diff --git a/.env b/.env index ca066b4..2508a94 100644 --- a/.env +++ b/.env @@ -44,5 +44,5 @@ VITE_APP_DEV_SERVICE = http://59.202.170.152:81/api # 信创线上 VITE_APP_PROD_SERVICE = http://59.202.170.152:81/api # 信创线上 # ******************** end 生产环境 end ******************** -# VITE_DEV_ENV = dev -VITE_DEV_ENV = prod +VITE_DEV_ENV = dev +# VITE_DEV_ENV = prod diff --git a/src/pages.json b/src/pages.json index 91a538a..45db073 100644 --- a/src/pages.json +++ b/src/pages.json @@ -16,13 +16,13 @@ "disableScroll": true } }, - { - "path": "pages/tabbar/shop", - "style": { - "navigationBarTitleText": "超市", - "disableScroll": true - } - }, + // { + // "path": "pages/tabbar/shop", + // "style": { + // "navigationBarTitleText": "超市", + // "disableScroll": true + // } + // }, { "path": "pages/tabbar/order", "style": { @@ -273,12 +273,12 @@ "iconPath": "static/tabbar/home.png", "selectedIconPath": "static/tabbar/home-select.png" }, - { - "pagePath": "pages/tabbar/shop", - "text": "超市", - "iconPath": "static/tabbar/shop.png", - "selectedIconPath": "static/tabbar/shop-select.png" - }, + // { + // "pagePath": "pages/tabbar/shop", + // "text": "超市", + // "iconPath": "static/tabbar/shop.png", + // "selectedIconPath": "static/tabbar/shop-select.png" + // }, { "pagePath": "pages/tabbar/order", "text": "订单", diff --git a/src/pages/boxes/list.vue b/src/pages/boxes/list.vue index c2c63e3..b5581eb 100644 --- a/src/pages/boxes/list.vue +++ b/src/pages/boxes/list.vue @@ -1,6 +1,6 @@ - - \ No newline at end of file + diff --git a/src/pages/merchant/food.vue b/src/pages/merchant/food.vue index c9dc62f..5023010 100644 --- a/src/pages/merchant/food.vue +++ b/src/pages/merchant/food.vue @@ -107,7 +107,7 @@ const doProduct = (v: any) => { @scroll="pageHook.scroll" > - + - - diff --git a/src/pages/tabbar/my.vue b/src/pages/tabbar/my.vue index 15e0bf1..0d97c75 100644 --- a/src/pages/tabbar/my.vue +++ b/src/pages/tabbar/my.vue @@ -1,5 +1,6 @@