code-image-backup-public/lilishop-uniapp
1
0
Fork 0
mirror of https://gitee.com/beijing_hongye_huicheng/lilishop-uniapp.git synced 2025-12-18 08:25:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-uniapp

Browse Source
This commit is contained in:
Yer11214
2024-11-25 10:20:44 +08:00
parent c1fce859ce 2cd7b7b63f
commit ef6f572311
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pages/cart/payment/shareOrderGoods.vue
View File

@@ -14,6 +14,9 @@
<span v-if="isBuy &&!master.toBeGroupedNum >0"> <span v-if="isBuy &&!master.toBeGroupedNum >0">
已成功拼团 已成功拼团
</span> </span>
<span v-if="!master.toBeGroupedNum >0">
拼团已结束
</span>
</div> </div>
<div v-if="isMaster && !isOver"> <div v-if="isMaster && !isOver">
@@ -24,7 +27,7 @@
去首页逛逛 去首页逛逛
</div> </div>
</div> </div>
<div v-if="!isMaster && !isOver && !isBuy"> <div v-if="!isMaster && !isOver && !isBuy && master.toBeGroupedNum">
<div class="share-user" @click="toBuy"> <div class="share-user" @click="toBuy">
参与拼团 参与拼团
</div> </div>
@@ -45,7 +48,7 @@
</div> </div>
<!-- 倒计时 --> <!-- 倒计时 -->
<div class="count-down" v-if="!isOver"> <div class="count-down" v-if="!isOver && master.toBeGroupedNum">
<u-count-down bg-color="#ededed" :hide-zero-day="true" @end="isOver" :timestamp="timeStamp"></u-count-down> <u-count-down bg-color="#ededed" :hide-zero-day="true" @end="isOver" :timestamp="timeStamp"></u-count-down>
</div> </div>

4
pages/product/goods.vue
View File

@@ -793,8 +793,8 @@ export default {
getGoodsList({ getGoodsList({
pageNumber: 1, pageNumber: 1,
pageSize: 10, pageSize: 10,
category: this.goodsDetail.categoryId, currentGoodsId: this.goodsDetail.id,
keyword: this.goodsDetail.name, keyword: this.goodsDetail.name
}).then((res) => { }).then((res) => {
this.likeGoodsList = res.data.result.records; this.likeGoodsList = res.data.result.records;
}); });