ソースを参照

退出重新登录

twt 1 年間 前
コミット
0c34b2e7ae
共有5 個のファイルを変更した91 個の追加55 個の削除を含む
  1. 38 38
      pages.json
  2. 2 2
      pages/index/index.vue
  3. 10 11
      pages/index/onlineBooking.vue
  4. 40 3
      pages/user/user.vue
  5. 1 1
      utils/request.js

+ 38 - 38
pages.json

@@ -458,41 +458,41 @@
 				"navigationStyle": "custom",
 				"enablePullDownRefresh": true
 			}
-		},
-		{
-			"path": "pages/user/myAppraise",
-			"style": {
-				"navigationBarTitleText": "我的评价",
-		
-				"enablePullDownRefresh": true
-			}
-		
-		},
-		{
-			"path": "pages/user/myAppraiseDetail",
-			"style": {
-				"navigationBarTitleText": "查看评价"
-		
-				
-			}
-		
-		},
-		{
-			"path": "pages/user/appraise",
-			"style": {
-				"navigationBarTitleText": "评价"
-		
-				
-			}
-		
+		},
+		{
+			"path": "pages/user/myAppraise",
+			"style": {
+				"navigationBarTitleText": "我的评价",
+		
+				"enablePullDownRefresh": true
+			}
+		
+		},
+		{
+			"path": "pages/user/myAppraiseDetail",
+			"style": {
+				"navigationBarTitleText": "查看评价"
+		
+				
+			}
+		
+		},
+		{
+			"path": "pages/user/appraise",
+			"style": {
+				"navigationBarTitleText": "评价"
+		
+				
+			}
+		
 		}
 		    ,{
             "path" : "pages/user/ShopAppraiseList",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "评价列表",
-                "enablePullDownRefresh": true
-            }
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "评价列表",
+                "enablePullDownRefresh": true
+            }
             
         },
 		{
@@ -573,31 +573,31 @@
 	
 		"tabBar": {
 			"color": "#8a8a8a",
-			"selectedColor": "#1677FF",
+			"selectedColor": "#D53533",
 			"borderStyle": "black",
 			"backgroundColor": "#ffffff",
 			"list": [{
 					"pagePath": "pages/index/index",
 					"iconPath": "./static/tabimg/index2.png",
-					"selectedIconPath": "./static/tabimg/index1677FF.png",
+					"selectedIconPath": "./static/tabimg/index1.png",
 					"text": "首页"
 				},
 				{
 					"pagePath": "pages/shop/shop",
 					"iconPath": "./static/tabimg/shop2.png",
-					"selectedIconPath": "./static/tabimg/shop1677FF.png",
+					"selectedIconPath": "./static/tabimg/shop1.png",
 					"text": "商城"
 				},
 				{
 					"pagePath": "pages/activity/activity",
 					"iconPath": "./static/tabimg/activty2.png",
-					"selectedIconPath": "./static/tabimg/activty1677FF.png",
+					"selectedIconPath": "./static/tabimg/activity1.png",
 					"text": "活动"
 				},
 				{
 					"pagePath": "pages/user/user",
 					"iconPath": "./static/tabimg/me2.png",
-					"selectedIconPath": "./static/tabimg/me1677FF.png",
+					"selectedIconPath": "./static/tabimg/me1.png",
 					"text": "我的"
 				}
 
@@ -610,4 +610,4 @@
 			"backgroundColor": "#F8F8F8"
 		},
 		"uniIdRouter": {}
-	}
+	}

+ 2 - 2
pages/index/index.vue

@@ -282,7 +282,7 @@
 				InsuranceExpireDate:'',
 				NextCareDate:'',
 				NextAuditDate:'',
-				themeColor:'1677FF',
+				themeColor:'',
 				getwxLoing:false,
 				shareID:'',
 				discount:'',
@@ -736,7 +736,7 @@
 						data: that.themeColor,
 						 success: function () {
 						    // that.uniLogin()
-						 
+						    console.log("themeColor=="+that.themeColor)
 						 }
 					}); 
 					if(this.wxOpenData.loginInfo){

+ 10 - 11
pages/index/onlineBooking.vue

@@ -656,16 +656,16 @@
 
 	.yrTop {
 		display: flex;
-		justify-content: space-between;
+		justify-content: space-between;
 		align-items: center;
 	}
 
 	.ItemName {
 		color: #3C3C3C;
 		font-size: 28rpx;
-		width: 480rpx;
-		font-weight: bold;
-		margin-top: 20rpx;
+		width: 480rpx;
+		font-weight: bold;
+		margin-top: 20rpx;
 		margin-bottom: 10rpx;
 	}
 
@@ -855,12 +855,12 @@
 		color: #FF3B30;
 		font-size: 32rpx;
 	}
-	.appraiseBg{
-		display: flex;
-		align-items: center;
+	.appraiseBg{
+		display: flex;
+		align-items: center;
 	}
 	.appraiseBox {
-		padding: 5rpx 20rpx;
+		padding: 5rpx 20rpx;
 		padding-right: 30rpx;
 		margin-top: 10rpx;
 		height: 62rpx;
@@ -952,8 +952,7 @@
 	.authorizContbutton{
 		width: 422rpx;
 		height: 88rpx;
-		/* background: #D53533; */
-		background: #1677FF;
+		background: #D53533;
 		border-radius: 44rpx;
 		line-height: 88rpx;
 		text-align: center;
@@ -962,4 +961,4 @@
 		margin-top: 62rpx;
 		margin-left:71rpx;
 	}
-</style>
+</style>

+ 40 - 3
pages/user/user.vue

@@ -350,6 +350,10 @@
 			</view> -->
 
 		</view>
+		<view class="rowBoxBg">
+			<view class="exit" @click="exit">退出登录</view>
+		</view>
+		
 		<view class="releaseVersion">版本号:{{release_version}}</view>
 
 		<!-- <view class="signOut" @click="signOut">退出登录</view> -->
@@ -402,7 +406,7 @@
 				nickName: '',
 				phone: '',
 				ext: '',
-				themeColor: '1677FF',
+				themeColor: '',
 				release_version: '',
 				qrimg:'',
 				qrSHow:false,
@@ -418,6 +422,7 @@
 
 			this.ext = this.$common.getExtStoreId();
 			this.themeColor = uni.getStorageSync("themeColor");
+			console.log("themeColor=="+this.themeColor)
 			if (this.themeColor) {
 				if (this.themeColor == '6F2BE8') {
 					var backgroundImage = '/static/tabimg/me6F2BE8.png'
@@ -460,17 +465,39 @@
 				this.queryMyDetail();
 			} else {
 				//console.log("授权")
-				//this.authorizShow = true;
+				this.authorizShow = true;
 			}
 			if (wxOpenData) {
 
 				this.uid = wxOpenData.loginInfo.uid;
 			}
-			
+			//this.themeColor = uni.getStorageSync("themeColor");
 
 
 		},
 		methods: {
+			exit(){
+				var that=this;
+				uni.showModal({
+				  title: '提示',
+				  content: '是否退出登录',
+				  success(res) {
+				    if (res.confirm) {
+						uni.clearStorageSync()
+						that.$store.commit('mutationsuserInfo', '')
+						that.$http('miniApp2/sys/logout', {
+							
+						}, 'GET').then(res => {
+						  uni.reLaunch({
+						  	 url: '../index/index'
+						  });
+						})
+						 
+				    }
+				  }
+				});
+				
+			},
 			makePhoneCall(tel){
 				uni.makePhoneCall({
 				  phoneNumber: tel,
@@ -740,6 +767,16 @@
 </script>
 
 <style scoped>
+.exit{
+	background: #FFFFFF;
+	line-height: 100rpx;
+	margin-top: 20rpx;
+	font-size: 28rpx;
+	font-family: PingFang;
+	font-weight: 500;
+	color: #ED2323;
+	text-align: center;
+}
 .cardNameIcon{
 	width: 30rpx;height: 30rpx;
 }

+ 1 - 1
utils/request.js

@@ -53,7 +53,7 @@ const http = (url = '', date = {}, type = 'POST', header = {
 				//  	 icon:'none',
 				//      duration: 3000,
 				//  });
-				 uni.clearStorageSync()
+				// uni.clearStorageSync()
 				//  uni.navigateTo({
 				// 	url:'../login/login'
 				// })