diff --git a/api/site/site.js b/api/site/site.js index 0b6b740..98c3130 100644 --- a/api/site/site.js +++ b/api/site/site.js @@ -9,3 +9,10 @@ export function nearbyList(pageSize,pageNum,longitude, latitude) { method: 'GET' }) } +//被护理人信息 经纬度 +export function getPatientInfo(id) { + return request({ + url: `/nurseApplet/login/getPatientInfo?patientId=${id}`, + method: 'GET' + }) +} diff --git a/pages/Aftersalesdetails/Aftersalesdetails.scss b/pages/Aftersalesdetails/Aftersalesdetails.scss new file mode 100644 index 0000000..872e6f2 --- /dev/null +++ b/pages/Aftersalesdetails/Aftersalesdetails.scss @@ -0,0 +1,115 @@ +.app { + padding: 3%; + height: 100vh; + font-size: 36rpx; + + //按钮修改申请和撤销申请 + .evaluate { + display: flex; + float: right; + margin-top: 40%; + font-size: 32rpx; + + .cancelorder { + margin-left: 1%; + width: 216rpx; + height: 68rpx; + background: #E1AE3C; + border-radius: 26rpx; + text-align: center; + color: #ffffff; + line-height: 68rpx; + } + } + + .content { + width: 95%; + height: 580rpx; + background: #FFFFFF; + box-shadow: 0px 9px 31px 9px rgba(0, 0, 0, 0.03); + border-radius: 20px; + margin: 10px auto; + + .name { + width: 95%; + height: 90rpx; + font-size: 30rpx; + line-height: 90rpx; + border-bottom: 1rpx solid #D8D4D4; + margin: 0 auto; + } + + .info { + font-size: 32rpx; + margin: 3%; + color: #969394; + line-height: 48rpx; + } + + .details { + width: 95%; + height: 40%; + margin: 0 auto; + border-bottom: 1rpx solid #D8D4D4; + + .detailslist { + display: flex; + + image { + width: 182rpx; + height: 182rpx; + margin: 20rpx 0 0 20rpx; + } + + .model { + width: 70%; + margin: 30rpx 0 0 20rpx; + + span { + font-size: 32rpx; + color: #000000; + } + + span:nth-child(1) { + display: inline-block; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + width: 70%; + } + + span:nth-child(2) { + color: #969394; + float: right; + margin-right: 30rpx; + } + + .bottom { + margin-top: 40rpx; + + .box { + color: #969394; + font-size: 30rpx; + } + } + } + } + } + } + + .elderly { + width: 95%; + height: 96rpx; + line-height: 96rpx; + color: #ffffff; + margin: 0 auto; + background: #4C7BC9; + box-shadow: 0rpx 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03); + border-radius: 20rpx; + + .wait { + margin-left: 3%; + } + + } + } \ No newline at end of file diff --git a/pages/Aftersalesdetails/Aftersalesdetails.vue b/pages/Aftersalesdetails/Aftersalesdetails.vue index 39625fb..eb4ea08 100644 --- a/pages/Aftersalesdetails/Aftersalesdetails.vue +++ b/pages/Aftersalesdetails/Aftersalesdetails.vue @@ -47,7 +47,7 @@ data() { return { baseurl: '', - Aftersalesorder:{}, + Aftersalesorder: {}, patientId: '', //用户id goodsOrderId: '', //订单id orderStatus: '', //状态 不传 @@ -76,7 +76,7 @@ } catch (e) { // error } - + // uni.getStorage({ // key: 'patientId', // success: function(res) { @@ -89,119 +89,5 @@ diff --git a/pages/CommodityDetails/CommodityDetails.vue b/pages/CommodityDetails/CommodityDetails.vue index 802197d..a008084 100644 --- a/pages/CommodityDetails/CommodityDetails.vue +++ b/pages/CommodityDetails/CommodityDetails.vue @@ -22,10 +22,10 @@ 优惠 - + @@ -37,7 +37,7 @@ · 仅工作日发货 - + @@ -132,6 +132,7 @@ data() { return { usershow: false, //完善信息开关 + image: null, //总图片 baseurl: '', //url goodsPrice: '', //页面价格 goodsDetailslist: [], //商品list @@ -246,11 +247,13 @@ this.updata.goodsPrice = 0 this.updata.attributeDetailsId = '' this.updata.goodsStock = 0 + this.updata.img = this.image } else { this.goodDetailsLists.forEach(e => { e.isActive = false }) item.isActive = true + this.updata.img = item.attributePitureUrl this.updata.goodsAttributeName = item.attributeDetailsName this.updata.goodsPrice = item.goodsPrice this.updata.goodsPrice = this.updata.goodsPrice.toFixed(2) @@ -290,25 +293,33 @@ goodsDetailsinfo(goodsInfoId) { goodsDetails(goodsInfoId).then(res => { res.data[0].goodsPictureUrl = this.baseurl + res.data[0].goodsPictureUrl + this.image = res.data[0].goodsPictureUrl + var obj = { + image: res.data[0].goodsPictureUrl, + } + this.info.push(obj) if (res.data[0].goodDetailsLists == null) { this.goodshow = false } else if (res.data[0].goodDetailsLists.length == 0) { this.goodshow = false } else { res.data[0].goodDetailsLists.forEach(e => { + e.attributePitureUrl = this.baseurl + e.attributePitureUrl e.isActive = false + var objs = { + image: e.attributePitureUrl, + } + this.info.push(objs) }) + this.goodDetailsLists = res.data[0].goodDetailsLists this.goodshow = true + console.log(this.goodDetailsLists) } - var obj = { - image: res.data[0].goodsPictureUrl - } - this.info.push(obj) this.goodsDetailslist = res.data[0] this.updata.goodsName = this.goodsDetailslist.goodsName this.updata.nurseStationId = this.goodsDetailslist.nurseStationId this.updata.img = res.data[0].goodsPictureUrl - this.goodDetailsLists = res.data[0].goodDetailsLists + // res.data[0].goodDetailsLists.forEach(e => { // e.goodAttributeDetailsLists.forEach(el => { // el.isActive = false diff --git a/pages/ProductList/ProductList.vue b/pages/ProductList/ProductList.vue index 2b522fa..5ef68ec 100644 --- a/pages/ProductList/ProductList.vue +++ b/pages/ProductList/ProductList.vue @@ -10,7 +10,7 @@ ￥{{item.goodsPrice}} - + diff --git a/pages/ServiceDetails/ServiceDetails.vue b/pages/ServiceDetails/ServiceDetails.vue index 3ab80bf..454d1d5 100644 --- a/pages/ServiceDetails/ServiceDetails.vue +++ b/pages/ServiceDetails/ServiceDetails.vue @@ -44,9 +44,9 @@ 耗材包详情： - ￥{{orderlist.itemConsumableList[0].consumablePrice}} - - ·{{orderlist.itemConsumableList[0].consumableDetail}} + ￥{{orderlist.consumableTotalPrice}} + + ·{{item.consumableDetail}} @@ -94,8 +94,8 @@ this.getlist() this.getPatientInfo() }, - onShow(){ - + onShow() { + }, methods: { gophone() { diff --git a/pages/appointmenttime/appointmenttime.scss b/pages/appointmenttime/appointmenttime.scss index 45f2477..9cc5e33 100644 --- a/pages/appointmenttime/appointmenttime.scss +++ b/pages/appointmenttime/appointmenttime.scss @@ -1,7 +1,7 @@ .app { font-size: 34rpx; padding-top: 10rpx; - height: 100vh; + height: 100%; .addressitem{ width: 97%; border-bottom: 1rpx solid #D8D4D4; diff --git a/pages/appointmenttime/appointmenttime.vue b/pages/appointmenttime/appointmenttime.vue index 52366c8..4419735 100644 --- a/pages/appointmenttime/appointmenttime.vue +++ b/pages/appointmenttime/appointmenttime.vue @@ -153,29 +153,10 @@ .cityName + response.data.regionName + response.data.streetName + response.data.address }) - console.log(that.orderlist) } } catch (e) { // error } - - // uni.getStorage({ - // key: 'patientId', - // success: function(res) { - // that.patientId = res.data - // //被护理人信息 - // getAppPatientList(that.patientId).then(response => { - // that.personInfo = response.data - // that.personInfo.address = response.data.provinceName + response.data - // .cityName + response.data.regionName + response.data.streetName + - // response.data.address - // that.orderlist.patientId = response.data.patientId - // that.orderlist.serviceAddress = response.data.provinceName + response.data - // .cityName + response.data.regionName + response.data.streetName + - // response.data.address - // }) - // } - // }); }, //获取耗材包详情 getPatientInfo(stationId, stationItemId, stationItemPriceId) { diff --git a/pages/medicine/medicine.vue b/pages/medicine/medicine.vue index 013fca7..d58fa87 100644 --- a/pages/medicine/medicine.vue +++ b/pages/medicine/medicine.vue @@ -25,9 +25,9 @@ methods: { // 跳转预约医生界面 godoctorslist() { - uni.navigateTo({ - url: '/pages/doctorslist/doctorslist' - }) + // uni.navigateTo({ + // url: '/pages/doctorslist/doctorslist' + // }) }, }, } diff --git a/pages/nursestation/nursestation.scss b/pages/nursestation/nursestation.scss index c55e366..37394be 100644 --- a/pages/nursestation/nursestation.scss +++ b/pages/nursestation/nursestation.scss @@ -113,6 +113,10 @@ position: absolute; top:10%; left:35%; + width: 60%; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; } .pingfen { float: right; diff --git a/pages/nursestation/nursestation.vue b/pages/nursestation/nursestation.vue index e0544f9..432a3a0 100644 --- a/pages/nursestation/nursestation.vue +++ b/pages/nursestation/nursestation.vue @@ -91,11 +91,11 @@ patientId: '', // usershow: false, //完善信息开关 choicetab: false, //切换 - list: [], //护理站list + list: [], //护理站list servelist: [], //服务项目 productlist: [], //产品 - servetotal:0,//服务项目total - producttotal:0,//产品total + servetotal: 0, //服务项目total + producttotal: 0, //产品total stationid: '', //护理站id nurseStationLabelList: [], //护理站配置 nearbyNursingStationItemList: [], @@ -110,34 +110,34 @@ }, ] } }, - onLoad(options) { + onShow() { this.usershow = false - let that = this - try { - const value = uni.getStorageSync('patientId'); - if (value) { - that.patientId = value - } - } catch (e) { - // error - } - this.nurseStationId = options.nurseStationId this.getInfo() this.serveinfo() this.productinfo() }, + onLoad(options) { + this.nurseStationId = options.nurseStationId + }, methods: { goappointments(item) { - AppIdentification(this.patientId).then(res => { - if (res.data.loginFlag) { - uni.navigateTo({ - url: `/pages/appointmenttime/appointmenttime?stationId=${item.stationId}&stationItemId=${item.stationItemId}&stationItemPriceId=${item.stationItemPriceId}`, + let that = this + try { + const value = uni.getStorageSync('patientId'); + if (value) { + that.patientId = value + AppIdentification(this.patientId).then(res => { + if (res.data.loginFlag) { + uni.navigateTo({ + url: `/pages/appointmenttime/appointmenttime?stationId=${item.stationId}&stationItemId=${item.stationItemId}&stationItemPriceId=${item.stationItemPriceId}`, + }) + this.usershow = false + } else { + this.usershow = true + } }) - this.usershow = false - } else { - this.usershow = true } - }) + } catch (e) {} }, getInfo() { introductionList(this.nurseStationId).then(res => { @@ -154,7 +154,7 @@ e.itemPictureUrl = baseurl + e.itemPictureUrl }) this.servelist = res.rows - this.servetotal=res.total + this.servetotal = res.total }) }, productinfo() { @@ -163,7 +163,7 @@ e.goodsPictureUrl = baseurl + e.goodsPictureUrl }) this.productlist = res.rows - this.producttotal=res.total + this.producttotal = res.total }) }, testTabClick(index) { @@ -234,7 +234,7 @@ }) }) } - + } }, diff --git a/pages/shopping/shopping.vue b/pages/shopping/shopping.vue index efaaab3..f30c0a9 100644 --- a/pages/shopping/shopping.vue +++ b/pages/shopping/shopping.vue @@ -3,12 +3,12 @@ - + {{item.goodsCategoryName}} - + @@ -25,6 +25,19 @@ pageSize: 10, //列 total: 0, //list总长度 goodsCategoryList: [], //商品列表list + listimg: [{ + img: '../../static/sp.png', + }, + { + img: '../../static/yyss.png', + }, + { + img: '../../static/znsb.png', + }, + { + img: '../../static/cp.png', + }, + ], listcolor: ['#00C176', '#D43953', '#E1AE3C', '#4C7BC9', '#00C176', '#D43953', '#E1AE3C', '#4C7BC9'], //颜色随动 }; }, diff --git a/pages/site/site.scss b/pages/site/site.scss index 6b6028e..a714b66 100644 --- a/pages/site/site.scss +++ b/pages/site/site.scss @@ -31,7 +31,7 @@ position: relative; .nurse { - font-size: 30rpx; + font-size: 28rpx; position: absolute; top: 15%; left: 35%; @@ -39,9 +39,9 @@ .distance { position: absolute; - top: 40%; - font-size: 28rpx; - margin-left: 35%; + bottom: 20%; + font-size: 24rpx; + left: 35%; color: #666666; } @@ -77,15 +77,16 @@ } .understand { + font-size: 28rpx; color: #ffffff; - width: 170rpx; - height: 70rpx; - line-height: 70rpx; + width: 160rpx; + height: 60rpx; + line-height: 60rpx; text-align: center; background-color: #4C7BC9; position: absolute; bottom: 10%; - right: 5%; + right: 1%; border-radius: 35rpx; } } @@ -98,7 +99,7 @@ opacity: 0.9; top: 0; z-index: 999; - + background-color: #f0f0f0; .mask { width: 72%; height: 348rpx; diff --git a/pages/site/site.vue b/pages/site/site.vue index d468e84..61ec906 100644 --- a/pages/site/site.vue +++ b/pages/site/site.vue @@ -38,7 +38,8 @@