From ba7abcfd7ca4a9928e84b5c388f1c9fa43551637 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Thu, 28 Nov 2024 11:54:23 +0800
Subject: [PATCH] fix模板: 优化多个模板页面的显示逻辑
---
src/main/resources/templates/febs/views/modules/score/moneyFlowList.html | 12 ++++--------
src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html | 28 ++++++++++++++++++++++++++--
src/main/resources/templates/febs/views/modules/score/goodsUpdate.html | 2 +-
3 files changed, 31 insertions(+), 11 deletions(-)
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html b/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html
index 38b644d..30223e5 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html
@@ -161,6 +161,26 @@
return '<span>购买商品获得积分</span>'
} else if (d.type === 3) {
return '<span>推荐下单获得积分</span>'
+ } else if (d.type === 16) {
+ return '<span>拨付积分</span>'
+ }else{
+ return '<span>-</span>'
+ }
+ }
+ if (d.flowType === 5) {
+ if (d.type === 21) {
+ return '<span>微信支付</span>'
+ } else if (d.type === 22) {
+ return '<span>微信退款</span>'
+ } else{
+ return '<span>-</span>'
+ }
+ }
+ if (d.flowType === 2) {
+ if (d.type === 16) {
+ return '<span>拨付积分</span>'
+ }else{
+ return '<span>-</span>'
}
}
@@ -196,7 +216,7 @@
}else if (d.type === 15) {
return '<span>感恩奖</span>'
}else if (d.type === 16) {
- return '<span>系统拨付</span>'
+ return '<span>拨付余额</span>'
}else if (d.type === 17) {
return '<span>抽奖</span>'
}else if (d.type === 18) {
@@ -210,7 +230,7 @@
}else if (d.type === 22) {
return '<span>微信退款</span>'
}else{
- return ''
+ return '<span>-</span>'
}
}
}, minWidth: 80,align:'center'},
@@ -220,6 +240,10 @@
return '余额';
} else if(d.flowType === 3) {
return '积分'
+ } else if(d.flowType === 2) {
+ return '系统'
+ } else if(d.flowType === 5) {
+ return '微信'
} else {
return '-';
}
diff --git a/src/main/resources/templates/febs/views/modules/score/goodsUpdate.html b/src/main/resources/templates/febs/views/modules/score/goodsUpdate.html
index 153ab2e..d5812c3 100644
--- a/src/main/resources/templates/febs/views/modules/score/goodsUpdate.html
+++ b/src/main/resources/templates/febs/views/modules/score/goodsUpdate.html
@@ -152,7 +152,7 @@
});
const E = window.wangEditor;
- const editor = new E('#toolbar-container', '#text-container'); // 传入两个元素
+ const editor = new E('#toolbar-container', '#editor-container'); // 传入两个元素
editor.config.showLinkImg = false;
editor.config.uploadFileName = 'file';
editor.config.customUploadImg = function (files, insertImgFn) {
diff --git a/src/main/resources/templates/febs/views/modules/score/moneyFlowList.html b/src/main/resources/templates/febs/views/modules/score/moneyFlowList.html
index 4d14b9f..88ea43f 100644
--- a/src/main/resources/templates/febs/views/modules/score/moneyFlowList.html
+++ b/src/main/resources/templates/febs/views/modules/score/moneyFlowList.html
@@ -98,14 +98,10 @@
{field: 'amount', title: '金额', minWidth: 150,align:'left'},
{field: 'type', title: '流水类型',
templet: function (d) {
- if (d.type === 10) {
- return '<span>支付</span>'
- }else if (d.type === 11) {
- return '<span>退款</span>'
- }else if (d.type === 12){
- return '<span>佣金转竞猜积分</span>'
- }else if (d.type === 14){
- return '<span>签到</span>'
+ if (d.type === 2) {
+ return '<span>获得积分</span>'
+ }else{
+ return ''
}
}, minWidth: 80,align:'center'},
{field: 'orderNo', title: '订单编号', minWidth: 150,align:'left'},
--
Gitblit v1.9.1