Merge branch 'dev' of git.oa00.com:xiaowen/swsWecat into dev

* 'dev' of git.oa00.com:xiaowen/swsWecat:
  cxw-010203
  cxw-010203

components/c-echars/index.wxml

@@ -1,4 +1,4 @@
 <!--pages/components/custom-echarts/index.wxml-->
-<view style="height: {{ height }}; width:100%;">
+<view style="height: {{ height }}; width:100%;position: relative;">
   <ec-canvas force-use-old-canvas="{{flocShow}}" wx:if="{{showChart}}" id="{{ chartId }}" canvas-id="eventBar" ec="{{ec}}" options="{{chartOption}}"></ec-canvas>
 </view>

components/word-cloud/index.js

@@ -120,21 +120,35 @@ Component({
       } = event.currentTarget.dataset
       this.triggerEvent('detail', detail);
     },
-    doData(list = []) {
-      if (list.length === 0) {
+    doData(arr1 = []) {
+      if (arr1.length === 0) {
         return []
       }
+      let list = this.doList(arr1);
       let arr = [];
       let maxVal = list[0][1];
+      let minVal = list[list.length - 1][1];
       let l = list.length;
       let x = l / (375 * this.data.height)
-      let max = x * maxVal;
-      let y = 23 / max;
+      let fx = Math.sqrt(x);
+      let max = fx * maxVal;
+      let fy = maxVal / minVal;
+      let fz = fy * 100 >= 500 ? 500 : fy*100;
+      let y = fz/ max;
       list.forEach(ele => {
-        let a = [ele[0], ele[1] * x * y];
+        let a = [ele[0], ele[1] * x * y ];
         arr.push(a)
       })
       return arr;
+    },
+    doList(arr = []) {
+      let list = [];
+      if(arr.length > 140) {
+        list = arr.slice(139)
+      } else {
+        list = arr;
+      }
+      return list
     }
   }
 })

ec-canvas/ec-canvas.wxml

@@ -1,4 +1,4 @@
 <!-- 新的：接口对其了H5 -->
-<canvas wx:if="{{isUseNewCanvas}}" type="2d" class="ec-canvas" canvas-id="{{ canvasId }}" bindinit="init" bindtouchstart="{{ ec.disableTouch ? '' : 'touchStart' }}" bindtouchmove="{{ ec.disableTouch ? '' : 'touchMove' }}" bindtouchend="{{ ec.disableTouch ? '' : 'touchEnd' }}"></canvas>
+<canvas wx:if="{{isUseNewCanvas}}" force-use-old-canvas="true" type="2d" class="ec-canvas" canvas-id="{{ canvasId }}" bindinit="init" bindtouchstart="{{ ec.disableTouch ? '' : 'touchStart' }}" bindtouchmove="{{ ec.disableTouch ? '' : 'touchMove' }}" bindtouchend="{{ ec.disableTouch ? '' : 'touchEnd' }}"></canvas>
 <!-- 旧的 -->
-<canvas wx:else class="ec-canvas" canvas-id="{{ canvasId }}" bindinit="init" bindtouchstart="{{ ec.disableTouch ? '' : 'touchStart' }}" bindtouchmove="{{ ec.disableTouch ? '' : 'touchMove' }}" bindtouchend="{{ ec.disableTouch ? '' : 'touchEnd' }}"></canvas>
+<canvas wx:else force-use-old-canvas="true" class="ec-canvas" canvas-id="{{ canvasId }}" bindinit="init" bindtouchstart="{{ ec.disableTouch ? '' : 'touchStart' }}" bindtouchmove="{{ ec.disableTouch ? '' : 'touchMove' }}" bindtouchend="{{ ec.disableTouch ? '' : 'touchEnd' }}"></canvas>

pages/index/Salesranking/Salesranking.wxml

@@ -104,7 +104,7 @@
     </van-tab>
 </van-tabs>
 
-<van-popup show="{{ show }}" position="bottom" custom-style="height: 40%;" bind:close="onClose">
+<van-popup 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

@@ -3,7 +3,9 @@
     box-shadow: 0 0 0 !important;
     border: 1px solid #F9F9F9;
 }
-
+.detail-page {
+    position: relative;
+}
 .menu-tabs .van-tabs__nav {
     background-color: #ffffff;
     /* 标签背景颜色 */