From 82cc7cfd3e7eba128d183f0760ddb6f66cad6b2e Mon Sep 17 00:00:00 2001
From: Jruome <2559028966@qq.com>
Date: Tue, 30 May 2023 19:03:08 +0800
Subject: [PATCH 1/2] =?UTF-8?q?uniapp=20=E9=94=80=E5=94=AE=E4=B8=9A?=
=?UTF-8?q?=E7=BB=A9=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
yudao-ui-app/pages/sale_performance/index.vue | 30 ++++++++++++++++---
1 file changed, 26 insertions(+), 4 deletions(-)
diff --git a/yudao-ui-app/pages/sale_performance/index.vue b/yudao-ui-app/pages/sale_performance/index.vue
index 1d1d20557..3e8313dc2 100644
--- a/yudao-ui-app/pages/sale_performance/index.vue
+++ b/yudao-ui-app/pages/sale_performance/index.vue
@@ -1,9 +1,9 @@
-
-
@@ -48,7 +48,7 @@
- 流水明细
+ {{performance[active].fund}}
+
@@ -96,6 +97,23 @@
fontWeight: '400',
color: '#fff'
},
+ show:false,
+ title:'业绩',
+ active:0,
+ performance: [
+ {
+ fund:'流水明细',
+ name:'发展会员业绩',
+ fontSize:'30',
+ id:0
+ },
+ {
+ fund:'订单流水',
+ name: '商品订单业绩',
+ fontSize:'30',
+ id:1
+ },
+ ],
list: [{
name: '今日',
}, {
@@ -127,6 +145,10 @@
}
},
methods: {
+ selectClick(value){
+ console.log(value)
+ this.active = value.id
+ },
async scrolltolower() {
if(this.total>this.orderData.length){
this.pageData.pageNo++
--
2.40.1
From 0e0450e48ceb079baffcfd19d1844d6396b2a34b Mon Sep 17 00:00:00 2001
From: TianYu <332368756@qq.com>
Date: Tue, 30 May 2023 19:35:18 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DBUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
yudao-ui-admin/src/api/shop/rechargeOrder.js | 9 ++++
.../commissionDetails/memberRecharge.vue | 53 ++++++++++---------
.../src/views/system/tenant/index.vue | 1 +
3 files changed, 37 insertions(+), 26 deletions(-)
diff --git a/yudao-ui-admin/src/api/shop/rechargeOrder.js b/yudao-ui-admin/src/api/shop/rechargeOrder.js
index 17bd5408b..fd779866b 100644
--- a/yudao-ui-admin/src/api/shop/rechargeOrder.js
+++ b/yudao-ui-admin/src/api/shop/rechargeOrder.js
@@ -52,6 +52,15 @@ export function getRechargeOrderPage(query) {
})
}
+// 获得抽佣明细-会员充值
+export function getCommissionDetailsPage(query) {
+ return request({
+ url: '/shop/recharge-order/findPromoterDrawPage',
+ method: 'post',
+ data: query
+ })
+}
+
// 导出订单 Excel
export function exportRechargeOrderExcel(query) {
return request({
diff --git a/yudao-ui-admin/src/views/distribution/commissionDetails/memberRecharge.vue b/yudao-ui-admin/src/views/distribution/commissionDetails/memberRecharge.vue
index 2719477ae..ba6f91183 100644
--- a/yudao-ui-admin/src/views/distribution/commissionDetails/memberRecharge.vue
+++ b/yudao-ui-admin/src/views/distribution/commissionDetails/memberRecharge.vue
@@ -3,21 +3,21 @@
-
-
+
+
-
-
+
+
-
-
+
-
-
+
+
搜索
@@ -31,32 +31,32 @@
-
- 导出
-
+
+
+
+
-
+
{{ scope.row.parentOrganizationName }}
-{{ scope.row.nickname }}
-
-
+
+
- {{ parseTime(scope.row.payTime) }}
+ {{ parseTime(scope.row.createTime) }}
-
-
-
-
+
+
+
+
import {
- getRechargeOrderPage,
+ getCommissionDetailsPage,
exportRechargeOrderExcel
} from '@/api/shop/rechargeOrder';
import {DICT_TYPE, getDictDatas} from "@/utils/dict";
@@ -104,10 +104,11 @@ export default {
queryParams: {
pageNo: 1,
pageSize: 10,
- orderId: null,
- tenantName: null,
- payTime: [],
- nickname: null
+ parentOrganizationName: '',
+ deptName: '',
+ createTime: [],
+ nickname: '',
+ mobile: ''
},
statusDictDatas: getDictDatas(DICT_TYPE.PAY_STATUS),
};
@@ -120,7 +121,7 @@ export default {
getList() {
this.loading = true;
// 执行查询
- getRechargeOrderPage(this.queryParams).then(response => {
+ getCommissionDetailsPage(this.queryParams).then(response => {
this.list = response.data.list;
this.total = response.data.total;
this.loading = false;
diff --git a/yudao-ui-admin/src/views/system/tenant/index.vue b/yudao-ui-admin/src/views/system/tenant/index.vue
index 0702962a3..c9d1bc33b 100755
--- a/yudao-ui-admin/src/views/system/tenant/index.vue
+++ b/yudao-ui-admin/src/views/system/tenant/index.vue
@@ -389,6 +389,7 @@ export default {
/** 新增按钮操作 */
handleAdd() {
this.reset();
+ this.form.status = 0
this.open = true;
this.isLook = false;
this.title = '添加店铺';
--
2.40.1