diff --git a/pages/customer/detail/index.wxml b/pages/customer/detail/index.wxml
index 78be637..28e27bd 100644
--- a/pages/customer/detail/index.wxml
+++ b/pages/customer/detail/index.wxml
@@ -169,7 +169,7 @@
       </block>
       <block wx:else>
         <view class="fn-flex-item flexsize4 pt20 pb20 bts-2-36afa2 bls-2-36afa2 bbs-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 {{detailinfo.generate_order?'':'opacity-50'}}" bindtap="{{detailinfo.generate_order?'pushLink':''}}" data-url="/pages/order/register/index?cus_id={{detailinfo.id}}&name={{detailinfo.name}}&mobile={{detailinfo.mobile}}">生成订单</view>
+        <view class="fn-flex-item flexsize4 pt20 pb20 btn-36afa2 font-32 color-fff ulib-rr750 {{detailinfo.generate_order?'':'opacity-50'}}" bindtap="{{detailinfo.generate_order?'pushLink':''}}" data-url="/pages/order/register/index?cus_id={{detailinfo.id}}&name={{detailinfo.name}}&mobile={{detailinfo.mobile}}&complete_mobile={{detailinfo.complete_mobile}}">生成订单</view>
       </block>
     </view>
   </view>
diff --git a/pages/customer/editCard/index.js b/pages/customer/editCard/index.js
index c0acfc5..8e473f9 100644
--- a/pages/customer/editCard/index.js
+++ b/pages/customer/editCard/index.js
@@ -337,7 +337,7 @@ Page({
         title: '请输入客户姓名',
         icon: 'none'
       })
-    } else if (that.data.mobile == '' ){
+    } else if (that.data.mobile != that.data.baseinfo.mobile.value&&!/^1[3456789]\d{9}$/.test(that.data.mobile)){
       wx.showToast({
         title: '请输入正确的手机号码',
         icon: 'none'
diff --git a/pages/order/detail/index2.wxml b/pages/order/detail/index2.wxml
index 036d7bb..1993fb1 100644
--- a/pages/order/detail/index2.wxml
+++ b/pages/order/detail/index2.wxml
@@ -36,7 +36,7 @@
           <view class="absolute left-0 box-middle font-28 color-333">车主身份证</view>
           <view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx">{{info.owner_cardid}}</view>
         </view>
-        <view class="relative bbs-1-eb pl140 font-28">
+        <view class="relative bbs-1-eb pl140 font-28" wx:if="{{info.address}}">
           <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>
diff --git a/pages/order/editOwner/index.js b/pages/order/editOwner/index.js
index 8b05a7d..de21fd4 100644
--- a/pages/order/editOwner/index.js
+++ b/pages/order/editOwner/index.js
@@ -99,12 +99,12 @@ Page({
         icon: 'none'
       })
     }
-    else if(this.data.main_type == 0&&this.data.address == ''){
-      wx.showToast({
-        title: '请填写车主地址',
-        icon: 'none'
-      })
-    }
+    // else if(this.data.main_type == 0&&this.data.address == ''){
+    //   wx.showToast({
+    //     title: '请填写车主地址',
+    //     icon: 'none'
+    //   })
+    // }
     else if(this.data.main_type == 1&&this.data.company == ''){
       wx.showToast({
         title: '请填写企业名称',
diff --git a/pages/order/editOwner/index.wxml b/pages/order/editOwner/index.wxml
index ac896f9..1182e16 100644
--- a/pages/order/editOwner/index.wxml
+++ b/pages/order/editOwner/index.wxml
@@ -21,13 +21,13 @@
           <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="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="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> -->
     </block>
     <block wx:if="{{main_type==1}}">
       <view class="mt10 pt20 pb20 bg-e3f5f3 font-36 text-center ulib-r10">企业信息</view>
diff --git a/pages/order/register/index.js b/pages/order/register/index.js
index 58f5e0b..8bbd008 100644
--- a/pages/order/register/index.js
+++ b/pages/order/register/index.js
@@ -108,6 +108,11 @@ Page({
       })
     }
 
+    this.setData({
+      org_mobile:this.data.mobile,
+    })
+
+
     this.getAppSeriesBrands()
     this.getUserInfo()
     this.getAppCityOncard()
@@ -137,7 +142,7 @@ Page({
             title: '请输入客户姓名',
             icon: 'none'
           })
-        }else if (!/^1[3456789]\d{9}$/.test(this.data.mobile)){
+        }else if (this.data.mobile != this.data.org_mobile && !/^1[3456789]\d{9}$/.test(this.data.mobile)){
           wx.showToast({
             title: '请输入客户手机号',
             icon: 'none'
@@ -155,7 +160,7 @@ Page({
             icon: 'none'
           })
         }
-        else if(this.data.main_type == 0&&!/^1[3456789]\d{9}$/.test(this.data.owner_mobile)){
+        else if(this.data.main_type == 0&&this.data.owner_mobile != this.data.org_mobile && !/^1[3456789]\d{9}$/.test(this.data.owner_mobile)){
           wx.showToast({
             title: '请填写车主手机号',
             icon: 'none'
@@ -167,12 +172,12 @@ Page({
             icon: 'none'
           })
         }
-        else if(this.data.main_type == 0&&(this.data.address == '')){
-          wx.showToast({
-            title: '请填写车主地址',
-            icon: 'none'
-          })
-        }
+        // else if(this.data.main_type == 0&&(this.data.address == '')){
+        //   wx.showToast({
+        //     title: '请填写车主地址',
+        //     icon: 'none'
+        //   })
+        // }
         else if(this.data.main_type == 1&&this.data.company == ''){
           wx.showToast({
             title: '请填写企业名称',
@@ -625,7 +630,11 @@ Page({
     params['main_type'] = that.data.main_type;
     params['cus_id'] = that.data.cus_id;
     params['name'] = that.data.name;
-    params['mobile'] = that.data.mobile;
+    if(that.data.mobile == that.data.org_mobile){
+      params['mobile'] = that.data.complete_mobile;
+    }else{
+      params['mobile'] = that.data.mobile;
+    }
     params['c_city_id'] = that.data.c_city_id;
     if(that.data.address != ''){
       //params['pro'] = that.data.region;
@@ -645,7 +654,11 @@ Page({
       params['owner_name'] = that.data.owner_name;
     }
     if(that.data.owner_mobile != ''){
-      params['owner_mobile'] = that.data.owner_mobile;
+      if(that.data.owner_mobile == that.data.org_mobile){
+        params['owner_mobile'] = that.data.complete_mobile;
+      }else{
+        params['owner_mobile'] = that.data.owner_mobile;
+      }
     }
     if(that.data.owner_cardid != ''){
       params['owner_cardid'] = that.data.owner_cardid;
@@ -762,7 +775,7 @@ Page({
         title: '请输入客户姓名',
         icon: 'none'
       })
-    }else if (!/^1[3456789]\d{9}$/.test(this.data.mobile)){
+    }else if (this.data.mobile != this.data.org_mobile && !/^1[3456789]\d{9}$/.test(this.data.mobile)){
       wx.showToast({
         title: '请输入客户手机号',
         icon: 'none'
@@ -780,7 +793,7 @@ Page({
         icon: 'none'
       })
     }
-    else if(this.data.main_type == 0&&!/^1[3456789]\d{9}$/.test(this.data.owner_mobile)){
+    else if(this.data.main_type == 0&&this.data.owner_mobile != this.data.org_mobile && !/^1[3456789]\d{9}$/.test(this.data.owner_mobile)){
       wx.showToast({
         title: '请填写车主手机号',
         icon: 'none'
@@ -792,12 +805,12 @@ Page({
         icon: 'none'
       })
     }
-    else if(this.data.main_type == 0&&this.data.address == ''){
-      wx.showToast({
-        title: '请填写车主地址',
-        icon: 'none'
-      })
-    }
+    // else if(this.data.main_type == 0&&this.data.address == ''){
+    //   wx.showToast({
+    //     title: '请填写车主地址',
+    //     icon: 'none'
+    //   })
+    // }
     else if(this.data.main_type == 1&&this.data.company == ''){
       wx.showToast({
         title: '请填写企业名称',
@@ -850,7 +863,11 @@ Page({
             params['main_type'] = that.data.main_type;
             params['cus_id'] = that.data.cus_id;
             params['name'] = that.data.name;
-            params['mobile'] = that.data.mobile;
+            if(that.data.mobile == that.data.org_mobile){
+              params['mobile'] = that.data.complete_mobile;
+            }else{
+              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 != ''){
@@ -862,7 +879,11 @@ Page({
               params['owner_name'] = that.data.owner_name;
             }
             if(that.data.owner_mobile != ''){
-              params['owner_mobile'] = that.data.owner_mobile;
+              if(that.data.owner_mobile == that.data.org_mobile){
+                params['owner_mobile'] = that.data.complete_mobile;
+              }else{
+                params['owner_mobile'] = that.data.owner_mobile;
+              }
             }
             if(that.data.owner_cardid != ''){
               params['owner_cardid'] = that.data.owner_cardid;
@@ -1211,7 +1232,7 @@ Page({
                   that.setData({
                     cardid:res2.data.IdNum,
                     name:res2.data.Name,
-                   customer_address:res2.data.Address, 
+                    customer_address:res2.data.Address, 
                     customer_cardidpic:resp.data.data.url,
                   })
                 })
diff --git a/pages/order/register/index.wxml b/pages/order/register/index.wxml
index c6b6da1..55431a4 100644
--- a/pages/order/register/index.wxml
+++ b/pages/order/register/index.wxml
@@ -76,13 +76,13 @@
                 <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" >
+            <!-- <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="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> -->
             <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">
@@ -401,10 +401,10 @@
         <text>{{owner_cardid}}</text>
       </view>
     </view>
-    <view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{address}}">
+    <!-- <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>
+    </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>
       <view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx;">