添加修改

6f537cca · 姜雷 · 4b5ff119 · 6f537cca · 6f537cca · 6f537cca
Commit 6f537cca authored Dec 27, 2019 by 姜雷
17 changed files
--- a/miniprogram/pages/components/PlatformFeeChart/PlatformFeeChart.js
+++ b/miniprogram/pages/components/PlatformFeeChart/PlatformFeeChart.js
+"use strict";
+var platforFeeChart = null;
+var month = '';
+function initChart(canvas, width, height, F2) {
+    var data = [];
+    platforFeeChart = new F2.Chart({
+        el: canvas,
+        width: width,
+        height: height,
+    });
+    platforFeeChart.source(data, {
+        days: {
+            min: 1,
+            max: 12,
+        },
+    });
+    platforFeeChart.tooltip({
+        showItemMarker: false,
+        background: {
+            radius: 2,
+            fill: '#6895fe',
+            padding: [6, 10],
+        },
+        onShow: function (ev) {
+            var items = ev.items;
+            items[0].name = '';
+            items[0].value = month + '-' + items[0].title;
+            items[1].name = '';
+            items[1].value = items[1].value + '元';
+        },
+    });
+    platforFeeChart
+        .line()
+        .position('month*totalMoney')
+        .color('#6895fe')
+        .shape('smooth')
+        .size(4);
+    platforFeeChart
+        .area()
+        .position('month*totalMoney')
+        .color('l(90) 0:#6895fe 1:#fff')
+        .shape('smooth')
+        .style({
+        fillOpacity: 0.6,
+    });
+    platforFeeChart.render();
+    return platforFeeChart;
+}
+Component({
+    properties: {
+        dataList: {
+            type: Array,
+            value: [],
+            observer: function (newVal) {
+                platforFeeChart && platforFeeChart.changeData(newVal);
+            },
+        },
+        month: {
+            type: String,
+            value: '',
+            observer: function (newVal) {
+                month = newVal;
+            },
+        },
+    },
+    data: {
+        opts: {
+            onInit: initChart,
+        },
+    },
+});
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUGxhdGZvcm1GZWVDaGFydC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIlBsYXRmb3JtRmVlQ2hhcnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUNBLElBQUksZUFBZSxHQUFHLElBQUksQ0FBQztBQUMzQixJQUFJLEtBQUssR0FBRyxFQUFFLENBQUM7QUFFZixtQkFBbUIsTUFBTSxFQUFFLEtBQUssRUFBRSxNQUFNLEVBQUUsRUFBRTtJQUMxQyxJQUFNLElBQUksR0FBRyxFQUFFLENBQUM7SUFDaEIsZUFBZSxHQUFHLElBQUksRUFBRSxDQUFDLEtBQUssQ0FBQztRQUM3QixFQUFFLEVBQUUsTUFBTTtRQUNWLEtBQUssT0FBQTtRQUNMLE1BQU0sUUFBQTtLQUNQLENBQUMsQ0FBQztJQUVILGVBQWUsQ0FBQyxNQUFNLENBQUMsSUFBSSxFQUFFO1FBQzNCLElBQUksRUFBRTtZQUNKLEdBQUcsRUFBRSxDQUFDO1lBQ04sR0FBRyxFQUFFLEVBQUU7U0FDUjtLQUNGLENBQUMsQ0FBQztJQUNILGVBQWUsQ0FBQyxPQUFPLENBQUM7UUFDdEIsY0FBYyxFQUFFLEtBQUs7UUFDckIsVUFBVSxFQUFFO1lBQ1YsTUFBTSxFQUFFLENBQUM7WUFDVCxJQUFJLEVBQUUsU0FBUztZQUNmLE9BQU8sRUFBRSxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUM7U0FDakI7UUFDRCxNQUFNLFlBQUMsRUFBRTtZQUNDLElBQUEsZ0JBQUssQ0FBUTtZQUNyQixLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxHQUFHLEVBQUUsQ0FBQztZQUNuQixLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxHQUFHLEtBQUssR0FBRyxHQUFHLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQztZQUM5QyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxHQUFHLEVBQUUsQ0FBQztZQUNuQixLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLEdBQUcsR0FBRyxDQUFDO1FBQ3hDLENBQUM7S0FDRixDQUFDLENBQUM7SUFDSCxlQUFlO1NBQ1osSUFBSSxFQUFFO1NBQ04sUUFBUSxDQUFDLGtCQUFrQixDQUFDO1NBQzVCLEtBQUssQ0FBQyxTQUFTLENBQUM7U0FDaEIsS0FBSyxDQUFDLFFBQVEsQ0FBQztTQUNmLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUNYLGVBQWU7U0FDWixJQUFJLEVBQUU7U0FDTixRQUFRLENBQUMsa0JBQWtCLENBQUM7U0FDNUIsS0FBSyxDQUFDLHdCQUF3QixDQUFDO1NBQy9CLEtBQUssQ0FBQyxRQUFRLENBQUM7U0FDZixLQUFLLENBQUM7UUFDTCxXQUFXLEVBQUUsR0FBRztLQUNqQixDQUFDLENBQUM7SUFFTCxlQUFlLENBQUMsTUFBTSxFQUFFLENBQUM7SUFDekIsTUFBTSxDQUFDLGVBQWUsQ0FBQztBQUN6QixDQUFDO0FBRUQsU0FBUyxDQUFDO0lBQ1IsVUFBVSxFQUFFO1FBQ1YsUUFBUSxFQUFFO1lBQ1IsSUFBSSxFQUFFLEtBQUs7WUFDWCxLQUFLLEVBQUUsRUFBRTtZQUNULFFBQVEsWUFBQyxNQUFNO2dCQUNiLGVBQWUsSUFBSSxlQUFlLENBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1lBQ3hELENBQUM7U0FDRjtRQUNELEtBQUssRUFBRTtZQUNMLElBQUksRUFBRSxNQUFNO1lBQ1osS0FBSyxFQUFFLEVBQUU7WUFDVCxRQUFRLFlBQUMsTUFBTTtnQkFDYixLQUFLLEdBQUcsTUFBTSxDQUFDO1lBQ2pCLENBQUM7U0FDRjtLQUNGO0lBQ0QsSUFBSSxFQUFFO1FBQ0osSUFBSSxFQUFFO1lBQ0osTUFBTSxFQUFFLFNBQVM7U0FDbEI7S0FDRjtDQUNGLENBQUMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8vIHBhZ2VzL2NvbXBvbmVudHMvUGxhdGZvcm1GZWVDaGFydC9QbGF0Zm9ybUZlZUNoYXJ0LmpzXG5sZXQgcGxhdGZvckZlZUNoYXJ0ID0gbnVsbDtcbmxldCBtb250aCA9ICcnO1xuXG5mdW5jdGlvbiBpbml0Q2hhcnQoY2FudmFzLCB3aWR0aCwgaGVpZ2h0LCBGMikge1xuICBjb25zdCBkYXRhID0gW107XG4gIHBsYXRmb3JGZWVDaGFydCA9IG5ldyBGMi5DaGFydCh7XG4gICAgZWw6IGNhbnZhcyxcbiAgICB3aWR0aCxcbiAgICBoZWlnaHQsXG4gIH0pO1xuXG4gIHBsYXRmb3JGZWVDaGFydC5zb3VyY2UoZGF0YSwge1xuICAgIGRheXM6IHtcbiAgICAgIG1pbjogMSxcbiAgICAgIG1heDogMTIsXG4gICAgfSxcbiAgfSk7XG4gIHBsYXRmb3JGZWVDaGFydC50b29sdGlwKHtcbiAgICBzaG93SXRlbU1hcmtlcjogZmFsc2UsXG4gICAgYmFja2dyb3VuZDoge1xuICAgICAgcmFkaXVzOiAyLFxuICAgICAgZmlsbDogJyM2ODk1ZmUnLFxuICAgICAgcGFkZGluZzogWzYsIDEwXSxcbiAgICB9LFxuICAgIG9uU2hvdyhldikge1xuICAgICAgY29uc3QgeyBpdGVtcyB9ID0gZXY7XG4gICAgICBpdGVtc1swXS5uYW1lID0gJyc7XG4gICAgICBpdGVtc1swXS52YWx1ZSA9IG1vbnRoICsgJy0nICsgaXRlbXNbMF0udGl0bGU7XG4gICAgICBpdGVtc1sxXS5uYW1lID0gJyc7XG4gICAgICBpdGVtc1sxXS52YWx1ZSA9IGl0ZW1zWzFdLnZhbHVlICsgJ+WFgyc7XG4gICAgfSxcbiAgfSk7XG4gIHBsYXRmb3JGZWVDaGFydFxuICAgIC5saW5lKClcbiAgICAucG9zaXRpb24oJ21vbnRoKnRvdGFsTW9uZXknKVxuICAgIC5jb2xvcignIzY4OTVmZScpXG4gICAgLnNoYXBlKCdzbW9vdGgnKVxuICAgIC5zaXplKDQpO1xuICBwbGF0Zm9yRmVlQ2hhcnRcbiAgICAuYXJlYSgpXG4gICAgLnBvc2l0aW9uKCdtb250aCp0b3RhbE1vbmV5JylcbiAgICAuY29sb3IoJ2woOTApIDA6IzY4OTVmZSAxOiNmZmYnKVxuICAgIC5zaGFwZSgnc21vb3RoJylcbiAgICAuc3R5bGUoe1xuICAgICAgZmlsbE9wYWNpdHk6IDAuNixcbiAgICB9KTtcbiAgLy8gcGxhdGZvckZlZUNoYXJ0LmF4aXMoJ3JlY2hhcmdlTW9uZXknLCBmYWxzZSk7XG4gIHBsYXRmb3JGZWVDaGFydC5yZW5kZXIoKTtcbiAgcmV0dXJuIHBsYXRmb3JGZWVDaGFydDtcbn1cblxuQ29tcG9uZW50KHtcbiAgcHJvcGVydGllczoge1xuICAgIGRhdGFMaXN0OiB7XG4gICAgICB0eXBlOiBBcnJheSxcbiAgICAgIHZhbHVlOiBbXSxcbiAgICAgIG9ic2VydmVyKG5ld1ZhbCkge1xuICAgICAgICBwbGF0Zm9yRmVlQ2hhcnQgJiYgcGxhdGZvckZlZUNoYXJ0LmNoYW5nZURhdGEobmV3VmFsKTtcbiAgICAgIH0sXG4gICAgfSxcbiAgICBtb250aDoge1xuICAgICAgdHlwZTogU3RyaW5nLFxuICAgICAgdmFsdWU6ICcnLFxuICAgICAgb2JzZXJ2ZXIobmV3VmFsKSB7XG4gICAgICAgIG1vbnRoID0gbmV3VmFsO1xuICAgICAgfSxcbiAgICB9LFxuICB9LFxuICBkYXRhOiB7XG4gICAgb3B0czoge1xuICAgICAgb25Jbml0OiBpbml0Q2hhcnQsXG4gICAgfSxcbiAgfSxcbn0pO1xuIl19
\ No newline at end of file
--- a/miniprogram/pages/components/PlatformFeeChart/PlatformFeeChart.json
+++ b/miniprogram/pages/components/PlatformFeeChart/PlatformFeeChart.json
+{
+  "component": true,
+  "usingComponents": {
+    "ff-canvas": "@antv/f2-canvas"
+  }
+}
--- a/miniprogram/pages/components/PlatformFeeChart/PlatformFeeChart.ts
+++ b/miniprogram/pages/components/PlatformFeeChart/PlatformFeeChart.ts
+// pages/components/PlatformFeeChart/PlatformFeeChart.js
+let platforFeeChart = null;
+let month = '';
+
+function initChart(canvas, width, height, F2) {
+  const data = [];
+  platforFeeChart = new F2.Chart({
+    el: canvas,
+    width,
+    height,
+  });
+
+  platforFeeChart.source(data, {
+    days: {
+      min: 1,
+      max: 12,
+    },
+  });
+  platforFeeChart.tooltip({
+    showItemMarker: false,
+    background: {
+      radius: 2,
+      fill: '#6895fe',
+      padding: [6, 10],
+    },
+    onShow(ev) {
+      const { items } = ev;
+      items[0].name = '';
+      items[0].value = month + '-' + items[0].title;
+      items[1].name = '';
+      items[1].value = items[1].value + '元';
+    },
+  });
+  platforFeeChart
+    .line()
+    .position('month*totalMoney')
+    .color('#6895fe')
+    .shape('smooth')
+    .size(4);
+  platforFeeChart
+    .area()
+    .position('month*totalMoney')
+    .color('l(90) 0:#6895fe 1:#fff')
+    .shape('smooth')
+    .style({
+      fillOpacity: 0.6,
+    });
+  // platforFeeChart.axis('rechargeMoney', false);
+  platforFeeChart.render();
+  return platforFeeChart;
+}
+
+Component({
+  properties: {
+    dataList: {
+      type: Array,
+      value: [],
+      observer(newVal) {
+        platforFeeChart && platforFeeChart.changeData(newVal);
+      },
+    },
+    month: {
+      type: String,
+      value: '',
+      observer(newVal) {
+        month = newVal;
+      },
+    },
+  },
+  data: {
+    opts: {
+      onInit: initChart,
+    },
+  },
+});
--- a/miniprogram/pages/components/PlatformFeeChart/PlatformFeeChart.wxml
+++ b/miniprogram/pages/components/PlatformFeeChart/PlatformFeeChart.wxml
+<!-- pages/components/PlatformFeeChart/PlatformFeeChart.wxml -->
+<ff-canvas id="PlatformFeeChart" canvas-id="PlatformFeeChart" opts="{{ opts }}" />
\ No newline at end of file
--- a/miniprogram/pages/components/PlatformFeeChart/PlatformFeeChart.wxss
+++ b/miniprogram/pages/components/PlatformFeeChart/PlatformFeeChart.wxss
+/* pages/components/PlatformFeeChart/PlatformFeeChart.wxss */
\ No newline at end of file
--- a/miniprogram/pages/components/PlatformFeeDialog/PlatformFeeDialog.js
+++ b/miniprogram/pages/components/PlatformFeeDialog/PlatformFeeDialog.js
--- a/miniprogram/pages/components/PlatformFeeDialog/PlatformFeeDialog.ts
+++ b/miniprogram/pages/components/PlatformFeeDialog/PlatformFeeDialog.ts
-import { operatorFetch } from "../../../api/fetch";
+import { operatorFetch } from '../../../api/fetch';
+import { IMyApp } from '../../../app';

+const app = getApp<IMyApp>();
+let timer = null;
 // pages/components/PlatformFeeDialog/PlatformFeeDialog.js
 Component({
+  lifetimes: {
+    attached() {
+      console.log(app.globalData.userInfo);
+      this.setData!({
+        userInfo: app.globalData.userInfo,
+      });
+      this.data.eventType === 'slef' && this.fetchPlatformFee();
+    },
+  },
  /**
   * 组件的属性列表
   */
-  properties: {},
+  properties: {
+    eventType: { type: String, value: 'slef' },
+  },

  /**
   * 组件的初始数据
   */
  data: {
+    userInfo: app.globalData.userInfo,
    showDialog: false,
+    type: 1, // 1 支付 2 扫码
+    isSkip: 0,
+    rechargeBalance: 0,
+    payTimeLimit: 0,
+    billType: '0',
+    payQrUrl: '',
+    countDown: 600,
+    countDownString: '10分00秒',
  },

  /**
   * 组件的方法列表
   */
  methods: {
-    fetchPlatformFee(){
+    fetchPlatformFee() {
+      operatorFetch({
+        url: '/operateBalance/rechage/initdata',
+        method: 'POST',
+        data: {
+          operateId: this.data.userInfo.operateId,
+          operateName: this.data.userInfo.operateName,
+          position: 3,
+          type: 2,
+        },
+      })
+        .then(res => {
+          const { isSkip, rechargeBalance, payTimeLimit } = res;
+          this.setData({
+            isSkip,
+            rechargeBalance,
+            payTimeLimit,
+            showDialog: rechargeBalance > 0 ? true : false,
+          });
+        })
+        .catch(err => {
+          console.log(err);
+        });
+    },
+    cancelShow() {
+      this.setData({
+        showDialog: false,
+      });
+    },
+    fetchRechargeInfo() {
+      console.log('in fetchRechargeInfo');
+    },
+    goRecordsPage() {
+      wx.navigateTo({
+        url: '/pages/platformFeeRecord/platformFeeRecord',
+      });
+    },
+    toggleType() {
+      let type = this.data.type;
+      this.setData({
+        type: type === 1 ? 2 : 1,
+      });
+      if (type === 1) {
+        this.fetchRechargeOrderQRcode();
+      } else {
+        timer && clearInterval(timer);
+        this.setData({
+          countDown: 600,
+          countDownString: '',
+        });
+      }
+    },
+    checkBillType(e) {
+      console.log(e);
+      const { value } = e.currentTarget.dataset;
+      this.setData({
+        billType: value,
+      });
+    },
+    fetchRechargeOrderQRcode() {
+      wx.showLoading({
+        title: '',
+      });
+      const entity = {
+        billType: this.data.billType,
+        isAgree: 1,
+        jsCode: 'string',
+        operateId: this.data.userInfo.operateId,
+        operateName: this.data.userInfo.operateName,
+        rechargeType: '2',
+        type: 2,
+      };
      operatorFetch({
-        url:''
+        url: '/operateBalance/rechage/order/formini',
+        method: 'POST',
+        data: entity,
+      })
+        .then(res => {
+          wx.hideLoading();
+          const { payQrUrl } = res;
+          this.setData({
+            payQrUrl,
+          });
+          timer = setInterval(() => {
+            let count = this.data.countDown;
+            if (count === 0) {
+              clearInterval(timer);
+            } else {
+              let newCount = count - 1;
+              let countString =
+                Math.floor(newCount / 60) + '分' + (newCount % 60) + '秒';
+              this.setData({
+                countDown: newCount,
+                countDownString: countString,
+              });
+            }
+          }, 1000);
        })
+        .catch(err => {
+          wx.hideLoading();
+          wx.showToast({
+            title: err.msg || '请求失败',
+            icon: 'none',
+          });
+          console.log(err);
+        });
    },
  },
 });
--- a/miniprogram/pages/components/PlatformFeeDialog/PlatformFeeDialog.wxml
+++ b/miniprogram/pages/components/PlatformFeeDialog/PlatformFeeDialog.wxml
 <!-- pages/components/PlatformFeeDialog/PlatformFeeDialog.wxml -->
-<view class="PlatformFeeDialog">
+<view class="PlatformFeeDialog" wx:if="{{showDialog}}">
  <view class="mask"></view>
  <view class="PlatformFeeDialog-body">
-    <view class="PlatformFeeDialog-content">
+    <view class="PlatformFeeDialog-content {{type===1?'show':''}}">
      <view class="PlatformFeeDialog-header">
        <view>尊敬的用户：</view>
-        <view class="PlatformFeeDialog-headerName">您好！您的平台服务费已生成，为不影响设备正常使用，请在5个工作日内及时缴费,谢谢</view>
+        <view class="PlatformFeeDialog-headerName">
+          您好！您的平台服务费已生成，为不影响设备正常使用，请在{{payTimeLimit}}个工作日内及时缴费,谢谢
+        </view>
      </view>
      <view class="PlatformFeeDialog-priceInfo">
        <view class="PlatformFeeDialog-priceItem">
          <view class="PlatformFeeDialog-priceItemLabel">服务费</view>
-          <view class="PlatformFeeDialog-priceItemPrice">265.23元</view>
+          <view class="PlatformFeeDialog-priceItemPrice">{{rechargeBalance}}元</view>
        </view>
        <view class="PlatformFeeDialog-priceItem">
          <view class="PlatformFeeDialog-priceItemLabel">开票选择</view>
        </view>
        <view class="PlatformFeeDialog-radiofroup">
-          <view class="PlatformFeeDialog-radio">
-            <view class="PlatformFeeDialog-radioinput"></view>
+          <view class="PlatformFeeDialog-radio" bind:tap="checkBillType" data-value="0">
+            <view class="PlatformFeeDialog-radioinput {{billType==='0'?'check':''}}"></view>
            <view>无需发票</view>
          </view>
-          <view class="PlatformFeeDialog-radio">
-            <view class="PlatformFeeDialog-radioinput"></view>
+          <view class="PlatformFeeDialog-radio" bind:tap="checkBillType" data-value="1">
+            <view class="PlatformFeeDialog-radioinput {{billType==='1'?'check':''}}"></view>
            <view>普通发票</view>
          </view>
-          <view class="PlatformFeeDialog-radio">
-            <view class="PlatformFeeDialog-radioinput"></view>
+          <view class="PlatformFeeDialog-radio" bind:tap="checkBillType" data-value="2">
+            <view class="PlatformFeeDialog-radioinput {{billType==='2'?'check':''}}"></view>
            <view>专用发票</view>
          </view>
        </view>
        <view class="PlatformFeeDialog-btnbox">
-          <button class="PlatformFeeDialog-btn">取消</button>
-          <button class="PlatformFeeDialog-btn">确认支付</button>
+          <button class="PlatformFeeDialog-btn cancel" wx:if="{{isSkip}}" bind:tap="cancelShow">取消</button>
+          <button class="PlatformFeeDialog-btn {{isSkip?'':'big'}}" bind:tap="fetchRechargeInfo">确认支付</button>
        </view>
        <view class="PlatformFeeDialog-links">
-          <view>查看服务费明细</view>
-          <view>扫码支付 ></view>
+          <view bind:tap="goRecordsPage">查看服务费明细</view>
+          <view bind:tap="toggleType">扫码支付 ></view>
        </view>
      </view>
    </view>
-    <view class="PlatformFeeDialog-content scanPay show">
+    <view class="PlatformFeeDialog-content scanPay {{type===2?'show':''}}">
      <view class="PlatformFeeDialog-header">
-        <view class="PlatformFeeDialog-back">&tl;</view>
+        <view class="PlatformFeeDialog-back" bind:tap="toggleType">{{'<'}}</view>
        <view class="PlatformFeeDialog-countdown">
          剩余
-          <text class="" selectable="false" space="false" decode="false">9分59秒</text>
+          <text class="" selectable="false" space="false" decode="false">{{countDownString}}</text>
        </view>
      </view>
      <view class="PlatformFeeDialog-priceInfo">
        <view class="PlatformFeeDialog-priceItem">
          <view class="PlatformFeeDialog-priceItemLabel">服务费</view>
-          <view class="PlatformFeeDialog-priceItemPrice">265.23元</view>
+          <view class="PlatformFeeDialog-priceItemPrice">{{rechargeBalance}}元</view>
        </view>
        <view class="PlatformFeeDialog-priceItem">
          <view class="PlatformFeeDialog-priceItemLabel">开票选择</view>
        </view>
        <view class="PlatformFeeDialog-radiofroup">
-          <view class="PlatformFeeDialog-radio">
-            <view class="PlatformFeeDialog-radioinput"></view>
+          <view class="PlatformFeeDialog-radio" bind:tap="checkBillType" data-value="0">
+            <view class="PlatformFeeDialog-radioinput {{billType==='0'?'check':''}}"></view>
            <view>无需发票</view>
          </view>
-          <view class="PlatformFeeDialog-radio">
-            <view class="PlatformFeeDialog-radioinput"></view>
+          <view class="PlatformFeeDialog-radio" bind:tap="checkBillType" data-value="1">
+            <view class="PlatformFeeDialog-radioinput {{billType==='1'?'check':''}}"></view>
            <view>普通发票</view>
          </view>
-          <view class="PlatformFeeDialog-radio">
-            <view class="PlatformFeeDialog-radioinput"></view>
+          <view class="PlatformFeeDialog-radio" bind:tap="checkBillType" data-value="2">
+            <view class="PlatformFeeDialog-radioinput {{billType==='2'?'check':''}}"></view>
            <view>专用发票</view>
          </view>
        </view>
        <view class="PlatformFeeDialog-payQRcode">
-          <image class="PlatformFeeDialog-payQRcodeImg" src="" mode="aspectFill" lazy-load="false" binderror="" bindload="" />
+          <image class="PlatformFeeDialog-payQRcodeImg" src="{{payQrUrl}}" mode="aspectFill" lazy-load="false" binderror="" bindload="" />
        </view>
      </view>
    </view>

--- a/miniprogram/pages/components/PlatformFeeDialog/PlatformFeeDialog.wxss
+++ b/miniprogram/pages/components/PlatformFeeDialog/PlatformFeeDialog.wxss
@@ -84,11 +84,19 @@
 }
 .PlatformFeeDialog-btn {
  margin: 0;
+  width: 224rpx;
  height: 98rpx;
  line-height: 98rpx;
  border-radius: 20rpx;
  font-size: 32rpx;
 }
+.PlatformFeeDialog-btn.cancel {
+  background-color: #e6e6e6;
+  color: #919191;
+}
+.PlatformFeeDialog-btn.big {
+  width: 100%;
+}
 .PlatformFeeDialog-links {
  margin-top: 40rpx;
  display: flex;

--- a/miniprogram/pages/platformFee/platformFee.js
+++ b/miniprogram/pages/platformFee/platformFee.js
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var fetch_1 = require("../../api/fetch");
 Page({
    data: {
+        areaCount: 0,
        year: '',
        dataList: [],
    },
@@ -23,8 +24,10 @@ Page({
            data: entity,
        })
            .then(function (res) {
+            var areaCount = res.areaCount, platformFees = res.platformFees;
            _this.setData({
-                dataList: res.data,
+                areaCount: areaCount,
+                dataList: platformFees,
            });
        })
            .catch(function (err) {
@@ -38,6 +41,10 @@ Page({
            year: value,
        });
    },
-    goRecordPage: function () { },
+    goRecordPage: function () {
+        wx.navigateTo({
+            url: '/pages/platformFeeRecord/platformFeeRecord',
+        });
+    },
 });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGxhdGZvcm1GZWUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJwbGF0Zm9ybUZlZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLHlDQUFrRDtBQUdsRCxJQUFJLENBQUM7SUFJSCxJQUFJLEVBQUU7UUFDSixJQUFJLEVBQUUsRUFBRTtRQUNSLFFBQVEsRUFBRSxFQUFFO0tBQ2I7SUFLRCxNQUFNLEVBQUUsVUFBUyxPQUFPO1FBQ3RCLElBQUksSUFBSSxHQUFHLElBQUksSUFBSSxFQUFFLENBQUMsV0FBVyxFQUFFLENBQUM7UUFDcEMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUNsQixJQUFJLENBQUMsU0FBUyxDQUFDO1lBQ2IsSUFBSSxNQUFBO1NBQ0wsQ0FBQyxDQUFDO1FBQ0gsSUFBSSxDQUFDLE9BQVEsQ0FBQztZQUNaLElBQUksTUFBQTtTQUNMLENBQUMsQ0FBQztJQUNMLENBQUM7SUFDRCxTQUFTLFlBQUMsTUFBTTtRQUFoQixpQkFhQztRQVpDLE1BQU0sQ0FBQyx1QkFBZSxDQUFDO1lBQ3JCLEdBQUcsRUFBRSx5Q0FBeUM7WUFDOUMsSUFBSSxFQUFFLE1BQU07U0FDYixDQUFDO2FBQ0MsSUFBSSxDQUFDLFVBQUEsR0FBRztZQUNQLEtBQUksQ0FBQyxPQUFRLENBQUM7Z0JBQ1osUUFBUSxFQUFFLEdBQUcsQ0FBQyxJQUFJO2FBQ25CLENBQUMsQ0FBQztRQUNMLENBQUMsQ0FBQzthQUNELEtBQUssQ0FBQyxVQUFBLEdBQUc7WUFDUixPQUFPLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQ25CLENBQUMsQ0FBQyxDQUFDO0lBQ1AsQ0FBQztJQUNELGdCQUFnQixZQUFDLENBQUM7UUFDaEIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUNQLElBQUEsc0JBQUssQ0FBYztRQUMzQixJQUFJLENBQUMsU0FBUyxDQUFDO1lBQ2IsSUFBSSxFQUFFLEtBQUs7U0FDWixDQUFDLENBQUM7SUFDTCxDQUFDO0lBQ0QsWUFBWSxnQkFBSSxDQUFDO0NBQ2xCLENBQUMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IHN0YXRpc3RpY3NGZXRjaCB9IGZyb20gJy4uLy4uL2FwaS9mZXRjaCc7XG5cbi8vIG1pbmlwcm9ncmFtL3BhZ2VzL3BsYXRmb3JtRmVlL3BsYXRmb3JtRmVlLmpzXG5QYWdlKHtcbiAgLyoqXG4gICAqIOmhtemdoueahOWIneWni+aVsOaNrlxuICAgKi9cbiAgZGF0YToge1xuICAgIHllYXI6ICcnLFxuICAgIGRhdGFMaXN0OiBbXSxcbiAgfSxcblxuICAvKipcbiAgICog55Sf5ZG95ZGo5pyf5Ye95pWwLS3nm5HlkKzpobXpnaLliqDovb1cbiAgICovXG4gIG9uTG9hZDogZnVuY3Rpb24ob3B0aW9ucykge1xuICAgIGxldCB5ZWFyID0gbmV3IERhdGUoKS5nZXRGdWxsWWVhcigpO1xuICAgIGNvbnNvbGUubG9nKHllYXIpO1xuICAgIHRoaXMuZmV0Y2hMaXN0KHtcbiAgICAgIHllYXIsXG4gICAgfSk7XG4gICAgdGhpcy5zZXREYXRhISh7XG4gICAgICB5ZWFyLFxuICAgIH0pO1xuICB9LFxuICBmZXRjaExpc3QoZW50aXR5KSB7XG4gICAgcmV0dXJuIHN0YXRpc3RpY3NGZXRjaCh7XG4gICAgICB1cmw6ICcvZGN4eS9wbGF0Zm9ybUZlZS9vcGVyYXRlL2FyZWFzL21vbnRobHknLFxuICAgICAgZGF0YTogZW50aXR5LFxuICAgIH0pXG4gICAgICAudGhlbihyZXMgPT4ge1xuICAgICAgICB0aGlzLnNldERhdGEhKHtcbiAgICAgICAgICBkYXRhTGlzdDogcmVzLmRhdGEsXG4gICAgICAgIH0pO1xuICAgICAgfSlcbiAgICAgIC5jYXRjaChlcnIgPT4ge1xuICAgICAgICBjb25zb2xlLmxvZyhlcnIpO1xuICAgICAgfSk7XG4gIH0sXG4gIHllYXJDaGFuZ2VIYW5kbGUoZSkge1xuICAgIGNvbnNvbGUubG9nKGUpO1xuICAgIGNvbnN0IHsgdmFsdWUgfSA9IGUuZGV0YWlsO1xuICAgIHRoaXMuZmV0Y2hMaXN0KHtcbiAgICAgIHllYXI6IHZhbHVlLFxuICAgIH0pO1xuICB9LFxuICBnb1JlY29yZFBhZ2UoKSB7fSxcbn0pO1xuIl19
\ No newline at end of file
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGxhdGZvcm1GZWUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJwbGF0Zm9ybUZlZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLHlDQUFrRDtBQUdsRCxJQUFJLENBQUM7SUFJSCxJQUFJLEVBQUU7UUFDSixTQUFTLEVBQUUsQ0FBQztRQUNaLElBQUksRUFBRSxFQUFFO1FBQ1IsUUFBUSxFQUFFLEVBQUU7S0FDYjtJQUtELE1BQU0sRUFBRSxVQUFTLE9BQU87UUFDdEIsSUFBSSxJQUFJLEdBQUcsSUFBSSxJQUFJLEVBQUUsQ0FBQyxXQUFXLEVBQUUsQ0FBQztRQUNwQyxPQUFPLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ2xCLElBQUksQ0FBQyxTQUFTLENBQUM7WUFDYixJQUFJLE1BQUE7U0FDTCxDQUFDLENBQUM7UUFDSCxJQUFJLENBQUMsT0FBUSxDQUFDO1lBQ1osSUFBSSxNQUFBO1NBQ0wsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUNELFNBQVMsWUFBQyxNQUFNO1FBQWhCLGlCQWVDO1FBZEMsTUFBTSxDQUFDLHVCQUFlLENBQUM7WUFDckIsR0FBRyxFQUFFLHlDQUF5QztZQUM5QyxJQUFJLEVBQUUsTUFBTTtTQUNiLENBQUM7YUFDQyxJQUFJLENBQUMsVUFBQSxHQUFHO1lBQ0MsSUFBQSx5QkFBUyxFQUFFLCtCQUFZLENBQVM7WUFDeEMsS0FBSSxDQUFDLE9BQVEsQ0FBQztnQkFDWixTQUFTLFdBQUE7Z0JBQ1QsUUFBUSxFQUFFLFlBQVk7YUFDdkIsQ0FBQyxDQUFDO1FBQ0wsQ0FBQyxDQUFDO2FBQ0QsS0FBSyxDQUFDLFVBQUEsR0FBRztZQUNSLE9BQU8sQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDbkIsQ0FBQyxDQUFDLENBQUM7SUFDUCxDQUFDO0lBQ0QsZ0JBQWdCLFlBQUMsQ0FBQztRQUNoQixPQUFPLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQ1AsSUFBQSxzQkFBSyxDQUFjO1FBQzNCLElBQUksQ0FBQyxTQUFTLENBQUM7WUFDYixJQUFJLEVBQUUsS0FBSztTQUNaLENBQUMsQ0FBQztJQUNMLENBQUM7SUFDRCxZQUFZO1FBQ1YsRUFBRSxDQUFDLFVBQVUsQ0FBQztZQUNaLEdBQUcsRUFBRSw0Q0FBNEM7U0FDbEQsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztDQUNGLENBQUMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IHN0YXRpc3RpY3NGZXRjaCB9IGZyb20gJy4uLy4uL2FwaS9mZXRjaCc7XG5cbi8vIG1pbmlwcm9ncmFtL3BhZ2VzL3BsYXRmb3JtRmVlL3BsYXRmb3JtRmVlLmpzXG5QYWdlKHtcbiAgLyoqXG4gICAqIOmhtemdoueahOWIneWni+aVsOaNrlxuICAgKi9cbiAgZGF0YToge1xuICAgIGFyZWFDb3VudDogMCxcbiAgICB5ZWFyOiAnJyxcbiAgICBkYXRhTGlzdDogW10sXG4gIH0sXG5cbiAgLyoqXG4gICAqIOeUn+WRveWRqOacn+WHveaVsC0t55uR5ZCs6aG16Z2i5Yqg6L29XG4gICAqL1xuICBvbkxvYWQ6IGZ1bmN0aW9uKG9wdGlvbnMpIHtcbiAgICBsZXQgeWVhciA9IG5ldyBEYXRlKCkuZ2V0RnVsbFllYXIoKTtcbiAgICBjb25zb2xlLmxvZyh5ZWFyKTtcbiAgICB0aGlzLmZldGNoTGlzdCh7XG4gICAgICB5ZWFyLFxuICAgIH0pO1xuICAgIHRoaXMuc2V0RGF0YSEoe1xuICAgICAgeWVhcixcbiAgICB9KTtcbiAgfSxcbiAgZmV0Y2hMaXN0KGVudGl0eSkge1xuICAgIHJldHVybiBzdGF0aXN0aWNzRmV0Y2goe1xuICAgICAgdXJsOiAnL2RjeHkvcGxhdGZvcm1GZWUvb3BlcmF0ZS9hcmVhcy9tb250aGx5JyxcbiAgICAgIGRhdGE6IGVudGl0eSxcbiAgICB9KVxuICAgICAgLnRoZW4ocmVzID0+IHtcbiAgICAgICAgY29uc3QgeyBhcmVhQ291bnQsIHBsYXRmb3JtRmVlcyB9ID0gcmVzO1xuICAgICAgICB0aGlzLnNldERhdGEhKHtcbiAgICAgICAgICBhcmVhQ291bnQsXG4gICAgICAgICAgZGF0YUxpc3Q6IHBsYXRmb3JtRmVlcyxcbiAgICAgICAgfSk7XG4gICAgICB9KVxuICAgICAgLmNhdGNoKGVyciA9PiB7XG4gICAgICAgIGNvbnNvbGUubG9nKGVycik7XG4gICAgICB9KTtcbiAgfSxcbiAgeWVhckNoYW5nZUhhbmRsZShlKSB7XG4gICAgY29uc29sZS5sb2coZSk7XG4gICAgY29uc3QgeyB2YWx1ZSB9ID0gZS5kZXRhaWw7XG4gICAgdGhpcy5mZXRjaExpc3Qoe1xuICAgICAgeWVhcjogdmFsdWUsXG4gICAgfSk7XG4gIH0sXG4gIGdvUmVjb3JkUGFnZSgpIHtcbiAgICB3eC5uYXZpZ2F0ZVRvKHtcbiAgICAgIHVybDogJy9wYWdlcy9wbGF0Zm9ybUZlZVJlY29yZC9wbGF0Zm9ybUZlZVJlY29yZCcsXG4gICAgfSk7XG4gIH0sXG59KTtcbiJdfQ==
\ No newline at end of file
--- a/miniprogram/pages/platformFee/platformFee.json
+++ b/miniprogram/pages/platformFee/platformFee.json
 {
  "navigationBarTitleText": "服务费明细",
  "usingComponents": {
-    "c-select": "../components/Select/Select"
+    "c-select": "../components/Select/Select",
+    "platform-fee-chart": "../components/PlatformFeeChart/PlatformFeeChart"
  }
 }
--- a/miniprogram/pages/platformFee/platformFee.ts
+++ b/miniprogram/pages/platformFee/platformFee.ts
@@ -6,6 +6,7 @@ Page({
   * 页面的初始数据
   */
  data: {
+    areaCount: 0,
    year: '',
    dataList: [],
  },
@@ -29,8 +30,10 @@ Page({
      data: entity,
    })
      .then(res => {
+        const { areaCount, platformFees } = res;
        this.setData!({
-          dataList: res.data,
+          areaCount,
+          dataList: platformFees,
        });
      })
      .catch(err => {
@@ -44,5 +47,9 @@ Page({
      year: value,
    });
  },
-  goRecordPage() {},
+  goRecordPage() {
+    wx.navigateTo({
+      url: '/pages/platformFeeRecord/platformFeeRecord',
+    });
+  },
 });
--- a/miniprogram/pages/platformFee/platformFee.wxml
+++ b/miniprogram/pages/platformFee/platformFee.wxml
@@ -4,15 +4,15 @@
    <view class="platformFee-area">
      <c-select mode="date" fields="year" value="{{year}}" bindchange="yearChangeHandle" />
    </view>
-    <view class="platformFee-time">缴费记录</view>
+    <view class="platformFee-time" bind:tap="goRecordPage">缴费记录</view>
  </view>
  <view class="platformFee-block">
    <view class="platformFee-title">
      <view class="platformFee-title-color user"></view>
-      <view class="platformFee-title-text">共计2个校区</view>
+      <view class="platformFee-title-text">共计{{areaCount}}个校区</view>
    </view>
    <view class="platformFee-canvas">
-      <user-grouth-chart dataList="{{growthList}}" month="{{month}}" />
+      <platform-fee-chart dataList="{{dataList}}" />
    </view>
  </view>
  <view class="platformFee-block">

--- a/miniprogram/pages/report/report.js
+++ b/miniprogram/pages/report/report.js
--- a/miniprogram/pages/report/report.json
+++ b/miniprogram/pages/report/report.json
@@ -2,6 +2,7 @@
  "navigationBarTitleText": "运营管理系统",
  "navigationBarBackgroundColor": "#f0f5ff",
  "usingComponents": {
+    "platform-dialog":"../components/PlatformFeeDialog/PlatformFeeDialog",
    "nav-item": "../components/NavItem/NavItem"
  }
 }
\ No newline at end of file
--- a/miniprogram/pages/report/report.ts
+++ b/miniprogram/pages/report/report.ts
@@ -37,12 +37,12 @@ Component({
        url: '/pages/feedback/feedback',
        reLaunch: false,
      },
-      // {
-      //   name: '服务费缴纳',
-      //   icon: '../../../images/btn_jiaona@2x.png',
-      //   url: '',
-      //   reLaunch: false,
-      // },
+      {
+        name: '服务费明细',
+        icon: '../../../images/btn_jiaona@2x.png',
+        url: '/pages/platformFee/platformFee',
+        reLaunch: false,
+      },
      // {
      //   name: '账户提现',
      //   icon: '../../../images/btn_tixian@2x.png',
@@ -55,8 +55,8 @@ Component({
        url: '/pages/index/index',
        reLaunch: true,
      },
-      // {},
-      // {},
+      {},
+      {},
    ],
    account: 0,
    platformFee: '0.00',
@@ -68,10 +68,17 @@ Component({
      })
        .then(res => {
          console.log(res);
+          this.setData({
+            platformFee: res.data ? res.data.toFixed(2) : '0.00',
+          });
        })
        .catch(err => {
          console.log(err);
        });
    },
+    showRechargeDialog() {
+      let dialog = this.selectComponent('#platformDialog');
+      dialog.fetchPlatformFee();
+    },
  },
 });
--- a/miniprogram/pages/report/report.wxml
+++ b/miniprogram/pages/report/report.wxml
@@ -27,13 +27,18 @@
    <view class="report-header-platform">
      <view class="report-header-platform-info">
        待缴纳服务费
-        <text class="report-header-platform-fee" selectable="false" space="false" decode="false">{{platformFee}}</text>
+        <text class="report-header-platform-fee" selectable="false" space="false" decode="false">
+          {{platformFee}}
+        </text>
      </view>
-      <button class="report-header-platform-btn" wx:if="{{platformFee>0}}">缴费</button>
+      <button class="report-header-platform-btn" wx:if="{{platformFee>0}}" bind:tap="showRechargeDialog">
+        缴费
+      </button>
    </view>
    <view class="report-header-bottom"></view>
  </view>
  <view class="report-nav">
    <nav-item wx:for="{{itemList}}" wx:key="{{index}}" nav-data="{{item}}"></nav-item>
  </view>
+  <platform-dialog id="platformDialog" eventType="parents" />
 </view>
\ No newline at end of file