11
This commit is contained in:
parent
c68243f95e
commit
ad7d404482
@ -43,7 +43,7 @@
|
|||||||
<view class="group-price">
|
<view class="group-price">
|
||||||
<view>¥{{ item.commodity_goods_info.sales_price }}/{{
|
<view>¥{{ item.commodity_goods_info.sales_price }}/{{
|
||||||
item.commodity_goods_info.goods_unit
|
item.commodity_goods_info.goods_unit
|
||||||
}}</view>
|
}}</view>
|
||||||
<!-- 运费 -->
|
<!-- 运费 -->
|
||||||
<view class="goods-desc" style="margin-top: 10rpx;">运费 ¥{{
|
<view class="goods-desc" style="margin-top: 10rpx;">运费 ¥{{
|
||||||
item.commodity_goods_info.freight }}</view>
|
item.commodity_goods_info.freight }}</view>
|
||||||
@ -233,7 +233,7 @@
|
|||||||
已支付成功
|
已支付成功
|
||||||
</view>
|
</view>
|
||||||
<view class="boxshadow_img">
|
<view class="boxshadow_img">
|
||||||
<view style="margin-bottom: 15rpx;">{{verifyCode}}</view>
|
<view style="margin-bottom: 15rpx;">{{ verifyCode }}</view>
|
||||||
<image
|
<image
|
||||||
src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/shop_share_img.png">
|
src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/shop_share_img.png">
|
||||||
</image>
|
</image>
|
||||||
@ -428,7 +428,7 @@ export default {
|
|||||||
const currentTime = new Date().getTime();
|
const currentTime = new Date().getTime();
|
||||||
const startTime = new Date(item.commodity_goods_info.group_buy_activity_info?.start_time).getTime();
|
const startTime = new Date(item.commodity_goods_info.group_buy_activity_info?.start_time).getTime();
|
||||||
const endTime = new Date(item.commodity_goods_info.group_buy_activity_info?.end_time).getTime();
|
const endTime = new Date(item.commodity_goods_info.group_buy_activity_info?.end_time).getTime();
|
||||||
|
|
||||||
if (item.count >= item.commodity_goods_info.stock_quantity) {
|
if (item.count >= item.commodity_goods_info.stock_quantity) {
|
||||||
uni.showToast({
|
uni.showToast({
|
||||||
title: '库存不足',
|
title: '库存不足',
|
||||||
@ -436,7 +436,7 @@ export default {
|
|||||||
});
|
});
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if (currentTime >= startTime && currentTime <= endTime) {
|
if (currentTime >= startTime && currentTime <= endTime) {
|
||||||
if (item.count == 0) {
|
if (item.count == 0) {
|
||||||
item.count += item.commodity_goods_info.min_order_quantity
|
item.count += item.commodity_goods_info.min_order_quantity
|
||||||
@ -540,7 +540,7 @@ export default {
|
|||||||
// 团购活动时间判断
|
// 团购活动时间判断
|
||||||
const currentTime = new Date().getTime();
|
const currentTime = new Date().getTime();
|
||||||
let isGroupBuyValid = true;
|
let isGroupBuyValid = true;
|
||||||
|
|
||||||
// 检查所有商品是否在团购活动时间内
|
// 检查所有商品是否在团购活动时间内
|
||||||
for (let supplierId in this.supplierGroups) {
|
for (let supplierId in this.supplierGroups) {
|
||||||
const group = this.supplierGroups[supplierId];
|
const group = this.supplierGroups[supplierId];
|
||||||
@ -551,7 +551,7 @@ export default {
|
|||||||
isGroupBuyValid = false;
|
isGroupBuyValid = false;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
const startTime = new Date(activityInfo.start_time).getTime();
|
const startTime = new Date(activityInfo.start_time).getTime();
|
||||||
const endTime = new Date(activityInfo.end_time).getTime();
|
const endTime = new Date(activityInfo.end_time).getTime();
|
||||||
if (!(currentTime >= startTime && currentTime <= endTime)) {
|
if (!(currentTime >= startTime && currentTime <= endTime)) {
|
||||||
@ -620,8 +620,8 @@ export default {
|
|||||||
group_buy_activity_id: firstItem.commodity_goods_info.group_buy_activity_id,
|
group_buy_activity_id: firstItem.commodity_goods_info.group_buy_activity_id,
|
||||||
goods_and_count: group.map(item => {
|
goods_and_count: group.map(item => {
|
||||||
const activityInfo = item.commodity_goods_info.group_buy_activity_info;
|
const activityInfo = item.commodity_goods_info.group_buy_activity_info;
|
||||||
const isGroupBuy = activityInfo &&
|
const isGroupBuy = activityInfo &&
|
||||||
currentTime >= new Date(activityInfo.start_time).getTime() &&
|
currentTime >= new Date(activityInfo.start_time).getTime() &&
|
||||||
currentTime <= new Date(activityInfo.end_time).getTime();
|
currentTime <= new Date(activityInfo.end_time).getTime();
|
||||||
return {
|
return {
|
||||||
goods_id: item.goods_id,
|
goods_id: item.goods_id,
|
||||||
@ -646,7 +646,7 @@ export default {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
// 处理mergePreorder接口的响应
|
// 处理mergePreorder接口的响应
|
||||||
handleMergePreorderResponse(res, orderId) {
|
handleMergePreorderResponse(res, orderId) {
|
||||||
if (res && res.timeStamp && res.nonceStr && res.package && res.signType && res.paySign) {
|
if (res && res.timeStamp && res.nonceStr && res.package && res.signType && res.paySign) {
|
||||||
@ -685,7 +685,6 @@ export default {
|
|||||||
icon: 'none'
|
icon: 'none'
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
|
||||||
},
|
},
|
||||||
// 复制收货地址
|
// 复制收货地址
|
||||||
copyAddress() {
|
copyAddress() {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user