From 74d89cb63051687402becfe68107a72fb4af45a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=81=E5=8F=B6?= <yerz@shengshi.com.cn>
Date: Wed, 20 Apr 2022 17:58:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E4=BF=A1=E6=81=AF=EF=BC=8C?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=BF=A1=E6=81=AF=EF=BC=8C=E8=B4=B7=E6=AC=BE?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 commons/css/base/layout.wxss         |   1 +
 commons/css/thirdparty/iconfont.wxss |  10 +-
 commons/js/config.js                 |   6 +-
 commons/js/utils/apiQuery.js         |  15 +++
 pages/customer/detail/index.js       |  29 +++--
 pages/customer/detail/index.wxml     | 115 +++++-------------
 pages/customer/index.wxml            |  40 +++---
 pages/index/index.js                 |   4 +-
 pages/order/detail/index2.js         |  15 +++
 pages/order/detail/index2.wxml       |   6 +-
 pages/order/editFinance/index.js     | 174 +++++++++++++++++++--------
 pages/order/editFinance/index.wxml   |  36 +++++-
 pages/order/editOwner/index.js       |  88 +++++++++++++-
 pages/order/editOwner/index.wxml     |  53 ++++++--
 pages/order/register/index.js        | 110 +++++++++++++----
 pages/order/register/index.wxml      | 128 ++++++++++++++------
 16 files changed, 572 insertions(+), 258 deletions(-)

diff --git a/commons/css/base/layout.wxss b/commons/css/base/layout.wxss
index c645ee9..78f56f3 100644
--- a/commons/css/base/layout.wxss
+++ b/commons/css/base/layout.wxss
@@ -117,6 +117,7 @@
 .line-height-20{line-height:2;}
 .rich-text-img{display:bolck;max-width:100% !important;height:auto !important;margin:40rpx 0 20rpx 0 !important;}
 
+.height-80{height:80rpx;box-sizing:border-box;}
 .height-90{height:90rpx;box-sizing:border-box;}
 .height-100{height:100rpx;box-sizing:border-box;}
 .height-120{height:120rpx;box-sizing:border-box;}
diff --git a/commons/css/thirdparty/iconfont.wxss b/commons/css/thirdparty/iconfont.wxss
index 0900fea..814b19e 100644
--- a/commons/css/thirdparty/iconfont.wxss
+++ b/commons/css/thirdparty/iconfont.wxss
@@ -1,9 +1,9 @@
 @font-face {
   font-family: "iconfont"; /* Project id 2643717 */
   src: 
-       url('data:application/x-font-woff2;charset=utf-8;base64,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') format('woff2'),
-       url('iconfont.woff?t=1648197136647') format('woff'),
-       url('iconfont.ttf?t=1648197136647') format('truetype');
+       url('data:application/x-font-woff2;charset=utf-8;base64,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') format('woff2'),
+       url('iconfont.woff?t=1650423440181') format('woff'),
+       url('iconfont.ttf?t=1650423440181') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-bianjiwenjian:before {
+  content: "\e601";
+}
+
 .icon-weixin1:before {
   content: "\e607";
 }
diff --git a/commons/js/config.js b/commons/js/config.js
index ccbdef2..3f9d48e 100644
--- a/commons/js/config.js
+++ b/commons/js/config.js
@@ -1,4 +1,4 @@
-const env = "p";
+const env = "d";
 
 const version = 1,
 
@@ -131,7 +131,9 @@ api = {
 
   appCustomersOffline_sources:'app/customers/offline_sources', //线索来源
   appCustomersTag:'app/customers/tag', //客户标签
-  
+
+  appCityOncard:'app/city/oncard', //获取上牌城市
+  appFinanceNums:'app/finance/nums', //获取金融分期期数
 
 }
 
diff --git a/commons/js/utils/apiQuery.js b/commons/js/utils/apiQuery.js
index bf14044..9d1dfdd 100644
--- a/commons/js/utils/apiQuery.js
+++ b/commons/js/utils/apiQuery.js
@@ -818,4 +818,19 @@ apiQuery.putAppLoan = function (params) {
   })
 }
 
+//获取上牌城市
+apiQuery.getAppCityOncard = function (params) {
+  return new Promise(function (resolve, reject) {
+    HttpRequest(false, Config.api.appCityOncard, 2, params, "GET", resolve, reject)
+  })
+}
+
+//获取金融分期期数
+apiQuery.getAppFinanceNums = function (params) {
+  return new Promise(function (resolve, reject) {
+    HttpRequest(false, Config.api.appFinanceNums, 2, params, "GET", resolve, reject)
+  })
+}
+
+
 export default apiQuery;
\ No newline at end of file
diff --git a/pages/customer/detail/index.js b/pages/customer/detail/index.js
index 5827162..4c71c4e 100644
--- a/pages/customer/detail/index.js
+++ b/pages/customer/detail/index.js
@@ -5,11 +5,11 @@ let interval = null
 Page({
   data: {
     imgUrl:_.config.imgUrl,
-    tabid:0,
+    tabid:2,
     tab:[
-      {"id":0,"title":"详细信息"},
+      // {"id":0,"title":"详细信息"},
+      {"id":2,"title":"客户画像"},
       {"id":1,"title":"跟进记录"},
-      {"id":2,"title":"智能标签"}
     ],
     logslist: [],//日志列表
     pageNo: 1,
@@ -321,16 +321,19 @@ Page({
   //选择状态
   radioPicker(e){
     if(e.currentTarget.dataset.key != this.data.statuskey){
-      if(e.currentTarget.dataset.key == 2 &&this.data.detailinfo.status==0){
-        wx.showToast({
-          title: '请先将客户变更为到店客户',
-          icon: 'none'
-        })
-      }else{
-        this.setData({
-          statuskey:e.currentTarget.dataset.key,
-        })
-      }
+      // if(e.currentTarget.dataset.key == 2 &&this.data.detailinfo.status==0){
+      //   wx.showToast({
+      //     title: '请先将客户变更为到店客户',
+      //     icon: 'none'
+      //   })
+      // }else{
+      //   this.setData({
+      //     statuskey:e.currentTarget.dataset.key,
+      //   })
+      // }
+      this.setData({
+        statuskey:e.currentTarget.dataset.key,
+      })
     }
   },
 
diff --git a/pages/customer/detail/index.wxml b/pages/customer/detail/index.wxml
index 57b346c..af8ab87 100644
--- a/pages/customer/detail/index.wxml
+++ b/pages/customer/detail/index.wxml
@@ -1,15 +1,17 @@
 <view class="container">
   <view class="inner40 pb0">
     <view class="inner40 relative ulib-r10 box-shadow-000-10-10 mb30 overflowhidden">
-      <view class="absolute top-0 left-0 width-25 mt40 pt5 pb5 bg-36afa2 line-height-13 font-22 color-fff">{{detailinfo.tip}}</view>
+      <view class="absolute top-0 left-0 ml40 bg-36afa2 pl10 pr10 font-22 color-fff" wx:if="{{detailinfo.tip}}">{{detailinfo.tip}}</view>
       <view class="relative pr180">
-        <view class="font-32">
-          <text>{{detailinfo.name}}</text>
-          <text class="font-26 color-666">({{detailinfo.mobile}})</text>
+        <view class="font-28">
+          <text>{{detailinfo.name}}<text class="ml10 font-22 color-666">编号:{{detailinfo.id}}</text></text>
           <text class="text-middle iconfont icon-weixin1 ml10 color-00c800" wx:if="{{detailinfo.is_weChat}}"></text>
           <text class="iconfont icon-xingxing ml10 {{detailinfo.is_top==1?'color-f9394d':'color-ccc'}}" catchtap="optTop" data-index="{{index}}"></text>
         </view>
-        <view class="text-nowrap">
+        <view class="mt10 text-nowrap font-28">
+          <text>{{detailinfo.mobile}}</text>
+        </view>
+        <!-- <view class="text-nowrap">
           <text class="mr15 font-22 color-666">编号：{{detailinfo.id}}</text>
           <block wx:for="{{detailinfo.tags}}" wx:for-index='i' wx:for-item='tag' wx:key='i'>
             <text class="inline-block mr10 pl10 pr10 bg-666 font-18 color-fff ulib-r750" wx:if="{{i<4}}">{{tag}}</text>
@@ -17,8 +19,8 @@
           <block wx:if="{{detailinfo.tags.length>4}}">
             ...
           </block>
-        </view>
-        <view class="absolute right-0 box-middle">
+        </view> -->
+        <view class="absolute right-0 box-middle text-center">
           <view class="inline-block relative img-55x55 bg-333 font-28 color-fff mr30 ulib-r750" catchtap="showMessage" data-id="{{detailinfo.id}}">
             <i class="absolute box-center-middle iconfont icon-duanxinguanli"></i>
           </view>
@@ -36,72 +38,15 @@
     </view>
   </view>
   <view class="pl30 pr30">
-    <view class="fn-flex font-32 color-666 text-center">
+    <view class="fn-flex pl50 pr50 font-32 color-666 text-center">
       <block wx:for='{{tab}}' wx:key='list'>
         <view class="fn-flex-item pl20 pr20 tabmenu2 {{tabid == item.id?'active color-36afa2':''}}" data-index="{{index}}" bindtap="changeTab">
           <view class="relative">{{item.title}}</view>
         </view>
       </block>
     </view>
-    <view class="mt30 pl10 pr10 pb200" wx:if="{{tabid == tab[0].id}}">
-      <!-- <view class="font-22">
-        <i class="iconfont icon-fenqi mr10"></i>
-        <text>分期信息</text>
-      </view> -->
-      <view class="text-right">
-        <button bindtap="pushLink" data-url="/pages/customer/editCard/index?id={{id}}" class="inline-block btn-36afa2 font-22 color-fff ulib-r10" hover-class="btn-36afa2-hover"><i class="iconfont icon-dengji mr10"></i>修改</button>
-      </view>
-      <view>
-        <view class="relative bbs-1-eb last-b-none pl140 font-28">
-          <view class="absolute left-0 box-middle">客户姓名</view>
-          <view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx">
-            {{name}}
-          </view>
-        </view>
-        <view class="relative bbs-1-eb last-b-none pl140 font-28">
-          <view class="absolute left-0 box-middle">手机号码</view>
-          <view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx">
-            {{mobile}}
-          </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="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx">
-            {{brandArray[brandIndex]}}
-          </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="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx">
-            {{modelArray[modelIndex]}}
-          </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="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx">
-            {{levelArray[levelIndex]}}
-          </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="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx">
-            {{colorArray[colorIndex]}}
-          </view>
-        </view> -->
-        <view class="relative bbs-1-eb last-b-none pl140 font-28" wx:if="{{baseinfo.of_id.value}}">
-          <view class="absolute left-0 box-middle">线索来源</view>
-          <view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx">{{baseinfo.of_id.value}}</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="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx">
-            {{buy_time}}天
-          </view>
-        </view>
 
-      </view>
-    </view>
-    <view class="mt30 pb150" wx:elif="{{tabid == tab[1].id}}">
+    <view class="mt30 pb150" wx:if="{{tabid == 1}}">
       <view class="fn-flex text-center">
         <block wx:for="{{statistics}}" wx:key='index'>
           <view class="fn-flex-item ml15 mr15 pt20 pb20 bg-f3f6fc ulib-r10" style="background-color:{{item.color}}">
@@ -157,20 +102,7 @@
         </view>
       </view>
     </view>
-    <view class="mt10 pl50 pr30 pb200" wx:elif="{{tabid == tab[2].id}}">
-      <view class="relative">
-        <view class="absolute left-0 box-middle font-28">客户级别</view>
-        <view class="pl150" wx:if="{{detailinfo.tags.length>0}}">
-          <block wx:for="{{detailinfo.tags}}" wx:for-index='i' wx:for-item='tag' wx:key='i'>
-            <text class="inline-block space-nowrap mt5 mb5 mr10 pt10 pb10 pl20 pr20 font-22 ulib-r10 bg-f3f6fc">{{tag}}</text>
-          </block>
-        </view>
-        <!-- <block wx:for='{{taglList}}' wx:for-item='list' wx:for-index='i' wx:key='i'>
-          <block wx:for='{{list.list}}' wx:for-item='option' wx:for-index='j' wx:key='j'>
-            <text class="inline-block space-nowrap mt20 mr20 pt15 pb15 pl30 pr30 font-22 ulib-r10 bg-f3f6fc" wx:if="{{option.checked}}">{{option.name}}</text>
-          </block>
-        </block> -->
-      </view>
+    <view class="mt30 pl50 pr30 pb200" wx:elif="{{tabid == 2}}">
       <block wx:for='{{taglList}}' wx:for-item='list' wx:for-index='i' wx:key='i'>
         <view class="relative mt20" wx:if="{{list.have}}">
           <view class="absolute left-0 box-middle font-28">{{list.name}}</view>
@@ -184,15 +116,32 @@
     </view>
   </view>
 
-  <view class="fixed left-0 bottom-0 right-0 bg-fff-op80 pl40 pr40 pt20 pb40 z-index-1">
-    <view class="fn-flex" wx:if="{{optDefeat}}">
+  <view class="fixed left-0 bottom-0 right-0 bg-fff-op90 pl40 pr40 pt20 pb40 z-index-1">
+    <!-- <view>
+      <button bindtap="pushLink" data-url="/pages/customer/editCard/index?id={{id}}" class="inline-block btn-36afa2 font-22 color-fff ulib-r10" hover-class="btn-36afa2-hover"></button>
+    </view> -->
+    <view class="fn-flex text-center">
+      <view class="fn-flex-item flexsize3 pt10 color-36afa2" bindtap="pushLink" data-url="/pages/customer/editCard/index?id={{id}}">
+        <i class="iconfont icon-bianjiwenjian font-36"></i>
+        <view class="font-22">修改信息</view>
+      </view>
+      <block wx:if="{{optDefeat}}">
+        <view class="fn-flex-item flexsize4 pt20 pb20 bds-2-36afa2 bg-fff font-32 color-36afa2 ulib-rl750" bindtap="putAppCustomersDefeats" data-type="0">战败</view>
+        <view class="fn-flex-item flexsize4 pt20 pb20 btn-36afa2 font-32 color-fff ulib-rr750" bindtap="putAppCustomersDefeats" data-type="1">再战</view>
+      </block>
+      <block wx:else>
+        <view class="fn-flex-item flexsize4 pt20 pb20 bds-2-36afa2 bg-fff font-32 color-36afa2 ulib-rl750" bindtap="optShowNote">跟进记录</view>
+        <view class="fn-flex-item flexsize4 pt20 pb20 btn-36afa2 font-32 color-fff ulib-rr750" bindtap="showSelectStatus">变更状态</view>
+      </block>
+    </view>
+    <!-- <view class="fn-flex" wx:if="{{optDefeat}}">
       <button class="fn-flex-item bds-2-36afa2 bg-fff mr20 pt10 pb10 text-center font-32 color-36afa2 ulib-r750" bindtap="putAppCustomersDefeats" data-type="0">战败</button>
       <button class="fn-flex-item btn-36afa2 ml20 pt10 pb10 text-center font-32 color-fff ulib-r750" bindtap="putAppCustomersDefeats" data-type="1">再战</button>
     </view>
     <view class="fn-flex" wx:else>
       <button class="fn-flex-item bds-2-36afa2 bg-fff mr20 pt10 pb10 text-center font-32 color-36afa2 ulib-r750" bindtap="optShowNote"><i class="iconfont icon-xiaoji mr10"></i>小记</button>
       <button class="fn-flex-item btn-36afa2 ml20 pt10 pb10 text-center font-32 color-fff ulib-r750" bindtap="showSelectStatus">变更状态</button>
-    </view>
+    </view> -->
   </view>
 
 </view>
diff --git a/pages/customer/index.wxml b/pages/customer/index.wxml
index 0f62ce1..1578e83 100644
--- a/pages/customer/index.wxml
+++ b/pages/customer/index.wxml
@@ -193,38 +193,26 @@
           </picker>
         </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="relative bbs-1-eb last-b-none pl140 font-28">
+        <view class="absolute left-0 box-middle">客户来源</view>
         <view class="pt25 pb25 text-right font-28 color-666">
-          <picker bindchange="changeCfrom" value="{{cfromIndex}}" range="{{filter.cfrom}}">
-            <text class="color-ccc" wx:if="{{cfromIndex == -1}}">请选择</text>
-            <text wx:else>{{filter.cfrom[cfromIndex]}}</text>
+          <picker bindchange="changeOf1" value="{{of1Index}}" range="{{of1Arr}}">
+            <text class="color-ccc" wx:if="{{of1Index == -1}}">请选择</text>
+            <text wx:else>{{of1Arr[of1Index]}}</text>
             <i class="iconfont ml5 icon-gengduo"></i>
           </picker>
         </view>
       </view>
-      <block wx:if="{{cfrom=='自有资源'}}">
-        <view class="relative bbs-1-eb last-b-none pl140 font-28">
-          <view class="absolute left-0 box-middle">线索来源</view>
-          <view class="pt25 pb25 text-right font-28 color-666">
-            <picker bindchange="changeOf1" value="{{of1Index}}" range="{{of1Arr}}">
-              <text class="color-ccc" wx:if="{{of1Index == -1}}">请选择</text>
-              <text wx:else>{{of1Arr[of1Index]}}</text>
-              <i class="iconfont ml5 icon-gengduo"></i>
-            </picker>
-          </view>
+      <view class="relative bbs-1-eb last-b-none pl140 font-28" wx:if="{{of2Arr.length>0}}">
+        <view class="absolute left-0 box-middle">{{sources[of1Index].name}}</view>
+        <view class="pt25 pb25 text-right font-28 color-666">
+          <picker bindchange="changeOf2" value="{{of2Index}}" range="{{of2Arr}}">
+            <text class="color-ccc" wx:if="{{of2Index == -1}}">请选择</text>
+            <text wx:else>{{of2Arr[of2Index]}}</text>
+            <i class="iconfont ml5 icon-gengduo"></i>
+          </picker>
         </view>
-        <view class="relative bbs-1-eb last-b-none pl140 font-28" wx:if="{{of2Arr.length>0}}">
-          <view class="absolute left-0 box-middle">{{sources[of1Index].name}}</view>
-          <view class="pt25 pb25 text-right font-28 color-666">
-            <picker bindchange="changeOf2" value="{{of2Index}}" range="{{of2Arr}}">
-              <text class="color-ccc" wx:if="{{of2Index == -1}}">请选择</text>
-              <text wx:else>{{of2Arr[of2Index]}}</text>
-              <i class="iconfont ml5 icon-gengduo"></i>
-            </picker>
-          </view>
-        </view>
-      </block>
+      </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="pt25 pb25 text-right font-28 color-666">
diff --git a/pages/index/index.js b/pages/index/index.js
index b1c645e..7cdbd14 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -53,8 +53,8 @@ Page({
       list:[
         // '新增 库存盘点',
         // '优化 客户建卡',
-        '新增版本更新说明',
-        '修复订单详情中销售顾问显示错误的问题',
+        '去掉客户详情中变更到订单客户需要先变更为到店客户的限制',
+        //'修复订单详情中销售顾问显示错误的问题',
       ],
     },
   },
diff --git a/pages/order/detail/index2.js b/pages/order/detail/index2.js
index 7c60b00..3ee8fe5 100644
--- a/pages/order/detail/index2.js
+++ b/pages/order/detail/index2.js
@@ -62,6 +62,21 @@ Page({
         this.getAppDelivery()
       }
 
+      //匹配上牌城市
+      if(!!res.data.c_city_id){
+        _.apiQuery.getAppCityOncard().then(res1 => {
+          if(res1.data.list.length>0){
+            res1.data.list.forEach((item,index) => {
+              if(item.city_id == res.data.c_city_id){
+                this.setData({
+                  c_city_name:item.name,
+                })
+              }
+            })
+          }
+        })
+      }
+
       wx.stopPullDownRefresh()
 
     })
diff --git a/pages/order/detail/index2.wxml b/pages/order/detail/index2.wxml
index 331a352..b892a53 100644
--- a/pages/order/detail/index2.wxml
+++ b/pages/order/detail/index2.wxml
@@ -38,7 +38,7 @@
         </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 class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx"><block wx:for="{{info.pro}}" wx:key='index'>{{item}} </block>{{info.address}}</view>
         </view>
       </block>
       <block wx:if="{{info.main_type==1}}">
@@ -51,6 +51,10 @@
           <view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx">{{info.credit}}</view>
         </view>
       </block>
+      <view class="relative bbs-1-eb pl140 font-28" wx:if="{{c_city_name}}">
+        <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">{{c_city_name}}</view>
+      </view>
       <view class="mt40 fn-clear">
         <view class="fn-fl pt10 font-32">订单信息</view>
         <view class="fn-fr" wx:if="{{info.edit_status==1}}">
diff --git a/pages/order/editFinance/index.js b/pages/order/editFinance/index.js
index 68c2b98..d4bfe58 100644
--- a/pages/order/editFinance/index.js
+++ b/pages/order/editFinance/index.js
@@ -9,6 +9,12 @@ Page({
 
     price_loan:'',//贷款金额
     submitFlag:false,
+
+    isShowConfirm:false,//是否显示确认弹框
+    nums:[],//金融分期期数列表
+    numIndex:-1,//分期期数索引
+    num:'',//分期期数
+    
   },
   onLoad: function (options) {
     for (let key in options) {
@@ -63,6 +69,27 @@ Page({
         this.getAppFinance()
       }
 
+      //匹配分期期数
+      if(!!res.data.num){
+        _.apiQuery.getAppFinanceNums().then(res1 => {
+          if(res1.data.list.length>0){
+            res1.data.list.forEach((item,index) => {
+              if(item == res.data.num){
+                this.setData({
+                  numIndex:index,
+                })
+              }
+            })
+            this.setData({
+              num:res.data.num,
+              nums:res1.data.list,
+            })
+          }
+        })
+      }else{
+        this.getAppFinanceNums()
+      }
+
       wx.stopPullDownRefresh()
 
     })
@@ -179,7 +206,7 @@ Page({
   },
 
   //修改贷款信息
-  putAppLoan() {
+  putAppLoan1() {
     if(this.data.finance_id == ''){
       wx.showToast({
         title: '请选择金融机构',
@@ -192,6 +219,12 @@ Page({
         icon: 'none'
       })
     }
+    else if(!this.data.price_loan||this.data.num == ''){
+      wx.showToast({
+        title: '请选择分期期数',
+        icon: 'none'
+      })
+    }
     else if(!this.data.notify_file_obj.src){
       wx.showToast({
         title: '请上传按揭通知函',
@@ -199,60 +232,12 @@ Page({
       })
     }
     else{
-      let that = this
-      if(that.data.info.edit_status==1){
-        wx.showModal({
-          title: '确定修改按揭信息？',
-          content: '金融机构：'+that.data.financeArray[that.data.financeIndex]+'\r\n贷款金额：'+that.data.price_loan+' ',
-          confirmColor: "#36afa2",
-          success(resW) {
-            if (resW.confirm) {
-              that.setData({
-                submitFlag: true,
-              })
-              let params = {};
-              params['o_id'] = that.data.id;
-              params['finance_id'] = that.data.finance_id;
-              params['notify_file'] = that.data.notify_file_obj.value;
-              params['price_loan'] = that.data.price_loan;
-              if(that.data.lend_file_obj.value){
-                params['lend_file'] = that.data.lend_file_obj.value;
-              }
-              _.apiQuery.putAppLoan(params).then(res => {
-        
-                that.setData({
-                  submitFlag: false,
-                })
-
-                //刷新详情页
-                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,
-                })
-              });
-            }
-          }
+      if(this.data.info.edit_status==1){
+        this.setData({
+          isShowConfirm:true,
         })
       }else{
+        let that = this
         that.setData({
           submitFlag: true,
         })
@@ -298,6 +283,57 @@ Page({
     }
   },
 
+  //修改贷款信息
+  putAppLoan2() {
+    let that = this
+    that.setData({
+      submitFlag: true,
+    })
+    let params = {};
+    params['o_id'] = that.data.id;
+    params['finance_id'] = that.data.finance_id;
+    params['notify_file'] = that.data.notify_file_obj.value;
+    params['price_loan'] = that.data.price_loan;
+    if(that.data.lend_file_obj.value){
+      params['lend_file'] = that.data.lend_file_obj.value;
+    }
+    if(that.data.num){
+      params['num'] = that.data.num;
+    }
+    _.apiQuery.putAppLoan(params).then(res => {
+  
+      that.setData({
+        isShowConfirm: false,
+        submitFlag: false,
+      })
+  
+      //刷新详情页
+      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,
+      })
+    });
+  },
+
   //查看图片
   previewImage: function (e) {
     wx.previewImage({
@@ -306,4 +342,36 @@ Page({
     })
   },
 
+  //获取金融分期期数
+  getAppFinanceNums(){
+    _.apiQuery.getAppFinanceNums().then(res => {
+      if(res.data.list.length>0){
+        this.setData({
+          nums:res.data.list,
+        })
+      }
+    });
+  },
+
+  //选择金融分期期数
+  changeNum(e) {
+    if(this.data.numIndex != e.detail.value && e.detail.value >= 0){
+      let num = ''
+      if(e.detail.value >= 0){
+        num = this.data.nums[e.detail.value]
+      }
+      this.setData({
+        num,
+        numIndex:e.detail.value,
+      })
+    }
+  },
+
+  //显示隐藏意向金弹框
+  optConfirm(){
+    this.setData({
+      isShowConfirm:!this.data.isShowConfirm,
+    })
+  },
+
 })
\ No newline at end of file
diff --git a/pages/order/editFinance/index.wxml b/pages/order/editFinance/index.wxml
index b5c6c8a..a9c57c0 100644
--- a/pages/order/editFinance/index.wxml
+++ b/pages/order/editFinance/index.wxml
@@ -17,6 +17,16 @@
           <input class="wp100 height-100 text-right font-28" placeholder-class="color-ccc" type="number" placeholder="请输入贷款金额" model:value='{{price_loan}}' />
         </view>
       </view>
+      <view class="relative bbs-1-eb pl190 last-b-none" wx:if="{{nums.length>0}}">
+        <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">
+          <picker bindchange="changeNum" value="{{numIndex}}" range="{{nums}}">
+            <text class="color-ccc" wx:if="{{numIndex == -1}}">请选择</text>
+            <text wx:else>{{nums[numIndex]}}</text>
+            <i class="iconfont ml5 icon-gengduo"></i>
+          </picker>
+        </view>
+      </view>
       <view class="relative">
         <view class="mt30 font-28">按揭通知函<text class="color-f9394d">*</text></view>
         <view class="mt30 text-center">
@@ -86,5 +96,27 @@
 </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="putAppLoan">确认</button>
-</view>
\ No newline at end of file
+  <button class="wp100 btn-36afa2 pt10 pb10 text-center font-32 color-fff ulib-r750" hover-class="btn-36afa2-hover" disabled="{{submitFlag}}" bindtap="putAppLoan1">确认</button>
+</view>
+
+<!--收起意向金-->
+<lcb-msg isShow="{{isShowConfirm}}">
+  <view slot="content">
+    <view class="pt50 pl60 pr60 pb40 text-center">
+      <view class="font-36">确定修改按揭信息？</view>
+      <view class="inline-block text-left">
+        <view class="mt20 font-28 color-666">金融机构：{{financeArray[financeIndex]}}</view>
+        <view class="mt20 font-28 color-666">贷款金额：{{price_loan}}</view>
+        <view class="mt20 font-28 color-666">分期期数：{{num}}</view>
+      </view>
+    </view>
+    <view class="pl60 pr60 pb50 text-center font-32 color-666 fn-flex">
+      <view class="fn-flex-item pr15">
+        <view bindtap="optConfirm" class="bds-1-eb pt15 pb15 font-28 color-666 ulib-r750">取消</view>
+      </view>
+      <view class="fn-flex-item pl15">
+        <view bindtap="putAppLoan2" disabled="{{submitFlag}}" class="btn-36afa2 pt15 pb15 font-28 color-fff ulib-r750">确认</view>
+      </view>
+    </view>
+	</view>
+</lcb-msg>
\ No newline at end of file
diff --git a/pages/order/editOwner/index.js b/pages/order/editOwner/index.js
index 4fdb048..dc52b5f 100644
--- a/pages/order/editOwner/index.js
+++ b/pages/order/editOwner/index.js
@@ -10,6 +10,12 @@ Page({
     company:'',//企业名称
     credit:'',//企业信用代码
     submitFlag:false,
+
+    isShowAddress:false,//是否显示地址弹框
+    region: ['福建省', '', ''],
+    c_city_id:'',
+    oncardArray:[],//上牌城市
+    oncardIndex:-1,//上牌城市索引
   },
   onLoad: function (options) {
     for (let key in options) {
@@ -38,8 +44,33 @@ Page({
         address:res.data.address?res.data.address:'',
         company:res.data.company?res.data.company:'',
         credit:res.data.credit?res.data.credit:'',
+        region:res.data.pro?res.data.pro:['福建省', '', ''],
       })
 
+      //匹配上牌城市
+      if(!!res.data.c_city_id){
+        _.apiQuery.getAppCityOncard().then(res1 => {
+          if(res1.data.list.length>0){
+            let oncardArray = []
+            res1.data.list.forEach((item,index) => {
+              if(item.city_id == res.data.c_city_id){
+                this.setData({
+                  oncardIndex:index,
+                })
+              }
+              oncardArray.push(item.name)
+            })
+            this.setData({
+              c_city_id:res.data.c_city_id,
+              oncardArray,
+              oncardList:res1.data.list,
+            })
+          }
+        })
+      }else{
+        this.getAppCityOncard()
+      }
+
       wx.stopPullDownRefresh()
 
     })
@@ -65,7 +96,7 @@ Page({
         icon: 'none'
       })
     }
-    else if(this.data.main_type == 0&&this.data.address == ''){
+    else if(this.data.main_type == 0&&(this.data.region[2]== ''||this.data.address == '')){
       wx.showToast({
         title: '请填写车主地址',
         icon: 'none'
@@ -83,6 +114,12 @@ Page({
         icon: 'none'
       })
     }
+    else if(this.data.c_city_id == ''){
+      wx.showToast({
+        title: '请选择上牌城市',
+        icon: 'none'
+      })
+    }
     else{
       let that = this
       that.setData({
@@ -90,6 +127,11 @@ Page({
       })
       let params = {};
       params['id'] = this.data.id;
+      params['c_city_id'] = that.data.c_city_id;
+      if(that.data.address != ''){
+        params['pro'] = that.data.region;
+        params['address'] = that.data.address;
+      }
       if(that.data.owner_name != ''){
         params['owner_name'] = that.data.owner_name;
       }
@@ -99,15 +141,13 @@ Page({
       if(that.data.owner_cardid != ''){
         params['owner_cardid'] = that.data.owner_cardid;
       }
-      if(that.data.address != ''){
-        params['address'] = that.data.address;
-      }
       if(that.data.company != ''){
         params['company'] = that.data.company;
       }
       if(that.data.credit != ''){
         params['credit'] = that.data.credit;
       }
+      
       _.apiQuery.putAppCusorderV2Info(params).then(res => {
 
         //刷新详情页
@@ -145,4 +185,44 @@ Page({
     }
   },
 
+  //获取上牌城市
+  getAppCityOncard(){
+    _.apiQuery.getAppCityOncard().then(res => {
+      if(res.data.list.length>0){
+        let oncardArray = []
+        res.data.list.forEach(item => {
+          oncardArray.push(item.name)
+        })
+        this.setData({
+          oncardArray,
+          oncardList:res.data.list,
+        })
+      }
+    });
+  },
+
+  //选择城市
+  bindRegionChange(e) {
+    this.setData({
+      region: e.detail.value
+    })
+  },
+
+  //显示隐藏修改地址
+  optAddress(){
+    this.setData({
+      isShowAddress:!this.data.isShowAddress,
+    })
+  },
+
+  //选择上牌城市
+  changeOncard(e) {
+    if(this.data.oncardIndex != e.detail.value && e.detail.value >= 0){
+      this.setData({
+        c_city_id:this.data.oncardList[e.detail.value].city_id,
+        oncardIndex:e.detail.value,
+      })
+    }
+  },
+
 })
\ No newline at end of file
diff --git a/pages/order/editOwner/index.wxml b/pages/order/editOwner/index.wxml
index c653d19..e048335 100644
--- a/pages/order/editOwner/index.wxml
+++ b/pages/order/editOwner/index.wxml
@@ -5,25 +5,26 @@
       <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}}' />
+          <input class="wp100 height-100 text-right font-28" placeholder-class="color-ccc" type="text" placeholder="请输入客户姓名" model:value='{{owner_name}}' 	disabled='{{isShowAddress?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}}' />
+          <input class="wp100 height-100 text-right font-28" placeholder-class="color-ccc" type="number" placeholder="请输入客户手机号码" model:value='{{owner_mobile}}' disabled='{{isShowAddress?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}}' />
+          <input class="wp100 height-100 text-right font-28" placeholder-class="color-ccc" type="idcard" placeholder="请输入客户身份证" model:value='{{owner_cardid}}' 	disabled='{{isShowAddress?true:false}}' />
         </view>
       </view>
-      <view class="relative bbs-1-eb last-b-none pl180 font-28">
+      <view class="relative bbs-1-eb last-b-none pl180 font-28" bindtap="optAddress">
         <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='{{address}}' 	disabled='{{isShowSelectCustomer||isShowRemarks?true:false}}' />
+        <view class="pt30 pb30 text-right font-28 text-break" wx:if="{{address}}"><block wx:for="{{region}}" wx:key='index'>{{item}} </block>{{address}}</view>
+        <view wx:else class="pt30 pb30 text-right font-28 color-ccc">
+          请编辑车主地址
         </view>
       </view>
     </block>
@@ -32,16 +33,26 @@
       <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}}' />
+          <input class="wp100 height-100 text-right font-28" placeholder-class="color-ccc" type="text" placeholder="请输入企业名称" model:value='{{company}}' disabled='{{isShowAddress?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}}' />
+          <input class="wp100 height-100 text-right font-28" placeholder-class="color-ccc" type="text" placeholder="请输入企业信用代号" model:value='{{credit}}' 	disabled='{{isShowAddress?true:false}}' />
         </view>
       </view>
     </block>
+    <view class="relative bbs-1-eb pl190 last-b-none">
+      <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">
+        <picker bindchange="changeOncard" value="{{oncardIndex}}" range="{{oncardArray}}">
+          <text class="color-ccc" wx:if="{{oncardIndex == -1}}">请选择</text>
+          <text wx:else>{{oncardArray[oncardIndex]}}</text>
+          <i class="iconfont ml5 icon-gengduo"></i>
+        </picker>
+      </view>
+    </view>
   </view>
   <view class="mt40 font-22 color-666 text-center">
     <label class="inline-block text-middle statement fn-clear"><checkbox class="fn-fl" value="cb" /><text class="pt3 fn-fl">我已阅读并同意</text></label>
@@ -53,4 +64,28 @@
 
 <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="putAppCusorderV2Info">确认</button>
-</view>
\ No newline at end of file
+</view>
+
+<!--车主地址-->
+<lcb-msg isShow="{{isShowAddress}}">
+	<view slot="content" style="width:650rpx;">
+    <view class="pt50 font-36 text-center">请填写车主地址信息</view>
+		<view class="pt30 pl60 pr60 pb40">
+      <picker class="inner20 bds-1-eb relative font-28 ulib-r10" mode="region" bindchange="bindRegionChange" value="{{region}}">
+        <text>{{region[0]}}</text>
+        <text class="pl10 pr10 color-666">-</text>
+        <text wx:if="{{region[1]}}">{{region[1]}}</text>
+        <text wx:else class="color-ccc">选择城市</text>
+        <text class="pl10 pr10 color-666">-</text>
+        <text wx:if="{{region[2]}}">{{region[2]}}</text>
+        <text wx:else class="color-ccc">选择地区</text>
+      </picker>
+      <view class="mt30 relative">
+        <textarea class="wp100 inner20 bds-1-eb font-28 ulib-r10" style="height:150rpx;" placeholder-class="color-ccc" type="text" placeholder="请输入详细地址" model:value='{{address}}' />
+      </view>
+    </view>
+    <view class="pl60 pr60 pb50 text-center font-32 color-666">
+      <button bindtap="optAddress" class="inline-block wp50 btn-36afa2 font-28 color-fff ulib-r750" hover-class="btn-36afa2-hover">确定</button>
+    </view>
+	</view>
+</lcb-msg>
\ No newline at end of file
diff --git a/pages/order/register/index.js b/pages/order/register/index.js
index d16d336..230de21 100644
--- a/pages/order/register/index.js
+++ b/pages/order/register/index.js
@@ -75,7 +75,6 @@ Page({
     isShowcheck:false,//是否显示预览核对弹框
     checkCount: 2,
     checktext: '3s',
-    isShowRemarks:false,//意向金备注
     srv_total:0,//代办费用
     agencyList:[],//代办数组
     fine_total:0,//精品费用
@@ -94,6 +93,13 @@ Page({
 
     business_type:0,//0未执行到商务政策 1商务政策执行中 2商务政策成功 3商务政策失败
 
+    isShowIntenMoney:false,//是否显示意向金弹框
+    isShowAddress:false,//是否显示地址弹框
+    region: ['福建省', '', ''],
+    c_city_id:'',
+    oncardArray:[],//上牌城市
+    oncardIndex:-1,//上牌城市索引
+
   },
   //生命周期函数--监听页面加载
   onLoad: function (options) {
@@ -106,6 +112,7 @@ Page({
     this.getAppCustomersList()
     this.getAppSeriesBrands()
     this.getUserInfo()
+    this.getAppCityOncard()
 
   },
 
@@ -160,7 +167,7 @@ Page({
             icon: 'none'
           })
         }
-        else if(this.data.main_type == 0&&this.data.address == ''){
+        else if(this.data.main_type == 0&&(this.data.region[2]== ''||this.data.address == '')){
           wx.showToast({
             title: '请填写车主地址',
             icon: 'none'
@@ -178,6 +185,12 @@ Page({
             icon: 'none'
           })
         }
+        else if(this.data.c_city_id == ''){
+          wx.showToast({
+            title: '请选择上牌城市',
+            icon: 'none'
+          })
+        }
         else{
           this.setData({
             step:2,
@@ -313,6 +326,22 @@ Page({
       wx.stopPullDownRefresh()
     });
   },
+
+  //获取上牌城市
+  getAppCityOncard(){
+    _.apiQuery.getAppCityOncard().then(res => {
+      if(res.data.list.length>0){
+        let oncardArray = []
+        res.data.list.forEach(item => {
+          oncardArray.push(item.name)
+        })
+        this.setData({
+          oncardArray,
+          oncardList:res.data.list,
+        })
+      }
+    });
+  },
   
   //获取车型品牌
   getAppSeriesBrands(){
@@ -621,7 +650,9 @@ Page({
     params['cus_id'] = that.data.customer[that.data.customerIndex].id;
     params['name'] = that.data.name;
     params['mobile'] = that.data.mobile;
+    params['c_city_id'] = that.data.c_city_id;
     if(that.data.address != ''){
+      params['pro'] = that.data.region;
       params['address'] = that.data.address;
     }
     if(that.data.cardid != ''){
@@ -636,9 +667,6 @@ 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.inten_money != ''){
-      params['inten_money'] = that.data.inten_money;
-    }
     if(that.data.owner_name != ''){
       params['owner_name'] = that.data.owner_name;
     }
@@ -732,13 +760,6 @@ Page({
     })
   },
 
-  //显示隐藏意向金备注
-  optShowRemarks(){
-    this.setData({
-      isShowRemarks:!this.data.isShowRemarks,
-    })
-  },
-
   //选择客户
   radioPicker(e){
     if(e.currentTarget.dataset.index != this.data.customerIndex){
@@ -771,9 +792,8 @@ Page({
     this.getAppCustomersList()
   },
 
-  //收取意向金新建订单
-  postAppCusorderV2Inten() {
-    
+   //点击收取意向金
+  createV2Inten() {
     if (this.data.customerIndex == -1 ) {
       wx.showToast({
         title: '请选择客户',
@@ -796,12 +816,6 @@ Page({
         icon: 'none'
       })
     }
-    else if(this.data.inten_money == ''){
-      wx.showToast({
-        title: '请输入意向金',
-        icon: 'none'
-      })
-    }
     else if(this.data.main_type == 0&&this.data.owner_name == ''){
       wx.showToast({
         title: '请填写车主姓名',
@@ -820,7 +834,7 @@ Page({
         icon: 'none'
       })
     }
-    else if(this.data.main_type == 0&&this.data.address == ''){
+    else if(this.data.main_type == 0&&(this.data.region[2]== ''||this.data.address == '')){
       wx.showToast({
         title: '请填写车主地址',
         icon: 'none'
@@ -838,7 +852,32 @@ Page({
         icon: 'none'
       })
     }
+    else if(this.data.c_city_id == ''){
+      wx.showToast({
+        title: '请选择上牌城市',
+        icon: 'none'
+      })
+    }
     else{
+      this.setData({
+        isShowIntenMoney:true,
+      })
+    }
+  },
+  //显示隐藏意向金弹框
+  optIntenMoney(){
+    this.setData({
+      isShowIntenMoney:!this.data.isShowIntenMoney,
+    })
+  },
+  //收取意向金新建订单
+  postAppCusorderV2Inten() {
+    if(this.data.inten_money == ''){
+      wx.showToast({
+        title: '请输入意向金',
+        icon: 'none'
+      })
+    }else{
       let that = this
       wx.showModal({
         title: '确定创建订单，收取意向金？',
@@ -855,7 +894,9 @@ Page({
             params['name'] = that.data.name;
             params['mobile'] = that.data.mobile;
             params['inten_money'] = that.data.inten_money;
+            params['c_city_id'] = that.data.c_city_id;
             if(that.data.address != ''){
+              params['pro'] = that.data.region;
               params['address'] = that.data.address;
             }
             if(that.data.cardid != ''){
@@ -889,6 +930,7 @@ Page({
               }
 
               that.setData({
+                isShowIntenMoney:false,//关闭意向金弹框
                 isShowSuccess:true,//是否显示成功提示
                 details:res.data,
               })
@@ -1143,4 +1185,28 @@ Page({
     }
   },
 
+  //选择城市
+  bindRegionChange(e) {
+    this.setData({
+      region: e.detail.value
+    })
+  },
+
+  //显示隐藏修改地址
+  optAddress(){
+    this.setData({
+      isShowAddress:!this.data.isShowAddress,
+    })
+  },
+
+  //选择上牌城市
+  changeOncard(e) {
+    if(this.data.oncardIndex != e.detail.value && e.detail.value >= 0){
+      this.setData({
+        c_city_id:this.data.oncardList[e.detail.value].city_id,
+        oncardIndex:e.detail.value,
+      })
+    }
+  },
+
 })
\ No newline at end of file
diff --git a/pages/order/register/index.wxml b/pages/order/register/index.wxml
index df5ce05..1108902 100644
--- a/pages/order/register/index.wxml
+++ b/pages/order/register/index.wxml
@@ -12,14 +12,14 @@
 
     <view class="pb200">
       <view wx:if="{{step == 1}}">
-        <view class="mt20 pl40 pr40 pt10 pb10 relative ulib-r10 box-shadow-000-10-10 overflowhidden" bindtap="{{customer.length>0?'showSelectCustomer':''}}">
+        <!-- <view class="mt20 pl40 pr40 pt10 pb10 relative ulib-r10 box-shadow-000-10-10 overflowhidden" bindtap="{{customer.length>0?'showSelectCustomer':''}}">
           <view class="pt50 pb50 font-28" wx:if="{{customerIndex == -1}}">{{customer.length>0?'请选择客户':'暂无可选客户'}}</view>
           <view class="pt30 pb30 font-28" wx:else>
             <view class="font-32">{{customer[customerIndex].name}}</view>
             <view class="mt5 font-22 color-666">手机号：{{customer[customerIndex].mobile}}</view>
           </view>
           <i class="absolute right-0 box-middle iconfont mr30 icon-gengduo font-28 color-666"></i>
-        </view>
+        </view> -->
         <view class="mt40 font-32">购车信息</view>
         <view class="mt30 pt10 pb10 pl30 pr30 bg-fff ulib-r10 box-shadow-000-10-10">
           <view class="relative bbs-1-eb pl190 last-b-none">
@@ -35,33 +35,31 @@
               </radio-group>
             </view>
           </view>
+          <view class="relative bbs-1-eb last-b-none pl180 font-28" bindtap="{{customer.length>0?'showSelectCustomer':''}}">
+            <view class="absolute left-0 box-middle">{{customer.length>0?'选择客户':'暂无可选客户'}}<text class="color-f9394d">*</text></view>
+            <view class="wp100 height-100 pt30 pr40 text-right font-28">{{customer[customerIndex].name}}</view>
+            <i class="absolute right-0 box-middle iconfont icon-gengduo font-28 color-666"></i>
+          </view>
           <block wx:if="{{customerIndex != -1}}">
             <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='{{name}}' 	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='{{name}}' 	disabled='{{isShowSelectCustomer||isShowIntenMoney||isShowAddress?true:false}}' always-embed='{{true}}' />
               </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='{{mobile}}' disabled='{{isShowSelectCustomer||isShowRemarks?true:false}}' always-embed='{{true}}' />
+                <input class="wp100 height-100 text-right font-28" placeholder-class="color-ccc" type="number" placeholder="请输入客户手机号码" model:value='{{mobile}}' disabled='{{isShowSelectCustomer||isShowIntenMoney||isShowAddress?true:false}}' always-embed='{{true}}' />
               </view>
             </view>
             <view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{main_type==0}}">
               <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='{{cardid}}' 	disabled='{{isShowSelectCustomer||isShowRemarks?true:false}}' always-embed='{{true}}' />
+                <input class="wp100 height-100 text-right font-28" placeholder-class="color-ccc" type="idcard" placeholder="请输入客户身份证" model:value='{{cardid}}' 	disabled='{{isShowSelectCustomer||isShowIntenMoney||isShowAddress?true:false}}' always-embed='{{true}}' />
               </view>
             </view> 
           </block>
-          <view class="relative bbs-1-eb last-b-none pl320 font-28">
-            <view class="absolute left-0 box-middle" bindtap="optShowRemarks">意向金<i class="iconfont icon-shuoming ml5 font-30"></i></view>
-            <view class="relative pr40">
-              <input class="wp100 height-100 text-right font-28" placeholder-class="color-ccc" type="text" placeholder="意向金不超过定金" model:value='{{inten_money}}' disabled='{{isShowSelectCustomer||isShowRemarks?true:false}}' always-embed='{{true}}' />
-              <view class="absolute right-0 box-middle font-28 color-666">元</view>
-            </view>
-          </view>
         </view>
         <block wx:if="{{main_type==0}}">
           <view class="mt40 fn-clear">
@@ -74,25 +72,36 @@
             <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}}' always-embed='{{true}}' />
+                <input class="wp100 height-100 text-right font-28" placeholder-class="color-ccc" type="text" placeholder="请输入车主姓名" model:value='{{owner_name}}' 	disabled='{{isShowSelectCustomer||isShowIntenMoney||isShowAddress?true:false}}' always-embed='{{true}}' />
               </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}}' always-embed='{{true}}' />
+                <input class="wp100 height-100 text-right font-28" placeholder-class="color-ccc" type="number" placeholder="请输入车主手机号码" model:value='{{owner_mobile}}' disabled='{{isShowSelectCustomer||isShowIntenMoney||isShowAddress?true:false}}' always-embed='{{true}}' />
               </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}}' always-embed='{{true}}' />
+                <input class="wp100 height-100 text-right font-28" placeholder-class="color-ccc" type="idcard" placeholder="请输入车主身份证" model:value='{{owner_cardid}}' 	disabled='{{isShowSelectCustomer||isShowIntenMoney||isShowAddress?true:false}}' always-embed='{{true}}' />
               </view>
             </view>
-            <view class="relative bbs-1-eb last-b-none pl180 font-28">
+            <view class="relative bbs-1-eb last-b-none pl180 font-28" bindtap="optAddress">
               <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='{{address}}' 	disabled='{{isShowSelectCustomer||isShowRemarks?true:false}}' always-embed='{{true}}' />
+              <view class="pt30 pb30 text-right font-28 text-break" wx:if="{{address}}"><block wx:for="{{region}}" wx:key='index'>{{item}} </block>{{address}}</view>
+              <view wx:else class="pt30 pb30 text-right font-28 color-ccc">
+                请编辑车主地址
+              </view>
+            </view>
+            <view class="relative bbs-1-eb pl190 last-b-none">
+              <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">
+                <picker bindchange="changeOncard" value="{{oncardIndex}}" range="{{oncardArray}}">
+                  <text class="color-ccc" wx:if="{{oncardIndex == -1}}">请选择</text>
+                  <text wx:else>{{oncardArray[oncardIndex]}}</text>
+                  <i class="iconfont ml5 icon-gengduo"></i>
+                </picker>
               </view>
             </view>
           </view>
@@ -103,13 +112,23 @@
             <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}}' always-embed='{{true}}' />
+                <input class="wp100 height-100 text-right font-28" placeholder-class="color-ccc" type="text" placeholder="请输入企业名称" model:value='{{company}}' disabled='{{isShowSelectCustomer||isShowIntenMoney||isShowAddress?true:false}}' always-embed='{{true}}' />
               </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}}' always-embed='{{true}}' />
+                <input class="wp100 height-100 text-right font-28" placeholder-class="color-ccc" type="text" placeholder="请输入企业信用代码" model:value='{{credit}}' 	disabled='{{isShowSelectCustomer||isShowIntenMoney||isShowAddress?true:false}}' always-embed='{{true}}' />
+              </view>
+            </view>
+            <view class="relative bbs-1-eb pl190 last-b-none">
+              <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">
+                <picker bindchange="changeOncard" value="{{oncardIndex}}" range="{{oncardArray}}">
+                  <text class="color-ccc" wx:if="{{oncardIndex == -1}}">请选择</text>
+                  <text wx:else>{{oncardArray[oncardIndex]}}</text>
+                  <i class="iconfont ml5 icon-gengduo"></i>
+                </picker>
               </view>
             </view>
           </view>
@@ -309,7 +328,7 @@
     <view class="fixed left-0 right-0 bottom-0 bg-fff-op90 inner40 fn-flex safe-pb">
       <block wx:if="{{step==1}}">
         <block wx:if="{{!isFill}}">
-          <button class="wp100 bds-2-36afa2 bg-fff mr20 pt10 pb10 text-center font-32 color-36afa2 ulib-r750" bindtap="postAppCusorderV2Inten">收取意向金</button>
+          <button class="wp100 bds-2-36afa2 bg-fff mr20 pt10 pb10 text-center font-32 color-36afa2 ulib-r750" bindtap="createV2Inten">收取意向金</button>
         </block>
         <button class="wp100 btn-36afa2 pt10 pb10 text-center font-32 color-fff ulib-r750" hover-class="btn-36afa2-hover" bindtap="nextstep">下一步</button>
       </block>
@@ -383,7 +402,7 @@
     </view>
     <view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{address}}">
       <view class="absolute left-0 box-middle">车主地址</view>
-      <view class="pt30 pb30 text-right font-28 color-666">{{address}}</view>
+      <view class="pt30 pb30 text-right font-28 color-666"><block wx:for="{{region}}" wx:key='index'>{{item}} </block>{{address}}</view>
     </view>
     <view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{company}}">
       <view class="absolute left-0 box-middle color-333">企业名称</view>
@@ -397,6 +416,10 @@
         <text>{{credit}}</text>
       </view>
     </view>
+    <view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{c_city_id}}">
+      <view class="absolute left-0 box-middle font-28 color-333">上牌城市</view>
+      <view class="pt30 pb30 text-right font-28 color-666">{{oncardArray[oncardIndex]}}</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>
@@ -439,10 +462,6 @@
       <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 class="mr10 color-f9394d">{{priceinfo.price_coplus}}</text>元</view>
     </view>
-    <view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{inten_money}}">
-      <view class="absolute left-0 box-middle color-333">意向金</view>
-      <view class="pt25 pb25 text-right" style="min-height:30rpx"><text class="mr10 color-f9394d">{{inten_money}}</text>元</view>
-    </view>
     <view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{priceinfo.sdeposit}}">
       <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 class="mr10 color-f9394d">{{priceinfo.sdeposit}}</text>元</view>
@@ -532,18 +551,6 @@
 	</view>
 </lcb-msg>
 
-<!--意向金备注-->
-<lcb-msg isShow="{{isShowRemarks}}">
-	<view slot="content">
-		<view class="inner40 pt50 pb50 line-height-16">
-      <view class="font-28 color-666">意向金：旨在客户尚未明确购车决策时(车型、付款方式等)，在不需要签订合同的情况下，收取订车费用锁定客户</view>
-    </view>
-    <view class="bts-1-eb text-center font-32 color-666">
-      <view class="pt25 pb25 color-36afa2" bindtap="optShowRemarks">知道了</view>
-    </view>
-	</view>
-</lcb-msg>
-
 <!--订单登记成功-->
 <lcb-msg isShow="{{isShowSuccess}}">
   <view slot="content">
@@ -573,4 +580,49 @@
       <button bindtap="viewDetails" class="inline-block wp50 btn-36afa2 font-28 color-fff ulib-r750" hover-class="btn-36afa2-hover">查看订单</button>
     </view>
 	</view>
+</lcb-msg>
+
+<!--收起意向金-->
+<lcb-msg isShow="{{isShowIntenMoney}}">
+  <view slot="content">
+    <view class="pt50 pl60 pr60 pb40">
+      <view class="font-36 text-center">请输入意向金</view>
+      <view class="mt30 relative">
+        <input class="wp100 height-80 pl20 pr20 bds-1-eb font-28 ulib-r10" placeholder-class="color-ccc" type="number" placeholder="意向金不超过定金" model:value='{{inten_money}}' />
+      </view>
+      <view class="mt20 line-height-15 font-22 color-999">意向金：旨在客户尚未明确购车决策时(车型、付款方式等)，在不需要签订合同的情况下，收取订车费用锁定客户</view>
+    </view>
+    <view class="pl60 pr60 pb50 text-center font-32 color-666 fn-flex">
+      <view class="fn-flex-item pr15">
+        <view bindtap="optIntenMoney" class="bds-1-eb pt15 pb15 font-28 color-666 ulib-r750">取消</view>
+      </view>
+      <view class="fn-flex-item pl15">
+        <view bindtap="postAppCusorderV2Inten" class="btn-36afa2 pt15 pb15 font-28 color-fff ulib-r750">确认</view>
+      </view>
+    </view>
+	</view>
+</lcb-msg>
+
+<!--车主地址-->
+<lcb-msg isShow="{{isShowAddress}}">
+	<view slot="content" style="width:650rpx;">
+    <view class="pt50 font-36 text-center">请填写车主地址信息</view>
+		<view class="pt30 pl60 pr60 pb40">
+      <picker class="inner20 bds-1-eb relative font-28 ulib-r10" mode="region" bindchange="bindRegionChange" value="{{region}}">
+        <text>{{region[0]}}</text>
+        <text class="pl10 pr10 color-666">-</text>
+        <text wx:if="{{region[1]}}">{{region[1]}}</text>
+        <text wx:else class="color-ccc">选择城市</text>
+        <text class="pl10 pr10 color-666">-</text>
+        <text wx:if="{{region[2]}}">{{region[2]}}</text>
+        <text wx:else class="color-ccc">选择地区</text>
+      </picker>
+      <view class="mt30 relative">
+        <textarea class="wp100 inner20 bds-1-eb font-28 ulib-r10" style="height:150rpx;" placeholder-class="color-ccc" type="text" placeholder="请输入详细地址" model:value='{{address}}' />
+      </view>
+    </view>
+    <view class="pl60 pr60 pb50 text-center font-32 color-666">
+      <button bindtap="optAddress" class="inline-block wp50 btn-36afa2 font-28 color-fff ulib-r750" hover-class="btn-36afa2-hover">确定</button>
+    </view>
+	</view>
 </lcb-msg>
\ No newline at end of file