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 @@
-
-
-
-
-
-
-
-
-
-
-
-
- {{ v.name }}
-
-
- ¥{{ v.price }}
-
-
-
- 可容纳{{ v.capacity }}人
-
-
-
- {{ hooks.useEnum("boxesBxStatusEnum", v.status.toString()) }}
-
-
- {{ hooks.useEnum("boxesBxStatusEnum", v.status) }}
-
-
- {{ hooks.useEnum("boxesBxStatusEnum", v.status) }}
-
-
-
-
- {{ v.address }}
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+ {{ v.name }}
+
+ ¥{{ v.price }}
+
+
+ 可容纳{{ v.capacity }}人
+
+
+
+ {{ hooks.useEnum("boxesBxStatusEnum", v.status.toString()) }}
+
+
+ {{ hooks.useEnum("boxesBxStatusEnum", v.status) }}
+
+
+ {{ hooks.useEnum("boxesBxStatusEnum", v.status) }}
+
+
+
+
+ {{ v.address }}
+
+
+
+
+
+
-
\ 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"
>
-
+
{
-
+
{{ v.name }}
diff --git a/src/pages/tabbar/home.vue b/src/pages/tabbar/home.vue
index 8ae2ffd..270bb8c 100644
--- a/src/pages/tabbar/home.vue
+++ b/src/pages/tabbar/home.vue
@@ -50,13 +50,13 @@ const toDetail = async (v: any) => {
:auto-scroll-to-top-when-reload="false"
@scroll="pageHook.scroll"
>
-
+
- {{ v.name }}
+ {{ v.name }}
{{ v.deptName }}
@@ -79,5 +79,3 @@ const toDetail = async (v: any) => {
-
-
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 @@
-
+
+
-
+
@@ -59,9 +60,9 @@ const state = reactive<{ wallet: any; userInfo: any; menuList: MenuItem[] }>({
userInfo: {},
menuList: [
{ text: "钱包管理", icon: "/static/icon/service_3.png", router: "/pages/wallet/list" },
- { text: "包厢预定", icon: "/static/icon/service_4.png", router: "/pages/boxes/apply-list" },
- { text: "外来人员就餐", icon: "/static/icon/service_1.png", router: "/pages/apply/foreign-list" },
- { text: "跨单位就餐", icon: "/static/icon/service_1.png", router: "/pages/apply/stride-list" },
+ // { text: "包厢预定", icon: "/static/icon/service_4.png", router: "/pages/boxes/apply-list" },
+ // { text: "外来人员就餐", icon: "/static/icon/service_1.png", router: "/pages/apply/foreign-list" },
+ // { text: "跨单位就餐", icon: "/static/icon/service_1.png", router: "/pages/apply/stride-list" },
{ text: "人脸管理", icon: "/static/icon/service_5.png", router: "/pages/human-face/list" },
],
})
diff --git a/src/pages/tabbar/order.vue b/src/pages/tabbar/order.vue
index a687daf..0bb0603 100644
--- a/src/pages/tabbar/order.vue
+++ b/src/pages/tabbar/order.vue
@@ -60,7 +60,7 @@ const doRefund = (v: any) => {
-
+
{
-
+
¥ {{ hooks.useMoney(v.totalPrice) }}
共 {{ v.carList.length }} 件
退款
-
- 核销码
-
+ 核销码
diff --git a/src/pages/tabbar/shop.vue b/src/pages/tabbar/shop.vue
index ff1aebd..1e61a46 100644
--- a/src/pages/tabbar/shop.vue
+++ b/src/pages/tabbar/shop.vue
@@ -50,6 +50,7 @@ const toDetail = async (v: any) => {
:auto-scroll-to-top-when-reload="false"
@scroll="pageHook.scroll"
>
+
diff --git a/src/pages/wallet/list.vue b/src/pages/wallet/list.vue
index 76ce397..5bfc3b4 100644
--- a/src/pages/wallet/list.vue
+++ b/src/pages/wallet/list.vue
@@ -122,7 +122,7 @@ const doFreeze = async () => {
-
+
{
¥{{ hooks.useMoney(v.balance) }}
-
- 绑定
-
-
+ 绑定
+
申请冻结
去充值
diff --git a/src/sheep/components/crud/crud-layout/crud-layout.vue b/src/sheep/components/crud/crud-layout/crud-layout.vue
index ce46af3..9a25bde 100644
--- a/src/sheep/components/crud/crud-layout/crud-layout.vue
+++ b/src/sheep/components/crud/crud-layout/crud-layout.vue
@@ -1,165 +1,165 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+