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

src/views/register/companyRegister.vue

@@ -13,8 +13,8 @@
         clickable
         name="picker"
         :value="value"
-        label="供求类型"
-        placeholder="点击选择供求类型"
+        label="经济类型"
+        placeholder="点击选择经济类型"
         @click="showPicker = true"
         required
         :rules="[{ required:true }]"
@@ -27,7 +27,7 @@
           @cancel="showPicker = false"
         />
       </van-popup>
-      <van-field v-model="form.phone" type="tel" label="手机号" placeholder="请输入手机号" required :rules="[{ required:true }]" />
+      <van-field v-model="form.phone" type="tel" label="手机号" placeholder="请输入手机号，作为登录账号！" required :rules="[{ required:true }]" />
       <van-field
         v-model="form.code"
         center

src/views/register/userRegister.vue

@@ -8,7 +8,7 @@
       @click-left="onClickLeft"
     />
     <van-form @submit="getSubmit">
-      <van-field v-model="form.phone" type="tel" label="手机号" placeholder="请输入手机号" required :rules="[{ required:true }]" />
+      <van-field v-model="form.phone" type="tel" label="手机号" placeholder="请输入手机号，作为登录账号" required :rules="[{ required:true }]" />
 <!--      <van-field-->
 <!--        center-->
 <!--        clearable-->
@@ -39,7 +39,7 @@
       <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.address" label="联系地址" placeholder="请输入联系地址" />
-      <van-field name="uploader" label="身份证（正）" required>
+      <van-field name="uploader" label="身份证(正)" required>
         <template #input>
           <van-uploader :after-read="afterReadSFZ" :before-delete="deleteFileSFZ" v-model="fileListSFZ" multiple :max-count="1" />
         </template>

src/views/user/accountSetting/userInformation/userInformation.vue

@@ -16,7 +16,7 @@
       <van-field v-model="userForm.realname" label="姓名" placeholder="请输入姓名" required :rules="[{ required:true }]"/>
       <van-field v-model="userForm.idCardNum" label="身份证号" placeholder="请输入身份证号" required :rules="[{ required:true }]"/>
       <van-field v-model="userForm.address" label="联系地址" placeholder="请输入联系地址" />
-      <van-field name="uploader" label="身份证（正）" required>
+      <van-field name="uploader" label="身份证(正)" required>
         <template #input>
           <van-uploader :after-read="afterReadSFZ" :before-delete="deleteFileSFZ" v-model="fileListSFZ" multiple :max-count="1" />
         </template>