From 33c33ccb3495fed45f71fb977c48c1594db329f7 Mon Sep 17 00:00:00 2001 From: GL <954534408@qq.com> Date: Mon, 16 Nov 2020 16:23:08 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9bug=E3=80=91?= =?UTF-8?q?=E3=80=90=E6=9F=A5=E8=AF=A2=E5=88=B8=E7=A0=81=20=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=E3=80=91=E3=80=90?= =?UTF-8?q?=E6=B6=88=E8=B4=B9=E5=8D=A1=E9=97=AE=E9=A2=98=E3=80=91=E3=80=90?= =?UTF-8?q?=E4=BC=9A=E5=91=98=E7=A7=AF=E5=88=86=E9=97=AE=E9=A2=98=E3=80=91?= =?UTF-8?q?=E3=80=90=E4=BC=9A=E5=91=98=E8=B5=A0=E5=88=B8=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/routers/index.js | 6 + .../navigation/accounts/marketingClose.vue | 15 +- src/views/navigation/buyExplain.vue | 72 +++++ src/views/navigation/commodity.vue | 15 +- src/views/navigation/consume/current.vue | 22 +- src/views/navigation/consume/todayConsume.vue | 253 +++++++++++------- src/views/navigation/integral/userMessage.vue | 5 +- src/views/navigation/ticket/ticketDetails.vue | 13 +- vue.config.js | 1 + 9 files changed, 278 insertions(+), 124 deletions(-) create mode 100644 src/views/navigation/buyExplain.vue diff --git a/src/routers/index.js b/src/routers/index.js index e8ac5f5..895babf 100644 --- a/src/routers/index.js +++ b/src/routers/index.js @@ -15,6 +15,7 @@ import ticketDetails from "@/views/navigation/ticket/ticketDetails" import chPhone from "@/views/navigation/ticket/chPhone" import details from "@/views/navigation/details" import commodity from "@/views/navigation/commodity" +import buyExplain from "@/views/navigation/buyExplain" import accomplish from "@/views/navigation/accomplish" import billing from "@/views/navigation/billing" import todayConsume from "@/views/navigation/consume/todayConsume" @@ -128,6 +129,11 @@ const routes = [ component:memberCancel }, + { + path: '/buyExplain',//购买须知 + name: 'buyExplain', + component:buyExplain + }, { path: '/memberGathering',//消费卡收款 name: 'memberGathering', diff --git a/src/views/navigation/accounts/marketingClose.vue b/src/views/navigation/accounts/marketingClose.vue index 7bc25a3..1bf7ebc 100644 --- a/src/views/navigation/accounts/marketingClose.vue +++ b/src/views/navigation/accounts/marketingClose.vue @@ -92,13 +92,13 @@ >
未结算
已结算
@@ -314,7 +314,7 @@ export default { }, settleType(value) { this.status4_index = value; - this.type = value; + this.status = value; this.search(); }, setSource(value) { @@ -386,6 +386,9 @@ export default { console.log(this.endDateText, "结束"); }, getLsit() { + + console.log("123") + Toast.loading({ message: "加载中...", duration: 0, // 持续展示 toast @@ -403,7 +406,7 @@ export default { enddate: this.endDateText + " 23:59:59", source: this.source, type: this.type, - status: "", + status: this.status, }, }) .then((res) => { @@ -450,7 +453,7 @@ export default { enddate: this.endDateText + " 23:59:59", source: this.source, type: this.type, - status: "", + status: this.status, }, }) .then((res) => { @@ -537,7 +540,7 @@ export default { transform: rotateX(180deg); } .status1_Box { - overflow: scroll; + /* overflow: scroll; */ } .status_1 { position: relative; diff --git a/src/views/navigation/buyExplain.vue b/src/views/navigation/buyExplain.vue new file mode 100644 index 0000000..c9e8d67 --- /dev/null +++ b/src/views/navigation/buyExplain.vue @@ -0,0 +1,72 @@ + + + \ No newline at end of file diff --git a/src/views/navigation/commodity.vue b/src/views/navigation/commodity.vue index 5135f04..87bba70 100644 --- a/src/views/navigation/commodity.vue +++ b/src/views/navigation/commodity.vue @@ -15,18 +15,18 @@
{{ list.title }}
-
{{ `有效期至${createDate}` }}
+
{{ `有效期至${ expiredTime}` }}
领券时间
-
{{ expiredTime }}
+
{{ createDate }}
券码
{{ list.id }}
-
+
活动规则
@@ -81,6 +81,14 @@ export default { }; }, methods: { + goExplain(){ + this.$router.push({ + path:'/buyExplain', + query:{ + text:this.list.remark + } + }) + }, goBack() { this.$router.go(-1); }, @@ -120,6 +128,7 @@ export default { })[0].name; // console.log(temp); // return temp.name + return temp }, }, mounted() { diff --git a/src/views/navigation/consume/current.vue b/src/views/navigation/consume/current.vue index f4dca9f..ce8b856 100644 --- a/src/views/navigation/consume/current.vue +++ b/src/views/navigation/consume/current.vue @@ -65,6 +65,7 @@
{{ `¥${item.deductionAmount / 100}` }}
{{ `实收 ¥${item.realPayment / 100}` }}
+
未到账
@@ -163,8 +164,7 @@ export default { this.getCardPay(); }, //初始化查询表格 - itiSearch(){ - + itiSearch() { this.payMum1(); this.payMum2(); this.payMum3(); @@ -187,15 +187,13 @@ export default { const { code, message, data } = res; if (code == 200) { this.ListLoading = false; - this.finished = data.list.length === 0?true:false; - this.list.push(...data.list) ; + this.finished = data.list.length === 0 ? true : false; + this.list.push(...data.list); } else { - Toast(message); } }) .catch((res) => { - Toast(res); }); }, @@ -393,6 +391,7 @@ export default { color: #999; } .content { + position: relative; background-color: #fff; padding: 0 0.6rem; overflow: hidden; @@ -406,6 +405,17 @@ export default { margin: 0.5rem 5%; border-radius: 0.2rem; } +.noAccount { + line-height: 0.6rem; + position: absolute; + top: 0.65rem; + left: 4rem; + transform: rotate(-30deg); + border: 0.01rem solid #ff6a6a; + border-radius: 0.1rem; + padding: 0.1rem 0.3rem; + color: #ff6a6a; +} .content_left { width: 50%; float: left; diff --git a/src/views/navigation/consume/todayConsume.vue b/src/views/navigation/consume/todayConsume.vue index e6318be..80482c0 100644 --- a/src/views/navigation/consume/todayConsume.vue +++ b/src/views/navigation/consume/todayConsume.vue @@ -1,6 +1,5 @@