diff --git a/src/app.wpy b/src/app.wpy index b3ef231..3c6d2f7 100644 --- a/src/app.wpy +++ b/src/app.wpy @@ -35,7 +35,7 @@ wepy.app({ } }, globalData: { - versions: 'v5.5.83', // 版本号 + versions: 'v5.5.87', // 版本号 navBarHeight: 0, // 导航栏高度 navRight: 0, // 胶囊距右方间距(方保持左、右间距一致) navTop: 0, // 胶囊距顶部间距 diff --git a/src/config.js b/src/config.js index 8518451..0bfd05e 100644 --- a/src/config.js +++ b/src/config.js @@ -36,7 +36,7 @@ export const service = { // 添加好友 addFriend: `${host}/friend/users`, // 关注某人 - follow: `${host}/follow/users`, + follow: `${host}/follow/user`, // 我的粉丝 followers: `${host}/followers`, // 我的好友 diff --git a/src/pages/dynamic/hotTopic.wpy b/src/pages/dynamic/hotTopic.wpy index 108630d..f10a295 100644 --- a/src/pages/dynamic/hotTopic.wpy +++ b/src/pages/dynamic/hotTopic.wpy @@ -178,7 +178,8 @@ wepy.page({ navTop: 0, StatusBar: 0, CustomBar: 0, - navHeight: 0 + navHeight: 0, + user_id: wx.getStorageSync('user_id') }, methods: { getDetail() { @@ -279,6 +280,9 @@ wepy.page({ vm.dynamicList.splice(vm.selectIndex, 1) } }, + gotoRedirect (url) { + wx.redirectTo({url: url}) + }, // 下拉加载中 onPulling() { let vm = this @@ -353,6 +357,34 @@ wepy.page({ } vm.getDetail() vm.getList() + }, + async onShareAppMessage(res) { + let that = this + let openid = wx.getStorageSync('openid') + let fromUserID = wx.getStorageSync('user_id') + let imgUrl = `${that.detail.back_image}` + let url = `/pages/dynamic/hotTopic?id=${that.id}&from_openid=${openid}&share_user_id=${that.user_id}&from_user_id=${fromUserID}` + console.log(url) + return { + title: `#${that.detail.name}#`, + path: url, + // imageUrl: 'https://images.ufutx.com/202004/29/baac955e5878e0cb03c17eef0c92f473.jpeg', + imageUrl: imgUrl, + success: function (res) { + wx.showToast({ + title: '转发成功', + icon: 'success', + duration: 1500 + }) + var shareTickets = res.shareTickets + if (shareTickets.length == 0) { + return false + } + }, + fail: function (res) { + // 转发失败 + } + } } }) diff --git a/src/pages/dynamic/issue.wpy b/src/pages/dynamic/issue.wpy index d4f186a..65225fb 100644 --- a/src/pages/dynamic/issue.wpy +++ b/src/pages/dynamic/issue.wpy @@ -353,7 +353,7 @@ wepy.page({ topic_id: vm.id * 1, content: vm.value, photos: vm.imgList, - aliyun_video_id: vm.videoId, + aliyun_video_id: vm.imgList.length > 0 ? '' : vm.videoId, address: vm.address == '我在哪里' ? '' : vm.address, is_hot: vm.hot * 1 } @@ -441,6 +441,7 @@ wepy.page({ success(res) { vm.latitude = res.latitude vm.longitude = res.longitude + vm.showCon = false wx.chooseLocation({ latitude: res.latitude, longitude: res.longitude, diff --git a/src/pages/news/review.wpy b/src/pages/news/review.wpy index 150c193..a1f754a 100644 --- a/src/pages/news/review.wpy +++ b/src/pages/news/review.wpy @@ -382,6 +382,8 @@ wepy.page({ vm.$refs.pageScroll.showBackTopBtn = top > 380 }, onShow() { + this.userInfo = wx.getStorageSync('userInfo') + console.log(this.userInfo, 'dd--') }, onLoad(e) { let vm = this @@ -389,7 +391,6 @@ wepy.page({ vm.buImg = 'https://images.ufutx.com/202106/21/42c2796abf4217cd79871c29ec794ca4.png' vm.dialogIng = 'https://images.ufutx.com/202106/21/0e7d701cd1280a9b2ecffd1287c9abd1.png' vm.getList() - vm.userInfo = wx.getStorageSync('userInfo') console.log(vm.userInfo.rank_id, '7777777777') } }) diff --git a/src/pages/news/visitor.wpy b/src/pages/news/visitor.wpy index 1eedbed..6d34408 100644 --- a/src/pages/news/visitor.wpy +++ b/src/pages/news/visitor.wpy @@ -582,6 +582,7 @@ wepy.page({ } }, onShow() { + this.userInfo = wx.getStorageSync('userInfo') }, onLoad(e) { let vm = this @@ -590,7 +591,6 @@ wepy.page({ } vm.getList() vm.getFansList() - vm.userInfo = wx.getStorageSync('userInfo') } }) diff --git a/src/pages/users/setTing.wpy b/src/pages/users/setTing.wpy index 0c1d4c3..499e8ee 100644 --- a/src/pages/users/setTing.wpy +++ b/src/pages/users/setTing.wpy @@ -53,7 +53,7 @@ - +