zhongchuang
/
mshop-view
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

添加：豆豆积分抵扣功能

This commit is contained in:
wuhui_zzw 2023-12-29 19:27:46 +08:00
parent b26b7e8567
commit 4192328e3c
6 changed files with 111 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
manifest.json
View File

@ -1,9 +1,9 @@
{
"name" : "万马奔腾",
"name" : "众创公社",
"appid" : "__UNI__FADD765",
"description" : "",
"versionName" : "1.0.4",
"versionCode" : 127,
"versionName" : "1.0.0",
"versionCode" : 1,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
@ -158,7 +158,7 @@
"quickapp" : {},
/* 小程序特有相关 */
"mp-weixin" : {
"appid" : "wx7aac64d4d4419260",
"appid" : "wx3333c42c5f068ac6",
"setting" : {
"urlCheck" : false,
"minified" : true,
@ -201,5 +201,6 @@
},
"title" : "加载中...",
"template" : "template.h5.html"
}
},
"vueVersion" : "2"
}

2
pages.json
View File

@ -904,7 +904,7 @@
// "plugins": {
// "live-player-plugin": {
// "version": "1.3.2",
// "provider": "wx7aac64d4d4419260"
// "provider": "wx3333c42c5f068ac6"
// }
// }
},

2
pages/activity/liveBroadcast/index.vue
View File

@ -3,7 +3,7 @@
<view class='flash-sale'>
<view class='list'>
<view v-for="(item,index) in broadcastList" :key='index' >
<navigator hover-class="none" :url="((item.live_status == 103 && item.replay_status) || item.live_status === 101 || item.live_status === 102) ? 'plugin-private://wx7aac64d4d4419260/pages/live-player-plugin?room_id=' + item.room_id : ''">
<navigator hover-class="none" :url="((item.live_status == 103 && item.replay_status) || item.live_status === 101 || item.live_status === 102) ? 'plugin-private://wx3333c42c5f068ac6/pages/live-player-plugin?room_id=' + item.room_id : ''">
<view class='item acea-row row-between-wrapper'>
<view class="live-image">
<img class="image" :src="item.share_img">

8
pages/index/component/liveBroadcast.vue
View File

@ -14,7 +14,7 @@
<view class="live-wrapper mores">
<scroll-view scroll-x="true" style="white-space: nowrap; display: flex">
<view class="item" v-for="(item, index) in liveList" :key="index">
<navigator hover-class="none" :url="'plugin-private://wx7aac64d4d4419260/pages/live-player-plugin?room_id=' + item.room_id">
<navigator hover-class="none" :url="'plugin-private://wx3333c42c5f068ac6/pages/live-player-plugin?room_id=' + item.room_id">
<view
class="live-top"
:style="'background:' + (item.live_status == 101 ? playBg : item.live_status != 101 && item.live_status != 102 ? endBg : notBg) + ';'"
@ -46,7 +46,7 @@
</block>
<block v-if="listStyle == 1">
<view class="live-wrapper-a">
<navigator class="live-item-a" v-for="(item,index) in liveList" :key="index" :url="'plugin-private://wx7aac64d4d4419260/pages/live-player-plugin?room_id=' + item.room_id" hover-class="none">
<navigator class="live-item-a" v-for="(item,index) in liveList" :key="index" :url="'plugin-private://wx3333c42c5f068ac6/pages/live-player-plugin?room_id=' + item.room_id" hover-class="none">
<view class="img-box">
<view class="label bgblue" v-if="item.live_status == 102">
<view class="txt">预告</view>
@ -98,7 +98,7 @@
</block>
<block v-if="listStyle == 2">
<view class="live-wrapper-b">
<navigator class="live-item-b" v-for="(item,index) in liveList" :key="index" :url="'plugin-private://wx7aac64d4d4419260/pages/live-player-plugin?room_id=' + item.room_id" hover-class="none" :style="[{'box-shadow':`0px 1px 20px ${boxShadow}`}]">
<navigator class="live-item-b" v-for="(item,index) in liveList" :key="index" :url="'plugin-private://wx3333c42c5f068ac6/pages/live-player-plugin?room_id=' + item.room_id" hover-class="none" :style="[{'box-shadow':`0px 1px 20px ${boxShadow}`}]">
<view class="img-box">
<view class="label bgblue" v-if="item.live_status == 102">
<view class="txt">预告</view>
@ -187,7 +187,7 @@
res.data.list.forEach(val => {
val.link =
(val.live_status == 103 && val.replay_status) || val.live_status === 101 || val.live_status === 102
? 'plugin-private://wx7aac64d4d4419260/pages/live-player-plugin?room_id=' + val.room_id
? 'plugin-private://wx3333c42c5f068ac6/pages/live-player-plugin?room_id=' + val.room_id
: '';
});
that.$set(that,'liveList',res.data.list)

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

@ -135,14 +135,19 @@
</view>
</view>
<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>
</view>
<view class='item acea-row row-between-wrapper' v-if="item.order.use_platform_integral > 0">
<view>平台积分抵扣</view>
<view class='discount'>使用{{item.order.use_platform_integral}}积分抵扣{{item.order.use_platform_integral_price}}</view>
<!--<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>-->
<!--</view>-->
<!--<view class='item acea-row row-between-wrapper' v-if="item.order.use_platform_integral > 0">-->
<!-- <view>平台积分抵扣</view>-->
<!-- <view class='discount'>使用{{item.order.use_platform_integral}}积分抵扣{{item.order.use_platform_integral_price}}</view>-->
<!--</view>-->
<view class='item acea-row row-between-wrapper' v-if="item.order.use_legumes_integral > 0">
<view>积分抵扣</view>
<view class='discount'>使用{{item.order.use_legumes_integral}}积分抵扣{{item.order.use_legumes_integral_price}}</view>
</view>
</view>
<view class='item acea-row row-between-wrapper' v-if='shippingType==0 && item.isTake == 0 && order_model == 0'>
<view>快递费用 <text
@ -337,7 +342,7 @@
<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>积分抵扣：</view>
<view class="integral-switch-list">
<view class="integral-s-l-box" v-if="hold_mer_integral > 0" @click="changeIntegral('mer')">
<!-- <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>
使用了<text class="pColor">{{order_use_mer_integral}}</text>个商户积分，共抵扣<text class="pColor">{{order_use_mer_integral_price}}</text>元
@ -356,6 +361,16 @@
<view class="iconfont icon-weixuanzhong" v-if="!use_platform_integral"></view>
<view class='iconfont icon-xuanzhong1' v-else></view>
</view>
</view>-->
<view class="integral-s-l-box" v-if="hold_legumes_integral > 0" @click="changeIntegral('legumes')">
<view v-if="!use_legumes_integral">持有积分<text class="pColor">{{hold_legumes_integral}}</text></view>
<view v-else>
使用了<text class="pColor">{{order_use_legumes_integral}}</text>个积分，共抵扣<text class="pColor">{{order_use_legumes_integral_price}}</text>元
</view>
<view class="checkbox integral_checked">
<view class="iconfont icon-weixuanzhong" v-if="!use_legumes_integral"></view>
<view class='iconfont icon-xuanzhong1' v-else></view>
</view>
</view>
</view>
<!--<view class='money'>
@ -585,14 +600,18 @@
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,// 用户持有的平台积分总数
// 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,// 用户持有的平台积分总数
order_use_legumes_integral: 0,// 使用的商户总积分
order_use_legumes_integral_price: 0,// 商户积分抵扣的总金额
use_legumes_integral: false,// 是否使用豆豆积分
hold_legumes_integral: 0,// 用户持有的豆豆积分
is_has_integral_use: 0,
pagesUrl: "",
orderKey: "",
@ -743,16 +762,18 @@
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;
}
// 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;
// }
if(type === 'legumes') this.use_legumes_integral = !this.use_legumes_integral;
this.getConfirm(this.addressId);
},
showPresellAgree(){
@ -1013,8 +1034,9 @@
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_mer_integral: that.use_mer_integral,
// use_platform_integral: that.use_platform_integral,
use_legumes_integral: that.use_legumes_integral
}).then(res => {
// 默认选中
that.is_take = false
@ -1053,14 +1075,22 @@
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, 'use_mer_integral', res.data.useMerIntegral);
// that.$set(that, 'order_use_mer_integral_price', res.data.order_use_mer_integral_price);
// that.$set(that, 'hold_mer_integral', res.data.hold_mer_integral);
// that.$set(that, 'order_use_mer_integral', res.data.order_use_mer_integral);
// 平台积分
// that.$set(that, 'use_platform_integral', res.data.usePlatformIntegral);
// 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_platform_integral', res.data.hold_platform_integral);
// 豆豆积分
that.$set(that, 'use_legumes_integral', res.data.useLegumesIntegral);
that.$set(that, 'order_use_legumes_integral', res.data.order_use_legumes_integral);
that.$set(that, 'order_use_legumes_integral_price', res.data.order_use_legumes_integral_price);
that.$set(that, 'hold_legumes_integral', res.data.hold_legumes_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
@ -1524,8 +1554,9 @@
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_mer_integral: this.use_mer_integral,
// use_platform_integral: this.use_platform_integral,
use_legumes_integral: this.use_legumes_integral,
receipt_data: this.invoiceData,
extend: this.extend,
post: this.post,

2
project.config.json
View File

@ -45,7 +45,7 @@
},
"compileType": "miniprogram",
"libVersion": "2.14.3",
"appid": "wx7aac64d4d4419260",
"appid": "wx3333c42c5f068ac6",
"projectname": "crmeb_merchant_h5",
"simulatorType": "wechat",
"simulatorPluginLibVersion": {},