mxl

pages/login/login.vue

@@ -51,7 +51,7 @@
 		
 		
 		
 		
 		<view class="btn-row">
 		<view class="btn-row">
-			<button  type="primary" class="primary btn-login" @click="login">登录</button>
+			<button style="background:#d81e06!important;"  type="primary" class="primary btn-login" @click="login">登录</button>
 		</view>
 		</view>
 		
 		
 		
 		
@@ -465,13 +465,11 @@
 
 
 			// }
 			// }
 		},
 		},
-		onReady() {
-			this.initPosition();
-			this.initProvider();
-			// #ifdef MP-WEIXIN
-			this.isDevtools = uni.getSystemInfoSync().platform === 'devtools';
-			// #endif
-		}
+		// onReady() {
+		// 	this.initPosition();
+		// 	this.initProvider();
+		// 	this.isDevtools = uni.getSystemInfoSync().platform === 'devtools';
+		// }
 	}
 	}
 </script>
 </script>
 
 

pages/main/main.vue

@@ -56,7 +56,6 @@
 					/**
 					/**
 					 * 如果需要强制登录，不显示取消按钮
 					 * 如果需要强制登录，不显示取消按钮
 					 */
 					 */
-					showCancel: !this.forcedLogin,
 					success: (res) => {
 					success: (res) => {
 						if (res.confirm) {
 						if (res.confirm) {
 							/**
 							/**

pages/service-apl-history/service-apl-history.vue

@@ -137,16 +137,7 @@
 								item.applyResult = '已拒绝';
 								item.applyResult = '已拒绝';
 							};
 							};
 							var disableCategory = this.disableCategory;
 							var disableCategory = this.disableCategory;
-							// for(var i=0;i<disableCategory.length;i++){
-							// 	if(disableCategory[i].id==item.disableCategory){
-							// 		item.disableCategoryName=disableCategory[i].name
-							// 	}
-							// }
-							// for(var j=0;j<this.disableLevel.length;j++){
-							// 	if(this.disableLevel[j].id==item.disableLevel){
-							// 		item.disableLevelName=this.disableLevel[j].name
-							// 	}
-							// }
+					
 						});
 						});
 
 
 						if (this.page > 1) {
 						if (this.page > 1) {

pages/user/user.vue

 <template>
 <template>
 	<view class="">
 	<view class="">
 		<view class="center">
 		<view class="center">
-			<view class="logo" @click="bindLogin" :hover-class="!hasLogin ? 'logo-hover' : ''">
+			<view class="logo" @click="bindLogin" :hover-class="!token ? 'logo-hover' : ''">
 				<!-- <image class="logo-img" :src="token ? userinfo.avatar : avatarUrl"></image> -->
 				<!-- <image class="logo-img" :src="token ? userinfo.avatar : avatarUrl"></image> -->
 				<image class="logo-img" :src="avatarUrl"></image>
 				<image class="logo-img" :src="avatarUrl"></image>
 				<view class="logo-title">
 				<view class="logo-title">
@@ -9,6 +9,7 @@
 					<text class="go-login navigat-arrow" v-if="!token">&#xe65e;</text>
 					<text class="go-login navigat-arrow" v-if="!token">&#xe65e;</text>
 				</view>
 				</view>
 			</view>
 			</view>
+			{{user.name}}
 
 
 			<!-- <view class="center-list" v-for="item in navList" :key="item.id">
 			<!-- <view class="center-list" v-for="item in navList" :key="item.id">
 				<view class="center-list-item border-bottom" v-for="item2 in item.barList" :key="item2.id" @click="goDetailPage(item2)">
 				<view class="center-list-item border-bottom" v-for="item2 in item.barList" :key="item2.id" @click="goDetailPage(item2)">
@@ -111,6 +112,7 @@
 			var token=uni.getStorageSync('token');
 			var token=uni.getStorageSync('token');
 			var user=uni.getStorageSync('user');
 			var user=uni.getStorageSync('user');
 			console.log('token:',token);
 			console.log('token:',token);
+			console.log('user:',user);
 			this.user=user;
 			this.user=user;
 			this.token=token;
 			this.token=token;
 		},
 		},