From 25d006d3c6a6ef2912f91f84d35f7d92decaa76b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=81=E5=8F=B6?= <yerz@shengshi.com.cn>
Date: Tue, 25 Jan 2022 15:11:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=A1=E6=81=AF=E8=B0=83=E6=95=B4?=
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       | 53 ++++++++++++++++++++++++++++++--
 pages/order/edit/index2.wxml     | 12 ++++++--
 pages/order/editOwner/index.wxml |  6 ++--
 pages/order/register/index.js    | 53 ++++++++++++++++++++++++++++++--
 pages/order/register/index.wxml  | 32 +++++++++++--------
 6 files changed, 145 insertions(+), 25 deletions(-)

diff --git a/pages/order/detail/index2.wxml b/pages/order/detail/index2.wxml
index 79c3e5f..a20b4b9 100644
--- a/pages/order/detail/index2.wxml
+++ b/pages/order/detail/index2.wxml
@@ -13,6 +13,10 @@
         <view class="absolute left-0 box-middle font-28 color-333">客户手机号</view>
         <view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx">{{info.mobile}}</view>
       </view>
+      <view class="relative bbs-1-eb pl140 font-28">
+        <view class="absolute left-0 box-middle font-28 color-333">客户身份证</view>
+        <view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx">{{info.cardid}}</view>
+      </view>
       <view class="mt40 relative fn-clear">
         <view class="fn-fl pt10 font-32">{{info.main_type==0?'车主信息':'企业信息'}}</view>
         <view class="fn-fr">
@@ -21,17 +25,21 @@
       </view>
       <block wx:if="{{info.main_type==0}}">
         <view class="relative bbs-1-eb pl140 font-28">
-          <view class="absolute left-0 box-middle font-28 color-333">客户姓名</view>
+          <view class="absolute left-0 box-middle font-28 color-333">车主姓名</view>
           <view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx">{{info.owner_name}}</view>
         </view>
         <view class="relative bbs-1-eb pl140 font-28">
-          <view class="absolute left-0 box-middle font-28 color-333">客户手机号</view>
+          <view class="absolute left-0 box-middle font-28 color-333">车主手机号</view>
           <view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx">{{info.owner_mobile}}</view>
         </view>
         <view class="relative bbs-1-eb pl140 font-28">
-          <view class="absolute left-0 box-middle font-28 color-333">客户身份证</view>
+          <view class="absolute left-0 box-middle font-28 color-333">车主身份证</view>
           <view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx">{{info.owner_cardid}}</view>
         </view>
+        <view class="relative bbs-1-eb pl140 font-28">
+          <view class="absolute left-0 box-middle font-28 color-333">车主地址</view>
+          <view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx">{{info.address}}</view>
+        </view>
       </block>
       <block wx:if="{{info.main_type==1}}">
         <view class="relative bbs-1-eb pl140 font-28">
diff --git a/pages/order/edit/index2.js b/pages/order/edit/index2.js
index 03f418b..c197eed 100644
--- a/pages/order/edit/index2.js
+++ b/pages/order/edit/index2.js
@@ -800,8 +800,12 @@ Page({
       params['size'] = 100;
       params['id'] = this.data.id;
       _.apiQuery.getAppServices(params).then(res => {
+        let agencyList = res.data.list
+        agencyList.forEach(item => {
+          item.sprice = item.price
+        })
         this.setData({
-          agencyList:res.data.list,
+          agencyList,
         })
       });
     }
@@ -984,7 +988,7 @@ Page({
       values.forEach(item2 => {
         if(item1.id == item2){
           item1.checked = true
-          srv_total = srv_total +  parseFloat(item1.price)
+          srv_total = srv_total +  parseFloat(item1.sprice)
         }
       })
     })
@@ -1072,6 +1076,51 @@ Page({
     }
   },
 
+  //快截输入价格
+  fillAgency(e){
+    this.setData({
+      ['agencyList['+e.currentTarget.dataset.index+'].sprice']:parseFloat(e.currentTarget.dataset.sprice),
+    })
+    let srv_total = 0
+    this.data.agencyList.forEach(item => {
+      if(item.checked&&parseFloat(item.sprice)>0){
+        srv_total = srv_total +  parseFloat(item.sprice)
+      }
+    })
+    this.setData({
+      srv_total,
+    })
+  },
+
+  //修改代办金额
+  inputAgency(e){
+    this.setData({
+      ['agencyList['+e.currentTarget.dataset.index+'].sprice']:parseFloat(e.detail.value),
+    })
+    let srv_total = 0
+    this.data.agencyList.forEach(item => {
+      if(item.checked&&parseFloat(item.sprice)>0){
+        srv_total = srv_total +  parseFloat(item.sprice)
+      }
+    })
+    this.setData({
+      srv_total,
+    })
+  },
+
+  //判断修改代办金额
+  inputBlurAgency(e){
+    if(this.data.agencyList[e.currentTarget.dataset.index].price>this.data.agencyList[e.currentTarget.dataset.index].sprice){
+      wx.showToast({
+        title: '代办费设置过低',
+        icon: 'none'
+      })
+      this.setData({
+        ['agencyList['+e.currentTarget.dataset.index+'].sprice']:this.data.agencyList[e.currentTarget.dataset.index].price,
+      })
+    }
+  },
+
   //页面相关事件处理函数--监听用户下拉动作
   onPullDownRefresh(){
     this.getAppCusorderV2()
diff --git a/pages/order/edit/index2.wxml b/pages/order/edit/index2.wxml
index 6fe4148..0611d84 100644
--- a/pages/order/edit/index2.wxml
+++ b/pages/order/edit/index2.wxml
@@ -104,7 +104,7 @@
           <view class="pt30 pb30 text-right font-28 color-666">
             <view class="fn-clear">
               <block wx:for="{{priceinfo.deposit_list}}" wx:key='index'>
-                <view class="inline-block radio-btn mr20 pt15 pb15 pl25 pr25 ulib-r10 font-28 {{deposit == item?'bg-333 color-fff':'bg-f8'}}" bindtap="depositPicker" data-deposit="{{item}}">
+                <view class="inline-block radio-btn mr20 pt15 pb15 pl25 pr25 ulib-r10 font-28 {{deposit == item?'bg-36afa2 color-fff':'bg-f8'}}" bindtap="depositPicker" data-deposit="{{item}}">
                   {{item}}
                 </view>
               </block>
@@ -141,11 +141,17 @@
           <view class="pb10">
             <checkbox-group bindchange="changeAgency">
               <block wx:for="{{agencyList}}" wx:key='index'>
-                <view class="mb20 block relative inner30 bg-f6 font-28 ulib-r10 fn-clear">
-                  <label class="fn-fl">
+                <view class="mb20 block relative height-100 pl220 pr30 bg-f6 font-28 ulib-r10">
+                  <label class="absolute box-middle left-0 ml30">
                     <text class="text-middle">{{item.title}}</text>
                     <checkbox class="text-middle ml15" value="{{item.id}}" checked="{{item.checked}}"/>
                   </label>
+                  <view class="text-right" wx:if="{{item.checked&&item.price>0}}">
+                    <text class="inline-block ml5 mr5 pt10 pb10 pl15 pr15 text-middle font-24 ulib-r10 {{item.sprice == item.price?'bg-36afa2 color-fff':'bg-e4 color-666'}}" bindtap="fillAgency" data-index="{{index}}" data-sprice="{{item.price}}">{{item.price}}</text>
+                    <text class="inline-block ml5 mr5 pt10 pb10 pl15 pr15 text-middle font-24 ulib-r10 {{item.sprice == item.price+200?'bg-36afa2 color-fff':'bg-e4 color-666'}}" bindtap="fillAgency" data-index="{{index}}" data-sprice="{{item.price+200}}">{{item.price+200}}</text>
+                    <text class="inline-block ml5 mr5 pt10 pb10 pl15 pr15 text-middle font-24 ulib-r10 {{item.sprice == item.price+400?'bg-36afa2 color-fff':'bg-e4 color-666'}}" bindtap="fillAgency" data-index="{{index}}" data-sprice="{{item.price+400}}">{{item.price+400}}</text>
+                    <input class="inline-block text-middle wp20 height-100 text-right font-28" placeholder-class="color-ccc" type="text" placeholder="价格" bindinput='inputAgency' bindblur='inputBlurAgency' data-index="{{index}}" value="{{item.sprice}}" />
+                  </view>
                 </view>
               </block>
             </checkbox-group>
diff --git a/pages/order/editOwner/index.wxml b/pages/order/editOwner/index.wxml
index c8e2506..85c0458 100644
--- a/pages/order/editOwner/index.wxml
+++ b/pages/order/editOwner/index.wxml
@@ -3,19 +3,19 @@
     <block wx:if="{{main_type==0}}">
       <view class="mt10 pt20 pb20 bg-e3f5f3 font-36 text-center ulib-r10">车主信息</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='{{owner_name}}' 	disabled='{{isShowSelectCustomer||isShowRemarks?true:false}}' />
         </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="number" placeholder="请输入客户手机号码" model:value='{{owner_mobile}}' disabled='{{isShowSelectCustomer||isShowRemarks?true:false}}' />
         </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="idcard" placeholder="请输入客户身份证" model:value='{{owner_cardid}}' 	disabled='{{isShowSelectCustomer||isShowRemarks?true:false}}' />
         </view>
diff --git a/pages/order/register/index.js b/pages/order/register/index.js
index 6b2b715..8992c43 100644
--- a/pages/order/register/index.js
+++ b/pages/order/register/index.js
@@ -600,8 +600,12 @@ Page({
       params['page'] = 1;
       params['size'] = 100;
       _.apiQuery.getAppServices(params).then(res => {
+        let agencyList = res.data.list
+        agencyList.forEach(item => {
+          item.sprice = item.price
+        })
         this.setData({
-          agencyList:res.data.list,
+          agencyList,
         })
       });
     }
@@ -957,7 +961,7 @@ Page({
       values.forEach(item2 => {
         if(item1.id == item2){
           item1.checked = true
-          srv_total = srv_total +  parseFloat(item1.price)
+          srv_total = srv_total +  parseFloat(item1.sprice)
         }
       })
     })
@@ -1060,4 +1064,49 @@ Page({
     }
   },
 
+  //快截输入价格
+  fillAgency(e){
+    this.setData({
+      ['agencyList['+e.currentTarget.dataset.index+'].sprice']:parseFloat(e.currentTarget.dataset.sprice),
+    })
+    let srv_total = 0
+    this.data.agencyList.forEach(item => {
+      if(item.checked&&parseFloat(item.sprice)>0){
+        srv_total = srv_total +  parseFloat(item.sprice)
+      }
+    })
+    this.setData({
+      srv_total,
+    })
+  },
+
+  //修改代办金额
+  inputAgency(e){
+    this.setData({
+      ['agencyList['+e.currentTarget.dataset.index+'].sprice']:parseFloat(e.detail.value),
+    })
+    let srv_total = 0
+    this.data.agencyList.forEach(item => {
+      if(item.checked&&parseFloat(item.sprice)>0){
+        srv_total = srv_total +  parseFloat(item.sprice)
+      }
+    })
+    this.setData({
+      srv_total,
+    })
+  },
+
+  //判断修改代办金额
+  inputBlurAgency(e){
+    if(this.data.agencyList[e.currentTarget.dataset.index].price>this.data.agencyList[e.currentTarget.dataset.index].sprice){
+      wx.showToast({
+        title: '代办费设置过低',
+        icon: 'none'
+      })
+      this.setData({
+        ['agencyList['+e.currentTarget.dataset.index+'].sprice']:this.data.agencyList[e.currentTarget.dataset.index].price,
+      })
+    }
+  },
+
 })
\ No newline at end of file
diff --git a/pages/order/register/index.wxml b/pages/order/register/index.wxml
index cd0241f..3996cc6 100644
--- a/pages/order/register/index.wxml
+++ b/pages/order/register/index.wxml
@@ -72,21 +72,21 @@
           </view>
           <view class="mt20 pt10 pb10 pl30 pr30 bg-fff ulib-r10 box-shadow-000-10-10">
             <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='{{owner_name}}' 	disabled='{{isShowSelectCustomer||isShowRemarks?true:false}}' />
+                <input class="wp100 height-100 text-right font-28" placeholder-class="color-ccc" type="text" placeholder="请输入车主姓名" model:value='{{owner_name}}' 	disabled='{{isShowSelectCustomer||isShowRemarks?true:false}}' />
               </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="number" placeholder="请输入客户手机号码" model:value='{{owner_mobile}}' disabled='{{isShowSelectCustomer||isShowRemarks?true:false}}' />
+                <input class="wp100 height-100 text-right font-28" placeholder-class="color-ccc" type="number" placeholder="请输入车主手机号码" model:value='{{owner_mobile}}' disabled='{{isShowSelectCustomer||isShowRemarks?true:false}}' />
               </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="idcard" placeholder="请输入客户身份证" model:value='{{owner_cardid}}' 	disabled='{{isShowSelectCustomer||isShowRemarks?true:false}}' />
+                <input class="wp100 height-100 text-right font-28" placeholder-class="color-ccc" type="idcard" placeholder="请输入车主身份证" model:value='{{owner_cardid}}' 	disabled='{{isShowSelectCustomer||isShowRemarks?true:false}}' />
               </view>
             </view>
             <view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{main_type==0}}">
@@ -208,7 +208,7 @@
           <view class="pt30 pb30 text-right font-28 color-666">
             <view class="fn-clear">
               <block wx:for="{{priceinfo.deposit_list}}" wx:key='index'>
-                <view class="inline-block radio-btn mr20 pt15 pb15 pl25 pr25 ulib-r10 font-28 {{deposit == item?'bg-333 color-fff':'bg-f8'}}" bindtap="depositPicker" data-deposit="{{item}}">
+                <view class="inline-block radio-btn mr20 pt15 pb15 pl25 pr25 ulib-r10 font-28 {{deposit == item?'bg-36afa2 color-fff':'bg-f8'}}" bindtap="depositPicker" data-deposit="{{item}}">
                   {{item}}
                 </view>
               </block>
@@ -242,13 +242,21 @@
               当前代办费用：<text class="color-f9394d">{{srv_total}}</text>元
             </view>
           </view>
-          <view class="pb10 fn-clear">
+          <view class="pb10">
             <checkbox-group bindchange="changeAgency">
               <block wx:for="{{agencyList}}" wx:key='index'>
-                <label class="fn-fl block mb20 wp31 relative inner30 bg-f6 font-28 ulib-r10 {{(index+1)%3==0?'':'mr20'}}">
-                  <text>{{item.title}}</text>
-                  <checkbox class="absolute right-0 box-middle mr15" value="{{item.id}}" checked="{{item.checked}}"/>
-                </label>
+                <view class="mb20 block relative height-100 pl220 pr30 bg-f6 font-28 ulib-r10">
+                  <label class="absolute box-middle left-0 ml30">
+                    <text class="text-middle">{{item.title}}</text>
+                    <checkbox class="text-middle ml15" value="{{item.id}}" checked="{{item.checked}}"/>
+                  </label>
+                  <view class="text-right" wx:if="{{item.checked&&item.price>0}}">
+                    <text class="inline-block ml5 mr5 pt10 pb10 pl15 pr15 text-middle font-24 ulib-r10 {{item.sprice == item.price?'bg-36afa2 color-fff':'bg-e4 color-666'}}" bindtap="fillAgency" data-index="{{index}}" data-sprice="{{item.price}}">{{item.price}}</text>
+                    <text class="inline-block ml5 mr5 pt10 pb10 pl15 pr15 text-middle font-24 ulib-r10 {{item.sprice == item.price+200?'bg-36afa2 color-fff':'bg-e4 color-666'}}" bindtap="fillAgency" data-index="{{index}}" data-sprice="{{item.price+200}}">{{item.price+200}}</text>
+                    <text class="inline-block ml5 mr5 pt10 pb10 pl15 pr15 text-middle font-24 ulib-r10 {{item.sprice == item.price+400?'bg-36afa2 color-fff':'bg-e4 color-666'}}" bindtap="fillAgency" data-index="{{index}}" data-sprice="{{item.price+400}}">{{item.price+400}}</text>
+                    <input class="inline-block text-middle wp20 height-100 text-right font-28" placeholder-class="color-ccc" type="text" placeholder="价格" bindinput='inputAgency' bindblur='inputBlurAgency' data-index="{{index}}" value="{{item.sprice}}" />
+                  </view>
+                </view>
               </block>
             </checkbox-group>
           </view>