From de72340de56d521371ec7e35f0f3f849be43d9c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9DRain=E2=80=9C?= <904416525@qq.com>
Date: Wed, 22 May 2024 22:52:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=A5=E8=AD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/levitatedsphere/levitatedsphere.vue | 6 ++++--
 main.js                                        | 4 ++--
 pages/login/compatibleLogin.vue                | 1 +
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/components/levitatedsphere/levitatedsphere.vue b/components/levitatedsphere/levitatedsphere.vue
index a85df224..2d842aa6 100644
--- a/components/levitatedsphere/levitatedsphere.vue
+++ b/components/levitatedsphere/levitatedsphere.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="holdon">
+	<view class="holdon" v-if="accountType == 6">
 		<image class="ball" @click="goNavigateTo()"
 			:style="'left:'+(moveX == 0 & x>0? x+'%':moveX+'px')+';top:'+(moveY == 0 & y>0? y+'%':moveY+'px')+';transform: translate(-'+(x+'%') +',-' +(y+'%') +');'"
 			@touchstart="drag_start" @touchmove.prevent="drag_hmove" src="@/static/rescue-phone.png" mode="aspectFit">
@@ -46,6 +46,7 @@
 					longitude: "",
 					latitude: "",
 				},
+				accountType:'',
 			}
 		},
 		mounted() {
@@ -56,7 +57,8 @@
 			this.windowWidth = windowWidth
 			this.windowHeight = windowHeight
 			this.projectSn = JSON.parse(uni.getStorageSync('userInfo')).sn;
-			this.workerInfoId = JSON.parse(uni.getStorageSync('userInfo')).userId;
+			this.workerInfoId = JSON.parse(uni.getStorageSync('userInfo')).workerId;
+			this.accountType = JSON.parse(uni.getStorageSync('userInfo')).accountType;
 			console.log(JSON.parse(uni.getStorageSync('userInfo')));
 		},
 		methods: {
diff --git a/main.js b/main.js
index dfe20678..f1279b52 100644
--- a/main.js
+++ b/main.js
@@ -41,8 +41,8 @@ if (process.env.NODE_ENV === 'development') {
 	// Vue.prototype.url_config = 'http://182.90.224.237:51234/' //雄哥内网穿透地址
 	// Vue.prototype.url_config = 'http://jxj.zhgdyun.com:61212/' //杰哥内网穿透地址
 	// Vue.prototype.url_config = ' http://192.168.34.221:28888/' //郭圣雄本地
-	// Vue.prototype.url_config = 'http://192.168.34.221:9111/' //郭圣雄本地
-	Vue.prototype.url_config = 'http://192.168.34.155:19111/' //彭洁本地
+	Vue.prototype.url_config = 'http://192.168.34.221:9111/' //郭圣雄本地
+	// Vue.prototype.url_config = 'http://192.168.34.155:19111/' //彭洁本地
 	// Vue.prototype.work_url = 'http://47.93.215.234:19997' // 工作流线上地址（弃用）
 	// Vue.prototype.work_url = 'http://42.180.188.17:19997' // 工作流线上地址
 	// Vue.prototype.work_url = 'http://42.180.188.17:19097' // 工作流测试地址
diff --git a/pages/login/compatibleLogin.vue b/pages/login/compatibleLogin.vue
index b0e498a2..57e7abc3 100644
--- a/pages/login/compatibleLogin.vue
+++ b/pages/login/compatibleLogin.vue
@@ -148,6 +148,7 @@
 								let {
 									accountType
 								} = res.result;
+					
 								if (accountType == 5 || accountType == 6 || accountType == 10) {
 									if (this.type == "user") {
 										// 用户端