From f31d3481348db5d21f280a70915e575ec12f8dc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=81=E5=8F=B6?= <yerz@shengshi.com.cn>
Date: Fri, 18 Mar 2022 15:53:53 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/detail/index2.wxml  | 14 +++++++-------
 pages/order/edit/index2.js      | 12 ++++++++----
 pages/order/register/index.wxml |  6 +++---
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/pages/order/detail/index2.wxml b/pages/order/detail/index2.wxml
index f11a193..109db2d 100644
--- a/pages/order/detail/index2.wxml
+++ b/pages/order/detail/index2.wxml
@@ -110,7 +110,7 @@
       <block wx:if="{{imgInfo.img_status==1}}">
         <!--上传身份证-->
         <block wx:if="{{info.main_type == 0}}">
-          <view class="mt40 font-32">上传身份证</view>
+          <view class="mt40 font-32">身份证</view>
           <view class="fn-flex mt30 text-center">
             <view class="fn-flex-item relative mr10" bindtap="chooseImg" data-type="cardida">
               <block wx:if="{{cardida.value}}">
@@ -154,7 +154,7 @@
         </block>
         <!--上传营业执照-->
         <block wx:elif="{{info.main_type == 1}}">
-          <view class="mt40 font-32">上传营业执照</view>
+          <view class="mt40 font-32">营业执照</view>
           <view class="mt30 text-center">
             <view class="inline-block img-300x200 relative ulib-r10 overflowhidden" bindtap="chooseImg" data-type="business_licence">
               <block wx:if="{{business_licence.value}}">
@@ -177,8 +177,8 @@
             </view>
           </view>
         </block>
-        <!--上传国家补材料-->
-        <view class="mt40 font-32">上传国家补材料</view>
+        <!--上传上牌材料-->
+        <view class="mt40 font-32">上牌材料</view>
         <view class="fn-flex mt30 text-center">
           <view class="fn-flex-item relative mr10" bindtap="chooseImg" data-type="register_img">
             <block wx:if="{{register_img.value}}">
@@ -214,7 +214,7 @@
           </view>
         </view>
         <!--上传保单-->
-        <view class="mt40 font-32">上传保单</view>
+        <view class="mt40 font-32">保单</view>
         <view class="mt30 pb20 text-center">
           <scroll-view class="space-nowrap" scroll-x="true">
             <block wx:for='{{ins_img}}' wx:for-item='ins_img' wx:key='index'>
@@ -234,7 +234,7 @@
           </scroll-view>
         </view>
         <!--上传交车合照-->
-        <view class="mt40 font-32">上传交车合照</view>
+        <view class="mt40 font-32">交车合照</view>
         <view class="mt30 pb20 text-center">
           <scroll-view class="space-nowrap" scroll-x="true">
             <block wx:for='{{other_img}}' wx:for-item='other_img' wx:key='index'>
@@ -284,7 +284,7 @@
         </block>
         <!--国家补材料-->
         <block wx:if="{{imgInfo.imgs.register_img.img||imgInfo.imgs.car_img.img}}">
-          <view class="mt40 font-32">国家补材料</view>
+          <view class="mt40 font-32">上牌材料</view>
           <view class="fn-flex mt30 text-center">
             <view class="fn-flex-item relative mr10">
               <view class="inline-block bg-f8 img-300x200 relative ulib-r10 overflowhidden" wx:if="{{imgInfo.imgs.register_img.img}}" bindtap="previewImage" data-type="register_img">  
diff --git a/pages/order/edit/index2.js b/pages/order/edit/index2.js
index edfe201..46d56ca 100644
--- a/pages/order/edit/index2.js
+++ b/pages/order/edit/index2.js
@@ -225,7 +225,7 @@ Page({
                                         priceinfo:res10.data,
                                         'priceinfo.sdeposit':res.data.deposit?res.data.deposit:'',
                                         'priceinfo.sdisc_money':res.data.disc_money?res.data.disc_money:'',
-                                        'priceinfo.sdisc_fine_money':res.data.disc_fine_money?res.data.disc_fine_money:'',
+                                        //'priceinfo.sdisc_fine_money':res.data.disc_fine_money?res.data.disc_fine_money:'',
                                       })
                                     }).catch(res => {
                                       this.setData({
@@ -744,6 +744,11 @@ Page({
           business_type:2,
           priceinfo:res.data,
         })
+        if(this.data.info.deposit){
+          this.setData({
+            'priceinfo.sdeposit':this.data.info.deposit,
+          })
+        }
       }).catch(res => {
         this.setData({
           business_type:3,
@@ -807,9 +812,7 @@ Page({
     params['payway'] = that.data.paymentIndex==0?'1':'0';
     params['delry_time'] = that.data.delry_time;
     params['business_id'] = that.data.priceinfo.id;
-    if(!!that.data.priceinfo.sdisc_money && that.data.priceinfo.sdisc_money != '' ){
-      params['disc_money'] = that.data.priceinfo.sdisc_money;
-    }
+    params['disc_money'] = that.data.priceinfo.sdisc_money?that.data.priceinfo.sdisc_money:0;
     let srv_arr = []
     that.data.agencyList.forEach(item => {
       if(item.checked){
@@ -826,6 +829,7 @@ Page({
     if(fines.length>0){
       params['fines'] = fines;
     }
+    //精品优惠金额
     // if(that.data.priceinfo.fine_money){
     //   params['if_fine'] = that.data.if_fine?'1':'0';
     //   if(that.data.if_fine&&!!that.data.priceinfo.sdisc_fine_money&&that.data.priceinfo.sdisc_fine_money!= ''){
diff --git a/pages/order/register/index.wxml b/pages/order/register/index.wxml
index 957072d..830795b 100644
--- a/pages/order/register/index.wxml
+++ b/pages/order/register/index.wxml
@@ -107,9 +107,9 @@
               </view>
             </view>
             <view class="relative bbs-1-eb last-b-none pl180 font-28">
-              <view class="absolute left-0 box-middle">企业信用代号<text class="color-f9394d">*</text></view>
+              <view class="absolute left-0 box-middle">企业信用代码<text class="color-f9394d">*</text></view>
               <view>
-                <input class="wp100 height-100 text-right font-28" placeholder-class="color-ccc" type="text" placeholder="请输入企业信用代号" model:value='{{credit}}' 	disabled='{{isShowSelectCustomer||isShowRemarks?true:false}}' always-embed='{{true}}' />
+                <input class="wp100 height-100 text-right font-28" placeholder-class="color-ccc" type="text" placeholder="请输入企业信用代码" model:value='{{credit}}' 	disabled='{{isShowSelectCustomer||isShowRemarks?true:false}}' always-embed='{{true}}' />
               </view>
             </view>
           </view>
@@ -386,7 +386,7 @@
       </view>
     </view>
     <view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{credit}}">
-      <view class="absolute left-0 box-middle color-333">企业信用代号</view>
+      <view class="absolute left-0 box-middle color-333">企业信用代码</view>
       <view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx;">
         <text>{{credit}}</text>
       </view>