浏览代码

Merge branch 'v3.5.1' of http://git.ycjcjy.com/zhiyuxing/miniapp-v3 into v3.5.1

张延森 5 年前
父节点
当前提交
acef4bb691
共有 2 个文件被更改,包括 32 次插入9 次删除
  1. 25
    2
      src/components/charts/Line.js
  2. 7
    7
      src/pages/person/menus.js

+ 25
- 2
src/components/charts/Line.js 查看文件

76
       grid: {
76
       grid: {
77
         left: '10%',
77
         left: '10%',
78
         right: '8%',
78
         right: '8%',
79
-        bottom: '10%',
79
+        bottom: '12%',
80
         top: '10%',
80
         top: '10%',
81
       },
81
       },
82
       series: [],
82
       series: [],
89
     return {
89
     return {
90
       ...defaultOpt,
90
       ...defaultOpt,
91
       dataset: { source },
91
       dataset: { source },
92
-      dataZoom: [{ type: 'inside', startValue, endValue }],
92
+      dataZoom: [{
93
+        type: 'slider',
94
+        startValue, endValue,
95
+        show: true,
96
+        xAxisIndex: [0],
97
+        handleSize: 10,//滑动条的 左右2个滑动条的大小  
98
+        height: 20,//组件高度  
99
+        left: 30, //左边的距离  
100
+        right: 30,//右边的距离  
101
+        bottom: 0,//下边的距离  
102
+        handleColor: 'rgba(0,0,0,0.1)',//h滑动图标的颜色  
103
+        realtime : true,
104
+        handleStyle: {
105
+          borderColor: "#999",
106
+          borderWidth: "1",
107
+          shadowBlur: 2,
108
+          background: "rgba(0,0,0,0.1)",
109
+          shadowColor: "rgba(0,0,0,0.1)",
110
+        },
111
+        backgroundColor: 'rgba(0,0,0,0.1)',//两边未选中的滑动条区域的颜色  
112
+        showDataShadow: false,//是否显示数据阴影 默认auto  
113
+        showDetail: false,
114
+
115
+      }],
93
       series: [{
116
       series: [{
94
         type: 'line',
117
         type: 'line',
95
         dimensions: ['name', 'value'],
118
         dimensions: ['name', 'value'],

+ 7
- 7
src/pages/person/menus.js 查看文件

73
     // },
73
     // },
74
   ],
74
   ],
75
   [
75
   [
76
-    // {
77
-    //   name: '我的客户',
78
-    //   url: '/pages/person/myGuest/index',
79
-    //   icon: icons.client,
80
-    //   extends: undefined,
81
-    //   userTypes: [CONSULTANT],
82
-    // },
76
+    {
77
+      name: '我的客户',
78
+      url: '/pages/person/myGuest/index',
79
+      icon: icons.client,
80
+      extends: undefined,
81
+      userTypes: [CONSULTANT],
82
+    },
83
     {
83
     {
84
       name: '我的活动',
84
       name: '我的活动',
85
       url: '/pages/activity/myActivity?from=mine',
85
       url: '/pages/activity/myActivity?from=mine',