Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_wechat_app into dev

src/project/fengdu/AppMine/userInfo.vue

@@ -52,7 +52,7 @@
           <div class="item-right" v-if="!editArea">
             <p class="name">{{ user.areaName || '' }}</p>
           </div>
-          <AiAreaPicker v-else class="item-right" :areaId="$areaId" v-model="userAreaId" :fullName.sync="userAreaName">
+          <AiAreaPicker v-else :selectRoot="false" class="item-right" :areaId="$areaId" v-model="userAreaId" :fullName.sync="userAreaName">
             <div class="ai-area__wrapper">
               <span class="label" v-if="userAreaName">{{ userAreaName }}</span>
               <i v-else>请选择</i>
@@ -134,6 +134,9 @@ export default {
       if (!this.userIdNumber) {
         return this.$u.toast('请输入身份证号')
       }
+      if (!this.$idCardNoUtil.checkIdCardNo(this.userIdNumber)) {
+        return this.$u.toast('请输入正确的身份证号码')
+      }
       if (!this.userAreaId) {
         return this.$u.toast('请选择所属地区')
       }