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

src/components/charts/Line.js

@@ -76,7 +76,7 @@ export default class LineChart extends Component {
       grid: {
         left: '10%',
         right: '8%',
-        bottom: '10%',
+        bottom: '12%',
         top: '10%',
       },
       series: [],
@@ -89,7 +89,30 @@ export default class LineChart extends Component {
     return {
       ...defaultOpt,
       dataset: { source },
-      dataZoom: [{ type: 'inside', startValue, endValue }],
+      dataZoom: [{
+        type: 'slider',
+        startValue, endValue,
+        show: true,
+        xAxisIndex: [0],
+        handleSize: 10,//滑动条的 左右2个滑动条的大小  
+        height: 20,//组件高度  
+        left: 30, //左边的距离  
+        right: 30,//右边的距离  
+        bottom: 0,//下边的距离  
+        handleColor: 'rgba(0,0,0,0.1)',//h滑动图标的颜色  
+        realtime : true,
+        handleStyle: {
+          borderColor: "#999",
+          borderWidth: "1",
+          shadowBlur: 2,
+          background: "rgba(0,0,0,0.1)",
+          shadowColor: "rgba(0,0,0,0.1)",
+        },
+        backgroundColor: 'rgba(0,0,0,0.1)',//两边未选中的滑动条区域的颜色  
+        showDataShadow: false,//是否显示数据阴影 默认auto  
+        showDetail: false,
+
+      }],
       series: [{
         type: 'line',
         dimensions: ['name', 'value'],

src/pages/person/menus.js

@@ -73,13 +73,13 @@ const menus = [
     // },
   ],
   [
-    // {
-    //   name: '我的客户',
-    //   url: '/pages/person/myGuest/index',
-    //   icon: icons.client,
-    //   extends: undefined,
-    //   userTypes: [CONSULTANT],
-    // },
+    {
+      name: '我的客户',
+      url: '/pages/person/myGuest/index',
+      icon: icons.client,
+      extends: undefined,
+      userTypes: [CONSULTANT],
+    },
     {
       name: '我的活动',
       url: '/pages/activity/myActivity?from=mine',