更换正式环境,测试修改
This commit is contained in:
@@ -73,10 +73,8 @@
|
||||
{{ item.useRestrictions }}
|
||||
</view>
|
||||
</view>
|
||||
<view class="right u-flex u-flex-col u-col-bottom u-row-center">
|
||||
<view class="u-flex ">
|
||||
<view class="use-btn" @click.stop="toEmitChooseQuan(item)">去使用</view>
|
||||
</view>
|
||||
<view class="right u-flex u-flex-col u-col-bottom u-row-center" style="flex-shrink: 1;">
|
||||
<view class="use-btn" @click.stop="toEmitChooseQuan(item)" style="flex-shrink: 1;">去使用</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
@@ -142,7 +140,8 @@
|
||||
returnCoupCanUse,
|
||||
returnCouponAllPrice,
|
||||
returnProductCoupon,
|
||||
returnCanUseFullReductionCoupon
|
||||
returnCanUseFullReductionCoupon,
|
||||
returnProductAllCoup
|
||||
} from '../quan_util.js'
|
||||
import { getHistoryOrder } from '@/http/api/order.js'
|
||||
import { shopUserDetail } from '@/http/api/shopUser.js'
|
||||
@@ -227,13 +226,12 @@
|
||||
})
|
||||
pageData.order = await getHistoryOrder({orderId:option.orderId})
|
||||
|
||||
console.log(pageData.order);
|
||||
const res = await getFindCoupon({
|
||||
shopUserId: option.shopUserId,
|
||||
type: pageData.types.sel+1
|
||||
})
|
||||
let fullReductionCoupon = res.filter(v => v.type == 1)
|
||||
let productCoupon = res.filter(v => v.type == 2)
|
||||
let fullReductionCoupon = res ? res.filter(v => v.type == 1) : []
|
||||
let productCoupon = res ? res.filter(v => v.type == 2) : []
|
||||
|
||||
canDikouGoodsArr = returnNewGoodsList(pageData.order.detailMap || [])
|
||||
fullReductionCoupon = fullReductionCoupon.map((v) => {
|
||||
@@ -259,7 +257,6 @@
|
||||
// .filter((v) => v.use);
|
||||
pageData.fullReductionCoupon = fullReductionCoupon
|
||||
pageData.productCoupon = productCoupon
|
||||
console.log(res)
|
||||
pageData.hasAjax = true;
|
||||
}
|
||||
|
||||
@@ -316,8 +313,6 @@
|
||||
const goodsQuan = pageData.productCoupon.filter(v => v.checked)
|
||||
let coupArr = [...goodsQuan, item]
|
||||
const payPrice = option.orderPrice - returnCouponAllPrice(coupArr, canDikouGoodsArr, pageData.user)
|
||||
|
||||
console.log(payPrice)
|
||||
if (payPrice<=0) {
|
||||
modal.content = '选择该商品券后支付金额将为0,继续选择将取消选择的满减券'
|
||||
modal.cancelText = '取消'
|
||||
@@ -333,7 +328,7 @@
|
||||
return
|
||||
}
|
||||
}
|
||||
console.log(2)
|
||||
|
||||
item.checked = !item.checked
|
||||
const CheckedArr = pageData.productCoupon.filter(v => v.checked)
|
||||
if (CheckedArr.length <= 0) {
|
||||
@@ -569,7 +564,6 @@
|
||||
&.goods {
|
||||
.right {
|
||||
background-color: #fff;
|
||||
position: initial;
|
||||
|
||||
.use-btn {
|
||||
padding: 10rpx 40rpx;
|
||||
|
||||
Reference in New Issue
Block a user