From 46b0dad571b606d62d6918d46e9f6730fb91dea7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=81=E5=8F=B6?= <yerz@shengshi.com.cn>
Date: Mon, 24 Jan 2022 16:47:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.json                         |   3 +-
 pages/order/detail/index2.wxml   | 181 +++++++++++++++++--------------
 pages/order/edit/index2.js       |  22 ++--
 pages/order/edit/index2.wxml     |  64 +++++------
 pages/order/editOwner/index.js   | 129 ++++++++++++++++++++++
 pages/order/editOwner/index.json |   3 +
 pages/order/editOwner/index.wxml |  44 ++++++++
 pages/order/editOwner/index.wxss |   1 +
 pages/order/index.js             |  48 +-------
 pages/order/index.wxml           |  78 ++++++++-----
 pages/order/register/index.js    |  15 ++-
 pages/order/register/index.wxml  |  66 +++++------
 12 files changed, 421 insertions(+), 233 deletions(-)
 create mode 100644 pages/order/editOwner/index.js
 create mode 100644 pages/order/editOwner/index.json
 create mode 100644 pages/order/editOwner/index.wxml
 create mode 100644 pages/order/editOwner/index.wxss

diff --git a/app.json b/app.json
index ae42324..6897e07 100644
--- a/app.json
+++ b/app.json
@@ -36,7 +36,8 @@
     "pages/allot/index",
     "pages/storeInfo/index",
     "pages/order/detail/index2",
-    "pages/order/edit/index2"
+    "pages/order/edit/index2",
+    "pages/order/editOwner/index"
   ],
   "echarts": [
     {
diff --git a/pages/order/detail/index2.wxml b/pages/order/detail/index2.wxml
index 17a2839..79c3e5f 100644
--- a/pages/order/detail/index2.wxml
+++ b/pages/order/detail/index2.wxml
@@ -2,25 +2,49 @@
   <view style="min-height:87vh">
     <view class="pl30 pr30">
       <view class="mt20 relative">
-        <view class="font-32">用户信息</view>
+        <view class="font-32">购车人信息</view>
         <view class="absolute right-0 box-middle font-22 color-666">销售顾问：<text class="color-36afa2">{{userInfo.uname}}</text></view>
       </view>
-      <view class="mt20 pl40 pr40 pt10 pb10 relative ulib-r10 box-shadow-000-10-10 overflowhidden">
-        <view class="pt30 pb30 font-28">
-          <view class="font-32">{{info.name}}</view>
-          <view class="mt5 font-22 color-666">手机号：{{info.mobile}}</view>
-        </view>
-        <view class="absolute right-0 mr30 box-middle">
-          <view class="inline-block relative img-55x55 bg-333 font-28 color-fff mr30 ulib-r750" catchtap="showMessage" data-id="{{info.id}}">
-            <i class="absolute box-center-middle iconfont icon-duanxinguanli"></i>
-          </view>
-          <view class="inline-block relative img-55x55 bg-333 font-28 color-fff ulib-r750" catchtap="call" data-id="{{info.id}}">
-            <i class="absolute box-center-middle iconfont icon-dianhua"></i>
-          </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.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="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx">{{info.mobile}}</view>
+      </view>
+      <view class="mt40 relative fn-clear">
+        <view class="fn-fl pt10 font-32">{{info.main_type==0?'车主信息':'企业信息'}}</view>
+        <view class="fn-fr">
+          <button bindtap="{{info.edit_status==1?'pushLink':''}}" data-url="/pages/order/editOwner/index?id={{id}}" class="inline-block font-22 color-fff ulib-r10  {{info.edit_status==1?'btn-36afa2':'bg-999'}}" hover-class="btn-36afa2-hover"><i class="iconfont icon-dengji mr10"></i>编辑</button>
         </view>
       </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="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="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="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx">{{info.owner_cardid}}</view>
+        </view>
+      </block>
+      <block wx:if="{{info.main_type==1}}">
+        <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.company}}</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.credit}}</view>
+        </view>
+      </block>
       <view class="mt40 fn-clear">
-        <view class="fn-fl pt10 font-32">车辆信息</view>
+        <view class="fn-fl pt10 font-32">订单信息</view>
         <view class="fn-fr">
           <button bindtap="{{info.edit_status==1?'pushLink':''}}" data-url="/pages/order/edit/index2?id={{id}}" class="inline-block font-22 color-fff ulib-r10  {{info.edit_status==1?'btn-36afa2':'bg-999'}}" hover-class="btn-36afa2-hover"><i class="iconfont icon-dengji mr10"></i>编辑</button>
         </view>
@@ -61,68 +85,6 @@
       <view class="mt40 font-32">开票信息</view>
       <view class="mt20"><image bindtap="previewImage" data-type="bill_img" class='wp100' lazy-load="{{true}}" mode="widthFix" src="{{imgInfo.imgs.bill_img.img}}"></image></view>
     </view>
-
-    <!--交付随车信息-->
-    <block wx:if="{{info.ckcar_status == 1}}">
-      <view class="pl30">
-        <view>
-          <view class="mr30 pt30 pb30 font-28 color-333">随车资料</view>
-          <view class="fn-clear">
-            <checkbox-group bindchange="changeMaterial">
-              <block wx:for="{{carInfoList}}" wx:key='index'>
-                <label class="fn-fl block mb20 relative inner30 pr80 bg-f6 font-28 ulib-r10 mr20">
-                  <text>{{item.title}}</text>
-                  <checkbox class="absolute right-0 box-middle mr15" value="{{item.title}}" checked="{{item.checked}}"/>
-                </label>
-              </block>
-            </checkbox-group>
-          </view>
-        </view>
-        <view>
-          <view class="mr30 pt30 pb30 font-28 color-333">随车工具</view>
-          <view class="fn-clear">
-            <checkbox-group bindchange="changeTool">
-              <block wx:for="{{carToolList}}" wx:key='index'>
-                <label class="fn-fl block mb20 relative inner30 pr80 bg-f6 font-28 ulib-r10 mr20">
-                  <text>{{item.title}}</text>
-                  <checkbox class="absolute right-0 box-middle mr15" value="{{item.title}}" checked="{{item.checked}}"/>
-                </label>
-              </block>
-            </checkbox-group>
-          </view>
-        </view>
-        <view class="pr30">
-          <view class="pt30 pb30 font-28 color-333">补充说明</view>
-          <textarea class="wp100 inner20 bds-1-eb font-28 ulib-r10" style="height:120rpx;" placeholder-class="color-ccc" maxlength='140' placeholder="请输入补充说明" model:value="{{remark}}" />
-        </view>
-      </view>
-      <view class="mt60 pl60 pr60">
-        <button class="wp100 btn-36afa2 pt10 pb10 text-center font-32 color-fff ulib-r750" hover-class="btn-36afa2-hover" disabled="{{submitFlag}}" bindtap="putAppCusorderCkcar">确认随车物品</button>
-      </view>
-    </block>
-    <view class="pl30 pr30" wx:if="{{info.ckcar_status == 0&&info.ckcar_data.info.length>0}}">
-      <view class="relative bbs-1-eb 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;">
-          <block wx:for="{{info.ckcar_data.info}}" wx:key='index'>
-            <text class="pl10">{{item}}</text>
-          </block>
-        </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;">
-          <block wx:for="{{info.ckcar_data.tool}}" wx:key='index'>
-            <text class="pl10">{{item}}</text>
-          </block>
-        </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.ckcar_data.remark}}</view>
-      </view>
-    </view>
-    <!--end交付随车信息-->
     
     <!--图片-->
     <view class="pl30 pr30">
@@ -343,10 +305,71 @@
     </view>
   </view>
 
+  <!--交付随车信息-->
+  <block wx:if="{{info.ckcar_status == 1}}">
+      <view class="pl30">
+        <view>
+          <view class="mr30 pt30 pb30 font-28 color-333">随车资料</view>
+          <view class="fn-clear">
+            <checkbox-group bindchange="changeMaterial">
+              <block wx:for="{{carInfoList}}" wx:key='index'>
+                <label class="fn-fl block mb20 relative inner30 pr80 bg-f6 font-28 ulib-r10 mr20">
+                  <text>{{item.title}}</text>
+                  <checkbox class="absolute right-0 box-middle mr15" value="{{item.title}}" checked="{{item.checked}}"/>
+                </label>
+              </block>
+            </checkbox-group>
+          </view>
+        </view>
+        <view>
+          <view class="mr30 pt30 pb30 font-28 color-333">随车工具</view>
+          <view class="fn-clear">
+            <checkbox-group bindchange="changeTool">
+              <block wx:for="{{carToolList}}" wx:key='index'>
+                <label class="fn-fl block mb20 relative inner30 pr80 bg-f6 font-28 ulib-r10 mr20">
+                  <text>{{item.title}}</text>
+                  <checkbox class="absolute right-0 box-middle mr15" value="{{item.title}}" checked="{{item.checked}}"/>
+                </label>
+              </block>
+            </checkbox-group>
+          </view>
+        </view>
+        <view class="pr30">
+          <view class="pt30 pb30 font-28 color-333">补充说明</view>
+          <textarea class="wp100 inner20 bds-1-eb font-28 ulib-r10" style="height:120rpx;" placeholder-class="color-ccc" maxlength='140' placeholder="请输入补充说明" model:value="{{remark}}" />
+        </view>
+      </view>
+      <view class="mt40 pb60 pl60 pr60">
+        <button class="wp100 btn-36afa2 pt10 pb10 text-center font-32 color-fff ulib-r750" hover-class="btn-36afa2-hover" disabled="{{submitFlag}}" bindtap="putAppCusorderCkcar">确认交车</button>
+      </view>
+    </block>
+    <view class="pl30 pr30" wx:if="{{info.ckcar_status == 0&&info.ckcar_data.info.length>0}}">
+      <view class="relative bbs-1-eb 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;">
+          <block wx:for="{{info.ckcar_data.info}}" wx:key='index'>
+            <text class="pl10">{{item}}</text>
+          </block>
+        </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;">
+          <block wx:for="{{info.ckcar_data.tool}}" wx:key='index'>
+            <text class="pl10">{{item}}</text>
+          </block>
+        </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.ckcar_data.remark}}</view>
+      </view>
+    </view>
+    <!--end交付随车信息-->
+
   <!--邀请签名 收取意向金 操作-->
-  <view class="mt40 pt20 pl30 pr30 pb40 bg-000-op80 fn-flex">
-    <button bindtap="optShowCode" class="fn-flex-item ml20 mr20 btn-36afa2 wp100 font-28 color-fff ulib-r750" hover-class="btn-36afa2-hover"><i class="iconfont mr5 icon-qianming"></i>邀请签名</button>
-    <button wx:if="{{info.pay_status == 1}}" bindtap="optShowOrderCode" class="fn-flex-item ml20 mr20 btn-36afa2 wp100 font-28 color-fff ulib-r750" hover-class="btn-36afa2-hover"><i class="iconfont mr5 icon-zhifu"></i>收取意向金</button>
+  <view class="mt40 pt20 pl30 pr30 pb40 bg-000-op80 fn-flex" wx:if="{{info.pay_status == 1}}">
+    <button bindtap="optShowOrderCode" class="fn-flex-item ml20 mr20 btn-36afa2 wp100 font-28 color-fff ulib-r750" hover-class="btn-36afa2-hover"><i class="iconfont mr5 icon-zhifu"></i>收取意向金</button>
   </view>
 
 </view>
diff --git a/pages/order/edit/index2.js b/pages/order/edit/index2.js
index 9bd3e6c..3f9bef2 100644
--- a/pages/order/edit/index2.js
+++ b/pages/order/edit/index2.js
@@ -447,11 +447,6 @@ Page({
             title: '请选择内饰颜色',
             icon: 'none'
           })
-        }else if(this.data.deposit == '' ){
-          wx.showToast({
-            title: '请选择定金',
-            icon: 'none'
-          })
         }else{
           this.setData({
             step:3,
@@ -482,8 +477,12 @@ Page({
             title: '请输入期望交付时间',
             icon: 'none'
           })
-        }
-        else{
+        }else if(this.data.deposit == '' ){
+          wx.showToast({
+            title: '请选择定金',
+            icon: 'none'
+          })
+        }else{
 
           let that = this
           that.setData({
@@ -1063,7 +1062,9 @@ Page({
       })
       let fine_total = 0
       this.data.fines.forEach(item => {
-        fine_total = fine_total +  parseFloat(item.price)
+        if(parseFloat(item.price)>0){
+          fine_total = fine_total +  parseFloat(item.price)
+        }
       })
       this.setData({
         fine_total,
@@ -1071,4 +1072,9 @@ Page({
     }
   },
 
+  //页面相关事件处理函数--监听用户下拉动作
+  onPullDownRefresh(){
+    this.getAppCusorderV2()
+  },
+
 })
\ No newline at end of file
diff --git a/pages/order/edit/index2.wxml b/pages/order/edit/index2.wxml
index f20ce99..25b057f 100644
--- a/pages/order/edit/index2.wxml
+++ b/pages/order/edit/index2.wxml
@@ -62,24 +62,6 @@
             </picker>
           </view>
         </view>
-        <view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{priceinfo.price}}">
-          <view class="absolute left-0 box-middle color-333">车辆平台售价</view>
-          <view class="pt30 pb30 text-right font-28 color-666" style="height:38rpx;">
-            <text>{{priceinfo.price}}元</text>
-          </view>
-        </view>
-        <view class="relative bbs-1-eb pl190 last-b-none" wx:if="{{priceinfo.deposit_list}}">
-          <view class="absolute left-0 box-middle font-28 color-333">定金<text class="color-f9394d">*</text></view>
-          <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 mt20 mr20 pt15 pb15 pl25 pr25 ulib-r10 font-28 {{deposit == item?'bg-333 color-fff':'bg-f8'}}" bindtap="depositPicker" data-deposit="{{item}}">
-                  {{item}}
-                </view>
-              </block>
-            </view>
-          </view>
-        </view>
       </view>
 
       <view wx:if="{{step == 3}}">
@@ -113,6 +95,24 @@
             </picker>
           </view>
         </view>
+        <view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{priceinfo.price}}">
+          <view class="absolute left-0 box-middle color-333">车辆平台售价</view>
+          <view class="pt30 pb30 text-right font-28 color-666" style="height:38rpx;">
+            <text>{{priceinfo.price}}元</text>
+          </view>
+        </view>
+        <view class="relative bbs-1-eb pl190 last-b-none" wx:if="{{priceinfo.deposit_list}}">
+          <view class="absolute left-0 box-middle font-28 color-333">定金<text class="color-f9394d">*</text></view>
+          <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 mt20 mr20 pt15 pb15 pl25 pr25 ulib-r10 font-28 {{deposit == item?'bg-333 color-fff':'bg-f8'}}" bindtap="depositPicker" data-deposit="{{item}}">
+                  {{item}}
+                </view>
+              </block>
+            </view>
+          </view>
+        </view>
         <view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{priceinfo.dis_money}}">
           <view class="absolute left-0 box-middle">车身优惠</view>
           <view class="relative pr40">
@@ -153,7 +153,7 @@
         </view>
         <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="absolute left-0 box-middle font-28 color-333">精品选装</view>
             <view class="pt30 pb30 text-right font-28 color-666">
               精品价值：<text class="color-f9394d">{{fine_total}}</text>元
             </view>
@@ -206,18 +206,6 @@
       <view class="absolute left-0 box-middle font-28 color-333">内饰颜色</view>
       <view class="pt30 pb30 text-right font-28 color-666">{{interiorArray[interiorIndex]}}</view>
     </view>
-    <view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{priceinfo.price}}">
-      <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>{{priceinfo.price}}元</text>
-      </view>
-    </view>
-    <view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{deposit}}">
-      <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>{{deposit}}元</text>
-      </view>
-    </view>
     <view class="mt40 font-32">其他信息</view>
     <view class="relative bbs-1-eb pl190 last-b-none">
       <view class="absolute left-0 box-middle font-28 color-333">付款方式</view>
@@ -231,6 +219,18 @@
       <view class="absolute left-0 box-middle font-28 color-333">期望交付时间</view>
       <view class="pt30 pb30 text-right font-28 color-666">{{delry_time}}</view>
     </view>
+    <view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{priceinfo.price}}">
+      <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>{{priceinfo.price}}元</text>
+      </view>
+    </view>
+    <view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{deposit}}">
+      <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>{{deposit}}元</text>
+      </view>
+    </view>
     <view class="relative bbs-1-eb pl190 last-b-none" wx:if="{{disc_money != ''}}">
       <view class="absolute left-0 box-middle font-28 color-333">车身优惠</view>
       <view class="pt30 pb30 text-right font-28 color-f9394d" style="min-height:38rpx;">{{disc_money}}元</view>
@@ -252,7 +252,7 @@
       </view>
     </view>
     <view class="relative bbs-1-eb pl190 last-b-none">
-      <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;">
         <block wx:for="{{fines}}" wx:key='index'>
           <text class="pl10" wx:if="{{item.txt}}">{{item.txt}}</text>
diff --git a/pages/order/editOwner/index.js b/pages/order/editOwner/index.js
new file mode 100644
index 0000000..66e6ab5
--- /dev/null
+++ b/pages/order/editOwner/index.js
@@ -0,0 +1,129 @@
+import _ from '../../../commons/js/commons'
+const app = getApp()
+Page({
+  data: {
+    main_type:'',//购车主体
+    owner_name:'',//车主姓名
+    owner_mobile:'',//车主手机号
+    owner_cardid:'',//车主身份证
+    company:'',//企业名称
+    credit:'',//企业信用代码
+    submitFlag:false,
+  },
+  onLoad: function (options) {
+    for (let key in options) {
+      this.setData({
+        [key]: options[key]
+      })
+    }
+
+    this.getAppCusorderV2()
+    
+  },
+  onShow: function () {
+
+  },
+
+  //获取订单详情
+  getAppCusorderV2(){
+    let params = {};
+    params['id'] = this.data.id;
+    _.apiQuery.getAppCusorderV2(params).then(res=>{
+      this.setData({
+        main_type:res.data.main_type,
+        owner_name:res.data.owner_name?res.data.owner_name:'',
+        owner_mobile:res.data.owner_mobile?res.data.owner_mobile:'',
+        owner_cardid:res.data.owner_cardid?res.data.owner_cardid:'',
+        company:res.data.company?res.data.company:'',
+        credit:res.data.credit?res.data.credit:'',
+      })
+
+      wx.stopPullDownRefresh()
+
+    })
+  },
+
+  //编辑信息
+  putAppCusorderV2Inten() {
+    if(this.data.main_type == 0&&this.data.owner_name == ''){
+      wx.showToast({
+        title: '请填写车主姓名',
+        icon: 'none'
+      })
+    }
+    else if(this.data.main_type == 0&&this.data.owner_mobile == ''){
+      wx.showToast({
+        title: '请填写车主手机号',
+        icon: 'none'
+      })
+    }
+    else if(this.data.main_type == 0&&(this.data.owner_cardid == ''|| !/^\d{6}(18|19|20)?\d{2}(0[1-9]|1[012])(0[1-9]|[12]\d|3[01])\d{3}(\d|[xX])$/.test(this.data.owner_cardid))){
+      wx.showToast({
+        title: '请填写正确车主身份证',
+        icon: 'none'
+      })
+    }
+    else if(this.data.main_type == 1&&this.data.company == ''){
+      wx.showToast({
+        title: '请填写企业名称',
+        icon: 'none'
+      })
+    }
+    else if(this.data.main_type == 1&&this.data.credit == ''){
+      wx.showToast({
+        title: '请填写企业信用代码',
+        icon: 'none'
+      })
+    }
+    else{
+      let that = this
+      that.setData({
+        submitFlag: true,
+      })
+      let params = {};
+      if(that.data.owner_name != ''){
+        params['owner_name'] = that.data.owner_name;
+      }
+      if(that.data.owner_mobile != ''){
+        params['owner_mobile'] = that.data.owner_mobile;
+      }
+      if(that.data.owner_cardid != ''){
+        params['owner_cardid'] = that.data.owner_cardid;
+      }
+      if(that.data.company != ''){
+        params['company'] = that.data.company;
+      }
+      if(that.data.credit != ''){
+        params['credit'] = that.data.credit;
+      }
+      _.apiQuery.putAppCusorderV2Inten(params).then(res => {
+
+        //刷新详情页
+        let pages = getCurrentPages();
+        let prevPage = null; //上一个页面
+        if (pages.length >= 2) {
+          prevPage = pages[pages.length - 2]; //上一个页面
+          if(prevPage.route == 'pages/order/detail/index2'){
+            prevPage.onPullDownRefresh()
+          }
+        }
+        wx.showToast({
+          title: '编辑成功',
+          icon: 'success',
+          duration: 2000
+        })
+        setTimeout(function () {
+          wx.navigateBack({
+            delta: 1
+          })
+        }, 500)
+
+      }).catch(res=>{
+        that.setData({
+          submitFlag: false,
+        })
+      });
+    }
+  },
+
+})
\ No newline at end of file
diff --git a/pages/order/editOwner/index.json b/pages/order/editOwner/index.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/pages/order/editOwner/index.json
@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/order/editOwner/index.wxml b/pages/order/editOwner/index.wxml
new file mode 100644
index 0000000..f5f1da6
--- /dev/null
+++ b/pages/order/editOwner/index.wxml
@@ -0,0 +1,44 @@
+<view class="container">
+  <view class="inner30">
+    <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>
+          <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>
+          <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>
+          <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>
+    </block>
+    <block wx:if="{{main_type==1}}">
+      <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>
+          <input class="wp100 height-100 text-right font-28" placeholder-class="color-ccc" type="text" placeholder="请输入企业名称" model:value='{{company}}' 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>
+          <input class="wp100 height-100 text-right font-28" placeholder-class="color-ccc" type="text" placeholder="请输入企业信用代号" model:value='{{credit}}' 	disabled='{{isShowSelectCustomer||isShowRemarks?true:false}}' />
+        </view>
+      </view>
+    </block>
+  </view>
+</view>
+
+<view class="fixed left-0 right-0 bottom-0 bg-fff-op90 inner40 fn-flex safe-pb">
+  <button class="wp100 btn-36afa2 pt10 pb10 text-center font-32 color-fff ulib-r750" hover-class="btn-36afa2-hover" disabled="{{submitFlag}}" bindtap="putAppCusorderV2Inten">确认编辑</button>
+</view>
\ No newline at end of file
diff --git a/pages/order/editOwner/index.wxss b/pages/order/editOwner/index.wxss
new file mode 100644
index 0000000..a638cb7
--- /dev/null
+++ b/pages/order/editOwner/index.wxss
@@ -0,0 +1 @@
+/* pages/order/editOwner/index.wxss */
\ No newline at end of file
diff --git a/pages/order/index.js b/pages/order/index.js
index 0a55244..d58e388 100644
--- a/pages/order/index.js
+++ b/pages/order/index.js
@@ -14,7 +14,6 @@ Page({
     load: true,
     loading: false,
     flag:1,
-    isShowMessage:false,//是否显示短信弹窗
     content:'',//短信内容
     isRefresh:false,//判断返回是否需要刷新
     isShowMobile: false,
@@ -137,23 +136,7 @@ Page({
       loading: false,
       flag: this.data.flag + 1
     })
-    this.getAppCusorderList()
-  },
-
-  //显示短信弹框
-  showMessage(e){
-    this.setData({
-      messageId:e.currentTarget.dataset.id,
-      isShowMessage:true,
-      content:'',
-    })
-  },
-
-  //关闭短信弹框
-  hideMessage(e){
-    this.setData({
-      isShowMessage:false,
-    })
+    this.getAppCusorderV2List()
   },
 
   //输入
@@ -164,35 +147,6 @@ Page({
     })
   },
 
-  //发短信
-  postAppSmsCusorder(){
-    if (this.data.submitFlag) return;
-    if (this.data.content == '') {
-      wx.showToast({
-        title: '请填写短信内容',
-        icon: 'none'
-      })
-    } else {
-      this.setData({
-        submitFlag: true,
-      })
-      let params = {};
-      params['id'] = this.data.messageId;
-      params['content'] = this.data.content;
-      _.apiQuery.postAppSmsCusorder(params).then(res=>{
-        this.setData({
-          isShowMessage:false,
-          submitFlag:false,
-          content:'',
-        })
-        wx.showToast({
-          title: res.msg,
-          icon: 'none'
-        })
-      })
-    }
-  },
-
   //推送链接
   pushLink(e){
     if(e.currentTarget.dataset.url){
diff --git a/pages/order/index.wxml b/pages/order/index.wxml
index 0fcafe3..c3ff598 100644
--- a/pages/order/index.wxml
+++ b/pages/order/index.wxml
@@ -1,8 +1,8 @@
 <view class="container">
 
   <view>
-    <view style="padding-top:110rpx"></view>
-    <view class="fixed top-0 left-0 right-0 bg-fff z-index-1">
+    <view style="padding-top:155rpx"></view>
+    <view class="fixed top-0 left-0 right-0 bg-fff pb10 z-index-1">
       <view class="fn-flex mt5 pl100 pr100 font-32 color-666 text-center" wx:if="{{tab.length<5}}">
         <block wx:for='{{tab}}' wx:key='list'>
           <view class="fn-flex-item pl20 pr20 tabmenu2 {{key == item.key?'active color-36afa2':''}}" data-index="{{index}}" bindtap="changeTab">
@@ -19,31 +19,29 @@
         </block>
         <view class="pl40 inline-block"></view>
       </scroll-view>
+      <view class="mt20 pl30 relative">
+        <view class="wp70 relative">
+          <view class="absolute box-center-middle font-22 color-ccc" bindtap="searchFocus" wx:if="{{searchInp.value == '' && searchInp.focus != true}}"><i class="iconfont mr10 icon-sousuo"></i>请输入客户姓名</view>
+          <input class="wp100 bg-f6 pl20 pr20 font-22 ulib-r750 text-center" bindinput="searchInput" bindfocus="searchFocus" bindblur="searchBlur" bindconfirm="searchSubmit" style="height:56rpx" type="text" />
+        </view>
+        <view bindtap="pushLink" data-url="/pages/order/register/index" class="absolute right-0 box-middle pt10 pb10 pl10 pr30 space-nowrap bg-333 font-22 color-fff ulib-rl750"><i class="iconfont mr5 icon-jia"></i>登记订单</view>
+      </view>
     </view>
   </view>
 
-  <view class="pl30 relative">
-    <view class="wp70 relative">
-      <view class="absolute box-center-middle font-22 color-ccc" bindtap="searchFocus" wx:if="{{searchInp.value == '' && searchInp.focus != true}}"><i class="iconfont mr10 icon-sousuo"></i>请输入客户姓名</view>
-      <input class="wp100 bg-f6 pl20 pr20 font-22 ulib-r750 text-center" bindinput="searchInput" bindfocus="searchFocus" bindblur="searchBlur" bindconfirm="searchSubmit" style="height:56rpx" type="text" />
-    </view>
-    <view bindtap="pushLink" data-url="/pages/order/register/index" class="absolute right-0 box-middle pt10 pb10 pl10 pr30 space-nowrap bg-333 font-22 color-fff ulib-rl750"><i class="iconfont mr5 icon-jia"></i>登记订单</view>
-  </view>
+
 
   <view class="mt30 pl30 pr30">
 
     <block wx:for='{{list}}' wx:key='index'>
       <view class="inner40 relative ulib-r10 box-shadow-000-10-10 mb30 overflowhidden" bindtap="pushLink" data-url="/pages/order/detail/index{{item.id>=v2OrderId?'2':''}}?id={{item.id}}">
-        <view class="absolute top-0 left-0 ml40 pt5 pb5 pl10 pr10 bg-36afa2 font-22 color-fff" wx:if="{{item.status_name}}">{{item.status_name}}</view>
+        <!-- <view class="absolute top-0 left-0 ml40 pt5 pb5 pl10 pr10 bg-36afa2 font-22 color-fff" wx:if="{{item.status_name}}">{{item.status_name}}</view> -->
         <view class="relative pt10 pb10 pr180">
           <view class="font-32">
             <text>{{item.name}}</text>
             <text>({{item.mobile}})</text>
           </view>
           <view class="absolute right-0 box-middle">
-            <view class="inline-block relative img-55x55 bg-333 font-28 color-fff mr30 ulib-r750" catchtap="showMessage" data-id="{{item.id}}">
-              <i class="absolute box-center-middle iconfont icon-duanxinguanli"></i>
-            </view>
             <view class="inline-block relative img-55x55 bg-333 font-28 color-fff ulib-r750" catchtap="call" data-id="{{item.id}}">
               <i class="absolute box-center-middle iconfont icon-dianhua"></i>
             </view>
@@ -57,6 +55,44 @@
           </view>
         </block>
 
+        <view class="mt25 fn-clear font-28">
+          <view class="fn-fl color-333">身份证</view>
+          <view class="fn-fr wp60 text-nowrap text-right color-666">
+            <text class="inline-block mr10 pt5 pb5 pl20 pr20 font-22 color-fff ulib-r750" style="background-color:#f9394d;">未传</text>
+          </view>
+        </view>
+        <view class="mt25 fn-clear font-28">
+          <view class="fn-fl color-333">登记证</view>
+          <view class="fn-fr wp60 text-nowrap text-right color-666">
+            <text class="inline-block mr10 pt5 pb5 pl20 pr20 font-22 color-fff ulib-r750" style="background-color:#fd9737">已传</text>
+          </view>
+        </view>
+        <view class="mt25 fn-clear font-28">
+          <view class="fn-fl color-333">行驶证</view>
+          <view class="fn-fr wp60 text-nowrap text-right color-666">
+            <text class="inline-block mr10 pt5 pb5 pl20 pr20 font-22 color-fff ulib-r750" style="background-color:#fd9737">已传</text>
+          </view>
+        </view>
+        <view class="mt25 fn-clear font-28">
+          <view class="fn-fl color-333">保单</view>
+          <view class="fn-fr wp60 text-nowrap text-right color-666">
+            <text class="inline-block mr10 pt5 pb5 pl20 pr20 font-22 color-fff ulib-r750" style="background-color:#36afa2">已通过</text>
+          </view>
+        </view>
+        <view class="mt25 fn-clear font-28">
+          <view class="fn-fl color-333">交车合照</view>
+          <view class="fn-fr wp60 text-nowrap text-right color-666">
+            <text class="inline-block mr10 pt5 pb5 pl20 pr20 font-22 color-fff ulib-r750" style="background-color:#36afa2">已通过</text>
+          </view>
+        </view>
+        <view class="mt25 fn-clear font-28">
+          <view class="fn-fl color-333">交付</view>
+          <view class="fn-fr wp60 text-nowrap text-right color-666">
+            <view class="inline-block ml10 mr10"><i class="iconfont font-34 mr5 text-middle icon-danxuan" /><text class="text-middle">顾问确认</text></view>
+            <view class="inline-block ml10 mr10"><i class="iconfont font-34 mr5 text-middle icon-danxuan_xuanzhong color-36afa2" /><text class="text-middle">用户确认</text></view>
+          </view>
+        </view>
+
         <view class="mt20 pt5 pb5 pl20 pr20 bg-f6 font-22 color-666 ulib-rlb750 ulib-rr750" wx:if="{{item.remark}}">注：{{item.remark}}</view>
 
       </view>
@@ -69,24 +105,12 @@
 <lcb-backChannel></lcb-backChannel>
 <lcb-shopTabBarNav currentIndex='2'></lcb-shopTabBarNav>
 
-<lcb-msg isShow="{{isShowMessage}}">
-	<view slot="content">
-		<view class="inner40">
-      <textarea class="wp100 inner20 bds-1-eb font-28 ulib-r10" placeholder-class="color-ccc" maxlength='100' placeholder="请输入短信内容" bindinput='inputTx' data-key="content" name='content' value='{{content}}' />
-    </view>
-    <view class="fn-flex pl60 pr60 pb50 text-center font-32 color-666">
-      <button bindtap="hideMessage" class="fn-flex-item mr20 bds-2-36afa2 btn-no-bg wp100 font-28 color-36afa2 ulib-r750">取消</button>
-      <button disabled="{{submitFlag}}" bindtap="postAppSmsCusorder" class="fn-flex-item ml20 btn-36afa2 wp100 font-28 color-fff ulib-r750" hover-class="btn-36afa2-hover">确定</button>
-    </view>
-	</view>
-</lcb-msg>
-
-<view class="fixedopt">
+<!-- <view class="fixedopt">
   <view class="optpin bg-333 relative ulib-r750">
     <view class="absolute top-0 bottom-0 left-0 right-0 z-index-0" bindtap="showMobileMsg">
       <i class="absolute box-center-middle iconfont icon-shouji font-44 color-fff"></i>
     </view>
   </view>
-</view>
+</view> -->
 
 <lcb-changeMobile isShow="{{isShowMobile}}"></lcb-changeMobile>
\ No newline at end of file
diff --git a/pages/order/register/index.js b/pages/order/register/index.js
index 3835197..545733b 100644
--- a/pages/order/register/index.js
+++ b/pages/order/register/index.js
@@ -212,11 +212,6 @@ Page({
             title: '请选择内饰颜色',
             icon: 'none'
           })
-        }else if(this.data.deposit == '' ){
-          wx.showToast({
-            title: '请选择定金',
-            icon: 'none'
-          })
         }else{
           this.setData({
             step:3,
@@ -248,6 +243,12 @@ Page({
             icon: 'none'
           })
         }
+        else if(this.data.deposit == '' ){
+          wx.showToast({
+            title: '请选择定金',
+            icon: 'none'
+          })
+        }
         else{
 
           let that = this
@@ -1045,7 +1046,9 @@ Page({
       })
       let fine_total = 0
       this.data.fines.forEach(item => {
-        fine_total = fine_total +  parseFloat(item.price)
+        if(parseFloat(item.price)>0){
+          fine_total = fine_total +  parseFloat(item.price)
+        }
       })
       this.setData({
         fine_total,
diff --git a/pages/order/register/index.wxml b/pages/order/register/index.wxml
index dd605fc..d4703bc 100644
--- a/pages/order/register/index.wxml
+++ b/pages/order/register/index.wxml
@@ -73,7 +73,7 @@
           <view class="mt40 fn-clear">
             <view class="fn-fl mt10 font-32">车主信息</view>
             <view class="fn-fr">
-              <button bindtap="synchroCustomer" class="inline-block font-22 color-fff ulib-r10 btn-36afa2" hover-class="btn-36afa2-hover">一件同步购车人</button>
+              <button bindtap="synchroCustomer" class="inline-block font-22 color-fff ulib-r10 btn-36afa2" hover-class="btn-36afa2-hover">一键同步购车人</button>
             </view>
           </view>
           <view class="mt20 pt10 pb10 pl30 pr30 bg-fff ulib-r10 box-shadow-000-10-10">
@@ -166,24 +166,6 @@
             </picker>
           </view>
         </view>
-        <view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{priceinfo.price}}">
-          <view class="absolute left-0 box-middle color-333">车辆平台售价</view>
-          <view class="pt30 pb30 text-right font-28 color-666" style="height:38rpx;">
-            <text>{{priceinfo.price}}元</text>
-          </view>
-        </view>
-        <view class="relative bbs-1-eb pl190 last-b-none" wx:if="{{priceinfo.deposit_list}}">
-          <view class="absolute left-0 box-middle font-28 color-333">定金<text class="color-f9394d">*</text></view>
-          <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 mt20 mr20 pt15 pb15 pl25 pr25 ulib-r10 font-28 {{deposit == item?'bg-333 color-fff':'bg-f8'}}" bindtap="depositPicker" data-deposit="{{item}}">
-                  {{item}}
-                </view>
-              </block>
-            </view>
-          </view>
-        </view>
       </view>
 
       <view wx:if="{{step == 3}}">
@@ -217,6 +199,24 @@
             </picker>
           </view>
         </view>
+        <view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{priceinfo.price}}">
+          <view class="absolute left-0 box-middle color-333">车辆平台售价</view>
+          <view class="pt30 pb30 text-right font-28 color-666" style="height:38rpx;">
+            <text>{{priceinfo.price}}元</text>
+          </view>
+        </view>
+        <view class="relative bbs-1-eb pl190 last-b-none" wx:if="{{priceinfo.deposit_list}}">
+          <view class="absolute left-0 box-middle font-28 color-333">定金<text class="color-f9394d">*</text></view>
+          <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 mt20 mr20 pt15 pb15 pl25 pr25 ulib-r10 font-28 {{deposit == item?'bg-333 color-fff':'bg-f8'}}" bindtap="depositPicker" data-deposit="{{item}}">
+                  {{item}}
+                </view>
+              </block>
+            </view>
+          </view>
+        </view>
         <view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{priceinfo.dis_money}}">
           <view class="absolute left-0 box-middle">车身优惠</view>
           <view class="relative pr40">
@@ -257,7 +257,7 @@
         </view>
         <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="absolute left-0 box-middle font-28 color-333">精品选装</view>
             <view class="pt30 pb30 text-right font-28 color-666">
               精品价值：<text class="color-f9394d">{{fine_total}}</text>元
             </view>
@@ -386,18 +386,6 @@
       <view class="absolute left-0 box-middle font-28 color-333">内饰颜色</view>
       <view class="pt30 pb30 text-right font-28 color-666">{{interiorArray[interiorIndex]}}</view>
     </view>
-    <view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{priceinfo.price}}">
-      <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>{{priceinfo.price}}元</text>
-      </view>
-    </view>
-    <view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{deposit}}">
-      <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>{{deposit}}元</text>
-      </view>
-    </view>
     <view class="mt40 font-32">其他信息</view>
     <view class="relative bbs-1-eb pl190 last-b-none">
       <view class="absolute left-0 box-middle font-28 color-333">付款方式</view>
@@ -411,6 +399,18 @@
       <view class="absolute left-0 box-middle font-28 color-333">期望交付时间</view>
       <view class="pt30 pb30 text-right font-28 color-666">{{delry_time}}</view>
     </view>
+    <view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{priceinfo.price}}">
+      <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>{{priceinfo.price}}元</text>
+      </view>
+    </view>
+    <view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{deposit}}">
+      <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>{{deposit}}元</text>
+      </view>
+    </view>
     <view class="relative bbs-1-eb pl190 last-b-none" wx:if="{{disc_money != ''}}">
       <view class="absolute left-0 box-middle font-28 color-333">车身优惠</view>
       <view class="pt30 pb30 text-right font-28 color-f9394d" style="min-height:38rpx;">{{disc_money}}元</view>
@@ -432,7 +432,7 @@
       </view>
     </view>
     <view class="relative bbs-1-eb pl190 last-b-none">
-      <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;">
         <block wx:for="{{fines}}" wx:key='index'>
           <text class="pl10" wx:if="{{item.txt}}">{{item.txt}}</text>