From 8b96c1f8a021e1e25c2d42ffaf3dc16b3b441732 Mon Sep 17 00:00:00 2001 From: weiwei Date: Wed, 11 Jun 2025 18:50:31 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=8D=A0=E4=BD=8D0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/shop/components/product-sku.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/shop/components/product-sku.vue b/src/pages/shop/components/product-sku.vue index d2daab7..e6f00ce 100644 --- a/src/pages/shop/components/product-sku.vue +++ b/src/pages/shop/components/product-sku.vue @@ -19,10 +19,10 @@ {{ state.goodsDetail.productName }} - 促销 ¥{{ state.selectedSku.promotionPrice }} - 原价 ¥{{ state.selectedSku.retailPrice }} + 促销 ¥{{ state.selectedSku.promotionPrice || 0 }} + 原价 ¥{{ state.selectedSku.retailPrice || 0 }} - 内装数量：{{ state.selectedSku.packageNum }} + 内装数量：{{ state.selectedSku.packageNum || 0 }} From 9285a1706613b82c68b4d9e025713af3588383e4 Mon Sep 17 00:00:00 2001 From: weiwei Date: Thu, 12 Jun 2025 14:59:20 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E5=95=86=E5=9F=8E?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/shop/components/product-cart.vue | 4 +-- src/pages/shop/components/product-row.vue | 2 +- src/pages/shop/components/product-sku.vue | 39 +++++++++++++++------ src/pages/shop/components/product-total.vue | 10 ++---- src/pages/shop/product-detail.vue | 22 +++++++++--- src/pages/tabbar/order.vue | 2 ++ 6 files changed, 53 insertions(+), 26 deletions(-) diff --git a/src/pages/shop/components/product-cart.vue b/src/pages/shop/components/product-cart.vue index 998380c..46e630f 100644 --- a/src/pages/shop/components/product-cart.vue +++ b/src/pages/shop/components/product-cart.vue @@ -28,7 +28,7 @@ @@ -58,7 +58,7 @@ const props = withDefaults( const doClose = () => emit("update:modelValue", false) -const doPay = () => emit("submit") +const doBuy = () => emit("submit") const getHeight = () => { const { bottom } = uni.getSystemInfoSync().safeAreaInsets! diff --git a/src/pages/shop/components/product-row.vue b/src/pages/shop/components/product-row.vue index 4b0b92f..8923d2c 100644 --- a/src/pages/shop/components/product-row.vue +++ b/src/pages/shop/components/product-row.vue @@ -7,7 +7,7 @@ {{ props.productName }} - ¥{{ hooks.useMoney(props.promotionPrice) }} + ¥{{ hooks.useMoney(props.promotionPrice || props.retailPrice) }} ¥{{ hooks.useMoney(props.retailPrice) }} 单位：{{ props.unit }} diff --git a/src/pages/shop/components/product-sku.vue b/src/pages/shop/components/product-sku.vue index e6f00ce..720619f 100644 --- a/src/pages/shop/components/product-sku.vue +++ b/src/pages/shop/components/product-sku.vue @@ -3,6 +3,7 @@ z-index="100" v-model:show="props.modelValue" showFooter + showClose title="加入购物车" position="bottom" size="70%" @@ -15,14 +16,24 @@ 商品信息 - + - {{ state.goodsDetail.productName }} + {{ state.goodsDetail.productName }} - 促销 ¥{{ state.selectedSku.promotionPrice || 0 }} + + 促销 ¥{{ parseFloat(state.selectedSku.promotionPrice) || state.selectedSku.retailPrice || 0 }} + 原价 ¥{{ state.selectedSku.retailPrice || 0 }} 内装数量：{{ state.selectedSku.packageNum || 0 }} + + 已选择：{{ `${state.selectedSku.spec || "未选择"} / ${state.selectedSku.unit || "未选择"}，数量：${state.goodsCount}` }} + @@ -32,13 +43,13 @@ 包装单位 - {{ v.spec + " " + v.unit }} + {{ v.spec + " / " + v.unit }} @@ -59,7 +70,13 @@ @@ -67,8 +84,8 @@ diff --git a/src/pages/shop/product-detail.vue b/src/pages/shop/product-detail.vue index e797493..fc57549 100644 --- a/src/pages/shop/product-detail.vue +++ b/src/pages/shop/product-detail.vue @@ -42,8 +42,8 @@ const getDetail = async () => { - 商品 - {{ state.detail.productName }} + 商品 + {{ state.detail.productName }} @@ -53,12 +53,24 @@ const getDetail = async () => { - - 评价 + + 包装单位 + - 详情 + 评价 + + + + 详情 diff --git a/src/pages/tabbar/order.vue b/src/pages/tabbar/order.vue index f9fcca1..758f513 100644 --- a/src/pages/tabbar/order.vue +++ b/src/pages/tabbar/order.vue @@ -51,6 +51,8 @@ const pageHook = hooks.usePage( ? orderApi.supPage : getLaunchParam() == "coopMerchant" ? orderApi.supPage + : getLaunchParam() == "onlineShop" + ? orderApi.supPage : async () => [], null, "data.records", From b94b5bf911ce68edfbbbecb4171aeaef65d255fc Mon Sep 17 00:00:00 2001 From: weiwei Date: Fri, 13 Jun 2025 15:33:03 +0800 Subject: [PATCH 3/3] .env --- .env | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.env b/.env index 5e88cc1..a83acd9 100644 --- a/.env +++ b/.env @@ -19,16 +19,18 @@ VITE_OAUTH2_APP_CLIENT='mini:mini' # --------------------------- 开发环境 api地址 ---------------------------------- # VITE_APP_DEV_SERVICE = https://stgl.pj.gov.cn/api # 域名线上 #VITE_APP_DEV_SERVICE = http://59.202.170.152:81/api # 信创线上 -VITE_APP_DEV_SERVICE = http://192.168.101.139:9999 # 邓-本地 +# VITE_APP_DEV_SERVICE = http://192.168.101.139: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://123.156.230.15:8089/api # 测试线上-过期 +VITE_APP_DEV_SERVICE = http://123.157.250.162:8089/api # 测试线上 # --------------------------- 开发环境 图片访问基础地址 --------------------------- # VITE_IMAGE_DEV_PATH = https://stgl.pj.gov.cn/api # 域名线上 #VITE_IMAGE_DEV_PATH = http://59.202.170.152:81/api # 信创线上 -VITE_IMAGE_DEV_PATH = http://192.168.101.139:9999 # 邓-本地 +# VITE_IMAGE_DEV_PATH = http://192.168.101.139:9999 # 邓-本地 # VITE_IMAGE_DEV_PATH = http://127.0.0.1:9999 -# VITE_IMAGE_DEV_PATH = http://123.156.230.15:8089/api # 测试线上 +# VITE_IMAGE_DEV_PATH = http://123.156.230.15:8089/api # 测试线上-过期 +VITE_IMAGE_DEV_PATH = http://123.157.250.162:8089/api # 测试线上 # --------------------------- 生产环境 api地址 ---------------------------------- VITE_APP_PROD_SERVICE = https://stgl.pj.gov.cn/api # 域名线上