Merge pull request 'zhy' (#144) from zhy into master

Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/144
This commit was merged in pull request #144.
This commit is contained in:
2020-08-10 17:47:31 +08:00
19 changed files with 358 additions and 20 deletions

View File

@@ -4,10 +4,10 @@
<view class="spike-view" v-if="type == 3">
<view class="left">
<view class="price">
<view class="now-price">{{ groupbuyInfo.groupbuy_price }}</view>
<view class="origin-price">{{ groupbuyInfo.goods_price }}</view>
<view class="now-price">{{ groupbuyInfo.groupbuy_price || '0.00' }}</view>
<view class="origin-price">{{ groupbuyInfo.goods_price || '0.00' }}</view>
</view>
<view class="num">剩余数量{{ groupbuyInfo.inventory - groupbuyInfo.groupbuy_buy_quantity }}</view>
<view class="num">剩余数量{{ groupbuyInfo.inventory - groupbuyInfo.groupbuy_buy_quantity || '0' }}</view>
</view>
<view class="right" v-if="!isSrartSpike || !isEndSpike">
<view class="title">{{ isSrartSpike ? '结束倒计时' : '秒杀倒计时' }}</view>
@@ -24,8 +24,8 @@
</view>
<view class="price-collect">
<view class="pic" v-if="type != 3">
<text>{{ goodsInfo.goods_price }}</text>
<s>{{ goodsInfo.goods_marketprice }}</s>
<text>{{ goodsInfo.pintuan_price || '0.00' }}</text>
<s>{{ goodsInfo.goods_price || '0.00' }}</s>
</view>
<view class="collect" @click="switchCollect(goodsInfo.goods_collect)">
<u-icon name="star" color="#474747" size="28" v-if="!goodsInfo.goods_collect"></u-icon>
@@ -213,7 +213,7 @@ export default {
sel: "", // 拼接的规格
quanxuan: false, // 规格是否选择
debounce: true, // 防止多次提交订单
storeid:0 //店铺id
storeid:0 // 店铺id
}
},
components: {
@@ -378,7 +378,7 @@ export default {
// 普通商品详情
ordinaryDetails(id) {
this.$u.api.getGoodsDetails({ id: id }).then((res)=>{
console.log(res)
// console.log(res)
if (res.errCode == 0) {
this.evaluate = res.data.goods_evaluate_info;
this.goodsInfo = res.data.goods;
@@ -536,7 +536,7 @@ export default {
xuanze(id){
// console.log(id)
// 选择完规格后设商品type = 1
this.type = 1;
// this.type = 1;
this.getGoodsDetails(this.glist[id])
this.id = this.glist[id];
},