diff --git a/pages/mobile_web/index/index.vue b/pages/mobile_web/index/index.vue index 84e62c4..8d53eed 100644 --- a/pages/mobile_web/index/index.vue +++ b/pages/mobile_web/index/index.vue @@ -87,11 +87,16 @@ export default { }, // #endif onShow(){ - // 小程序不要刷新 - // #ifndef MP + // 小程序除我的页,其它不要刷新 let index = uni.getStorageSync('current'); this.current = index?index:0; this.isLogin = this.$store.state.vuex_token; + // #ifdef MP + if(this.current === 2){ + this.changeCurrent(this.current); + } + // #endif + // #ifndef MP if(this.current === 1){ uni.pageScrollTo({scrollTop: 0}); } diff --git a/pages/mobile_web/my/child_pages/login.vue b/pages/mobile_web/my/child_pages/login.vue index 9412aa6..374bc3f 100644 --- a/pages/mobile_web/my/child_pages/login.vue +++ b/pages/mobile_web/my/child_pages/login.vue @@ -267,7 +267,7 @@ })); that.$u.vuex('vuex_token', res.data.token); // that.$u.vuex('vuex_token', 'fbc545a91cc94fe89296828a25a7e08e@9085553879028596738'); - that.$u.vuex('user_message', JSON.stringify(res.data.user)); + await that.$u.vuex('user_message', JSON.stringify(res.data.user)); if(that.nextUrl===''){ uni.navigateBack({complete() { setTimeout(()=>{ @@ -393,6 +393,11 @@ .pixel-input{ width: 320rpx; } + // #ifdef MP + /deep/.u-form-item{ + margin: 0 40rpx; + } + // #endif } .lgc-btn{ margin-top: 50rpx; diff --git a/pages/mobile_web/my/child_pages/setting.vue b/pages/mobile_web/my/child_pages/setting.vue index 1e34738..a3f3e7d 100644 --- a/pages/mobile_web/my/child_pages/setting.vue +++ b/pages/mobile_web/my/child_pages/setting.vue @@ -216,7 +216,7 @@ export default { title: '注销', content: '是否确认退出登录?', confirmColor: '#94d500', - success: function (res) { + success: async(res) => { if (res.confirm) { that.$u.vuex('vuex_token', ''); that.$u.vuex('user_message', {}); diff --git a/pages/mobile_web/my/child_pages/share.vue b/pages/mobile_web/my/child_pages/share.vue index 1c86c0e..e4f4f83 100644 --- a/pages/mobile_web/my/child_pages/share.vue +++ b/pages/mobile_web/my/child_pages/share.vue @@ -314,6 +314,10 @@ display: flex; justify-content: center; align-items: center; + // #ifdef MP + border-radius: 16rpx; + overflow: hidden; + // #endif .sil-image{ width: 140rpx; height: 140rpx; @@ -336,6 +340,9 @@ width: 100%; height: 100%; transition: 0.5s; + // #ifdef MP + overflow: hidden; + // #endif .sil-image{ width: 200rpx; height: 200rpx; diff --git a/pages/mobile_web/recharge/detail.vue b/pages/mobile_web/recharge/detail.vue index af87cfc..707e30f 100644 --- a/pages/mobile_web/recharge/detail.vue +++ b/pages/mobile_web/recharge/detail.vue @@ -236,10 +236,14 @@ export default { }, // 返回 back(){ - // uni.navigateBack(); + // #ifdef MP + uni.navigateBack(); + // #endif + // #ifndef MP uni.redirectTo({ url: '/pages/mobile_web/recharge/recharge' }) + // #endif }, // 支付协议 toAgree() { diff --git a/pages/mobile_web/recharge/recharge.vue b/pages/mobile_web/recharge/recharge.vue index 120e432..56e3e55 100644 --- a/pages/mobile_web/recharge/recharge.vue +++ b/pages/mobile_web/recharge/recharge.vue @@ -136,10 +136,14 @@ methods:{ // 返回 back(){ - // uni.navigateBack(); + // #ifdef MP + uni.navigateBack(); + // #endif + // #ifndef MP uni.redirectTo({ url: '/pages/mobile_web/index/index' }) + // #endif }, // 滚动回顶部 goTop() { diff --git a/pages/mobile_web/work/work.vue b/pages/mobile_web/work/work.vue index df7a6f1..b0c8f5a 100644 --- a/pages/mobile_web/work/work.vue +++ b/pages/mobile_web/work/work.vue @@ -169,7 +169,7 @@ export default { methods:{ // 初始化 async init(){ - this.$refs.uWaterfall.clear(); + await this.$refs.uWaterfall.clear(); if(this.current){ this.collectList = []; this.collectForm = {current: 1,size: 10,isFinish: false,total: 0}; diff --git a/pages/mobile_web/workshops/index.vue b/pages/mobile_web/workshops/index.vue index b304751..56bc7e1 100644 --- a/pages/mobile_web/workshops/index.vue +++ b/pages/mobile_web/workshops/index.vue @@ -8,10 +8,14 @@ + + + +