静态-登记订单

commons/js/config.js

@@ -1,4 +1,4 @@
-const env = "p";
+const env = "d";
 
 const version = 1,
 

pages/order/register/index.js

@@ -12,15 +12,15 @@ Page({
         step:2,
       },
       {
-        title:'其他信息',
+        title:'价格明细',
         step:3,
       },
+      {
+        title:'其他信息',
+        step:4,
+      },
     ],
-    step:1,
-    name:'',//姓名
-    mobile:'',//手机号
-    cardid:'',//身份证
-    address:'',//地址
+    step:3,
     owner_name:'',//车主姓名
     owner_mobile:'',//车主手机号
     owner_cardid:'',//车主身份证
@@ -80,8 +80,6 @@ Page({
     business_type:0,//0未执行到商务政策 1商务政策执行中 2商务政策成功 3商务政策失败
 
     isShowIntenMoney:false,//是否显示意向金弹框
-    isShowAddress:false,//是否显示地址弹框
-    region: ['福建省', '', ''],
     c_city_id:'',
     oncardArray:[],//上牌城市
     oncardIndex:-1,//上牌城市索引
@@ -90,12 +88,14 @@ Page({
 
     if_local_bill:0,//本地开具发票
 
-    customer_cardidpic:'',//客户身份证正面照
     owner_cardidpic:'',//车主身份证正面照
 
     fineArr:[],//精品选装
     finedIndex:-1,//精品选装索引
 
+    isShowWanShan:false,//是否显示完善信息
+    isShowInfoForm:false,//是否显示完善信息
+
   },
   //生命周期函数--监听页面加载
   onLoad: function (options) {
@@ -124,29 +124,10 @@ Page({
     switch (this.data.step) {
       case 1:
         this.setData({
-          mobile:this.trimAll(this.data.mobile),
-          cardid:this.trimAll(this.data.cardid),
           owner_mobile:this.trimAll(this.data.owner_mobile),
           owner_cardid:this.trimAll(this.data.owner_cardid),
         })
-        if (this.data.name == '' ) {
-          wx.showToast({
-            title: '请输入客户姓名',
-            icon: 'none'
-          })
-        }else if (!/^1[3456789]\d{9}$/.test(this.data.mobile)){
-          wx.showToast({
-            title: '请输入客户手机号',
-            icon: 'none'
-          })
-        }
-        else if(this.data.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.cardid)){
-          wx.showToast({
-            title: '请填写正确客户身份证',
-            icon: 'none'
-          })
-        }
-        else if(this.data.main_type == 0&&this.data.owner_name == ''){
+        if(this.data.main_type == 0&&this.data.owner_name == ''){
           wx.showToast({
             title: '请填写车主姓名',
             icon: 'none'
@@ -164,12 +145,6 @@ Page({
             icon: 'none'
           })
         }
-        else if(this.data.main_type == 0&&(this.data.region[2]== ''||this.data.address == '')){
-          wx.showToast({
-            title: '请填写车主地址',
-            icon: 'none'
-          })
-        }
         else if(this.data.main_type == 1&&this.data.company == ''){
           wx.showToast({
             title: '请填写企业名称',
@@ -182,12 +157,6 @@ Page({
             icon: 'none'
           })
         }
-        else if(this.data.c_city_id == ''){
-          wx.showToast({
-            title: '请选择上牌城市',
-            icon: 'none'
-          })
-        }
         else{
           this.setData({
             step:2,
@@ -222,6 +191,11 @@ Page({
         }
         break;
       case 3:
+        this.setData({
+          step:4,
+        })
+        break;
+      case 4:
         if(this.data.paymentIndex == -1 ){
           wx.showToast({
             title: '请选择付款方式',
@@ -240,6 +214,12 @@ Page({
             icon: 'none'
           })
         }
+        else if(this.data.c_city_id == ''){
+          wx.showToast({
+            title: '请选择上牌城市',
+            icon: 'none'
+          })
+        }
         else{
 
           let that = this
@@ -284,12 +264,6 @@ Page({
         userInfo: res,
       })
 
-      if(res.biz_name == '测试门店'){
-        this.setData({
-          cardid:'350000202101010000',//身份证
-        })
-      }
-
     });
   },
 
@@ -514,18 +488,6 @@ Page({
     }
   },
 
-  //购车主体
-  changeMain(e) {
-    this.setData({
-      main_type:e.detail.value,
-      owner_name:'',
-      owner_mobile:'',
-      owner_cardid:'',
-      company:'',
-      credit:'',
-    })
-  },
-
   //获取车辆价格
   getAppBusiness(){
     if(this.data.car_id != ''&&this.data.v_id != ''&&this.data.color_id != ''&&this.data.incolor_id != ''){
@@ -545,7 +507,7 @@ Page({
         })
       }).catch(res => {
         this.setData({
-          business_type:3,
+          business_type:3
         })
       });
     }
@@ -592,16 +554,6 @@ Page({
     })
   },
 
-  //一件同步购车人信息
-  synchroCustomer(e){
-    this.setData({
-      owner_name:this.data.name,
-      owner_mobile:this.data.mobile,
-      owner_cardid:this.data.cardid,
-      owner_cardidpic:this.data.customer_cardidpic,
-    })
-  },
-
   //新建订单
   postAppCusorderV2() {
     let that = this
@@ -619,14 +571,7 @@ Page({
     let params = {};
     params['main_type'] = that.data.main_type;
     params['cus_id'] = that.data.cus_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;
-    }
-    params['cardid'] = that.data.cardid;
     params['car_id'] = that.data.car_id;
     params['v_id'] = that.data.v_id;
     params['color_id'] = that.data.color_id;
@@ -747,29 +692,10 @@ Page({
    //点击收取意向金
   createV2Inten() {
     this.setData({
-      mobile:this.trimAll(this.data.mobile),
-      cardid:this.trimAll(this.data.cardid),
       owner_mobile:this.trimAll(this.data.owner_mobile),
       owner_cardid:this.trimAll(this.data.owner_cardid),
     })
-    if (this.data.name == '' ) {
-      wx.showToast({
-        title: '请输入客户姓名',
-        icon: 'none'
-      })
-    }else if (!/^1[3456789]\d{9}$/.test(this.data.mobile)){
-      wx.showToast({
-        title: '请输入客户手机号',
-        icon: 'none'
-      })
-    }
-    else if(this.data.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.cardid)){
-      wx.showToast({
-        title: '请填写正确客户身份证',
-        icon: 'none'
-      })
-    }
-    else if(this.data.main_type == 0&&this.data.owner_name == ''){
+    if(this.data.main_type == 0&&this.data.owner_name == ''){
       wx.showToast({
         title: '请填写车主姓名',
         icon: 'none'
@@ -787,12 +713,6 @@ Page({
         icon: 'none'
       })
     }
-    else if(this.data.main_type == 0&&(this.data.region[2]== ''||this.data.address == '')){
-      wx.showToast({
-        title: '请填写车主地址',
-        icon: 'none'
-      })
-    }
     else if(this.data.main_type == 1&&this.data.company == ''){
       wx.showToast({
         title: '请填写企业名称',
@@ -844,15 +764,8 @@ Page({
             let params = {};
             params['main_type'] = that.data.main_type;
             params['cus_id'] = that.data.cus_id;
-            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;
-            }
-            params['cardid'] = that.data.cardid;
             if(that.data.owner_name != ''){
               params['owner_name'] = that.data.owner_name;
             }
@@ -1145,20 +1058,6 @@ 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){
@@ -1179,55 +1078,8 @@ Page({
   //选择图片
   chooseImg(e) {
     let that = this
-    //上传身份证正面-客户身份证
-    if(e.currentTarget.dataset.type=='customer'){
-      wx.chooseImage({
-        count: 1, // 默认9
-        sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
-        sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有
-        success(res) {
-          wx.showLoading({
-            title: '识别中',
-          })
-          wx.uploadFile({
-            url:_.config.api.upImg,
-            filePath:res.tempFilePaths[0],
-            name: 'img',
-            formData: {
-              'app': 'liche'
-            },
-            success: (resp) => {
-              resp.data = JSON.parse(resp.data);
-              if (resp.data.code == 200) {
-                let params = {};
-                params['img'] = resp.data.data.url;
-                _.apiQuery.getAppIdcardInfo(params).then(res2 => {
-                  wx.hideLoading();
-                  that.setData({
-                    cardid:res2.data.IdNum,
-                    name:res2.data.Name,
-                    customer_cardidpic:resp.data.data.url,
-                  })
-                })
-              }
-            },
-            fail: res => {
-              wx.hideLoading();
-            }
-          })
-        },
-        fail: res => {
-          wx.showToast({
-            title: '文件选择失败',
-            icon: 'none',
-            duration: 2000
-          })
-        }
-      })
-    }
-
     //上传身份证正面-车主身份证
-    if(e.currentTarget.dataset.type=='owner'){
+    if(that.data.main_type == 0){
       wx.chooseImage({
         count: 1, // 默认9
         sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
@@ -1254,6 +1106,8 @@ Page({
                     owner_cardid:res2.data.IdNum,
                     owner_name:res2.data.Name,
                     owner_cardidpic:resp.data.data.url,
+                    isShowInfoForm:true,
+                    isShowWanShan:false,
                   })
                 })
               }
@@ -1380,4 +1234,34 @@ Page({
     }
   },
 
+  //选择购车类型
+  radioPicker(e){
+    if(e.currentTarget.dataset.value != this.data.main_type){
+      this.setData({
+        main_type:e.currentTarget.dataset.value,
+        owner_name:'',
+        owner_mobile:'',
+        owner_cardid:'',
+        company:'',
+        credit:'',
+        isShowInfoForm:false,
+      })
+    }
+  },
+
+  //显示隐藏完善信息
+  optWanShan(){
+    this.setData({
+      isShowWanShan:!this.data.isShowWanShan,
+    })
+  },
+
+  //显示信息表单
+  showInfoForm(){
+    this.setData({
+      isShowInfoForm:true,
+      isShowWanShan:false,
+    })
+  },
+
 })

pages/order/register/index.wxml

@@ -2,8 +2,8 @@
   <view class="pl30 pr30 pb200" wx:if="{{!isPreview}}">
     <view class="height-100">
       <view class="fixed top-0 left-0 right-0 height-100 fn-flex pt30 pl20 pr20 bg-fff text-center z-index-1">
-        <view class="pl40 pr40" wx:for="{{tab}}" wx:key="index">
-          <view class="inline-block {{step==item.step?'font-40 color-1a':'pt10 font-32'}} {{step>item.step?'color-666':''}} {{step<item.step?'color-999':''}}" bindtap="{{item.step < step?'optstep':''}}" data-step="{{item.step}}">
+        <view class="pl20 pr20" wx:for="{{tab}}" wx:key="index">
+          <view class="inline-block {{step==item.step?'font-38 color-1a':'pt10 font-30'}} {{step>item.step?'color-666':''}} {{step<item.step?'color-999':''}}" bindtap="{{item.step < step?'optstep':''}}" data-step="{{item.step}}">
             {{item.title}}
           </view>
         </view>
@@ -12,92 +12,42 @@
 
     <view class="pb200">
       <view wx:if="{{step == 1}}">
-        <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">
-            <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">
-              <radio-group bindchange="changeMain">
-                <label class="inline-block ml40" wx:for="{{main}}" wx:key="index">
-                  <view class="inline-block text-middle">
-                    <radio value="{{item.value}}" checked="{{item.value==main_type?true:false}}"/>
-                  </view>
-                  <text class="inline-block text-middle">{{item.title}}</text>
-                </label>
-              </radio-group>
-            </view>
-          </view>
-          <block>
-            <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='{{isShowIntenMoney||isShowAddress?true:false}}' always-embed='{{true}}' />
-              </view>
-            </view>
-            <view class="relative bbs-1-eb last-b-none pl180 pr60 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='{{cardid}}' 	disabled='{{isShowIntenMoney||isShowAddress?true:false}}' always-embed='{{true}}' />
-              </view>
-              <view class="absolute right-0 box-middle font-50 iconfont icon-cardid color-666" bindtap="chooseImg" data-type="customer"></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='{{name}}' 	disabled='{{isShowIntenMoney||isShowAddress?true:false}}' always-embed='{{true}}' />
-              </view>
-            </view>
-          </block>
+        <view class="mt30 font-28 text-center fn-flex">
+          <view class="fn-flex-item relative pt20 pb20 ulib-r10 {{item.value == 0?'mr10':'ml10'}} {{main_type == item.value?'bg-36afa2 color-fff':'bg-f6'}}" bindtap="radioPicker" data-value="{{item.value}}" wx:for="{{main}}" wx:key="index">{{item.title}}</view>
         </view>
         <block wx:if="{{main_type==0}}">
           <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>
-            </view>
+            <view class="fn-fl font-32">车主信息</view>
+            <view class="fn-fr mr5 font-50 iconfont icon-shenfenzheng color-666" bindtap="optWanShan"></view>
           </view>
-          <view class="mt20 pt10 pb10 pl30 pr30 bg-fff ulib-r10 box-shadow-000-10-10">
-            <view class="relative bbs-1-eb last-b-none pl180 font-28">
-              <view class="absolute left-0 box-middle">车主手机号码<text class="color-f9394d">*</text></view>
-              <view>
-                <input class="wp100 height-100 text-right font-28" placeholder-class="color-ccc" type="number" placeholder="请输入车主手机号码" model:value='{{owner_mobile}}' disabled='{{isShowIntenMoney||isShowAddress?true:false}}' always-embed='{{true}}' />
-              </view>
-            </view>
-            <view class="relative bbs-1-eb last-b-none pl180 pr60 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='{{isShowIntenMoney||isShowAddress?true:false}}' always-embed='{{true}}' />
-              </view>
-              <view class="absolute right-0 box-middle font-50 iconfont icon-cardid color-666" bindtap="chooseImg" data-type="owner"></view>
-            </view>
+          <view class="mt20 pt10 pb10 pl30 pr30 bg-fff ulib-r10 box-shadow-000-10-10" wx:if="{{isShowInfoForm}}">
             <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='{{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="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 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='{{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 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='{{isShowIntenMoney||isShowAddress?true:false}}' always-embed='{{true}}' />
               </view>
             </view>
+            
           </view>
         </block>
         <block wx:elif="{{main_type==1}}">
-          <view class="mt40 font-32">企业信息</view>
-          <view class="mt30 pt10 pb10 pl30 pr30 bg-fff ulib-r10 box-shadow-000-10-10">
+          <view class="mt40 fn-clear">
+            <view class="fn-fl font-32">企业信息</view>
+            <view class="fn-fr mr5 font-50 iconfont icon-yingyezizhi color-666" bindtap="optWanShan"></view>
+          </view>
+          <view class="mt20 pt10 pb10 pl30 pr30 bg-fff ulib-r10 box-shadow-000-10-10" wx:if="{{isShowInfoForm}}">
             <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>
@@ -110,24 +60,26 @@
                 <input class="wp100 height-100 text-right font-28" placeholder-class="color-ccc" type="text" placeholder="请输入企业信用代码" model:value='{{credit}}' 	disabled='{{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 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='{{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='{{isShowIntenMoney||isShowAddress?true:false}}' always-embed='{{true}}' />
               </view>
             </view>
           </view>
         </block>
-        <view class="mt40 font-22 color-666 text-center">
+        <!-- <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>
           <text class="text-middle color-36afa2" bindtap="pushLink" data-url="/pages/statement/registration/index">《狸车用户注册协议》</text>
           <text class="text-middle">和</text>
           <text class="text-middle color-36afa2" bindtap="pushLink" data-url="/pages/statement/privacy/index">《狸车用户隐私政策》</text>
-        </view>
+        </view> -->
       </view>
       <view wx:if="{{step == 2}}">
         <view class="relative bbs-1-eb pl190 last-b-none">
@@ -183,109 +135,91 @@
       </view>
 
       <view wx:if="{{step == 3}}">
-        <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="changePayment" value="{{paymentIndex}}" range="{{payment}}">
-              <text class="color-ccc" wx:if="{{paymentIndex == -1}}">请选择</text>
-              <text wx:else>{{payment[paymentIndex]}}</text>
-              <i class="iconfont ml5 icon-gengduo"></i>
-            </picker>
+        <view class="mt40 fn-clear">
+          <view class="fn-fl font-32">车价明细</view>
+          <view class="fn-fr font-28 color-666">
+            总计：<text class="mr10 color-f9394d">{{srv_total}}</text>元
           </view>
         </view>
-        <view class="relative bbs-1-eb last-b-none pl180 font-28">
-          <view class="absolute left-0 box-middle">期望交付时间<text class="color-f9394d">*</text></view>
-          <view class="pt30 pb30 text-right font-28 color-666">
-            <picker mode="date" value="{{delry_time}}" bindchange="delryTime">
-              <text class="color-ccc" wx:if="{{delry_time == ''}}">请选择</text>
-              <text wx:else>{{delry_time}}</text>
-              <i class="iconfont ml10 icon-gengduo"></i>
-            </picker>
+        <view class="mt20 pt10 pb10 pl30 pr30 bg-fff ulib-r10 box-shadow-000-10-10">
+          <view class="relative bbs-1-eb last-b-none pl180 font-28" 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 class="mr10 color-f9394d">{{priceinfo.price}}</text>元</view>
           </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 class="mr10 color-f9394d">{{priceinfo.price}}</text>元</view>
-        </view>
-        <view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{priceinfo.price_color}}">
-          <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_color}}</text>元</view>
-        </view>
-        <view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{priceinfo.price_coplus}}">
-          <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 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 ml5 mr5 pt10 pb10 pl15 pr15 text-middle font-24 ulib-r10 {{priceinfo.sdeposit == item?'bg-36afa2 color-fff':'bg-f8'}}" bindtap="fillDeposit" data-deposit="{{item}}">
-                  {{item}}
-                </view>
-              </block>
-              <input class="inline-block ml5 mr5 text-middle bg-fff bds-1-eb text-center font-24 ulib-r10" style="width:100rpx;height:52rpx;" placeholder-class="color-ccc" type="digit" placeholder="金额" bindinput='inputDeposit' bindblur='inputBlurDeposit' value="{{priceinfo.sdeposit}}" always-embed='{{true}}' />
+          <view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{priceinfo.price_color}}">
+            <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_color}}</text>元</view>
+          </view>
+          <view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{priceinfo.price_coplus}}">
+            <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 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 ml5 mr5 pt10 pb10 pl15 pr15 text-middle font-24 ulib-r10 {{priceinfo.sdeposit == item?'bg-36afa2 color-fff':'bg-f8'}}" bindtap="fillDeposit" data-deposit="{{item}}">
+                    {{item}}
+                  </view>
+                </block>
+                <input class="inline-block ml5 mr5 text-middle bg-fff bds-1-eb text-center font-24 ulib-r10" style="width:100rpx;height:52rpx;" placeholder-class="color-ccc" type="digit" placeholder="金额" bindinput='inputDeposit' bindblur='inputBlurDeposit' value="{{priceinfo.sdeposit}}" always-embed='{{true}}' />
+              </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 font-28 color-333">车身优惠</view>
+            <view class="pt30 pb30 text-right font-28 color-666">
+              <view class="fn-clear">
+                <block wx:for="{{priceinfo.dis_money_list}}" wx:key='index'>
+                  <view class="inline-block ml5 mr5 pt10 pb10 pl15 pr15 text-middle font-24 ulib-r10 {{priceinfo.sdisc_money == item?'bg-36afa2 color-fff':'bg-f8'}}" bindtap="fillDisc_money" data-disc_money="{{item}}">
+                    {{item}}
+                  </view>
+                </block>
+                <input class="inline-block ml5 mr5 text-middle bg-fff bds-1-eb text-center font-24 ulib-r10" style="width:100rpx;height:52rpx;" placeholder-class="color-ccc" type="digit" placeholder="金额" bindinput='inputDisc_money' bindblur='inputBlurDisc_money' value="{{priceinfo.sdisc_money}}" always-embed='{{true}}' />
+              </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">
+              <picker bindchange="changePayment" value="{{paymentIndex}}" range="{{payment}}">
+                <text class="color-ccc" wx:if="{{paymentIndex == -1}}">请选择</text>
+                <text wx:else>{{payment[paymentIndex]}}</text>
+                <i class="iconfont ml5 icon-gengduo"></i>
+              </picker>
             </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 font-28 color-333">车身优惠</view>
-          <view class="pt30 pb30 text-right font-28 color-666">
-            <view class="fn-clear">
-              <block wx:for="{{priceinfo.dis_money_list}}" wx:key='index'>
-                <view class="inline-block ml5 mr5 pt10 pb10 pl15 pr15 text-middle font-24 ulib-r10 {{priceinfo.sdisc_money == item?'bg-36afa2 color-fff':'bg-f8'}}" bindtap="fillDisc_money" data-disc_money="{{item}}">
-                  {{item}}
-                </view>
-              </block>
-              <input class="inline-block ml5 mr5 text-middle bg-fff bds-1-eb text-center font-24 ulib-r10" style="width:100rpx;height:52rpx;" placeholder-class="color-ccc" type="digit" placeholder="金额" bindinput='inputDisc_money' bindblur='inputBlurDisc_money' value="{{priceinfo.sdisc_money}}" always-embed='{{true}}' />
-            </view>
-          </view>
-        </view>
-        <!-- <view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{priceinfo.fine_money}}">
-          <view class="absolute left-0 box-middle">精品尊享包<text class="ml10 font-24">{{priceinfo.fine_money}}元</text></view>
-          <view class="relative pt30 pb30 text-right" bindtap="changeFineBag">
-            <checkbox value="{{if_fine}}" checked="{{if_fine}}"/>
-          </view>
-        </view>
-        <view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{if_fine&&priceinfo.dis_fine_money}}">
-          <view class="absolute left-0 box-middle font-28 color-333">精品优惠</view>
-          <view class="pt30 pb30 text-right font-28 color-666">
-            <view class="fn-clear">
-              <block wx:for="{{priceinfo.dis_fine_money_list}}" wx:key='index'>
-                <view class="inline-block ml5 mr5 pt10 pb10 pl15 pr15 text-middle font-24 ulib-r10 {{priceinfo.sdisc_fine_money == item?'bg-36afa2 color-fff':'bg-f8'}}" bindtap="fillDisc_fine_money" data-disc_fine_money="{{item}}">
-                  {{item}}
-                </view>
-              </block>
-              <input class="inline-block ml5 mr5 text-middle bg-fff bds-1-eb text-center font-24 ulib-r10" style="width:100rpx;height:52rpx;" placeholder-class="color-ccc" type="digit" placeholder="金额" bindinput='inputDisc_fine_money' bindblur='inputBlurDisc_fine_money' value="{{priceinfo.sdisc_fine_money}}" always-embed='{{true}}' />
-            </view>
-          </view>
-        </view> -->
+
         <block wx:if="{{userInfo.biz_type == 1}}">
           <view class="bbs-1-eb last-b-none" wx:if="{{agencyList.length>0}}">
-            <view class="relative pl190">
-              <view class="absolute left-0 box-middle font-28 color-333">委托代办</view>
-              <view class="pt30 pb30 text-right font-28 color-666">
+            <view class="mt40 fn-clear">
+              <view class="fn-fl font-32">委托明细</view>
+              <view class="fn-fr font-28 color-666">
                 总计：<text class="mr10 color-f9394d">{{srv_total}}</text>元
               </view>
             </view>
-            <view class="pb10">
-              <checkbox-group bindchange="changeAgency">
-                <block wx:for="{{agencyList}}" wx:key='index'>
-                  <view class="mb20 block relative height-100 pl220 pr20 bg-f6 font-28 ulib-r10">
-                    <label class="absolute box-middle left-0 ml30">
-                      <checkbox class="text-middle mr5" value="{{item.id}}" checked="{{item.checked}}" disabled="{{item.id == 1||item.id == 2}}" />
-                      <text class="text-middle">{{item.title}}</text>
-                    </label>
-                    <view class="pt25 text-right" wx:if="{{item.checked&&item.price>0}}">
-                      <block wx:for="{{item.price_list}}" wx:for-item='price_list' wx:for-index='i' wx:key='i'>
-                        <text class="inline-block ml5 mr5 pt10 pb10 pl15 pr15 text-middle font-24 ulib-r10 {{item.sprice == price_list?'bg-36afa2 color-fff':'bg-e4 color-666'}}" bindtap="fillAgency" data-index="{{index}}" data-sprice="{{price_list}}">{{price_list}}</text>
-                      </block>
-                      <input class="inline-block ml5 mr5 text-middle bg-fff bds-1-eb text-center font-24 ulib-r10" style="width:100rpx;height:52rpx;" placeholder-class="color-ccc" type="digit" placeholder="价格" bindinput='inputAgency' data-index="{{index}}" value="{{item.sprice}}" always-embed='{{true}}' />
+            <view class="mt20 pt10 pb10 pl30 pr30 bg-fff ulib-r10 box-shadow-000-10-10">
+              <view class="pb10">
+                <checkbox-group bindchange="changeAgency">
+                  <block wx:for="{{agencyList}}" wx:key='index'>
+                    <view class="mb20 block relative height-100 pl220 pr20 bg-f6 font-28 ulib-r10">
+                      <label class="absolute box-middle left-0 ml30">
+                        <checkbox class="text-middle mr5" value="{{item.id}}" checked="{{item.checked}}" disabled="{{item.id == 1||item.id == 2}}" />
+                        <text class="text-middle">{{item.title}}</text>
+                      </label>
+                      <view class="pt25 text-right" wx:if="{{item.checked&&item.price>0}}">
+                        <block wx:for="{{item.price_list}}" wx:for-item='price_list' wx:for-index='i' wx:key='i'>
+                          <text class="inline-block ml5 mr5 pt10 pb10 pl15 pr15 text-middle font-24 ulib-r10 {{item.sprice == price_list?'bg-36afa2 color-fff':'bg-e4 color-666'}}" bindtap="fillAgency" data-index="{{index}}" data-sprice="{{price_list}}">{{price_list}}</text>
+                        </block>
+                        <input class="inline-block ml5 mr5 text-middle bg-fff bds-1-eb text-center font-24 ulib-r10" style="width:100rpx;height:52rpx;" placeholder-class="color-ccc" type="digit" placeholder="价格" bindinput='inputAgency' data-index="{{index}}" value="{{item.sprice}}" always-embed='{{true}}' />
+                      </view>
+                      <view class="pt30 text-right color-666" wx:elif="{{item.text}}">{{item.text}}</view>
                     </view>
-                    <view class="pt30 text-right color-666" wx:elif="{{item.text}}">{{item.text}}</view>
-                  </view>
-                </block>
-              </checkbox-group>
+                  </block>
+                </checkbox-group>
+              </view>
             </view>
           </view>
           <view class="bbs-1-eb last-b-none">
@@ -313,6 +247,48 @@
             </view>
           </view>
         </block>
+      </view>
+
+      <view wx:if="{{step == 4}}">
+        <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 color-666">
+            <picker mode="date" value="{{delry_time}}" bindchange="delryTime">
+              <text class="color-ccc" wx:if="{{delry_time == ''}}">请选择</text>
+              <text wx:else>{{delry_time}}</text>
+              <i class="iconfont ml10 icon-gengduo"></i>
+            </picker>
+          </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 class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{priceinfo.fine_money}}">
+          <view class="absolute left-0 box-middle">精品尊享包<text class="ml10 font-24">{{priceinfo.fine_money}}元</text></view>
+          <view class="relative pt30 pb30 text-right" bindtap="changeFineBag">
+            <checkbox value="{{if_fine}}" checked="{{if_fine}}"/>
+          </view>
+        </view>
+        <view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{if_fine&&priceinfo.dis_fine_money}}">
+          <view class="absolute left-0 box-middle font-28 color-333">精品优惠</view>
+          <view class="pt30 pb30 text-right font-28 color-666">
+            <view class="fn-clear">
+              <block wx:for="{{priceinfo.dis_fine_money_list}}" wx:key='index'>
+                <view class="inline-block ml5 mr5 pt10 pb10 pl15 pr15 text-middle font-24 ulib-r10 {{priceinfo.sdisc_fine_money == item?'bg-36afa2 color-fff':'bg-f8'}}" bindtap="fillDisc_fine_money" data-disc_fine_money="{{item}}">
+                  {{item}}
+                </view>
+              </block>
+              <input class="inline-block ml5 mr5 text-middle bg-fff bds-1-eb text-center font-24 ulib-r10" style="width:100rpx;height:52rpx;" placeholder-class="color-ccc" type="digit" placeholder="金额" bindinput='inputDisc_fine_money' bindblur='inputBlurDisc_fine_money' value="{{priceinfo.sdisc_fine_money}}" always-embed='{{true}}' />
+            </view>
+          </view>
+        </view> -->
         <block wx:if="{{userInfo.show_sa}}">
           <view class="relative pt30 font-28 color-333">特别约定</view>
           <textarea class="wp100 mt20 inner20 line-height-16 bg-f6 font-28 ulib-r10" style="height:180rpx;" placeholder-class="color-ccc" placeholder="请填写特别约定" model:value='{{sa}}' always-embed='{{true}}' />
@@ -340,6 +316,10 @@
         <button class="wp100 btn-36afa2 pt10 pb10 text-center font-32 color-fff ulib-r750" hover-class="btn-36afa2-hover" bindtap="getAppBusiness" wx:elif="{{business_type==3}}">下一步</button>
       </block>
       <block wx:if="{{step==3}}">
+        <button class="wp100 bds-2-36afa2 bg-fff mr20 pt10 pb10 text-center font-32 color-36afa2 ulib-r750" hover-class="btn-36afa2-hover" bindtap="optstep" data-step="{{step-1}}">上一步</button>
+        <button class="wp100 btn-36afa2 pt10 pb10 text-center font-32 color-fff ulib-r750" hover-class="btn-36afa2-hover" bindtap="nextstep">下一步</button>
+      </block>
+      <block wx:if="{{step==4}}">
         <button class="wp100 bds-2-36afa2 bg-fff mr20 pt10 pb10 text-center font-32 color-36afa2 ulib-r750" hover-class="btn-36afa2-hover" bindtap="optstep" data-step="{{step-1}}">上一步</button>
         <button class="wp100 btn-36afa2 pt10 pb10 text-center font-32 color-fff ulib-r750" hover-class="btn-36afa2-hover" bindtap="nextstep">登记预览</button>
       </block>
@@ -371,18 +351,6 @@
       <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="relative bbs-1-eb last-b-none pl180 font-28">
-      <view class="absolute left-0 box-middle">客户姓名</view>
-      <view class="pt30 pb30 text-right font-28 color-666">{{name}}</view>
-    </view>
-    <view class="relative bbs-1-eb last-b-none pl180 font-28">
-      <view class="absolute left-0 box-middle">客户手机号码</view>
-      <view class="pt30 pb30 text-right font-28 color-666">{{mobile}}</view>
-    </view>
-    <view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{cardid}}">
-      <view class="absolute left-0 box-middle">客户身份证</view>
-      <view class="pt30 pb30 text-right font-28 color-666">{{cardid}}</view>
-    </view>
     <view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{owner_name}}">
       <view class="absolute left-0 box-middle color-333">车主姓名</view>
       <view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx;">
@@ -401,10 +369,6 @@
         <text>{{owner_cardid}}</text>
       </view>
     </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>
     <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;">
@@ -417,10 +381,6 @@
         <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>
@@ -451,6 +411,10 @@
       <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="{{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="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 class="mr10 color-f9394d">{{priceinfo.price}}</text>元</view>
@@ -592,26 +556,18 @@
 	</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 text-center 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}}' />
+<!--完善信息-->
+<lcb-msg isShow="{{isShowWanShan}}" isHasClose="{{true}}" bind:closeevent="optWanShan">
+	<view slot="content">
+		<view class="inner40 pt60 pb60 line-height-16 font-34 color-666">
+      <view class="text-center text-bold">完善信息</view>
+      <view class="pl50 pr50 text-center">
+        <view class="relative overflowhidden mt30 btn-36afa2 pt15 pb15 font-28 color-fff ulib-r10" bindtap="chooseImg">
+          <view class="orderTip text-center font-20 color-fff bg-f9394d">推荐</view>
+          {{main_type == 0?'上传身份证':'上传营业执照'}}
+        </view>
+        <view class="mt30 btn-36afa2 pt15 pb15 font-28 color-fff ulib-r10" bindtap="showInfoForm">手动输入信息</view>
       </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>

pages/order/register/index.wxss

@@ -56,4 +56,15 @@ radio .wx-radio-input.wx-radio-input-checked::before{
   color:#fff;
   transform:translate(-50%, -50%) scale(1);
   -webkit-transform:translate(-50%, -50%) scale(1);
+}
+
+.orderTip{
+  position: absolute;
+  top: -10rpx;
+  right: -35rpx;
+  width: 100rpx;
+  height: 35rpx;
+  padding-top:18rpx;
+  /* line-height: 50rpx; */
+  transform: rotate(45deg);
 }