提交

components/option/pictographicOption.js

@@ -1,5 +1,11 @@
 // 象形
 export default function pictographicOption(dRegion = [], dValue = [], dSum = 0) {
+    if(dRegion.length < 5) {
+        let n = 5 - dRegion.length;
+        for(let i = 0; i < n; i++) {
+            dRegion.push('')
+        }
+    }
     return {
         tooltip: {
             trigger: "axis",

components/option/pictographicOption2.js

@@ -1,5 +1,11 @@
 // 象形
 export default function pictographicOption(dRegion = [], dValue = [], dSum = 0) {
+    if(dRegion.length < 5) {
+        let n = 5 - dRegion.length;
+        for(let i = 0; i < n; i++) {
+            dRegion.push('')
+        }
+    }
     return {
         textStyle: {
 

components/option/singleLineOption.js

@@ -4,6 +4,7 @@ export default function brokenLine(dValue = [], dx = []) {
     grid: {
       left:  40,
       top: 25,
+      bottom: 25,
       height: 150,
       width: 320
     },

contrastPackages/carModelsRatio/weibo/index.wxml

@@ -95,12 +95,12 @@
         </view>
     </view>
     <view  wx:for="{{area}}">
-        <view style="margin-left:32rpx ;">{{item.name}}</view>
+        <view  style="margin:10px 32rpx 0 32rpx">{{item.name}}</view>
-        <view class="chart_box" style="margin-top: -100rpx;">
+        <view class="chart_box" style="margin-top: -60rpx;">
-            <view style="float:left;width:342rpx;height:486rpx;">
+            <view style="float:left;width:342rpx;height:400rpx;">
                 <c-echars showChart="{{showChart}}" canvasId="region-canvas1" chartId="regionbar1" chartOption="{{item.func[0]}}" height="100%"></c-echars>
             </view>
-            <view style="float:right;width:342rpx;height:486rpx;">
+            <view style="float:right;width:342rpx;height:400rpx;">
                 <c-echars showChart="{{showChart}}" canvasId="region-canvas1" chartId="regionbar1" chartOption="{{item.func[1]}}" height="100%"></c-echars>
             </view>
 

contrastPackages/carModelsRatio/weibo/index.wxss

@@ -1,7 +1,7 @@
 .chart_box{
     margin-top: 24rpx;
     width: 686rpx;
-    height: 486rpx;
+    height: 400rpx;
     padding-top:32rpx ;
     background: white;
 }
@@ -72,8 +72,8 @@
 .area_box{
     margin-top: 24rpx;
     width: 686rpx;
-    height: 970rpx;
+    height: 880rpx;
     background:#ffffff;
     border-radius: 8rpx;
-    padding-top:32rpx;
+    padding:32rpx 0;
 }

pages/index/Salesranking/Salesranking.js

@@ -354,6 +354,11 @@ Page({
             })
         })
     },
+    onClose(){
+        this.setData({
+            show: false
+        })
+    },
     exit() {
         this.setData({
             show: false

pages/index/Salesranking/Salesranking.wxml

@@ -93,7 +93,7 @@
     </van-tab>
 </van-tabs>
 
-<page-container show="{{ show }}" position="bottom" custom-style="height: 40%;" bind:close="onClose" lock-scroll="{{false}}">
+<page-container bind:clickoverlay="onClose" show="{{ show }}" position="bottom" custom-style="height: 40%;" bind:close="onClose" lock-scroll="{{false}}">
     <view class="detail-page">
         <view style="display: flex;">
             <view class="qushi">销量趋势</view>

pages/index/Salesranking/Salesranking.wxss

@@ -206,7 +206,7 @@
 .brand_tu {
     /* position: relative; */
     width: 100%;
-    height: 390rpx;
+    height: 420rpx;
     text-align: center;
 }
 

pages/insight/pages/brandInsight/brandDataList/index.js

@@ -272,7 +272,7 @@ Page({
         success: function (r) {
           if (r.confirm) {
             that.setData({
-              fileName: "事件数据" + date,
+              fileName: wx.getStorageSync('sBrand') + date,
               reportShow: true
             })
           } else {
@@ -282,7 +282,7 @@ Page({
       })
     } else {
       that.setData({
-        fileName: "事件数据" + date,
+        fileName:  wx.getStorageSync('sBrand') + date,
         reportShow: true
       })
     }

pages/insight/pages/modalInsight/modalDataList/index.js

@@ -96,7 +96,7 @@ Page({
       iTimeType: this.data.iTimeType, //0发布时间 1入库时间
       sCrisis: wjList.join(',') || '',
       sBrand: wx.getStorageSync('sBrand') || '',
-      sSeries: wx.getStorageSync('sSeriesName') || '',
+      sSeriesName: wx.getStorageSync('sSeriesName') || '',
     }).then(res => {
       let arr = [...this.data.brandDataList, ...res]
       this.setData({
@@ -138,7 +138,7 @@ Page({
       iTimeType: this.data.iTimeType, //0发布时间 1入库时间
       sCrisis: wjList.join(',') || '',
       sBrand: wx.getStorageSync('sBrand') || '',
-      sSeries: wx.getStorageSync('sSeriesName') || '',
+      sSeriesName: wx.getStorageSync('sSeriesName') || '',
     }, (res) => {
       this.setData({
         total: res.totalNum
@@ -270,7 +270,7 @@ Page({
         success: function (r) {
           if (r.confirm) {
             that.setData({
-              fileName: "事件数据" + date,
+              fileName: wx.getStorageSync('sSeriesName') + date,
               reportShow: true
             })
           } else {
@@ -280,7 +280,7 @@ Page({
       })
     } else {
       that.setData({
-        fileName: "事件数据" + date,
+        fileName:wx.getStorageSync('sSeriesName') + date,
         reportShow: true
       })
     }
@@ -327,7 +327,7 @@ Page({
       sStartTime: this.data.sStartTime,
       sEndTime: this.data.sEndTime,
       sBrand: wx.getStorageSync('sBrand') || '',
-      sSeries: wx.getStorageSync('sSeriesName') || '',
+      sSeriesName: wx.getStorageSync('sSeriesName') || '',
       sQuDao: qdList.join(',') || '',
       sQingGan: qgList.join(',') || '',
       sCrisis: wjList.join(',') || '',

pages/insight/pages/themeBoard/index.wxml

@@ -210,7 +210,7 @@
             <view class="tb-item">
                 <view class="tb-area-title">
                     <view style="width: 20%;">大V分析</view>
-                    <view style="width: 80%;">
+                    <view style="width: 78%;">
                         <van-tabs type="card" active="{{ bigvActive }}" color="#BBBBBB" bind:change="changeBigv" nav-class="tabber-class">
                             <van-tab title="合计"></van-tab>
                             <van-tab title="名人"></van-tab>

pages/insight/pages/themeList/index.js

@@ -370,7 +370,7 @@ Page({
         success: function (r) {
           if (r.confirm) {
             that.setData({
-              fileName: "事件数据" + date,
+              fileName: "主题数据" + date,
               reportShow: true
             })
           } else {
@@ -380,7 +380,7 @@ Page({
       })
     } else {
       that.setData({
-        fileName: "事件数据" + date,
+        fileName: "主题数据" + date,
         reportShow: true
       })
     }