显示地名

miniapp/pages/yuecai/search/index1.vue

@@ -11,11 +11,15 @@
       </view>
     </view>
     <view v-show="currentTab != 3" style="width: 100%;height: 250px;">
-      <l-echart ref="chart" @finished="init"></l-echart>
+      <l-echart class="width-100 height-100" ref="chart" @finished="init"></l-echart>
+    </view>
+    <view class="area-title">
+      <u-icon name="map-fill" color="#65371b"></u-icon>
+      <view class="area-title-text">{{currentAreaName || '广东省'}}</view>
     </view>
     <u-tabs ref="tabs" :list="tabList" :scrollable="false" :current="currentTab" @change="tabChange" lineColor="#65371b"
       :activeStyle="{color:'#65371b'}" inactiveStyle="{color:'#65371b'}"></u-tabs>
-    <u-list @scrolltolower="scrolltolower" :height="currentTab != 3?'calc(100% - 341px)':'calc(100% - 91px)'"
+    <u-list @scrolltolower="scrolltolower" :height="currentTab != 3?'calc(100% - 383px)':'calc(100% - 91px)'"
       lowerThreshold="10">
 
       <view class="info-list">
@@ -51,6 +55,7 @@
             left: 'right'
           },
           tooltip: {
+            show: false,
             trigger: 'item',
             formatter: '{b}'
           },
@@ -164,6 +169,7 @@
         },
         keyword: '',
         areaCode: '',
+        currentAreaName: '',
         list: [],
         tabList: [{
           name: '名店',
@@ -180,7 +186,7 @@
     onLoad(options) {},
     onShow() {
       uni.hideLoading()
-      // this.doRefresh()
+      this.doRefresh()
     },
     methods: {
       async init() {
@@ -193,24 +199,26 @@
       },
 
       clickMap(e) {
-        let currentAcode;
-        if (!(e.data && e.data.name)) {
-          currentAcode = '';
-        } else {
+        let currentAcode = '',
+          currentAreaName = '';
+        if (e.data && e.data.name) {
           /** 通过名称匹配 */
           for (let i = 0; i < mapJson.features.length; i++) {
             let p = mapJson.features[i].properties;
             if (p.name == e.data.name) {
               currentAcode = p.adcode.toString().substring(0, 4);
+              currentAreaName = p.name;
               break;
             }
           }
         }
         if (this.currentTab != 3 && this.areaCode != currentAcode) {
           this.areaCode = currentAcode;
+          this.currentAreaName = currentAreaName;
           this.areaSearch();
         } else if (this.currentTab != 3 && this.areaCode == currentAcode) {
           this.areaCode = '';
+          this.currentAreaName = ''
           myChart.dispatchAction({
             type: 'downplay',
             seriesIndex: e.seriesIndex
@@ -337,6 +345,20 @@
     align-items: center;
   }
 
+  .area-title {
+    width: calc(100% - 40px);
+    margin: auto;
+    display: flex;
+    align-items: center;
+    padding: 10px 0px;
+    border-bottom: 2rpx solid #65371b;
+
+    .area-title-text {
+      margin-left: 10px;
+      color: #65371b;
+    }
+  }
+
   .nav-btns {
     border-bottom: 1rpx solid #65371b;
     margin-bottom: 20rpx;