Merge remote-tracking branch 'origin/master'

pages/Detain/Detain.vue

@@ -3,7 +3,7 @@
 <template>
 	<view class="content">
 		<view style="background: #317dfa">
-			<VNavigationBar title="扣车"></VNavigationBar>
+			<VNavigationBar title="扣车管理"></VNavigationBar>
 			<view class="search-box">
 				<view class="s-input">
 					<uni-icons type="search" color=" #999999" size="16"></uni-icons>
@@ -196,7 +196,7 @@
 					}
 				}).then((res) => {
 					if (res.code == 200) {
-						this.one = res.total
+						this.one = res.total || 0
 					}
 				})
 				request({
@@ -210,7 +210,7 @@
 					}
 				}).then((res) => {
 					if (res.code == 200) {
-						this.two = res.total
+						this.two = res.total || 0
 					}
 
 				})
@@ -397,7 +397,7 @@
 	}
 
 	.tap-box {
-		width: 33%;
+		width: 50%;
 		font-size: 15px;
 		font-weight: 400;
 		color: #ffffff;
@@ -698,4 +698,4 @@
 		margin: 100px auto;
 
 	}
-</style>
+</style>

pages/login/login.vue

@@ -140,7 +140,7 @@
 				}
 			},
 		},
-    created(){
+    mounted(){
       getTenantIdByWebsite(this.tenantCode).then(res => {
         const tenantId = res.data;
         if (tenantId && tenantId >= 0) {

pages/my/carlist.vue

@@ -174,7 +174,7 @@
 				}).then((res) => {
 
 					if (res.code == 200) {
-						this.one = res.total
+						this.one = res.total || 0
 					}
 
 				})
@@ -190,7 +190,7 @@
 				}).then((res) => {
 
 					if (res.code == 200) {
-						this.two = res.total
+						this.two = res.total || 0
 					}
 
 				})
@@ -206,7 +206,7 @@
 				}).then((res) => {
 
 					if (res.code == 200) {
-						this.three = res.total
+						this.three = res.total || 0
 					}
 
 				})

pages/my/my.vue

@@ -380,9 +380,15 @@
 				})
 			},
 			gocarlist() {
-				uni.navigateTo({
-					url: '/pages/my/carlist'
-				})
+        if(this.role === 'user'){
+          uni.navigateTo({
+            url: '/pages/my/carlist'
+          })
+        }else {
+          uni.navigateTo({
+            url: '/pages/Detain/Detain'
+          })
+        }
 			},
 			goshang() {
 				uni.navigateTo({
@@ -531,7 +537,7 @@
 	.content {
 		width: 100%;
 		height: calc(100vh);
-		background-size: 100% 100%;
+    background: #F6F7FC;
 		box-sizing: border-box;
 	}
 

pages/rescue/trafficPolice.vue

@@ -236,7 +236,7 @@
 			// #endif
 		},
 		onShow() {
-			this.Fourhammers()
+			//this.Fourhammers()
 			this.timeWeekFormat()
 			this.getsjlist()
 			this.getlist()
@@ -969,4 +969,4 @@
 	#y5 {
 		background-image: url('../../static/kc.png');
 	}
-</style>
+</style>