12.31开源admin代码更新

admin/src/views/financial/brokerage/index.vue

@@ -3,23 +3,19 @@
     <el-card class="box-card">
       <div slot="header" class="clearfix">
         <div class="container">
-          <el-form size="small" label-width="100px" :inline="true">
-            <el-form-item label="关键字：">
-              <el-input v-model="tableFrom.keywords" placeholder="昵称/ID" class="selWidth" size="small" clearable>
-                <el-button slot="append" icon="el-icon-search" size="small" @click="getList(1)" />
-              </el-input>
-            </el-form-item>
-            <el-form-item label="佣金范围：">
-              <el-col :span="11">
-                <el-input v-model="tableFrom.min" placeholder="请输入最小金额" type="number" clearable></el-input>
-              </el-col>
-              <el-col class="line" :span="2" style="text-align: center;">-</el-col>
-              <el-col :span="11">
-                <el-input v-model="tableFrom.max" placeholder="请输入最大金额" type="number" clearable></el-input>
-              </el-col>
+          <el-form label-width="100px" :inline="true">
+            <el-form-item>
+               <el-select v-model="tableFrom.type" clearable  placeholder="请选择">
+                <el-option
+                  v-for="item in typeOptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
             </el-form-item>
             <el-form-item>
-              <el-button type="primary" @click="getList(1)" size="mini">查询</el-button>
+              <el-button type="primary" @click="getList(1)" size="small">查询</el-button>
             </el-form-item>
           </el-form>
         </div>
@@ -33,44 +29,31 @@
         highlight-current-row
       >
         <el-table-column
-          prop="uid"
-          label="会员ID"
+          prop="id"
+          label="ID"
           width="80"
         />
+        <el-table-column label="佣金变动" min-width="100">
+          <template slot-scope="scope">
+            <span :class="scope.row.type == 1 ? 'color_red': 'color_green'">{{scope.row.type == 1 ? '+' : '-' }}{{scope.row.price}}</span>
+          </template>
+        </el-table-column>
         <el-table-column
-          prop="nickname"
-          label="昵称"
-          min-width="130"
-        />
-        <el-table-column
-          sortable
-          prop="totalBrokerage"
-          label="总佣金金额"
-          min-width="120"
-        />
-        <el-table-column
-          sortable
-          label="账户余额"
-          min-width="100"
-          prop="nowMoney"
-        />
-        <el-table-column
-          sortable
-          :default-sort = "{prop: 'brokerage', order: 'descending'}"
-          prop="brokerage"
-          label="账户佣金"
-          min-width="100"
-        />
-        <el-table-column
-          sortable
-          prop="totalExtract"
-          label="到账佣金"
+          prop="mark"
+          label="变动信息"
           min-width="150"
         />
-        <el-table-column label="操作" min-width="130" fixed="right">
-          <template slot-scope="scope">
-            <el-button size="small" type="text" @click="handlerOpenInfo(scope.row)">详情</el-button>
-          </template>
+        <el-table-column
+          label="变动类型"
+          min-width="130"
+          prop="title"
+        />
+        <el-table-column
+          prop="userName"
+          label="用户信息"
+          min-width="150"
+        />
+        <el-table-column label="时间" min-width="130" prop="updateTime">
         </el-table-column>
       </el-table>
       <div class="block">
@@ -85,75 +68,11 @@
         />
       </div>
     </el-card>
-
-    <el-dialog
-      title="佣金详情"
-      :visible.sync="Visible"
-      width="900px"
-      v-if="Visible"
-      :before-close="Close">
-      <div>
-        <div class="acea-row row-middle" v-if="userDetail">
-          <div class="dashboard-workplace-header-tip-desc">
-            <span class="dashboard-workplace-header-tip-desc-sp">姓名: {{ userDetail.nickname }}</span>
-            <span class="dashboard-workplace-header-tip-desc-sp">上级推广人: {{ userDetail.spreadName | filterEmpty }}</span>
-            <span class="dashboard-workplace-header-tip-desc-sp">佣金总收入: {{ userDetail.totalBrokerage }}</span>
-            <span class="dashboard-workplace-header-tip-desc-sp">账户余额: {{ userDetail.nowMoney }}</span>
-            <span class="dashboard-workplace-header-tip-desc-sp">创建时间: {{ userDetail.createTime }}</span>
-          </div>
-        </div>
-        <el-divider></el-divider>
-        <el-form size="small" label-position="left" label-width="90px">
-          <el-form-item label="时间选择：" class="width100">
-            <el-radio-group v-model="userTableFrom.dateLimit" type="button" class="mr20" size="small" @change="selectChangeUser(userTableFrom.dateLimit)">
-              <el-radio-button v-for="(item,i) in fromList.fromTxt" :key="i" :label="item.val">{{ item.text }}</el-radio-button>
-            </el-radio-group>
-            <el-date-picker v-model="timeValUser" value-format="yyyy-MM-dd" format="yyyy-MM-dd" size="small" type="daterange" placement="bottom-end" placeholder="自定义时间" style="width: 250px;" @change="onchangeTimeUser" />
-          </el-form-item>
-        </el-form>
-        <el-divider></el-divider>
-        <el-table
-          v-loading="tablistLoading"
-          :data="userDetailData.data"
-          style="width: 100%"
-          size="mini"
-          class="table"
-          highlight-current-row
-        >
-          <el-table-column
-            prop="price"
-            label="佣金金额"
-            min-width="100"
-          />
-          <el-table-column
-            prop="updateTime"
-            label="获得时间"
-            min-width="120"
-          />
-          <el-table-column
-            label="备注"
-            min-width="150"
-            prop="mark"
-          />
-        </el-table>
-        <div class="block">
-          <el-pagination
-            :page-sizes="[10, 20, 30, 40]"
-            :page-size="userTableFrom.limit"
-            :current-page="userTableFrom.page"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="userDetailData.total"
-            @size-change="userHandleSizeChange"
-            @current-change="userPageChange"
-          />
-        </div>
-      </div>
-    </el-dialog>
   </div>
 </template>
 
 <script>
-  import { brokerageListApi, monitorListDetailApi } from '@/api/financial'
+  import { brokerageListApi } from '@/api/financial'
   export default {
     name: 'AccountsCapital',
     data() {
@@ -163,15 +82,9 @@
           data: [],
           total: 0
         },
-        userDetailData: {
-          data: [],
-          total: 0
-        },
         listLoading: true,
         tableFrom: {
-          min: '',
-          max: '',
-          keywords: '',
+          type:'',
           page: 1,
           limit: 20
         },
@@ -182,10 +95,13 @@
         },
         fromList: this.$constants.fromList,
         options: [],
-        Visible: false,
-        tablistLoading: false,
-        userDetail: {},
-        timeValUser: []
+        typeOptions:[
+          { value: 1, label: '订单返佣'},
+          { value: 2, label: '申请提现'},
+          { value: 3, label: '提现失败'},
+          { value: 4, label: '提现成功'},
+          { value: 5, label: '佣金转余额'},
+        ],
       }
     },
     mounted() {
@@ -193,47 +109,6 @@
       this.getList()
     },
     methods: {
-      Close(){
-        this.Visible = false
-      },
-      handlerOpenInfo(row){
-        this.userDetail = row
-        this.Visible = true
-        this.tablistLoading = true
-        this.userTableFrom.limit = 10
-        this.getUserList()
-      },
-      getUserList(num){
-        this.userTableFrom.page = num ? num : this.userTableFrom.page;
-        monitorListDetailApi(this.userDetail.uid, this.userTableFrom).then(res => {
-          this.userDetailData.data = res.list
-          this.userDetailData.total = res.total
-          this.tablistLoading = false
-        }).catch((res) => {
-          this.tablistLoading = false
-        })
-      },
-      selectChangeUser (tab) {
-        this.userTableFrom.dateLimit = tab
-        this.timeValUser = []
-        this.userTableFrom.page = 1;
-        this.getUserList()
-      },
-      userPageChange(page) {
-        this.userTableFrom.page = page
-        this.getUserList()
-      },
-      userHandleSizeChange(val) {
-        this.userTableFrom.limit = val
-        this.getUserList()
-      },
-      // 具体日期
-      onchangeTimeUser(e) {
-        this.timeValUser = e
-        this.userTableFrom.dateLimit = e ? this.timeValUser.join(',') : ''
-        this.userTableFrom.page = 1;
-        this.getUserList()
-      },
       // 列表
       getList(num) {
         this.listLoading = true
@@ -326,4 +201,10 @@
   .selWidth{
     width: 300px;
   }
+  .color_red{
+    color:#F5222D;
+  }
+  .color_green{
+    color:#7ABE5C;
+  }
 </style>

admin/src/views/financial/commission/withdrawal/index.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="divBox">
     <el-card class="box-card">
-      <div slot="header" class="clearfix">
+      <div class="clearfix">
         <div class="container">
           <el-form size="small" label-width="100px">
-            <el-form-item label="时间选择：" class="width100">
+            <el-form-item label="时间选择：" class="width100"> 
               <el-radio-group v-model="tableFrom.dateLimit" type="button" class="mr20" size="small" @change="selectChange(tableFrom.dateLimit)">
                 <el-radio-button v-for="(item,i) in fromList.fromTxt" :key="i" :label="item.val">{{ item.text }}</el-radio-button>
               </el-radio-group>
@@ -33,9 +33,13 @@
             </el-form-item>
           </el-form>
         </div>
-        <cards-data :cardLists="cardLists"></cards-data>
       </div>
-      <el-table
+    </el-card>
+    <div class="mt20">
+      <cards-data :cardLists="cardLists" v-if="checkPermi(['admin:finance:apply:balance'])"></cards-data>
+    </div>
+    <el-card class="box-card">
+       <el-table
         v-loading="listLoading"
         :data="tableData.data"
         style="width: 100%"
@@ -119,8 +123,8 @@
             <span class="spBlock">{{ scope.row.status | extractStatusFilter }}</span>
             <span v-if="scope.row.status === -1">拒绝原因：{{scope.row.failMsg}}</span>
             <template v-if="scope.row.status === 0">
-              <el-button type="danger" icon="el-icon-close" size="mini" @click="onExamine(scope.row.id)">未通过</el-button>
-              <el-button type="primary" icon="el-icon-check" size="mini" @click="ok(scope.row.id)">通过</el-button>
+              <el-button type="danger" icon="el-icon-close" size="mini" @click="onExamine(scope.row.id)" v-hasPermi="['admin:finance:apply:apply']">未通过</el-button>
+              <el-button type="primary" icon="el-icon-check" size="mini" @click="ok(scope.row.id)" v-hasPermi="['admin:finance:apply:apply']">通过</el-button>
             </template>
           </template>
         </el-table-column>
@@ -139,7 +143,7 @@
         />
         <el-table-column label="操作" min-width="80" fixed="right" align="center">
           <template slot-scope="scope">
-            <el-button v-if="scope.row.status !== 1" type="text" size="small" @click="handleEdit(scope.row)">编辑</el-button>
+            <el-button v-if="scope.row.status !== 1" type="text" size="small" @click="handleEdit(scope.row)" v-hasPermi="['admin:finance:apply:update']">编辑</el-button>
             <span v-else>无</span>
           </template>
         </el-table-column>
@@ -155,7 +159,7 @@
           @current-change="pageChange"
         />
       </div>
-    </el-card>
+     </el-card>
 
     <!--编辑-->
     <el-dialog
@@ -198,6 +202,8 @@
   import { applyListApi, applyBalanceApi, applyUpdateApi, applyStatusApi } from '@/api/financial'
   import cardsData from '@/components/cards/index'
   import zbParser from '@/components/FormGenerator/components/parser/ZBParser'
+  import { checkPermi } from "@/utils/permission"; // 权限判断函数
+  import {Debounce} from '@/utils/validate'
   export default {
     name: 'AccountsExtract',
     components: {
@@ -234,6 +240,7 @@
       this.getBalance()
     },
     methods: {
+      checkPermi,
       resetForm(){
         this.dialogVisible = false;
       },
@@ -244,7 +251,7 @@
         this.isCreate = 1;
         this.editData = JSON.parse(JSON.stringify(row));
       },
-      handlerSubmit(formValue) {
+      handlerSubmit:Debounce(function(formValue) {
         formValue.id = this.applyId;
         formValue.extractType = this.extractType;
         applyUpdateApi(formValue).then(data => {
@@ -252,7 +259,7 @@
           this.dialogVisible = false
           this.getList()
         })
-      },
+      }),
       handleClose() {
         this.dialogVisible = false
         this.editData = {}
@@ -297,10 +304,10 @@
       getBalance() {
         applyBalanceApi({dateLimit: this.tableFrom.dateLimit}).then(res => {
           this.cardLists = [
-            { name: '待提现金额', count: res.toBeWithdrawn },
-            { name: '佣金总金额', count: res.commissionTotal },
-            { name: '已提现金额', count: res.withdrawn },
-            { name: '未提现金额', count: res.unDrawn }
+            { name: '待提现金额', count: res.toBeWithdrawn,color:'#1890FF',class:'one',icon:'iconzhichujine1' },
+            { name: '佣金总金额', count: res.commissionTotal,color:'#A277FF',class:'two',icon:'iconzhifuyongjinjine1' },
+            { name: '已提现金额', count: res.withdrawn,color:'#EF9C20',class:'three',icon:'iconyingyee1' },
+            { name: '未提现金额', count: res.unDrawn,color:'#1BBE6B',class:'four',icon:'iconyuezhifujine2' }
           ]
         })
       },

admin/src/views/financial/record/charge/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="divBox">
     <el-card class="box-card">
-      <div slot="header" class="clearfix">
+      <div class="clearfix">
         <div class="container">
           <el-form size="small" label-width="100px" inline>
             <el-form-item label="时间选择：" class="width100">
@@ -10,13 +10,6 @@
               </el-radio-group>
               <el-date-picker v-model="timeVal" value-format="yyyy-MM-dd" format="yyyy-MM-dd" size="small" type="daterange" placement="bottom-end" placeholder="自定义时间" style="width: 250px;" @change="onchangeTime" />
             </el-form-item>
-            <!--<el-form-item label="是否支付：">-->
-              <!--<el-radio-group v-model="tableFrom.paid" type="button" size="small" @change="getList(1)">-->
-                <!--<el-radio-button label="">全部</el-radio-button>-->
-                <!--<el-radio-button label="1">已支付</el-radio-button>-->
-                <!--<el-radio-button label="0">未支付</el-radio-button>-->
-              <!--</el-radio-group>-->
-            <!--</el-form-item>-->
             <el-form-item label="用户id：">
               <el-input v-model="tableFrom.uid" placeholder="用户id" class="selWidth" size="small" clearable>
                 <el-button slot="append" icon="el-icon-search" size="small" @click="getList(1)" />
@@ -29,8 +22,12 @@
             </el-form-item>
           </el-form>
         </div>
-        <cards-data :card-lists="cardLists" />
       </div>
+    </el-card>
+    <div class="mt20">
+      <cards-data :card-lists="cardLists" v-if="checkPermi(['admin:recharge:balance'])" />
+    </div>
+    <el-card class="box-card">
       <el-table
         v-loading="listLoading"
         :data="tableData.data"
@@ -81,14 +78,6 @@
           prop="givePrice"
           :sort-method="(a,b)=>{return a.givePrice - b.givePrice}"
         />
-        <!--<el-table-column-->
-          <!--label="是否支付"-->
-          <!--min-width="80"-->
-        <!--&gt;-->
-          <!--<template slot-scope="scope">-->
-            <!--<span class="spBlock">{{ scope.row.paid | payStatusFilter }}</span>-->
-          <!--</template>-->
-        <!--</el-table-column>-->
         <el-table-column
           label="充值类型"
           min-width="80"
@@ -105,12 +94,6 @@
             <span class="spBlock">{{ scope.row.payTime || '无' }}</span>
           </template>
         </el-table-column>
-        <!--<el-table-column label="操作" min-width="120" fixed="right" align="center">-->
-          <!--<template slot-scope="scope">-->
-            <!--<el-button type="text" size="small" @click="handleDelete(scope.row)" v-if="!scope.row.paid">删除</el-button>-->
-            <!--<el-button type="text" size="small" @click="handleRefund(scope.row)" v-if="parseFloat(scope.row.refundPrice) <= 0 && scope.row.paid">退款</el-button>-->
-          <!--</template>-->
-        <!--</el-table-column>-->
       </el-table>
       <div class="block">
         <el-pagination
@@ -146,6 +129,7 @@
   import { topUpLogListApi, balanceApi, topUpLogDeleteApi, refundApi } from '@/api/financial'
   import cardsData from '@/components/cards/index'
   import zbParser from '@/components/FormGenerator/components/parser/ZBParser'
+  import { checkPermi } from "@/utils/permission"; // 权限判断函数
   export default {
     name: 'AccountsBill',
     components: { cardsData, zbParser },
@@ -177,6 +161,7 @@
       this.getStatistics()
     },
     methods: {
+      checkPermi,
       resetForm(formValue) {
         this.handleClose();
       },
@@ -246,10 +231,9 @@
         balanceApi().then(res => {
           const stat = res
           this.cardLists = [
-            { name: '充值总金额', count: stat.total, icon: 'el-icon-s-goods' },
-            { name: '充值退款金额', count: stat.refund, icon: 'el-icon-s-order' },
-            { name: '小程序充值金额', count: stat.routine, icon: 'el-icon-s-cooperation' },
-            { name: '公众号充值金额', count: stat.weChat, icon: 'el-icon-s-finance' }
+            { name: '充值总金额', count: stat.total, color:'#1890FF',class:'one',icon:'iconchongzhijine' },
+            { name: '小程序充值金额', count: stat.routine, color:'#A277FF',class:'two',icon:'iconweixinzhifujine' },
+            { name: '公众号充值金额', count: stat.weChat, color:'#EF9C20',class:'three',icon:'iconyuezhifujine1' }
           ]
         })
       }

admin/src/views/financial/record/monitor/index.vue

@@ -10,21 +10,21 @@
               </el-radio-group>
               <el-date-picker v-model="timeVal" value-format="yyyy-MM-dd" format="yyyy-MM-dd" size="small" type="daterange" placement="bottom-end" placeholder="自定义时间" style="width: 250px;" @change="onchangeTime" />
             </el-form-item>
-            <!--<el-form-item label="明细类型：">-->
-              <!--<el-select  class="selWidth" v-model="tableFrom.type" filterable clearable placeholder="请选择" @change="getList(1)">-->
-                <!--<el-option-->
-                  <!--v-for="(item, index) in optionList"-->
-                  <!--:key="index"-->
-                  <!--:label="item.title"-->
-                  <!--:value="item.type"-->
-                <!--/>-->
-              <!--</el-select>-->
-            <!--</el-form-item>-->
-            <el-form-item label="关键字：" class="width100">
+            <el-form-item label="关键字" class="width100">
               <el-input v-model="tableFrom.keywords" placeholder="微信昵称/ID" class="selWidth" size="small" clearable>
                 <el-button slot="append" icon="el-icon-search" size="small" @click="getList(1)" />
               </el-input>
             </el-form-item>
+            <el-form-item label="明细类型">
+              <el-select v-model="tableFrom.title" size="small" clearable placeholder="请选择" @change="selectType">
+                <el-option
+                  v-for="item in options"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
           </el-form>
         </div>
       </div>
@@ -47,12 +47,15 @@
           min-width="130"
         />
         <el-table-column
-          prop="number"
           label="金额"
-          sortable
-          :sort-method="(a,b)=>{return a.number - b.number}"
           min-width="120"
-        />
+        >
+          <template slot-scope="scope">
+            <div>
+              <span :class="scope.row.pm == 1 ? 'color_red': 'color_green'">{{scope.row.pm == 1 ? '+' : '-' }}{{scope.row.number}}</span>
+            </div>
+          </template>>
+        </el-table-column>
         <el-table-column
           label="明细类型"
           min-width="100"
@@ -97,28 +100,27 @@
         },
         listLoading: true,
         tableFrom: {
-         // type: '',
+          title: '',
           dateLimit: '',
           keywords: '',
           page: 1,
-          limit: 20
+          limit: 20,
         },
         categoryId: '',
         fromList: this.$constants.fromList,
-        optionList: []
+        options:[
+          {value: 'recharge',label: '充值支付'},
+          {value: 'admin',label: '后台操作'},
+          {value: 'productRefund',label: '商品退款'},
+          {value: 'payProduct',label: '购买商品'},
+        ]
       }
     },
     mounted() {
       // this.getTypes()
-      this.getOptionList()
       this.getList()
     },
     methods: {
-      getOptionList() {
-        monitorListOptionApi().then(res => {
-          this.optionList = res
-        })
-      },
       selectChange(tab) {
         this.tableFrom.dateLimit = tab
         this.timeVal = []
@@ -152,6 +154,9 @@
       handleSizeChange(val) {
         this.tableFrom.limit = val
         this.getList()
+      },
+      selectType(e){
+        this.getList();
       }
     }
   }
@@ -161,4 +166,10 @@
   .selWidth{
     width: 300px;
   }
+  .color_red{
+    color:#F5222D;
+  }
+  .color_green{
+    color:#7ABE5C;
+  }
 </style>