diff --git a/App.vue b/App.vue index 1ec3616..6ee297b 100644 --- a/App.vue +++ b/App.vue @@ -165,4 +165,4 @@ @import './tuniao-ui/index.scss'; @import './tuniao-ui/iconfont.css'; @import './static/css/my.scss'; - \ No newline at end of file + diff --git a/manifest.json b/manifest.json index b3e514e..0f15254 100644 --- a/manifest.json +++ b/manifest.json @@ -52,7 +52,7 @@ "quickapp" : {}, /* 小程序特有相关 */ "mp-weixin" : { - "appid" : "wx51c40ff1c6337652", + "appid" : "wxd01d4f0be53a283a", "setting" : { "urlCheck" : true, "minified" : true, diff --git a/pages.json b/pages.json index 385609c..314b02a 100644 --- a/pages.json +++ b/pages.json @@ -202,26 +202,51 @@ "style": { "navigationBarTitleText": "河南省青年企业家协会" } + }, + { + "path": "user/my_collection", + "style": { + "navigationBarTitleText": "河南省青年企业家协会" + } + }, + { + "path": "user/my_add", + "style": { + "navigationBarTitleText": "河南省青年企业家协会" + } } ] }, { "root": "pages/packageB", "pages": [{ - "path": "event/event_info", - "style": { - "navigationBarTitleText": "河南省青年企业家协会" + "path": "event/event_info", + "style": { + "navigationBarTitleText": "河南省青年企业家协会" + } + }, { + "path": "news/new_info", + "style": { + "navigationBarTitleText": "河南省青年企业家协会" + } + }, { + "path": "news/new_list", + "style": { + "navigationBarTitleText": "河南省青年企业家协会" + } + }, + { + "path": "paper/add", + "style": { + "navigationBarTitleText": "河南省青年企业家协会" + } + }, + { + "path": "paper/paper_info", + "style": { + "navigationBarTitleText": "河南省青年企业家协会" + } } - }, { - "path": "news/new_info", - "style": { - "navigationBarTitleText": "河南省青年企业家协会" - } - }, { - "path": "news/new_list", - "style": { - "navigationBarTitleText": "河南省青年企业家协会" - } - }] + ] }], "globalStyle": { "navigationStyle": "custom", diff --git a/pages/index/directory.vue b/pages/index/directory.vue index 6839ae0..b451295 100644 --- a/pages/index/directory.vue +++ b/pages/index/directory.vue @@ -36,17 +36,19 @@ :style="{top:isFixed?vuex_custom_bar_height+'px':'auto'}"> - 地区 + + {{dq_name=='全部'?'地区':dq_name}} + - - + {{hy_name=='全部'?'行业':hy_name}} + :class="openHyShow?'tn-icon-up-triangle':'tn-icon-down-triangle'"> 届数 @@ -62,9 +64,21 @@ - - {{item.industry_name}} + {{item.label}} + + + + + + + + + + {{item.industry_name}} @@ -72,7 +86,7 @@ - @@ -119,7 +133,8 @@ import { addressList, associationIndex, - newIndustryIndex + newIndustryIndex, + getRegion } from '@/util/api.js'; import store from "@/store"; export default { @@ -137,15 +152,19 @@ currentTabbarIndex: 0, apiImgUrl: this.$store.state.imgUrl, industry_list: [], - leftId: 0, + leftHyId: 0, selectShow: false, HomeTitle: '', selectList: [], gid: store.state.Gid, top: 0, - openDqShow: false, + openHyShow: false, selectTopNumber: 220, hy_name: '全部', + openDqShow: false, + region_list: [], + dq_name: '全部', + leftDqId: 0, } }, onLoad(d) { @@ -155,6 +174,7 @@ } this.getIndustryList(); this.getAssociationIndex(); + this.getRegionList(); }, methods: { serach_do() { @@ -168,6 +188,7 @@ this.gid = store.state.Gid; this.getIndustryList(); this.getAssociationIndex(); + this.getRegionList(); }, confirm(d) { var info = d[0]; @@ -215,7 +236,7 @@ id: 0, industry_name: '全部' }); - this.leftId = res.data[0].id; + this.leftHyId = res.data[0].id; uni.showLoading({ title: '加载中...' }); @@ -233,8 +254,9 @@ getAddressList() { addressList({ position_id: 0, + region_id:this.leftDqId, association_id: this.gid, - industry_id: this.leftId, + industry_id: this.leftHyId, nikename: this.serach_content }) .then(res => { @@ -256,7 +278,42 @@ }); }) }, - clickClassifyNav(index) { + getRegionList() { + getRegion({ + association_id: 1, + }) + .then(res => { + if (res.code == 1) { + var key = res.data; + const transformedSelectList = key.map(item => ({ + value: item.id, + label: item.region_name + })); + this.region_list = transformedSelectList; + } + }) + .catch(error => { + uni.showToast({ + title: error, + icon: 'none', + duration: 2000 + }); + }) + }, + clickClassifyHy(index) { + uni.showLoading({ + title: '加载中...' + }); + this.isFixed = false; + this.showNo = false; + this.openHyShow = false; + this.currentTabbarIndex = index; + this.leftHyId = this.industry_list[index].id; + this.hy_name = this.industry_list[index].industry_name; + this.list = []; + this.getAddressList(); + }, + clickClassifyDq(index) { uni.showLoading({ title: '加载中...' }); @@ -264,8 +321,8 @@ this.showNo = false; this.openDqShow = false; this.currentTabbarIndex = index; - this.leftId = this.industry_list[index].id; - this.hy_name = this.industry_list[index].industry_name; + this.leftDqId = this.region_list[index].value; + this.dq_name = this.region_list[index].label; this.list = []; this.getAddressList(); }, @@ -426,4 +483,4 @@ .abc { position: absolute; } - \ No newline at end of file + diff --git a/pages/index/index.vue b/pages/index/index.vue index c01a43d..1d1e416 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -132,19 +132,38 @@ mounted() { //this.wxshare(); }, - onShareAppMessage() { // 分享到微信好友 - // 更多参数配置，参考文档 - return { - title: this.name, - path: '/pages/index/index?gid=' + store.state.Gid, - imageUrl: this.icon, + onShareAppMessage: async function(data) { + console.log(data); + if (data.from == 'button') { + var info = data.target.dataset.item; + return { + title: info.title, + path: '/pages/packageB/paper/paper_info?id=' + info.id, + imageUrl: this.icon, + } + } else { + return { + title: this.name, + path: '/pages/index/index?gid=' + store.state.Gid, + imageUrl: this.icon, + } } + }, - onShareTimeline() { // 分享到朋友圈 - return { - title: this.name, - path: '/pages/index/index?gid=' + store.state.Gid, - imageUrl: this.icon, + onShareTimeline: async function(data) { // 分享到朋友圈 + if (data.from == 'button') { + var info = data.target.dataset.item; + return { + title: info.title, + path: '/pages/packageB/paper/paper_info?id=' + info.id, + imageUrl: this.icon, + } + } else { + return { + title: this.name, + path: '/pages/index/index?gid=' + store.state.Gid, + imageUrl: this.icon, + } } }, methods: { @@ -188,6 +207,9 @@ if (this.currentIndex === 0) { this.$refs.home.ReachBottom(); } + if (this.currentIndex === 2) { + this.$refs.pizz.ReachBottom(); + } // if (this.currentIndex === 1) { // this.$refs.service.ReachBottom(); // } diff --git a/pages/index/pizz.vue b/pages/index/pizz.vue index fb4f6e0..cab5904 100644 --- a/pages/index/pizz.vue +++ b/pages/index/pizz.vue @@ -1,5 +1,5 @@ + + \ No newline at end of file diff --git a/pages/packageA/user/my_card.vue b/pages/packageA/user/my_card.vue index e774a96..f271597 100644 --- a/pages/packageA/user/my_card.vue +++ b/pages/packageA/user/my_card.vue @@ -72,16 +72,61 @@ - - 分享 + - 申请查看联系方式 + + + 申请联系方式 + + 点击确定按钮将发送联系方式的申请,等待对方同意后方可展示。且发送申请时,对方也将看到你的个人名片信息。 + + + + + + + + + + + {{userThisInfo.nikename}} + {{userThisInfo.phone}} + + + + {{userThisInfo.enterprise_name}} + + + + + + + 取消 + + + + 确定 + + + + + + + - - + + 好友验证 - - - - - - - - - - - {{item.nikename}} - {{item.phone}} - - - {{item.enterprise_name}} + + + + 近三天 + + + + + + + + + + 石训 + + + + 查看 + + + + + 好想你健康食品股份有限公司 + + + + + + + + 系统消息 + + 对方向您申请了联系方式的查看,需等待您同意后方可展示。 + + + + + + + + + + + 石训 + 135******** + + + 好想你健康食品股份有限公司 + + + + + + + 取消 + + + 确定 + + + + + - + /* 自定义导航栏内容 end */ + + /* 底部安全边距 start*/ + .tn-tabbar-height { + min-height: 20rpx; + height: calc(40rpx + env(safe-area-inset-bottom) / 2); + height: calc(40rpx + constant(safe-area-inset-bottom)); + } + + + .tn-color-wallpaper { + color: #1D2541; + } + + /* 页面阴影 start*/ + .wallpaper-shadow { + border-radius: 15rpx; + box-shadow: 0rpx 0rpx 50rpx 0rpx rgba(0, 0, 0, 0.07); + } + + + + /* 图标容器15 start */ + .icon15 { + &__item { + width: 30%; + background-color: #FFFFFF; + border-radius: 10rpx; + padding: 30rpx; + margin: 20rpx 10rpx; + transform: scale(1); + transition: transform 0.3s linear; + transform-origin: center center; + + &--icon { + width: 105rpx; + height: 105rpx; + font-size: 60rpx; + border-radius: 50%; + margin-bottom: 18rpx; + position: relative; + z-index: 1; + + &::after { + content: " "; + position: absolute; + z-index: -1; + width: 100%; + height: 100%; + left: 0; + bottom: 0; + border-radius: inherit; + opacity: 1; + transform: scale(1, 1); + background-size: 100% 100%; + + + } + } + } + } + + /* 用户头像 start */ + .logo-image { + width: 100rpx; + height: 100rpx; + position: relative; + } + + .logo-pic { + background-size: cover; + background-repeat: no-repeat; + // background-attachment:fixed; + background-position: top; + border: 1rpx solid rgba(255, 255, 255, 0.05); + box-shadow: 0rpx 0rpx 80rpx 0rpx rgba(0, 0, 0, 0.05); + border-radius: 50%; + overflow: hidden; + // background-color: #FFFFFF; + } + \ No newline at end of file diff --git a/pages/packageA/user/my_collection.vue b/pages/packageA/user/my_collection.vue new file mode 100644 index 0000000..d62f77a --- /dev/null +++ b/pages/packageA/user/my_collection.vue @@ -0,0 +1,126 @@ + + + + + \ No newline at end of file diff --git a/pages/packageA/user/my_invoice.vue b/pages/packageA/user/my_invoice.vue index fd19a8e..aee7f97 100644 --- a/pages/packageA/user/my_invoice.vue +++ b/pages/packageA/user/my_invoice.vue @@ -1,20 +1,56 @@ @@ -290,7 +314,7 @@ bank_basic_account_number: '', bank: '', association_id: 0, - + money: '', }, invoice_type_show: false, actionSheetList: [{ @@ -309,7 +333,6 @@ tt_add_show: false, tt_show: false, tt_list: [], - money: '', page: 1, allList: [], info: {}, @@ -513,4 +536,8 @@ .info_text view { margin-bottom: 40rpx; } + + .view_text view { + margin-top: 20rpx; + } \ No newline at end of file diff --git a/pages/packageA/user/my_msg.vue b/pages/packageA/user/my_msg.vue index 735c821..aa4956a 100644 --- a/pages/packageA/user/my_msg.vue +++ b/pages/packageA/user/my_msg.vue @@ -1,91 +1,156 @@ @@ -100,6 +165,8 @@ name: 'Message', data() { return { + hdModel: false, + xtModel: false, loadingIn: 'loading', uid: 0, page: 1, diff --git a/pages/packageB/event/event_info.vue b/pages/packageB/event/event_info.vue index 5db5a95..4949e2c 100644 --- a/pages/packageB/event/event_info.vue +++ b/pages/packageB/event/event_info.vue @@ -18,7 +18,7 @@ {{ info.activity_name }} - {{formatTime(info.activity_end_time)}}-{{formatTime(info.activity_start_time)}} + {{info.activity_end_time}}-{{info.activity_start_time}} @@ -38,6 +38,32 @@ + + 问卷问题 + + + + @@ -51,17 +77,19 @@ - + - + + 点赞 - + - + + 收藏 @@ -194,36 +222,7 @@ - - 问卷问题 - - - - + --> @@ -333,7 +332,11 @@ applicationAdd, questionnaireAdd, moneyLogAdd, - wxphoneLogin + wxphoneLogin, + likeDo, + favsDo, + likeRevoke, + favsRevoke } from '@/util/api.js'; import store from '@/store/index.js' @@ -387,6 +390,7 @@ // var id = this.$route.query.id; // this.id = id; // this.getEventInfo(); + //1已点赞2未点赞 }, onShareAppMessage() { // 分享到微信好友 // 更多参数配置，参考文档 @@ -424,6 +428,120 @@ this.getEventInfo(); }, methods: { + like() { + var uid = uni.getStorageSync('uid'); + if (!uid) { + uni.showToast({ + title: '请先登录', + icon: 'none', + duration: 2000 + }); + return; + } + if (this.info.like == 2) { + likeDo({ + member_id: uid, + related_id: this.id, + related_type: 'article', + }) + .then(res => { + console.log(res); + uni.showToast({ + title: '赞成功！', + icon: 'none', + duration: 2000 + }); + this.info.like = 1; + }) + .catch(error => { + uni.showToast({ + title: error, + icon: 'none', + duration: 2000 + }); + }) + } else { + likeRevoke({ + member_id: uid, + related_id: this.id, + related_type: 'article', + }) + .then(res => { + console.log(res); + uni.showToast({ + title: '取消成功！', + icon: 'none', + duration: 2000 + }); + this.info.like = 2; + }) + .catch(error => { + uni.showToast({ + title: error, + icon: 'none', + duration: 2000 + }); + }) + } + + }, + favs() { + var uid = uni.getStorageSync('uid'); + if (!uid) { + uni.showToast({ + title: '请先登录', + icon: 'none', + duration: 2000 + }); + return; + } + if (this.info.fav == 2) { + favsDo({ + member_id: uid, + related_id: this.id, + related_type: 'article', + }) + .then(res => { + console.log(res); + uni.showToast({ + title: '收藏成功！', + icon: 'none', + duration: 2000 + }); + this.info.fav = 1; + }) + .catch(error => { + uni.showToast({ + title: error, + icon: 'none', + duration: 2000 + }); + }) + } else { + favsRevoke({ + member_id: uid, + related_id: this.id, + related_type: 'article', + }) + .then(res => { + console.log(res); + uni.showToast({ + title: '取消收藏成功！', + icon: 'none', + duration: 2000 + }); + this.info.fav = 2; + }) + .catch(error => { + uni.showToast({ + title: error, + icon: 'none', + duration: 2000 + }); + }) + } + + }, PhoneLogin(d) { console.log(d); this.showLogin = false; diff --git a/pages/packageB/paper/add.vue b/pages/packageB/paper/add.vue new file mode 100644 index 0000000..23088ea --- /dev/null +++ b/pages/packageB/paper/add.vue @@ -0,0 +1,160 @@ + + + + + \ No newline at end of file diff --git a/pages/packageB/paper/paper_info.vue b/pages/packageB/paper/paper_info.vue new file mode 100644 index 0000000..3f01496 --- /dev/null +++ b/pages/packageB/paper/paper_info.vue @@ -0,0 +1,452 @@ + + + + + \ No newline at end of file diff --git a/static/_6@2x.png b/static/_6@2x.png new file mode 100644 index 0000000..1431ca2 Binary files /dev/null and b/static/_6@2x.png differ diff --git a/static/book.png b/static/book.png deleted file mode 100644 index 2dffccd..0000000 Binary files a/static/book.png and /dev/null differ diff --git a/static/c1.png b/static/c1.png deleted file mode 100644 index 2fdd620..0000000 Binary files a/static/c1.png and /dev/null differ diff --git a/static/c1455.png b/static/c1455.png deleted file mode 100644 index a40e24c..0000000 Binary files a/static/c1455.png and /dev/null differ diff --git a/static/c2.png b/static/c2.png deleted file mode 100644 index af3700d..0000000 Binary files a/static/c2.png and /dev/null differ diff --git a/static/c3.png b/static/c3.png deleted file mode 100644 index e19103f..0000000 Binary files a/static/c3.png and /dev/null differ diff --git a/static/hqzc.png b/static/hqzc.png deleted file mode 100644 index 4074ff7..0000000 Binary files a/static/hqzc.png and /dev/null differ diff --git a/static/ico1.png b/static/ico1.png index be9f34a..48f7411 100644 Binary files a/static/ico1.png and b/static/ico1.png differ diff --git a/static/ico10.png b/static/ico10.png deleted file mode 100644 index 377b9db..0000000 Binary files a/static/ico10.png and /dev/null differ diff --git a/static/ico11.png b/static/ico11.png deleted file mode 100644 index e050613..0000000 Binary files a/static/ico11.png and /dev/null differ diff --git a/static/ico12.png b/static/ico12.png deleted file mode 100644 index 50c1750..0000000 Binary files a/static/ico12.png and /dev/null differ diff --git a/static/ico13.png b/static/ico13.png deleted file mode 100644 index 5b6e737..0000000 Binary files a/static/ico13.png and /dev/null differ diff --git a/static/ico16.png b/static/ico16.png deleted file mode 100644 index 8210212..0000000 Binary files a/static/ico16.png and /dev/null differ diff --git a/static/ico2.png b/static/ico2.png index b140322..769c26b 100644 Binary files a/static/ico2.png and b/static/ico2.png differ diff --git a/static/ico3.png b/static/ico3.png index c31de61..a55e2d2 100644 Binary files a/static/ico3.png and b/static/ico3.png differ diff --git a/static/ico4.png b/static/ico4.png index 09c2819..abcf136 100644 Binary files a/static/ico4.png and b/static/ico4.png differ diff --git a/static/ico5.png b/static/ico5.png deleted file mode 100644 index dd89264..0000000 Binary files a/static/ico5.png and /dev/null differ diff --git a/static/ico8.png b/static/ico8.png deleted file mode 100644 index ee91af4..0000000 Binary files a/static/ico8.png and /dev/null differ diff --git a/static/ico9.png b/static/ico9.png deleted file mode 100644 index 233318c..0000000 Binary files a/static/ico9.png and /dev/null differ diff --git a/static/icon13.png b/static/icon13.png deleted file mode 100644 index 2674e62..0000000 Binary files a/static/icon13.png and /dev/null differ diff --git a/static/icon14.png b/static/icon14.png deleted file mode 100644 index b44aa57..0000000 Binary files a/static/icon14.png and /dev/null differ diff --git a/static/icon15.png b/static/icon15.png deleted file mode 100644 index 736f670..0000000 Binary files a/static/icon15.png and /dev/null differ diff --git a/static/jj.png b/static/jj.png deleted file mode 100644 index 7b93efd..0000000 Binary files a/static/jj.png and /dev/null differ diff --git a/static/msg1.png b/static/msg1.png new file mode 100644 index 0000000..a92d4f3 Binary files /dev/null and b/static/msg1.png differ diff --git a/static/msg2.png b/static/msg2.png new file mode 100644 index 0000000..e524a0b Binary files /dev/null and b/static/msg2.png differ diff --git a/static/msg3.png b/static/msg3.png new file mode 100644 index 0000000..b417f9e Binary files /dev/null and b/static/msg3.png differ diff --git a/static/sh.png b/static/sh.png deleted file mode 100644 index 9207b65..0000000 Binary files a/static/sh.png and /dev/null differ diff --git a/static/t1.png b/static/t1.png deleted file mode 100644 index d2f328d..0000000 Binary files a/static/t1.png and /dev/null differ diff --git a/static/t2.png b/static/t2.png deleted file mode 100644 index 2948144..0000000 Binary files a/static/t2.png and /dev/null differ diff --git a/static/tg.png b/static/tg.png deleted file mode 100644 index aac7098..0000000 Binary files a/static/tg.png and /dev/null differ diff --git a/util/api.js b/util/api.js index 3622a98..3de8656 100644 --- a/util/api.js +++ b/util/api.js @@ -91,4 +91,29 @@ export const addInvoiceLog = data => request.post('/move/invoice_header/addInvoi export const someMethod = data => request.post('/move/invoice_header/someMethod', data, false); export const getInvoiceLogWithHeader = data => request.post('/move/invoice_header/getInvoiceLogWithHeader', data, -false); \ No newline at end of file + false); + +export const likeDo = data => request.post('/move/like/do', data, false); +export const likeRevoke = data => request.post('/move/like/revoke', data, false); + +export const favsDo = data => request.post('/move/favs/do', data, false); + +export const favsRevoke = data => request.post('/move/favs/revoke', data, false); + +export const favsIndex = data => request.post('/move/favs/index', data, false); + +export const tweetsPostAdd = data => request.post('/move/tweets/post', data, false); + +export const tweetsList = data => request.post('/move/tweets/plaza', data, false); + +export const tweetsInfo = data => request.post('/move/tweets/detail', data, false); + +export const postComment = data => request.post('/move/tweets/post_comment', data, false); + +export const commentList = data => request.post('/move/tweets/comments', data, false); + +export const addComment = data => request.post('/move/tweets/post_comment', data, false); + +export const removeComment = data => request.post('/move/tweets/remove_comment', data, false); + +export const tweetsDel = data => request.post('/move/tweets/destroy', data, false); \ No newline at end of file