HandOver-liuwu
/
mobileclient
mirror of https://codeup.aliyun.com/lsxd/marketing/mobileclient.git
4
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/mobileclient into couponV2.0 

* 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/mobileclient:
  feat:新增订单状态颜色
  fix:修改支付方式默认为支付宝
  fix:修复订单状态不正确
This commit is contained in:
Apple 2022-10-09 16:12:06 +08:00
parent 755c7cf629 e317c8131f
commit 0b4073b5de
2 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
v2_0_0_C/coupon/exchange.html
View File

@ -205,7 +205,7 @@
'https://lsxd-yunshanfu.oss-cn-hangzhou.aliyuncs.com/common_image/20220120/9bedd7af6a8a570be8f2858564f9ec6d.png'
],
show: false, /* 控制支付弹窗 */
payType: 1, /* 支付方式 */
payType: 2, /* 支付方式 */
/* 提示框状态 */
popShow: false,

31
v2_0_0_C/coupon/myOrder.html
View File

@ -44,7 +44,10 @@
<div class="bottom">
<p class="money">实付金额：￥<span>{{item.pay_amount}}</span></p>
<p class="button" @click="immediatelyPay(item)" v-show="item.status===6">立即支付</p>
<p class="button" @click="goExchange(item)" v-show="item.status===0">去兑换</p>
<!-- 立减金待领取 -->
<p class="button" @click="goExchange(item)" v-show="item.status===1&&item.type===2">去兑换</p>
<!-- 立减金领取过期 -->
<p class="button filter" v-show="item.status===5&&item.type===2">去兑换</p>
</div>
</div>
<!-- 空状态 -->
@ -76,7 +79,7 @@
el: "#app",
data () {
return {
active: 1, /* 选择支付方式 */
active: 2, /* 选择支付方式 */
show: false, /* 支付弹窗状态 */
limit: 50,
page: 1,
@ -112,19 +115,8 @@
methods: {
/* 根据不同状态展示 订单样式和表现 */
statusColor (status) {
switch (status) {
/* 兑换码状态 */
case 3:
return '#FD553D'
case 2:
return '#44D27D'
case 6:
return '#F28542'
/* 立减金状态 */
case 4:
return '#4193EE'
}
const colorArray = ['#f28542', '#f28542', '#44D27D', '#fd553d', '#fd553d', '#aaaaaa', '#fd553d'];
return colorArray[status];
},
/* 图标分流 */
@ -232,14 +224,7 @@
}
return
}
if (code === 200) {
data.map(item => {
if (item.type === 2 && item.status === 2) item.status = 4
if (item.type === 2 && item.status === 1) item.status = 6
})
this.orderList = data
}
if (code === 200) this.orderList = data
})
},