From 616b8d997af78847c1b606c5da9445b5979af225 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Sat, 3 Aug 2024 07:42:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=9A=E4=B8=BB=E7=AB=AF?=
 =?UTF-8?q?=E6=AC=A0=E8=B4=B9=E7=82=B9=E5=87=BB=E6=97=A0=E6=B3=95=E6=9F=A5?=
 =?UTF-8?q?=E5=88=B0=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/my/my-menu.vue       |  4 ++--
 conf/config.js                  |  4 ++--
 pages.json                      | 12 ++++++------
 pages/homemaking/homemaking.vue |  2 --
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/components/my/my-menu.vue b/components/my/my-menu.vue
index 7b98f13..835a39a 100644
--- a/components/my/my-menu.vue
+++ b/components/my/my-menu.vue
@@ -11,7 +11,7 @@
 				</view>
 			</view>
 		</view>
-		<!-- #ifdef H5 && WUYE -->
+
 		<view class="order_box">
 			<view class="order_title">我的订单</view>
 			<view class="order_list">
@@ -23,7 +23,7 @@
 				</view>
 			</view>
 		</view>
-		<!-- #endif -->
+
 		<auth-owner-dialog ref="authOwnerDialogRef"></auth-owner-dialog>
 	</view>
 </template>
diff --git a/conf/config.js b/conf/config.js
index 6a08e2f..3043454 100644
--- a/conf/config.js
+++ b/conf/config.js
@@ -18,7 +18,7 @@ const baseUrl = '/';
 const baseUrl = 'http://127.0.0.1:8008/';
 // #endif
 
-let commonBaseUrl = 'http://127.0.0.1:3000/';
+let commonBaseUrl = 'http://demo.homecommunity.cn/';
 
 //商城的url
 let mallUrl = 'http://mallapp.homecommunity.cn/';
@@ -43,7 +43,7 @@ let systemName="业主版";
 
 if(_systemConfig){
 	mallUrl = _systemConfig.mallUrl;
-	//commonBaseUrl = _systemConfig.imgUrl;
+	commonBaseUrl = _systemConfig.imgUrl;
 	systemName = _systemConfig.ownerTitle;
 	DEFAULT_COMMUNITY_ID = _systemConfig.defaultCommunityId;
 }
diff --git a/pages.json b/pages.json
index 86d8931..4e70942 100644
--- a/pages.json
+++ b/pages.json
@@ -1108,12 +1108,12 @@
 			},
 			
 			
-			// {
-			// 	"pagePath": "pages/mall/mall",
-			// 	"text": "商圈",
-			// 	"iconPath": "static/images/market.png",
-			// 	"selectedIconPath": "static/images/market-selected.png"
-			// },
+			{
+				"pagePath": "pages/mall/mall",
+				"text": "商圈",
+				"iconPath": "static/images/market.png",
+				"selectedIconPath": "static/images/market-selected.png"
+			},
 			
 			{
 				"pagePath": "pages/my/my",
diff --git a/pages/homemaking/homemaking.vue b/pages/homemaking/homemaking.vue
index a4a5051..3ef939c 100644
--- a/pages/homemaking/homemaking.vue
+++ b/pages/homemaking/homemaking.vue
@@ -1,9 +1,7 @@
 <template>
 	<view>
 		<service-property></service-property>
-		<!-- #ifdef H5 && WUYE -->
 		<service-homemaking></service-homemaking>
-		<!-- #endif -->
 	</view>
 </template>