From 047c292bd6f859ec7361a86e6c521285bf342b3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com> Date: Thu, 12 Oct 2023 10:14:51 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E9=A2=84=E7=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ServiceAppointment.scss | 12 ++++++++--- .../ServiceAppointment/ServiceAppointment.vue | 21 +++++++------------ pagesC/appointmenttime/appointmenttime.vue | 15 ------------- 3 files changed, 17 insertions(+), 31 deletions(-) diff --git a/pagesC/ServiceAppointment/ServiceAppointment.scss b/pagesC/ServiceAppointment/ServiceAppointment.scss index c6f25eb..5b45b0b 100644 --- a/pagesC/ServiceAppointment/ServiceAppointment.scss +++ b/pagesC/ServiceAppointment/ServiceAppointment.scss @@ -74,6 +74,9 @@ .servename { padding: 0 50rpx 0 50rpx; font-size: 28rpx; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; font-family: Source Han Sans CN; font-weight: 400; color: #868585; @@ -95,9 +98,12 @@ } .big { - // padding: 35rpx 50rpx 30rpx 50rpx; - padding: 27rpx 84rpx 29rpx 46rpx; - font-size: 32rpx; + padding: 35rpx 84rpx 24rpx 46rpx; + width: 80%; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + font-size: 28rpx; font-family: Source Han Sans CN; font-weight: 500; color: #000000; diff --git a/pagesC/ServiceAppointment/ServiceAppointment.vue b/pagesC/ServiceAppointment/ServiceAppointment.vue index bd1e5da..34e22ba 100644 --- a/pagesC/ServiceAppointment/ServiceAppointment.vue +++ b/pagesC/ServiceAppointment/ServiceAppointment.vue @@ -41,10 +41,10 @@ identity: '372431196910127051', region: '', listinfo: [], - appointlist:[], - packageNo:'', - formName:'', - formNo:'', + appointlist: [], + packageNo: '', + formName: '', + formNo: '', }; }, @@ -62,7 +62,6 @@ // this.identity=this.userinfo.cardNo this.region = this.userinfo.cityCode; getForm(this.identity, this.region, this.projectName).then(res => { - // console.log(res, '555') this.listinfo = res.data }) }, @@ -72,13 +71,9 @@ }) }, goapponint(item) { - - console.log(item,'56') - uni.navigateTo({ - // url: '/pagesC/appointmenttime/appointmenttime', - url: `/pagesC/appointmenttime/appointmenttime?item=${JSON.stringify(item)}` - }) - // } + uni.navigateTo({ + url: `/pagesC/appointmenttime/appointmenttime?item=${JSON.stringify(item)}` + }) @@ -89,4 +84,4 @@ + \ No newline at end of file diff --git a/pagesC/appointmenttime/appointmenttime.vue b/pagesC/appointmenttime/appointmenttime.vue index 88bff04..abbd95c 100644 --- a/pagesC/appointmenttime/appointmenttime.vue +++ b/pagesC/appointmenttime/appointmenttime.vue @@ -36,19 +36,10 @@ this.userinfo = uni.getStorageSync('userinfo'); // this.listitem.identity=this.userinfo.cardNo this.appointlist = JSON.parse(e.item) - console.log(this.appointlist,'56') - this.listitem = this.appointlist - - // this.single= new Date(); }, methods: { - maskClick(e) { - console.log(e, '55') - }, - change(e) { - // console.log(e) this.listitem.bookingTime = e.result }, todayEndTime() { @@ -59,8 +50,6 @@ return todayTime }, submit() { - - if (this.listitem.sourceType == '1') { this.listitem.packageNo = this.appointlist.packageId this.listitem.formNo = this.appointlist.projectId @@ -72,7 +61,6 @@ this.$delete(this.listitem, 'projectName') console.log(this.listitem, '55') detail(this.listitem).then(res => { - // console.log(res) if (res.code == 200) { this.$refs.uToast.show({ title: '预约成功', @@ -102,9 +90,6 @@ type: 'error' }) } - // console.log(res, '9595') - // this.appointlistinfo = res.data - }) } }, From 3c7384ca75ab29368c22f55e4f7917fd3bff67a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com> Date: Thu, 12 Oct 2023 10:29:09 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E9=A2=84=E7=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 5 +++-- pages/homepage/homepage.vue | 13 +++++-------- pagesC/ServiceAppointment/ServiceAppointment.vue | 4 ++-- pagesC/appointmenttime/appointmenttime.vue | 4 ++-- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/pages.json b/pages.json index a3329b9..b6f9561 100644 --- a/pages.json +++ b/pages.json @@ -9,7 +9,7 @@ "navigationStyle": "custom", "enablePullDownRefresh": false } - },{ + }, { "path": "pages/homepage/homepage", "style": { "enablePullDownRefresh": false, @@ -414,6 +414,7 @@ "enablePullDownRefresh": false } }, + { "path": "Filinginformation/Filinginformation", "style": { @@ -545,4 +546,4 @@ } ] } -} +} \ No newline at end of file diff --git a/pages/homepage/homepage.vue b/pages/homepage/homepage.vue index d3f91a7..67f1ec8 100644 --- a/pages/homepage/homepage.vue +++ b/pages/homepage/homepage.vue @@ -203,14 +203,11 @@ }, // 服务预约 goappoint() { - uni.navigateTo({ - url: '/pagesC/ServiceAppointment/ServiceAppointment' - }) - // if (!this.userinfo && !this.identity) { - // this.gologin(); - // } else { - // this.detailinfo('', '/pagesC/ServiceAppointment/ServiceAppointment') - // } + if (!this.userinfo && !this.identity) { + this.gologin(); + } else { + this.detailinfo('', '/pagesC/ServiceAppointment/ServiceAppointment') + } }, // 服务记录 servicerecord() { diff --git a/pagesC/ServiceAppointment/ServiceAppointment.vue b/pagesC/ServiceAppointment/ServiceAppointment.vue index 34e22ba..1b8ce08 100644 --- a/pagesC/ServiceAppointment/ServiceAppointment.vue +++ b/pagesC/ServiceAppointment/ServiceAppointment.vue @@ -38,7 +38,7 @@ backgroundColor: '#26A888', }, projectName: '', - identity: '372431196910127051', + identity: '', region: '', listinfo: [], appointlist: [], @@ -59,7 +59,7 @@ methods: { getlist() { this.userinfo = uni.getStorageSync('userinfo'); - // this.identity=this.userinfo.cardNo + this.identity=this.userinfo.cardNo this.region = this.userinfo.cityCode; getForm(this.identity, this.region, this.projectName).then(res => { this.listinfo = res.data diff --git a/pagesC/appointmenttime/appointmenttime.vue b/pagesC/appointmenttime/appointmenttime.vue index abbd95c..da182b4 100644 --- a/pagesC/appointmenttime/appointmenttime.vue +++ b/pagesC/appointmenttime/appointmenttime.vue @@ -53,7 +53,7 @@ if (this.listitem.sourceType == '1') { this.listitem.packageNo = this.appointlist.packageId this.listitem.formNo = this.appointlist.projectId - this.listitem.identity='372431196910127051' + this.listitem.identity=this.userinfo.cardNo this.listitem.applyStartTime = this.datetimerange[0] this.listitem.applyEndTime = this.datetimerange[1] this.listitem.formName = this.appointlist.projectName @@ -74,7 +74,7 @@ } }) } else if (this.listitem.sourceType == '2') { - this.listitem.identity='372431196910127051' + this.listitem.identity=this.userinfo.cardNo this.listitem.applyStartTime = this.datetimerange[0] this.listitem.applyEndTime = this.datetimerange[1] console.log(this.listitem, '555')