diff --git a/.env b/.env
index 9f62d2f..803c6f4 100644
--- a/.env
+++ b/.env
@@ -24,8 +24,8 @@ VITE_IMAGE_BASE_PATH = http://localhost:9999
# VITE_APP_DEV_SERVICE = https://stgl.pj.gov.cn/app-api
#VITE_APP_DEV_SERVICE = http://192.168.101.29: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://localhost:9999
+# VITE_APP_DEV_SERVICE = http://123.156.230.15:8089/api
+VITE_APP_DEV_SERVICE = http://localhost:9999
# ******************** end 开发环境 end ********************
# ******************** start 生产环境 start ********************
diff --git a/src/pages/merchant/detail.vue b/src/pages/merchant/detail.vue
index 4f225a7..75c6b23 100644
--- a/src/pages/merchant/detail.vue
+++ b/src/pages/merchant/detail.vue
@@ -47,7 +47,7 @@ const getDetail = async () => {
};
const getShopCar = async () => {
- const _pa = { merchantId: state.detailId };
+ const _pa = { merchantId: state.detailId, hardType: "CANTEEN" };
const { data } = await foodApi.getShopCar(_pa);
state.carList = data ?? [];
asyncCarCount(state.shopList)
@@ -80,7 +80,7 @@ const updateShopCar = async () => {
};
});
if (isEmpty(list)) return;
- const _pa = { merchantId: state.detailId, list: list };
+ const _pa = { merchantId: state.detailId, list: list, hardType:"CANTEEN" };
const { data, code }: any = await foodApi.updateShopCar(_pa);
if (code == 0) await getShopCar();
};
diff --git a/src/pages/order/detail.vue b/src/pages/order/detail.vue
index f02d458..440e1fe 100644
--- a/src/pages/order/detail.vue
+++ b/src/pages/order/detail.vue
@@ -118,20 +118,20 @@ const doCancelRefund = async () => {
{{ v.productName }}
- ¥ {{ hooks.useMoney(v.productPrice) }}
+ ¥ {{ hooks.useMoney(v.productPrice) }}
x {{ v.productCount }}
- ¥ {{ hooks.useMoney(v.totalPrice) }}
+ ¥ {{ hooks.useMoney(v.totalPrice) }}
实付款
- ¥
- {{ hooks.useMoney(state.detail.practicalTotalPrice) }}
+ ¥
+ {{ hooks.useMoney(state.detail.payPrice) }}
@@ -193,14 +193,14 @@ const doCancelRefund = async () => {
-
取消申请
+ @tap="router.jump('/pages/refund/apply', { id: state.detailId }, 2)">
重新申请
diff --git a/src/pages/tabbar/order.vue b/src/pages/tabbar/order.vue
index eb58eff..7e3d781 100644
--- a/src/pages/tabbar/order.vue
+++ b/src/pages/tabbar/order.vue
@@ -122,7 +122,7 @@ const doRefund = (v: any) => {
- ¥ {{ hooks.useMoney(v.totalPrice) }}
+ ¥ {{ hooks.useMoney(v.totalPrice) }}
共 {{ v.carList.length }} 件