diff --git a/.env b/.env
index 2f80fbe..81fcc7b 100644
--- a/.env
+++ b/.env
@@ -27,12 +27,12 @@ VITE_OAUTH2_APP_CLIENT='mini:mini'
VITE_IMAGE_BASE_PATH = http://59.202.170.152:81/api # 信创线上
# ******************** start 开发环境 start ********************
-# VITE_APP_DEV_SERVICE = http://59.202.170.152:81/api # 信创线上
+VITE_APP_DEV_SERVICE = http://59.202.170.152:81/api # 信创线上
# VITE_APP_DEV_SERVICE = https://stgl.pj.gov.cn/app-api
# VITE_APP_DEV_SERVICE = http://192.168.101.60:9999 # 邓-本地
# VITE_APP_DEV_SERVICE = http://127.0.0.1:9999
# VITE_APP_DEV_SERVICE = http://123.156.230.15:8089/api/ # 线上
-VITE_APP_DEV_SERVICE = http://220.191.229.171:8090/api # 线上
+# VITE_APP_DEV_SERVICE = http://220.191.229.171:8090/api # 线上
# VITE_APP_DEV_SERVICE = http://localhost:9999
# ******************** end 开发环境 end ********************
diff --git a/src/pages/boxes/apply.vue b/src/pages/boxes/apply.vue
index bddeac2..6470d55 100644
--- a/src/pages/boxes/apply.vue
+++ b/src/pages/boxes/apply.vue
@@ -1,215 +1,215 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 时间段
-
-
- {{ v.bxDate }}
- {{ v.hour }}
-
-
-
-
- 提交
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 时间段
+
+
+ {{ v.bxDate }}
+ {{ v.hour }}
+
+
+
+
+ 提交
+
+
+
\ No newline at end of file
+
diff --git a/src/pages/merchant/detail.vue b/src/pages/merchant/detail.vue
index 9ce4ce5..5ae3314 100644
--- a/src/pages/merchant/detail.vue
+++ b/src/pages/merchant/detail.vue
@@ -327,7 +327,7 @@ const doFood = () => {
- 暂无商品
+ 暂无信息
diff --git a/src/pages/merchant/product-detail.vue b/src/pages/merchant/product-detail.vue
index d20b72d..83b3844 100644
--- a/src/pages/merchant/product-detail.vue
+++ b/src/pages/merchant/product-detail.vue
@@ -1,87 +1,73 @@
-
-
-
-
-
-
- ¥{{ state.detail.price }}
- ¥{{ state.detail.marketPrice }}
-
- 已售{{ state.detail.salesCount }}
-
-
- {{ state.detail.name }}
- {{
- state.detail.introduction
- }}
-
-
-
- 评价
-
-
- 详情
-
-
-
-
+
+
+
+
+
+
+
+ ¥{{ state.detail.price }}
+ ¥{{ state.detail.marketPrice }}
+
+ 已售{{ state.detail.salesCount }}
+
+
+ {{ state.detail.name }}
+ {{ state.detail.introduction }}
+
+
+
+ 评价
+
+
+ 详情
+
+
+
+
+ 暂无数据
+
diff --git a/src/pages/tabbar/shop.vue b/src/pages/tabbar/shop.vue
index 1e61a46..a3ff656 100644
--- a/src/pages/tabbar/shop.vue
+++ b/src/pages/tabbar/shop.vue
@@ -1,31 +1,27 @@