wangmingchuan
/
yanzong_qianduan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug修复

Browse Source
main
fanfan 6 months ago
parent 00d03e5725
commit 122bf7c837
5 changed files with 40 additions and 28 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 15
      pages/dealer/withdraw/apply.vue
  2. 2
      pages/news/recycling/confirm.vue
  3. 31
      pages/news/user/withdrawal.vue
  4. 14
      pages/order/detail.vue
  5. 6
      pages/order/index.vue

15
pages/dealer/withdraw/apply.vue
Unescape View File

@ -21,7 +21,7 @@
<view class="item__left">{{ words.money.value }}：</view> <view class="item__left">{{ words.money.value }}：</view>
<view class="item__right flex-box"> <view class="item__right flex-box">
<input class="input" v-model="inputValue" type="digit" name="money" <input class="input" v-model="inputValue" type="digit" name="money"
@input="wordsAmount" :placeholder="words.money_placeholder.value" /> @blur="wordsAmount" :placeholder="words.money_placeholder.value" />
</view> </view>
</view> </view>
</view> </view>
@ -150,6 +150,7 @@
methods: { methods: {
wordsAmount(e) { wordsAmount(e) {
let that=this
let amount = e.detail.value let amount = e.detail.value
let num = null let num = null
num = amount.replace(new RegExp('^(\\d+\\.\\d{2}).+'), '$1') num = amount.replace(new RegExp('^(\\d+\\.\\d{2}).+'), '$1')
@ -168,19 +169,19 @@
.replace(/\./g, "") .replace(/\./g, "")
.replace("$#$", ".") .replace("$#$", ".")
} }
if (num > Number(this.settlement.min_money)) { if (num > Number(that.settlement.min_money)) {
uni.showToast({ uni.showToast({
title: this.settlement.min_money > 0 ? `最多可用${Number(this.settlement.min_money)}元, 请重新输入` : title: that.settlement.min_money > 0 ? `最多可用${Number(that.settlement.min_money)}元, 请重新输入` :
'暂无可提现金额', '暂无可提现金额',
icon: 'none', icon: 'none',
duration: 2000 duration: 2000
}) })
this.inputValue = '' that.inputValue = ''
this.$forceUpdate(); that.$forceUpdate();
} else { } else {
if (!num) { // 判断value值是否等于空,为空amount默认0, if (!num) { // 判断value值是否等于空,为空amount默认0,
this.inputValue = '' that.inputValue = ''
this.$forceUpdate(); that.$forceUpdate();
} }
} }
}, },

2
pages/news/recycling/confirm.vue
Unescape View File

@ -56,7 +56,7 @@
<view class="item"> <view class="item">
<view class="a">服务时间</view> <view class="a">服务时间</view>
<view class="b" @click="openPage(1)"> <view class="b" @click="openPage(1)">
<view class="select" :class="server_time?'select-on':''">{{server_time?server_time:(type == 2?'请选择预约上门时间':'请选择预约到店时间')}} <view class="select" :class="server_time?'select-on':''">{{server_time?server_time:(type == 1?'请选择预约上门时间':'请选择预约到店时间')}}
</view> </view>
<u-icon style="margin-left: 10rpx;" name="arrow-right"></u-icon> <u-icon style="margin-left: 10rpx;" name="arrow-right"></u-icon>
</view> </view>

31
pages/news/user/withdrawal.vue
Unescape View File

@ -13,7 +13,7 @@
<view class="a"> <view class="a">
<view class="l">提现金</view> <view class="l">提现金</view>
<view class="r"> <view class="r">
<view class="p">￥<input type="digit" @input="onCheck" v-model="obj.money" placeholder="请输入金额" /> <view class="p">￥<input type="digit" @blur="onCheck" v-model="obj.money" placeholder="请输入金额" />
</view> </view>
<view class="w" @click="allMoeny" style="color:#FF3126 ;width: 140rpx;text-align: right;">全部提现 <view class="w" @click="allMoeny" style="color:#FF3126 ;width: 140rpx;text-align: right;">全部提现
</view> </view>
@ -288,6 +288,7 @@
}) })
}, },
onCheck(e) { onCheck(e) {
let that = this
let amount = e.detail.value let amount = e.detail.value
let num = null let num = null
num = amount.replace(new RegExp('^(\\d+\\.\\d{2}).+'), '$1') num = amount.replace(new RegExp('^(\\d+\\.\\d{2}).+'), '$1')
@ -306,26 +307,36 @@
.replace(/\./g, "") .replace(/\./g, "")
.replace("$#$", ".") .replace("$#$", ".")
} }
if (num > Number(this.balance)) { if (num > Number(that.balance)) {
uni.showToast({ uni.showToast({
title: this.balance > 0 ? `最多可用${Number(this.balance)}元, 请重新输入` : '暂无可提现金额', title: that.balance > 0 ? `最多可用${Number(that.balance)}元, 请重新输入` : '暂无可提现金额',
icon: 'none', icon: 'none',
duration: 2000 duration: 2000
}) })
this.obj.money = this.balance > 0 ? this.balance : '' that.obj.money = ''
this.$forceUpdate(); that.$set(that.obj, 'money', '')
} else { } else {
if (!num) { if (!num) {
this.obj.money = '' that.obj.money = ''
this.$forceUpdate(); that.$set(that.obj, 'money', '')
} else { } else {
this.obj.money = num that.$set(that.obj, 'money', num)
this.$forceUpdate(); that.obj.money = num
} }
} }
}, },
allMoeny() { //全部体现 allMoeny() { //全部体现
this.obj.money = this.balance if (this.balance > 0) {
this.obj.money = this.balance
} else {
uni.showToast({
title: '暂无可提现金额',
icon: 'none',
duration: 2000
})
}
}, },
tabItem(i) { tabItem(i) {
this.obj.source = i; this.obj.source = i;

14
pages/order/detail.vue
Unescape View File

@ -145,10 +145,10 @@
共{{ order.total_num }}件商品，实付款￥<text>{{ order.pay_price?Number(order.pay_price):order.pay_price }}</text> 共{{ order.total_num }}件商品，实付款￥<text>{{ order.pay_price?Number(order.pay_price):order.pay_price }}</text>
</view> </view>
<view class="line" <view class="line"
v-if="order.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value"> v-if="order.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value&&order.order_status == OrderStatusEnum.NORMAL.value">
</view> </view>
<view class="cancel" @click="onCancel(order.order_id)" <view class="cancel" @click="onCancel(order.order_id)"
v-if="order.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value"> v-if="order.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value&&order.order_status == OrderStatusEnum.NORMAL.value">
取消订单 取消订单
</view> </view>
</view> </view>
@ -266,15 +266,15 @@
<view v-if="menushow" class="menuarea"> <view v-if="menushow" class="menuarea">
<view class="menulist"> <view class="menulist">
<view class="" @click="onInvoicing(order.order_id,order)" <view class="" @click="onInvoicing(order.order_id,order)"
v-if="order.order_status == OrderStatusEnum.COMPLETED.value"> v-if="order.order_status == OrderStatusEnum.COMPLETED.value&&item.pay_status == PayStatusEnum.SUCCESS.value">
申请开票 申请开票
</view> </view>
<view class="" @click="onDelete(order.order_id)" <view class="" @click="onDelete(order.order_id)"
v-if="order.order_status == OrderStatusEnum.COMPLETED.value"> v-if="order.order_status == OrderStatusEnum.COMPLETED.value&&item.pay_status == PayStatusEnum.SUCCESS.value">
删除订单 删除订单
</view> </view>
<view class="" <view class=""
v-if="order.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value" v-if="order.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value&&order.order_status == OrderStatusEnum.NORMAL.value"
@click="onCancel(order.order_id)"> @click="onCancel(order.order_id)">
取消订单 取消订单
</view> </view>
@ -283,7 +283,7 @@
</view> </view>
<view class="footer"> <view class="footer">
<view class="meetPrice" @click="changeMenu" <view class="meetPrice" @click="changeMenu"
v-if="order.order_status == OrderStatusEnum.COMPLETED.value || (order.pay_status == PayStatusEnum.PENDING.value&&order.order_status == OrderStatusEnum.NORMAL.value)"> v-if="(order.order_status == OrderStatusEnum.COMPLETED.value&&item.pay_status == PayStatusEnum.SUCCESS.value) || (order.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value&&order.order_status == OrderStatusEnum.NORMAL.value)">
更多 更多
</view> </view>
<view v-else style="color: #fff;">-</view> <view v-else style="color: #fff;">-</view>
@ -313,7 +313,7 @@
确认收货 确认收货
</view> </view>
<view class="buyAgain" @click="onCdDia(order.order_id)" <view class="buyAgain" @click="onCdDia(order.order_id)"
v-if="order.delivery_type == DeliveryTypeEnum.EXPRESS.value&&order.pay_status == PayStatusEnum.SUCCESS.value && order.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value"> v-if="order.delivery_type == DeliveryTypeEnum.EXPRESS.value&&order.pay_status == PayStatusEnum.SUCCESS.value && order.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value&&order.order_status == OrderStatusEnum.NORMAL.value">
催发货 催发货
</view> </view>
<!-- <view class="buyAgain" @click="onCancel(order.order_id)" <!-- <view class="buyAgain" @click="onCancel(order.order_id)"

6
pages/order/index.vue
Unescape View File

@ -63,7 +63,7 @@
v-if="item.order_status == OrderStatusEnum.COMPLETED.value && item.pay_status == PayStatusEnum.SUCCESS.value"> v-if="item.order_status == OrderStatusEnum.COMPLETED.value && item.pay_status == PayStatusEnum.SUCCESS.value">
删除订单 删除订单
</view> </view>
<view class="" v-if="item.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value" <view class="" v-if="item.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value&&item.order_status == OrderStatusEnum.NORMAL.value"
@click="onCancel(item.order_id)"> @click="onCancel(item.order_id)">
取消订单 取消订单
</view> </view>
@ -72,7 +72,7 @@
</view> </view>
<view class="btn"> <view class="btn">
<view class="a" @click="changeMenu(index)" <view class="a" @click="changeMenu(index)"
v-if="(item.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value)||(item.order_status == OrderStatusEnum.COMPLETED.value)|| (item.pay_status == PayStatusEnum.PENDING.value&&item.order_status == OrderStatusEnum.NORMAL.value)"> v-if="(item.order_status == OrderStatusEnum.COMPLETED.value && item.pay_status == PayStatusEnum.SUCCESS.value)|| (item.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value&&item.order_status == OrderStatusEnum.NORMAL.value)">
更多</view> 更多</view>
<view class="b"> <view class="b">
<view class="n" v-if="item.jd_link" @click="onCopyLink(item.jd_link)">复制链接</view> <view class="n" v-if="item.jd_link" @click="onCopyLink(item.jd_link)">复制链接</view>
@ -94,7 +94,7 @@
v-if="(item.pay_status == PayStatusEnum.SUCCESS.value && item.delivery_status == ReceiptStatusEnum.NOT_RECEIVED.value)||item.order_status == OrderStatusEnum.CANCELLED.value" v-if="(item.pay_status == PayStatusEnum.SUCCESS.value && item.delivery_status == ReceiptStatusEnum.NOT_RECEIVED.value)||item.order_status == OrderStatusEnum.CANCELLED.value"
@click="handleTargetGoods(item.goods[0].goods_id)">再次购买</view> @click="handleTargetGoods(item.goods[0].goods_id)">再次购买</view>
<view class="n" <view class="n"
v-if="item.delivery_type == DeliveryTypeEnum.EXPRESS.value&&item.pay_status == PayStatusEnum.SUCCESS.value && item.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value" v-if="item.delivery_type == DeliveryTypeEnum.EXPRESS.value&&item.pay_status == PayStatusEnum.SUCCESS.value && item.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value&&item.order_status == OrderStatusEnum.NORMAL.value"
@click="onCdDia(item.order_id)">催发货</view> @click="onCdDia(item.order_id)">催发货</view>
<!-- <view class="n" <!-- <view class="n"
v-if="item.pay_status == PayStatusEnum.SUCCESS.value && item.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value" v-if="item.pay_status == PayStatusEnum.SUCCESS.value && item.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value"

Write Preview
Loading…
Cancel
Save