diff --git a/.env b/.env index 3e8193c..8656828 100644 --- a/.env +++ b/.env @@ -18,17 +18,17 @@ VITE_OAUTH2_APP_CLIENT='mini:mini' # 图片访问基础地址 # VITE_IMAGE_BASE_PATH = http://localhost:9999 -# VITE_IMAGE_BASE_PATH = http://192.168.101.29:9999 # 邓-本地 +VITE_IMAGE_BASE_PATH = http://192.168.101.29:9999 # 邓-本地 # VITE_IMAGE_BASE_PATH = http://pjcloud.center.takin.cc # 张 -VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089/api # 线上 +# VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089/api # 线上 # ******************** start 开发环境 start ******************** # VITE_APP_DEV_SERVICE =http://123.156.228.134:48080/app-api # 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://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://localhost:9999 # ******************** end 开发环境 end ******************** # ******************** start 生产环境 start ******************** diff --git a/src/pages/shop/detail.vue b/src/pages/shop/detail.vue index 57ae069..5e1750b 100644 --- a/src/pages/shop/detail.vue +++ b/src/pages/shop/detail.vue @@ -141,7 +141,7 @@ onLoad((options: any) => { }); onShow(async () => { await getDetail(); - // await getShopCar(); + await getShopCar(); await getClassify(); }); @@ -151,7 +151,7 @@ const getDetail = async () => { }; const getShopCar = async () => { - const { data } = await foodApi.getShopCar({ merchantId: state.detailId }); + const { data } = await foodApi.getShopCar({ merchantId: state.merchantId, hardType: "SUPERMARKET" }); state.carList = data ?? []; state.totPrice = state.carList.map((v) => v.totalPrice).reduce((pre, next) => pre + next, 0); state.totCount = state.carList.map((v) => v.productCount).reduce((pre, next) => pre + next, 0);