diff --git a/api/model/index.js b/api/model/index.js index d8afffc..1055348 100644 --- a/api/model/index.js +++ b/api/model/index.js @@ -1,11 +1,11 @@ // 首页相关接口 const api = { - submitPersonalSharing: { - url: '/index_common/updateCartNum', - method: 'POST', + // 获取首页背景图 + getBanner: { + url: '/all_login/getBanner', + method: 'GET', auth: true, - debounce: 300, }, } diff --git a/pages/index/index.vue b/pages/index/index.vue index eedb630..5f7ee94 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -51,18 +51,30 @@ title: '文章分享', path: '/pages_order/record/articleSharing' }, - ] + ], + bgUrl: null, } }, computed: { ...mapState(['userInfo']), }, + onShow() { + this.fetchBg() + }, onLoad() { if (uni.getStorageSync('token') && !this.userInfo?.id) { this.$store.commit('getUserInfo') } }, methods: { + async fetchBg() { + try { + // todo: check + this.bgUrl = (await this.$fetch('getBanner'))?.[0]?.image + } catch (err) { + + } + }, onClick(url) { if (!uni.getStorageSync('token')) { uni.navigateTo({ diff --git a/pages_order/auth/wxLogin.vue b/pages_order/auth/wxLogin.vue index 22daff7..f7c67e4 100644 --- a/pages_order/auth/wxLogin.vue +++ b/pages_order/auth/wxLogin.vue @@ -36,7 +36,7 @@ }" > - 我已阅读《XXX小程序用户注册协议》《XXX小程序隐私保护协议》 + 我已阅读《裂变星小程序用户注册协议》《裂变星小程序隐私保护协议》 diff --git a/pages_order/auth/wxUserInfo.vue b/pages_order/auth/wxUserInfo.vue index 2cdfa0f..b9831e5 100644 --- a/pages_order/auth/wxUserInfo.vue +++ b/pages_order/auth/wxUserInfo.vue @@ -145,6 +145,7 @@ headImage: '请选择头像', nickName: '请填写昵称', phone: '请填写手机号', + wxCode: '请填写微信号', })) { return } diff --git a/pages_order/components/popupQrCode.vue b/pages_order/components/popupQrCode.vue index e286552..61d3032 100644 --- a/pages_order/components/popupQrCode.vue +++ b/pages_order/components/popupQrCode.vue @@ -39,6 +39,8 @@ .qr-popup { flex-direction: column; + padding-bottom: 104rpx; + .tips { margin-top: 75rpx; color: #1B1B1B; diff --git a/pages_order/mine/setting.vue b/pages_order/mine/setting.vue index f21ab73..92342d6 100644 --- a/pages_order/mine/setting.vue +++ b/pages_order/mine/setting.vue @@ -3,14 +3,12 @@ - - + 隐私政策 - - + @@ -21,8 +19,12 @@ export default { data() { return { + isLogined: false } }, + onShow() { + this.isLogined = !!uni.getStorageSync('token') + }, methods: { onLogout() { this.$store.commit('logout') diff --git a/pages_order/record/articleSharing.vue b/pages_order/record/articleSharing.vue index 7b7cca8..38a05e1 100644 --- a/pages_order/record/articleSharing.vue +++ b/pages_order/record/articleSharing.vue @@ -167,12 +167,12 @@ onShareAppMessage(res) { const { headTitle, - indexImage, + headImage, } = this.form let o = { title : headTitle, - imageUrl: indexImage, + imageUrl: headImage, path: `/pages_order/sharing/article?id=${this.id}` } @@ -316,7 +316,6 @@ const { headImage, headTitle, - indexImage, num, wxCodeImage, } = this.form @@ -326,7 +325,6 @@ userId: this.userId, headImage, headTitle, - indexImage, num, wxCodeImage, textDetails,