diff --git a/pages/coupons/add.vue b/pages/coupons/add.vue index 8d9b540..cff7fa0 100644 --- a/pages/coupons/add.vue +++ b/pages/coupons/add.vue @@ -125,8 +125,8 @@ ], timeIndex : 0, times : [ - { type: 2, text: '固定时间(区间范围)' }, - { type: 1, text: '延期券(用户领取后有效天数)' } + { type: 1, text: '固定时间(区间范围)' }, + { type: 2, text: '延期券(用户领取后有效天数)' } ], showDatePicker : false, // 活动弹出层时间 datePickerValue : [], // 活动时间 @@ -211,7 +211,7 @@ days : this.timeNumber, goodsable_ids : this.coupongoods } - + console.log(valuss) pushCoupons(valuss).then(res => { uni.showModal({ title : '提示', diff --git a/pages/wallet/extract.vue b/pages/wallet/extract.vue index f6594b2..80240fc 100644 --- a/pages/wallet/extract.vue +++ b/pages/wallet/extract.vue @@ -34,7 +34,7 @@ ≈ ¥{{total.toFixed(2)}} 提现至银行卡 - 预计5- 10个工作日到账 手续费: {{tax}}% + 预计5- 10个工作日到账 手续费: {{tax === '0'?'免手续费':tax+'%'}} @@ -74,6 +74,7 @@ this.cost = res.cost this.bank_accounts = res.bank_accounts.length this.withdraw_input = Number(res.balance) + this.total = Number(res.balance) * Number(res.cost) uni.setStorageSync('refresh', false) }).catch(err => { uni.showToast({ @@ -148,7 +149,7 @@ } uni.showModal({ title: '温馨提示', - content: '您是否确认提现,将会扣除' + this.tax + '%手续费', + content:this.tax === '0'?'您是否确认提现,交易将免手续费':'您是否确认提现,将会扣除' + this.tax + '%手续费', confirmColor: '#7c52fc', cancelColor: '#cacaca', cancelText: '我再想想', diff --git a/pages/wallet/withdrawList.vue b/pages/wallet/withdrawList.vue index 2cb5c4a..34cecaa 100644 --- a/pages/wallet/withdrawList.vue +++ b/pages/wallet/withdrawList.vue @@ -11,17 +11,19 @@ - 当前能量球 + 当前能量球 + + + + {{date?date:'选择日期'}} + + + + {{account || '0.00'}} - - - - {{date?date:'选择日期'}} - - - + @@ -337,6 +339,12 @@ font-size: 28rpx; color: #fff; padding: 0 0 20rpx 0; + display: flex; + flex-direction: row; + align-items: center; + width: 100%; + justify-content: space-between; + box-sizing: border-box; } .record-money { @@ -381,11 +389,13 @@ font-size: 30rpx; padding-top: 10rpx; color: $text-price; - .left-des{ + + .left-des { color: #999; font-size: 26rpx; margin-left: 20rpx; } + span:nth-child(2) { color: #C0C0C0; font-weight: normal;