feat(firstPurchase): 首购收益添加本月合计

src/api/bonus.js

@@ -1,294 +1,287 @@
-import request from '@/util/request'
+import request from "@/util/request";
 
 // 奖金明细列表
 export function getQueryBonus(data) {
   return request({
-    url: '/member/api/bonus/query-bonus',
+    url: "/member/api/bonus/query-bonus",
-    method: 'post',
+    method: "post",
-    data
+    data,
-  })
+  });
 }
 // 奖金明细-实时收益
 export function queryCurrentBonus(data) {
   return request({
-    url: '/bonus/api/bonus/query-current-bonus',
+    url: "/bonus/api/bonus/query-current-bonus",
-    method: 'post',
+    method: "post",
-    data
+    data,
-  })
+  });
 }
 // 奖金明细-首购收益
-export function queryBonusFirst(data,data1) {
+export function queryBonusFirst(data, data1) {
   return request({
-    url: '/bonus/api/bonus/query-bonus-first'+data1,
+    url: "/bonus/api/bonus/query-bonus-first" + data1,
-    method: 'post',
+    method: "post",
-    data
+    data,
-  })
+  });
 }
 // 奖金明细-嗨粉收益
-export function queryBonusHiFun(data,data1) {
+export function queryBonusHiFun(data, data1) {
   return request({
-    url: '/bonus/api/bonus/query-bonus-hi-fun'+data1,
+    url: "/bonus/api/bonus/query-bonus-hi-fun" + data1,
-    method: 'post',
+    method: "post",
-    data
+    data,
-  })
+  });
 }
-// 奖金-计算昨天合计的奖金数量
+// 奖金-计算昨天及当月合计的奖金数量
 export function queryBonusTotal(data) {
   return request({
-    url: '/bonus/api/bonus/query-bonus-total',
+    url: "/bonus/api/bonus/query-bonus-total",
-    method: 'post',
+    method: "post",
-    data
+    data,
-  })
+  });
 }
 
 // 奖金明细-云代收益
-export function queryBonusCloud(data,data1) {
+export function queryBonusCloud(data, data1) {
   return request({
-    url: '/bonus/api/bonus/query-bonus-cloud'+data1,
+    url: "/bonus/api/bonus/query-bonus-cloud" + data1,
-    method: 'post',
+    method: "post",
-    data
+    data,
-  })
+  });
 }
 // 奖金明细-复购券收益
-export function queryBonusCoupon(data,data1) {
+export function queryBonusCoupon(data, data1) {
   return request({
-    url: '/bonus/api/bonus/query-bonus-coupon'+data1,
+    url: "/bonus/api/bonus/query-bonus-coupon" + data1,
-    method: 'post',
+    method: "post",
-    data
+    data,
-  })
+  });
 }
 // 奖金明细-创客空间收益
-export function queryBonusMarker(data,data1) {
+export function queryBonusMarker(data, data1) {
   return request({
-    url: '/bonus/api/bonus/query-bonus-maker'+data1,
+    url: "/bonus/api/bonus/query-bonus-maker" + data1,
-    method: 'post',
+    method: "post",
-    data
+    data,
-  })
+  });
 }
 // 奖金明细-海粉收益
-export function queryBonusHaifun(data,data1) {
+export function queryBonusHaifun(data, data1) {
   return request({
-    url: '/bonus/api/bonus/query-bonus-hai-fun'+data1,
+    url: "/bonus/api/bonus/query-bonus-hai-fun" + data1,
-    method: 'post',
+    method: "post",
-    data
+    data,
-  })
+  });
 }
 // 奖金明细-复购收益
-export function queryBonusRepurchase(data,data1) {
+export function queryBonusRepurchase(data, data1) {
   return request({
-    url: '/bonus/api/bonus/query-bonus-repurchase'+data1,
+    url: "/bonus/api/bonus/query-bonus-repurchase" + data1,
-    method: 'post',
+    method: "post",
-    data
+    data,
-  })
+  });
 }
 
-
 //奖金来源列表
-export function getBonusDetail(data,data1) {
+export function getBonusDetail(data, data1) {
   return request({
-    url: '/bonus/api/bonus/query-bonus-detail'+data1,
+    url: "/bonus/api/bonus/query-bonus-detail" + data1,
-    method: 'post',
+    method: "post",
-    data
+    data,
-  })
+  });
 }
 
 //招商列表
 export function getBiddingList(params) {
   return request({
-    url: '/member/api/market-news/bidding-list',
+    url: "/member/api/market-news/bidding-list",
-    method: 'get',
+    method: "get",
-    params
+    params,
-  })
+  });
 }
 
 //三单循环
 export function tripleCycleList(params) {
   return request({
-    url: '/member/api/market-news/triple_cycle_list',
+    url: "/member/api/market-news/triple_cycle_list",
-    method: 'get',
+    method: "get",
-    params
+    params,
-  })
+  });
 }
 
 //海粉
 export function seaFlourList(params) {
   return request({
-    url: '/member/api/market-news/sea_flour_list',
+    url: "/member/api/market-news/sea_flour_list",
-    method: 'get',
+    method: "get",
-    params
+    params,
-  })
+  });
 }
 
 //注册列表
 export function getRegList(params) {
   return request({
-    url: '/member/api/market-news/reg-list',
+    url: "/member/api/market-news/reg-list",
-    method: 'get',
+    method: "get",
-    params
+    params,
-  })
+  });
 }
 
 //收益类型下拉选-奖项配置
 export function getBdBonusitemsList(params) {
   return request({
-    url: '/system/api/bd-bonus-items/list',
+    url: "/system/api/bd-bonus-items/list",
-    method: 'get',
+    method: "get",
-    params
+    params,
-  })
+  });
 }
 
 //注册等级下拉选
 export function getGradeList(params) {
   return request({
-    url: '/system/api/grade/list',
+    url: "/system/api/grade/list",
-    method: 'get',
+    method: "get",
-    params
+    params,
-  })
+  });
 }
 
 //考核明细接口
 export function getAssessList(params) {
   return request({
-    url: '/member/api/assess/assessList',
+    url: "/member/api/assess/assessList",
-    method: 'get',
+    method: "get",
-    params
+    params,
-  })
+  });
 }
 
-
 //考核状态复购考核
 export function getAssessStatusList(params) {
   return request({
-    url: '/system/pub/enums/member-assess-status',
+    url: "/system/pub/enums/member-assess-status",
-    method: 'get',
+    method: "get",
-    params
+    params,
-  })
+  });
 }
 
-
 //考核类型分红考核
 export function getchangeTypeList(params) {
   return request({
-    url: '/system/pub/enums/change-type',
+    url: "/system/pub/enums/change-type",
-    method: 'get',
+    method: "get",
-    params
+    params,
-  })
+  });
 }
 
 //考核分红积分
 export function getAssAchieve(params) {
   return request({
-    url: '/member/api/assess/assAchieve',
+    url: "/member/api/assess/assAchieve",
-    method: 'get',
+    method: "get",
-    params
+    params,
-  })
+  });
 }
 
 //活动列表
 export function getActivityList(params) {
   return request({
-    url: '/activity/api/base/activity-list',
+    url: "/activity/api/base/activity-list",
-    method: 'get',
+    method: "get",
-    params
+    params,
-  })
+  });
 }
 //三单轮次
 export function nextRound(params) {
   return request({
-    url: '/member/api/market-news/round-his',
+    url: "/member/api/market-news/round-his",
-    method: 'get',
+    method: "get",
-    params
+    params,
-  })
+  });
 }
 
 //活动详情
 export function getActivityDetailList(data) {
   return request({
-    url: '/activity/api/base/activity-detail',
+    url: "/activity/api/base/activity-detail",
-    method: 'post',
+    method: "post",
-    data
+    data,
-  })
+  });
 }
 
-
 //新人礼包详情
 export function getGiftPack(data) {
   return request({
-    url: '/activity/api/people-service/getGiftPack',
+    url: "/activity/api/people-service/getGiftPack",
-    method: 'post',
+    method: "post",
-    data
+    data,
-  })
+  });
 }
 
 //抽奖奖品列表
 export function getDrawPrizeList(data) {
   return request({
-    url: '/activity/api/draw/prize-list',
+    url: "/activity/api/draw/prize-list",
-    method: 'post',
+    method: "post",
-    data
+    data,
-  })
+  });
 }
 
 //抽奖次数查询
 export function getLotteryDrawNum(data) {
   return request({
-    url: '/activity/api/draw/lottery-num',
+    url: "/activity/api/draw/lottery-num",
-    method: 'post',
+    method: "post",
-    data
+    data,
-  })
+  });
 }
 
-
 //抽奖
 export function getLotteryDraw(data) {
   return request({
-    url: '/activity/api/draw/lottery-draw',
+    url: "/activity/api/draw/lottery-draw",
-    method: 'post',
+    method: "post",
-    data
+    data,
-  })
+  });
 }
 
-
 //在线支付点击在线支付时调用
 export function drawOnlinePayDraw(data) {
   return request({
-    url: '/activity/api/draw/online-pay-draw',
+    url: "/activity/api/draw/online-pay-draw",
-    method: 'post',
+    method: "post",
-    data
+    data,
-  })
+  });
 }
 
-
 //抽奖查询支付明细
 export function getLuckdrawDetail(data) {
   return request({
-    url: '/activity/api/draw/query-spend-details',
+    url: "/activity/api/draw/query-spend-details",
-    method: 'post',
+    method: "post",
-    data
+    data,
-  })
+  });
 }
 
 //月度业绩左右区业绩详情
 export function getAchieveDetails(params) {
   return request({
-    url: '/member/api/achieve/place-new-add-achieve-details',
+    url: "/member/api/achieve/place-new-add-achieve-details",
-    method: 'get',
+    method: "get",
-    params
+    params,
-  })
+  });
 }
 //旅游活动积分
 export function tourismPoint(params) {
   return request({
-    url: '/activity/api/tourism/tourism-point/' + params,
+    url: "/activity/api/tourism/tourism-point/" + params,
-    method: 'get'
+    method: "get",
-  })
+  });
 }
 
 //创客空间收益
 export function markBonus(data) {
   return request({
-    url: '/bonus/api/bonus/query-mark-bonus-detail',
+    url: "/bonus/api/bonus/query-mark-bonus-detail",
-    method: 'post',
+    method: "post",
-    data
+    data,
-  })
+  });
-}
+}

src/components/bonus/firstPurchase.vue

@@ -30,12 +30,19 @@
       </el-form>
     </div>
     <div class="tablebox">
+      <div class="tabletop month-total">
+        <span class="tabletoptitle1">本月合计：</span>
+        <span class="tabletoptitle2">{{
+          monthIncomeTotal | toThousandthAndKeepDecimal
+        }}</span>
+      </div>
       <div class="tabletop">
-        <span class="tabletoptitle1">{{ "昨日实发合计" }}：</span>
+        <span class="tabletoptitle1">昨日合计：</span>
         <span class="tabletoptitle2">{{
           toSum | toThousandthAndKeepDecimal
         }}</span>
       </div>
+
       <el-table
         height="1351px"
         :data="tableData"
@@ -130,7 +137,7 @@ import { toThousandthAndKeepDecimal } from "@/util/numberToCurrency";
 import user from "@/store/modules/user";
 import { mapGetters } from "vuex";
 import * as api from "@/api/goods";
-import { queryBonusTotal } from "../../api/bonus";
+import { queryBonusTotal } from "@/api/bonus";
 import { isLocalSymbol } from "../../util/numberToCurrency";
 export default {
   name: "IncomeDetail",
@@ -171,12 +178,10 @@ export default {
   },
   computed: {
     toSum() {
-      var sum = 0;
+      return this.totals[0]?.realIncomeTotal || "0.00";
-      this.totals.forEach((ele) => {
+    },
-        sum += (ele.realIncomeTotal * 100) / 100;
+    monthIncomeTotal() {
-      });
+      return this.totals[0]?.monthIncomeTotal || "0.00";
-      sum = sum.toFixed(2);
-      return sum;
     },
     user() {
       return user;
@@ -188,8 +193,15 @@ export default {
     this.specialArea = this.$route.query.id;
     this.research();
     this.getMenuLists();
+    // this.getSum();
   },
   methods: {
+    // getSum() {
+    //   queryBonusTotal({}).then((res) => {
+    //     this.toSum = res.rows[0].realIncomeTotal;
+    //     this.monthIncomeTotal = res.rows[0].monthIncomeTotal;
+    //   });
+    // },
     hasKey(e) {
       let flag = true;
       this.tableData.forEach((item) => {
@@ -399,10 +411,12 @@ export default {
     box-shadow: 0px 2px 20px 0px rgba(135, 135, 135, 0.3);
     border-radius: 10px 10px 10px 10px;
     margin-top: 20px;
-
+    .month-total {
+      top: 50px;
+    }
     .tabletop {
       text-align: right;
-      padding: 20px;
+      padding: 10px;
 
       .tabletoptitle1 {
         font-size: 18px;