czg_team/cashier_wx
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'prod' of https://newgitea.sxczgkj.cn/czg_team/cashier_wx into test

Browse Source
This commit is contained in:
YeMingfei666
2026-01-20 10:08:51 +08:00
parent 7c143efe30 32c60b4f83
commit 0444b68cb2
15 changed files with 69 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
pages/product/components/goods-modal.vue
View File

@@ -126,7 +126,7 @@
</view>
<!-- 占位 -->
<!-- 占位不用管下面代码也不要删除 -->
<view class="shop_bottom" style="opacity: 0;">
<view class="flex-between">
<view class="price price-sku" v-if="goods.type != 'package' && goods.result">
@@ -210,14 +210,47 @@
<text
v-if="goods.result.suitNum > 1">「{{ goods.result.suitNum }}{{ goods.result.unitName }}起点」</text>
</view>
<view class="price price-package " v-else>
<view class="price single-and-staticPackage "
v-else-if="goods.type=='single'||(goods.type=='package'&&goods.groupType==0)">
<text class="i">￥</text>
<view class="num">
<GoodsPrice :limitDiscount="cartStore.limitTimeDiscount" :cart="goods"
:shopUserInfo="shopUserInfo" :shopInfo="shopInfo"></GoodsPrice>
</view>
<text class="i" v-if="goods.unitName">/{{ goods.unitName }}</text>
<text v-if="goods.suitNum > 1">「{{ goods.suitNum }}{{ goods.unitName }}起点」</text>
<text v-if="selSku&&selSku.suitNum > 1">「{{ selSku.suitNum }}{{ selSku.unitName }}起点」</text>
</view>
<view class="price choosePackage "
v-else-if="goods.type=='package'&&goods.groupType==1">
<text class="i">￥</text>
<view class="num">
<GoodsPrice :limitDiscount="cartStore.limitTimeDiscount" :cart="goods"
:shopUserInfo="shopUserInfo" :shopInfo="shopInfo"></GoodsPrice>
</view>
<text class="i" v-if="goods.unitName">/{{ goods.unitName }}</text>
<text v-if="selSku&&selSku.suitNum > 1">「{{ selSku.suitNum }}{{ selSku.unitName }}起点」</text>
</view>
<view class="price sku" v-else-if="goods.type=='sku'">
<text class="i">￥</text>
<view class="num">
<GoodsPrice :limitDiscount="cartStore.limitTimeDiscount" :cart="selSku"
:shopUserInfo="shopUserInfo" :shopInfo="shopInfo"></GoodsPrice>
</view>
<text class="i" v-if="goods.unitName">/{{ goods.unitName }}</text>
<text v-if="selSku&&selSku.suitNum > 1">「{{ selSku.suitNum }}{{ selSku.unitName }}起点」</text>
</view>
<view class="price price-package " v-else>
<text class="i">￥</text>
<view class="num">
<GoodsPrice :limitDiscount="cartStore.limitTimeDiscount" :cart="selSku"
:shopUserInfo="shopUserInfo" :shopInfo="shopInfo"></GoodsPrice>
</view>
<text class="i" v-if="goods.unitName">/{{ goods.unitName }}</text>
<text v-if="selSku&&selSku.suitNum > 1">「{{ selSku.suitNum }}{{ selSku.unitName }}起点」</text>
</view>
<view v-if="goods.type == 'package'&&goods.groupType==1">
@@ -446,7 +479,12 @@
const swiperCurrent = ref(0);
function returnFirstSku(product) {
return product.skuList[0]
console.log('returnFirstSku', product.skuList[0]);
return {
...product.skuList[0],
sku_id: product.skuList[0].id,
id: product.id,
}
}
//返回是否是多规格商品
function returnIsSkuGoods(item) {