From 7c3218e12105b87cab21e9ced57c99c339ffac10 Mon Sep 17 00:00:00 2001
From: 付延余 <f-yanyu@outlook.com>
Date: 星期二, 26 七月 2022 08:51:58 +0800
Subject: [PATCH] tatolpage

---
 components/common/popup-menu/popup-menu.vue |   82 ++++++++++++-----------------------------
 1 files changed, 24 insertions(+), 58 deletions(-)

diff --git a/components/common/popup-menu/popup-menu.vue b/components/common/popup-menu/popup-menu.vue
index 6ac376e..716cd4f 100644
--- a/components/common/popup-menu/popup-menu.vue
+++ b/components/common/popup-menu/popup-menu.vue
@@ -10,7 +10,8 @@
 				   <image src="@/static/menuIcon/menu-home.png" slot="icon" size="32" name="search"/>
 				</u-cell>
 				<u-cell
-				    v-if="shenqingMenu"
+				    v-if="$store.state.shenqingMenu"
+					v-cloak
 				    title="鎴戠殑鐢宠"
 				    isLink
 				    url="/pages/my-application/my-application"
@@ -32,12 +33,13 @@
 				    <image src="@/static/menuIcon/menu-havedo.png" slot="icon" size="32" name="search"/>
 				</u-cell>
 				<u-cell
-				   v-if="rijihuaMenu"
+				   v-if="$store.state.rijihuaMenu"
+				   v-cloak
 				    title="鏃ュ彂杩愯鍒�"
 				    isLink
 				    url="/pages/jihua/jihua" style="color:blue"
 				>
-				    <image src="@/static/menuIcon/menu-home.png" slot="icon" size="32" name="search"/>
+				    <image src="@/static/menuIcon/menu-shipment.png" slot="icon" size="32" name="search"/>
 				</u-cell>
 			</u-cell-group>
 			<u-button text="閫�鍑�" type="primary" @click="menuPopupClick"></u-button>
@@ -63,70 +65,19 @@
 	// },
 	data() {
 		return {
-			menuShow:false,
-			rijihuaMenu:false,
-			shenqingMenu:false,
+			menuShow:false
 		};
 	},
 	onShow() {
-		alert(111)
+		alert(111);
 	},
 	methods: {
-		checkRijihua(data) {
-			let labelArry = []
-			let newObj = data.filter(e => e.label == '鍦伴攢璁¢噺')
-			newObj && newObj.forEach(e => {
-				if(e.children.length > 0) {
-					e.children.forEach(item => {
-						labelArry.push(item.label)
-					})
-				}else{
-					this.rijihuaMenu = false
-				}
-			})
-			if(labelArry.indexOf('姹借溅鏃ュ彂杩愯鍒掔鐞�') > -1) {
-				this.rijihuaMenu = true
-			}else {
-				this.rijihuaMenu = false
-			}
-		},
-		checkShenqing(data) {
-			let labelArry = []
-			let newObj = data.filter(e => e.label == '宸ヤ綔瀹℃壒')
-			newObj && newObj.forEach(e => {
-				if(e.children.length > 0) {
-					e.children.forEach(item => {
-						labelArry.push(item.label)
-					})
-				}else{
-					this.shenqingMenu = false
-				}
-			})
-			if(labelArry.indexOf('鎴戠殑鐢宠') > -1) {
-				this.shenqingMenu = true
-			}else {
-				this.shenqingMenu = false
-			}
-		},
-		menu() {
-			// 鏉冮檺鍒ゆ柇
-			this.$reqGet('menu').then(res => {
-				if(res.data == null) {
-					this.rijihuaMenu = false
-					this.shenqingMenu = false
-				}else {
-					this.checkRijihua(res.data)
-					this.checkShenqing(res.data)
-				}
-			})
-		},
 		menuClick(){
 			this.menuShow = !this.menuShow
 			this.$emit('menuShow',this.menuShow)
 		},
 		open() {
-			console.log('open');
-			this.menu()
+			console.log(this.$store.state,'shenqingMenu====')
 		},
 		close() {
 			this.menuShow = false;
@@ -134,7 +85,22 @@
 		},
 		menuPopupClick(){
 			this.menuShow = false;
-			redirectLogin();
+			uni.request({
+				url:'/auth/token/logout',
+				method:'DELETE',
+				header:{
+					'TENANT-ID': 5,
+					Authorization: 'Bearer ' + uni.getStorageSync('access_token'),
+					VERSION: 'zzl'
+				}
+			}).then(res=>{
+			 redirectLogin();
+				
+			}).catch(err=>{
+				uni.showToast({
+					title:'閫�鍑哄け璐ワ紒',
+				})
+			})
 		}
 	}
 };

--
Gitblit v1.9.1