Merge branch 'dev4.6.2.15' of http://192.168.3.207:8080/qmx/jy into dev4.6.2.15

src/jfw/modules/app/src/web/staticres/jyapp/big-member/css/report_analysis.css

@@ -259,6 +259,7 @@
   font-size: .4rem;
 }
 .search-result .section {
+  position: relative;
   margin-top: .16rem;
 }
 .search-result .section-header {
@@ -330,6 +331,7 @@
 
 .m-overview-name {
   margin-bottom: .08rem;
+  white-space: nowrap;
 }
 .m-overview-name,
 .m-overview-unit,

src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/components/lineChartScatter.js

@@ -138,6 +138,39 @@ var lineChartScatter = {
       }
     },
     configOptions (options) {
+      // 面积颜色-渐变
+      Object.assign(options.series[0], {
+        areaStyle: {
+          normal: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: 'rgba(42, 190, 209, 0.5)'
+              },
+              {
+                offset: 1,
+                color: 'rgba(42, 190, 209, 0)'
+              }
+            ], false)
+          }
+        }
+      })
+      Object.assign(options.series[1], {
+        areaStyle: {
+          normal: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: 'rgba(255, 159, 63, 0.5)'
+              },
+              {
+                offset: 1,
+                color: 'rgba(255, 159, 63, 0)'
+              }
+            ], false)
+          }
+        }
+      })
       options.tooltip.formatter = params => {
         let tip = `<div style="padding-top:2px;color:#9B9CA3;">${params[0].name}</div>`
         for (let i = 0; i < params.length; i++) {

src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/report_analysis.js

@@ -571,7 +571,7 @@ var vm = new Vue({
 
       this.analysis.loaded = false
       this.analysis.loading = true
-      var loading = this.showLoading()
+      this.showLoading()
 
       $.ajax({
         type: 'POST',
@@ -588,7 +588,6 @@ var vm = new Vue({
         }.bind(this),
         complete: function () {
           this.analysis.loading = false
-          loading.clear()
         }.bind(this)
       })
     },
@@ -1671,7 +1670,7 @@ var vm = new Vue({
       }
     },
     toSubManage: function () {
-      location.href = '/jyapp/vipsubscribe/toSubVipSetPage?vSwitch=m'
+      location.href = '/jyapp/vipsubscribe/toSetKeyWordPage'
     },
     toArticleContent (item) {
       this.saveState()

src/web/staticres/common-module/collection/js/area-city-mobile.js

@@ -208,6 +208,7 @@ var areaCityMobileComponent = {
       var state = {}
       var count = 0
       this.tablist.forEach(function (item) {
+        if (item.name === '全国') return
         if (item.type) {
           // 全省被选中
           state[item.name] = []