diff --git a/pages/hospitalcare/hospitalcare.vue b/pages/hospitalcare/hospitalcare.vue index 3da3bd2..5594285 100644 --- a/pages/hospitalcare/hospitalcare.vue +++ b/pages/hospitalcare/hospitalcare.vue @@ -199,36 +199,6 @@ this.timevalue = starttime + ' - ' + endtime this.timepicker = false }, - 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, @@ -243,22 +213,6 @@ } 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)); - }, } } diff --git a/pages/modify/modify.vue b/pages/modify/modify.vue index 09da0a4..ff00a17 100644 --- a/pages/modify/modify.vue +++ b/pages/modify/modify.vue @@ -22,7 +22,7 @@ 出生日期: diff --git a/pages/nursestation/nursestation.vue b/pages/nursestation/nursestation.vue index 3a92297..e13e3a8 100644 --- a/pages/nursestation/nursestation.vue +++ b/pages/nursestation/nursestation.vue @@ -329,32 +329,31 @@ const value = uni.getStorageSync('openid'); const patientId = uni.getStorageSync('patientId'); if (value && patientId) { - let that = this - AppIdentification(patientId).then(res => { - if (res.code == 200) { - if (res.data.loginFlag) { - that.usershow = false - const scenenurseStationId = uni.getStorageSync('scenenurseStationId'); - if (that.list.nurseStationId == scenenurseStationId) { - uni.navigateTo({ - url: `/pages/hospitalcare/hospitalcare?stationId=${item.stationId}&stationItemId=${item.stationItemId}&stationItemPriceId=${item.stationItemPriceId}`, - }) - } else { + const scenenurseStationId = uni.getStorageSync('scenenurseStationId'); + if (that.list.nurseStationId == scenenurseStationId) { + uni.navigateTo({ + url: `/pages/hospitalcare/hospitalcare?stationId=${item.stationId}&stationItemId=${item.stationItemId}&stationItemPriceId=${item.stationItemPriceId}`, + }) + } else { + AppIdentification(patientId).then(res => { + if (res.code == 200) { + if (res.data.loginFlag) { + that.usershow = false uni.navigateTo({ url: `/pages/appointmenttime/appointmenttime?stationId=${item.stationId}&stationItemId=${item.stationItemId}&stationItemPriceId=${item.stationItemPriceId}`, }) + } else { + that.usershow = true } - } else { - that.usershow = true + } else if (res.code == 9999) {} else { + that.$refs.uToast.show({ + title: res.msg, + type: 'error', + url: '/pages/login/login' + }) } - } else if (res.code == 9999) {} else { - that.$refs.uToast.show({ - title: res.msg, - type: 'error', - url: '/pages/login/login' - }) - } - }) + }) + } } else { that.$refs.uToast.show({ title: '未登录,请先登录',