2.7 last

packageA/scan/scanFail.vue

@@ -1,10 +1,10 @@
 <template>
 	<view class="content">
 		<view class="resultBox">
-			<view class="result">暂未录入改商品</view>
-			<view class="text">
+			<view class="result">暂未录入该商品</view>
+			<view class="text flex align-center">
 				扫码结果
-				{{code}}
+				<view style="color: rgba(0,0,0,0.4); margin-left: 10px;">{{code}}</view>
 			</view>
 		</view>
 		
@@ -77,8 +77,9 @@ page{
 			margin-bottom: 15px;
 		}
 		.text{
-			font-size: 42rpx;
-			border-bottom: 1px solid rgba(0,0,0,0.35);
+			padding: 20rpx 0rpx 40rpx;
+			font-size: 38rpx;
+			border-bottom: 1px solid rgba(0,0,0,0.1);
 		}
 	}
 	.buttonBox{

pages/login/login.vue

@@ -94,6 +94,7 @@
 												let that = this
 												setTimeout(function(){
 													if (that.$store.state.url) {
+														console.log(1)
 														let url = that.$store.state.url
 														console.log(url)
 														uni.reLaunch({
@@ -101,11 +102,12 @@
 														})
 														that.$store.commit('removeUrl')
 													} else {
-														uni.navigateTo({
-															url:"../index/index"
+														console.log(2)
+														uni.reLaunch({
+															url: "/pages/index/index"
 														})
 													}
-												},1000)
+												},500)
 											}
 										})
 									}

pages/mobileLogin/mobileLogin.vue

@@ -208,7 +208,7 @@
 											url:"../index/index"
 										})
 									}
-								},1000)
+								},500)
 							}
 						})
 					}else{