diff --git a/App.vue b/App.vue index a1184b9..dffde2d 100644 --- a/App.vue +++ b/App.vue @@ -19,7 +19,7 @@ height: 100%; // position: relative; color: #000000; - padding: 30rpx 0 0 0; + padding: 30rpx 0 150rpx 0; .cards { width: 94%; diff --git a/api/ProjectDetails/index.js b/api/ProjectDetails/index.js new file mode 100644 index 0000000..bf08060 --- /dev/null +++ b/api/ProjectDetails/index.js @@ -0,0 +1,8 @@ +import request from "../request.js" + +export function getAppStationItemInfo(stationId, stationItemId, stationItemPriceId) { + return request({ + url: `/nurseApp/login/getAppStationItemInfo?stationId=${stationId}&stationItemId=${stationItemId}&stationItemPriceId=${stationItemPriceId}`, + method: 'GET' + }) +} diff --git a/manifest.json b/manifest.json index 3f7f71d..c9e76ad 100644 --- a/manifest.json +++ b/manifest.json @@ -18,8 +18,8 @@ }, /* 模块配置 */ "modules" : { - "Geolocation" : {}, - "Maps" : {} + "Maps" : {}, + "Geolocation" : {} }, /* 应用发布信息 */ "distribute" : { @@ -32,6 +32,7 @@ "", "", "", + "", "", "", "", @@ -49,22 +50,21 @@ ] }, /* ios打包配置 */ - "ios" : {}, + "ios" : { + "dSYMs" : false + }, /* SDK配置 */ "sdkConfigs" : { "maps" : { "amap" : { - "appkey_ios" : "", + "appkey_ios" : "b38c6aa0cb9a6323f48b05ea6462aed5", "appkey_android" : "b38c6aa0cb9a6323f48b05ea6462aed5" } }, "geolocation" : { - "system" : { - "__platform__" : [ "android" ] - }, "amap" : { - "__platform__" : [ "android" ], - "appkey_ios" : "", + "__platform__" : [ "ios", "android" ], + "appkey_ios" : "b38c6aa0cb9a6323f48b05ea6462aed5", "appkey_android" : "b38c6aa0cb9a6323f48b05ea6462aed5" } }, @@ -75,10 +75,11 @@ "appid" : "", "UniversalLinks" : "" } - } + }, + "ad" : {} }, "splashscreen" : { - "androidStyle" : "default", + "androidStyle" : "common", "android" : { "xxhdpi" : "static/xxhdpi.png", "hdpi" : "static/hdpi.png", diff --git a/pages.json b/pages.json index 01e1afd..563a64b 100644 --- a/pages.json +++ b/pages.json @@ -9,6 +9,37 @@ "navigationBarTitleText": "", "navigationStyle": "custom" } + }, { + "path": "pages/ProjectDetails/ProjectDetails", + "style": { + "navigationBarTitleText": "护理项目详情", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#ffffff" //背景颜色 + } + + }, + { + "path": "pages/Bodysatelliteintegration/Bodysatelliteintegration", + "style": { + "navigationBarTitleText": "体卫融合", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#ffffff" //背景颜色 + } + }, { + "path": "pages/Geriatricdisease/Geriatricdisease", + "style": { + "navigationBarTitleText": "老年病中心", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#ffffff" + } + + }, { + "path": "pages/diseasemanagement/diseasemanagement", + "style": { + "navigationBarTitleText": "专病管理", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#ffffff" + } }, { "path": "pages/goodsorderRate/goodsorderRate", "style": { diff --git a/pages/Applforrefund/Applforrefund.vue b/pages/Applforrefund/Applforrefund.vue index f8f3bae..a84bb91 100644 --- a/pages/Applforrefund/Applforrefund.vue +++ b/pages/Applforrefund/Applforrefund.vue @@ -10,10 +10,10 @@ 退款金额 - ￥{{order.godTotalPrice}} + ￥{{order.totalPrice}} diff --git a/pages/Bodysatelliteintegration/Bodysatelliteintegration.vue b/pages/Bodysatelliteintegration/Bodysatelliteintegration.vue new file mode 100644 index 0000000..5fc337b --- /dev/null +++ b/pages/Bodysatelliteintegration/Bodysatelliteintegration.vue @@ -0,0 +1,72 @@ + + + + + diff --git a/pages/CommodityOrder/CommodityOrder.vue b/pages/CommodityOrder/CommodityOrder.vue index 96de110..5f1c640 100644 --- a/pages/CommodityOrder/CommodityOrder.vue +++ b/pages/CommodityOrder/CommodityOrder.vue @@ -33,7 +33,7 @@ 实付款： - ￥{{item.godTotalPrice}} + ￥{{item.totalPrice}} diff --git a/pages/Geriatricdisease/Geriatricdisease.vue b/pages/Geriatricdisease/Geriatricdisease.vue new file mode 100644 index 0000000..d3624ef --- /dev/null +++ b/pages/Geriatricdisease/Geriatricdisease.vue @@ -0,0 +1,77 @@ + + + + + diff --git a/pages/Nursingstationserviceorder/Nursingstationserviceorder.vue b/pages/Nursingstationserviceorder/Nursingstationserviceorder.vue index a8b4726..c27ee48 100644 --- a/pages/Nursingstationserviceorder/Nursingstationserviceorder.vue +++ b/pages/Nursingstationserviceorder/Nursingstationserviceorder.vue @@ -8,7 +8,7 @@ {{item.orderStatus=='PAY'?'已付款':''}} {{item.orderStatus=='WAIT_DISPATCH'?'待服务':''}} {{item.orderStatus=='NOT_FINISH'?'待完成':''}} - {{item.orderStatus=='COMPLETE'?'未评价':''}} + {{item.orderStatus=='COMPLETE'?'待评价':''}} {{item.orderStatus=='EVALUATED'?'服务完成':''}} {{item.orderStatus=='WAIT_REFUND'?'退款中':''}} {{item.orderStatus=='REFUNDED'?'已退款':''}} diff --git a/pages/ProjectDetails/ProjectDetails.scss b/pages/ProjectDetails/ProjectDetails.scss new file mode 100644 index 0000000..f2ad8a6 --- /dev/null +++ b/pages/ProjectDetails/ProjectDetails.scss @@ -0,0 +1,171 @@ + .app { + height: 100%; + padding: 2% 2% 150rpx 2%; + padding-top: 10rpx; + font-size: 34rpx; + .mask { + .information { + width: 70%; + height: 400rpx; + margin: 50% auto; + background: #FFFFFF; + border-radius: 30rpx; + text-align: center; + color: #FFFFFF; + position: relative; + + .determine, + .cancel { + width: 200rpx; + height: 70rpx; + border-radius: 26rpx; + font-size: 34rpx; + line-height: 70rpx; + position: absolute; + top: 74%; + } + + .determine { + background: #4C7BC9; + right: 36rpx; + } + + .cancel { + background: #C5BFBF; + left: 36rpx; + } + + .title { + font-size: 42rpx; + margin-top: 40rpx; + color: #000000; + } + + image { + width: 100rpx; + height: 100rpx; + margin: 10% 0 0 0; + } + } + } + .appointment { + width: 120rpx; + height: 70rpx; + background: #4C7BC9; + border-radius: 26rpx; + color: #ffffff; + text-align: center; + line-height: 70rpx; + position: absolute; + bottom:20rpx; + right:5%; + } + .detail { + position: relative; + width: 94%; + height: 100%; + margin: 0 auto; + background: #FFFFFF; + border-radius: 20rpx; + margin-top: 3%; + font-size: 31rpx; + padding: 3%; + padding-bottom: 50rpx; + .textInfo { + word-break:break-all; + font-size: 29rpx; + text-indent: 2rem; + line-height: 42rpx; + color: #666666; + padding-top: 30rpx; + /deep/ .richPic { + width: 100% !important; + height: 100% !important; + } + } + .Introduction { + font-size: 31rpx; + color: #333333; + line-height: 12rpx; + margin-left: -3%; + padding: 3%; + } + } + .item { + width: 95%; + height: 100%; + background: #FFFFFF; + box-shadow: 0px 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03); + border-radius: 20rpx; + margin: 20rpx auto 0; + padding: 3% 3% 40rpx 3%; + line-height: 60rpx; + position: relative; + + image { + width: 170rpx; + height: 170rpx; + margin-left: 3%; + } + + .servicetime { + color: #999999; + line-height: 37rpx; + font-size: 30rpx; + position: absolute; + top: 35%; + left: 35%; + } + + .price { + color: red; + font-size: 32rpx; + position: absolute; + top: 65%; + left: 35%; + } + + .product { + color: #000000; + width: 60%; + position: absolute; + top: 14%; + left: 32%; + font-size: 28rpx; + } + + .huanyao { + color: #000000; + position: absolute; + top: 10%; + left: 35%; + width: 60%; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } + } + + /* 耗材包 */ + .Consumablespackage { + width: 95%; + height: 100%; + background: #FFFFFF; + box-shadow: 0px 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03); + border-radius: 20rpx; + margin: 20rpx auto 0; + padding: 3% 3% 40rpx 3%; + line-height: 60rpx; + font-size: 32rpx; + + .detail { + font-size: 30rpx; + color: #000000; + } + + span { + color: red; + float: right; + } + } + } \ No newline at end of file diff --git a/pages/ProjectDetails/ProjectDetails.vue b/pages/ProjectDetails/ProjectDetails.vue new file mode 100644 index 0000000..1519212 --- /dev/null +++ b/pages/ProjectDetails/ProjectDetails.vue @@ -0,0 +1,160 @@ + + + + diff --git a/pages/appointmenttime/appointmenttime.scss b/pages/appointmenttime/appointmenttime.scss index 43ae696..ea5525c 100644 --- a/pages/appointmenttime/appointmenttime.scss +++ b/pages/appointmenttime/appointmenttime.scss @@ -1,86 +1,95 @@ .app { - font-size: 34rpx; - padding-top: 10rpx; - height: 100%; - .mask{ - .Agreement{ - width: 100%; - background-color: #F4F5F7; - text-align: center; - height: 1000rpx; - position: absolute; - width:94%; - left:3%; - top:5%; - font-size: 30rpx; - .title{ - height: 100rpx; - line-height: 100rpx; - border-bottom: 1px solid #eeeeee; - font-size: 34rpx; - margin: 0px auto; - width: 100%; - text-align: center; - } - .scroll-Y{ - width: 98%; - margin: 0 auto; - height:830rpx ; - overflow-y:scroll; - text-align: left; - text-indent: 2em; - } - .cancel { - height:70rpx; - line-height: 70rpx; - font-size: 32rpx; - background-color: #F4F5F7; - position: absolute; - border-top: 1rpx solid #000000; - bottom:0; - right:0; - width: 50%; - color: #000000; - } - .determine { - height:70rpx; - line-height: 70rpx; - font-size: 32rpx; - width: 50%; - color: #F4F5F7; - background: #4C7BC9; - position: absolute; - bottom:0; - left:0; - } - } - } - .addressitem{ - width: 97%; - border-bottom: 1rpx solid #D8D4D4; - margin-left: 3%; + font-size: 34rpx; + padding-top: 10rpx; height: 100%; - .leftaddress{ - width:15%; + + .mask { + .Agreement { + width: 100%; + background-color: #F4F5F7; + text-align: center; + height: 1000rpx; + position: absolute; + top: 5%; + width: 94%; + left: 3%; + font-size: 30rpx; + + .title { + height: 100rpx; + line-height: 100rpx; + border-bottom: 1px solid #eeeeee; + font-size: 34rpx; + margin: 0px auto; + width: 100%; + text-align: center; + } + + .scroll-Y { + width: 98%; + margin: 0 auto; + height: 830rpx; + overflow-y: scroll; + text-align: left; + text-indent: 2em; + } + + .cancel { + height: 70rpx; + line-height: 70rpx; + font-size: 32rpx; + background-color: #F4F5F7; + position: absolute; + border-top: 1rpx solid #000000; + bottom: 0; + right: 0; + width: 50%; + color: #000000; + } + + .determine { + height: 70rpx; + line-height: 70rpx; + font-size: 32rpx; + width: 50%; + color: #F4F5F7; + background: #4C7BC9; + position: absolute; + bottom: 0; + left: 0; + } + } + } + + .addressitem { + width: 97%; + border-bottom: 1rpx solid #D8D4D4; + margin-left: 3%; height: 100%; - display: flex; - display: inline-block; + + .leftaddress { + width: 15%; + height: 100%; + display: flex; + display: inline-block; + } + + .addition { + color: #666666; + display: inline-block; + line-height: 50rpx; + font-size: 28rpx; + } } - .addition{ - color: #666666; - display: inline-block; - line-height: 50rpx; - font-size: 28rpx; - } - } .money { font-size: 32rpx; color: #D43953; position: absolute; - right:5%; - top:20%; + right: 5%; + top: 20%; } + .user { background: #FFFFFF; width: 94%; @@ -88,35 +97,46 @@ box-shadow: 0rpx 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03); border-radius: 20rpx; line-height: 93rpx; + .selecttime { height: 93rpx; margin-left: 3%; + position: relative; + text { font-size: 34rpx; color: #878987; } + image { width: 18rpx; height: 27rpx; - margin-left:50%; + position: absolute; + right: 5%; + top: 50%; + transform: translateY(-50%); } - .addition{ + + .addition { color: #666666; line-height: 30rpx; font-size: 28rpx; } } + .item { width: 97%; border-bottom: 1rpx solid #D8D4D4; margin-left: 3%; - .addition{ + + .addition { color: #666666; line-height: 30rpx; font-size: 28rpx; } } } + .remarks { width: 94%; height: 382rpx; @@ -128,32 +148,37 @@ border-radius: 20rpx; margin-top: 20rpx; position: relative; - span{ + + span { display: inline-block; width: 20%; } + input { position: absolute; - top:50%; - left:23%; + top: 50%; + left: 23%; width: 77%; transform: translateY(-50%); } } + .priceback { width: 99%; background: #FFFFFF; height: 100rpx; - position:fixed; - bottom:0; + position: fixed; + bottom: 0; padding-bottom: 20rpx; display: flex; justify-content: space-around; + .prices { font-size: 48rpx; color: #D43953; line-height: 100rpx; } + .xiugai { width: 200rpx; height: 70rpx; @@ -165,6 +190,7 @@ text-align: center; color: #ffffff; } + .queren { width: 200rpx; height: 70rpx; @@ -176,22 +202,26 @@ color: #ffffff; } } + .radio-content { margin: 50rpx auto; width: 70%; text-align: center; font-size: 28rpx; position: relative; + .agreement { position: absolute; - top:50%; - left:20%; + top: 50%; + left: 20%; transform: translateY(-50%); color: #878987; - } + } + .radio-right { height: 100rpx; width: 100rpx; + .radio { display: inline-block; width: 35rpx; @@ -199,21 +229,25 @@ border-radius: 70%; border: 2rpx solid #178ffb; position: absolute; - top:50%; - left:5%; + top: 50%; + left: 5%; transform: translateY(-50%); + .radio-active { width: 16rpx; height: 16rpx; border-radius: 50%; background-color: #178ffb; - margin-left: 26%; - margin-top: 22%; + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); // margin: 0 auto; } } } } + /* 耗材包 */ .Consumablespackage { width: 94%; @@ -225,15 +259,14 @@ margin-top: 20rpx; position: relative; padding-bottom: 40rpx; + .detail { - width: 301rpx; - height: 31rpx; - font-size: 32rpx; - color: #666666; - line-height: 31rpx; + width: 100%; + line-height: 60rpx; margin: 20rpx 0 0 40rpx; } } + /* 套餐 */ .Package { width: 94%; @@ -243,18 +276,20 @@ font-size: 34rpx; background: #FFFFFF; border-radius: 20rpx; - margin-top:20rpx; + margin-top: 20rpx; position: relative; + .detail { line-height: 31rpx; font-size: 32rpx; color: #666666; line-height: 31rpx; position: absolute; - left:10%; - top:60%; + left: 10%; + top: 60%; } } + .message { width: 94%; background: white; @@ -263,4 +298,4 @@ text-align: center; line-height: 96rpx; } - } + } \ No newline at end of file diff --git a/pages/appointmenttime/appointmenttime.vue b/pages/appointmenttime/appointmenttime.vue index f3dfcd6..3bee7d0 100644 --- a/pages/appointmenttime/appointmenttime.vue +++ b/pages/appointmenttime/appointmenttime.vue @@ -14,9 +14,20 @@ 地址： {{personInfo.address}} + + + 请您选择希望护理员到达的时间区间 + + + 日期： + 请选择日期 + + + {{yeartime}} + 时间： - 请选择时间 + 请选择时间区间 {{usertime}} @@ -34,15 +45,21 @@ 耗材包详情： ￥{{orderlist.consumableTotalPrice}} - - ·{{item.consumableDetail}} + + + + {{item.consumableDetail}} + + 备注： - + @@ -57,7 +74,9 @@ 确认预约 - + + + @@ -94,15 +113,26 @@ data() { return { timeparams: { //picker组件所需 - year: true, - month: true, - day: true, + year: false, + month: false, + day: false, hour: true, endhour: true, minute: true, endminute: true, }, timeshow: false, //时间开关 + usertime: '', //页面展示时间 + yearparams: { //picker组件所需 + year: true, + month: true, + day: true, + hour: false, + minute: false, + second: false + }, + yearshow: false, //时间开关 + yeartime: '', //页面展示时间 maskshow: false, //用户协议开关 radio: 1, //用户协议 personInfo: [], //用户信息 @@ -178,9 +208,13 @@ }, //获取耗材包详情 getPatientInfo(stationId, stationItemId, stationItemPriceId) { - let that = this; getAppStationItemInfo(stationId, stationItemId, stationItemPriceId).then(res => { if (res.code == 200) { + if (res.data.itemConsumableList) { + res.data.itemConsumableList.forEach(e => { + e.radio = true + }) + } this.orderlist = res.data } }) @@ -196,7 +230,12 @@ this.orderlist.orderChannel = "MOBILE_APP" this.orderlist.buySource = "NURSE_STATION" this.orderlist.orderCount = 1; - this.orderlist.orderConsumableList = this.orderlist.itemConsumableList + this.orderlist.orderConsumableList = [] + this.orderlist.itemConsumableList.forEach(e => { + if (e.radio) { + this.orderlist.orderConsumableList.push(e) + } + }) // submitAppointment(this.orderlist).then(res => { // if (res.code == 500) { // this.$refs.uToast.show({ @@ -221,14 +260,21 @@ this.radio = 1; } }, + // 选中任一checkbox时，由checkbox-group触发 + checkboxGroupChange(e) {}, + // 全选 + checkedAll() {}, //获取时间 timeconfirm(e) { - this.orderlist.serviceDate = e.year + '-' + e.month + '-' + e.day this.orderlist.serviceStartTime = e.hour + ":" + e.minute + this.usertime = e.hour + ":" + e.minute + '--' + e.endhour + ":" + e.endminute this.orderlist.serviceEndTime = e.endhour + ":" + e.endminute - this.usertime = e.year + '年' + e.month + '月' + e.day + '日' + e.hour + ":" + e.minute + '至' + e.endhour + - ":" + e.endminute - console.log(this.orderlist, this.usertime) + this.orderlist.patientId = this.personInfo.patientId + this.orderlist.serviceAddress = this.personInfo.address + }, + yeartimeconfirm(e) { + this.orderlist.serviceDate = e.year + '-' + e.month + '-' + e.day + this.yeartime = e.year + '年' + e.month + '月' + e.day + "日" }, goaddress() { uni.navigateTo({ diff --git a/pages/confirmOrder/confirmOrder.vue b/pages/confirmOrder/confirmOrder.vue index 0bf131e..0c41456 100644 --- a/pages/confirmOrder/confirmOrder.vue +++ b/pages/confirmOrder/confirmOrder.vue @@ -119,7 +119,6 @@ methods: { buy() { // addStationGoodsOrder(this.updata).then(res => { - // console.log(res) // if (res.code == 500) { // this.$refs.uToast.show({ // title: res.msg, diff --git a/pages/diseasemanagement/diseasemanagement.vue b/pages/diseasemanagement/diseasemanagement.vue new file mode 100644 index 0000000..4998e22 --- /dev/null +++ b/pages/diseasemanagement/diseasemanagement.vue @@ -0,0 +1,72 @@ + + + + + diff --git a/pages/homepage/homepage.vue b/pages/homepage/homepage.vue index 62cea6b..e513662 100644 --- a/pages/homepage/homepage.vue +++ b/pages/homepage/homepage.vue @@ -13,19 +13,19 @@ 就医 - + 国家老年病中心 - + 体卫融合 - + 专病管理 @@ -48,12 +48,28 @@ return {}; }, methods: { - //暂未开放 - gono() { - this.$refs.uToast.show({ - title: '暂未开放', - type: 'error', - duration: '1000' + //专病管理 + godiseasemanagement() { + uni.navigateTo({ + url: '/pages/diseasemanagement/diseasemanagement' + }) + }, + //老年病中心 + goGeriatricdisease() { + uni.navigateTo({ + url: '/pages/Geriatricdisease/Geriatricdisease' + }) + }, + //体卫融合 + goBodysatelliteintegration() { + uni.navigateTo({ + url: "/pages/Bodysatelliteintegration/Bodysatelliteintegration" + }) + }, + //跳转就医页面 + gomedicine() { + uni.navigateTo({ + url: '/pages/medicine/medicine' }) }, //跳转护理站页面 @@ -68,17 +84,6 @@ url: '/pages/shopping/shopping' }) }, - //跳转就医页面 - gomedicine() { - this.$refs.uToast.show({ - title: '暂未开放', - type: 'error', - duration: '1000' - }) - // uni.navigateTo({ - // url: '/pages/medicine/medicine' - // }) - }, } } diff --git a/pages/information/information.scss b/pages/information/information.scss index 783ec53..f4e3270 100644 --- a/pages/information/information.scss +++ b/pages/information/information.scss @@ -1,6 +1,104 @@ .app { padding:0; height:100vh; + .btn{ + width:28%; + float: right; + background-color: #2979ff; + height: 80rpx; + line-height: 80rpx; + border-radius: 20rpx; + color: #FFFFFF; + text-align: center; + font-size: 38rpx; + margin-right: 30rpx; + } + .Agreement{ + width: 100%; + background-color: #F4F5F7; + text-align: center; + height: 1000rpx; + position: absolute; + top:5%; + font-size: 30rpx; + .title{ + height: 100rpx; + line-height: 100rpx; + border-bottom: 1px solid #eeeeee; + font-size: 34rpx; + margin: 0px auto; + width: 100%; + text-align: center; + } + .scroll-Y{ + height:830rpx ; + overflow-y:scroll; + text-align: left; + text-indent: 2em; + } + .cancel { + height:70rpx; + line-height: 70rpx; + font-size: 32rpx; + background-color: #F4F5F7; + position: absolute; + border-top: 1rpx solid #000000; + bottom:0; + right:0; + width: 50%; + color: #000000; + } + .determine { + height:70rpx; + line-height: 70rpx; + font-size: 32rpx; + width: 50%; + color: #F4F5F7; + background: #4C7BC9; + position: absolute; + bottom:0; + left:0; + } + } + .radio-content { + margin: 50rpx auto; + width: 70%; + text-align: center; + font-size: 28rpx; + position: relative; + .agreement { + position: absolute; + top:50%; + left:20%; + transform: translateY(-50%); + color: #878987; + } + .radio-right { + height: 100rpx; + + .radio { + display: inline-block; + width: 35rpx; + height: 35rpx; + border-radius: 70%; + border: 2rpx solid #178ffb; + position: absolute; + top:50%; + left:5%; + transform: translateY(-50%); + .radio-active { + width: 16rpx; + height: 16rpx; + border-radius: 50%; + background-color: #178ffb; + position: absolute; + top:50%; + left:50%; + transform: translate(-50%,-50%); + } + } + } + } .service { width: 90%; margin: 0 auto; diff --git a/pages/information/information.vue b/pages/information/information.vue index d4e69c5..184b74f 100644 --- a/pages/information/information.vue +++ b/pages/information/information.vue @@ -50,9 +50,37 @@ - 提交 - + + + + + + + 我已阅读并同意《用户协议》 + + + + 提交 + + + + + + 用户协议与隐私政策 + + + + + + 取消 + + + 确定并同意 + + + @@ -63,15 +91,21 @@ getNurseType, information } from '@/api/information/index.js' + import contenttext from './text.vue' export default { + components: { + contenttext + }, data() { return { + radio: 1, timer: null, arealist: [], //区街道list areashow: false, //经纬度开关 getNurseTypelist: [], //护理类型数组 medicalcarelist: [], //医疗护理数组 address: '', //页面所属区域 + maskshow: false, //用户协议 chooseLocation: '', query: { //信息请求数组 patientName: "", @@ -172,6 +206,17 @@ url: `/pages/disease/disease?diseaseInfoList=${JSON.stringify(this.query.diseaseInfoList)}` }) }, + changeRadio() { + if (this.radio == 1) { + this.radio = 2; + } else { + this.radio = 1; + } + }, + tapradio() { + this.radio = 2; + this.maskshow = false; + }, }, onUnload() { // 页面卸载时设置插件选点数据为null，防止再次进入页面，geLocation返回的是上次选点结果 diff --git a/pages/information/text.vue b/pages/information/text.vue new file mode 100644 index 0000000..8fa9249 --- /dev/null +++ b/pages/information/text.vue @@ -0,0 +1,384 @@ + + + + + diff --git a/pages/medicine/medicine.vue b/pages/medicine/medicine.vue index 39e324f..479ac41 100644 --- a/pages/medicine/medicine.vue +++ b/pages/medicine/medicine.vue @@ -1,6 +1,6 @@ @@ -45,5 +62,46 @@ } } } + + + .concent { + width: 701rpx; + height: 100%; + background: #4C7BC9; + box-shadow: 0px 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03); + border-radius: 20rpx; + margin: 5% auto 20px; + padding: 30rpx 0; + + .background { + position: relative; + width: 657rpx; + height: 100%; + background: #FFFFFF; + border-radius: 25rpx; + background-color: white; + margin: 0 auto; + + image { + width: 178rpx; + height: 84rpx; + background: #FFFFFF; + border-radius: 25px; + margin-left: 68%; + margin-top: 5%; + } + } + } + + .detailed { + width: 657rpx; + height: 100%; + padding: 0 42rpx 20rpx; + line-height: 56rpx; + } + + .detailed view { + text-indent: 2em; + } } diff --git a/pages/modify/modify.scss b/pages/modify/modify.scss index e959c8e..2a493bc 100644 --- a/pages/modify/modify.scss +++ b/pages/modify/modify.scss @@ -3,6 +3,92 @@ background-color: #F4F5F7; width: 100%; color: #000000; + .Agreement{ + width: 100%; + background-color: #F4F5F7; + text-align: center; + height: 1000rpx; + position: absolute; + top:5%; + font-size: 30rpx; + .title{ + height: 100rpx; + line-height: 100rpx; + border-bottom: 1px solid #eeeeee; + font-size: 34rpx; + margin: 0px auto; + width: 100%; + text-align: center; + } + .scroll-Y{ + height:830rpx ; + overflow-y:scroll; + text-align: left; + text-indent: 2em; + } + .cancel { + height:70rpx; + line-height: 70rpx; + font-size: 32rpx; + background-color: #F4F5F7; + position: absolute; + border-top: 1rpx solid #000000; + bottom:0; + right:0; + width: 50%; + color: #000000; + } + .determine { + height:70rpx; + line-height: 70rpx; + font-size: 32rpx; + width: 50%; + color: #F4F5F7; + background: #4C7BC9; + position: absolute; + bottom:0; + left:0; + } + } + .radio-content { + margin: 50rpx auto; + width: 70%; + text-align: center; + font-size: 28rpx; + position: relative; + .agreement { + position: absolute; + top:50%; + left:20%; + transform: translateY(-50%); + color: #878987; + } + .radio-right { + height: 100rpx; + + .radio { + display: inline-block; + width: 35rpx; + height: 35rpx; + border-radius: 70%; + border: 2rpx solid #178ffb; + position: absolute; + top:50%; + left:5%; + transform: translateY(-50%); + .radio-active { + width: 16rpx; + height: 16rpx; + border-radius: 50%; + background-color: #178ffb; + position: absolute; + top:50%; + left:50%; + transform: translate(-50%,-50%); + } + } + } + } .finish{ width: 25%; height: 68rpx; diff --git a/pages/modify/modify.vue b/pages/modify/modify.vue index 3319d8e..a5027f9 100644 --- a/pages/modify/modify.vue +++ b/pages/modify/modify.vue @@ -8,7 +8,8 @@ 姓名: - + 身份证号: - + 所属区域: @@ -26,9 +28,10 @@ 详细地址: - + 所在位置: - {{chooseLocation}} + + {{chooseLocation}} 疾病类型: @@ -38,11 +41,38 @@ + + + + + + + 我已阅读并同意《用户协议》 + + 完成 + + + + + 用户协议与隐私政策 + + + + + + 取消 + + + 确定并同意 + + + @@ -53,15 +83,21 @@ import { information } from '@/api/information/index.js' + import contenttext from '../information/text.vue' import baseurl from '@/api/baseurl.js' export default { + components: { + contenttext + }, data() { return { - timer:null, + radio: 1, + timer: null, baseurl: '', address: '', arealist: [], areashow: false, + maskshow:false,//用户协议 chooseLocation: '', img: null, image: null, @@ -102,68 +138,76 @@ informationinfo() { //上传图片 var that = this - if (this.image) { - uni.uploadFile({ - url: baseurl + '/nurseApplet/uploadFile/uploadHeadPictureUrl', - filePath: that.appPersonallist.headPictureUrl, - name: 'file', - formData: { - 'patientId': that.appPersonallist.patientId - }, - timeout: 5000, - success(res) { - that.appPersonallist.headPictureUrl = JSON.parse(res.data).imgUrl - that.appPersonallist.diseaseInfoList = that.patientDiseaseInfoList - information(that.appPersonallist).then(res => { - if (res.code == 200) { - that.$refs.uToast.show({ - title: '修改信息成功', - type: 'success', - duration: '1500' - }) - if (that.timer) { - clearTimeout(that.timer) - } - that.timer = setTimeout(e => { - uni.navigateBack({ - delta: 1 - }) - }, 1500) - } else if (res.code == 500) { - that.$refs.uToast.show({ - title: res.msg, - type: 'error', - url: '' - }) - } - }) - } + var that = this + if (that.radio == 1) { + that.$refs.uToast.show({ + title: '请审核并同意用户协议', + type: 'error' }) } else { - that.appPersonallist.diseaseInfoList = that.patientDiseaseInfoList - information(that.appPersonallist).then(res => { - if (res.code == 200) { - that.$refs.uToast.show({ - title: '修改信息成功', - type: 'success', - duration: '1500' - }) - if (that.timer) { - clearTimeout(that.timer) - } - that.timer = setTimeout(e => { - uni.navigateBack({ - delta: 1 + if (this.image) { + uni.uploadFile({ + url: baseurl + '/nurseApplet/uploadFile/uploadHeadPictureUrl', + filePath: that.appPersonallist.headPictureUrl, + name: 'file', + formData: { + 'patientId': that.appPersonallist.patientId + }, + timeout: 5000, + success(res) { + that.appPersonallist.headPictureUrl = JSON.parse(res.data).imgUrl + that.appPersonallist.diseaseInfoList = that.patientDiseaseInfoList + information(that.appPersonallist).then(res => { + if (res.code == 200) { + that.$refs.uToast.show({ + title: '修改信息成功', + type: 'success', + duration: '1500' + }) + if (that.timer) { + clearTimeout(that.timer) + } + that.timer = setTimeout(e => { + uni.navigateBack({ + delta: 1 + }) + }, 1500) + } else if (res.code == 500) { + that.$refs.uToast.show({ + title: res.msg, + type: 'error', + url: '' + }) + } }) - }, 1500) - } else if (res.code == 500) { - that.$refs.uToast.show({ - title: res.msg, - type: 'error', - url: '' - }) - } - }) + } + }) + } else { + that.appPersonallist.diseaseInfoList = that.patientDiseaseInfoList + information(that.appPersonallist).then(res => { + if (res.code == 200) { + that.$refs.uToast.show({ + title: '修改信息成功', + type: 'success', + duration: '1500' + }) + if (that.timer) { + clearTimeout(that.timer) + } + that.timer = setTimeout(e => { + uni.navigateBack({ + delta: 1 + }) + }, 1500) + } else if (res.code == 500) { + that.$refs.uToast.show({ + title: res.msg, + type: 'error', + url: '' + }) + } + }) + } } }, //上传头像 @@ -179,6 +223,17 @@ } }) }, + tapradio() { + this.radio = 2; + this.maskshow = false; + }, + changeRadio() { + if (this.radio == 1) { + this.radio = 2; + } else { + this.radio = 1; + } + }, //获取所在位置 getAddress() { var that = this; diff --git a/pages/modifyAddress/modifyAddress.vue b/pages/modifyAddress/modifyAddress.vue index a8bb1e4..4f4ba5c 100644 --- a/pages/modifyAddress/modifyAddress.vue +++ b/pages/modifyAddress/modifyAddress.vue @@ -22,7 +22,7 @@ - 添加收货地址 + 添加地址 @@ -185,7 +185,7 @@ }, // 修改按钮 updataxg(item) { - this.shipAddress = '修改收货地址' + this.shipAddress = '修改地址' this.isedit = false nursingStationGoodsinfo(item.id).then(res => { this.infolist = res.data diff --git a/pages/nursestation/nursestation.scss b/pages/nursestation/nursestation.scss index 78c2e03..e42f783 100644 --- a/pages/nursestation/nursestation.scss +++ b/pages/nursestation/nursestation.scss @@ -208,6 +208,10 @@ line-height: 42rpx; color: #666666; padding-top: 30rpx; + /deep/ .richPic { + width: 100% !important; + height: 100% !important; + } } .Introduction { font-size: 31rpx; diff --git a/pages/nursestation/nursestation.vue b/pages/nursestation/nursestation.vue index a4c091b..25976ed 100644 --- a/pages/nursestation/nursestation.vue +++ b/pages/nursestation/nursestation.vue @@ -19,8 +19,7 @@ 机构简介 - - {{list.agencyIntroduce}} + @@ -159,6 +158,7 @@ getInfo() { introductionList(this.nurseStationId).then(res => { res.data.stationIntroducePcitureUrl = baseurl + res.data.stationIntroducePcitureUrl + res.data.agencyIntroduce = res.data.agencyIntroduce.replace(/\ 实付款 - ￥{{order.godTotalPrice}} + ￥{{order.totalPrice}} diff --git a/pages/payorderDetails/payorderDetails.vue b/pages/payorderDetails/payorderDetails.vue new file mode 100644 index 0000000..10e3657 --- /dev/null +++ b/pages/payorderDetails/payorderDetails.vue @@ -0,0 +1,180 @@ + + + + diff --git a/pages/picker/picker.vue b/pages/picker/picker.vue index 6dfd384..591b840 100644 --- a/pages/picker/picker.vue +++ b/pages/picker/picker.vue @@ -197,7 +197,7 @@ // 顶部标题 title: { type: String, - default: '预约时间' + default: '预约时间区间' }, // 取消按钮的文字 cancelText: { @@ -331,7 +331,7 @@ this.day = time.getDate(); this.hour = time.getHours(); this.minute = time.getMinutes(); - this.endhour = time.getHours()+1; + this.endhour = time.getHours(); this.endminute = time.getMinutes(); // this.second = time.getSeconds(); }, @@ -427,7 +427,6 @@ // 用户更改picker的列选项 change(e) { this.valueArr = e.detail.value; - console.log(this.valueArr) let i = 0; if (this.mode == 'time') { // 这里使用i++，是因为this.valueArr数组的长度是不确定长度的，它根据this.params的值来配置长度 @@ -437,8 +436,8 @@ if (this.params.day) this.day = this.days[this.valueArr[i++]]; if (this.params.hour) this.hour = this.hours[this.valueArr[i++]]; if (this.params.minute) this.minute = this.minutes[this.valueArr[i++]]; - if (this.params.endhour) this.endhour = this.hours[this.valueArr[6]] - if (this.params.endminute) this.endminute = this.endminutes[this.valueArr[7]]; + if (this.params.endhour) this.endhour = this.hours[this.valueArr[3]] + if (this.params.endminute) this.endminute = this.endminutes[this.valueArr[4]]; // if (this.params.second) this.second = this.seconds[this.valueArr[i++]]; } }, diff --git a/pages/register/register.scss b/pages/register/register.scss index 37ad9a7..05a6c36 100644 --- a/pages/register/register.scss +++ b/pages/register/register.scss @@ -128,9 +128,10 @@ height: 16rpx; border-radius: 50%; background-color: #178ffb; - margin-left: 26%; - margin-top: 22%; - // margin: 0 auto; + position: absolute; + top:50%; + left:50%; + transform: translate(-50%,-50%); } } } diff --git a/pages/shopping/shopping.vue b/pages/shopping/shopping.vue index f30c0a9..f7e3216 100644 --- a/pages/shopping/shopping.vue +++ b/pages/shopping/shopping.vue @@ -3,8 +3,9 @@ - - + + {{item.goodsCategoryName}} @@ -38,7 +39,9 @@ img: '../../static/cp.png', }, ], - listcolor: ['#00C176', '#D43953', '#E1AE3C', '#4C7BC9', '#00C176', '#D43953', '#E1AE3C', '#4C7BC9'], //颜色随动 + listcolor: ['#00C176', '#D43953', '#E1AE3C', '#4C7BC9', '#9e4dd0', '#00C176', '#D43953', '#E1AE3C', + '#4C7BC9', '#9e4dd0', + ], //颜色随动 }; }, onLoad(options) { //初始化加载 @@ -56,9 +59,10 @@ goodsCategory() { goodsCategoryList(this.pageSize, this.pageNum).then(res => { res.rows.forEach(e => { - e.goodsCatrgoryPicture = baseurl + e.goodsCatrgoryPicture + e.goodsCategoryPicture = baseurl + e.goodsCategoryPicture this.goodsCategoryList.push(e) }) + console.log(this.goodsCategoryList) this.total = res.total }) } @@ -73,7 +77,7 @@ this.pageNum = 1; goodsCategoryList(this.pageSize, this.pageNum).then(res => { res.rows.forEach(e => { - e.goodsCatrgoryPicture = baseurl + e.goodsCatrgoryPicture + e.goodsCategoryPicture = baseurl + e.goodsCategoryPicture }) this.goodsCategoryList = res.rows this.total = res.total diff --git a/pages/site/site.vue b/pages/site/site.vue index 02482b4..893e28c 100644 --- a/pages/site/site.vue +++ b/pages/site/site.vue @@ -12,7 +12,7 @@ {{item.nurseStationName}} - 距离您{{item.distance}}米 + 距离您{{item.distance}}KM 点击了解 @@ -63,12 +63,13 @@ }, methods: { getlocation() { + var that = this uni.getLocation({ type: 'wgs84', success: res => { - this.latitude = res.latitude - this.longitude = res.longitude - this.markers.push({ + that.latitude = res.latitude + that.longitude = res.longitude + that.markers.push({ id: 3, latitude: res.latitude, longitude: res.longitude, @@ -76,7 +77,7 @@ height: 25, iconPath: "../../static/locatinsmall.png" }) - this.requestinfo(); + that.requestinfo(); }, fail: error => { uni.showModal({ diff --git a/pages/user/user.vue b/pages/user/user.vue index 3dfdcba..8a8f025 100644 --- a/pages/user/user.vue +++ b/pages/user/user.vue @@ -132,7 +132,7 @@ that.removeS(); } else if (res.cancel) { that.$refs.uToast.show({ - title: '退出账号失败', + title: '取消退出账号', type: 'error', duration: '1000' }) @@ -196,14 +196,19 @@ uni.removeStorageSync('patientId'); uni.removeStorageSync('phone'); uni.removeStorageSync('password'); + that.$refs.uToast.show({ + title: '退出账号成功', + type: 'success', + duration: '1000' + }) if (that.timer) { clearTimeout(that.timer) } that.timer = setTimeout(e => { - uni.reLaunch({ - url: '/pages/login/login' + uni.navigateBack({ + delta: 1 }) - }, 1500) + }, 1000) }, updatainfo() { uni.navigateTo({