From c21b3fa86de732cacf25f1d2f4b8dd2fa383cfc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=81=E5=8F=B6?= <yerz@shengshi.com.cn>
Date: Mon, 15 Nov 2021 17:05:07 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=BC=98=E6=83=A0=E9=87=91?=
 =?UTF-8?q?=E9=A2=9D=E8=AE=BE=E7=BD=AE=E4=B8=BA0=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=8D=E5=88=A4=E6=96=AD=E9=99=90=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/edit/index.js       | 4 ++--
 pages/order/edit/index.wxml     | 4 ++--
 pages/order/register/index.js   | 4 ++--
 pages/order/register/index.wxml | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pages/order/edit/index.js b/pages/order/edit/index.js
index 837e0da..1bec4b0 100644
--- a/pages/order/edit/index.js
+++ b/pages/order/edit/index.js
@@ -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'
diff --git a/pages/order/edit/index.wxml b/pages/order/edit/index.wxml
index 490c0fa..35d669e 100644
--- a/pages/order/edit/index.wxml
+++ b/pages/order/edit/index.wxml
@@ -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">
diff --git a/pages/order/register/index.js b/pages/order/register/index.js
index fb27a78..2cb2f0f 100644
--- a/pages/order/register/index.js
+++ b/pages/order/register/index.js
@@ -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'
diff --git a/pages/order/register/index.wxml b/pages/order/register/index.wxml
index 7a8d91e..b7d6d13 100644
--- a/pages/order/register/index.wxml
+++ b/pages/order/register/index.wxml
@@ -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">