diff --git a/pages/CommodityDetails/CommodityDetails.vue b/pages/CommodityDetails/CommodityDetails.vue index ac3e5d0..2076e1d 100644 --- a/pages/CommodityDetails/CommodityDetails.vue +++ b/pages/CommodityDetails/CommodityDetails.vue @@ -43,7 +43,9 @@ 图文服务 - + + + @@ -294,6 +296,8 @@ // 查询商品详细信息 goodsDetailsinfo(goodsInfoId) { goodsDetails(goodsInfoId).then(res => { + res.data[0].goodsRemark = res.data[0].goodsRemark.replace(/\ ￥{{list.consumableTotalPrice==null?'0':list.consumableTotalPrice}} ·{{item.consumableDetail}} + {{item.consumableCount}}{{item.consumableUnit}}/￥{{item.consumablePrice}} - + 服务详情: @@ -144,9 +145,7 @@ getlist(stationId, stationItemId, stationItemPriceId) { getAppStationItemInfo(stationId, stationItemId, stationItemPriceId).then(res => { res.data.nurseItemContent = res.data.nurseItemContent.replace(/\ ￥{{list.consumableTotalPrice}} ·{{item.orderConsumableName}} + @@ -99,7 +100,7 @@ list: {}, orderNo: '', patientId: '', //id - timer:null, + timer: null, } }, onLoad(options) { diff --git a/pages/appointmenttime/appointmenttime.scss b/pages/appointmenttime/appointmenttime.scss index ea5525c..7fd686e 100644 --- a/pages/appointmenttime/appointmenttime.scss +++ b/pages/appointmenttime/appointmenttime.scss @@ -1,4 +1,5 @@ -.app { + + .app { font-size: 34rpx; padding-top: 10rpx; height: 100%; @@ -87,7 +88,7 @@ color: #D43953; position: absolute; right: 5%; - top: 20%; + top: 15%; } .user { @@ -248,11 +249,15 @@ } } + .Consumablespackage .money { + top: 8%; + } + /* 耗材包 */ .Consumablespackage { width: 94%; margin: 10rpx auto; - padding: 3%; + padding: 3% 0 3% 3%; font-size: 34rpx; background: #FFFFFF; border-radius: 20rpx; @@ -262,8 +267,25 @@ .detail { width: 100%; - line-height: 60rpx; - margin: 20rpx 0 0 40rpx; + line-height: 100rpx; + + // padding: 20rpx 0 0 40rpx; + /deep/ .u-checkbox { + margin: 40rpx 0 0; + position: relative; + } + + span { + width: 100%; + display: inline-block; + font-size: 30rpx; + color: #D43953; + text-align: right; + position: absolute; + right: 5%; + top: 50%; + transform: translateY(-50%); + } } } @@ -272,7 +294,7 @@ width: 94%; height: 150rpx; margin: 10rpx auto; - padding: 3%; + padding: 3% 0 3% 3%; font-size: 34rpx; background: #FFFFFF; border-radius: 20rpx; diff --git a/pages/appointmenttime/appointmenttime.vue b/pages/appointmenttime/appointmenttime.vue index 3bee7d0..cb4a039 100644 --- a/pages/appointmenttime/appointmenttime.vue +++ b/pages/appointmenttime/appointmenttime.vue @@ -47,10 +47,11 @@ ￥{{orderlist.consumableTotalPrice}} - - {{item.consumableDetail}} + {{item.consumableDetail}} + {{item.consumableCount}}{{item.consumableUnit}}/￥{{item.consumablePrice}} @@ -183,6 +184,73 @@ this.getPatientInfo(options.stationId, options.stationItemId, options.stationItemPriceId) }, methods: { + checkboxChange(e) { + if (e.radio) { + this.orderlist.totalPrice = this.argSubtr(this.orderlist.totalPrice, e.consumablePrice) + } else { + this.orderlist.totalPrice = this.argAdd(this.orderlist.totalPrice, e.consumablePrice) + } + }, + argAdd(arg1, arg2) { + // 加法函数 + var _this = this, + r1 = 0, + r2 = 0, + m = 0; + try { + r1 = arg1.toString().split(".")[1].length + } catch (e) {} + try { + r2 = arg2.toString().split(".")[1].length + } catch (e) {} + m = Math.pow(10, Math.max(r1, r2)) + return _this.argDiv((_this.argMul(arg1, m) + _this.argMul(arg2, m)), m) + }, + argSubtr(arg1, arg2) { + // 减法函数 + var _this = this, + r1 = 0, + r2 = 0, + m = 0; + try { + r1 = arg1.toString().split(".")[1].length + } catch (e) {} + try { + r2 = arg2.toString().split(".")[1].length + } catch (e) {} + m = Math.pow(10, Math.max(r1, r2)); + return _this.argDiv((_this.argMul(arg1, m) - _this.argMul(arg2, m)), m) + }, + argMul(arg1, arg2) { + // 乘法函数 + var _this = this, + m = 0, + s1 = arg1.toString(), + s2 = arg2.toString(); + try { + m += s1.split(".")[1].length + } catch (e) {} + try { + m += s2.split(".")[1].length + } catch (e) {} + return Number(s1.replace(".", "")) * Number(s2.replace(".", "")) / Math.pow(10, m) + }, + argDiv(arg1, arg2) { + // 除法函数 + var _this = this, + t1 = 0, + t2 = 0, + r1, r2; + try { + t1 = arg1.toString().split(".")[1].length + } catch (e) {} + try { + t2 = arg2.toString().split(".")[1].length + } catch (e) {} + r1 = Number(arg1.toString().replace(".", "")) + r2 = Number(arg2.toString().replace(".", "")) + return _this.argMul((r1 / r2), Math.pow(10, t2 - t1)); + }, userinfo() { //取出patientId var that = this diff --git a/pages/modifyAddress/modifyAddress.vue b/pages/modifyAddress/modifyAddress.vue index 4f4ba5c..f37cf4a 100644 --- a/pages/modifyAddress/modifyAddress.vue +++ b/pages/modifyAddress/modifyAddress.vue @@ -3,8 +3,8 @@ - {{item.receiveName}}, - {{item.receivePhone}} + {{item.receiveName}}, + {{item.receivePhone}} {{item.address}} @@ -72,6 +72,7 @@ export default { data() { return { + timer:null, isedit: true, //标识 delshow: false, //删除弹框 content: '确认要删除信息吗？', @@ -79,7 +80,7 @@ areashow: false, //经纬度开关 arealist: [], //区街道list areaCode: '', - shipAddress: '添加收货地址', + shipAddress: '添加地址', infolist: { receiveName: '', receivePhone: '', @@ -137,6 +138,19 @@ }) that.goodPatient = res.data }) + } else { + that.$refs.uToast.show({ + title: '登录状态异常', + type: 'error' + }) + if (that.timer) { + clearTimeout(that.timer) + } + that.timer = setTimeout(e => { + uni.navigateBack({ + delta: 2 + }) + }, 1500) } } catch (e) {} // uni.getStorage({ @@ -162,24 +176,24 @@ if (res.code == 200) { uni.showToast({ title: '新增成功', - duration: 1500 + duration: 1000 }); that.show = false; setTimeout(e => { that.goodsList() - }, 1500) + }, 1000) } }) } else { updatenursingStation(that.infolist).then(res => { uni.showToast({ title: '修改成功', - duration: 1500 + duration: 1000 }); that.show = false; setTimeout(e => { that.goodsList() - }, 1500) + }, 1000) }) } }, @@ -218,15 +232,14 @@ delnursingStation(item.id).then(res => { uni.showToast({ title: '删除成功', - duration: 1500, + duration: 1000, }); setTimeout(e => { that.goodsList() - }, 1500) + }, 1000) that.delshow = false; }) - } else if (res.cancel) { - } + } else if (res.cancel) {} } }); }, diff --git a/pages/nursestation/nursestation.vue b/pages/nursestation/nursestation.vue index 25976ed..a6ab847 100644 --- a/pages/nursestation/nursestation.vue +++ b/pages/nursestation/nursestation.vue @@ -128,12 +128,12 @@ }, onShow() { this.usershow = false - this.getInfo() - this.serveinfo() - this.productinfo() }, onLoad(options) { this.nurseStationId = options.nurseStationId + this.getInfo() + this.serveinfo() + this.productinfo() }, methods: { goappointments(item) { @@ -158,7 +158,8 @@ getInfo() { introductionList(this.nurseStationId).then(res => { res.data.stationIntroducePcitureUrl = baseurl + res.data.stationIntroducePcitureUrl - res.data.agencyIntroduce = res.data.agencyIntroduce.replace(/\