Merge remote-tracking branch 'origin/master'

zengh

2022-02-26 eeb9de8a494aa2801df004231c4c328a12d8386a

 pages/registerUser/registerUser.vue

@@ -26,6 +26,12 @@
            <u-input v-model="form.xq" type="select" placeholder="请选择工作地点" :border="true"
               @click="regionClick('工作地点')" />
         </u-form-item>
			
         <u-form-item v-show="jobValue == '有'" label="单位名称" prop="jobUnit" label-width="200" left-icon="home"
            :required="true">
            <u-input v-model="form.jobUnit" placeholder="请输入单位名称" />
         </u-form-item>
			
         <u-form-item label="居住地" prop="address" left-icon="map" label-width="200" :required="true">
            <u-input v-model="form.address" type="select" placeholder="请选择居住地" :border="true"
               @click="placeClick('居住地')" />
@@ -61,7 +67,8 @@
         注册</u-button>

      <map v-show="signLocation" id="SignLocationMap"
         style="position: absolute; top: 0; left: 0; width: 100%; height: 100%; z-index: 99;"
         style="position: absolute; left: 0; width: 100%; z-index: 99;"
         :style="{height: screenHeight + 'px', top: screenTop + 'px'}"
         @regionchange="regionChange" :latitude="latitude" :longitude="longitude" :scale="scale">

         <cover-view class="dingwBut">
@@ -108,6 +115,10 @@
         };

         return {
            // 设置高度, TOP值
            screenHeight: 0,
            screenTop: 0,
				
            // 记录地区获取居住地
            regionOrPlace: '',

@@ -211,12 +222,11 @@
               carId: '',
               phone: '',
               sex: '男',
               obj: '',
               objId: '',
               xq: '',
               jurisdiction: '',
               jsid: '',
               address: '',
               jobUnit: '',
               signals: '',
               workjurisdiction: ''
            },
@@ -267,9 +277,9 @@
                  // 可以单个或者同时写两个触发验证方式 
                  trigger: ['change', 'blur'],
               }],
               obj: [{
                  required: false,
                  message: '请输入工作单位',
               jobUnit: [{
                  required: true,
                  message: '请输入单位名称',
                  // 可以单个或者同时写两个触发验证方式 
                  trigger: ['change', 'blur'],
               }],
@@ -420,6 +430,8 @@
                  cardid: d.carId,
                  // 居住地址
                  address: d.address,
                  // 单位名称
                  jobUnit: d.jobUnit,
                  // 居住辖区
                  jurisdiction: d.jurisdiction,
                  // 工作地址
@@ -527,7 +539,13 @@
         }
      },
      onReady() {
         var that = this
         this.$refs.uForm.setRules(this.rules);
			
         uni.getSystemInfo({success: function (res) {
            that.screenHeight = res.windowHeight 
            that.screenTop = res.windowTop 
         }})
      },
      watch: {
         faceState() {