From ea314e42d4cf9534ad09f6d4d37f3d7983845d5d Mon Sep 17 00:00:00 2001 From: GL <954534408@qq.com> Date: Thu, 29 Oct 2020 17:56:41 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=99=9A=E4=B8=8A=E4=B8=8B=E6=8B=89?= =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E9=97=AE=E9=A2=98=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/images/calendar.png | Bin 366 -> 239 bytes .../navigation/accounts/marketingClose.vue | 125 ++++-- src/views/navigation/billing.vue | 112 ++++-- src/views/navigation/commodity.vue | 111 ++++-- src/views/navigation/consume/current.vue | 367 +++++++++++------- .../navigation/consume/memberGathering.vue | 32 +- src/views/navigation/consume/todayConsume.vue | 41 ++ src/views/navigation/details.vue | 37 +- .../integral/integralParticulars.vue | 123 ++++-- .../navigation/integral/memberIntegral.vue | 40 +- src/views/navigation/integral/userMessage.vue | 52 ++- src/views/navigation/ticket/chPhone.vue | 123 ++++-- src/views/navigation/ticket/memberTicket.vue | 68 +++- src/views/navigation/ticket/ticketDetails.vue | 186 +++++---- 14 files changed, 1022 insertions(+), 395 deletions(-) diff --git a/src/assets/images/calendar.png b/src/assets/images/calendar.png index b46345a816b43cb7ca5ebcc6869716593dee61c4..f61c55c2cb840bb9cd69792928546635f05b3673 100644 GIT binary patch delta 212 zcmV;_04x9Q0`CEkBYyz4NklV%mkn-giYp(h|{hQz>_U>syYDZ0gNKDe4Ecvu6O#-ff@l^*M$y5 zxmgaF{muxy1jwj$D>U~N+!9MAn}+al)%9h$ebWFg9SE&TElrlf7~2&T7LPV(qK*yV zjRD-&djqgJK%W6RKpR531N0f71JJMFzW{G_9@eezpYW^BBPUqGUUvp)jchQCC_?-I O0000cwlt2lT5ITSk zk`AB(LIq*u=$MOxk#uAfj#qlsChjQ;5VVB2kOop z0nbYNr4E;+bVM3lP2V4YeN9qWKx!%B*#K`!m`~2jWCK2cSH(#3@x208z*I@rfP5sD zK;CY$mUyp;ludOW;R=|S8U%y|^d9Iv(0icwKyc2O@bDlq8G`^*K#;E({_hXTBi{?; m@m)ROyl+Ou$Fw$fF5nE+Gjkyu84bGt0000
+
+ + 营销结算 +
+
-
-
-
{{ item.orderId }}
-
- {{ setTiem(item.createDate, "YYYY-MM-DD HH:mm:ss") }} + +
+
+
{{ item.orderId }}
+
+ {{ setTiem(item.createDate, "YYYY-MM-DD HH:mm:ss") }} +
-
-
-
- {{ item.sourceStr + " " + item.typeStr }} +
+
+ {{ item.sourceStr + " " + item.typeStr }} +
+
+ {{ `应收:${item.subsidyStr}` }} +
-
- {{ `应收:${item.subsidyStr}` }} +
+ {{ item.statusStr }} +
+
+ {{ item.statusStr }}
-
- {{ item.statusStr }} -
-
- {{ item.statusStr }} -
-
+
+
+
{{ beginDateText }} @@ -124,7 +145,7 @@
-
暂无数据!
+
暂无数据!
总计应收
@@ -164,6 +185,8 @@ Vue.use(DatetimePicker, Popup, Toast); export default { data() { return { + ListLoading: false, + finished: false, navigation: [ { name: "全部", @@ -265,14 +288,24 @@ export default { }; }, methods: { - itiLsitData() {//初始化查询列表参数 - this.pageNum1 = 1; + //下拉加载 + onLoad() { + this.pageNum += 1; + this.getLsit(); + }, + goBack() { + this.$router.go(-1); + }, + itiLsitData() { + //初始化查询列表参数 + this.pageNum = 1; this.pageSize = 10; this.beginDateText = ""; this.endDateText = ""; this.source = ""; this.type = ""; this.status = ""; + this.list = []; }, settleWay(value) { this.status3_index = value; @@ -295,19 +328,22 @@ export default { //第一个参数是时间戳 第二个参数是格式 参考momentJS return moment(Number(temp)).format(format); }, + //点击却换导航 switchover(index) { this.navigationIndex = index; this.list = ""; switch (index) { case 0: this.noData = false; - this.search(); this.beginDateText = ""; this.endDateText = ""; + this.itiLsitData() + this.search(); break; case 1: this.noData = false; this.showTiem = true; + this.itiLsitData() this.beginDateText = "开始时间"; this.endDateText = "结束时间"; break; @@ -316,22 +352,26 @@ export default { this.showTiem = true; this.beginDateText = ""; this.endDateText = ""; + this.itiLsitData() break; case 3: this.noData = false; this.showTiem = true; this.beginDateText = ""; this.endDateText = ""; + this.itiLsitData() break; case 4: this.noData = false; this.showTiem = true; this.beginDateText = ""; this.endDateText = ""; + this.itiLsitData() break; default: - console.log("全部"); + this.itiLsitData() + this.search() break; } }, @@ -346,6 +386,13 @@ export default { console.log(this.endDateText, "结束"); }, getLsit() { + Toast.loading({ + message: "加载中...", + duration: 0, // 持续展示 toast + forbidClick: true, + forbidClick: true, + }); + this.ListLoading = true; this.$http .subsidyList({ method: "get", @@ -362,9 +409,11 @@ export default { .then((res) => { const { code, data, message } = res; if (code == 200) { - if (data.list.length == 0) { + if(this.pageNum==1&&data.list.length==0){ this.noData = true; } + Toast.clear(); + this.ListLoading = false; data.list.map((item) => { item.sourceStr = this.auditWayOptions.filter((e) => e.value == item.source) @@ -379,16 +428,17 @@ export default { : ""; item.statusStr = item.status === 0 ? "未结算" : "已结算"; }); - this.list = data.list; - this.itiLsitData() + + this.list.push(...data.list); + this.finished = data.list.length === 0 ? true : false; } else { + Toast.clear(); Toast(message); - this.itiLsitData() } }) .catch((res) => { + Toast.clear(); Toast(res); - this.itiLsitData() }); }, getTotal() { @@ -431,6 +481,25 @@ export default { /* background: #f6f6f6; */ overflow: hidden; } +.pad{ + margin-top: 2rem; +} +.back-box { + left: 0; + top: 0; + z-index: 1000; + width: 100%; + height: 1.3rem; + line-height: 1.3rem; + background: #52a0fd; + color: #fff; + font-size: 0.43rem; + text-align: center; +} +.back-icon { + float: left; + margin: 0.4rem 0 0 0.1rem; +} .navigation { overflow: hidden; border-bottom: 0.01rem solid #eee; diff --git a/src/views/navigation/billing.vue b/src/views/navigation/billing.vue index dc80c3f..8acb5e4 100644 --- a/src/views/navigation/billing.vue +++ b/src/views/navigation/billing.vue @@ -1,13 +1,22 @@ \ No newline at end of file diff --git a/src/views/navigation/consume/memberGathering.vue b/src/views/navigation/consume/memberGathering.vue index 260ff3d..2ebd0f3 100644 --- a/src/views/navigation/consume/memberGathering.vue +++ b/src/views/navigation/consume/memberGathering.vue @@ -1,5 +1,15 @@