Merge branch 'feature/zjx' into 'develop'

Feature/zjx

See merge request !52

src/components/pickArea/index.vue

@@ -88,10 +88,16 @@ export default {
       },
       immediate:true
     },
+    projectEquityNo: {
+      handler(nv) {
+        console.log('projectEquityNo', nv);
+        this.initData();
+      }
+    }
 
   },
   created() {
-    this.initData();
+
   },
   methods: {
     // 初始化 省市县信息

src/views/appoint/index.vue

@@ -419,12 +419,14 @@ export default {
     getDetailByUnionId() { },
     confirm(values) {
       console.log('confirm', values);
-      this.showAreaLabel = values.map(ele => ele.name).join('');
-      this.externalData.provinceId = values[0].id;
-      this.externalData.countyId = values[2].id;
-      this.externalData.cityId = values[1].id;
+      if (values) {
+        this.showAreaLabel = values.map(ele => ele.name).join('');
+        this.externalData.provinceId = values[0].id;
+        this.externalData.countyId = values[2].id;
+        this.externalData.cityId = values[1].id;
+        this.showArea = false;
+      }
 
-      this.showArea = false;
     },
     selectHospital({hospitalId, hospitalName}) {
       this.hospitalId = hospitalId;

src/views/insurance-question-result/insuranceQuestionResult.vue

@@ -182,7 +182,7 @@ background: #fff;
     color: #666666;
   }
   .advise {
-    height: 78px;
+    height: 48px;
     background: #fffbf9;
     border-radius: 11px;
     border: 1px solid #fbe0ce;