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

src/views/agriculturalTrusteeship/login.vue

@@ -101,50 +101,40 @@
         <van-tab name="register" title="注册" v-if="loginType != 'mj'">
         <!--保险机构注册-->
           <van-form @submit="goRegister" ref="formData" show-error :show-error-message="false">
+
             <template v-if="loginType == 'bxjg' || loginType == 'dkjg' || loginType == 'ndjg'">
               <van-field v-model="serviceForm.financialName" required :rules="[{ required: true }]" center :border="false" placeholder="请输入机构名称" >
                 <template #left-icon>
                   <img src="../../../static/images/agriculturalTrusteeship/login/register_01.png" alt="">
                 </template>
               </van-field>
-
               <van-field v-model="serviceForm.linker" required :rules="[{ required: true }]" center :border="false" placeholder="请输入联系人">
                 <template #left-icon>
                   <img src="../../../static/images/agriculturalTrusteeship/login/register_04.png" alt="">
                 </template>
               </van-field>
-
-              <van-field v-model="serviceForm.address" required :rules="[{ required: true }]" center :border="false" placeholder="请输入地址" >
+              <van-field v-model="serviceForm.phone" required :rules="[{ required: true }]" center :border="false" placeholder="请输入电话">
                 <template #left-icon>
-                  <img src="../../../static/images/agriculturalTrusteeship/login/register_02.png" alt="">
+                  <img src="../../../static/images/agriculturalTrusteeship/login/register_07.png" alt="">
                 </template>
               </van-field>
-
-  <!--            <van-field v-model="value1" center :border="false" placeholder="请输入成立时间">-->
-  <!--              <template #left-icon>-->
-  <!--                <img src="../../../static/images/agriculturalTrusteeship/login/register_05.png" alt="">-->
-  <!--              </template>-->
-  <!--            </van-field>-->
-
-              <van-field v-model="serviceForm.phone" required :rules="[{ required: true }]" center :border="false" placeholder="请输入电话">
+              <van-field v-model="serviceForm.address" required :rules="[{ required: true }]" center :border="false" placeholder="请输入地址" >
                 <template #left-icon>
-                  <img src="../../../static/images/agriculturalTrusteeship/login/register_07.png" alt="">
+                  <img src="../../../static/images/agriculturalTrusteeship/login/register_02.png" alt="">
                 </template>
               </van-field>
 
-              <van-field v-model="serviceForm.username" required :rules="[{ required: true }]" center :border="false" placeholder="请输入用户名" >
+              <van-field v-model="serviceForm.username" required :rules="[{ required: true }]" center :border="false" placeholder="请输入登录账号" >
                 <template #left-icon>
                   <img src="../../../static/images/agriculturalTrusteeship/login/register_06.png" alt="">
                 </template>
               </van-field>
-
-              <van-field v-model="serviceForm.password" required :rules="[{ required: true }]" center :border="false" placeholder="请输入密码" >
+              <van-field v-model="serviceForm.password" required :rules="[{ required: true }]" center :border="false" placeholder="请输入登录密码" >
                 <template #left-icon>
                   <img src="../../../static/images/agriculturalTrusteeship/login/register_08.png" alt="">
                 </template>
               </van-field>
-
-              <van-field v-model="serviceForm.passwordReal" required :rules="[{ required: true }]" center :border="false" placeholder="请确认密码">
+              <van-field v-model="serviceForm.passwordReal" required :rules="[{ required: true }]" center :border="false" placeholder="请再次输入密码">
                 <template #left-icon>
                   <img src="../../../static/images/agriculturalTrusteeship/login/register_08.png" alt="">
                 </template>
@@ -155,17 +145,17 @@
                   <img src="../../../static/images/agriculturalTrusteeship/login/register_05.png" alt="">
                 </template>
               </van-field>
-
               <van-field v-model="serviceForm.description" center :border="false" placeholder="请输入简要描述">
                 <template #left-icon>
                   <img src="../../../static/images/agriculturalTrusteeship/login/register_03.png" alt="">
                 </template>
               </van-field>
-
               <div style="height: 20PX"></div>
               <van-uploader v-model="mainImgUploader" :after-read="afterReadEvidenceForm" :before-delete="deleteFileEvidenceForm" />
               <MapGisTag ref="clickLoading" :showBtn="true" :message="serviceForm.theGeom" v-on:formSubmit="MapTag"></MapGisTag>
+
             </template>
+
             <template v-if="loginType == 'fwzz'">
               <van-field v-model="entityForm.entityName" required :rules="[{ required: true }]" center :border="false" placeholder="请输入主体名称" >
                 <template #left-icon>