From 274ccf59aba658b0ce623a90ef2caa5576939121 Mon Sep 17 00:00:00 2001
From: yxq <y1530857136@qq.com>
Date: Wed, 4 Sep 2024 15:52:20 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 monitorMobile/pages/work/returnBed/index.vue |  2 +-
 monitorMobile/store/index.js                 | 15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/monitorMobile/pages/work/returnBed/index.vue b/monitorMobile/pages/work/returnBed/index.vue
index c2b7cf6..f01e2ee 100644
--- a/monitorMobile/pages/work/returnBed/index.vue
+++ b/monitorMobile/pages/work/returnBed/index.vue
@@ -1,7 +1,7 @@
 <template>
 	<view style="height: 100%;">
 		<view class="searchBox">
-			<selectRadio v-model="search.loudong" :options="[{value:1,label:'男生宿舍1号楼'},{value:2,label:'男生宿舍2号楼'},{value:3,label:'女生宿舍1号楼'},{value:4,label:'女生宿舍2号楼'}]"
+			<selectRadio v-model="search.loudong" :options="this.allOptions.monitorList"
 				title="楼栋" />
 			<selectSearch v-model="search.qinshi" :options="[{value:1,label:'寝室302'},{value:2,label:'寝室305'},{value:3,label:'寝室303'}]"
 				placeholder="请选择寝室" popupTitle="选择寝室" search-placeholder="请输入宿舍号"/>
diff --git a/monitorMobile/store/index.js b/monitorMobile/store/index.js
index 04d8675..99ef8d5 100644
--- a/monitorMobile/store/index.js
+++ b/monitorMobile/store/index.js
@@ -51,6 +51,7 @@ const store = new Vuex.Store({
 		refreshToken: lifeData.refreshToken || '',
 		allOptions: lifeData.allOptions || {
 			monitorList: [], //摄像头列表
+			monitorList:[], //楼栋列表
 		},
 	},
 	actions: {
@@ -71,18 +72,20 @@ const store = new Vuex.Store({
 				name: 'token',
 				value: payload.token
 			})
-			context.commit('$uStore', {
-				name: 'refreshToken',
-				value: payload.refreshToken || ''
-			})
+			if (payload.refreshToken) {
+				context.commit('$uStore', {
+					name: 'refreshToken',
+					value: payload.refreshToken || ''
+				})
+			}
 		},
 		clearToken(context) {
 			context.commit('$uStore', {
 				name: 'token',
 				value: ''
 			})
-			context.commit('refreshToken', {
-				name: 'token',
+			context.commit('$uStore', {
+				name: 'refreshToken',
 				value: ''
 			})
 		},