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

 Conflicts:

	src/views/register/companyRegister.vue

src/views/register/companyRegister.vue

@@ -8,17 +8,7 @@
       @click-left="onClickLeft"
     />
     <van-form @submit="getSubmit">
-      <van-field
-        readonly
-        clickable
-        name="picker"
-        :value="value"
-        label="经济类型"
-        placeholder="点击选择经济类型"
-        @click="showPicker = true"
-        required
-        :rules="[{ required:true }]"
-      />
+
       <van-popup v-model="showPicker" position="bottom">
         <van-picker
           show-toolbar
@@ -28,21 +18,9 @@
         />
       </van-popup>
       <van-field v-model="form.phone" type="tel" label="手机号" placeholder="请输入手机号，作为登录账号！" required :rules="[{ required:true }]" />
-      <van-field
-        v-model="form.code"
-        center
-        clearable
-        label="验证码"
-        placeholder="图形验证码"
-        required :rules="[{ required:true }]"
-      >
-        <template #button>
-          <img class="code-img" :src="codeUrl" @click="getCode" />
-        </template>
-      </van-field>
       <van-field v-model="form.password" type="password" label="密码" placeholder="请输入密码" required :rules="[{ required:true }]"/>
       <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 }]"/>
@@ -55,6 +33,12 @@
         </template>
       </van-field>
 
+      <van-field v-model="form.code" center clearable label="验证码" placeholder="图形验证码" required :rules="[{ required:true }]">
+        <template #button>
+          <img class="code-img" :src="codeUrl" @click="getCode" />
+        </template>
+      </van-field>
+
 
 
       <van-divider>银行信息</van-divider>

src/views/register/userRegister.vue

@@ -22,18 +22,7 @@
 <!--          <van-button size="small" type="primary" native-type="button" :rules="[{ required:true }]">发送验证码</van-button>-->
 <!--        </template>-->
 <!--      </van-field>-->
-      <van-field
-        v-model="form.code"
-        center
-        clearable
-        label="验证码"
-        placeholder="图形验证码"
-        required :rules="[{ required:true }]"
-      >
-        <template #button>
-          <img class="code-img" :src="codeUrl" @click="getCode" />
-        </template>
-      </van-field>
+
       <van-field v-model="form.password" type="password" label="密码" placeholder="请输入密码" required :rules="[{ required:true }]"/>
       <van-field v-model="confirmPassWord" type="password" label="确认密码" placeholder="请再次输入密码" required :rules="[{ required:true }]"/>
       <van-field v-model="form.realname" label="姓名" placeholder="请输入姓名" required :rules="[{ required:true }]"/>
@@ -117,7 +106,7 @@
       <van-field
         v-model="form.bankAddress"
         label="开户银行"
-        placeholder="请输入开户银行"
+        placeholder="需上边设置【开户省市、关键词】后检索"
         required
         :rules="[{ required:true }]"
         readonly
@@ -138,7 +127,13 @@
       </van-popup>
 
 
-      <van-field v-model="form.payeePaymentLines" label="联行号" placeholder="请输入开户银行" required :rules="[{ required:true }]"/>
+      <van-field v-model="form.payeePaymentLines" label="联行号" placeholder="开户银行选定后，自动填充！" required :rules="[{ required:true }]"/>
+
+      <van-field v-model="form.code" center clearable label="验证码" placeholder="图形验证码" required :rules="[{ required:true }]">
+        <template #button>
+          <img class="code-img" :src="codeUrl" @click="getCode" />
+        </template>
+      </van-field>
 
       <div class="submit">
 <!--        <p>我已阅读并同意<span>《农村产权交易信息服务平台会员注册协议》</span></p>-->