Merge remote-tracking branch 'origin/master'

src/views/agriculturalTrusteeship/login.vue

@@ -79,7 +79,13 @@
             </template>
           </van-field>
           <div v-if="loginType == 'mj'">
-            <van-field v-model="formData.code" center clearable label="验证码" placeholder="图形验证码">
+            <van-field
+              v-model="formData.code"
+              center
+              clearable
+              label="验证码"
+              placeholder="图形验证码"
+            >
               <template #button>
                 <img style="width: 100px" :src="codeUrl" @click="getCode" />
               </template>
@@ -92,7 +98,6 @@
           <p class="submit_btn" v-if="loginType == 'mj'" @click="handleLogin">登录</p>
           <p class="submit_btn" v-else @click="goLogin">登录</p>
         </van-tab>
-
         <van-tab name="register" title="注册" v-if="loginType != 'mj'">
         <!--保险机构注册-->
           <van-form @submit="goRegister" ref="formData" show-error :show-error-message="false">
@@ -135,7 +140,6 @@
                 </template>
               </van-field>
 
-              <!--
               <van-field v-model="serviceForm.fax" center :border="false" placeholder="请输入传真">
                 <template #left-icon>
                   <img src="../../../static/images/agriculturalTrusteeship/login/register_05.png" alt="">
@@ -148,8 +152,8 @@
               </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>
-              -->
+<!--              <MapGisTag ref="clickLoading" :showBtn="true" :message="serviceForm.theGeom" v-on:formSubmit="MapTag"></MapGisTag>-->
+
             </template>
 
             <template v-if="loginType == 'fwzz'">
@@ -328,7 +332,7 @@
               <van-uploader v-model="mainImgUploader2" :after-read="afterReadEvidenceEntityForm" :before-delete="deleteFileEvidenceEntityForm" />
 
 
-              <MapGisTag ref="clickLoading1" :showBtn="true" :message="entityForm.theGeom" v-on:formSubmit="MapTag1"></MapGisTag>
+<!--              <MapGisTag ref="clickLoading1" :showBtn="true" :message="entityForm.theGeom" v-on:formSubmit="MapTag1"></MapGisTag>-->
             </template>
             <p class="submit_btn" @click="$refs.formData.submit()">提交审核</p>
           </van-form>
@@ -344,12 +348,12 @@
   import {getCodeImg, getRegisterSmsCode, registerCheck, registerOn} from "@/api/login";
   import {decrypt, encrypt} from "@/utils/jsencrypt";
   import {serviceLogin, entityLogin, commonUpload , serviceRegister , entityRegister , treeselect} from "@/api/agriculturalTrusteeship";
-  import MapGisTag from "@/components/Map/MapGisTagDTG";
+  // import MapGisTag from "@/components/Map/MapGisTagDTG";
   export default {
     name: "agriculturalTrusteeshipLogin",
-    components: {
-      MapGisTag
-    },
+    // components: {
+    //   MapGisTag
+    // },
     data() {
       return {
         active:0,
@@ -442,28 +446,28 @@
 
     },
     methods: {
-      //获取自己返回值
-      /** 查找地图中定位点 */
-      MapTag: function (data) {
-        this.serviceForm.theGeom = data;
-      },
-      //每个查看修改，新增  方法下引用下面方法
-      mapClickLoading(){
-        setTimeout(() => {
-          this.$refs.clickLoading.pointPaceCountryDarw();
-        }, 500);
-      },
-      //获取自己返回值
-      /** 查找地图中定位点 */
-      MapTag1: function (data) {
-        this.entityForm.theGeom = data;
-      },
-      //每个查看修改，新增  方法下引用下面方法
-      mapClickLoading1(){
-        setTimeout(() => {
-          this.$refs.clickLoading1.pointPaceCountryDarw();
-        }, 500);
-      },
+      // //获取自己返回值
+      // /** 查找地图中定位点 */
+      // MapTag: function (data) {
+      //   this.serviceForm.theGeom = data;
+      // },
+      // //每个查看修改，新增  方法下引用下面方法
+      // mapClickLoading(){
+      //   setTimeout(() => {
+      //     this.$refs.clickLoading.pointPaceCountryDarw();
+      //   }, 500);
+      // },
+      // //获取自己返回值
+      // /** 查找地图中定位点 */
+      // MapTag1: function (data) {
+      //   this.entityForm.theGeom = data;
+      // },
+      // //每个查看修改，新增  方法下引用下面方法
+      // mapClickLoading1(){
+      //   setTimeout(() => {
+      //     this.$refs.clickLoading1.pointPaceCountryDarw();
+      //   }, 500);
+      // },
       goLogin(){
         console.log(this.formData)
         if (this.loginType == 'bxjg' || this.loginType == 'dkjg' || this.loginType == 'ndjg' ){
@@ -508,11 +512,11 @@
           this.top = '40px';
           this.transform = 'none';
           this.left = '0';
-          if (this.loginType == 'bxjg' || this.loginType == 'dkjg' || this.loginType == 'ndjg'){
-            this.mapClickLoading()
-          }else if(this.loginType == 'fwzz'){
-            this.mapClickLoading1()
-          }
+          // if (this.loginType == 'bxjg' || this.loginType == 'dkjg' || this.loginType == 'ndjg'){
+          //   this.mapClickLoading()
+          // }else if(this.loginType == 'fwzz'){
+          //   this.mapClickLoading1()
+          // }
         }else if( name == 'login'){
           this.position = 'absolute';
           this.top = '50%';