继续适配调节

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});
 		}

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;

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', {});

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;

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() {

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() {

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};

pages/mobile_web/workshops/index.vue

@@ -8,10 +8,14 @@
 	<view class="mobile-workshops" :style="{ backgroundImage: `url(${myFileUrl+background})` }">
 	<!-- #endif -->
 		<view class="mwt-top">
+			<!-- #ifdef MP -->
+			<view class="app-top" :style="{height: `${StatusBar}px`,background: topLevel===0? '#ffffff00' : `rgba(255, 255, 255,${topLevel})`}"></view>
+			<view :style="{height: `${StatusBar}px`}"></view>
+			<view class="mobile-logo" :style="{height: `${CustomBarHeight}px`,backgroundColor: `rgba(255, 255, 255,${topLevel})`}">
+			<!-- #endif -->
+			<!-- #ifndef MP -->
 			<view class="mobile-logo" :style="{backgroundColor: `rgba(255, 255, 255,${topLevel})`}">
-				<!-- #ifdef H5 -->
+			<!-- #endif -->
-				<!-- <u-icon name="arrow-left" size="40" color="#c2ea04" class="back" @click="back"></u-icon> -->
-				<!-- #endif -->
 				<image :src="myFileUrl+logo"></image>
 			</view>
 			<view class="mw-title">
@@ -202,6 +206,11 @@ export default {
 	},
 	data(){
 		return{
+			// #ifdef MP
+			// 微信小程序自定义导航栏参数
+			StatusBar: this.StatusBar || 0,
+			CustomBarHeight: this.Custom.height+(this.Custom.top-this.StatusBar)*2 || 0,
+			// #endif
 			// 全加载
 			loading: false,
 			// 顶部距离等级
@@ -405,10 +414,14 @@ export default {
 		},
 		// 返回
 		back(){
-			// uni.navigateBack();
+			// #ifdef MP
+			uni.navigateBack();
+			// #endif
+			// #ifndef MP
 			uni.redirectTo({
 				url: '/pages/mobile_web/index/index'
 			})
+			// #endif
 		},
 		// 上传图片
 		selectImage(){
@@ -857,7 +870,7 @@ export default {
 	justify-content: space-between;
 	min-height: 100vh;
 	background-size: cover;
-	// #ifdef APP
+	// #ifdef APP || MP
 	.app-top{
 		width: 100%;
 		position: fixed;
@@ -866,7 +879,7 @@ export default {
 	}
 	// #endif
 	.mwt-top{
-		// #ifdef APP
+		// #ifdef APP || MP
 		.app-top{
 			width: 100%;
 			position: fixed;