diff --git a/App.vue b/App.vue index 3d0e7aa..a1184b9 100644 --- a/App.vue +++ b/App.vue @@ -1,25 +1,7 @@ diff --git a/pages.json b/pages.json index e65f27a..daf494f 100644 --- a/pages.json +++ b/pages.json @@ -10,6 +10,13 @@ "navigationStyle": "custom" } },{ + "path": "pages/appointmenttime/appointmenttime", + "style": { + "navigationBarTitleText": "预约时间", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#ffffff" //背景颜色 + } + }, { "path": "pages/information/information", "style": { "navigationBarTitleText": "完善个人信息", @@ -184,13 +191,6 @@ "enablePullDownRefresh": false, "navigationBarBackgroundColor": "#ffffff" } - }, { - "path": "pages/appointmenttime/appointmenttime", - "style": { - "navigationBarTitleText": "预约时间", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#ffffff" //背景颜色 - } }, { "path": "pages/InformationFilling/InformationFilling", "style": { diff --git a/pages/Applforrefund/Applforrefund.vue b/pages/Applforrefund/Applforrefund.vue index 3ba5a95..f8f3bae 100644 --- a/pages/Applforrefund/Applforrefund.vue +++ b/pages/Applforrefund/Applforrefund.vue @@ -12,9 +12,9 @@ 退款金额 ￥{{order.godTotalPrice}} - + diff --git a/pages/CommodityOrder/CommodityOrder.scss b/pages/CommodityOrder/CommodityOrder.scss index 45c3a61..6b80e9b 100644 --- a/pages/CommodityOrder/CommodityOrder.scss +++ b/pages/CommodityOrder/CommodityOrder.scss @@ -1,6 +1,21 @@ .app { width: 100%; padding: 3%; + .noorder{ + margin-top: 20%; + image{ + display: block; + margin: 0 auto; + width: 200rpx; + height: 240rpx; + } + view{ + margin-top: 100rpx; + text-align: center; + font-size: 36rpx; + color: #BFBFBF; + } + } .submits { width: 501rpx; height: 71rpx; diff --git a/pages/CommodityOrder/CommodityOrder.vue b/pages/CommodityOrder/CommodityOrder.vue index c32d879..946f94e 100644 --- a/pages/CommodityOrder/CommodityOrder.vue +++ b/pages/CommodityOrder/CommodityOrder.vue @@ -4,45 +4,53 @@ - - 店铺名称 - - 待付款 - 退款中 - 已取消 - 待收货 - 已完成 - 待发货 - 退款成功 - 待退货 - 退款成功 - - - - - - - {{item.goodsName}} - ￥{{item.goodsPrice}} - - - 型号：{{item.goodsAttributeName}} - ×{{item.goodsCount}} - - - 实付款： - ￥{{item.godTotalPrice}} + + + 店铺名称 + + 待付款 + 退款中 + 已取消 + 待收货 + 已完成 + 待发货 + 退款成功 + 待退货 + 退款成功 + + + + + + + {{item.goodsName}} + ￥{{item.goodsPrice}} + + + 型号：{{item.goodsAttributeName}} + ×{{item.goodsCount}} + + + 实付款： + ￥{{item.godTotalPrice}} + - - - 查看物流 + + 查看物流 + + + 去支付 + + 确认收货 - - 去支付 - - 确认收货 + + + + + + 暂无商品订单 diff --git a/pages/Nursingstationserviceorder/Nursingstationserviceorder.scss b/pages/Nursingstationserviceorder/Nursingstationserviceorder.scss index 4ad1f25..018b842 100644 --- a/pages/Nursingstationserviceorder/Nursingstationserviceorder.scss +++ b/pages/Nursingstationserviceorder/Nursingstationserviceorder.scss @@ -1,6 +1,20 @@ .app { padding: 2%; - +.noorder{ + margin-top: 20%; + image{ + display: block; + margin: 0 auto; + width: 200rpx; + height: 240rpx; + } + view{ + margin-top: 100rpx; + text-align: center; + font-size: 36rpx; + color: #BFBFBF; + } + } .item { width: 99%; background: #FFFFFF; diff --git a/pages/Nursingstationserviceorder/Nursingstationserviceorder.vue b/pages/Nursingstationserviceorder/Nursingstationserviceorder.vue index 2855fbd..c918ce3 100644 --- a/pages/Nursingstationserviceorder/Nursingstationserviceorder.vue +++ b/pages/Nursingstationserviceorder/Nursingstationserviceorder.vue @@ -1,38 +1,47 @@ @@ -47,6 +56,7 @@ return { baseurl: '', patientId: null, + total: 0, pageNum: 1, pageSize: 10, list: [], diff --git a/pages/appointmenttime/appointmenttime.scss b/pages/appointmenttime/appointmenttime.scss index be2ac6d..47667d9 100644 --- a/pages/appointmenttime/appointmenttime.scss +++ b/pages/appointmenttime/appointmenttime.scss @@ -2,6 +2,59 @@ 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; @@ -124,27 +177,31 @@ } } .radio-content { - height: 80rpx; - line-height: 2rpx; - font-size: 34rpx; - padding-top: 20rpx; + margin: 50rpx auto; + width: 70%; + text-align: center; + font-size: 28rpx; + position: relative; .agreement { - font-size: 34rpx; + position: absolute; + top:50%; + left:20%; + transform: translateY(-50%); color: #878987; - margin-left: 14%; } .radio-right { - margin-left: 66rpx; - .radio-default { - border: 2rpx solid #0fbda6; - } + height: 100rpx; + .radio { - width: 34rpx; - height: 34rpx; + display: inline-block; + width: 35rpx; + height: 35rpx; border-radius: 70%; border: 2rpx solid #178ffb; - margin: 6px 25px -10px -10px; - + position: absolute; + top:50%; + left:5%; + transform: translateY(-50%); .radio-active { width: 16rpx; height: 16rpx; diff --git a/pages/appointmenttime/appointmenttime.vue b/pages/appointmenttime/appointmenttime.vue index 1888a21..f3dfcd6 100644 --- a/pages/appointmenttime/appointmenttime.vue +++ b/pages/appointmenttime/appointmenttime.vue @@ -42,14 +42,14 @@ 备注： - - + + - 我已阅读并同意 - 《用户协议》 + 我已阅读并同意《用户协议》 ￥{{orderlist.totalPrice}} @@ -58,6 +58,23 @@ + + + + + 护理站上门服务知情同意书 + + + + + + 取消 + + + 确定并同意 + + + diff --git a/pages/appointmenttime/text.vue b/pages/appointmenttime/text.vue new file mode 100644 index 0000000..39a76db --- /dev/null +++ b/pages/appointmenttime/text.vue @@ -0,0 +1,39 @@ + + + + + diff --git a/pages/confirmOrder/confirmOrder.vue b/pages/confirmOrder/confirmOrder.vue index 113dc72..0bf131e 100644 --- a/pages/confirmOrder/confirmOrder.vue +++ b/pages/confirmOrder/confirmOrder.vue @@ -118,19 +118,19 @@ }, methods: { buy() { - addStationGoodsOrder(this.updata).then(res => { - console.log(res) - if (res.code == 500) { - this.$refs.uToast.show({ - title: res.msg, - type: 'error' - }) - } else { - uni.navigateTo({ - url: `/pages/paysuccess/paysuccess` - }) - } - }) + // addStationGoodsOrder(this.updata).then(res => { + // console.log(res) + // if (res.code == 500) { + // this.$refs.uToast.show({ + // title: res.msg, + // type: 'error' + // }) + // } else { + // uni.navigateTo({ + // url: `/pages/paysuccess/paysuccess` + // }) + // } + // }) }, delnumber(e) { this.updata.totalPrice = (e.value * this.updata.goodsPrice).toFixed(2) diff --git a/pages/forgotPassword/forgotPassword.vue b/pages/forgotPassword/forgotPassword.vue index dc814eb..65883de 100644 --- a/pages/forgotPassword/forgotPassword.vue +++ b/pages/forgotPassword/forgotPassword.vue @@ -30,7 +30,7 @@ --> - 登录 + 确定 diff --git a/pages/information/information.vue b/pages/information/information.vue index 0d36b5d..d4e69c5 100644 --- a/pages/information/information.vue +++ b/pages/information/information.vue @@ -27,7 +27,8 @@ 所在位置: - {{chooseLocation}} + {{chooseLocation}} + { - if (res.code == 200) { - this.$refs.uToast.show({ - title: '完善信息成功', - type: 'success', - duration: '1500' - }) - if (this.timer) { - clearTimeout(this.timer) - } - this.timer = setTimeout(e => { - uni.navigateBack({ - delta: 1 - }) - }, 1500) - } else if (res.code == 500) { - this.$refs.uToast.show({ - title: res.msg, - type: 'error', + let that = this + try { + const value = uni.getStorageSync('phone'); + if (value) { + that.query.phone = value + information(that.query).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', + }) + } }) } - }) + } catch (e) {} }, //获取所在位置 getAddress() { var that = this; uni.chooseLocation({ success: function(res) { - that.appPersonallist.locationName = res.name + that.query.locationName = res.name that.chooseLocation = res.name that.query.homeLongitude = res.longitude; that.query.homeLatitude = res.latitude; diff --git a/pages/login/login.vue b/pages/login/login.vue index b7f015c..d208c1f 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -42,6 +42,7 @@ if (res.code == 200) { if (res.data.registerFlag == false) { uni.setStorageSync("patientId", res.data.patientId) + uni.setStorageSync("phone", res.data.phone) // uni.setStorage({ // key: 'patientId', // data: res.data.patientId, diff --git a/pages/orderDetails/orderDetails.vue b/pages/orderDetails/orderDetails.vue index dbaa5bc..267e986 100644 --- a/pages/orderDetails/orderDetails.vue +++ b/pages/orderDetails/orderDetails.vue @@ -47,7 +47,9 @@ - 收货信息：{{order.receiver}},{{order.phone}},{{order.receiveAddress}} + 收货人：{{order.receiver}} + 联系电话：{{order.phone}} + 收货地址：{{order.receiveAddress}} 订单编号：{{order.goOrderNo}} 下单时间：{{order.orderTime}} diff --git a/pages/register/register.scss b/pages/register/register.scss index 7443a0b..691bc44 100644 --- a/pages/register/register.scss +++ b/pages/register/register.scss @@ -1,6 +1,53 @@ .app { height:100vh; padding:20rpx 0; + .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; + } + } .item{ font-size: 34rpx; margin: 0 auto 20rpx; @@ -50,28 +97,31 @@ } } .radio-content { - margin: 0 auto; + margin: 50rpx auto; width: 70%; text-align: center; - padding-top: 50rpx; - height: 80rpx; - line-height: 11rpx; font-size: 28rpx; + position: relative; .agreement { + position: absolute; + top:50%; + left:20%; + transform: translateY(-50%); color: #878987; } .radio-right { - margin-left: 30rpx; - .radio-default { - border: 2rpx solid #0fbda6; - } + height: 100rpx; + .radio { - width: 30rpx; - height: 30rpx; + display: inline-block; + width: 35rpx; + height: 35rpx; border-radius: 70%; border: 2rpx solid #178ffb; - margin: 6px 25px -20rpx -5rpx; - + position: absolute; + top:50%; + left:5%; + transform: translateY(-50%); .radio-active { width: 16rpx; height: 16rpx; diff --git a/pages/register/register.vue b/pages/register/register.vue index 727c3f7..570776e 100644 --- a/pages/register/register.vue +++ b/pages/register/register.vue @@ -35,14 +35,15 @@ {{getCodeText}} --> - - + + - 我已阅读并同意 - 《用户协议》 + 我已阅读并同意《用户协议》 + 注册 @@ -50,6 +51,23 @@ 已有账号,去登录 + + + + + 用户协议与隐私政策 + + + + + + 取消 + + + 确定并同意 + + + @@ -57,7 +75,11 @@ import { appRegister } from '../../api/register/index.js' + import contenttext from './text.vue' export default { + components: { + contenttext + }, data() { return { radio: 1, //用户协议 @@ -69,6 +91,7 @@ getCodeText: '获取验证码', //获取验证码的文字 getCodeBtnColor: "#4C7BC9", //获取验证码的color getCodeisWaiting: false, //判断是否在倒计时中 + maskshow: false, //用户协议 }; }, methods: { @@ -80,6 +103,11 @@ type: 'error', duration: '1500' }) + } else if (this.radio == 1) { + this.$refs.uToast.show({ + title: '请审核并同意用户协议', + type: 'error' + }) } else { appRegister(this.patientName, this.phone, this.password, this.verification).then(res => { console.log(res) @@ -224,6 +252,10 @@ // }); // }, 1000) }, + tapradio() { + this.radio = 2; + this.maskshow = false; + }, changeRadio() { if (this.radio == 1) { this.radio = 2; diff --git a/pages/register/text.vue b/pages/register/text.vue new file mode 100644 index 0000000..8fa9249 --- /dev/null +++ b/pages/register/text.vue @@ -0,0 +1,384 @@ + + + + +