Merge branch 'develop' into test

miniprogram/pages/areaSelect/areaSelect.ts

@@ -90,17 +90,28 @@ Page({
   selectedHandle(e) {
     const { value } = e.currentTarget.dataset;
     console.log(e, value);
-    if (this.data.selectedIndex === value) {
-      this.setData({
-        selected: '',
-        selectedIndex: '',
-      });
-    } else {
-      this.setData({
-        selected: this.data.filterList[value].id,
-        selectedIndex: value,
-      });
+    // if (this.data.selectedIndex === value) {
+    //   this.setData({
+    //     selected: '',
+    //     selectedIndex: '',
+    //   });
+    // } else {
+    //   this.setData({
+    //     selected: this.data.filterList[value].id,
+    //     selectedIndex: value,
+    //   });
+    // }
+    var pages = getCurrentPages();
+    var prevPage = pages[pages.length - 2]; //上一个页面
+    let entity = {
+      id: value,
+      name: this.data.filterList[value].areaName,
+    };
+
+    if (this.data.methodName && prevPage[this.data.methodName]) {
+      prevPage[this.data.methodName](entity);
     }
+    wx.navigateBack({ delta: 1 });
   },
   bindPickerChange() {
     let value = this.data.selected;

miniprogram/pages/components/PayTypeChart/PayTypeChart.ts

@@ -39,6 +39,7 @@ function initChart(canvas, width, height, F2) {
       items[1].value = items[1].value + '元';
     },
   });
+
   paytypeChart.coord('polar', {
     transposed: true,
     innerRadius: 0.5,
@@ -56,6 +57,18 @@ function initChart(canvas, width, height, F2) {
     .adjust('stack');
   paytypeChart.axis(false);
   paytypeChart.render();
+
+  // 绘制内阴影
+  const frontPlot = paytypeChart.get('frontPlot');
+  const coord = paytypeChart.get('coord'); // 获取坐标系对象
+  frontPlot.addShape('sector', {
+    attrs: {
+      fill: '#000',
+    },
+  });
+  paytypeChart.get('canvas').draw();
+  console.log('coord', coord);
+
   return paytypeChart;
 }
 

miniprogram/pages/homeAndReport/homeAndReport.js

 "use strict";
 Page({
+    onShow: function () {
+        if (wx.hideHomeButton) {
+            wx.hideHomeButton();
+        }
+    },
     data: {
         selected: 0,
         list: [
@@ -25,4 +30,4 @@ Page({
         });
     },
 });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaG9tZUFuZFJlcG9ydC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImhvbWVBbmRSZXBvcnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLElBQUksQ0FBQztJQUNILElBQUksRUFBRTtRQUNKLFFBQVEsRUFBRSxDQUFDO1FBQ1gsSUFBSSxFQUFFO1lBQ0o7Z0JBQ0UsUUFBUSxFQUFFLGtCQUFrQjtnQkFDNUIsUUFBUSxFQUFFLDhCQUE4QjtnQkFDeEMsZ0JBQWdCLEVBQUUsOEJBQThCO2dCQUNoRCxJQUFJLEVBQUUsTUFBTTthQUNiO1lBQ0Q7Z0JBQ0UsUUFBUSxFQUFFLHNCQUFzQjtnQkFDaEMsUUFBUSxFQUFFLGdDQUFnQztnQkFDMUMsZ0JBQWdCLEVBQUUsZ0NBQWdDO2dCQUNsRCxJQUFJLEVBQUUsTUFBTTthQUNiO1NBQ0Y7S0FDRjtJQUNELFdBQVcsWUFBQyxDQUFDO1FBQ1gsT0FBTyxDQUFDLEdBQUcsQ0FBQyxVQUFVLEVBQUUsQ0FBQyxDQUFDLENBQUM7UUFDdkIsSUFBQSxhQUEwQixFQUF4QixjQUFJLEVBQUUsZ0JBQUssQ0FBYztRQUcvQixJQUFJLENBQUMsT0FBTyxDQUFDO1lBQ1gsUUFBUSxFQUFFLEtBQUs7U0FDaEIsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztDQUNGLENBQUMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIlBhZ2Uoe1xuICBkYXRhOiB7XG4gICAgc2VsZWN0ZWQ6IDAsXG4gICAgbGlzdDogW1xuICAgICAge1xuICAgICAgICBwYWdlUGF0aDogJy9wYWdlcy9ob21lL2hvbWUnLFxuICAgICAgICBpY29uUGF0aDogJy9pbWFnZXMvdGFiX3NodWp1X25vckAyeC5wbmcnLFxuICAgICAgICBzZWxlY3RlZEljb25QYXRoOiAnL2ltYWdlcy90YWJfc2h1anVfcHJlQDJ4LnBuZycsXG4gICAgICAgIHRleHQ6ICfmlbDmja7pppbpobUnLFxuICAgICAgfSxcbiAgICAgIHtcbiAgICAgICAgcGFnZVBhdGg6ICcvcGFnZXMvcmVwb3J0L3JlcG9ydCcsXG4gICAgICAgIGljb25QYXRoOiAnL2ltYWdlcy90YWJfYmFvYmlhb19ub3JAMngucG5nJyxcbiAgICAgICAgc2VsZWN0ZWRJY29uUGF0aDogJy9pbWFnZXMvdGFiX2Jhb2JpYW9fcHJlQDJ4LnBuZycsXG4gICAgICAgIHRleHQ6ICfov5DokKXnrqHnkIYnLFxuICAgICAgfSxcbiAgICBdLFxuICB9LFxuICBjbGlja0hhbmRsZShlKSB7XG4gICAgY29uc29sZS5sb2coJ2luIGNsaWNrJywgZSk7XG4gICAgbGV0IHsgcGF0aCwgaW5kZXggfSA9IGUuZGV0YWlsO1xuICAgIC8vIGNvbnNvbGUubG9nKHBhdGgsIGluZGV4KTtcbiAgICAvLyB3eC5zd2l0Y2hUYWIoeyB1cmw6IHBhdGggfSk7XG4gICAgdGhpcy5zZXREYXRhKHtcbiAgICAgIHNlbGVjdGVkOiBpbmRleCxcbiAgICB9KTtcbiAgfSxcbn0pO1xuIl19
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaG9tZUFuZFJlcG9ydC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImhvbWVBbmRSZXBvcnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLElBQUksQ0FBQztJQUNILE1BQU07UUFDSixFQUFFLENBQUMsQ0FBQyxFQUFFLENBQUMsY0FBYyxDQUFDLENBQUMsQ0FBQztZQUN0QixFQUFFLENBQUMsY0FBYyxFQUFFLENBQUM7UUFDdEIsQ0FBQztJQUNILENBQUM7SUFDRCxJQUFJLEVBQUU7UUFDSixRQUFRLEVBQUUsQ0FBQztRQUNYLElBQUksRUFBRTtZQUNKO2dCQUNFLFFBQVEsRUFBRSxrQkFBa0I7Z0JBQzVCLFFBQVEsRUFBRSw4QkFBOEI7Z0JBQ3hDLGdCQUFnQixFQUFFLDhCQUE4QjtnQkFDaEQsSUFBSSxFQUFFLE1BQU07YUFDYjtZQUNEO2dCQUNFLFFBQVEsRUFBRSxzQkFBc0I7Z0JBQ2hDLFFBQVEsRUFBRSxnQ0FBZ0M7Z0JBQzFDLGdCQUFnQixFQUFFLGdDQUFnQztnQkFDbEQsSUFBSSxFQUFFLE1BQU07YUFDYjtTQUNGO0tBQ0Y7SUFDRCxXQUFXLFlBQUMsQ0FBQztRQUNYLE9BQU8sQ0FBQyxHQUFHLENBQUMsVUFBVSxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBQ3ZCLElBQUEsYUFBMEIsRUFBeEIsY0FBSSxFQUFFLGdCQUFLLENBQWM7UUFHL0IsSUFBSSxDQUFDLE9BQU8sQ0FBQztZQUNYLFFBQVEsRUFBRSxLQUFLO1NBQ2hCLENBQUMsQ0FBQztJQUNMLENBQUM7Q0FDRixDQUFDLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJQYWdlKHtcbiAgb25TaG93KCkge1xuICAgIGlmICh3eC5oaWRlSG9tZUJ1dHRvbikge1xuICAgICAgd3guaGlkZUhvbWVCdXR0b24oKTtcbiAgICB9XG4gIH0sXG4gIGRhdGE6IHtcbiAgICBzZWxlY3RlZDogMCxcbiAgICBsaXN0OiBbXG4gICAgICB7XG4gICAgICAgIHBhZ2VQYXRoOiAnL3BhZ2VzL2hvbWUvaG9tZScsXG4gICAgICAgIGljb25QYXRoOiAnL2ltYWdlcy90YWJfc2h1anVfbm9yQDJ4LnBuZycsXG4gICAgICAgIHNlbGVjdGVkSWNvblBhdGg6ICcvaW1hZ2VzL3RhYl9zaHVqdV9wcmVAMngucG5nJyxcbiAgICAgICAgdGV4dDogJ+aVsOaNrummlumhtScsXG4gICAgICB9LFxuICAgICAge1xuICAgICAgICBwYWdlUGF0aDogJy9wYWdlcy9yZXBvcnQvcmVwb3J0JyxcbiAgICAgICAgaWNvblBhdGg6ICcvaW1hZ2VzL3RhYl9iYW9iaWFvX25vckAyeC5wbmcnLFxuICAgICAgICBzZWxlY3RlZEljb25QYXRoOiAnL2ltYWdlcy90YWJfYmFvYmlhb19wcmVAMngucG5nJyxcbiAgICAgICAgdGV4dDogJ+i/kOiQpeeuoeeQhicsXG4gICAgICB9LFxuICAgIF0sXG4gIH0sXG4gIGNsaWNrSGFuZGxlKGUpIHtcbiAgICBjb25zb2xlLmxvZygnaW4gY2xpY2snLCBlKTtcbiAgICBsZXQgeyBwYXRoLCBpbmRleCB9ID0gZS5kZXRhaWw7XG4gICAgLy8gY29uc29sZS5sb2cocGF0aCwgaW5kZXgpO1xuICAgIC8vIHd4LnN3aXRjaFRhYih7IHVybDogcGF0aCB9KTtcbiAgICB0aGlzLnNldERhdGEoe1xuICAgICAgc2VsZWN0ZWQ6IGluZGV4LFxuICAgIH0pO1xuICB9LFxufSk7XG4iXX0=
\ No newline at end of file

miniprogram/pages/homeAndReport/homeAndReport.json

 {
-  "navigationBarTitleText": "多彩运营管理系统",
+  "navigationBarTitleText": "多彩运营商",
   "usingComponents": {
     "home": "../home/home",
     "report": "../report/report",

miniprogram/pages/homeAndReport/homeAndReport.ts

 Page({
+  onShow() {
+    if (wx.hideHomeButton) {
+      wx.hideHomeButton();
+    }
+  },
   data: {
     selected: 0,
     list: [

miniprogram/pages/homeAndReport/homeAndReport.wxml

 <!-- miniprogram/pages/homeAndReport/homeAndReport.wxml -->
 <view class="container">
   <home wx:if="{{selected === 0}}" />
-  <report wx:elif="{{selected === 1}}" />
+  <report wx:elif="{{selected === 1}}" class="report-wrap" />
   <tab-bar checked="{{selected}}" listData="{{list}}" bindcustomevent="clickHandle"></tab-bar>
 </view>
\ No newline at end of file

miniprogram/pages/homeAndReport/homeAndReport.wxss

 /* miniprogram/pages/homeAndReport/homeAndReport.wxss */
+
+.report-wrap {
+  width: 100%;
+}

miniprogram/pages/index/index.ts

@@ -103,7 +103,7 @@ Page({
         .then(({ code, cookie }: { code: string; cookie: string }) => {
           let mixpwd = md5(pwd);
           return systemFetch({
-            url: '/login',
+            url: '/boss/login',
             method: 'POST',
             header: {
               cookie: cookie,

miniprogram/pages/index/index.wxml

-<!--index.wxml-->
+<!-- index.wxml -->
 <view class="container login">
   <view class="login-box">
     <view class="login-title">多彩运营商</view>
     <input class="login-input" placeholder="请输入账号" bindinput="nameInputHandle" />
     <view class="login-input-password">
       <input class="login-input" placeholder="请输入密码" password="{{!showPassword}}" bindinput="passwardInoutHandle" />
-      <image wx:if="{{showPassword}}" catchtap="togglePassword" class="password-eyes" src="../../images/btn_turn_on.png"></image>
-      <image wx:else catchtap="togglePassword" class="password-eyes" src="../../images/btn_turnoff.png"></image>
-
+      <div class="password-eyes" catchtap="togglePassword">
+        <image wx:if="{{showPassword}}" class="password-eyes-icon" src="../../images/btn_turn_on.png"></image>
+        <image wx:else class="password-eyes-icon" src="../../images/btn_turnoff.png"></image>
+      </div>
     </view>
     <button class="login-btn" bindtap="loginHandle">登录</button>
   </view>

miniprogram/pages/index/index.wxss

@@ -26,10 +26,14 @@
   width: 44rpx;
   height: 44rpx;
   right: 40rpx;
-  top: 20rpx;
+  top: 10rpx;
   z-index: 2;
+  padding: 10rpx;
+}
+.password-eyes-icon {
+  width: 100%;
+  height: 100%;
 }
-
 .login-btn {
   margin-top: 40rpx;
 }

miniprogram/pages/report/report.js

@@ -20,12 +20,6 @@ Component({
                 reLaunch: false,
             },
             {
-                name: '用户增长分析',
-                icon: '../../../images/btn_yonghu@2x.png',
-                url: '/pages/userGrowth/userGrowth',
-                reLaunch: false,
-            },
-            {
                 name: '会员反馈',
                 icon: '../../../images/btn_fsnkui@2x.png',
                 url: '/pages/feedback/feedback',
@@ -37,10 +31,8 @@ Component({
                 url: '/pages/index/index',
                 reLaunch: true,
             },
-            {},
-            {},
         ],
         account: 0,
     },
 });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVwb3J0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsicmVwb3J0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBR0EsSUFBTSxHQUFHLEdBQUcsTUFBTSxFQUFVLENBQUM7QUFDN0IsU0FBUyxDQUFDO0lBQ1IsU0FBUyxFQUFFO1FBQ1QsUUFBUTtZQUNOLE9BQU8sQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxRQUFRLENBQUMsQ0FBQztZQUNyQyxJQUFJLENBQUMsT0FBUSxDQUFDO2dCQUNaLFFBQVEsRUFBRSxHQUFHLENBQUMsVUFBVSxDQUFDLFFBQVE7YUFDbEMsQ0FBQyxDQUFDO1FBQ0wsQ0FBQztLQUNGO0lBSUQsSUFBSSxFQUFFO1FBQ0osUUFBUSxFQUFFLEdBQUcsQ0FBQyxVQUFVLENBQUMsUUFBUTtRQUNqQyxRQUFRLEVBQUU7WUFDUjtnQkFDRSxJQUFJLEVBQUUsUUFBUTtnQkFDZCxJQUFJLEVBQUUsa0NBQWtDO2dCQUN4QyxHQUFHLEVBQUUsb0NBQW9DO2dCQUN6QyxRQUFRLEVBQUUsS0FBSzthQUNoQjtZQUNEO2dCQUNFLElBQUksRUFBRSxRQUFRO2dCQUNkLElBQUksRUFBRSxtQ0FBbUM7Z0JBQ3pDLEdBQUcsRUFBRSw4QkFBOEI7Z0JBQ25DLFFBQVEsRUFBRSxLQUFLO2FBQ2hCO1lBQ0Q7Z0JBQ0UsSUFBSSxFQUFFLE1BQU07Z0JBQ1osSUFBSSxFQUFFLG1DQUFtQztnQkFDekMsR0FBRyxFQUFFLDBCQUEwQjtnQkFDL0IsUUFBUSxFQUFFLEtBQUs7YUFDaEI7WUFhRDtnQkFDRSxJQUFJLEVBQUUsTUFBTTtnQkFDWixJQUFJLEVBQUUscUNBQXFDO2dCQUMzQyxHQUFHLEVBQUUsb0JBQW9CO2dCQUN6QixRQUFRLEVBQUUsSUFBSTthQUNmO1lBQ0QsRUFBRTtZQUNGLEVBQUU7U0FDSDtRQUNELE9BQU8sRUFBRSxDQUFDO0tBQ1g7Q0FDRixDQUFDLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBJTXlBcHAgfSBmcm9tICcuLi8uLi9hcHAnO1xuXG4vLyBtaW5pcHJvZ3JhbS9wYWdlcy9yZXBvcnQvcmVwb3J0LmpzXG5jb25zdCBhcHAgPSBnZXRBcHA8SU15QXBwPigpO1xuQ29tcG9uZW50KHtcbiAgbGlmZXRpbWVzOiB7XG4gICAgYXR0YWNoZWQoKSB7XG4gICAgICBjb25zb2xlLmxvZyhhcHAuZ2xvYmFsRGF0YS51c2VySW5mbyk7XG4gICAgICB0aGlzLnNldERhdGEhKHtcbiAgICAgICAgdXNlckluZm86IGFwcC5nbG9iYWxEYXRhLnVzZXJJbmZvLFxuICAgICAgfSk7XG4gICAgfSxcbiAgfSxcbiAgLyoqXG4gICAqIOmhtemdoueahOWIneWni+aVsOaNrlxuICAgKi9cbiAgZGF0YToge1xuICAgIHVzZXJJbmZvOiBhcHAuZ2xvYmFsRGF0YS51c2VySW5mbyxcbiAgICBpdGVtTGlzdDogW1xuICAgICAge1xuICAgICAgICBuYW1lOiAn5pyI5bqm6L+Q6JCl5YiG5p6QJyxcbiAgICAgICAgaWNvbjogJy4uLy4uLy4uL2ltYWdlcy9idG5feXVlZHVAMngucG5nJyxcbiAgICAgICAgdXJsOiAnL3BhZ2VzL21vbnRoT3BlcmF0b3IvbW9udGhPcGVyYXRvcicsXG4gICAgICAgIHJlTGF1bmNoOiBmYWxzZSxcbiAgICAgIH0sXG4gICAgICB7XG4gICAgICAgIG5hbWU6ICfnlKjmiLflop7plb/liIbmnpAnLFxuICAgICAgICBpY29uOiAnLi4vLi4vLi4vaW1hZ2VzL2J0bl95b25naHVAMngucG5nJyxcbiAgICAgICAgdXJsOiAnL3BhZ2VzL3VzZXJHcm93dGgvdXNlckdyb3d0aCcsXG4gICAgICAgIHJlTGF1bmNoOiBmYWxzZSxcbiAgICAgIH0sXG4gICAgICB7XG4gICAgICAgIG5hbWU6ICfkvJrlkZjlj43ppognLFxuICAgICAgICBpY29uOiAnLi4vLi4vLi4vaW1hZ2VzL2J0bl9mc25rdWlAMngucG5nJyxcbiAgICAgICAgdXJsOiAnL3BhZ2VzL2ZlZWRiYWNrL2ZlZWRiYWNrJyxcbiAgICAgICAgcmVMYXVuY2g6IGZhbHNlLFxuICAgICAgfSxcbiAgICAgIC8vIHtcbiAgICAgIC8vICAgbmFtZTogJ+acjeWKoei0uee8tOe6sycsXG4gICAgICAvLyAgIGljb246ICcuLi8uLi8uLi9pbWFnZXMvYnRuX2ppYW9uYUAyeC5wbmcnLFxuICAgICAgLy8gICB1cmw6ICcnLFxuICAgICAgLy8gICByZUxhdW5jaDogZmFsc2UsXG4gICAgICAvLyB9LFxuICAgICAgLy8ge1xuICAgICAgLy8gICBuYW1lOiAn6LSm5oi35o+Q546wJyxcbiAgICAgIC8vICAgaWNvbjogJy4uLy4uLy4uL2ltYWdlcy9idG5fdGl4aWFuQDJ4LnBuZycsXG4gICAgICAvLyAgIHVybDogJycsXG4gICAgICAvLyAgIHJlTGF1bmNoOiBmYWxzZSxcbiAgICAgIC8vIH0sXG4gICAgICB7XG4gICAgICAgIG5hbWU6ICfpgIDlh7rnmbvlvZUnLFxuICAgICAgICBpY29uOiAnLi4vLi4vLi4vaW1hZ2VzL2J0bl9TaWduX291dEAyeC5wbmcnLFxuICAgICAgICB1cmw6ICcvcGFnZXMvaW5kZXgvaW5kZXgnLFxuICAgICAgICByZUxhdW5jaDogdHJ1ZSxcbiAgICAgIH0sXG4gICAgICB7fSxcbiAgICAgIHt9LFxuICAgIF0sXG4gICAgYWNjb3VudDogMCxcbiAgfSxcbn0pO1xuIl19
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVwb3J0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsicmVwb3J0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBR0EsSUFBTSxHQUFHLEdBQUcsTUFBTSxFQUFVLENBQUM7QUFDN0IsU0FBUyxDQUFDO0lBQ1IsU0FBUyxFQUFFO1FBQ1QsUUFBUTtZQUNOLE9BQU8sQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxRQUFRLENBQUMsQ0FBQztZQUNyQyxJQUFJLENBQUMsT0FBUSxDQUFDO2dCQUNaLFFBQVEsRUFBRSxHQUFHLENBQUMsVUFBVSxDQUFDLFFBQVE7YUFDbEMsQ0FBQyxDQUFDO1FBQ0wsQ0FBQztLQUNGO0lBSUQsSUFBSSxFQUFFO1FBQ0osUUFBUSxFQUFFLEdBQUcsQ0FBQyxVQUFVLENBQUMsUUFBUTtRQUNqQyxRQUFRLEVBQUU7WUFDUjtnQkFDRSxJQUFJLEVBQUUsUUFBUTtnQkFDZCxJQUFJLEVBQUUsa0NBQWtDO2dCQUN4QyxHQUFHLEVBQUUsb0NBQW9DO2dCQUN6QyxRQUFRLEVBQUUsS0FBSzthQUNoQjtZQU9EO2dCQUNFLElBQUksRUFBRSxNQUFNO2dCQUNaLElBQUksRUFBRSxtQ0FBbUM7Z0JBQ3pDLEdBQUcsRUFBRSwwQkFBMEI7Z0JBQy9CLFFBQVEsRUFBRSxLQUFLO2FBQ2hCO1lBYUQ7Z0JBQ0UsSUFBSSxFQUFFLE1BQU07Z0JBQ1osSUFBSSxFQUFFLHFDQUFxQztnQkFDM0MsR0FBRyxFQUFFLG9CQUFvQjtnQkFDekIsUUFBUSxFQUFFLElBQUk7YUFDZjtTQUdGO1FBQ0QsT0FBTyxFQUFFLENBQUM7S0FDWDtDQUNGLENBQUMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IElNeUFwcCB9IGZyb20gJy4uLy4uL2FwcCc7XG5cbi8vIG1pbmlwcm9ncmFtL3BhZ2VzL3JlcG9ydC9yZXBvcnQuanNcbmNvbnN0IGFwcCA9IGdldEFwcDxJTXlBcHA+KCk7XG5Db21wb25lbnQoe1xuICBsaWZldGltZXM6IHtcbiAgICBhdHRhY2hlZCgpIHtcbiAgICAgIGNvbnNvbGUubG9nKGFwcC5nbG9iYWxEYXRhLnVzZXJJbmZvKTtcbiAgICAgIHRoaXMuc2V0RGF0YSEoe1xuICAgICAgICB1c2VySW5mbzogYXBwLmdsb2JhbERhdGEudXNlckluZm8sXG4gICAgICB9KTtcbiAgICB9LFxuICB9LFxuICAvKipcbiAgICog6aG16Z2i55qE5Yid5aeL5pWw5o2uXG4gICAqL1xuICBkYXRhOiB7XG4gICAgdXNlckluZm86IGFwcC5nbG9iYWxEYXRhLnVzZXJJbmZvLFxuICAgIGl0ZW1MaXN0OiBbXG4gICAgICB7XG4gICAgICAgIG5hbWU6ICfmnIjluqbov5DokKXliIbmnpAnLFxuICAgICAgICBpY29uOiAnLi4vLi4vLi4vaW1hZ2VzL2J0bl95dWVkdUAyeC5wbmcnLFxuICAgICAgICB1cmw6ICcvcGFnZXMvbW9udGhPcGVyYXRvci9tb250aE9wZXJhdG9yJyxcbiAgICAgICAgcmVMYXVuY2g6IGZhbHNlLFxuICAgICAgfSxcbiAgICAgIC8vIHtcbiAgICAgIC8vICAgbmFtZTogJ+eUqOaIt+WinumVv+WIhuaekCcsXG4gICAgICAvLyAgIGljb246ICcuLi8uLi8uLi9pbWFnZXMvYnRuX3lvbmdodUAyeC5wbmcnLFxuICAgICAgLy8gICB1cmw6ICcvcGFnZXMvdXNlckdyb3d0aC91c2VyR3Jvd3RoJyxcbiAgICAgIC8vICAgcmVMYXVuY2g6IGZhbHNlLFxuICAgICAgLy8gfSxcbiAgICAgIHtcbiAgICAgICAgbmFtZTogJ+S8muWRmOWPjemmiCcsXG4gICAgICAgIGljb246ICcuLi8uLi8uLi9pbWFnZXMvYnRuX2Zzbmt1aUAyeC5wbmcnLFxuICAgICAgICB1cmw6ICcvcGFnZXMvZmVlZGJhY2svZmVlZGJhY2snLFxuICAgICAgICByZUxhdW5jaDogZmFsc2UsXG4gICAgICB9LFxuICAgICAgLy8ge1xuICAgICAgLy8gICBuYW1lOiAn5pyN5Yqh6LS557y057qzJyxcbiAgICAgIC8vICAgaWNvbjogJy4uLy4uLy4uL2ltYWdlcy9idG5famlhb25hQDJ4LnBuZycsXG4gICAgICAvLyAgIHVybDogJycsXG4gICAgICAvLyAgIHJlTGF1bmNoOiBmYWxzZSxcbiAgICAgIC8vIH0sXG4gICAgICAvLyB7XG4gICAgICAvLyAgIG5hbWU6ICfotKbmiLfmj5DnjrAnLFxuICAgICAgLy8gICBpY29uOiAnLi4vLi4vLi4vaW1hZ2VzL2J0bl90aXhpYW5AMngucG5nJyxcbiAgICAgIC8vICAgdXJsOiAnJyxcbiAgICAgIC8vICAgcmVMYXVuY2g6IGZhbHNlLFxuICAgICAgLy8gfSxcbiAgICAgIHtcbiAgICAgICAgbmFtZTogJ+mAgOWHuueZu+W9lScsXG4gICAgICAgIGljb246ICcuLi8uLi8uLi9pbWFnZXMvYnRuX1NpZ25fb3V0QDJ4LnBuZycsXG4gICAgICAgIHVybDogJy9wYWdlcy9pbmRleC9pbmRleCcsXG4gICAgICAgIHJlTGF1bmNoOiB0cnVlLFxuICAgICAgfSxcbiAgICAgIC8vIHt9LFxuICAgICAgLy8ge30sXG4gICAgXSxcbiAgICBhY2NvdW50OiAwLFxuICB9LFxufSk7XG4iXX0=
\ No newline at end of file

miniprogram/pages/report/report.ts

@@ -23,12 +23,12 @@ Component({
         url: '/pages/monthOperator/monthOperator',
         reLaunch: false,
       },
-      {
-        name: '用户增长分析',
-        icon: '../../../images/btn_yonghu@2x.png',
-        url: '/pages/userGrowth/userGrowth',
-        reLaunch: false,
-      },
+      // {
+      //   name: '用户增长分析',
+      //   icon: '../../../images/btn_yonghu@2x.png',
+      //   url: '/pages/userGrowth/userGrowth',
+      //   reLaunch: false,
+      // },
       {
         name: '会员反馈',
         icon: '../../../images/btn_fsnkui@2x.png',
@@ -53,8 +53,8 @@ Component({
         url: '/pages/index/index',
         reLaunch: true,
       },
-      {},
-      {},
+      // {},
+      // {},
     ],
     account: 0,
   },