diff --git a/src/views/audit/bean/beanAudit.vue b/src/views/audit/bean/beanAudit.vue
index 4d59a62..243953a 100644
--- a/src/views/audit/bean/beanAudit.vue
+++ b/src/views/audit/bean/beanAudit.vue
@@ -206,9 +206,13 @@ const get = async function () {
searchForm.value.createStartTime = ''
searchForm.value.createEndTime = ''
}
- // if (searchForm.value.market === '总部' || searchForm.value.market === '研发部') {
- // searchForm.value.market = '';
- // }
+ if(checkTab.value === 'pending'){
+ sortField.value = 'createTime'
+ sortOrder.value = 'desc'
+ }else{
+ sortField.value = 'auditTime'
+ sortOrder.value = 'desc'
+ }
const params = {
pageNum: pagination.value.pageNum,//页码
pageSize: pagination.value.pageSize,//页面大小
diff --git a/src/views/audit/gold/refundAudit.vue b/src/views/audit/gold/refundAudit.vue
index 3570ad2..d05f654 100644
--- a/src/views/audit/gold/refundAudit.vue
+++ b/src/views/audit/gold/refundAudit.vue
@@ -1,5 +1,5 @@
-
+
精网号:
diff --git a/src/views/consume/bean/addBeanConsume.vue b/src/views/consume/bean/addBeanConsume.vue
index c1ed50c..a235cd4 100644
--- a/src/views/consume/bean/addBeanConsume.vue
+++ b/src/views/consume/bean/addBeanConsume.vue
@@ -223,9 +223,6 @@ const throttledHandleConsumeFormt = _.throttle(handleConsumeForm, 5000, {
-
重置
提交
@@ -233,57 +230,36 @@ const throttledHandleConsumeFormt = _.throttle(handleConsumeForm, 5000, {
-
- 客户信息
+
+ 客户信息
+
+
+
姓名:
+
{{ user.name }}
+
当前付费金豆:
+
{{ Number(user.permanentBean) }}
+
+
+
-
-
-
-
- {{ user.name }}
-
-
-
-
-
- {{ Number(user.permanentBean) }}
-
-
-
-
-
-
+
+
+
精网号:
+
{{ user.jwcode }}
+
当前免费金豆:
+
{{ user.freeBean }}
+
-
-
-
-
- {{ user.jwcode }}
-
-
-
-
- {{ user.freeBean }}
-
-
-
-
-
-
-
-
- {{ user.market }}
-
-
-
-
- {{ user.consumeSum }}
- {{ 0 }}
-
-
-
-
-
+
+
+
所属门店:
+
{{ user.market }}
+
消耗金豆总数:
+
{{ user.consumeSum }}
+
{{ 0 }}
+
+
+
@@ -306,12 +282,14 @@ const throttledHandleConsumeFormt = _.throttle(handleConsumeForm, 5000, {
.right {
flex: 1;
display: flex;
+ margin-left: 10%;
.customer-info {
width: 35vw;
- height:28vh;
- float: right;
+ height: 28vh;
margin-top: 5vh;
+ display: flex;
+ justify-content: center;
}
}
}
diff --git a/src/views/consume/bean/articleVideo.vue b/src/views/consume/bean/articleVideo.vue
index 25062e3..90ae55a 100644
--- a/src/views/consume/bean/articleVideo.vue
+++ b/src/views/consume/bean/articleVideo.vue
@@ -523,7 +523,7 @@ const getTagText = (state) => {
免费金豆数:{{ format3(Math.abs(freeBean)) }}
-
+
{{
diff --git a/src/views/consume/bean/dieHardFan.vue b/src/views/consume/bean/dieHardFan.vue
index 79ebbce..32e980e 100644
--- a/src/views/consume/bean/dieHardFan.vue
+++ b/src/views/consume/bean/dieHardFan.vue
@@ -506,7 +506,7 @@ const getTagText = (state) => {
免费金豆数:{{ format3(Math.abs(freeBean)) }}
-
+
{{
diff --git a/src/views/consume/bean/liveStream.vue b/src/views/consume/bean/liveStream.vue
index 0fa8beb..6062e20 100644
--- a/src/views/consume/bean/liveStream.vue
+++ b/src/views/consume/bean/liveStream.vue
@@ -502,7 +502,7 @@ const getTagText = (state) => {
-
+
精网号:
@@ -556,9 +556,8 @@ const getTagText = (state) => {
付费金豆数:{{ format3(Math.abs(permanentBean)) }}
免费金豆数:{{ format3(Math.abs(freeBean)) }}
-
-
+
{{
diff --git a/src/views/consume/gold/coinConsumeDetail.vue b/src/views/consume/gold/coinConsumeDetail.vue
index c019607..653cceb 100644
--- a/src/views/consume/gold/coinConsumeDetail.vue
+++ b/src/views/consume/gold/coinConsumeDetail.vue
@@ -613,8 +613,8 @@ const getMarket = async function () {
免费金币:{{ format3(Math.abs(freeGolds)) }}
任务金币:{{ format3(Math.abs(taskGolds)) }}
-
-
+
+
{{
diff --git a/src/views/home.vue b/src/views/home.vue
index b64b3a9..03c9a71 100644
--- a/src/views/home.vue
+++ b/src/views/home.vue
@@ -1,13 +1,13 @@
-
-
+
-
+
-

-
+
-
-
-
-
-
-
-
-
+
+
-
-
+
@@ -223,68 +180,50 @@ function logout() {
-
+
\ No newline at end of file
diff --git a/src/views/recharge/bean/addBeanRecharge.vue b/src/views/recharge/bean/addBeanRecharge.vue
index d4023fa..c93f3d9 100644
--- a/src/views/recharge/bean/addBeanRecharge.vue
+++ b/src/views/recharge/bean/addBeanRecharge.vue
@@ -270,7 +270,7 @@ const handleAddForm = async () => {
float: left;
.customer-info {
- width: 30vw;
+ width: 35vw;
height: 28vh;
margin-top: 5vh;
display: flex;
diff --git a/src/views/recharge/bean/beanOnlineRecharge.vue b/src/views/recharge/bean/beanOnlineRecharge.vue
index aaee39c..019857b 100644
--- a/src/views/recharge/bean/beanOnlineRecharge.vue
+++ b/src/views/recharge/bean/beanOnlineRecharge.vue
@@ -391,7 +391,7 @@ onMounted(async function () {
-
+
{{
diff --git a/src/views/recharge/bean/beanSystemRecharge.vue b/src/views/recharge/bean/beanSystemRecharge.vue
index 95d62b7..53e6716 100644
--- a/src/views/recharge/bean/beanSystemRecharge.vue
+++ b/src/views/recharge/bean/beanSystemRecharge.vue
@@ -373,7 +373,7 @@ onMounted(async function () {
免费金豆数:{{ format3(freeBean) }}
-
+
{{
@@ -436,7 +436,6 @@ onMounted(async function () {
\ No newline at end of file
diff --git a/src/views/workspace/index.vue b/src/views/workspace/index.vue
index 447eeb1..e038363 100644
--- a/src/views/workspace/index.vue
+++ b/src/views/workspace/index.vue
@@ -15,7 +15,7 @@
当前金币余量
{{ currentGold / 100
- }} 较前一日
+ }} 较前一日
{{ dailyChange / 100 }}
@@ -123,11 +123,11 @@
-
合计
+
+
合计:{{ sumConsume / 100 }}
永久金币: {{ activeTab === 'recharge' ? sumRechargePermanent / 100 : sumConsumePermanent / 100 }}
免费金币: {{ activeTab === 'recharge' ? sumRechargeFree / 100 : sumConsumeFree / 100 }}
任务金币: {{ activeTab === 'recharge' ? sumRechargeTask / 100 : sumConsumeTask / 100 }}
-
合计 {{ sumConsume / 100 }}
昨天