From a72c26afe0a3814e38c36c5e6affac3a9e9bac86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com> Date: Fri, 21 Apr 2023 18:37:37 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 27 ++-- pages/ServiceDetails/ServiceDetails.scss | 3 +- pages/diagnosis/diagnosis.vue | 169 ----------------------- pages/night/night.vue | 46 +++++- pages/nursestation/nursestation.vue | 2 +- pages/user/user.scss | 0 6 files changed, 60 insertions(+), 187 deletions(-) delete mode 100644 pages/diagnosis/diagnosis.vue delete mode 100644 pages/user/user.scss diff --git a/pages.json b/pages.json index 2f234f8..3b36af7 100644 --- a/pages.json +++ b/pages.json @@ -31,7 +31,7 @@ }, { "path": "pages/medicine/medicine", "style": { - "navigationBarTitleText": "健康咨询", + "navigationBarTitleText": "齐鲁名医", "enablePullDownRefresh": false, "disableScroll": true } @@ -41,6 +41,12 @@ "navigationBarTitleText": "积分", "enablePullDownRefresh": false } + }, { + "path": "pages/confirmation/confirmation", + "style": { + "enablePullDownRefresh": false, + "navigationBarTitleText": "预约时间" + } }, { "path": "pages/CommodityDetails/CommodityDetails", "style": { @@ -51,7 +57,6 @@ "path": "pages/coupon/coupon", "style": { "navigationBarTitleText": "优惠券", - "enablePullDownRefresh": false, "onReachBottomDistance": 40, //距离底部多远时触发 单位为px "enablePullDownRefresh": true //设置参数为true } @@ -226,7 +231,6 @@ "path": "pages/site/site", "style": { "navigationBarTitleText": "护理机构", - "enablePullDownRefresh": false, "onReachBottomDistance": 100, //距离底部多远时触发 单位为px "enablePullDownRefresh": true //设置参数为true } @@ -293,17 +297,14 @@ "navigationBarTitleText": "齐鲁名医", "enablePullDownRefresh": false } + }, { + "path": "pages/night/night", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } } - ,{ - "path" : "pages/night/night", - "style" : - { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - - } - ], + ], "globalStyle": { "navigationBarTextStyle": "black", "navigationBarTitleText": "", diff --git a/pages/ServiceDetails/ServiceDetails.scss b/pages/ServiceDetails/ServiceDetails.scss index 20e1d79..b550c77 100644 --- a/pages/ServiceDetails/ServiceDetails.scss +++ b/pages/ServiceDetails/ServiceDetails.scss @@ -246,7 +246,7 @@ top:10%; width: 65%; .top,.bottom{ - height: 30rpx; + height: 60rpx; view { width: 100%; font-size: 32rpx; @@ -259,7 +259,6 @@ } .bottom { - height: 60rpx; view { font-size: 25rpx; color: #969394; diff --git a/pages/diagnosis/diagnosis.vue b/pages/diagnosis/diagnosis.vue deleted file mode 100644 index 4794935..0000000 --- a/pages/diagnosis/diagnosis.vue +++ /dev/null @@ -1,169 +0,0 @@ - - - - - diff --git a/pages/night/night.vue b/pages/night/night.vue index 1bda5d2..ce36b0b 100644 --- a/pages/night/night.vue +++ b/pages/night/night.vue @@ -14,6 +14,9 @@ 截止目前，平台在网用户已达30余万人，活跃用户4万余人，平台日呼入量近600人次，累计完成紧急援助近6000人次，累计提供各种服务近200万次，居民对服务的满意率达到99%。 2017年11月，公司被山东省质监局、山东省发改委正式授予“山东省服务标准化示范单位”称号。同时，先后多次被中国服务贸易协会授予 “健康养老最佳商业模式机构”、“最具成长型服务企业”、“健康养老品牌服务机构”、“服务贸易创新型企业”等荣誉称号。 + + 立即呼叫 + @@ -28,6 +31,33 @@ return { }; + }, + methods: { + phone() { + var that = this + uni.getSystemInfo({ + success: function(res) { + console.log(res) + if (res.platform == 'ios') { + uni.makePhoneCall({ + phoneNumber: '053196558' //仅为示例 + }); + } else { + uni.showActionSheet({ + itemList: ['呼叫'], + success: function(res) { + if (res.tapIndex + 1 == 1) { + uni.makePhoneCall({ + phoneNumber: '053196558' //仅为示例 + }); + } + }, + fail: function(res) {} + }); + } + } + }); + } } } @@ -36,9 +66,21 @@ .app { padding-top: 10rpx; + .btn { + background-color: #4C7BC9; + text-align: center; + color: #FFFFFF; + width: 70%; + height: 80rpx; + line-height: 80rpx; + margin: 80rpx auto; + text-indent: 0em; + border-radius: 10rpx; + } + .concent { width: 701rpx; - height: 1500rpx; + height: 1700rpx; background: #4C7BC9; box-shadow: 0px 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03); border-radius: 20rpx; @@ -47,7 +89,7 @@ .background { position: relative; width: 657rpx; - height: 1450rpx; + height: 1650rpx; background: #FFFFFF; border-radius: 25rpx; background-color: white; diff --git a/pages/nursestation/nursestation.vue b/pages/nursestation/nursestation.vue index 1d041aa..35675a8 100644 --- a/pages/nursestation/nursestation.vue +++ b/pages/nursestation/nursestation.vue @@ -416,7 +416,7 @@ }); } else { uni.showActionSheet({ - itemList: ['呼叫', ], + itemList: ['呼叫'], success: function(res) { if (res.tapIndex + 1 == 1) { uni.makePhoneCall({ diff --git a/pages/user/user.scss b/pages/user/user.scss deleted file mode 100644 index e69de29..0000000 From e48f9de4bbed9c226769e85897ba645f4f71642b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com> Date: Thu, 27 Apr 2023 14:19:41 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/ServiceDetails/ServiceDetails.js | 8 +++- api/request.js | 1 - pages/CommodityOrder/CommodityOrder.vue | 4 +- .../Nursingstationserviceorder.vue | 4 +- pages/ServiceDetails/ServiceDetails.vue | 23 ++++++++++- pages/lookrate/lookrate.vue | 1 - pages/menttimeorder/menttimeorder.vue | 26 +++++++++++- pages/night/night.vue | 5 +-- pages/orderDetails/orderDetails.scss | 1 - pages/orderDetails/orderDetails.vue | 29 ++++++++++++-- pages/payorderDetails/payorderDetails.vue | 40 +++++++++++++++---- 11 files changed, 114 insertions(+), 28 deletions(-) diff --git a/api/ServiceDetails/ServiceDetails.js b/api/ServiceDetails/ServiceDetails.js index efeb4ec..a704c3d 100644 --- a/api/ServiceDetails/ServiceDetails.js +++ b/api/ServiceDetails/ServiceDetails.js @@ -14,4 +14,10 @@ export function addAppointmentEvaluate(data) { method: 'POST', data }) -} \ No newline at end of file +} +export function handCloseOrder() { + return request({ + url: `/monitor/payTask/handCloseOrder`, + method: 'GET' + }) +} diff --git a/api/request.js b/api/request.js index 063a05c..a387b4c 100644 --- a/api/request.js +++ b/api/request.js @@ -22,7 +22,6 @@ var request = function(config) { let pages = getCurrentPages(); let path = pages[pages.length - 1].$page.fullPath let paths = path.split('?') - console.log(paths) if (paths == '/pages/integral/integral' || paths == '/pages/shopping/shopping' || paths == '/pages/coupon/coupon' || paths == diff --git a/pages/CommodityOrder/CommodityOrder.vue b/pages/CommodityOrder/CommodityOrder.vue index f61ec28..624d18b 100644 --- a/pages/CommodityOrder/CommodityOrder.vue +++ b/pages/CommodityOrder/CommodityOrder.vue @@ -238,7 +238,7 @@ this.orderlist = res.rows // this.orderlist.forEach(e => { // e.timestamp = null - // var time = new Date(e.orderTime).getTime() / 1000 + (60 * 60 * 24) + // var time = new Date(e.orderTime).getTime() / 1000 + (60 * 60 * 2) // var times = new Date().getTime() / 1000 // e.timestamp = time - times // }) @@ -318,7 +318,7 @@ .goodsName).then(res => { res.rows.forEach(e => { // e.timestamp = null - // var time = new Date(e.orderTime).getTime() / 1000 + (60 * 60 * 24) + // var time = new Date(e.orderTime).getTime() / 1000 + (60 * 60 * 2) // var times = new Date().getTime() / 1000 // e.timestamp = time - times this.orderlist.push(e) diff --git a/pages/Nursingstationserviceorder/Nursingstationserviceorder.vue b/pages/Nursingstationserviceorder/Nursingstationserviceorder.vue index daad5b0..0804fe1 100644 --- a/pages/Nursingstationserviceorder/Nursingstationserviceorder.vue +++ b/pages/Nursingstationserviceorder/Nursingstationserviceorder.vue @@ -259,7 +259,7 @@ this.list = res.rows; // this.list.forEach(e => { // e.timestamp = null - // var time = new Date(e.createTime).getTime() / 1000 + (60 * 60 * 24) + // var time = new Date(e.createTime).getTime() / 1000 + (60 * 60 * 2) // var times = new Date().getTime() / 1000 // e.timestamp = time - times // }) @@ -284,7 +284,7 @@ appServiceOrder(this.patientId, this.pageSize, this.pageNum).then(res => { res.rows.forEach(e => { // e.timestamp = null - // var time = new Date(e.createTime).getTime() / 1000 + (60 * 60 * 24) + // var time = new Date(e.createTime).getTime() / 1000 + (60 * 60 * 2) // var times = new Date().getTime() / 1000 // e.timestamp = time - times this.list.push(e) diff --git a/pages/ServiceDetails/ServiceDetails.vue b/pages/ServiceDetails/ServiceDetails.vue index f687b71..510e164 100644 --- a/pages/ServiceDetails/ServiceDetails.vue +++ b/pages/ServiceDetails/ServiceDetails.vue @@ -134,7 +134,8 @@ import baseurl from '@/api/baseurl.js' import { getAppointmentDetailsInfo, - addAppointmentEvaluate + addAppointmentEvaluate, + handCloseOrder } from '@/api/ServiceDetails/ServiceDetails.js' import { lookrate @@ -152,14 +153,19 @@ orderNo: '', timer: null, timestamp: 0, + timecount: 0, lookrateshow: false, //查看评价 ratelist: null, rateimgtitle: { img: null, title: null, }, + Timers: null, } }, + onUnload() { + clearInterval(this.Timers); //清除该函数 + }, onShow() { this.getlist() }, @@ -174,8 +180,19 @@ that.openid = value2 } this.getlist() + this.Timers = setInterval(() => { + this.timecount--; + }, 1000) }, watch: { //监听 + timecount() { + if (this.timecount <= 0) { + clearInterval(this.Timers); //清除该函数 + handCloseOrder().then(res => { + this.list.orderStatus = 'CANCEL' + }) + } + }, rateval() { if (this.rateval == 5) { this.evaluateSatisfaction = 'VERYSATISFIED' @@ -323,9 +340,11 @@ getAppointmentDetailsInfo(this.orderNo).then(res => { this.list = res.data var ordertimes = this.list.createTime.replaceAll(/\-/gi, "/") - var time = new Date(ordertimes).getTime() / 1000 + (60 * 60 * 24) + var time = new Date(ordertimes).getTime() / 1000 + (60 * 60 * 2) var times = new Date().getTime() / 1000 this.timestamp = time - times + this.timecount = this.timestamp + this.timecount = 10 }) }, cancelorderment() { diff --git a/pages/lookrate/lookrate.vue b/pages/lookrate/lookrate.vue index 23fdb15..f98a5b2 100644 --- a/pages/lookrate/lookrate.vue +++ b/pages/lookrate/lookrate.vue @@ -55,7 +55,6 @@ onLoad(options) { this.baseurl = baseurl this.order = JSON.parse(options.item) - console.log(this.order) lookrate(this.order.goOrderNo).then(res => { this.ratelist = res.data }) diff --git a/pages/menttimeorder/menttimeorder.vue b/pages/menttimeorder/menttimeorder.vue index e499724..8bc486e 100644 --- a/pages/menttimeorder/menttimeorder.vue +++ b/pages/menttimeorder/menttimeorder.vue @@ -82,7 +82,8 @@ } from '@/api/appointmenttime/appointmenttime.js' import baseurl from '@/api/baseurl.js' import { - getAppointmentDetailsInfo + getAppointmentDetailsInfo, + handCloseOrder } from '@/api/ServiceDetails/ServiceDetails.js' export default { data() { @@ -93,6 +94,8 @@ list: null, orderNo: '', timestamp: 0, + timecount: undefined, + Timers: null, } }, onShow() { @@ -110,6 +113,23 @@ if (value2) { that.openid = value2 } + this.getlist() + this.Timers = setInterval(() => { + this.timecount--; + }, 1000) + }, + onUnload() { + clearInterval(this.Timers); //清除该函数 + }, + watch: { //监听 + timecount() { + if (this.timecount <= 0) { + clearInterval(this.Timers); //清除该函数 + handCloseOrder().then(res => { + this.list.orderStatus = 'CANCEL' + }) + } + }, }, methods: { //支付 @@ -187,9 +207,11 @@ getAppointmentDetailsInfo(this.orderNo).then(res => { this.list = res.data var ordertimes = this.list.createTime.replaceAll(/\-/gi, "/") - var time = new Date(ordertimes).getTime() / 1000 + (60 * 60 * 24) + var time = new Date(ordertimes).getTime() / 1000 + (60 * 60 * 2) var times = new Date().getTime() / 1000 this.timestamp = time - times + this.timecount = this.timestamp + this.timecount = 10 }) }, } diff --git a/pages/night/night.vue b/pages/night/night.vue index ce36b0b..37a38ae 100644 --- a/pages/night/night.vue +++ b/pages/night/night.vue @@ -28,16 +28,13 @@