diff --git a/pages/CommodityDetails/CommodityDetails.vue b/pages/CommodityDetails/CommodityDetails.vue index 5d16f7b..08ab708 100644 --- a/pages/CommodityDetails/CommodityDetails.vue +++ b/pages/CommodityDetails/CommodityDetails.vue @@ -320,7 +320,11 @@ this.updata.goodsName = this.goodsDetailslist.goodsName this.updata.nurseStationId = this.goodsDetailslist.nurseStationId this.updata.img = res.data[0].goodsPictureUrl - + this.updata.goodsAttributeName = '' + this.updata.goodsPrice = 0 + this.updata.attributeDetailsId = '' + this.updata.goodsStock = 0 + this.updata.img = this.image // res.data[0].goodDetailsLists.forEach(e => { // e.goodAttributeDetailsLists.forEach(el => { // el.isActive = false @@ -350,7 +354,7 @@ onLoad(options) { //获取传值 this.updata.buySource = options.buySource this.goodsPrice = options.goodsPrice //页面价格 - this.goodsDetailsinfo(options.goodsInfoId) + uni.setStorageSync("goodsInfoId", options.goodsInfoId) }, onShow() { this.baseurl = baseurl @@ -367,6 +371,14 @@ } catch (e) { // error } + try { + const value = uni.getStorageSync('goodsInfoId'); + if (value) { + this.goodsDetailsinfo(value) + } else {} + } catch (e) { + // error + } }, } diff --git a/pages/appointmenttime/appointmenttime.scss b/pages/appointmenttime/appointmenttime.scss index 9cc5e33..be2ac6d 100644 --- a/pages/appointmenttime/appointmenttime.scss +++ b/pages/appointmenttime/appointmenttime.scss @@ -73,11 +73,18 @@ height: 96rpx; background: #FFFFFF; border-radius: 20rpx; - margin-top: 2%; - + margin-top: 20rpx; + position: relative; + span{ + display: inline-block; + width: 20%; + } input { - margin-top: -6%; - margin-left: 15%; + position: absolute; + top:50%; + left:23%; + width: 77%; + transform: translateY(-50%); } } .priceback { @@ -158,13 +165,12 @@ font-size: 34rpx; background: #FFFFFF; border-radius: 20rpx; - margin-top: 2%; + margin-top: 20rpx; position: relative; padding-bottom: 40rpx; .detail { width: 301rpx; height: 31rpx; - line-height: 31rpx; font-size: 32rpx; color: #666666; line-height: 31rpx; @@ -180,7 +186,7 @@ font-size: 34rpx; background: #FFFFFF; border-radius: 20rpx; - margin-top:2%; + margin-top:20rpx; position: relative; .detail { line-height: 31rpx; diff --git a/pages/homepage/homepage.vue b/pages/homepage/homepage.vue index d5b8c94..62cea6b 100644 --- a/pages/homepage/homepage.vue +++ b/pages/homepage/homepage.vue @@ -13,19 +13,19 @@ 就医 - + 国家老年病中心 - + 体卫融合 - + 专病管理 @@ -38,6 +38,7 @@ + @@ -47,6 +48,14 @@ return {}; }, methods: { + //暂未开放 + gono() { + this.$refs.uToast.show({ + title: '暂未开放', + type: 'error', + duration: '1000' + }) + }, //跳转护理站页面 gosite() { uni.navigateTo({ @@ -61,9 +70,14 @@ }, //跳转就医页面 gomedicine() { - uni.navigateTo({ - url: '/pages/medicine/medicine' + this.$refs.uToast.show({ + title: '暂未开放', + type: 'error', + duration: '1000' }) + // uni.navigateTo({ + // url: '/pages/medicine/medicine' + // }) }, } } @@ -73,6 +87,7 @@ .app { .cards { padding: 22px 0 20px 0; + .shopping { background: #F58540; } diff --git a/pages/information/information.scss b/pages/information/information.scss index cbfaa20..783ec53 100644 --- a/pages/information/information.scss +++ b/pages/information/information.scss @@ -67,7 +67,7 @@ line-height: 120rpx; border-bottom: 1rpx solid #D8D4D4; position: relative; - view { + .address { position: absolute; left:25%; top:50%; @@ -102,6 +102,7 @@ position: absolute; left:25%; top:50%; + width: 75%; transform: translateY(-50%); } } diff --git a/pages/information/information.vue b/pages/information/information.vue index 40fdb01..f891d00 100644 --- a/pages/information/information.vue +++ b/pages/information/information.vue @@ -17,7 +17,7 @@ 所属区域: - {{address}} + {{address}} 详细地址: @@ -26,7 +26,8 @@ 所在位置: - {{chooseLocation}}11 + + {{chooseLocation}} 所属区域: - {{address}} + {{address}} 详细地址: @@ -28,7 +28,7 @@ 所在位置: - {{chooseLocation}} + {{chooseLocation}} 疾病类型: @@ -76,6 +76,7 @@ nurseTypeIdList: [], diseaseInfoList: [], headPictureUrl: '', + locationName: '', }, patientDiseaseInfoList: [], //获取个人信息 } @@ -92,9 +93,8 @@ this.patientDiseaseInfoList.forEach(e => { e.id = e.diseaseId }) - if (this.appPersonallist.homeLongitude && this.appPersonallist.homeLatitude) { - this.chooseLocation = '东经:' + this.appPersonallist.homeLongitude + ' 北纬:' + this.appPersonallist - .homeLatitude + if (this.appPersonallist.locationName) { + this.chooseLocation = this.appPersonallist.locationName } }, methods: { @@ -185,6 +185,7 @@ var that = this; uni.chooseLocation({ success: function(res) { + that.appPersonallist.locationName = res.address that.chooseLocation = res.name that.appPersonallist.homeLongitude = res.longitude; that.appPersonallist.homeLatitude = res.latitude; diff --git a/pages/paysuccess/paysuccess.vue b/pages/paysuccess/paysuccess.vue index 0b9e425..9bd6414 100644 --- a/pages/paysuccess/paysuccess.vue +++ b/pages/paysuccess/paysuccess.vue @@ -38,7 +38,7 @@