From 5a9e8516c89afbd66f5cf81efab480f22e45cd8f Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Tue, 14 Jun 2022 10:44:56 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                 | 18 +-----------------
 apis/request.js         |  7 +------
 libs/util.js            |  2 +-
 main.js                 |  1 +
 pages.json              | 12 ++++++------
 pages/index/index.vue   | 27 +++++++++++++++++++++++++--
 pages/login/login.vue   |  1 +
 pages/person/person.vue |  2 +-
 styles/common.scss      |  3 +++
 9 files changed, 40 insertions(+), 33 deletions(-)

diff --git a/App.vue b/App.vue
index 7e91dc0..d996bf2 100644
--- a/App.vue
+++ b/App.vue
@@ -1,23 +1,7 @@
 <script>
-	import { getUserRolesPermissionMenu } from '@/apis/modules/user.js'
 	export default {
 		onLaunch: function() {
-			// 查询当前角色权限
-			uni.getStorageSync('token') && getUserRolesPermissionMenu({
-				platformId: 4
-			}).then(({ permissionMenu }) => {
-				const auth = []
-				const generateAuth = (list, parent) => {
-					list.map(e => {
-						const name = `${parent ? parent + ':' : ''}${e.name}`
-						auth.push(name)
-						generateAuth(e.children, name)
-					})
-				}
-				generateAuth(permissionMenu[0].children, '')
-				console.log(333, auth)
-				uni.setStorageSync('auth', auth)
-			}).catch(e => {})
+			
 		},
 		onShow: function() {
 			
diff --git a/apis/request.js b/apis/request.js
index d20c1c2..0502eb2 100644
--- a/apis/request.js
+++ b/apis/request.js
@@ -29,12 +29,7 @@ const request = options => {
 					resolve(data)
 				} else if (status == 401) {
 					// 登录过期
-					uni.removeStorageSync('token')
-					uni.removeStorageSync('userName')
-					uni.removeStorageSync('avatar')
-					uni.removeStorageSync('sessionKey')
-					uni.removeStorageSync('team')
-					uni.removeStorageSync('auth')
+					uni.clearStorageSync()
 					uni.showToast({
 						title: message,
 						icon: 'none'
diff --git a/libs/util.js b/libs/util.js
index 82c5a0e..516bcca 100644
--- a/libs/util.js
+++ b/libs/util.js
@@ -55,5 +55,5 @@ export default {
 	// 获取商务经理名称
 	getBmName(val) {
 		return uni.getStorageSync('team').partnerClassificationName
-	},
+	}
 }
\ No newline at end of file
diff --git a/main.js b/main.js
index 6461027..a0768de 100644
--- a/main.js
+++ b/main.js
@@ -18,6 +18,7 @@ Vue.prototype.auth = function(text){
 	    const isPermission = auth.includes(text)
 	    return auth.includes(text)
 	}
+	// return true
 }
 
 const app = new Vue({
diff --git a/pages.json b/pages.json
index 826e8d5..1236a81 100644
--- a/pages.json
+++ b/pages.json
@@ -9,26 +9,26 @@
             }
         },
         {
-            "path" : "pages/index/index",
+            "path" : "pages/invite/invite",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                "navigationBarTitleText": "加入团队",
                 "enablePullDownRefresh": false
             }
         },
         {
-            "path" : "pages/qrcode/qrcode",
+            "path" : "pages/index/index",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "邀请加入",
+                "navigationBarTitleText": "",
                 "enablePullDownRefresh": false
             }
         },
         {
-            "path" : "pages/invite/invite",
+            "path" : "pages/qrcode/qrcode",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "加入团队",
+                "navigationBarTitleText": "邀请加入",
                 "enablePullDownRefresh": false
             }
         },
diff --git a/pages/index/index.vue b/pages/index/index.vue
index b4e20c4..f47bbb1 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="page">
+	<view :class="['page', {oh: !per}]">
 		<image class="bg" src="@/static/image/index/index2.png" mode="widthFix"></image>
 		<view class="team">
 			<uni-data-picker class="picker-input" placeholder="切换团队" popup-title="切换团队" preload :clear-icon="false" :localdata="list" :map="{text: 'partnerClassificationName', value: 'teamId'}" v-model="teamId" @change="teamChange"></uni-data-picker>
@@ -103,6 +103,7 @@
 </template>
 
 <script>
+	import { getUserRolesPermissionMenu } from '@/apis/modules/user.js'
 	import { getTeamsByAccountId, getTheBusinessManagerIdsUnderTheTeam } from '@/apis/modules/client.js'
 	import { treeList } from '@/apis/modules/parner.js'
 	export default {
@@ -116,7 +117,7 @@
 			}
 		},
 		onShow() {
-			this.initRole()
+			this.getAuth()
 		},
 		methods: {
 			// 初始化权限
@@ -127,6 +128,25 @@
 					this.getInfo()
 				}
 			},
+			// 查询当前角色权限
+			getAuth() {
+				uni.getStorageSync('token') && getUserRolesPermissionMenu({
+					platformId: 4
+				}).then(({ permissionMenu }) => {
+					const auth = []
+					const generateAuth = (list, parent) => {
+						list.map(e => {
+							const name = `${parent ? parent + ':' : ''}${e.name}`
+							auth.push(name)
+							generateAuth(e.children, name)
+						})
+					}
+					generateAuth(permissionMenu[0].children, '')
+					console.log(333, auth)
+					uni.setStorageSync('auth', auth)
+					this.initRole()
+				}).catch(e => {})
+			},
 			// 获取团队
 			getInfo() {
 				getTeamsByAccountId().then(({ data }) => {
@@ -295,4 +315,7 @@
 		}
 	}
 }
+.oh {
+	overflow: hidden;
+}
 </style>
diff --git a/pages/login/login.vue b/pages/login/login.vue
index c4047e8..be96c60 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -56,6 +56,7 @@
 				if (uni.getStorageSync('token')) {
 					this.toIndex()
 				} else {
+					uni.clearStorageSync()
 					this.isLogin = false
 					this.getPhone = false
 				}
diff --git a/pages/person/person.vue b/pages/person/person.vue
index ca4ff4a..b869512 100644
--- a/pages/person/person.vue
+++ b/pages/person/person.vue
@@ -13,7 +13,7 @@
 				<view v-if="auth('我的:我的收益')" class="item">
 					<view class="left">
 						<image class="icon" src="@/static/image/person1.png" mode=""></image>
-						<text class="name">我的收益</text>
+						<text class="name">我的项目收益</text>
 					</view>
 					<text class="val">{{ my.myIncome}}元</text>
 				</view>
diff --git a/styles/common.scss b/styles/common.scss
index b8e5098..7e6228f 100644
--- a/styles/common.scss
+++ b/styles/common.scss
@@ -176,4 +176,7 @@ ul {
 	font-size: 28rpx;
 	color: #333;
 	background-color: rgba(255, 255, 255, 0.95);
+	-webkit-user-drag: none;
+	-webkit-user-select: none;
+	user-select: none;
 }
\ No newline at end of file