wanma-benteng
/
new-mshop-view
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

添加：商品支持设置是否开启赠送额度

This commit is contained in:
wuhui_zzw 2024-01-11 08:54:18 +08:00
parent 45ba192d96
commit 4b8fe723a2
1 changed files with 55 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
pages/users/order_confirm/index.vue
View File

@ -101,9 +101,9 @@
</view>
<view class="delivery_type">
<text v-if="!goods.allow_delivery">不支持快递</text>
<text v-if="!goods.allow_take">不支持到店核销</text>
<text v-if="!goods.allow_take">不支持到店核销</text>
</view>
</view>
<view class="err-txt" v-if="goods.undelivered && addressInfo.real_name">
<text class="iconfont icon-zhuyi-copy"></text>
@ -134,7 +134,7 @@
</view>
</view>
</view>
<view class="boxs" v-if="item.order.total_integral > 0">
<!--<view class="boxs" v-if="item.order.total_integral > 0">
<view class='item acea-row row-between-wrapper' v-if="item.order.use_mer_integral > 0">
<view>本商户积分抵扣</view>
<view class='discount'>使用{{item.order.use_mer_integral}}积分抵扣{{item.order.use_mer_integral_price}}</view>
@ -143,7 +143,7 @@
<view>平台积分抵扣</view>
<view class='discount'>使用{{item.order.use_platform_integral}}积分抵扣{{item.order.use_platform_integral_price}}</view>
</view>
</view>
</view>-->
<view class='item acea-row row-between-wrapper' v-if='shippingType==0 && item.isTake == 0 && order_model == 0'>
<view>快递费用 <text
v-if="item.list[0].productPresell && item.list[0].productPresell.presell_type == 2">(尾款阶段）</text>
@ -273,7 +273,7 @@
<view class='discount'>
<input type="text" v-model="post.real_name" placeholder="请填写收货人姓名" placeholder-class='placeholder' />
</view>
</view>
</view>
<view class='item acea-row row-between-wrapper'>
<view><text class="item-require">*</text>收货人电话</view>
<view class='discount'>
@ -333,10 +333,10 @@
<view class='item acea-row row-between-wrapper' v-if="coupon_price > 0">
<view>店铺优惠金额：</view>
<view class='money'>-￥{{coupon_price}}</view>
</view>
<view class='item acea-row row-between-wrapper integral-switch-content' v-if="open_integral && userInfo.integral > 0 && order_type == 0 && is_has_integral_use > 0">
</view><!--&& is_has_integral_use > 0-->
<!--<view class='item acea-row row-between-wrapper integral-switch-content' v-if="open_integral && userInfo.integral > 0 && order_type == 0">
<view>积分抵扣：</view>
<view class="integral-switch-list">
&lt;!&ndash;<view class="integral-switch-list">
<view class="integral-s-l-box" v-if="hold_mer_integral > 0" @click="changeIntegral('mer')">
<view v-if="!use_mer_integral">持有相关商户积分<text class="pColor">{{hold_mer_integral}}</text></view>
<view v-else>
@ -357,16 +357,16 @@
<view class='iconfont icon-xuanzhong1' v-else></view>
</view>
</view>
</view>
<!--<view class='money'>
</view>&ndash;&gt;
<view class='money'>
<text v-if="!use_integral">当前积分<text class="pColor">{{userInfo.integral}}</text></text>
<text v-else>使用了{{integral_count}}个积分，抵扣<text class="pColor">{{integral_price}}元</text></text>
<view class="checkbox integral_checked" @click="changeIntegral">
<view class="iconfont icon-weixuanzhong" v-if="!use_integral"></view>
<view class='iconfont icon-xuanzhong1' v-else></view>
</view>
</view>-->
</view>
</view>
</view>-->
<!--<view class='item acea-row row-between-wrapper' v-if="!seckillId && order_type != 3 && order_type != 4 && enabledPlatformCoupon">
<view>平台优惠券<text @tap="showCoupon" class="iconfont icon-wenhao1"></text></view>
<block v-if="platformCoupon.length > 0">
@ -397,8 +397,9 @@
<text @click="openDiscount">优惠明细</text>
</view>
</view>
<view class='settlement' :class='couponData.status != "noAddress" ? "" : "disabled"' style='z-index:100'
@tap="SubOrder">{{couponData.status != "noAddress" ? '提交订单':'选择地址'}}</view>
<view class='settlement' :class='couponData.status != "noAddress" ? "" : "disabled"' style='z-index:100' @tap="SubOrder">
{{couponData.status != "noAddress" ? '提交订单':'选择地址'}}
</view>
</view>
</view>
<block v-if="coupon.status">
@ -585,15 +586,15 @@
animated: false,
totalPrice: 0,
// use_integral: false,
use_mer_integral: false,// 是否使用商户积分
use_platform_integral: false,// 是否使用平台积分
order_use_mer_integral: 0,// 使用的商户总积分
order_use_mer_integral_price: 0,// 商户积分抵扣的总金额
order_use_platform_integral: 0,// 使用的平台总积分
order_use_platform_integral_price: 0,// 平台积分抵扣的总金额
hold_mer_integral: 0,// 用户持有的当前订单相关商户总商户积分
hold_platform_integral: 0,// 用户持有的平台积分总数
is_has_integral_use: 0,
// use_mer_integral: false,// 是否使用商户积分
// order_use_mer_integral: 0,// 使用的商户总积分
// order_use_mer_integral_price: 0,// 商户积分抵扣的总金额
// use_platform_integral: false,// 是否使用平台积分
// order_use_platform_integral: 0,// 使用的平台总积分
// order_use_platform_integral_price: 0,// 平台积分抵扣的总金额
// hold_mer_integral: 0,// 用户持有的当前订单相关商户总商户积分
// hold_platform_integral: 0,// 用户持有的平台积分总数
// is_has_integral_use: 0,
pagesUrl: "",
orderKey: "",
offlinePostage: "",
@ -742,17 +743,17 @@
},
changeIntegral: function(type) {
console.log("--------- 变更类型 ---------------",type);
// this.use_integral = !this.use_integral;
if(type === 'mer') {
this.use_mer_integral = !this.use_mer_integral;
// 判断：开启商户积分 则不开启平台积分
if(this.use_mer_integral) this.use_platform_integral = false;
}
if(type === 'platform') {
this.use_platform_integral = !this.use_platform_integral;
// 判断：开启平台积分 则不开启商户积分
if(this.use_platform_integral) this.use_mer_integral = false;
}
this.use_integral = !this.use_integral;
// if(type === 'mer') {
// this.use_mer_integral = !this.use_mer_integral;
// // 判断：开启商户积分 则不开启平台积分
// if(this.use_mer_integral) this.use_platform_integral = false;
// }
// if(type === 'platform') {
// this.use_platform_integral = !this.use_platform_integral;
// // 判断：开启平台积分 则不开启商户积分
// if(this.use_platform_integral) this.use_mer_integral = false;
// }
this.getConfirm(this.addressId);
},
showPresellAgree(){
@ -1012,9 +1013,9 @@
address_id: address_id,
takes: that.take,
use_coupon: that.subCoupon,
// use_integral: that.use_integral,
use_mer_integral: that.use_mer_integral,
use_platform_integral: that.use_platform_integral,
use_integral: that.use_integral,
// use_mer_integral: that.use_mer_integral,
// use_platform_integral: that.use_platform_integral,
}).then(res => {
// 默认选中
that.is_take = false
@ -1027,7 +1028,7 @@
that.subCoupon[el.mer_id].push(coupon.coupon_user_id)
}
})
})
})
that.subCoupon['0'] = []
if(res.data.platformCoupon.length > 0){
res.data.platformCoupon.forEach(el => {
@ -1052,16 +1053,16 @@
that.$set(that, 'integral_count', res.data.order_total_integral);
that.$set(that, 'integral_price', res.data.order_total_integral_price);
that.$set(that, 'open_integral', res.data.openIntegral);
// that.$set(that, 'use_integral', res.data.useIntegral);
that.$set(that, 'use_mer_integral', res.data.useMerIntegral);
that.$set(that, 'use_platform_integral', res.data.usePlatformIntegral);
that.$set(that, 'order_use_mer_integral', res.data.order_use_mer_integral);
that.$set(that, 'order_use_mer_integral_price', res.data.order_use_mer_integral_price);
that.$set(that, 'order_use_platform_integral', res.data.order_use_platform_integral);
that.$set(that, 'order_use_platform_integral_price', res.data.order_use_platform_integral_price);
that.$set(that, 'hold_mer_integral', res.data.hold_mer_integral);
that.$set(that, 'hold_platform_integral', res.data.hold_platform_integral);
that.$set(that, 'is_has_integral_use', res.data.is_has_integral_use);
that.$set(that, 'use_integral', res.data.useIntegral);
// that.$set(that, 'use_mer_integral', res.data.useMerIntegral);
// that.$set(that, 'use_platform_integral', res.data.usePlatformIntegral);
// that.$set(that, 'order_use_mer_integral', res.data.order_use_mer_integral);
// that.$set(that, 'order_use_mer_integral_price', res.data.order_use_mer_integral_price);
// that.$set(that, 'order_use_platform_integral', res.data.order_use_platform_integral);
// that.$set(that, 'order_use_platform_integral_price', res.data.order_use_platform_integral_price);
// that.$set(that, 'hold_mer_integral', res.data.hold_mer_integral);
// that.$set(that, 'hold_platform_integral', res.data.hold_platform_integral);
// that.$set(that, 'is_has_integral_use', res.data.is_has_integral_use);
that.$set(that, 'order_extend', (that.order_extend && that.order_extend.length>0) ? that.order_extend : res.data.order_extend);
that.totalPrice = res.data.order_price
that.orderStatus = res.data.status
@ -1374,7 +1375,7 @@
});
break;
// #endif
default:
default:
let pages = '/pages/order_pay_status/index?order_id=' +
orderId + '&msg=取消支付'
return that.$util.Tips({
@ -1523,9 +1524,9 @@
order_type: this.order_type,
key: this.order_key,
takes: this.take,
// use_integral: this.use_integral,
use_mer_integral: this.use_mer_integral,
use_platform_integral: this.use_platform_integral,
use_integral: this.use_integral,
// use_mer_integral: this.use_mer_integral,
// use_platform_integral: this.use_platform_integral,
receipt_data: this.invoiceData,
extend: this.extend,
post: this.post,
@ -1812,7 +1813,7 @@
/deep/.order-submission .virtual_form .uni-input-wrapper {
text-align: right;
}
.order-submission .virtual_form .item-require{
color: red;
margin-right: 4rpx;
@ -2149,7 +2150,7 @@
color: var(--view-priceColor);
font-size: 20rpx;
}
}
}
.err-txt {