优化测试问题

components/cm-custom/cm-drag.vue

@@ -129,7 +129,7 @@
 		align-items: center;
 		justify-content: center;
 		cursor: pointer;
-		z-index: 99999;
+		z-index: 20;
 		image {
 			width: 58rpx;
 			height: 58rpx;

components/cm-module/cm-seller/home.vue

@@ -251,6 +251,7 @@
 			navToDetailPage(id) {//跳转商品详情页
 				this.modallayer = true;
 				this.$api.navigateTo(`/pages/goods/product?id=${id}`)
+				this.modallayer = false;
 			},
 			handleContact(e){
 				console.log(e.detail.path)
@@ -351,7 +352,7 @@
 	}
 	.swiper__dots-box{
 		position: absolute;
-		bottom: 24rpx;
+		bottom: 5rpx;
 		left: 0;
 		right: 0;
 		/* #ifndef APP-NVUE */
@@ -369,7 +370,7 @@
 			background-color:rgba(255,255,255,.7);
 		}
 		.swiper__dots-long{
-			width: 32rpx;
+			width: 35rpx;
 			height: 8rpx;
 			border-radius: 4rpx;
 			background-color: #ffff;

components/cm-module/listTemplate/immediatelyList.vue

@@ -586,7 +586,7 @@
 		position: fixed;
 		top: 0;
 		left: 0;
-		z-index: 999;
+		z-index: 19;
 		.search-from{
 			width: 420rpx;
 			height: 80rpx;

pages/search/search-order.vue

@@ -658,10 +658,10 @@
 				background:linear-gradient(132deg,rgba(255,177,0,1) 0%,rgba(255,127,0,1) 100%);
 				border-radius: 6rpx;
 				line-height: 30rpx;
-				font-size: $font-size-24;
+				font-size: $font-size-22;
 				text-align: center;
 				color: #FFFFFF;
-				margin-top: 7rpx;
+				margin-top: 8rpx;
 			}
 			.bage-auto{
 				isplay: inline-block;
@@ -671,10 +671,10 @@
 				background:linear-gradient(135deg,rgba(0,216,255,1) 0%,rgba(22,139,225,1) 100%);
 				border-radius: 6rpx;
 				line-height: 30rpx;
-				font-size: $font-size-24;
+				font-size: $font-size-22;
 				text-align: center;
 				color: #FFFFFF;
-				margin-top: 7rpx;
+				margin-top:8rpx;
 			}
 			.bage-text{
 				font-size: $font-size-28;

pages/tabBar/home/home.vue

@@ -400,7 +400,7 @@
 	}
 	.swiper__dots-box{
 		position: absolute;
-		bottom: 24rpx;
+		bottom: 5rpx;
 		left: 0;
 		right: 0;
 		/* #ifndef APP-NVUE */
@@ -418,7 +418,7 @@
 			background-color:rgba(255,255,255,.7);
 		}
 		.swiper__dots-long{
-			width: 32rpx;
+			width: 35rpx;
 			height: 8rpx;
 			border-radius: 4rpx;
 			background-color: #ffff;

pages/tabBar/user/user.vue

@@ -311,8 +311,8 @@
 		onPageScroll(e){//实时获取到滚动的值
 			if(e.scrollTop>20){
 				this.isCmcustom = true
-				this.nvabarData.bgColor = '#FFFFFF'
-				this.nvabarData.textColor = '#333333'
+				this.nvabarData.bgColor = '#E37A4B'
+				this.nvabarData.textColor = '#FFFFFF'
 			}else{
 				this.isCmcustom = false
 				this.nvabarData.bgColor = ''

pages/user/order/order-list.vue

@@ -551,10 +551,10 @@
 				background:linear-gradient(132deg,rgba(255,177,0,1) 0%,rgba(255,127,0,1) 100%);
 				border-radius: 6rpx;
 				line-height: 30rpx;
-				font-size: $font-size-24;
+				font-size: $font-size-22;
 				text-align: center;
 				color: #FFFFFF;
-				margin-top: 7rpx;
+				margin-top: 8rpx;
 			}
 			.bage-auto{
 				display: inline-block;
@@ -564,10 +564,10 @@
 				background:linear-gradient(135deg,rgba(0,216,255,1) 0%,rgba(22,139,225,1) 100%);
 				border-radius: 6rpx;
 				line-height: 30rpx;
-				font-size: $font-size-24;
+				font-size: $font-size-22;
 				text-align: center;
 				color: #FFFFFF;
-				margin-top: 7rpx;
+				margin-top: 8rpx;
 			}
 			.bage-text{
 				font-size: $font-size-28;

seller/pages/index/index.vue

@@ -42,6 +42,7 @@
 				isUserData: false,
 				isCategory: false,
 				isHomeData: false,
+				isIphoneX:this.$store.state.isIphone,
 				tab_nav_list :[//菜单列表
 					{'id':0,'name':'首页',icon:'../../../static/icon-home@3x.png',iconAc:'../../../static/icon-home-active@3x.png'},
 					{'id':1,'name':'分类',icon:'../../../static/icon-sort@3x.png',iconAc:'../../../static/icon-sort-active@3x.png'},
@@ -52,9 +53,7 @@
 		},
 		onLoad() {
 			this.$nextTick(()=>{// 一定要等视图更新完再调用方法
-				setTimeout(()=>{
-					this.isUserData = true
-				},100)
+				setTimeout(()=>{ this.isUserData = true },100)
 			})
 		},
 		methods: {

seller/pages/login/register.vue

@@ -29,7 +29,7 @@
 					<text>展开信息填写<text class="iconfont icon-xiangxiajiantou"></text></text>
 				</view>
 			</view>	
-			<view class="register-fiexd clearfix">
+			<view class="register-fiexd clearfix" :style="{bottom:isIphoneX?'40rpx':''}">
 				<view class="register-bet" @tap.stop="hideUpgrade()" v-if="isUpgrade">
 					<text>收起<text class="iconfont icon-xiangshangjiantou"></text></text>
 				</view>
@@ -253,6 +253,7 @@
 					haveBack:true,
 					textLeft:this.$store.state.isIphone
 				},
+				isIphoneX:this.$store.state.isIphone,
 				CustomBar:this.CustomBar,// 顶部导航栏高度
 				userID:'',//协销ID
 				isPreviewImage:false,   	//预览图片开关

seller/pages/order/order-historylist.vue

@@ -528,6 +528,7 @@
 			height: 44rpx;
 			float: left;
 			padding-top: 8rpx;
+			line-height: 44rpx;
 			.bage-buss{
 				display: block;
 				float: left;
@@ -536,10 +537,10 @@
 				background:linear-gradient(132deg,rgba(255,177,0,1) 0%,rgba(255,127,0,1) 100%);
 				border-radius: 6rpx;
 				line-height: 30rpx;
-				font-size: $font-size-24;
+				font-size: $font-size-22;
 				text-align: center;
 				color: #FFFFFF;
-				margin-top: 10rpx;
+				margin-top: 8rpx;
 			}
 			.bage-auto{
 				display: block;
@@ -549,10 +550,10 @@
 				background:linear-gradient(135deg,rgba(0,216,255,1) 0%,rgba(22,139,225,1) 100%);
 				border-radius: 6rpx;
 				line-height: 30rpx;
-				font-size: $font-size-24;
+				font-size: $font-size-22;
 				text-align: center;
 				color: #FFFFFF;
-				margin-top: 10rpx;
+				margin-top: 8rpx;
 			}
 			.bage-text{
 				font-size: $font-size-28;

seller/pages/order/order-list.vue

@@ -586,18 +586,19 @@
 			height: 44rpx;
 			float: left;
 			padding-top: 8rpx;
+			line-height: 44rpx;
 			.bage-buss{
-				display: block;
+				display: inline-block;
 				float: left;
 				width: 64rpx;
 				height: 30rpx;
 				background:linear-gradient(132deg,rgba(255,177,0,1) 0%,rgba(255,127,0,1) 100%);
 				border-radius: 6rpx;
 				line-height: 30rpx;
-				font-size: $font-size-24;
+				font-size: $font-size-22;
 				text-align: center;
 				color: #FFFFFF;
-				margin-top: 10rpx;
+				margin-top: 8rpx;
 			}
 			.bage-auto{
 				display: block;
@@ -607,10 +608,10 @@
 				background:linear-gradient(135deg,rgba(0,216,255,1) 0%,rgba(22,139,225,1) 100%);
 				border-radius: 6rpx;
 				line-height: 30rpx;
-				font-size: $font-size-24;
+				font-size: $font-size-22;
 				text-align: center;
 				color: #FFFFFF;
-				margin-top: 10rpx;
+				margin-top: 8rpx;
 			}
 			.bage-text{
 				font-size: $font-size-28;

seller/pages/search/search-order.vue

@@ -638,6 +638,7 @@
 			height: 44rpx;
 			float: left;
 			padding-top: 8rpx;
+			line-height: 44rpx;
 			.bage-buss{
 				display: block;
 				float: left;
@@ -646,10 +647,10 @@
 				background:linear-gradient(132deg,rgba(255,177,0,1) 0%,rgba(255,127,0,1) 100%);
 				border-radius: 6rpx;
 				line-height: 30rpx;
-				font-size: $font-size-24;
+				font-size: $font-size-22;
 				text-align: center;
 				color: #FFFFFF;
-				margin-top: 10rpx;
+				margin-top: 8rpx;
 			}
 			.bage-auto{
 				display: block;
@@ -659,10 +660,10 @@
 				background:linear-gradient(135deg,rgba(0,216,255,1) 0%,rgba(22,139,225,1) 100%);
 				border-radius: 6rpx;
 				line-height: 30rpx;
-				font-size: $font-size-24;
+				font-size: $font-size-22;
 				text-align: center;
 				color: #FFFFFF;
-				margin-top: 10rpx;
+				margin-top:8rpx;
 			}
 			.bage-text{
 				font-size: $font-size-28;