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 |   47 +++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/components/common/popup-menu/popup-menu.vue b/components/common/popup-menu/popup-menu.vue
index 6091533..716cd4f 100644
--- a/components/common/popup-menu/popup-menu.vue
+++ b/components/common/popup-menu/popup-menu.vue
@@ -7,23 +7,40 @@
 				    isLink
 				    url="/pages/home/home" style="color:blue"
 				>
-				<image src="@/static/menuIcon/menu-home.png" slot="icon" size="32" name="search"/></u-cell>
+				   <image src="@/static/menuIcon/menu-home.png" slot="icon" size="32" name="search"/>
+				</u-cell>
 				<u-cell
+				    v-if="$store.state.shenqingMenu"
+					v-cloak
 				    title="鎴戠殑鐢宠"
 				    isLink
 				    url="/pages/my-application/my-application"
 				>
-				<image src="@/static/menuIcon/menu-application.png" slot="icon" size="32" name="search"/></u-cell></u-cell>
+				     <image src="@/static/menuIcon/menu-application.png" slot="icon" size="32" name="search"/>
+				</u-cell>
 				<u-cell
 				    title="鎴戠殑寰呭姙"
 				    isLink
 				    url="/pages/my-todo/my-todo"
-				>				<image src="@/static/menuIcon/menu-todo.png" slot="icon" size="32" name="search"/></u-cell></u-cell>
+				>				
+				    <image src="@/static/menuIcon/menu-todo.png" slot="icon" size="32" name="search"/>
+				</u-cell>
 				<u-cell
 				    title="鎴戠殑宸插姙"
 				    isLink
 				    url="/pages/my-have-todo/my-have-todo"
-				>				<image src="@/static/menuIcon/menu-havedo.png" slot="icon" size="32" name="search"/></u-cell></u-cell>
+				>				
+				    <image src="@/static/menuIcon/menu-havedo.png" slot="icon" size="32" name="search"/>
+				</u-cell>
+				<u-cell
+				   v-if="$store.state.rijihuaMenu"
+				   v-cloak
+				    title="鏃ュ彂杩愯鍒�"
+				    isLink
+				    url="/pages/jihua/jihua" style="color:blue"
+				>
+				    <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>
 		</u-popup>
@@ -51,13 +68,16 @@
 			menuShow:false
 		};
 	},
+	onShow() {
+		alert(111);
+	},
 	methods: {
 		menuClick(){
 			this.menuShow = !this.menuShow
 			this.$emit('menuShow',this.menuShow)
 		},
 		open() {
-			console.log('open');
+			console.log(this.$store.state,'shenqingMenu====')
 		},
 		close() {
 			this.menuShow = false;
@@ -65,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