lhl 1 month ago
parent
commit
9e5769c3b7

+ 1 - 0
src/pages/agent/agentManage.vue

@@ -489,6 +489,7 @@ export default {
           let data = res.data;
           let data = res.data;
           data.res.forEach(value => value.col = 4)
           data.res.forEach(value => value.col = 4)
           this.cardLists = data.res;
           this.cardLists = data.res;
+		  console.log(this.cardLists,'this.cardLists');
         })
         })
         .catch((res) => {
         .catch((res) => {
           this.$Message.error(res.msg);
           this.$Message.error(res.msg);

+ 24 - 4
src/pages/finance/jc/list.vue

@@ -11,6 +11,12 @@
 			</Select>
 			</Select>
 			<Button type="primary" @click="getList" style="margin-left: 20px;">查询</Button>
 			<Button type="primary" @click="getList" style="margin-left: 20px;">查询</Button>
 			<Button type="primary" @click="reset" style="margin-left: 20px;">重置</Button>
 			<Button type="primary" @click="reset" style="margin-left: 20px;">重置</Button>
+			</Card>
+			<cards-data
+			  :cardLists="cardLists"
+			  v-if="cardLists.length >= 0"
+			></cards-data>
+			<Card :bordered="false">
 			<Table :columns="columns1" :data="list" ref="table" class="mt25" :loading="loading" highlight-row
 			<Table :columns="columns1" :data="list" ref="table" class="mt25" :loading="loading" highlight-row
 				no-userFrom-text="暂无数据" no-filtered-userFrom-text="暂无筛选结果">
 				no-userFrom-text="暂无数据" no-filtered-userFrom-text="暂无筛选结果">
 				<template slot-scope="{ row, index }" slot="icons">
 				<template slot-scope="{ row, index }" slot="icons">
@@ -57,7 +63,7 @@
 </template>
 </template>
 <script>
 <script>
 	import goodsList from "@/components/goodsList/index";
 	import goodsList from "@/components/goodsList/index";
-	
+	import cardsData from "@/components/cards/cards";
 	import {
 	import {
 		mapState,
 		mapState,
 		mapMutations
 		mapMutations
@@ -73,7 +79,8 @@
 		name: 'guquanList',
 		name: 'guquanList',
 		components: {
 		components: {
 			userLists,
 			userLists,
-			goodsList
+			goodsList,
+			cardsData
 		},
 		},
 		data() {
 		data() {
 			return {
 			return {
@@ -128,6 +135,7 @@
 				},
 				},
 				list: [],
 				list: [],
 				total: 0,
 				total: 0,
+				cardLists:[]
 			}
 			}
 		},
 		},
 		created() {
 		created() {
@@ -173,7 +181,9 @@
 				console.log(this.listFrom.uid,'this.listFrom.uid')
 				console.log(this.listFrom.uid,'this.listFrom.uid')
 			},
 			},
 			reset() {
 			reset() {
-				this.listFrom.member_id = 0,
+				this.listFrom.page = 1;
+				this.listFrom.uid = ''
+				this.listFrom.product_id = ''
 				this.getList()
 				this.getList()
 			},
 			},
 			pass(row,type) {
 			pass(row,type) {
@@ -204,7 +214,17 @@
 				getJcList(this.listFrom).then(async res => {
 				getJcList(this.listFrom).then(async res => {
 					let data = res.data
 					let data = res.data
 					this.list = data.list;
 					this.list = data.list;
-					this.total = res.data.count;
+					this.total = data.count;
+					let arr = []
+					Object.keys(data.count_list).forEach(item => {
+						arr.push({
+							name: item == 'jackpot' ? '未发放奖池': (item == 'grant'? '已发放奖池': '用户领取上限'),
+							col: 8,
+							count: data.count_list[item],
+							className: item == 'jackpot' ? 'md-contacts': (item == 'grant'? "md-contact": "md-cart")
+						})
+					})
+					this.cardLists = arr
 					this.loading = false;
 					this.loading = false;
 				}).catch(res => {
 				}).catch(res => {
 					console.log(res, 'res');
 					console.log(res, 'res');

+ 3 - 3
src/pages/product/productAdd/index.vue

@@ -1105,9 +1105,9 @@
 					</Col>
 					</Col>
 					<!-- //'bonus_ratio -->
 					<!-- //'bonus_ratio -->
 					<Col span="24">
 					<Col span="24">
-					<FormItem label="每日分红比例:" prop="">
-						<Input v-model="formValidate.bonus_ratio" placeholder="请输入每日分红比例" v-width="'50%'" />
-						<div class="tips">奖池每日分红比例</div>
+					<FormItem label="购买赠予权重:" prop="">
+						<Input v-model="formValidate.num" placeholder="请输入购买赠予权重" v-width="'50%'" />
+						<!-- <div class="tips">购买赠予权重</div> -->
 					</FormItem>
 					</FormItem>
 					</Col>
 					</Col>
 					<Col span="24">
 					<Col span="24">