From 66c4ed2b7908ff58f6a5c3c3add69941c614cab0 Mon Sep 17 00:00:00 2001 From: liuye Date: Thu, 12 Jan 2023 13:42:18 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E9=97=AE=E7=AD=94=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- project/fengdu/app/AppLearning/components/List.vue | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/project/fengdu/app/AppLearning/components/List.vue b/project/fengdu/app/AppLearning/components/List.vue index 9339278f..a63efde4 100644 --- a/project/fengdu/app/AppLearning/components/List.vue +++ b/project/fengdu/app/AppLearning/components/List.vue @@ -72,9 +72,7 @@ export default { }; }, created() { - this.dict.load("twoNewOrgCompanyCategory", "twoNewOrgConcernDegree").then(() => { - this.getList() - }) + this.getList() }, methods: { getListInit() { From 4cd0fa249c208a5f647737e4a39e2da2fecb5d93 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Mon, 16 Jan 2023 13:56:50 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E9=83=AB=E9=83=BD=E7=BD=91=E6=A0=BC?= =?UTF-8?q?=E5=91=98=E7=A7=AF=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/gridScoreDetail.vue | 14 ++++++-------- .../components/gridScoreStatistics.vue | 10 ++++++++-- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/project/pidu/app/AppGridMemberScore/components/gridScoreDetail.vue b/project/pidu/app/AppGridMemberScore/components/gridScoreDetail.vue index 6e9f23d3..512075e0 100644 --- a/project/pidu/app/AppGridMemberScore/components/gridScoreDetail.vue +++ b/project/pidu/app/AppGridMemberScore/components/gridScoreDetail.vue @@ -49,25 +49,23 @@ - diff --git a/project/pidu/app/AppGridMemberScore/components/gridScoreStatistics.vue b/project/pidu/app/AppGridMemberScore/components/gridScoreStatistics.vue index add41884..297f285d 100644 --- a/project/pidu/app/AppGridMemberScore/components/gridScoreStatistics.vue +++ b/project/pidu/app/AppGridMemberScore/components/gridScoreStatistics.vue @@ -79,13 +79,19 @@ From 00ee02ccb9910af7f681d9e0e1f4877787ce274c Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Mon, 16 Jan 2023 14:06:57 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E7=A7=AF=E5=88=86=E6=AD=A3=E8=B4=9F?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/AppGridMemberScore/components/gridScoreDetail.vue | 6 +++--- .../AppGridMemberScore/components/gridScoreStatistics.vue | 7 +++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/project/pidu/app/AppGridMemberScore/components/gridScoreDetail.vue b/project/pidu/app/AppGridMemberScore/components/gridScoreDetail.vue index 512075e0..3753b260 100644 --- a/project/pidu/app/AppGridMemberScore/components/gridScoreDetail.vue +++ b/project/pidu/app/AppGridMemberScore/components/gridScoreDetail.vue @@ -51,8 +51,8 @@ @@ -61,7 +61,7 @@ 积分调整 积分消费 积分申请 - {{ row.eventType }} + {{ row.eventType }} diff --git a/project/pidu/app/AppGridMemberScore/components/gridScoreStatistics.vue b/project/pidu/app/AppGridMemberScore/components/gridScoreStatistics.vue index 297f285d..c6df3fd0 100644 --- a/project/pidu/app/AppGridMemberScore/components/gridScoreStatistics.vue +++ b/project/pidu/app/AppGridMemberScore/components/gridScoreStatistics.vue @@ -79,18 +79,17 @@ From 9793ac502f350426d41f66a325cbb39b38dc0a6c Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Mon, 16 Jan 2023 14:14:15 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E7=A7=AF=E5=88=86=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pidu/app/AppGridMemberScore/components/gridScoreDetail.vue | 2 +- .../app/AppGridMemberScore/components/gridScoreStatistics.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/project/pidu/app/AppGridMemberScore/components/gridScoreDetail.vue b/project/pidu/app/AppGridMemberScore/components/gridScoreDetail.vue index 3753b260..bc08dbcc 100644 --- a/project/pidu/app/AppGridMemberScore/components/gridScoreDetail.vue +++ b/project/pidu/app/AppGridMemberScore/components/gridScoreDetail.vue @@ -61,7 +61,7 @@ 积分调整 积分消费 积分申请 - {{ row.eventType }} + 系统规则 diff --git a/project/pidu/app/AppGridMemberScore/components/gridScoreStatistics.vue b/project/pidu/app/AppGridMemberScore/components/gridScoreStatistics.vue index c6df3fd0..57d491bc 100644 --- a/project/pidu/app/AppGridMemberScore/components/gridScoreStatistics.vue +++ b/project/pidu/app/AppGridMemberScore/components/gridScoreStatistics.vue @@ -82,7 +82,7 @@ 积分调整 积分消费 积分申请 - {{ row.eventType }} + 系统规则 From 38bc07f0fd01d981402fd148921789f1b85e88da Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Mon, 16 Jan 2023 14:17:24 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=81=A2=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pidu/app/AppGridMemberScore/components/gridScoreDetail.vue | 2 +- .../app/AppGridMemberScore/components/gridScoreStatistics.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/project/pidu/app/AppGridMemberScore/components/gridScoreDetail.vue b/project/pidu/app/AppGridMemberScore/components/gridScoreDetail.vue index bc08dbcc..3753b260 100644 --- a/project/pidu/app/AppGridMemberScore/components/gridScoreDetail.vue +++ b/project/pidu/app/AppGridMemberScore/components/gridScoreDetail.vue @@ -61,7 +61,7 @@ 积分调整 积分消费 积分申请 - 系统规则 + {{ row.eventType }} diff --git a/project/pidu/app/AppGridMemberScore/components/gridScoreStatistics.vue b/project/pidu/app/AppGridMemberScore/components/gridScoreStatistics.vue index 57d491bc..c6df3fd0 100644 --- a/project/pidu/app/AppGridMemberScore/components/gridScoreStatistics.vue +++ b/project/pidu/app/AppGridMemberScore/components/gridScoreStatistics.vue @@ -82,7 +82,7 @@ 积分调整 积分消费 积分申请 - 系统规则 + {{ row.eventType }} From ce36a373eb4ca86fd6e92ca87b052393d73917c9 Mon Sep 17 00:00:00 2001 From: liuye Date: Tue, 17 Jan 2023 09:57:43 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=AD=A6=E4=B9=A0=E9=97=AE=E7=AD=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- project/fengdu/app/AppLearning/components/List.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project/fengdu/app/AppLearning/components/List.vue b/project/fengdu/app/AppLearning/components/List.vue index a63efde4..95d6ae49 100644 --- a/project/fengdu/app/AppLearning/components/List.vue +++ b/project/fengdu/app/AppLearning/components/List.vue @@ -16,7 +16,7 @@ size="small" placeholder="请输入问题/提问人员" clearable - v-throttle="() => {search.current = 1, getList()}" + v-throttle="() => {getListInit()}" @clear="search.content = '', getListInit()" suffix-icon="iconfont iconSearch"> @@ -82,7 +82,7 @@ export default { getList() { this.search.startTime = '' this.search.endTime = '' - if(this.time.length) { + if(this.time && this.time.length) { this.search.startTime = this.time[0] this.search.endTime = this.time[1] }