Merge branch 'test' of git.echepei.com:sailun/sailun-tbr-web into test

pages/home/Scan-code-out/index.vue

@@ -44,9 +44,6 @@
 					</view>
 				</view>
 			</view>
-			<view class="content-four">
-				注：请完善请完善请完善请完善请完善请完善请完善
-			</view>
 		</view>
 		<u-toast ref="repeat" position="bottom" />
 		<view class="tail" @click="location">
@@ -111,6 +108,14 @@
 			},
 			Submit() {
 				this.show = true;
+				let data = {
+						storeId:this.$store.state.storeInfo.storeId,
+						userId:this.$store.state.storeInfo.userId,
+						scanAddress: this.whole.address, //地址
+						longitude: this.whole.degree.x,
+						latitude: this.whole.degree.y,
+						materialList: this.datalist
+					}
 				request({
 					url: '/storeScan/storeScanOutTyres',
 					method: 'Post',

pages/home/index.vue

@@ -42,7 +42,7 @@
 		<!-- <u-tabbar v-model="current" :list="list"></u-tabbar> -->
 		<u-skeleton :loading="loading" :animation="true"></u-skeleton>
 		<u-toast ref="ulogin" />
-		<luo-version-upgrade v-if="show_s == true" version="1.0.1" :url="url" :is_force="is_force" :describe="Copywriting"></luo-version-upgrade>
+		<luo-version-upgrade v-if="show_s == true" :url="url" :is_force="is_force" :describe="Copywriting"></luo-version-upgrade>
 	</view>
 </template>
 

pages/home/scancode/scancodeout.vue

@@ -292,7 +292,7 @@
 								}
 								if (res.data.code == 520) {
 									
-									let name = 'notallow'
+									let name = 'repeat-out'
 									this.tipss(res, name)
 									return
 								}
@@ -485,6 +485,12 @@
 								this.tipss(res, name)
 								return
 							}
+							if (res.data.code == 520) {
+								
+								let name = 'repeat-out'
+								this.tipss(res, name)
+								return
+							}
 							if (res.data.code == 500) {
 								
 								let name = 'error'