版本开发

.env.prod

@@ -1,3 +1,3 @@
 NODE_ENV='production'
 VUE_APP_ENV='prod'
-VUE_APP_BASE_API = 'https://fgsadminapi.ptsslpm.cn/'
+VUE_APP_BASE_API = 'https://adminapi.cause.yaoyuankj.top/'

package.json

@@ -6,8 +6,8 @@
     "scripts": {
         "dev": "vue-cli-service serve --open",
         "build:stage": "vue-cli-service build --mode staging",
-        "build:test": "set NODE_OPTIONS=\"--openssl-legacy-provider\" & vue-cli-service build --mode test",
-        "build:prod": "set NODE_OPTIONS=\"--openssl-legacy-provider\" & vue-cli-service build --mode prod",
+        "build:test": "vue-cli-service build --mode test",
+        "build:prod": "vue-cli-service build --mode prod",
         "build:pre": "vue-cli-service build --mode pre",
         "lint": "vue-cli-service lint",
         "test:unit": "vue-cli-service test:unit",

src/api/account.js

@@ -88,6 +88,16 @@ export function accountLimit (query) {
     data: query
   })
 }
+
+//新增用户
+export function addAccountMethod (query) {
+  return request({
+    url: '/cms_api/account/add_account',
+    method: 'post',
+    data: query
+  })
+}
+
 // 上级代理设置
 export function updatePromotion (query) {
   return request({
@@ -112,3 +122,20 @@ export function updateAccountInfo (query) {
     data: query
   })
 }
+
+// 人工充值
+export function manualRecharge(query) {
+  return request({
+    url: '/cms_api/recharge/recharge',
+    method: 'post',
+    data: query
+  })
+}
+// 人工提现
+export function manualWithdrawal(query) {
+  return request({
+    url: '/cms_api/withdrawal/withdrawal',
+    method: 'post',
+    data: query
+  })
+}

src/api/finance.js

@@ -127,7 +127,7 @@ export function auctionList (query) {
 }
 
 // 用户汇总列表
-export function settleAccountList (query) {
+export function settleAccountList(query) {
   return request({
     url: '/cms_api/settle/account_list',
     method: 'post',
@@ -135,6 +135,15 @@ export function settleAccountList (query) {
   })
 }
 
+// 用户汇总列表
+export function settleAccountMonthList(query) {
+  return request({
+    url: '/cms_api/settle/account_month_list',
+    method: 'post',
+    data: query
+  })
+}
+
 // 平台汇总列表
 export function settlePlatformList (query) {
   return request({
@@ -144,6 +153,16 @@ export function settlePlatformList (query) {
   })
 }
 
+
+// 平台月汇总列表
+export function settlePlatformMonthList (query) {
+  return request({
+    url: '/cms_api/settle/platform_month_list',
+    method: 'post',
+    data: query
+  })
+}
+
 // 流水总明细
 export function totalList (query) {
   return request({

src/components/base/bar-chart.vue

@@ -37,7 +37,7 @@ export default {
         },
         series: [
           {
-            name: '当天送券',
+            name: '当天定租收益',
             type: 'bar',
             stack: 'total',
             label: {

src/components/upload-pic/index.vue

@@ -43,10 +43,7 @@
 </template>
 
 <script>
-import { uploadOSS , deleteOSS } from '@/libs/oss';
 import draggable from 'vuedraggable';
-import {productList} from "@/api/manage";
-import {uploadFile} from "@/api/system";
 import Cookies from "js-cookie";
 import axios from "axios";
 export default {

src/libs/myPlugin.js

@@ -523,6 +523,38 @@ export default {
         )
       }
     }
+
+    //yyyyMMdd
+    Vue.prototype.v_formatYYYYMMDD = function (shijianchuo) {
+      if (!shijianchuo) {
+        return ''
+      }
+
+      function add0 (m) {
+        return m < 10 ? '0' + m : m
+      }
+
+      var time = new Date(shijianchuo)
+      var y = time.getFullYear()
+      var m = time.getMonth() + 1
+      var d = time.getDate()
+      return (
+        y + add0(m) + add0(d)
+      )
+    }
+    // 格式化时间    年月
+    Vue.prototype.v_formatYM = function (shijianchuo) {
+      function add0 (m) {
+        return m < 10 ? '0' + m : m
+      }
+
+      var time = new Date(shijianchuo)
+      var y = time.getFullYear()
+      var m = time.getMonth() + 1
+      return (
+        y + add0(m)
+      )
+    }
     // 在指定时间戳 上  加上天数  后返回 时间戳
     /*
              * 1.start	开始日期的时间戳

src/libs/request.js

@@ -17,7 +17,7 @@ const downloadUrl = url => {
 }
 let baseUrl = ''
 if (process.env.VUE_APP_ENV === 'prod') {
-    baseUrl = 'https://fgsadminapi.ptsslpm.cn/'
+    baseUrl = 'https://adminapi.cause.yaoyuankj.top/'
         // baseUrl = window.location.protocol + '//' + 'wefree-cms-api.nicekol.com'
 } else if (process.env.VUE_APP_ENV === 'dev') {
     baseUrl = '/web'

src/view/menu/account/accountFinance/index.vue

@@ -2,7 +2,7 @@
   <div class="tran-detail">
     <inputBlock
       inlineBlock
-      v-model.trim="realName"
+      v-model.trim="searchRealName"
       prefix="姓名："
     ></inputBlock>
     <inputBlock
@@ -11,6 +11,7 @@
       prefix="手机号："
     ></inputBlock>
     <Button type="primary" class="margin-right20" @click="search">查询</Button>
+    <Button type="primary" class="margin-right20" @click="addAccount">添加新用户</Button>
     <Table
       border
       :columns="tableTitle"
@@ -19,41 +20,45 @@
       :loading="loading"
     >
       <template slot-scope="{ row }" slot="do" >
-        <el-button size="small" class="marginrb" type="success"  @click="shareholderOpen(row)">股东转账开启</el-button>
-        <el-button v-if="row.isTreasurer===1" class="marginrb" style="margin-left: 0" size="small" type="warning"  @click="financeRechargeShow(row)">财务账号充值</el-button>
+<!--        <el-button size="small" class="marginrb" type="success"  @click="shareholderOpen(row)">股东转账开启</el-button>-->
+        <el-button v-if="row.isTreasurer===1" class="marginrb" size="small" type="warning"  @click="financeRechargeShow(row)">财务账号充值</el-button>
         <el-popconfirm v-if="row.isTreasurer===0"
                        title="确定设置该账号为财务账号吗？"
                        @confirm="setFinance(row)"
         >
           <el-button class="marginrb" slot="reference" size="small" type="primary">财务账号设置</el-button>
         </el-popconfirm>
-        <el-popconfirm v-if="row.withdrawalDisable===0"
-                       title="确定禁止该用户提现吗？"
-                       @confirm="setRole(row,2,1)"
-        >
-          <el-button class="marginrb" slot="reference" size="small" type="danger" style="margin-top: 6px">提现禁用</el-button>
-        </el-popconfirm>
-        <el-popconfirm v-if="row.withdrawalDisable===1"
-                       title="确定启用该用户提现吗？"
-                       @confirm="setRole(row,2,0)"
-        >
-          <el-button  class="marginrb" slot="reference"  size="small" type="success" style="margin-top: 6px" >提现启用</el-button>
-        </el-popconfirm>
-        <el-popconfirm v-if="row.transferDisable===0"
-                       title="确定禁止该用户转账吗？"
-                       @confirm="setRole(row,1,1)"
-        >
-          <el-button class="marginrb" slot="reference" size="small" type="danger" style="margin-top: 6px">转账禁用</el-button>
-        </el-popconfirm>
-        <el-popconfirm v-if="row.transferDisable===1"
-                       title="确定启用该用户转账吗？"
-                       @confirm="setRole(row,1,0)"
-        >
-          <el-button  class="marginrb" slot="reference"  size="small" type="success" style="margin-top: 6px" >转账启用</el-button>
-        </el-popconfirm>
-        <el-button  class="marginrb" type="primary" size="small"   style="margin-top: 6px" @click="dataEditing(row)">资料编辑</el-button>
-        <el-button  class="marginrb" style="margin-left: 0;margin-top: 6px" size="small" type="warning"  @click="limitShow(row,1)">提现每日限额</el-button>
-        <el-button  class="marginrb" style="margin-left: 0;margin-top: 6px" size="small" type="warning"  @click="limitShow(row,2)">转账每日限额</el-button>
+
+<!--        <el-popconfirm v-if="row.withdrawalDisable===0"-->
+<!--                       title="确定禁止该用户提现吗？"-->
+<!--                       @confirm="setRole(row,2,1)"-->
+<!--        >-->
+<!--          <el-button class="marginrb" slot="reference" size="small" type="danger" style="margin-top: 6px">提现禁用</el-button>-->
+<!--        </el-popconfirm>-->
+<!--        <el-popconfirm v-if="row.withdrawalDisable===1"-->
+<!--                       title="确定启用该用户提现吗？"-->
+<!--                       @confirm="setRole(row,2,0)"-->
+<!--        >-->
+<!--          <el-button  class="marginrb" slot="reference"  size="small" type="success" style="margin-top: 6px" >提现启用</el-button>-->
+<!--        </el-popconfirm>-->
+<!--        <el-popconfirm v-if="row.transferDisable===0"-->
+<!--                       title="确定禁止该用户转账吗？"-->
+<!--                       @confirm="setRole(row,1,1)"-->
+<!--        >-->
+<!--          <el-button class="marginrb" slot="reference" size="small" type="danger" style="margin-top: 6px">转账禁用</el-button>-->
+<!--        </el-popconfirm>-->
+<!--        <el-popconfirm v-if="row.transferDisable===1"-->
+<!--                       title="确定启用该用户转账吗？"-->
+<!--                       @confirm="setRole(row,1,0)"-->
+<!--        >-->
+<!--          <el-button  class="marginrb" slot="reference"  size="small" type="success" style="margin-top: 6px" >转账启用</el-button>-->
+<!--        </el-popconfirm>-->
+        <el-button  class="marginrb" type="primary" size="small" style="margin-left: 0"  @click="dataEditing(row)">资料编辑</el-button>
+        <br>
+        <el-button class="marginrb"  size="small" type="success" @click="financeShow(row,0)">人工充值</el-button>
+        <el-button class="marginrb"  size="small" type="danger"  style="margin-top: 6px;margin-left: 0" @click="financeShow(row,1)">人工提现</el-button>
+<!--        <el-button  class="marginrb" style="margin-left: 0;margin-top: 6px" size="small" type="warning"  @click="limitShow(row,1)">提现每日限额</el-button>-->
+<!--        <el-button  class="marginrb" style="margin-left: 0;margin-top: 6px" size="small" type="warning"  @click="limitShow(row,2)">转账每日限额</el-button>-->
       </template>
       <template slot-scope="{ row }" slot="sumAmount" >
         <div>{{ parseFloat(row.agileAmount+row.auctionAmount+row.shareholderAmount).toFixed(2) }}</div>
@@ -262,6 +267,67 @@
           <el-button type="primary" @click="setLimitAction()">提交</el-button>
       </span>
     </el-dialog>
+
+    <el-dialog
+      width="25%"
+      title="添加新用户"
+      :show-close="true"
+      :close-on-click-modal="false"
+      :visible.sync="addAccountShow"
+      append-to-body
+      element-loading-spinner="el-icon-loading"
+      element-loading-background="rgba(0, 0, 0, 0.3)"
+    >
+      <div class="margin-left20 margin-top15">
+        <el-form
+          ref="addAccountForm"
+          label-width="90px"
+        >
+          <el-form-item label="用户账号：" prop="account">
+            <el-input  v-model="account"></el-input>
+          </el-form-item>
+          <el-form-item label="真实姓名：" prop="realName">
+            <el-input v-model="realName"></el-input>
+          </el-form-item>
+          <el-form-item label="身份证号：" prop="idNumber">
+            <el-input v-model="idNumber"></el-input>
+          </el-form-item>
+        </el-form>
+      </div>
+      <span slot="footer" class="dialog-footer">
+          <el-button @click="addAccountShow = false">取消</el-button>
+          <el-button type="primary" @click="addAccountSubmit()">提交</el-button>
+      </span>
+    </el-dialog>
+    <el-dialog
+      width="22%"
+      :title="financeTitle"
+      :show-close="true"
+      :close-on-click-modal="false"
+      :visible.sync="financeShowModal"
+      append-to-body
+      element-loading-spinner="el-icon-loading"
+      element-loading-background="rgba(0, 0, 0, 0.3)"
+    >
+      <div class="margin-left20 margin-top15">
+        <el-form
+          ref="passForm"
+          label-width="100px"
+        >
+          <el-form-item label="金额：" prop="amount">
+            <el-input type="number" style="width: 180px" v-model="amount"></el-input>
+          </el-form-item>
+          <el-form-item label="财务凭证：" prop="certificate">
+            <!-- 图片上传 -->
+            <uploadPic :imgList="certificateImages" prefixMinWidht='10px' :maxPic="1" @fileData="imageData"></uploadPic>
+          </el-form-item>
+        </el-form>
+      </div>
+      <span slot="footer" class="dialog-footer">
+          <el-button @click="financeShowModal = false">取消</el-button>
+          <el-button type="primary" @click="submitFinance()">提交</el-button>
+        </span>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -269,6 +335,7 @@ import inputBlock from '_c/base/input/input-block'
 import selectBlock from '_c/base/input/select-block'
 import TableMinxin from '@/mixin/TableMixin'
 import {Pass} from "codemirror/src/util/misc";
+import uploadPic from '_c/upload-pic/index'
 import {
   accountLimit,
   accountList,
@@ -279,7 +346,7 @@ import {
   shareholderOpen,
   updatePromotion,
   accountInfo,
-  updateAccountInfo, proxyTypeEnum
+  updateAccountInfo, proxyTypeEnum, addAccountMethod, manualRecharge, manualWithdrawal
 } from "@/api/account";
 export default {
   name: 'rechargeExamine',
@@ -290,13 +357,15 @@ export default {
   },
   components:{
     inputBlock,
-    selectBlock
+    selectBlock,
+    uploadPic
   },
   mixins: [TableMinxin],
   data () {
     return {
       phone: '', // 充值手机号
       realName: '', // 姓名
+      searchRealName: '', // 搜索姓名
       phones: '', // 充值手机号
       realNames: '', // 姓名
       total: 0,
@@ -305,11 +374,18 @@ export default {
       totalAmount:0,
       setProxyShowModal:false,
       configShowModal:false,
+      financeShowModal:false,
       rechargeShowModal:false,
       limitShowModal:false,
       shareholderShowModal:false,
       dataEditingdio:false,
+      addAccountShow:false,
+      certificateImages:[],
+      certificate:'',
       currentRow:{},
+      account:'',
+      financeTitle:'人工充值',
+      idNumber:'',
       tableContent:[],
       proxyId:'',
       amount:'',
@@ -347,7 +423,7 @@ export default {
           align: 'center'
         },
         {
-          title: '购物宝账户',
+          title: '定租账户',
           key: 'agileAmount',
           align: 'center'
         },
@@ -424,7 +500,7 @@ export default {
       this.loading = false
       let data = {
         account: this.phone, // 账户手机号
-        realName: this.realName // 姓名
+        realName: this.searchRealName // 姓名
       }
       let params = {
         data:data,
@@ -451,6 +527,53 @@ export default {
         }
       })
     },
+    imageData(data){
+      this.certificate=data[0].ossUrl
+    },
+    financeShow(row,isRecharge){
+      this.currentRow = this.v_deepClone(row);
+      if(isRecharge===1){
+        this.financeTitle = '人工提现'
+      }else {
+        this.financeTitle = '人工充值'
+      }
+      this.certificateImages=[]
+      this.amount=''
+      this.financeShowModal=true
+    },
+    submitFinance(){
+      let params = {
+        data:{
+          accountId: this.currentRow.id,
+          amount: this.amount,
+          certificate: this.certificate
+        }
+      }
+      if(this.financeTitle === '人工充值'){
+        //调用充值接口
+        manualRecharge(params).then(res => {
+          if (res.rspCode === 0) {
+            this.$message({
+              type: 'success',
+              message: '操作成功'
+            })
+            this.getTableData()
+          }
+        })
+      }else {
+        //调用提现接口
+        manualWithdrawal(params).then(res => {
+          if (res.rspCode === 0) {
+            this.$message({
+              type: 'success',
+              message: '设置成功'
+            })
+            this.getTableData()
+          }
+        })
+      }
+      this.financeShowModal=false
+    },
     setLimitAction(){
       let data={}
       if(this.isTransfer===1){
@@ -481,6 +604,25 @@ export default {
         }
       })
     },
+    addAccountSubmit(){
+      let params = {
+        data:{
+          account: this.account,
+          idNumber: this.idNumber,
+          realName: this.realName
+        }
+      }
+      addAccountMethod(params).then(res => {
+        if (res.rspCode === 0) {
+          this.$message({
+            type: 'success',
+            message: '操作成功'
+          })
+          this.addAccountShow=false
+          this.getTableData()
+        }
+      })
+    },
     proxyConfig(row){
       this.currentRow = this.v_deepClone(row);
       this.configShowModal=true;
@@ -652,6 +794,13 @@ export default {
         this.bankReqList = res.data.bankList || []
       })
     },
+    //添加新用户
+    addAccount(){
+      this.account='';
+      this.idNumber='';
+      this.realName='';
+      this.addAccountShow = true;
+    },
     // 确定修改
     editCard(){
       let params = {

src/view/menu/account/proxyAccount/index.vue

@@ -34,7 +34,7 @@
 import TableMinxin from '@/mixin/TableMixin'
 import {rechargeCancel, rechargeDetail, rechargeExamine, rechargeList} from "@/api/finance";
 import {Pass} from "codemirror/src/util/misc";
-import {accountList, proxyList} from "@/api/account";
+import {proxyList} from "@/api/account";
 import inputBlock from '_c/base/input/input-block'
 import selectBlock from '_c/base/input/select-block'
 export default {

src/view/menu/financeManage/accountMonthStatistics/index.vue

@@ -0,0 +1,150 @@
+<template>
+  <div class="tran-detail">
+    <inputBlock
+      inlineBlock
+      v-model.trim="realName"
+      prefix="姓名："
+    ></inputBlock>
+    <inputBlock
+      inlineBlock
+      v-model.trim="phone"
+      prefix="手机号："
+    ></inputBlock>
+    结算月份:
+    <el-date-picker range-separator="-" style="margin-right: 15px;margin-left: 12px" start-placeholder="开始月份" end-placeholder="结束月份" type="monthrange" v-model="createTime" ></el-date-picker>
+    <Button style="margin-bottom: 4px" type="primary" class="margin-right20" @click="search">查询</Button>
+    <Table
+      border
+      :columns="tableTitle"
+      :data="tableContent"
+      class="margin-bottom20 margin-top20"
+      :loading="loading"
+    >
+      <template slot-scope="{ row }" slot="contribution" >
+        <div>{{ parseFloat(row.proxyRebateDay+row.proxyGratitudeDay).toFixed(2) }}</div>
+      </template>
+    </Table>
+    <Page
+      :total="total"
+      @on-change="changePageNum"
+      :current="currentPage"
+      show-sizer
+      show-total
+      show-elevator
+      @on-page-size-change="changePageSize"
+    />
+  </div>
+</template>
+<script>
+import TableMinxin from '@/mixin/TableMixin'
+import {
+  settleAccountList, settleAccountMonthList
+} from "@/api/finance";
+import {Pass} from "codemirror/src/util/misc";
+import uploadPic from '_c/upload-pic/index'
+import inputBlock from '_c/base/input/input-block'
+export default {
+  name: 'accountMonthStatistics',
+  computed: {
+    Pass() {
+      return Pass
+    }
+  },
+  mixins: [TableMinxin],
+  components: {
+    uploadPic,inputBlock
+  },
+  data () {
+    return {
+      phone: '', // 充值手机号
+      realName: '', // 姓名
+      total: 0,
+      tableContent:[],
+      createTime:'',
+      tableTitle: [
+        {
+          title: 'ID',
+          key: 'id',
+          align: 'center',
+          width:80
+        },
+        {
+          title: '手机号',
+          key: 'account',
+          align: 'center'
+        },
+        {
+          title: '姓名',
+          key: 'realName',
+          align: 'center'
+        },
+        {
+          title: '结算月份',
+          key: 'settleDate',
+          align: 'center'
+        },
+        {
+          title: '定租',
+          key: 'agileDay',
+          align: 'center'
+        },
+        {
+          title: '定租收益',
+          key: 'agileInterestDay',
+          align: 'center'
+        },
+        {
+          title: '提成',
+          key: 'proxyRebateDay',
+          align: 'center'
+        },
+        {
+          title: '感恩奖',
+          key: 'proxyGratitudeDay',
+          align: 'center'
+        },
+        {
+          title: '贡献值',
+          slot: 'contribution',
+          align: 'center'
+        },
+        {
+          title: '结算余额',
+          key: 'financeTotal',
+          align: 'center'
+        }
+      ]
+    }
+  },
+  mounted () {
+    this.getTableData()
+  },
+  methods: {
+    // 获取表格数据
+    getTableData () {
+      this.loading = false
+      let data = {
+        account: this.phone, // 账户手机号
+        realName: this.realName, // 姓名
+        startTime: this.v_formatYM(this.createTime && this.createTime[0]),
+        endTime: this.v_formatYM(this.createTime && this.createTime[1])
+      }
+      let params = {
+        data: data,
+        page: this.currentPage,
+        pageSize: this.pageSize
+      }
+      settleAccountMonthList(params).then(res => {
+        if (res.rspCode === 0) {
+          this.tableContent = res.data
+          this.total = res.total
+        }
+      })
+    }
+  }
+}
+</script>
+<style scoped>
+.tran-detail {
+}
+</style>

src/view/menu/financeManage/financeAccountStatistics/index.vue

@@ -20,6 +20,9 @@
       class="margin-bottom20 margin-top20"
       :loading="loading"
     >
+      <template slot-scope="{ row }" slot="contribution" >
+        <div>{{ parseFloat(row.proxyRebateDay+row.proxyGratitudeDay).toFixed(2) }}</div>
+      </template>
     </Table>
     <Page
       :total="total"
@@ -41,7 +44,7 @@ import {Pass} from "codemirror/src/util/misc";
 import uploadPic from '_c/upload-pic/index'
 import inputBlock from '_c/base/input/input-block'
 export default {
-  name: 'rechargeExamine',
+  name: 'financeAccountStatistics',
   computed: {
     Pass() {
       return Pass
@@ -81,38 +84,28 @@ export default {
           align: 'center'
         },
         {
-          title: '累计充值',
-          key: 'rechargeTotal',
+          title: '定租',
+          key: 'agileDay',
           align: 'center'
         },
         {
-          title: '累计提现',
-          key: 'withdrawalTotal',
+          title: '定租收益',
+          key: 'agileInterestDay',
           align: 'center'
         },
         {
-          title: '累计转入',
-          key: 'transferInTotal',
+          title: '提成',
+          key: 'proxyRebateDay',
           align: 'center'
         },
         {
-          title: '累计转出',
-          key: 'transferOutTotal',
+          title: '感恩奖',
+          key: 'proxyGratitudeDay',
           align: 'center'
         },
         {
-          title: '累计送购物券',
-          key: 'agileInterestTotal',
-          align: 'center'
-        },
-        {
-          title: '累计提成',
-          key: 'proxyRebateTotal',
-          align: 'center'
-        },
-        {
-          title: '累计感恩收益',
-          key: 'proxyGratitudeTotal',
+          title: '贡献值',
+          slot: 'contribution',
           align: 'center'
         },
         {

src/view/menu/financeManage/financePlatformStatistics/index.vue

@@ -9,6 +9,9 @@
       class="margin-bottom20 margin-top20"
       :loading="loading"
     >
+      <template slot-scope="{ row }" slot="contribution" >
+        <div>{{ parseFloat(row.proxyRebateDay+row.proxyGratitudeDay).toFixed(2) }}</div>
+      </template>
     </Table>
     <Page
       :total="total"
@@ -56,38 +59,28 @@ export default {
           align: 'center'
         },
         {
-          title: '累计充值',
-          key: 'rechargeTotal',
+          title: '定租',
+          key: 'agileDay',
           align: 'center'
         },
         {
-          title: '累计提现',
-          key: 'withdrawalTotal',
+          title: '定租收益',
+          key: 'agileInterestDay',
           align: 'center'
         },
         {
-          title: '累计转入',
-          key: 'transferInTotal',
+          title: '提成',
+          key: 'proxyRebateDay',
           align: 'center'
         },
         {
-          title: '累计转出',
-          key: 'transferOutTotal',
+          title: '感恩奖',
+          key: 'proxyGratitudeDay',
           align: 'center'
         },
         {
-          title: '累计送购物券',
-          key: 'agileInterestTotal',
-          align: 'center'
-        },
-        {
-          title: '累计提成',
-          key: 'proxyRebateTotal',
-          align: 'center'
-        },
-        {
-          title: '累计感恩收益',
-          key: 'proxyGratitudeTotal',
+          title: '贡献值',
+          slot: 'contribution',
           align: 'center'
         },
         {

src/view/menu/financeManage/platformMonthStatistics/index.vue

@@ -0,0 +1,123 @@
+<template>
+  <div class="tran-detail">
+    结算月份：<el-date-picker range-separator="-" style="margin-right: 15px;margin-left: 12px" start-placeholder="开始月份" end-placeholder="结束月份" type="monthrange" v-model="createTime"></el-date-picker>
+    <Button style="margin-bottom: 4px" type="primary" class="margin-right20" @click="search">查询</Button>
+    <Table
+      border
+      :columns="tableTitle"
+      :data="tableContent"
+      class="margin-bottom20 margin-top20"
+      :loading="loading"
+    >
+      <template slot-scope="{ row }" slot="contribution" >
+        <div>{{ parseFloat(row.proxyRebateDay+row.proxyGratitudeDay).toFixed(2) }}</div>
+      </template>
+    </Table>
+    <Page
+      :total="total"
+      @on-change="changePageNum"
+      :current="currentPage"
+      show-sizer
+      show-total
+      show-elevator
+      @on-page-size-change="changePageSize"
+    />
+  </div>
+</template>
+<script>
+import TableMinxin from '@/mixin/TableMixin'
+import {
+  rechargeCancel,
+  rechargeDetail,
+  rechargeExamine,
+  rechargeList, settleAccountList, settlePlatformList, settlePlatformMonthList,
+  withdrawalDetail, withdrawalExamine,
+  withdrawalList
+} from "@/api/finance";
+import {Pass} from "codemirror/src/util/misc";
+import uploadPic from '_c/upload-pic/index'
+export default {
+  name: 'rechargeExamine',
+  computed: {
+    Pass() {
+      return Pass
+    }
+  },
+  mixins: [TableMinxin],
+  components: {
+    uploadPic
+  },
+  data () {
+    return {
+      total: 0,
+      tableContent:[],
+      createTime:'',
+      tableTitle: [
+        {
+          title: '结算日期',
+          key: 'settleDate',
+          align: 'center'
+        },
+        {
+          title: '定租',
+          key: 'agileDay',
+          align: 'center'
+        },
+        {
+          title: '定租收益',
+          key: 'agileInterestDay',
+          align: 'center'
+        },
+        {
+          title: '提成',
+          key: 'proxyRebateDay',
+          align: 'center'
+        },
+        {
+          title: '感恩奖',
+          key: 'proxyGratitudeDay',
+          align: 'center'
+        },
+        {
+          title: '贡献值',
+          slot: 'contribution',
+          align: 'center'
+        },
+        {
+          title: '结算余额',
+          key: 'financeTotal',
+          align: 'center'
+        }
+      ]
+    }
+  },
+  mounted () {
+    this.getTableData()
+  },
+  methods: {
+    // 获取表格数据
+    getTableData () {
+      this.loading = false
+      let data = {
+        startTime: this.v_formatYM(this.createTime && this.createTime[0]),
+        endTime: this.v_formatYM(this.createTime && this.createTime[1])
+      }
+      let params = {
+        data: data,
+        page: this.currentPage,
+        pageSize: this.pageSize
+      }
+      settlePlatformMonthList(params).then(res => {
+        if (res.rspCode === 0) {
+          this.tableContent = res.data
+          this.total = res.total
+        }
+      })
+    }
+  }
+}
+</script>
+<style scoped>
+.tran-detail {
+}
+</style>

src/view/menu/financeManage/rechargeExamine/index.vue

@@ -22,7 +22,7 @@
       <template slot-scope="{ row }" slot="do" >
         <Button class="marginrb" v-if="row.examineStatus===1" type="success"  @click="examine(row)">审批</Button>
         <Button class="marginrb" v-if="row.examineStatus!==1" type="primary"  @click="examine(row)">详情</Button>
-        <Button class="marginrb" v-if="row.examineStatus===2" type="error"  @click="cancel(row)">撤销</Button>
+<!--        <Button class="marginrb" v-if="row.examineStatus===2" type="error"  @click="cancel(row)">撤销</Button>-->
       </template>
     </Table>
     <Page

vue.config.js

@@ -28,8 +28,8 @@ module.exports = {
         // target: 'http://influencer-dev-cms.zhairenwu.com/',
         // target: 'http://test-cms-api.nicekol.com',
         //  target: "http://dev-cms-api.nicekol.com",
-        // target: 'http://127.0.0.1:8052/',
-		target: 'http://42.194.187.203:8052/',
+        target: 'http://127.0.0.1:8052/',
+		// target: 'http://42.194.187.203:8052/',
         // target: 'https://cms-api.nicekol.com/',
         cookieDomainRewrite: {
           "*": "localhost",