优化：豆豆分配记录查看

2023-12-29 15:01:06 +08:00 · 2023-12-29 15:01:06 +08:00 · 23dd871bfe
parent da66b54f6a
commit 23dd871bfe
6 changed files with 279 additions and 5 deletions
--- a/src/api/platformCommission.js
+++ b/src/api/platformCommission.js
@ -25,3 +25,12 @@ export function platformCommissionPartnerCycleList(data) {
 export function platformCommissionPartnerList(data) {
  return request.get(`marketing/platformCommission/partner_list`, data)
 }
+// 平台抽成 - 豆豆和积分 - 统计
+export function platformCommissionLegumesTitle(data) {
+  return request.get(`marketing/platformCommission/legumes_title`, data)
+}
+// 平台抽成 - 豆豆和积分
+export function platformCommissionLegumes(data,getType = 'hold_list') {
+  // cycle_list=周期列表；list=豆豆分配明细
+  return request.get(`marketing/platformCommission/legumes_${getType}`, data)
+}
--- a/src/router/modules/marketing.js
+++ b/src/router/modules/marketing.js
@ -478,11 +478,20 @@ const marketingRouter = {
          path: 'partner',
          name: `platformCommissionPartner`,
          meta: {
-            title: '权重值管理',
+            title: '合伙人佣金',
            noCache: true
          },
          component: () => import('@/views/marketing/platformCommission/partner/index')
        },
+        {
+          path: 'legumes',
+          name: `platformCommissionLegumes`,
+          meta: {
+            title: '豆豆积分',
+            noCache: true
+          },
+          component: () => import('@/views/marketing/platformCommission/legumes/index')
+        },
        {
          path: 'config',
          name: `platformCommissionConfig`,
--- a/src/views/marketing/platformCommission/commissionRecord/index.vue
+++ b/src/views/marketing/platformCommission/commissionRecord/index.vue
@ -135,7 +135,7 @@ export default {
      },
      tableFrom: {
        page: 1,
-        limit: 10,
+        limit: 20,
        uid: '',
        mer_id: ''
      },
--- a/src/views/marketing/platformCommission/legumes/index.vue
+++ b/src/views/marketing/platformCommission/legumes/index.vue
@ -0,0 +1,256 @@
+<template>
+  <div class="divBox">
+    <el-card class="box-card">
+      <!--顶部搜索栏-->
+      <div slot="header" class="clearfix">
+        <div class="container">
+          <cards-data :card-lists="cardLists" />
+        </div>
+      </div>
+      <!--列表信息-->
+      <el-tabs v-model="activeName" @tab-click="changeTabs">
+        <el-tab-pane label="周期信息" name="cycle_list">
+          <el-table v-loading="listLoading" :data="tableData.data" style="width: 100%" size="mini">
+            <el-table-column prop="id" label="ID" min-width="60" align="center"/>
+            <el-table-column prop="total_platform_commission_money" label="基金数量" min-width="100" align="center"/>
+            <el-table-column prop="legumes_price" label="豆豆价格" min-width="100" align="center"/>
+            <el-table-column prop="legumes_num" label="豆豆数量" min-width="100" align="center"/>
+            <el-table-column prop="legumes_num" label="豆豆数量" min-width="100" align="center"/>
+            <el-table-column label="周期时间段" min-width="300" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.start_time }} ~ {{ scope.row.end_time }}
+              </template>
+            </el-table-column>
+            <el-table-column prop="create_time" label="处理时间" min-width="150" align="center"/>
+            <el-table-column label="状态" min-width="100" align="center">
+              <template slot-scope="scope">
+                <el-tag v-if="scope.row.status == 1" type="success" effect="dark">已分配</el-tag>
+                <el-tag v-else type="info" effect="dark">待分配</el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" min-width="150" align="center">
+              <template slot-scope="scope">
+                <el-button type="primary" @click="seeDetailRecord(scope.row.id)">分配明细</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-tab-pane>
+        <el-tab-pane label="豆豆分配明细" name="list">
+          <!--顶部搜索栏-->
+          <div class="clearfix">
+            <div class="container">
+              <el-form inline size="small" label-width="80px">
+                <el-form-item label="搜索：">
+                  <el-input v-model="tableFrom.uid" placeholder="请输入用户ID" class="selWidth" clearable>
+                    <el-button slot="append" icon="el-icon-search" class="el-button-solt" @click="clickSearch" />
+                  </el-input>
+                </el-form-item>
+                <el-form-item class="width100">
+                  <!--<el-button size="small" type="primary" @click="exports">导出</el-button>-->
+                </el-form-item>
+              </el-form>
+            </div>
+          </div>
+          <!--表单列表-->
+          <el-table v-loading="listLoading" :data="tableData.data" style="width: 100%" size="mini">
+            <el-table-column prop="id" label="ID" min-width="60" align="center"/>
+            <el-table-column label="用户信息" prop="nickname" min-width="280" align="left">
+              <template slot-scope="scope">
+                <div class="user-content">
+                  <div class="user-avatar" v-if="scope.row.avatar && scope.row.avatar != 1">
+                    <img :src="scope.row.avatar" />
+                  </div>
+                  <div class="user-info">
+                    <div class="nickname">{{ scope.row.nickname }}</div>
+                    <div class="user-id">ID：{{ scope.row.uid }}</div>
+                  </div>
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column prop="order_money" label="订单金额" min-width="100" align="center"/>
+            <el-table-column prop="order_money_rate" label="占比例(%)" min-width="100" align="center"/>
+            <el-table-column prop="get_legumes" label="获得豆豆" min-width="100" align="center"/>
+            <el-table-column prop="get_integral" label="获取积分" min-width="100" align="center"/>
+            <el-table-column prop="use_integral" label="已使用积分" min-width="100" align="center"/>
+            <el-table-column prop="create_time" label="处理时间" min-width="150" align="center"/>
+            <el-table-column label="状态" min-width="100" align="center">
+              <template slot-scope="scope">
+                <el-tag v-if="scope.row.status == 0" type="info" effect="dark">冻结中</el-tag>
+                <el-tag v-else-if="scope.row.status == 1" type="success" effect="dark">可使用</el-tag>
+                <el-tag v-else type="danger" effect="dark">已失效</el-tag>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-tab-pane>
+      </el-tabs>
+      <div class="block">
+        <el-pagination
+          :page-sizes="[10, 20, 40, 60, 80]"
+          :page-size="tableFrom.limit"
+          :current-page="tableFrom.page"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="tableData.total"
+          @size-change="handleSizeChange"
+          @current-change="pageChange"
+        />
+      </div>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import cardsData from '@/components/cards/index'
+import { platformCommissionLegumes, platformCommissionLegumesTitle } from '@/api/platformCommission'
+export default {
+  name: "platformCommissionLegumes",
+  components: { cardsData },
+  data() {
+    return {
+      // 选项卡相关内容
+      activeName: 'cycle_list',
+      // 周期信息相关
+      listLoading: true,
+      tableData: {
+        data: [],
+        total: 0,
+      },
+      tableFrom: {
+        page: 1,
+        limit: 10,
+        uid: '',
+        legumes_id: '',
+      },
+      cardLists: [],
+    };
+  },
+  watch: {},
+  mounted() {
+    this.getIntegralTitle();
+    this.getList('');
+  },
+  methods: {
+    // 获取统计数据
+    getIntegralTitle() {
+      platformCommissionLegumesTitle(this.tableFrom).then((res) => {
+        this.cardLists = res.data
+      }).catch((res) => {
+        this.$message.error(res.message)
+      })
+    },
+    // 获取列表 列表分页
+    getList(num) {
+      this.listLoading = true;
+      this.tableFrom.page = num ? num : this.tableFrom.page;
+      platformCommissionLegumes(this.tableFrom,this.activeName)
+        .then((res) => {
+          this.tableData.data = res.data.list;
+          this.tableData.total = res.data.count;
+          this.listLoading = false;
+        })
+        .catch((res) => {
+          this.listLoading = false;
+          this.$message.error(res.message);
+        });
+    },
+    pageChange(page) {
+      this.tableFrom.page = page;
+      this.getList('');
+    },
+    handleSizeChange(val) {
+      this.tableFrom.limit = val;
+      this.getList('');
+    },
+    // 点击搜索
+    clickSearch(){
+      this.getList(1);
+    },
+    // 点击变更选项卡
+    changeTabs(tab, event){
+      this.tableFrom.legumes_id = '';
+      this.tableFrom.uid = '';
+      this.getList(1);
+    },
+    // 查看周期明细
+    seeDetailRecord(legumes_id){
+      this.tableFrom.legumes_id = legumes_id;
+      this.activeName = 'list';
+      this.getList(1);
+    }
+
+
+
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.selWidth {
+  width: 350px !important;
+}
+.seachTiele {
+  line-height: 35px;
+}
+.title{
+  margin-bottom: 16px;
+  color: #17233d;
+  font-size: 14px;
+  font-weight: bold;
+}
+.scollhide::-webkit-scrollbar {
+  display: none; /* Chrome Safari */
+}
+.user-content{
+  --user-content-height-: 80px;
+
+  height: var(--user-content-height-);
+  width: 100%;
+  display: inline-flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  justify-content: center;
+  align-items: center;
+  .user-avatar{
+    height: var(--user-content-height-);
+    width: var(--user-content-height-);
+    display: inline-flex;
+    flex-direction: row;
+    flex-wrap: nowrap;
+    justify-content: center;
+    align-items: center;
+    img{
+      height: 80%!important;
+      width: 80%!important;
+      border-radius: 50% !important;
+    }
+  }
+  .user-info{
+    height: var(--user-content-height-);
+    width: calc(100% - var(--user-content-height-)) !important;
+    display: inline-flex;
+    flex-direction: column;
+    flex-wrap: nowrap;
+    justify-content: center;
+    align-items: flex-start;
+    .nickname{
+      font-size: 15px;
+      font-weight: bold;
+      line-height: calc(var(--user-content-height- * 65%)) !important;
+      width: 100%;
+      text-align: left;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+    .user-id{
+      font-size: 13px;
+      line-height: calc(var(--user-content-height- * 35%));
+    }
+  }
+}
+.rate-num{
+  margin-top: 10px!important;
+}
+/deep/ .cell{
+  padding: 0!important;
+}
+</style>
--- a/src/views/marketing/platformCommission/partner/index.vue
+++ b/src/views/marketing/platformCommission/partner/index.vue
@ -89,7 +89,7 @@ export default {
      },
      tableFrom: {
        page: 1,
-        limit: 10,
+        limit: 20,
      },
      // 周期明细相关
      dialogVisible: false,
@ -100,7 +100,7 @@ export default {
      },
      dialogTableFrom: {
        page: 1,
-        limit: 10,
+        limit: 20,
        cycle_id: 0
      },

--- a/src/views/marketing/platformCommission/weightValue/index.vue
+++ b/src/views/marketing/platformCommission/weightValue/index.vue
@ -100,7 +100,7 @@ export default {
      // 搜索内容
      searchData: {
        page: 1,
-        limit: 10,
+        limit: 20,
        uid: ''
      },
      // 选项卡相关内容