diff --git a/src/components/loginDialog.wpy b/src/components/loginDialog.wpy index 2f44b85..261abe3 100644 --- a/src/components/loginDialog.wpy +++ b/src/components/loginDialog.wpy @@ -53,6 +53,13 @@ margin-left: 4rpx; } } + .iconV2{ + width: 28rpx; + height: 28rpx; + vertical-align: middle; + margin-right: 8rpx; + margin-top: -2rpx; + } } } @@ -66,10 +73,14 @@ 登录福恋，获得更精准的推荐 - 登录即表明您同意福恋的 + + + + 请阅读并同意 用户协议 与 隐私政策 + 微信登录 @@ -98,6 +109,7 @@ wepy.component({ } }, data: { + active: false }, mixins: [https, base], methods: { @@ -107,12 +119,18 @@ wepy.component({ }, jumpPath() { let vm = this + if (!vm.active) { + return vm.$showToast('请先选择同意服务协议') + } vm.hidden() wx.navigateTo({url: `/pages/home/registration`}) }, gotoApp(url) { wx.navigateTo({url: '/pages/books/bookDetail?url=' + encodeURIComponent(url)}) - } + }, + activeFn(index) { + this.active = !this.active + } }, created() { } diff --git a/src/components/userTitle.wpy b/src/components/userTitle.wpy index 8cab36b..9c64b27 100644 --- a/src/components/userTitle.wpy +++ b/src/components/userTitle.wpy @@ -17,36 +17,36 @@ - - {{ user.nickname }} + + {{ user.nickname }} 你还未登录 - 编辑 + 编辑 - 编辑 + 编辑 - + - + 已认证 - 正在审核中 - 成为认证用户 - 完善个人资料 + 正在审核中 + 成为认证用户 + 完善个人资料 - 登录后即可体验完整功能 + 登录后即可体验完整功能 @@ -253,6 +253,7 @@ height: 150rpx; } .mainVip { + margin-top: 4rpx; margin-left: 10rpx; .icon { width: 76rpx; @@ -376,7 +377,7 @@ height: 50rpx; line-height: 50rpx; z-index: 9999; - span { + label { max-width: 240rpx; overflow: hidden; text-overflow: ellipsis; diff --git a/src/mixins/https.js b/src/mixins/https.js index df4b899..59e2ee1 100644 --- a/src/mixins/https.js +++ b/src/mixins/https.js @@ -190,7 +190,9 @@ export default { console.error('[ERROR]', err) }, complete: (res) => { - wx.hideLoading() + setTimeout(() => { + wx.hideLoading() // loading只展示一会就被去除了 + }, 1000) if (res.errMsg.indexOf('timeout') > -1) { vm.errorOne += 1 let pages = getCurrentPages() // 获取加载的页面 diff --git a/src/pages/home/information.wpy b/src/pages/home/information.wpy index bbc4557..7e703ea 100644 --- a/src/pages/home/information.wpy +++ b/src/pages/home/information.wpy @@ -1354,7 +1354,24 @@ wepy.page({ vm.userData = wx.getStorageSync('userInfo') vm.userId = wx.getStorageSync('user_id') vm.userType = wx.getStorageSync('type') - vm.id = e.id + if (e.scene) { + let newScene = decodeURIComponent(e.scene) + console.log(newScene, 'newScene-') + if (newScene.indexOf('&') >= 0) { + newScene.split('&').forEach((item, index) => { + if (item.indexOf('id') >= 0) { + vm.id = item.split('=')[1] + } + if (item.indexOf('from_user_id') >= 0) { + wx.setStorageSync('from_user_id', item.split('=')[1]) + } + }) + } else { + vm.id = decodeURIComponent(e.scene).split('=')[1] + } + } else { + vm.id = e.id + } vm.getDetail() vm.getDynamic() vm.getPraiseList() diff --git a/src/pages/news/chitchat.wpy b/src/pages/news/chitchat.wpy index c325efc..5f6044e 100644 --- a/src/pages/news/chitchat.wpy +++ b/src/pages/news/chitchat.wpy @@ -832,7 +832,7 @@ wepy.page({ app.globalData.nim.msg.sendTextMsg({ scene: 'p2p', to: vm.otherUserId, - body: msg, + body: vm.msg, isSend: 0, onSendBefore: function (msg) { console.log('get msg before', msg) diff --git a/src/pages/news/groupChitchat.wpy b/src/pages/news/groupChitchat.wpy index 9077cf8..dd2937c 100644 --- a/src/pages/news/groupChitchat.wpy +++ b/src/pages/news/groupChitchat.wpy @@ -777,11 +777,12 @@ wepy.page({ vm.$showToast('请输入聊天内容') return } + let msg = vm.msg if (/\[[^\]]+\]/.test(vm.msg)) { - vm.msg = vm.transitionMsg(vm.msg) + msg = vm.transitionMsg(vm.msg) } vm.msgList.push({ - text: vm.msg, + text: msg, attach: '', id: `id_${timeData}`, isSelf: true, diff --git a/src/pages/news/groupChitchatDetail.wpy b/src/pages/news/groupChitchatDetail.wpy index 3b8b0fe..8991f8c 100644 --- a/src/pages/news/groupChitchatDetail.wpy +++ b/src/pages/news/groupChitchatDetail.wpy @@ -389,7 +389,18 @@ wepy.page({ }, jumpPath(e) { wx.navigateTo({url: e}) - } + }, + handleContact(e) { + let vm = this + try { + wx.previewImage({ + current: 'https://image.fulllinkai.com/202310/23/2a132a4978ef87d532a817041e425c26.png', + urls: ['https://image.fulllinkai.com/202310/23/2a132a4978ef87d532a817041e425c26.png'] + }) + } catch (error) { + vm.$showToast('请更新至微信最新版本') + } + } }, onLoad(e) { let vm = this diff --git a/src/pages/news/systemNews.wpy b/src/pages/news/systemNews.wpy index 8a7665a..1503b07 100644 --- a/src/pages/news/systemNews.wpy +++ b/src/pages/news/systemNews.wpy @@ -148,7 +148,7 @@ page { - 点击查看>> + 点击查看>> {{item.message}} @@ -256,11 +256,19 @@ wepy.page({ }, jumpPath(e) { let url = `` + console.log(e.type, e.path_type, 'path_type=') if (e.type == 'system' || e.type == 'gift' || e.type == 'marketing') { if (!e.path_url) { return } - wx.navigateTo({url: `/pages/books/bookDetail?url=${encodeURIComponent(e.path_url)}`}) + if (e.path_type == 2) { + console.log('2222') + wx.navigateTo({url: `/pages/books/bookDetail?url=${encodeURIComponent(e.path_url)}`}) + } else { + console.log('1111') + wx.navigateTo({url: '/' + e.path_url}) + } + return } if (e.type == 'follow' || e.type == 'friend' || e.type == 'remind_profile') { url = `/pages/home/information?id=${e.type == 'follow' ? e.send_user_id : e.user_id}` @@ -297,8 +305,10 @@ wepy.page({ vm.$refs.pageScroll.showBackTopBtn = top > 380 }, onShow() { + console.log('33333') }, onLoad() { + console.log('44444') let vm = this vm.getList() } diff --git a/src/pages/users/myOrderList.wpy b/src/pages/users/myOrderList.wpy index b5168ba..4455eaf 100644 --- a/src/pages/users/myOrderList.wpy +++ b/src/pages/users/myOrderList.wpy @@ -6,9 +6,10 @@ - - + + + 订单号：{{item.trade_no}} @@ -99,6 +100,13 @@ wepy.page({ }, methods: { + onPulling () { + this.collectionMessage = false + this.noMoreShow = false + this.vipList = [] + this.vipPage = 1 + this.vipData() + }, serviceToupper(e) { clearTimeout(this._st) this._st = setTimeout(() => { @@ -136,6 +144,7 @@ wepy.page({ _this.loading = true this.$get({url: `${service.host}/order/rank/list`, data}).then(({code, data}) => { _this.triggeredsService = false + if (!data.data || (data.data.length == 0 && _this.vipPage == 1)) { _this.hideMessage = true return @@ -149,16 +158,12 @@ wepy.page({ } if (_this.vipList.length != 0 && _this.vipPage == 1) return _this.vipList = [..._this.vipList, ...data.data] + }).finally(() => { wx.hideLoading() - }).finally(() => { _this.loaded = false }) }, - onPulling() { - this.triggered = true - }, - copyFn(data) { let vm = this wx.setClipboardData({ @@ -385,6 +390,10 @@ page{ .ui-quit-btn-submit{ background: linear-gradient(to right,#FF5380 0%,#FF85A5 100%); } + .ui-placeholder{ + width: 100vw; + height: 110rpx; + } } diff --git a/src/pages/users/selfTextarea.wpy b/src/pages/users/selfTextarea.wpy index 5a1b58e..c767fe3 100644 --- a/src/pages/users/selfTextarea.wpy +++ b/src/pages/users/selfTextarea.wpy @@ -253,7 +253,7 @@ import base from '../../mixins/base' this.selfTextareaShow = true if (e.text) { console.log(e.text, 'text==-') - if (e.text == '兴趣爱好') { + if (e.text == '兴趣标签') { this.bgColor = '#ffffff' wx.setNavigationBarColor({ frontColor: '#000000', @@ -557,11 +557,13 @@ import base from '../../mixins/base' this.$showLoading('提交中..') this.$put({url: `${service.host}/user/other/profie`, data}).then(({code, data}) => { this.throttleShow = true - wx.hideLoading() console.log('参数保存成功！') - wx.navigateBack({ - delta: 1 - }) + setTimeout(() => { + wx.hideLoading() + wx.navigateBack({ + delta: 1 + }) + }, 2000) }) } else { this.throttleShow = false diff --git a/src/pages/users/unmarri.wpy b/src/pages/users/unmarri.wpy index 0600962..c26b0bd 100644 --- a/src/pages/users/unmarri.wpy +++ b/src/pages/users/unmarri.wpy @@ -435,12 +435,16 @@ }, ensureData(data) { // 保存 + this.$showLoading('提交中..') this.$put({url: `${service.host}/user/base/profile`, data}).then(({code, data}) => { console.log('参数保存成功！') - wx.navigateBack({ - delta: 1 - }) - }) + setTimeout(() => { + wx.hideLoading() + wx.navigateBack({ + delta: 1 + }) + }, 1200) + }) }, multiCity(country, province, city) { diff --git a/src/pages/users/unmarriV2.wpy b/src/pages/users/unmarriV2.wpy index 82f098d..5bcc520 100644 --- a/src/pages/users/unmarriV2.wpy +++ b/src/pages/users/unmarriV2.wpy @@ -314,6 +314,10 @@ } } } + .imMainInfo{ + border-radius: 30rpx; + border: 1px solid red; + } } .m_bas { background-color: white; @@ -656,7 +660,7 @@