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 d2daab7..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 }} - 原价 ¥{{ state.selectedSku.retailPrice }} + + 促销 ¥{{ parseFloat(state.selectedSku.promotionPrice) || state.selectedSku.retailPrice || 0 }} + + 原价 ¥{{ state.selectedSku.retailPrice || 0 }} + + 内装数量:{{ state.selectedSku.packageNum || 0 }} + + 已选择:{{ `${state.selectedSku.spec || "未选择"} / ${state.selectedSku.unit || "未选择"},数量:${state.goodsCount}` }} - 内装数量:{{ state.selectedSku.packageNum }} @@ -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",