Merge branch 'master' of http://39.98.153.250:9080/bowintek/EmploymentSite

h5app/src/views/pages/company/edit.vue

@@ -302,6 +302,7 @@ import {required} from "@vuelidate/validators";
 import {getSysDictionaryList} from "@/api/system/dictionary";
 import dayjs from "dayjs";
 import IndustrySelection from "@/components/industrySelection.vue";
+import {getPosition} from "@/utils/position";
 
 interface StepParams{
   name: string,
@@ -374,7 +375,9 @@ export default defineComponent({
         workSituation: null,
         insuredCount: null,
         businScope: null,
-        companyDesc: null
+        companyDesc: null,
+        longitude: null,
+        latitude: null
     }});
     const stepList = ref([
         {title: '基础信息', desc: '企业基础信息', val: 1},
@@ -569,6 +572,7 @@ export default defineComponent({
     }
 
     const onNext = async () => {
+      console.log(formState.dataModel)
       const isFormCorrect = await v$.value.$validate();
       if (!isFormCorrect) {
         await presentAlert('请输入完整信息！');
@@ -618,6 +622,9 @@ export default defineComponent({
       isLongDate.value = formState.dataModel.validDate == "2099-12-31T00:00:00.000+08:00";
       console.log('dataModel',formState.dataModel);
       if(formState.dataModel.regionCode!=null) getStreetListData(formState.dataModel.regionCode);
+      if (companyID == null) {
+        setLongitudeLatitude();
+      }
     };
 
    /* watch(() => route.query, () => {
@@ -649,6 +656,16 @@ export default defineComponent({
       await alert.present();
     }
 
+    // 设置经纬度
+    function setLongitudeLatitude() {
+      getPosition().then((data: any) => {
+        if (data.longitude != null && data.latitude != null) {
+          formState.dataModel.longitude = data.longitude;
+          formState.dataModel.latitude = data.latitude;
+        }
+      })
+    }
+
     return {
       ...toRefs(formState),
       arrowBackOutline,

h5app/src/views/pages/jobUserInfo/companyEdit.vue

@@ -299,6 +299,7 @@ import {required} from "@vuelidate/validators";
 import {getSysDictionaryList} from "@/api/system/dictionary";
 import dayjs from "dayjs";
 import IndustrySelection from "@/components/industrySelection.vue";
+import {getPosition} from "@/utils/position";
 
 interface StepParams{
   loginUserID: string,
@@ -372,7 +373,9 @@ export default defineComponent({
         businScope: null,
         companyDesc: null,
         openId:null,
-        loginUserID:''
+        loginUserID: '',
+        longitude: null,
+        latitude: null
       }});
     const stepList = ref([
       {title: '基础信息', desc: '企业基础信息', val: 1},
@@ -582,6 +585,9 @@ export default defineComponent({
       formState.dataModel.openId = openId;
       console.log('dataModel',formState.dataModel);
       if(formState.dataModel.regionCode!=null) getStreetListData(formState.dataModel.regionCode);
+      if (companyID == null) {
+        setLongitudeLatitude();
+      }
     };
 
 
@@ -608,10 +614,15 @@ export default defineComponent({
       await alert.present();
     }
 
-
-
-
-
+    // 设置经纬度
+    function setLongitudeLatitude() {
+      getPosition().then((data: any) => {
+        if (data.longitude != null && data.latitude != null) {
+          formState.dataModel.longitude = data.longitude;
+          formState.dataModel.latitude = data.latitude;
+        }
+      })
+    }
 
     return {
       ...toRefs(formState),