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

src/apps/AppCreditPoints/AppGridIntegral.vue

@@ -5,12 +5,12 @@
       <img src="https://cdn.cunwuyun.cn/dvcp/credit/head.png" alt="">
       <div class="headerDataPane" flex>
         <div class="headerItem top">
-          <div v-text="`个人积分`"/>
-          <b v-text="info.historyIntegralTotal||0"/>
+          <div v-text="`积分余额`"/>
+          <b v-text="info.nowIntegral||0"/>
         </div>
         <div class="headerItem">
-          <div v-text="`剩余积分`"/>
-          <b v-text="info.nowIntegral||0"/>
+          <div v-text="`历史累计积分`"/>
+          <b v-text="info.historyIntegralTotal||0"/>
         </div>
         <div class="divider"/>
         <div class="headerItem">
@@ -122,7 +122,7 @@ export default {
           line-height: 50px;
           color: #000;
           font-size: 36px;
-          font-family: DIN,DINAlternate-Bold, DINAlternate;
+          font-family: DIN, DINAlternate-Bold, DINAlternate;
           margin-bottom: 10px;
         }
 

src/components/AiAreaPicker.vue

@@ -79,7 +79,7 @@ export default {
     value: {
       immediate: true,
       handler(v) {
-        v && !this.areaName && this.getAreaName(this.value)
+        v && this.getAreaName(this.value)
       }
     },
     fullArea(v) {
@@ -104,17 +104,18 @@ export default {
       })
     },
     getInfo(areaId) {
-      return areaId && this.$http.post('/admin/area/getAllParentAreaId', null, {
+      return areaId ? this.$http.post('/admin/area/getAllParentAreaId', null, {
         withoutToken: true,
         params: {areaId},
       }).then(res => {
         if (res?.data) {
           return res.data.reverse()
         }
-      })
+      }) : Promise.reject()
     },
     getFullArea(areaId) {
-      return this.fullArea?.length > 0 ? Promise.resolve(this.fullArea) : this.getInfo(areaId).then(meta => {
+      const current = this.fullArea.slice(-1)?.[0]?.id
+      return current && current == areaId ? Promise.resolve(this.fullArea) : this.getInfo(areaId).then(meta => {
         if (meta.length > 1) {
           this.fullArea = meta.slice(this.dataRange)
         } else {
@@ -148,13 +149,15 @@ export default {
         uni.navigateTo({url})
       }
     },
-    getAreaName(area, name) {
-      name ? this.areaName = name :
-          this.multiple ? this.areaName = !![area].toString() ? `已选择${[area].flat().length}个` : '' :
-              this.getFullArea(area).then(list => {
-                let arr = JSON.parse(JSON.stringify(list))
-                this.areaName = arr?.reverse()?.[0]?.name || ""
-              })
+    getAreaName(area) {
+      if (this.multiple) {
+        this.areaName = `已选择${[area].flat().filter(Boolean)?.length}个`.replace('已选择0个', '')
+      } else {
+        this.getFullArea(area).then(list => {
+          let arr = JSON.parse(JSON.stringify(list))
+          this.areaName = arr?.reverse()?.[0]?.name || ""
+        }).catch(() => this.areaName = '')
+      }
     },
   }
 }