Merge branch 'master' of http://116.255.223.226:3000/zhangzl/nsgk_mobile

 Conflicts:

	src/views/register/companyRegister.vue

src/views/register/companyRegister.vue

@@ -22,8 +22,6 @@
       <van-field v-model="confirmPassWord" type="password" label="确认密码" placeholder="请再次输入密码" required :rules="[{ required:true }]"/>
       <van-field readonly clickable name="picker" :value="value" label="经济类型" placeholder="点击选择经济类型" @click="showPicker = true" required :rules="[{ required:true }]"/>
       <van-field v-model="form.companyName" label="公司名称" placeholder="请输入公司名称" required :rules="[{ required:true }]"/>
-      <van-field v-model="form.realname" label="负责人姓名" placeholder="请输入负责人姓名" required :rules="[{ required:true }]"/>
-      <van-field v-model="form.idCardNum" label="身份证号" placeholder="请输入法人身份证号" required :rules="[{ required:true }]"/>
       <van-field v-model="form.companyCode" label="社会信用代码" placeholder="请输入公司的社会信用代码" required :rules="[{ required:true }]"/>
       <van-field v-model="form.companyLicense" label="营业执照号" placeholder="请输入公司的营业执照号" required :rules="[{ required:true }]"/>
       <van-field v-model="form.address" label="联系地址" placeholder="请输入联系地址" />
@@ -35,6 +33,9 @@
       </van-field>
 
       <van-field name="uploader" label="附件上传" required>
+      <van-field v-model="form.realname" label="法人姓名" placeholder="请输入法人姓名" required :rules="[{ required:true }]"/>
+      <van-field v-model="form.idCardNum" label="法人身份证号" placeholder="请输入法人身份证号" required :rules="[{ required:true }]"/>
+      <van-field name="uploader" label="开户证明" required>
         <template #input>
           <van-uploader :after-read="afterReadKHZM" :before-delete="deleteFileKHZM" v-model="fileListKHZM" multiple :max-count="1" />
         </template>
@@ -102,11 +103,11 @@
         />
       </van-popup>
 
-      <van-field v-model="form.bankDeposit" label="关键词" placeholder="请输入开户行地址关键词"/>
+      <van-field v-model="form.bankDeposit" label="关键词" placeholder="请输入开户行地址关键词，如镇街名称"/>
       <van-field
         v-model="form.bankAddress"
         label="开户银行"
-        placeholder="需上边设置【开户省市、关键词】后检索"
+        placeholder="输入【开户省市、关键词】后："
         required
         :rules="[{ required:true }]"
         readonly

src/views/register/userRegister.vue

@@ -102,11 +102,11 @@
         />
       </van-popup>
 
-      <van-field v-model="form.bankDeposit" label="关键词" placeholder="请输入开户行地址关键词"/>
+      <van-field v-model="form.bankDeposit" label="关键词" placeholder="请输入开户行地址关键词，如镇街名称"/>
       <van-field
         v-model="form.bankAddress"
         label="开户银行"
-        placeholder="需上边设置【开户省市、关键词】后检索"
+        placeholder="输入【开户省市、关键词】后："
         required
         :rules="[{ required:true }]"
         readonly