Merge branch 'dev/v1.5.43_cyl' of jianyu/page_bigmember_pc into feature/v1.5.43

src/components/selector-cascader/AreaCityCascader.vue

@@ -75,6 +75,7 @@ export default {
       propsData: {
         value: 'name',
         label: 'name',
+        expandTrigger: 'hover',
         multiple: true
       },
       optionsList: []

src/components/selector-cascader/BuyerClassCascader.vue

@@ -69,6 +69,7 @@ export default {
       value: '',
       buyerclassListMapExp,
       propsData: {
+        expandTrigger: 'hover',
         multiple: true
       }
     }

src/components/selector-cascader/IndustryCascader.vue

@@ -66,6 +66,7 @@ export default {
       value: '',
       industryListMapExp,
       propsData: {
+        expandTrigger: 'hover',
         multiple: true
       }
     }

src/components/selector-cascader/SubscribeClassListCascader.vue

@@ -94,6 +94,7 @@ export default {
     return {
       value: '',
       propsData: {
+        expandTrigger: 'hover',
         multiple: true
       }
     }

src/utils/format/money.js

@@ -89,7 +89,17 @@ function recursiveCalculationMoney (money, config = {}, start = false) {
  * @returns {*|string|string|number}
  */
 export function formatMoney (money, config = {}) {
-  return recursiveCalculationMoney(money, config, true)
+  if (config.level === 1 && !config.degrade) {
+    // 万元单位, 并且不单位降级, 则小于100元的金额会被舍弃, 造成显示空白
+    // 此处逻辑: 单位固定万元,不降级. 金额<10000, 展示元为单位
+    if (money && money > 0 && money < 10000) {
+      return `${money}元`
+    } else {
+      return recursiveCalculationMoney(money, config, true)
+    }
+  } else {
+    return recursiveCalculationMoney(money, config, true)
+  }
 }
 
 /**

src/views/reportData/pageMonth.vue

@@ -1100,7 +1100,13 @@ export default {
     },
     beforeTabLeave (targetActiveName) {
       this.recordScrollTop(this.tabActiveName)
-      this.recoverScrollTop(targetActiveName)
+      if (targetActiveName === '1') {
+        // 恢复到默认位置
+        this.recoverScrollTop(targetActiveName)
+      } else if (targetActiveName === '2') {
+        // 滚动到顶部
+        this.scrollToTab()
+      }
       return true
     },
     // 采购排行榜查看全部
@@ -1265,6 +1271,10 @@ export default {
         line-height: 50px;
         font-size: 16px;
         color: #686868;
+        &.is-active,
+        &:hover {
+          color: #2CB7CA;
+        }
       }
       .el-tabs__nav-wrap {
         &::after {

src/views/reportData/pageWeek.vue

@@ -449,7 +449,13 @@ export default {
     },
     beforeTabLeave (targetActiveName) {
       this.recordScrollTop(this.tabActiveName)
-      this.recoverScrollTop(targetActiveName)
+      if (targetActiveName === '1') {
+        // 恢复到默认位置
+        this.recoverScrollTop(targetActiveName)
+      } else if (targetActiveName === '2') {
+        // 滚动到顶部
+        this.scrollToTab()
+      }
       return true
     },
     /* 数据处理 */
@@ -807,6 +813,10 @@ export default {
         line-height: 50px;
         font-size: 16px;
         color: #686868;
+        &.is-active,
+        &:hover {
+          color: #2CB7CA;
+        }
       }
       .el-tabs__nav-wrap {
         &::after {