检查时间

components/tabbar.vue

@@ -71,7 +71,7 @@
 				console.log("item", item)
 				console.log("index", index)
 				let url = item.pagePath;
-				uni.redirectTo({
+				uni.switchTab({
 					url
 				})
 

config.js

@@ -4,7 +4,7 @@ const domain = 'https://fx.anxincloud.cn';
 const devApi = 'https://121.36.37.70:8204';
 const devDomain = 'https://121.36.37.70:8204';
 
-const online = false; //是否线上模式
+const online = true; //是否线上模式
 
 export default {
   domain: online ? domain : devDomain,

libs/auth.js

@@ -19,9 +19,13 @@ const login = {
 	getLocalUserInfo() {
 		const user = uni.getStorageSync("token");
 		console.log('从本地存储中获取用户数据', user, 11111111);
+		if(user){
+			request.getToken()
+		}
 		if (!user) return false;
 		if (!user.token) return false;
 		store.commit('saveToken', user);
+		
 		return true
 	},
 

pages/rescue/taskapply.vue

@@ -478,7 +478,7 @@
 						this.nub += 1
 					}
 				}
-				this.opts.subtitle.name = this.nub
+				this.opts.subtitle.name = JSON.stringify(this.nub)
 				this.index3 = true
 			},
 			dateYear(e) {

pages/rescue/taskreceive.vue

@@ -485,7 +485,7 @@
 						this.nub += 1
 					}
 				}
-				this.opts.subtitle.name = this.nub
+				this.opts.subtitle.name = JSON.stringify(this.nub)
 				
 			},
 			dateYear(e) {

pages/tabbar/index.vue

@@ -1,7 +1,15 @@
 <template>
+	<view class="">
+		<view class="">
 			<Dindex v-if="shenfen=='battalion'&&!isSupervisor"></Dindex>
-	<Zindex v-else-if="shenfen=='brigade'"></Zindex>
-	<Jindex v-else></Jindex>
+		</view>
+		<view class="">
+			<Zindex v-if="shenfen=='brigade'"></Zindex>
+		</view>
+		<view class="">
+			<Jindex v-if="shenfen=='squadron'||isSupervisor"></Jindex>
+		</view>
+	</view>
 	
 </template>
 

pages/tabbar/tow.vue

@@ -1,7 +1,15 @@
 <template>
+		<view class="">
+			<view class="">
 				<Dtask v-if="shenfen=='battalion'&&!isSupervisor"></Dtask>
-		<Ztask v-else-if="shenfen=='brigade'"></Ztask>
-		<Jtask v-else></Jtask>
+			</view>
+			<view class="">
+				<Ztask v-if="shenfen=='brigade'"></Ztask>
+			</view>
+			<view class="">
+				<Jtask v-if="shenfen=='squadron'||isSupervisor"></Jtask>
+			</view>
+		</view>
 
 </template>
 
@@ -21,7 +29,7 @@
 				isSupervisor: false
 			}
 		},
-		onLoad() {
+		onShow() {
 			let roles = uni.getStorageSync("user").roles
 			let isSupervisor = roles.find(item => {
 				return item.name.indexOf('检查') != -1

pages/tabbar/user.vue

@@ -41,7 +41,7 @@
 				list: {}
 			}
 		},
-		onLoad() {
+		onShow() {
 			this.list = uni.getStorageSync("user")
 			console.log(this.list);
 		},