admin/lichebao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

订单优惠金额设置为0时，不判断限额

Browse Source
This commit is contained in:
老叶
2021-11-15 17:05:07 +08:00
parent c33d5b5de1
commit c21b3fa86d
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pages/order/edit/index.js
+2 -2
View File
@@ -981,7 +981,7 @@ Page({
})
}else{
//判断是否超过最大可优惠价格
if(parseFloat(this.data.disc_money!=''?this.data.disc_money:'0')+this.data.fine_total+parseFloat(this.data.fineList[e.currentTarget.dataset.index].price)>parseFloat(this.data.priceinfo.dis_money)){
if(this.data.priceinfo.dis_money>0 && parseFloat(this.data.disc_money!=''?this.data.disc_money:'0')+this.data.fine_total+parseFloat(this.data.fineList[e.currentTarget.dataset.index].price)>parseFloat(this.data.priceinfo.dis_money)){
wx.showToast({
title: '已超过最大可优惠价格',
icon: 'none'
@@ -1012,7 +1012,7 @@ Page({
//输入车身优惠
inputDisc(e) {
if(parseFloat(e.detail.value)+this.data.fine_total>parseFloat(this.data.priceinfo.dis_money)){
if(this.data.priceinfo.dis_money>0 && parseFloat(e.detail.value)+this.data.fine_total>parseFloat(this.data.priceinfo.dis_money)){
wx.showToast({
title: '已超过最大可优惠价格',
icon: 'none'
pages/order/edit/index.wxml
+2 -2
View File
@@ -108,7 +108,7 @@
</picker>
</view>
</view>
<view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{priceinfo.dis_money}}">
<view class="relative bbs-1-eb last-b-none pl180 font-28">
<view class="absolute left-0 box-middle">车身优惠</view>
<view class="relative pr40">
<input class="wp100 height-100 text-right font-28" placeholder-class="color-ccc" type="text" placeholder="请输入车身优惠金额" bindinput='inputDisc' data-key="disc_money" name='disc_money' value="{{disc_money}}" />
@@ -133,7 +133,7 @@
</checkbox-group>
</view>
</view>
<view class="bbs-1-eb last-b-none" wx:if="{{priceinfo.dis_money}}">
<view class="bbs-1-eb last-b-none">
<view class="relative pl190">
<view class="absolute left-0 box-middle font-28 color-333">精品赠送</view>
<view class="pt30 pb30 text-right font-28 color-666">
pages/order/register/index.js
+2 -2
View File
@@ -952,7 +952,7 @@ Page({
})
}else{
//判断是否超过最大可优惠价格
if(parseFloat(this.data.disc_money!=''?this.data.disc_money:'0')+this.data.fine_total+parseFloat(this.data.fineList[e.currentTarget.dataset.index].price)>parseFloat(this.data.priceinfo.dis_money)){
if(this.data.priceinfo.dis_money>0 && parseFloat(this.data.disc_money!=''?this.data.disc_money:'0')+this.data.fine_total+parseFloat(this.data.fineList[e.currentTarget.dataset.index].price)>parseFloat(this.data.priceinfo.dis_money)){
wx.showToast({
title: '已超过最大可优惠价格',
icon: 'none'
@@ -983,7 +983,7 @@ Page({
//输入车身优惠
inputDisc(e) {
if(parseFloat(e.detail.value)+this.data.fine_total>parseFloat(this.data.priceinfo.dis_money)){
if(this.data.priceinfo.dis_money>0 && parseFloat(e.detail.value)+this.data.fine_total>parseFloat(this.data.priceinfo.dis_money)){
wx.showToast({
title: '已超过最大可优惠价格',
icon: 'none'
pages/order/register/index.wxml
+2 -2
View File
@@ -180,7 +180,7 @@
</picker>
</view>
</view>
<view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{priceinfo.dis_money}}">
<view class="relative bbs-1-eb last-b-none pl180 font-28">
<view class="absolute left-0 box-middle">车身优惠</view>
<view class="relative pr40">
<input class="wp100 height-100 text-right font-28" placeholder-class="color-ccc" type="text" placeholder="请输入车身优惠金额" bindinput='inputDisc' data-key="disc_money" name='disc_money' value="{{disc_money}}" />
@@ -205,7 +205,7 @@
</checkbox-group>
</view>
</view>
<view class="bbs-1-eb last-b-none" wx:if="{{priceinfo.dis_money}}">
<view class="bbs-1-eb last-b-none">
<view class="relative pl190">
<view class="absolute left-0 box-middle font-28 color-333">精品赠送</view>
<view class="pt30 pb30 text-right font-28 color-666">