From 43f60e87b6e0eae9d8a65345600d93929d4c6b05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=81=E5=8F=B6?= <yerz@shengshi.com.cn>
Date: Thu, 23 Feb 2023 11:05:16 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E4=B8=BB=E5=9C=B0=E5=9D=80=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/detail/index2.wxml   |  2 +-
 pages/order/editOwner/index.js   | 32 +++++++++++++++++++++---------
 pages/order/editOwner/index.wxml |  8 ++++----
 pages/order/register/index.js    | 34 ++++++++++++++++++++++----------
 pages/order/register/index.wxml  | 10 +++++-----
 5 files changed, 57 insertions(+), 29 deletions(-)

diff --git a/pages/order/detail/index2.wxml b/pages/order/detail/index2.wxml
index bfe0710..036d7bb 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"><block wx:for="{{info.pro}}" wx:key='index'>{{item}} </block>{{info.address}}</view>
+          <view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx">{{info.address}}</view>
         </view>
       </block>
       <block wx:if="{{info.main_type==1}}">
diff --git a/pages/order/editOwner/index.js b/pages/order/editOwner/index.js
index fefd001..8b05a7d 100644
--- a/pages/order/editOwner/index.js
+++ b/pages/order/editOwner/index.js
@@ -12,11 +12,13 @@ Page({
     submitFlag:false,
 
     isShowAddress:false,//是否显示地址弹框
-    region: ['', '', ''],
+    //region: ['', '', ''],
     c_city_id:'',
     oncardArray:[],//上牌城市
     oncardIndex:-1,//上牌城市索引
     owner_cardidpic:'',//车主身份证正面照
+
+    addressFocus:false,
   },
   onLoad: function (options) {
     for (let key in options) {
@@ -45,7 +47,7 @@ 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[2]?res.data.pro:['', '', ''],
+        //region:res.data.pro[2]?res.data.pro:['', '', ''],
       })
 
       //匹配上牌城市
@@ -97,7 +99,7 @@ Page({
         icon: 'none'
       })
     }
-    else if(this.data.main_type == 0&&(this.data.region[2]== ''||this.data.address == '')){
+    else if(this.data.main_type == 0&&this.data.address == ''){
       wx.showToast({
         title: '请填写车主地址',
         icon: 'none'
@@ -130,7 +132,7 @@ Page({
       params['id'] = this.data.id;
       params['c_city_id'] = that.data.c_city_id;
       if(that.data.address != ''){
-        params['pro'] = that.data.region;
+        //params['pro'] = that.data.region;
         params['address'] = that.data.address;
       }
       if(that.data.owner_name != ''){
@@ -213,11 +215,11 @@ Page({
   },
 
   //选择城市
-  bindRegionChange(e) {
-    this.setData({
-      region: e.detail.value
-    })
-  },
+  // bindRegionChange(e) {
+  //   this.setData({
+  //     region: e.detail.value
+  //   })
+  // },
 
   //显示隐藏修改地址
   optAddress(){
@@ -266,6 +268,7 @@ Page({
                   that.setData({
                     owner_cardid:res2.data.IdNum,
                     owner_name:res2.data.Name,
+                    address:res2.data.Address,
                     owner_cardidpic:resp.data.data.url,
                   })
                 })
@@ -308,4 +311,15 @@ Page({
     }
   },
 
+  focusAddress(){
+    this.setData({
+      addressFocus:true,
+    })
+  },
+  blurAddress(){
+    this.setData({
+      addressFocus:false,
+    })
+  },
+
 })
\ No newline at end of file
diff --git a/pages/order/editOwner/index.wxml b/pages/order/editOwner/index.wxml
index 852656d..ac896f9 100644
--- a/pages/order/editOwner/index.wxml
+++ b/pages/order/editOwner/index.wxml
@@ -21,11 +21,11 @@
           <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" bindtap="optAddress">
+      <view class="relative bbs-1-eb last-b-none pl180 font-28" >
         <view class="absolute left-0 box-middle">车主地址<text class="color-f9394d">*</text></view>
-        <view class="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 class="relative">
+          <view class="absolute right-0 box-middle font-28 color-ccc" wx:if="{{!address&&!addressFocus}}">请输入详细地址</view>
+          <textarea class="wp100 inner20 font-28 ulib-r10" style="height:105rpx;" bindfocus='focusAddress' bindblur='blurAddress' placeholder-class="color-ccc" type="text" placeholder="" model:value='{{address}}' />
         </view>
       </view>
     </block>
diff --git a/pages/order/register/index.js b/pages/order/register/index.js
index 4b95405..bcf0afe 100644
--- a/pages/order/register/index.js
+++ b/pages/order/register/index.js
@@ -81,7 +81,7 @@ Page({
 
     isShowIntenMoney:false,//是否显示意向金弹框
     isShowAddress:false,//是否显示地址弹框
-    region: ['福建省', '', ''],
+    //region: ['福建省', '', ''],
     c_city_id:'',
     oncardArray:[],//上牌城市
     oncardIndex:-1,//上牌城市索引
@@ -96,6 +96,8 @@ Page({
     fineArr:[],//精品选装
     finedIndex:-1,//精品选装索引
 
+    addressFocus:false,
+
   },
   //生命周期函数--监听页面加载
   onLoad: function (options) {
@@ -164,7 +166,7 @@ Page({
             icon: 'none'
           })
         }
-        else if(this.data.main_type == 0&&(this.data.region[2]== ''||this.data.address == '')){
+        else if(this.data.main_type == 0&&(this.data.address == '')){
           wx.showToast({
             title: '请填写车主地址',
             icon: 'none'
@@ -623,7 +625,7 @@ Page({
     params['mobile'] = that.data.mobile;
     params['c_city_id'] = that.data.c_city_id;
     if(that.data.address != ''){
-      params['pro'] = that.data.region;
+      //params['pro'] = that.data.region;
       params['address'] = that.data.address;
     }
     params['cardid'] = that.data.cardid;
@@ -787,7 +789,7 @@ Page({
         icon: 'none'
       })
     }
-    else if(this.data.main_type == 0&&(this.data.region[2]== ''||this.data.address == '')){
+    else if(this.data.main_type == 0&&this.data.address == ''){
       wx.showToast({
         title: '请填写车主地址',
         icon: 'none'
@@ -849,7 +851,7 @@ Page({
             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['pro'] = that.data.region;
               params['address'] = that.data.address;
             }
             params['cardid'] = that.data.cardid;
@@ -1146,11 +1148,11 @@ Page({
   },
 
   //选择城市
-  bindRegionChange(e) {
-    this.setData({
-      region: e.detail.value
-    })
-  },
+  // bindRegionChange(e) {
+  //   this.setData({
+  //     region: e.detail.value
+  //   })
+  // },
 
   //显示隐藏修改地址
   optAddress(){
@@ -1253,6 +1255,7 @@ Page({
                   that.setData({
                     owner_cardid:res2.data.IdNum,
                     owner_name:res2.data.Name,
+                    address:res2.data.Address,
                     owner_cardidpic:resp.data.data.url,
                   })
                 })
@@ -1380,4 +1383,15 @@ Page({
     }
   },
 
+  focusAddress(){
+    this.setData({
+      addressFocus:true,
+    })
+  },
+  blurAddress(){
+    this.setData({
+      addressFocus:false,
+    })
+  },
+
 })
\ No newline at end of file
diff --git a/pages/order/register/index.wxml b/pages/order/register/index.wxml
index 4ed3711..c6b6da1 100644
--- a/pages/order/register/index.wxml
+++ b/pages/order/register/index.wxml
@@ -76,11 +76,11 @@
                 <input class="wp100 height-100 text-right font-28" placeholder-class="color-ccc" type="text" placeholder="请输入车主姓名" model:value='{{owner_name}}' 	disabled='{{isShowIntenMoney||isShowAddress?true:false}}' always-embed='{{true}}' />
               </view>
             </view>
-            <view class="relative bbs-1-eb last-b-none pl180 font-28" bindtap="optAddress">
+            <view class="relative bbs-1-eb last-b-none pl180 font-28" >
               <view class="absolute left-0 box-middle">车主地址<text class="color-f9394d">*</text></view>
-              <view class="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 class="relative">
+                <view class="absolute right-0 box-middle font-28 color-ccc" wx:if="{{!address&&!addressFocus}}">请输入详细地址</view>
+                <textarea class="wp100 inner20 font-28 ulib-r10" style="height:105rpx;" bindfocus='focusAddress' bindblur='blurAddress' placeholder-class="color-ccc" type="text" placeholder="" model:value='{{address}}' />
               </view>
             </view>
             <view class="relative bbs-1-eb pl190 last-b-none">
@@ -403,7 +403,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"><block wx:for="{{region}}" wx:key='index'>{{item}} </block>{{address}}</view>
+      <view class="pt30 pb30 text-right font-28 color-666">{{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>