From 49120a2e1f9c8ada98f95b58b95fa079d4689683 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AF=85?= <1335909236@qq.com>
Date: Thu, 18 Sep 2025 10:20:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=A9=E4=B8=9A=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E9=83=A8=E5=88=86=E5=85=B3=E4=BA=8E=E5=B0=8F=E5=8C=BA?=
 =?UTF-8?q?=E7=9A=84=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/shop/groupPurchase/index.vue         |  2 +-
 packages/workOrderDashboard/guide/index.vue   | 48 +++++++++++++++----
 .../workOrderDashboard/myCommunity/index.vue  |  9 +---
 3 files changed, 42 insertions(+), 17 deletions(-)

diff --git a/packages/shop/groupPurchase/index.vue b/packages/shop/groupPurchase/index.vue
index 246444ad..aa7d9558 100644
--- a/packages/shop/groupPurchase/index.vue
+++ b/packages/shop/groupPurchase/index.vue
@@ -1,4 +1,4 @@
-m<template>
+<template>
     <view class="group-purchase-container">
         <!-- 顶部横幅 -->
         <view class="banner">
diff --git a/packages/workOrderDashboard/guide/index.vue b/packages/workOrderDashboard/guide/index.vue
index 7d44febd..35bf2caf 100644
--- a/packages/workOrderDashboard/guide/index.vue
+++ b/packages/workOrderDashboard/guide/index.vue
@@ -39,22 +39,43 @@ import { apiArr } from "../../../api/community";
 export default {
     data() {
         return {
-            communityVal: "添加我的房产",
-            showWorkOrderSection: false
+            communityVal: "切换小区",
+            showWorkOrderSection: false,
+            communityList: []
         }
     },
-    onLoad() {
+    async onLoad() {
         const workOrderPermission = uni.getStorageSync('work_order_permission');
         const orderDispatchPermission = uni.getStorageSync('order_dispatch_permission');
         this.showWorkOrderSection = !(workOrderPermission === false && orderDispatchPermission === false);
+        
+        // 获取小区列表并设置默认选中第一个
+        await request(apiArr.workCommunityList, "POST", {
+            user_id: uni.getStorageSync('userId'),
+        }).then(res => {
+            res.rows.forEach(item => {
+                item.pic = item.pic.startsWith('http') ? item.pic : picUrl + item.pic
+            });
+            this.communityList = res.rows;
+            
+            // 如果没有选中的小区且有小区列表，则默认选中第一个
+            if (!uni.getStorageSync('changeWorkOrderData') && res.rows.length > 0) {
+                uni.setStorageSync('changeWorkOrderData', { id: res.rows[0].community_id, name: res.rows[0].name });
+                this.communityVal = res.rows[0].name;
+            }
+        });
     },
     async onShow() {
-        this.communityVal = uni.getStorageSync('changeCommData').name;
-        const params = {
-            community_id: uni.getStorageSync('changeCommData').id,
+        const changeCommData = uni.getStorageSync('changeWorkOrderData');
+        this.communityVal = changeCommData ? changeCommData.name : "切换小区";
+        
+        if (changeCommData) {
+            const params = {
+                community_id: changeCommData.id,
+            }
+            const res = await request(apiArr.communityInfo, "POST", params);
+            uni.setStorageSync('allow_grab_order', res.allow_grab_order == 1 ? true : false);
         }
-        const res = await request(apiArr.communityInfo, "POST", params);
-        uni.setStorageSync('allow_grab_order', res.allow_grab_order == 1 ? true : false);
     },
     methods: {
         addCommunity() {
@@ -63,8 +84,17 @@ export default {
 
         // 跳转到工单台
         navigateToWorkOrderDashboard() {
+            const changeCommData = uni.getStorageSync('changeWorkOrderData');
+            if (!changeCommData) {
+                uni.showToast({
+                    title: '请先选择小区',
+                    icon: 'none'
+                });
+                return;
+            }
+            
             uni.navigateTo({
-                url: '/packages/workOrderDashboard/index/index?communityId=' + uni.getStorageSync('changeCommData').id
+                url: '/packages/workOrderDashboard/index/index?communityId=' + changeCommData.id
             });
         }
     }
diff --git a/packages/workOrderDashboard/myCommunity/index.vue b/packages/workOrderDashboard/myCommunity/index.vue
index a478b6a3..d2c425e3 100644
--- a/packages/workOrderDashboard/myCommunity/index.vue
+++ b/packages/workOrderDashboard/myCommunity/index.vue
@@ -65,24 +65,19 @@ export default {
 				this.communityList = res.rows
 			})
 		},
-		// toUpview(item) {
-		// 	uni.setStorageSync('changeCommData', { id: item.community_id, name: item.name });
-		// 	NavgateTo("/packages/community/index/index")
-		// },
 
 		choseCommunity(e) {
 			this.currentCommunity = e
-			uni.setStorageSync('changeCommData', { id: e.community_id, name: e.name });
+			uni.setStorageSync('changeWorkOrderData', { id: e.community_id, name: e.name });
 			uni.setStorageSync('currentCommunityAddr',e.addr);
 			NavgateTo("1")
 		},
 	},
 
 	onLoad(options) {
-		this.currentCommunity = uni.getStorageSync('changeCommData')
+		this.currentCommunity = uni.getStorageSync('changeWorkOrderData')
 		console.log(this.currentCommunity, 'currentCommunity');
 		this.getList();
-
 	},
 
 	onReachBottom() { },