diff --git a/Pages/index/index.js b/Pages/index/index.js index af9f44f..ade1a4f 100644 --- a/Pages/index/index.js +++ b/Pages/index/index.js @@ -21,72 +21,15 @@ Page({ let url = e.currentTarget.dataset.url; wx.setStorageSync('usertype', usertype); wx.setStorageSync('next_url', url); - let user_uuid = wx.getStorageSync('user_id'); - console.log(user_uuid); - if(user_uuid){ + let token = wx.getStorageSync('AUTH_TOKEN_'+usertype); + console.log(token); + if(token){ wx.switchTab({ url: url }) }else{ app.go(app.globalData.login_url); } - }, - bindGetUserInfo(){ - wx.getUserInfo({ - success: function(res) { - var userInfo = res.userInfo - var nickName = userInfo.nickName - var avatarUrl = userInfo.avatarUrl - var gender = userInfo.gender //性别 0：未知、1：男、2：女 - var province = userInfo.province - var city = userInfo.city - var country = userInfo.country - console.log(res.userInfo) - } - }) - }, - shenfang(){ - wx.requestSubscribeMessage({ - tmplIds: [ - "5Tl-xmaWXrKP5BB8E6b3oTdPHbHa7WYWbmvZiuz4TLs", - "kUy70xHlr7ADo4aIHiictM4Te7MSec3E5kHsYvFQu40" - ], - success(res){ - console.log(res) - }, - fail(res){ - console.log(res) - }, - complete(res){ - console.log(res) - } - }) - }, - yici(){ - wx.requestSubscribeMessage({ - tmplIds: [ - "jhYUf91ULCTX_f69hazqAYwImdFf8ELasRAwB6X-MTM", - "JMPmlYGh1HcUSuEfJCVQUIsZv4H5ar3QvXZfrNYNFuc" - ], - success(res){ - console.log(res) - }, - fail(res){ - console.log(res) - }, - complete(res){ - console.log(res) - } - }) - }, - check(){ - wx.getSetting({ - withSubscriptions: true, - success (res) { - console.log(res.authSetting) - console.log(res.subscriptionsSetting) - } - }) } }) \ No newline at end of file diff --git a/Pages/index/index.wxml b/Pages/index/index.wxml index 35b36ca..789a18c 100644 --- a/Pages/index/index.wxml +++ b/Pages/index/index.wxml @@ -26,10 +26,6 @@ - - diff --git a/Pages/login/index.js b/Pages/login/index.js index 1bd4d75..9407e64 100644 --- a/Pages/login/index.js +++ b/Pages/login/index.js @@ -9,7 +9,7 @@ Page({ showCapsule: 1, //是否显示左上角图标 1表示显示 0表示不显示 title: '登录', //导航栏 中间的标题 }, - checked: true + checked: false }, onChange(event) { this.setData({ @@ -26,6 +26,13 @@ Page({ getPhoneNumber (e) { console.log(e); console.log(e.detail.code); + if(!this.data.checked){ + wx.showToast({ + title: '请同意协议', + icon: "error" + }) + return; + } let usertype = wx.getStorageSync('usertype'); let next_url = wx.getStorageSync('next_url'); wx.login({ @@ -39,7 +46,7 @@ Page({ } api.wechatMobileLogin(params).then(response => { console.log(response); - wx.setStorageSync('AUTH_TOKEN', response.data.token); + wx.setStorageSync('AUTH_TOKEN_'+usertype, response.data.token); wx.setStorageSync('user_id', response.data.user_id); wx.setStorageSync('client_user_id', response.data.client_user_id); app.globalData.config.userID = response.data.user_id; diff --git a/Pages/login/index.wxml b/Pages/login/index.wxml index 2292bab..625cfb6 100644 --- a/Pages/login/index.wxml +++ b/Pages/login/index.wxml @@ -15,9 +15,14 @@ 微信授权手机号登录 + 微信授权手机号登录 我已阅读并同意协议《肝胆相照用户服务协议》 diff --git a/Pages/mobile_login/index.js b/Pages/mobile_login/index.js index c35cb02..1463245 100644 --- a/Pages/mobile_login/index.js +++ b/Pages/mobile_login/index.js @@ -7,7 +7,7 @@ Page({ showCapsule: 1, //是否显示左上角图标 1表示显示 0表示不显示 title: '手机号登录', //导航栏 中间的标题 }, - checked: true, + checked: false, phone: "", sms: "", btn_msg: "获取验证码", @@ -55,22 +55,37 @@ Page({ }) return; } - var params = {}; - params.phone = this.data.phone; - params.code = this.data.sms; - params.user_type = wx.getStorageSync('usertype'); - - api.mobileLogin(params).then(response => { - console.log(response); - wx.setStorageSync('AUTH_TOKEN', response.data.token); - wx.setStorageSync('user_id', response.data.user_id); - wx.setStorageSync('client_user_id', response.data.client_user_id); - app.globalData.config.userID = response.data.user_id; - app.imInit(); - wx.switchTab({ - url: wx.getStorageSync('next_url') - }) - }).catch(errors => {console.error(errors);}) + let usertype = wx.getStorageSync('usertype'); + wx.login({ + success: (res) => { + console.log(res) + if (res.code) { + var params = {}; + params.phone = this.data.phone; + params.code = this.data.sms; + params.user_type = usertype; + params.wx_code = res.code; + + api.mobileLogin(params).then(response => { + console.log(response); + wx.setStorageSync('AUTH_TOKEN_'+usertype, response.data.token); + wx.setStorageSync('user_id', response.data.user_id); + wx.setStorageSync('client_user_id', response.data.client_user_id); + app.globalData.config.userID = response.data.user_id; + app.imInit(); + wx.switchTab({ + url: wx.getStorageSync('next_url') + }) + }).catch(errors => {console.error(errors);}) + } else { + wx.showToast({ + title: '登录失败', + icon: "error" + }) + } + }, + }) + }, beginDaoJiShi(){ console.log("开始倒计时") diff --git a/Pages/yaoshi/authentication/authentication.js b/Pages/yaoshi/authentication/authentication.js index 9f2ffdf..1e25c6b 100644 --- a/Pages/yaoshi/authentication/authentication.js +++ b/Pages/yaoshi/authentication/authentication.js @@ -1,4 +1,5 @@ -// Pages/authentication/authentication.js +import { API } from './../../../utils/network/api' +const api = new API() const app = getApp() Page({ data: { @@ -8,9 +9,8 @@ Page({ showCapsule: 1, //是否显示左上角图标 1表示显示 0表示不显示 title: '实名认证', //导航栏 中间的标题 }, - - // 此页面 页面内容距最顶部的距离 - height: app.globalData.height, + height: app.globalData.height, + info: {} }, onLoad() { console.log(this.data.height) @@ -19,5 +19,14 @@ Page({ this.setData({ nbLoading: false, }) + + api.getPharmacistInfo().then(response => { + console.log(response.data); + this.setData({ + info: response.data + }) + }).catch(errors => { + console.error(errors); + }) } }) \ No newline at end of file diff --git a/Pages/yaoshi/authentication/authentication.wxml b/Pages/yaoshi/authentication/authentication.wxml index 2c4f3db..51a5e6f 100644 --- a/Pages/yaoshi/authentication/authentication.wxml +++ b/Pages/yaoshi/authentication/authentication.wxml @@ -1,18 +1,18 @@ - - - - - - - - - - + + + + + + + + + + - 下一步 + 下一步（去干啥？） \ No newline at end of file diff --git a/Pages/yaoshi/home/home.js b/Pages/yaoshi/home/home.js index 30226a9..0bc357c 100644 --- a/Pages/yaoshi/home/home.js +++ b/Pages/yaoshi/home/home.js @@ -1,4 +1,5 @@ -// Pages/home.js +import { API } from './../../../utils/network/api' +const api = new API() const app = getApp() Page({ /** @@ -12,7 +13,13 @@ Page({ title: '药师端', //导航栏 中间的标题 }, // 此页面 页面内容距最顶部的距离 - height: app.globalData.height + height: app.globalData.height, + pharmacist: {}, + audit_number: 0, + data_list_0: [], + data_list_1: [], + data_list_2: [], + data_list_3: [], }, onLoad() { @@ -28,5 +35,74 @@ Page({ active: 0, //数字是当前页面在tabbar的索引,如我的查询页索引是2，因此这边为2，同理首页就为0，审批页面为1 }) } + api.getPharmacistIndex().then(response => { + this.setData({ + pharmacist: response.data.pharmacist, + audit_number: response.data.audit_number + }) + }).catch(errors => { + console.error(errors); + }) + + this.getPharmacistPrescription(); + }, + getPharmacistPrescription(){ + let params = {}; + let active = this.data.active; + let pharmacist_audit_status = 0; + let platform_audit_status = 1; + + if(active == 0){ + pharmacist_audit_status = 0; + platform_audit_status = 0; + } + if(active == 1){ + pharmacist_audit_status = 1; + platform_audit_status = 1; + } + if(active == 2){ + pharmacist_audit_status = 2; + platform_audit_status = 0; + } + if(active == 3){ + pharmacist_audit_status = 1; + platform_audit_status = 2; + } + params.pharmacist_audit_status = pharmacist_audit_status; + params.platform_audit_status = platform_audit_status; + let data_name = "data_list_"+active; + api.getPharmacistPrescription(params).then(response => { + this.setData({ + [data_name]: response.data.data + }) + }).catch(errors => { + console.error(errors); + }) + }, + onChange(e){ + console.log(e) + this.setData({ + active: e.detail.index + }) + this.getPharmacistPrescription(); + }, + go(e){ + let url = e.currentTarget.dataset.url; + app.go(url) + }, + switchStatus(){ + let is_online = this.data.pharmacist.is_online; + if(is_online == 0){ + is_online = 1 + }else if(is_online == 1){ + is_online = 0 + } + api.putPharmacistOnOff({is_online: is_online}).then(response => { + this.setData({ + "pharmacist.is_online": is_online + }) + }).catch(errors => {console.error(errors);}) } + + }) \ No newline at end of file diff --git a/Pages/yaoshi/home/home.wxml b/Pages/yaoshi/home/home.wxml index 0487f1d..c13413b 100644 --- a/Pages/yaoshi/home/home.wxml +++ b/Pages/yaoshi/home/home.wxml @@ -2,100 +2,114 @@ - + - 李四 - 今日审方 9 + {{pharmacist.user_name}} + 今日审方 {{audit_number}} - - 离线 + + {{pharmacist.is_online==1?'在线':'离线'}} - + - 处方订单号：2023010510324649 + 处方订单号：{{item.prescription_code}} - + - 开方时间：2023-01-16 08:52 - - - 查看病例 - + 开方时间：{{item.created_at}} + + 查看病例 - 张三/男/45岁 - + {{item.patient_name}}/{{item.patient_sex==1?'男':'女'}}/{{item.patient_age}}岁 + 去审方 - - - 处方订单号：2023010510324649 - - 查看病例 - - - - - 开方时间：2023-01-16 08:52 - - 查看病例 - - - - - 张三/男/45岁 - - 去审方 - - - - - - 处方订单号 2023010510324649 + + 处方订单号：2023010510324649 + + 查看病例 + - - 迷你按钮 + + + 开方时间：2023-01-16 08:52 + 通过 + + + + 张三/男/45岁 + + + - - 处方订单号 2023010510324649 + + 处方订单号：2023010510324649 + + 查看病例 + - - 迷你按钮 + + + 开方时间：2023-01-16 08:52 + 驳回 + + + + 张三/男/45岁 + + + - - 处方订单号 2023010510324649 + + 处方订单号：2023010510324649 + + 查看病例 + - - 迷你按钮 + + + 开方时间：2023-01-16 08:52 + 驳回 + + + + 张三/男/45岁 + + + + + + \ No newline at end of file diff --git a/Pages/yaoshi/home/home.wxss b/Pages/yaoshi/home/home.wxss index 0628c84..7aa8dee 100644 --- a/Pages/yaoshi/home/home.wxss +++ b/Pages/yaoshi/home/home.wxss @@ -40,15 +40,18 @@ page{ .status_offline{ background-color: #BFBFBF; } +.status_online{ + background-color: rgb(124, 231, 124); +} .status_text{ - display: inline-block; padding: 10rpx 20rpx; border-radius: 20rpx; - word-spacing: 10rpx; - letter-spacing: 10rpx; float: right; margin-right: 25rpx; font-size: 20rpx; + display: flex; + width: 50rpx; + justify-content: space-evenly; } .custom-tabs { margin-bottom: 32rpx; diff --git a/Pages/yaoshi/info/info.js b/Pages/yaoshi/info/info.js index b8bc702..8079ebf 100644 --- a/Pages/yaoshi/info/info.js +++ b/Pages/yaoshi/info/info.js @@ -1,7 +1,6 @@ -//index.js -//获取应用实例 +import { API } from './../../../utils/network/api' +const api = new API() const app = getApp() - Page({ data: { // 组件所需的参数 @@ -11,9 +10,21 @@ Page({ }, // 此页面 页面内容距最顶部的距离 - height: app.globalData.height , + height: app.globalData.height, + info: "" }, - onLoad() { - console.log(this.data.height) + onLoad(options) { + + }, + onShow(){ + + api.getPharmacistInfo().then(response => { + console.log(response.data); + this.setData({ + info: response.data + }) + }).catch(errors => { + console.error(errors); + }) } }) diff --git a/Pages/yaoshi/info/info.wxml b/Pages/yaoshi/info/info.wxml index 01a1be7..531713a 100644 --- a/Pages/yaoshi/info/info.wxml +++ b/Pages/yaoshi/info/info.wxml @@ -1,19 +1,19 @@ - - 李四 + + {{info.user_name}} - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/Pages/yaoshi/info/info.wxss b/Pages/yaoshi/info/info.wxss index f40053f..cb7329f 100644 --- a/Pages/yaoshi/info/info.wxss +++ b/Pages/yaoshi/info/info.wxss @@ -14,6 +14,5 @@ text-align: justify; text-justify:distribute-all-lines; text-align-last: justify; - width: 60rpx; font-size: 28rpx; } diff --git a/Pages/yaoshi/medicalrecord/medicalrecord.js b/Pages/yaoshi/medicalrecord/medicalrecord.js index 70ad975..54df78b 100644 --- a/Pages/yaoshi/medicalrecord/medicalrecord.js +++ b/Pages/yaoshi/medicalrecord/medicalrecord.js @@ -1,7 +1,6 @@ -//index.js -//获取应用实例 +import { API } from './../../../utils/network/api' +const api = new API() const app = getApp() - Page({ data: { // 组件所需的参数 @@ -9,11 +8,34 @@ Page({ showCapsule: 1, //是否显示左上角图标 1表示显示 0表示不显示 title: '患者病历', //导航栏 中间的标题 }, - // 此页面 页面内容距最顶部的距离 - height: app.globalData.height , + height: app.globalData.height, + order_inquiry_id: "", + order_prescription_id: "", + case_detail: {} + }, + onLoad(options) { + let order_inquiry_id = options.order_inquiry_id; + let order_prescription_id = options.order_prescription_id; + console.log("order_inquiry_id: ", order_inquiry_id); + this.setData({ + order_inquiry_id: order_inquiry_id, + order_prescription_id: order_prescription_id, + }) + }, + onShow(){ + + api.getCase({order_inquiry_id: this.data.order_inquiry_id}).then(response => { + console.log(response.data); + this.setData({ + case_detail: response.data + }) + }).catch(errors => { + console.error(errors); + }) + }, + go(e){ + let url = e.currentTarget.dataset.url; + app.go(url) }, - onLoad() { - console.log(this.data.height) - } }) diff --git a/Pages/yaoshi/medicalrecord/medicalrecord.wxml b/Pages/yaoshi/medicalrecord/medicalrecord.wxml index e1a0a73..6a8eb72 100644 --- a/Pages/yaoshi/medicalrecord/medicalrecord.wxml +++ b/Pages/yaoshi/medicalrecord/medicalrecord.wxml @@ -3,27 +3,26 @@ 疾病资料 - 病情主要述：我问问 - 用药意向：【未匹配】连花清瘟胶囊*1 - 体重：56KG - 本次用药已相关确认病症：无 - 是否服用过您想购买的药品且无相关禁忌症：是 - 是否有药物过敏史：否 - 您的肝功能、肾功能是否存在异常：否 - 您是否处于备孕、妊娠、哺乳期：否 + 病情主要述：{{case_detail.disease_desc}} + + 用药意向： + {{item}} + + 体重：{{case_detail.weight}}KG + 是否服用过您想购买的药品且无相关禁忌症：{{case_detail.is_taboo==0?'否':'是'}} + 是否有药物过敏史：{{case_detail.is_allergy_history==0?'否':'是'}} + 您是否处于备孕、妊娠、哺乳期：{{case_detail.is_pregnant==0?'否':'是'}} 复诊凭证 - - - 前往审方 - + + 前往审方 - 肝胆相照提供技术支持 + \ No newline at end of file diff --git a/Pages/yaoshi/medicalrecord/medicalrecord.wxss b/Pages/yaoshi/medicalrecord/medicalrecord.wxss index aa32373..4e53343 100644 --- a/Pages/yaoshi/medicalrecord/medicalrecord.wxss +++ b/Pages/yaoshi/medicalrecord/medicalrecord.wxss @@ -1,7 +1,8 @@ +page{ + background-color: #F3F5F7; +} .container{ letter-spacing: 3rpx; - background-color: #F3F5F7; - height: 100vh; } .user_info{ background-color: #fff; diff --git a/Pages/yaoshi/my/my.js b/Pages/yaoshi/my/my.js index 3d1a988..b1feb40 100644 --- a/Pages/yaoshi/my/my.js +++ b/Pages/yaoshi/my/my.js @@ -1,31 +1,29 @@ -// Pages/my/my.js +import { API } from './../../../utils/network/api' +const api = new API() const app = getApp() Page({ - - /** - * 页面的初始数据 - */ data: { navbarData: { showCapsule: 1, //是否显示左上角图标 1表示显示 0表示不显示 title: '个人中心', //导航栏 中间的标题 }, - - // 此页面 页面内容距最顶部的距离 - height: app.globalData.height, + height: app.globalData.height, + info:{} }, - onLoad() { - console.log(this.data.height) - }, - - /** - * 生命周期函数--监听页面显示 - */ onShow() { if (typeof this.getTabBar === 'function' && this.getTabBar()) { this.getTabBar().setData({ active: 1, //数字是当前页面在tabbar的索引,如我的查询页索引是2，因此这边为2，同理首页就为0，审批页面为1 }) } + + api.getPharmacistInfo().then(response => { + console.log(response.data); + this.setData({ + info: response.data + }) + }).catch(errors => { + console.error(errors); + }) } }) \ No newline at end of file diff --git a/Pages/yaoshi/my/my.json b/Pages/yaoshi/my/my.json index bc00c53..b6f232d 100644 --- a/Pages/yaoshi/my/my.json +++ b/Pages/yaoshi/my/my.json @@ -1,7 +1,6 @@ { "component": true, "usingComponents": { - "te-nav-bar": "/commpents/te_navbar", "t-avatar": "tdesign-miniprogram/avatar/avatar", "van-icon": "@vant/weapp/icon/index" }, diff --git a/Pages/yaoshi/my/my.wxml b/Pages/yaoshi/my/my.wxml index 97df817..ac21aba 100644 --- a/Pages/yaoshi/my/my.wxml +++ b/Pages/yaoshi/my/my.wxml @@ -1,8 +1,7 @@ - - - 李四 + + {{info.user_name}} diff --git a/Pages/yaoshi/my/my.wxss b/Pages/yaoshi/my/my.wxss index 2f0075c..7b6c197 100644 --- a/Pages/yaoshi/my/my.wxss +++ b/Pages/yaoshi/my/my.wxss @@ -14,7 +14,6 @@ text-align: justify; text-justify:distribute-all-lines; text-align-last: justify; - width: 60rpx; font-size: 28rpx; } .my{ diff --git a/Pages/yaoshi/prescription/prescription.js b/Pages/yaoshi/prescription/prescription.js index dd73300..1ef80dd 100644 --- a/Pages/yaoshi/prescription/prescription.js +++ b/Pages/yaoshi/prescription/prescription.js @@ -1,4 +1,6 @@ -import Toast from '@vant/weapp/toast/toast'; +import Toast from '@vant/weapp/toast/toast' +import { API } from './../../../utils/network/api' +const api = new API() const app = getApp() Page({ data: { @@ -12,10 +14,15 @@ Page({ }, // 此页面 页面内容距最顶部的距离 - height: app.globalData.height, + height: app.globalData.height, + order_prescription_id: "" }, - onLoad() { - console.log(this.data.height) + onLoad(options) { + let order_prescription_id = options.order_prescription_id; + console.log("order_prescription_id: ", order_prescription_id) + this.setData({ + order_prescription_id: order_prescription_id + }) }, onConfirmReason(event) { @@ -27,7 +34,6 @@ Page({ }, onCancelReason() { - Toast('取消'); this.setData({ reasonshow: false }); }, @@ -53,21 +59,34 @@ Page({ this.setData({ bohuishow: false }); }, - submitBohui() { + submitBohui(e) { console.log(444); - Toast.loading({ - message: '加载中...', - forbidClick: true, - onClose: () => { - console.log('执行OnClose函数'); - this.setData({ bohuishow: false }); - }, - }); - + this.putPharmacistPrescriptionVerify(e); }, submit(){ console.log(555); + }, + onShow(){ + api.getPharmacistPrescriptioninfo({order_prescription_id: this.data.order_prescription_id}).then(response => { + console.log(response.data); + }).catch(errors => {console.error(errors);}) + }, + putPharmacistPrescriptionVerify(e){ + console.log(e) + let params = {}; + params.pharmacist_audit_status = e.currentTarget.dataset.pharmacist_audit_status; + if(params.pharmacist_audit_status == 2){ + params.pharmacist_fail_reason = this.data.resonText; + } + params.order_prescription_id = this.data.order_prescription_id; + api.putPharmacistPrescriptionVerify(params).then(response => { + console.log(response.data); + Toast.success("处理成功"); + setTimeout(() => { + wx.navigateBack(); + }, 1000); + }).catch(errors => {console.error(errors);}) } }) \ No newline at end of file diff --git a/Pages/yaoshi/prescription/prescription.wxml b/Pages/yaoshi/prescription/prescription.wxml index 7a75c57..5758fd6 100644 --- a/Pages/yaoshi/prescription/prescription.wxml +++ b/Pages/yaoshi/prescription/prescription.wxml @@ -14,19 +14,22 @@     驳回     - +     通过     + + + 取消 - 确认驳回 + 确认驳回 diff --git a/Pages/yaoshi/prescription/prescription.wxss b/Pages/yaoshi/prescription/prescription.wxss index 314155b..4ac2e02 100644 --- a/Pages/yaoshi/prescription/prescription.wxss +++ b/Pages/yaoshi/prescription/prescription.wxss @@ -1,6 +1,8 @@ -.container{ +page{ + background-color: #F3F5F7; } + .img_box{ width: 90vw; margin: 20rpx auto; diff --git a/Pages/yishi/bankcard/index.wxml b/Pages/yishi/bankcard/index.wxml index d554abe..9ab18a4 100644 --- a/Pages/yishi/bankcard/index.wxml +++ b/Pages/yishi/bankcard/index.wxml @@ -1,6 +1,6 @@ - + 我的银行卡 @@ -11,14 +11,14 @@ - + 添加结算银行卡 提示：每人只能绑定一张银行卡，银行卡绑定成功后每月只能修改结算银行卡一次，请谨慎绑定。 - + {{bank_name}} {{bank_card_code_mask}} diff --git a/Pages/yishi/bankcard/index.wxss b/Pages/yishi/bankcard/index.wxss index 0b61e2c..0b5e953 100644 --- a/Pages/yishi/bankcard/index.wxss +++ b/Pages/yishi/bankcard/index.wxss @@ -1,7 +1,8 @@ +page{ + background-color: #F4F4F4; +} .container{ width: 100vw; - height: 100vh; - background-color: #F4F4F4; } .help{ display: flex; diff --git a/Pages/yishi/bindcard/index.wxml b/Pages/yishi/bindcard/index.wxml index a513bca..4d4a855 100644 --- a/Pages/yishi/bindcard/index.wxml +++ b/Pages/yishi/bindcard/index.wxml @@ -16,11 +16,13 @@ + placeholder-style="font-size: 16px;" + > + 银行卡号 + diff --git a/Pages/yishi/bindcard/index.wxss b/Pages/yishi/bindcard/index.wxss index 47c8a6c..f979002 100644 --- a/Pages/yishi/bindcard/index.wxss +++ b/Pages/yishi/bindcard/index.wxss @@ -12,7 +12,7 @@ font-size: 30rpx; } .bankcard{ - margin-top: 50rpx; + margin-top: 20rpx; } .note{ font-size: 28rpx; diff --git a/Pages/yishi/case/index.wxml b/Pages/yishi/case/index.wxml index 739505b..85ce54d 100644 --- a/Pages/yishi/case/index.wxml +++ b/Pages/yishi/case/index.wxml @@ -7,10 +7,10 @@ {{case_detail.sex==1?'男':case_detail.sex==2?'女':'未知'}}｜{{case_detail.age}}岁 - 身高：{{case_detail.height}}cm - 体重：{{case_detail.weight}}KG - 民族：{{case_detail.nation_name}} - 职业：{{case_detail.job_name}} + 身高：{{case_detail.height==null?'未知':case_detail.height}}cm + 体重：{{case_detail.weight==null?'未知':case_detail.weight}}KG + 民族：{{case_detail.nation_name==''?'未知':case_detail.nation_name}} + 职业：{{case_detail.job_name==''?'未知':case_detail.job_name}} 婚姻：{{case_detail.marital_status==0?'未婚':case_detail.marital_status==1?'已婚':case_detail.marital_status==2?'离异':'未知'}} @@ -26,7 +26,7 @@ 医生诊断： {{case_detail.disease_class_name}} --> - + 确诊医院： {{case_detail.diagnosis_hospital}} @@ -41,7 +41,7 @@ 病情描述： {{case_detail.disease_desc}} - + 用药意向： {{item}}; diff --git a/Pages/yishi/cash/index.js b/Pages/yishi/cash/index.js index 7b0b7a4..782805a 100644 --- a/Pages/yishi/cash/index.js +++ b/Pages/yishi/cash/index.js @@ -12,10 +12,10 @@ Page({ bank_card_id: "", bank_icon_path: "https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/bankcard/js_icon.png", realname: "默认姓名", - bank_name : "招商银行", - bank_card_code_mask: "2233 9988 9989 9900", - withdrawal_amount: "987", - income_tax: "12", + bank_name : "xx银行", + bank_card_code_mask: "888 xxxx xxxx 888", + withdrawal_amount: "xxxx", + income_tax: "xx", contactKeFu: false }, onLoad(options){ diff --git a/Pages/yishi/cash/index.json b/Pages/yishi/cash/index.json index c3b0e34..c1f968d 100644 --- a/Pages/yishi/cash/index.json +++ b/Pages/yishi/cash/index.json @@ -2,7 +2,7 @@ "component": true, "usingComponents": { "te-nav-bar": "/commpents/te_navbar", - "t-image": "tdesign-miniprogram/image/image", + "van-image": "@vant/weapp/image/index", "van-icon": "@vant/weapp/icon/index", "van-button": "@vant/weapp/button/index", "van-dialog": "@vant/weapp/dialog/index" diff --git a/Pages/yishi/cash/index.wxml b/Pages/yishi/cash/index.wxml index e626c74..7db1ca9 100644 --- a/Pages/yishi/cash/index.wxml +++ b/Pages/yishi/cash/index.wxml @@ -7,7 +7,7 @@ - + {{realname}}{{bank_name}} diff --git a/Pages/yishi/identity/index.js b/Pages/yishi/identity/index.js index 59639ab..542115a 100644 --- a/Pages/yishi/identity/index.js +++ b/Pages/yishi/identity/index.js @@ -46,7 +46,13 @@ Page({ "stickyProps.offsetTop": this.data.stateHeight + this.data.navHeight + 10 }) }, - onLoad(){ + onLoad(options){ + let selected_tab = options.selected_tab; + if(selected_tab){ + this.setData({ + selected_tab: selected_tab + }) + } let _this = this; //获取实名认证信息 api.getDoctorAuthReal().then(response => { @@ -373,9 +379,16 @@ Page({ } api.postDoctorAuthReal(params).then(response => { console.log(response); + wx.showToast({ + title: '认证成功', + icon: 'none', + duration: 2000 + }) _this.setData({ panel_2_disabled: false, - selected_tab: 1 + selected_tab: 1, + next_btn_disabled: true, + next_btn_txt: '已认证，不可修改' }) }).catch(errors => { console.error(errors); diff --git a/Pages/yishi/identity/index.wxml b/Pages/yishi/identity/index.wxml index 0bbe9c7..3784610 100644 --- a/Pages/yishi/identity/index.wxml +++ b/Pages/yishi/identity/index.wxml @@ -20,26 +20,29 @@ + disabled="{{next_btn_disabled}}" + > + 真实姓名 * + + disabled="{{next_btn_disabled}}" + > + 身份证号 * + @@ -59,14 +62,16 @@ + + - + \ No newline at end of file diff --git a/Pages/yishi/identity/index.wxss b/Pages/yishi/identity/index.wxss index 2031194..a97e304 100644 --- a/Pages/yishi/identity/index.wxss +++ b/Pages/yishi/identity/index.wxss @@ -109,10 +109,7 @@ height: 300rpx; background-color: cadetblue; } -/* 自定义 vant required 小红点位置 */ -.van-cell--required::before { - left: 4.7rem !important; -} + .zhuanchang_box{ display: flex; flex-wrap: wrap; @@ -132,7 +129,6 @@ } .zhuanchang_block { width: 100vw; - height: 240px; background: #fff; border-top-left-radius: 16rpx; border-top-right-radius: 16rpx; diff --git a/Pages/yishi/index/index.js b/Pages/yishi/index/index.js index 23eb0d3..7613934 100644 --- a/Pages/yishi/index/index.js +++ b/Pages/yishi/index/index.js @@ -8,15 +8,15 @@ Page({ navHeight: 0, stateHeight: 0, info:{ - user_name: "手机号后四位", - not_accepted_inquiry_num: 6, - accepting_inquiry_num: 12, + user_name: "xxx", + not_accepted_inquiry_num: 0, + accepting_inquiry_num: 0, info_shiming_status_txt: "未认证", info_shiming_status: "info_shiming_status_no", show_info_note: false, - praise_rate: "99%", - avg_response_time: 125, - number_of_fans: 9254, + praise_rate: "100%", + avg_response_time: 0, + number_of_fans: 0, avatar: "https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/default_photo.png", reject_prescription_number: false,//处方管理小红点 }, @@ -27,11 +27,7 @@ Page({ multi_point_status_url: "/Pages/yishi/zhiye_identity/index", duration: 500, interval: 5000, - swiperList: [ - `https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/ad1.jpg`, - `https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/ad2.jpg`, - `https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com/applet/doctor/static/images/yishi/ad3.jpg`, - ], + swiperList: [], banner: [], default_dialog_show: false,//只弹框一次 dialog_visible: false, @@ -60,17 +56,17 @@ Page({ { case_status: 0, case_module: [0,1,2,3,4,5,6,7,8], - case_text: "未实名认证" + case_text: "请您先实名认证" }, { case_status: 1, case_module: [0,1,2,3,4,5,6,7,8], - case_text: "未医师身份认证" + case_text: "请您先医师身份认证" }, { case_status: 2, case_module: [0,1,4,5,6], - case_text: "未绑定结算银行卡" + case_text: "请您先绑定结算银行卡" }, { case_status: 3, @@ -116,6 +112,9 @@ Page({ }, onUnload(){ console.log("index onUnload() onUnload() "); + this.setData({ + swiperList: [] + }) }, onHide(){ console.log("index onHide() onHide() "); @@ -170,13 +169,13 @@ Page({ //iden_auth_status 0:未认证 1:认证通过 2:审核中 3:认证失败 if(iden_auth_status == 0) this.setData({iden_auth_status_txt: "未认证"}); - if(iden_auth_status == 1) this.setData({iden_auth_status_txt: "认证通过", iden_auth_status_url: "/Pages/yishi/attestation/index"}); + if(iden_auth_status == 1) this.setData({iden_auth_status_txt: "已认证", iden_auth_status_url: "/Pages/yishi/attestation/index"}); if(iden_auth_status == 2) this.setData({iden_auth_status_txt: "审核中"}); if(iden_auth_status == 3) this.setData({iden_auth_status_txt: "认证失败"}); //multi_point_status 0:未认证 1:认证通过 2:审核中 3:认证失败 if(multi_point_status == 0) this.setData({multi_point_status_txt: "未认证"}); - if(multi_point_status == 1) this.setData({multi_point_status_txt: "认证通过", multi_point_status_url: "/Pages/yishi/practicing/index"}); + if(multi_point_status == 1) this.setData({multi_point_status_txt: "已认证", multi_point_status_url: "/Pages/yishi/practicing/index"}); if(multi_point_status == 2) this.setData({multi_point_status_txt: "审核中"}); if(multi_point_status == 3) this.setData({multi_point_status_txt: "认证失败"}); @@ -241,6 +240,27 @@ Page({ app.go(e.currentTarget.dataset.url) } }, + gozhiye(e){ + let idcard_status = this.data.info.idcard_status; + let iden_auth_status = this.data.info.iden_auth_status; + if(idcard_status != 1){ + this.setData({ + dialog_content: "请您先实名认证", + shiming_status_url: "/Pages/yishi/identity/index", + dialog_visible: true, + }); + return; + } + if(iden_auth_status != 1){ + this.setData({ + dialog_content: "请您先医师身份认证", + shiming_status_url: "/Pages/yishi/identity/index?selected_tab=1", + dialog_visible: true, + }); + return; + } + app.go(e.currentTarget.dataset.url); + }, confirmDialog(){ this.setData({ dialog_visible: false @@ -259,145 +279,170 @@ Page({ let iden_auth_status = this.data.info.iden_auth_status; //多点执业认证 let multi_point_status = this.data.info.multi_point_status; - - wx.setStorageSync('idcard_status', idcard_status); - wx.setStorageSync('iden_auth_status', iden_auth_status); + //绑定结算银行卡 + var is_bind_bank = this.data.info.is_bind_bank; + + let userID = wx.getStorageSync('user_id'); + wx.setStorageSync(userID+'_idcard_status', idcard_status); + wx.setStorageSync(userID+'_iden_auth_status', iden_auth_status); + wx.setStorageSync(userID+'_multi_point_status', multi_point_status); + wx.setStorageSync(userID+'_is_bind_bank', is_bind_bank); if(idcard_status == 0){ if(!this.data.default_dialog_show){ this.setData({ - dialog_content: "请您先实名认证", dialog_visible: true, - shiming_status_url: "/Pages/yishi/identity/index", - default_dialog_show: true }); } + this.setData({ + dialog_content: "请您先实名认证", + shiming_status_url: "/Pages/yishi/identity/index", + default_dialog_show: true + }); return false; } if(idcard_status == 2){ if(!this.data.default_dialog_show){ this.setData({ - "info.info_shiming_status_txt": "认证失败", - "info.info_shiming_status": "info_shiming_status_yes", - shiming_status_url: "/Pages/yishi/identity/index", - dialog_content: "实名认证失败", dialog_visible: true, - default_dialog_show: true }); } + this.setData({ + "info.info_shiming_status_txt": "认证失败", + "info.info_shiming_status": "info_shiming_status_yes", + shiming_status_url: "/Pages/yishi/identity/index", + dialog_content: "实名认证失败", + default_dialog_show: true + }); return false;; } if(iden_auth_status == 0){ if(!this.data.default_dialog_show){ this.setData({ - "info.info_shiming_status_txt": "前往医师身份认证", - "info.info_shiming_status": "info_shiming_status_yes", - shiming_status_url: "/Pages/yishi/identity/index", - dialog_content: "请您前往医师身份认证", dialog_visible: true, - default_dialog_show: true }); } + this.setData({ + "info.info_shiming_status_txt": "前往医师身份认证", + "info.info_shiming_status": "info_shiming_status_yes", + shiming_status_url: "/Pages/yishi/identity/index?selected_tab=1", + dialog_content: "请您先医师身份认证", + default_dialog_show: true + }); return false; } if(iden_auth_status == 2){ if(!this.data.default_dialog_show){ this.setData({ - "info.info_shiming_status_txt": "审核中", - "info.info_shiming_status": "info_shiming_status_yes", - shiming_status_url: "/Pages/yishi/identity/index", - dialog_content: "您的医师身份认证正在审核中", - dialog_visible: true, - default_dialog_show: true + // dialog_visible: true, }); } + this.setData({ + "info.info_shiming_status_txt": "审核中", + "info.info_shiming_status": "info_shiming_status_yes", + shiming_status_url: "/Pages/yishi/identity/index?selected_tab=1", + dialog_content: "您的医师身份认证正在审核中", + // default_dialog_show: true + }); return false; } if(iden_auth_status == 3){ if(!this.data.default_dialog_show){ this.setData({ - "info.info_shiming_status_txt": "认证失败", - "info.info_shiming_status": "info_shiming_status_yes", - dialog_content: "您的医师身份认证失败", - dialog_visible: true, - default_dialog_show: true + // dialog_visible: true, + }); + } + this.setData({ + "info.info_shiming_status_txt": "认证失败", + "info.info_shiming_status": "info_shiming_status_yes", + shiming_status_url: "/Pages/yishi/identity/index?selected_tab=1", + dialog_content: "您的医师身份认证失败", + // default_dialog_show: true }); - } return false; } + + if(is_bind_bank == 0){ + if(!this.data.default_dialog_show){ + this.setData({ + dialog_visible: true, + }); + } + this.setData({ + "info.info_shiming_status_txt": "绑定结算银行卡", + "info.info_shiming_status": "info_shiming_status_yes", + shiming_status_url: "/Pages/yishi/bankcard/index", + dialog_content: "请您先绑定结算银行卡", + default_dialog_show: true + }); + return false; + } + //多点执业认证 if(multi_point_status == 0){ if(!this.data.default_dialog_show){ this.setData({ - "info.info_shiming_status_txt": "前往多点执业认证", - "info.info_shiming_status": "info_shiming_status_yes", - shiming_status_url: "/Pages/yishi/zhiye_identity/index", - dialog_content: "请您先进行多点执业认证", dialog_visible: true, - default_dialog_show: true }); } - return false; + this.setData({ + "info.info_shiming_status_txt": "前往多点执业认证", + "info.info_shiming_status": "info_shiming_status_yes", + shiming_status_url: "/Pages/yishi/zhiye_identity/index", + dialog_content: "请您先进行多点执业认证", + default_dialog_show: true + }); + // return false; } if(multi_point_status == 2){ if(!this.data.default_dialog_show){ this.setData({ - "info.info_shiming_status_txt": "审核中", - "info.info_shiming_status": "info_shiming_status_yes", - shiming_status_url: "/Pages/yishi/zhiye_identity/index", - dialog_content: "您的多点执业认证正在审核中", dialog_visible: true, - default_dialog_show: true }); } - return false; + this.setData({ + "info.info_shiming_status_txt": "审核中", + "info.info_shiming_status": "info_shiming_status_yes", + shiming_status_url: "/Pages/yishi/zhiye_identity/index", + dialog_content: "您的多点执业认证正在审核中", + default_dialog_show: true + }); + // return false; } if(multi_point_status == 3){ if(!this.data.default_dialog_show){ this.setData({ - "info.info_shiming_status_txt": "认证失败", - "info.info_shiming_status": "info_shiming_status_yes", - shiming_status_url: "/Pages/yishi/zhiye_identity/index", - dialog_content: "您的多点执业认证失败", dialog_visible: true, - default_dialog_show: true }); + } + this.setData({ + "info.info_shiming_status_txt": "认证失败", + "info.info_shiming_status": "info_shiming_status_yes", + shiming_status_url: "/Pages/yishi/zhiye_identity/index", + dialog_content: "您的多点执业认证失败", + default_dialog_show: true + }); + // return false; } - return false; - } - - - //绑定结算银行卡 - var is_bind_bank = this.data.info.is_bind_bank; - if(is_bind_bank == 0){ - if(!this.data.default_dialog_show){ - this.setData({ - "info.info_shiming_status_txt": "绑定结算银行卡", - "info.info_shiming_status": "info_shiming_status_yes", - shiming_status_url: "/Pages/yishi/bankcard/index", - dialog_content: "请您先绑定结算银行卡", - dialog_visible: true, - default_dialog_show: true - }); - } - return false; - } + //开启在线问诊 var is_img_expert_reception = this.data.info.is_img_expert_reception; if(is_img_expert_reception == 0 ){ if(!this.data.default_dialog_show){ - this.setData({ - "info.info_shiming_status_txt": "开启在线问诊", - "info.info_shiming_status": "info_shiming_status_yes", - shiming_status_url: "/Pages/yishi/onlinesetup/index", - dialog_content: "请您先前往在线问诊管理中开通在线问诊", - dialog_visible: true, - default_dialog_show: true - }); - } + this.setData({ + dialog_visible: true, + }); + } + this.setData({ + "info.info_shiming_status_txt": "开启在线问诊", + "info.info_shiming_status": "info_shiming_status_yes", + shiming_status_url: "/Pages/yishi/onlinesetup/index", + dialog_content: "请您先前往在线问诊管理中开通在线问诊", + default_dialog_show: true + }) return false; } this.setData({ @@ -447,13 +492,13 @@ Page({ // 已实名认证和医师身份认证且绑定结算银行卡，开通了在线问诊，已开通多点执业认证 5 if(idcard_status == 0 && iden_auth_status == 0){ status = 0; - }else if(idcard_status == 1 && iden_auth_status == 0){ + }else if(idcard_status == 1 && iden_auth_status != 1){ status = 1; - }else if(idcard_status == 1 && iden_auth_status == 1 && is_bind_bank == 0){ + }else if(idcard_status == 1 && iden_auth_status == 1 && is_bind_bank != 1){ status = 2; - }else if(idcard_status == 1 && iden_auth_status == 1 && is_bind_bank == 1 && is_img_expert_reception == 0){ + }else if(idcard_status == 1 && iden_auth_status == 1 && is_bind_bank == 1 && is_img_expert_reception != 1){ status = 3; - }else if(idcard_status == 1 && iden_auth_status == 1 && is_bind_bank == 1 && is_img_expert_reception == 1 && multi_point_status == 0){ + }else if(idcard_status == 1 && iden_auth_status == 1 && is_bind_bank == 1 && is_img_expert_reception == 1 && multi_point_status != 1){ status = 4; }else{ status = 5; diff --git a/Pages/yishi/index/index.wxml b/Pages/yishi/index/index.wxml index fcfcd55..82147a0 100644 --- a/Pages/yishi/index/index.wxml +++ b/Pages/yishi/index/index.wxml @@ -57,7 +57,7 @@ - + 多点执业认证 @@ -75,7 +75,7 @@ - + - 我的简介 + 简介管理 - 在线问诊 + 在线问诊管理 - 快速问诊 + 快速问诊管理 - 公益问诊 + 公益问诊管理 联系客服 - + + + - + 价格设置 @@ -41,8 +41,8 @@ - - 去接诊 + + 去接诊 diff --git a/Pages/yishi/myinfo/index.js b/Pages/yishi/myinfo/index.js index ec564ba..076d713 100644 --- a/Pages/yishi/myinfo/index.js +++ b/Pages/yishi/myinfo/index.js @@ -7,14 +7,17 @@ Page({ showCapsule: 1, //是否显示左上角图标 1表示显示 0表示不显示 title: '我的信息', //导航栏 中间的标题 }, - height: app.globalData.height, + height: app.globalData.height, card_name: "", card_num_mask: "", doctor_id: "", idcard_status: 0, iden_auth_status: 0, user_name: "", - brief_introduction: "我的简介" + brief_introduction: "我的简介", + v_show: false, + v_message: "", + next_url: "/Pages/yishi/identity/index" }, onLoad(){ //获取医生我的账户数据 @@ -32,13 +35,14 @@ Page({ }, logOut(){ console.log("退出登录"); + let usertype = wx.getStorageSync('usertype'); wx.showModal({ title: '确认退出登录', content: '退出登录后您需要重新登录', success (res) { if (res.confirm) { console.log('用户点击确定') - wx.setStorageSync('AUTH_TOKEN', ""); + wx.setStorageSync('AUTH_TOKEN_'+usertype, ""); wx.setStorageSync('user_id', ""); wx.setStorageSync('client_user_id', ""); app.go("/Pages/index/index"); @@ -47,6 +51,50 @@ Page({ } } }) + }, + go(e){ + if(this.data.idcard_status != 1){ + this.setData({ + v_show: true, + v_message: "请先进行实名认证", + next_url: "/Pages/yishi/identity/index" + }) + return; + } + if(this.data.iden_auth_status != 1){ + this.setData({ + v_show: true, + v_message: "请先进行医师身份认证", + next_url: "/Pages/yishi/identity/index?selected_tab=1", + }) + return; + } + app.go(e.currentTarget.dataset.url) + }, + go1(e){ + if(this.data.idcard_status != 1){ + this.setData({ + v_show: true, + v_message: "请先进行实名认证", + next_url: "/Pages/yishi/identity/index" + }) + return; + } + app.go(e.currentTarget.dataset.url) + }, + go2(e){ + if(this.data.iden_auth_status != 1){ + this.setData({ + v_show: true, + v_message: "请先进行医师身份认证", + next_url: "/Pages/yishi/identity/index?selected_tab=1", + }) + return; + } + app.go(e.currentTarget.dataset.url) + }, + goIn(){ + app.go(this.data.next_url) } }) \ No newline at end of file diff --git a/Pages/yishi/myinfo/index.json b/Pages/yishi/myinfo/index.json index c97fb39..cd86b08 100644 --- a/Pages/yishi/myinfo/index.json +++ b/Pages/yishi/myinfo/index.json @@ -4,6 +4,7 @@ "te-nav-bar": "/commpents/te_navbar", "van-cell": "@vant/weapp/cell/index", "van-cell-group": "@vant/weapp/cell-group/index", - "van-button": "@vant/weapp/button/index" + "van-button": "@vant/weapp/button/index", + "van-dialog": "@vant/weapp/dialog/index" } } \ No newline at end of file diff --git a/Pages/yishi/myinfo/index.wxml b/Pages/yishi/myinfo/index.wxml index 7831e02..0013b44 100644 --- a/Pages/yishi/myinfo/index.wxml +++ b/Pages/yishi/myinfo/index.wxml @@ -1,13 +1,22 @@ - - - - + + + + 退出登录 + + \ No newline at end of file diff --git a/Pages/yishi/myinfo/index.wxss b/Pages/yishi/myinfo/index.wxss index e69de29..1b690af 100644 --- a/Pages/yishi/myinfo/index.wxss +++ b/Pages/yishi/myinfo/index.wxss @@ -0,0 +1,5 @@ +.van-cell__value { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} \ No newline at end of file diff --git a/Pages/yishi/myprofile/index.wxml b/Pages/yishi/myprofile/index.wxml index 7b691fc..b3b7e70 100644 --- a/Pages/yishi/myprofile/index.wxml +++ b/Pages/yishi/myprofile/index.wxml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/Pages/yishi/onlinechufang/index.js b/Pages/yishi/onlinechufang/index.js index 3e455d7..982245f 100644 --- a/Pages/yishi/onlinechufang/index.js +++ b/Pages/yishi/onlinechufang/index.js @@ -1,6 +1,5 @@ import Toast from '@vant/weapp/toast/toast'; import { API } from './../../../utils/network/api' - const api = new API() const app = getApp() Page({ @@ -29,9 +28,30 @@ Page({ save_durg_single_use: "", save_durg_packaging_unit: "", save_durg_frequency_use: "", - save_durg_available_days: "" + save_durg_available_days: "", + order_inquiry_id: "", + doctor_advice: "", + doctors_advice_focus: false, + case_detail: {} + }, + onDoctorsAdviceFocus(){ + this.setData({ + doctors_advice_focus: true + }) + }, + onLoad(options){ + let order_inquiry_id = options.order_inquiry_id; + //获取患者问诊病例 + api.getDoctorInquiryCase({order_inquiry_id: order_inquiry_id}).then(response => { + console.log(response); + this.setData({ + case_detail: response.data + }) + }).catch(errors => {console.error(errors);}) + this.setData({ + order_inquiry_id: order_inquiry_id + }) }, - select_drug(e){ this.setData({ drug_content_show: true, @@ -253,5 +273,44 @@ Page({ drugs_box_item_list: list }) } + }, + getAdvice(e){ + console.log(e.detail.value) + this.setData({ + doctor_advice: e.detail.value + }) + }, + postDoctorPrescription(){//新增处方 + console.log("postDoctorPrescription postDoctorPrescription"); + let params = {}; + params.order_inquiry_id = this.data.order_inquiry_id; + params.doctor_advice = this.data.doctor_advice; + let prescription_icd = []; + this.data.zhenduan_list.forEach(item => { + prescription_icd.push(item.disease_class_id); + }) + params.prescription_icd = prescription_icd; + params.prescription_product = this.data.drugs_box_item_list; + + console.log(params); + + api.postDoctorPrescription(params).then(response => { + console.log(response); + + }).catch(errors => {console.error(errors);}) + }, + putDoctorPrescription(){//修改处方 + let params = {}; + api.putDoctorPrescription(params).then(response => { + console.log(response); + + }).catch(errors => {console.error(errors);}) + }, + getDoctorPrescriptionInfo(){//获取处方详情 + let params = {}; + api.getDoctorPrescriptionInfo(params).then(response => { + console.log(response); + + }).catch(errors => {console.error(errors);}) } }) \ No newline at end of file diff --git a/Pages/yishi/onlinechufang/index.wxml b/Pages/yishi/onlinechufang/index.wxml index 64ecba7..32a9bf2 100644 --- a/Pages/yishi/onlinechufang/index.wxml +++ b/Pages/yishi/onlinechufang/index.wxml @@ -1,21 +1,21 @@ - + - 张三三 - 男 | 30岁 - 查看病历 + {{case_detail.name}} + {{case_detail.sex==1?'男':case_detail.sex==2?'女':'未知'}}｜{{case_detail.age}}岁 + 查看病历 病情主诉： - 头疼，腰疼、肩膀酸、等症状已经困，头疼，腰疼、肩膀酸、等症状已经困 + {{case_detail.disease_desc}} 用药意向： - 肝功能异常 + {{item}}; - + @@ -22,9 +22,9 @@ - 您还未设置在线问诊价格 + 未收到任何消息 - 开通图文问诊 + - + - + - + + + + 提示：平台会在1~3天内审核您提交的资料，审核结果会第一时间通知您。 {{btn_txt}} - - - + \ No newline at end of file diff --git a/TUIKit/components/TUIChat/components/MessageInput/index.js b/TUIKit/components/TUIChat/components/MessageInput/index.js index b39dd2b..63becfd 100644 --- a/TUIKit/components/TUIChat/components/MessageInput/index.js +++ b/TUIKit/components/TUIChat/components/MessageInput/index.js @@ -342,7 +342,7 @@ Component({ app.go("/Pages/yishi/case/index?order_inquiry_id="+this.data.order_inquiry_id) break; case '11'://在线开方 - app.go("/Pages/yishi/onlinechufang/index") + app.go("/Pages/yishi/onlinechufang/index?order_inquiry_id="+this.data.order_inquiry_id) break; default: break; diff --git a/commpents/myprofile/index.js b/commpents/myprofile/index.js index 09c0439..c19e37d 100644 --- a/commpents/myprofile/index.js +++ b/commpents/myprofile/index.js @@ -96,6 +96,7 @@ Component({ license_cert_reason: "", qualification_cert_reason: "", work_cert_reason: "", + department_custom_name_reason: '' }, options: { @@ -108,15 +109,14 @@ Component({ console.log("myprofile attached") let _this = this; console.log(_this.data.zhicheng_columns); - _this.setData({ - "zhicheng_columns[0].text": "AAA" - }) console.log(_this.data.zhicheng_columns); + + //获得医师身份认证 - api.getDoctorAuthIden().then(response => { + api.getDoctorAuthIden({source: this.data.indentity?1:2}).then(response => { console.log("getDoctorAuthIden: ",response); this.setData({ - is_avatar: true, + doctorauthiden_data_ready: true, textarea_jianjie: response.data.brief_introduction, textarea_shanchang: response.data.be_good_at, @@ -137,12 +137,13 @@ Component({ license_cert_reason: response.data.license_cert_reason, qualification_cert_reason: response.data.qualification_cert_reason, work_cert_reason: response.data.work_cert_reason, + department_custom_name_reason: response.data.department_custom_name_reason, }); let iden_auth_status = response.data.iden_auth_status; console.log("iden_auth_status: ",iden_auth_status) let iden_auth_status_txt = iden_auth_status == 0?'请完善资料后提交':iden_auth_status == 1?'认证通过': iden_auth_status==2?'资料已提交，审核中':iden_auth_status==3?'认证失败':'未认证'; - let iden_auth_disabled = iden_auth_status == 0?false:iden_auth_status == 1?false: iden_auth_status==2?true:iden_auth_status==3?false:true; + let iden_auth_disabled = iden_auth_status == 0?false:iden_auth_status == 1?true: iden_auth_status==2?true:iden_auth_status==3?false:true; console.log("iden_auth_disabled: ",iden_auth_disabled) this.setData({ iden_auth_status_txt: iden_auth_status_txt, @@ -182,12 +183,12 @@ Component({ }) } let avatar = response.data.avatar; - if(avatar && (avatar.indexOf("http") == -1)){ - avatar = api.getStaticHost() + avatar; + if(avatar){ + this.setData({ + "avatar": avatar, + is_avatar: true, + }) } - this.setData({ - "avatar": avatar - }) }).catch(errors => {console.error(errors);}) //加载省份列表 @@ -471,7 +472,18 @@ Component({ }, onYiYuanShow(e) { console.log("onYiYuanShow"); - this.setData({ yiyuan_show: true }); + let select_province_id = this.data.select_province_id; + let select_city_id = this.data.select_city_id; + let select_county_id = this.data.select_county_id; + if(select_province_id && select_city_id && select_county_id){ + this.setData({ yiyuan_show: true }); + }else{ + wx.showToast({ + title: '请先选择省市', + icon: "error" + }) + } + }, onYiYuanClose(e) { console.log("onYiYuanClose"); @@ -490,11 +502,19 @@ Component({ console.log("onYiYuanConfirm"); const { picker, value, index } = event.detail; console.log(event.detail); - this.setData({ - yiyuan_show: false, - select_yiyuan_id: `${value.value}`, - yiyuan_note: `${value.text}` - }); + if(value.value){ + this.setData({ + yiyuan_show: false, + select_yiyuan_id: `${value.value}`, + yiyuan_note: `${value.text}` + }); + }else{ + wx.showToast({ + title: '请先选择医院', + icon: "error" + }) + } + }, onYiYuanChange(event) { console.log("onYiYuanChange"); @@ -598,29 +618,48 @@ Component({ console.log("onZhiChengClose"); this.setData({ zhicheng_img_show: false }); }, - getTextAreaVal(e){ - console.log("myindex: ", e); - let textarea_name = e.currentTarget.dataset.textarea_name; + onCustomKeshiChange(){ this.setData({ - [textarea_name]: e.detail.value + department_custom_name_reason: "" + }) + }, + getTextAreaVal(e){ + console.log("myindex: ", e);//textarea_jianjie + let textarea_name = e.currentTarget.dataset.textarea_name; + if(textarea_name == "textarea_jianjie"){ + this.setData({ + brief_introduction_reason: "" + }) + } + if(textarea_name == "textarea_shanchang"){ + this.setData({ + be_good_at_reason: "" + }) + } + let reason_name = textarea_name+"_reason"; + this.setData({ + [textarea_name]: e.detail.value, }) }, select_zhuanchang(e){ console.log(e); let count = 0 this.data.zhuanchang_columns.forEach(item => { - count = count + 1; + if(item.is_selected == 1){ + count = count + 1; + } }) - if(count < 10){ - let is_selected = e.currentTarget.dataset.is_selected; - let index = e.currentTarget.dataset.index; - let data = "zhuanchang_columns["+index+"].is_selected"; - this.setData({[data]: is_selected==1?0:1}) - }else{ + + if(count >= 10 && e.currentTarget.dataset.is_selected==0){ wx.showToast({ title: '最多10个专长', icon: "error" }) + }else{ + let is_selected = e.currentTarget.dataset.is_selected; + let index = e.currentTarget.dataset.index; + let data = "zhuanchang_columns["+index+"].is_selected"; + this.setData({[data]: is_selected==1?0:1}) } }, zhuanchangConfirm(e){ @@ -629,9 +668,14 @@ Component({ zhuanchangConcle(e){ this.setData({ zhuanchang_show: false }); }, - addDoctorAuthIden(){ - let params = {}; + addDoctorAuthIden(e){ + console.log("addDoctorAuthIden addDoctorAuthIden") + let from = e.currentTarget.dataset.from; + console.log("from: ", from); + let params = {}; + + params.source = from=="myinfo"?2:1; if(!this.data.is_avatar){wx.showToast({title: '请上传头像',icon: "error"});return} params.avatar = this.data.avatar; if(!this.data.select_county_id){wx.showToast({title: '请选择城市',icon: "error"});return} @@ -639,7 +683,7 @@ Component({ params.hospital_id = this.data.select_yiyuan_id;//医院id if(!this.data.select_keshi_id){wx.showToast({title: '请选择科室',icon: "error"});return} params.department_custom_id = this.data.select_keshi_id;//科室id - if(!this.data.custom_keshi){wx.showToast({title: '请输入科室',icon: "error"});return} + // if(!this.data.custom_keshi){wx.showToast({title: '请输入科室',icon: "error"});return} params.department_custom_name = this.data.custom_keshi;//自定义科室名称 if(!this.data.office_phone){wx.showToast({title: '请输入科室电话',icon: "error"});return} params.department_custom_mobile = this.data.office_phone;//科室电话 @@ -652,34 +696,112 @@ Component({ if(!this.data.textarea_shanchang){wx.showToast({title: '请输入擅长',icon: "error"});return} params.be_good_at = this.data.textarea_shanchang;//擅长 - if(this.data.zhiye_file_list.length == 0){wx.showToast({title: '请上传医师执业证',icon: "error"});return} - params.license_cert = this.data.zhiye_file_list.map(e => e.url);//医师执业证 - if(this.data.zige_file_list.length == 0){wx.showToast({title: '请上传医师资格证',icon: "error"});return} - params.qualification_cert = this.data.zige_file_list.map(e => e.url);//医生资格证 - if(this.data.zhicheng_file_list.length == 0){wx.showToast({title: '请上传职称证',icon: "error"});return} - params.work_cert = this.data.zhicheng_file_list.map(e => e.url);//工作证，职称证 + if(from == "doctorauthiden"){//只有在医师身份认证模块才去修改证件 + if(this.data.zhiye_file_list.length == 0){wx.showToast({title: '请上传医师执业证',icon: "error"});return} + if(this.data.zhiye_file_list.length < 2){wx.showToast({title: '医师执业证至少2张',icon: "error"});return} + params.license_cert = this.data.zhiye_file_list.map(e => e.url);//医师执业证 + if(this.data.zige_file_list.length == 0){wx.showToast({title: '请上传医师资格证',icon: "error"});return} + params.qualification_cert = this.data.zige_file_list.map(e => e.url);//医生资格证 + if(this.data.zhicheng_file_list.length == 0){wx.showToast({title: '请上传职称证',icon: "error"});return} + params.work_cert = this.data.zhicheng_file_list.map(e => e.url);//工作证，职称证 + } console.log(params); let _this = this; - wx.requestSubscribeMessage({ - tmplIds: ['kUy70xHlr7ADo4aIHiictM4Te7MSec3E5kHsYvFQu40'], - success (res) { - console.log(res); - api.postDoctorAuthIden(params).then(response => { - console.log(response); - wx.showToast({ - title: '提交成功', - icon: "success" - }) - _this.setData({ - iden_auth_status_txt: "审核中", - iden_auth_disabled: true - }) - }).catch(errors => {console.error(errors);}) - } + api.postDoctorAuthIden(params).then(response => { + console.log(response); + wx.showToast({ + title: '提交成功', + icon: "success" + }) + _this.setData({ + iden_auth_status_txt: "资料已提交，审核中", + iden_auth_disabled: true, + iden_auth_status: 2, + }) + }).catch(errors => {console.error(errors);}) + }, + onOfficePhoneChange(){ + this.setData({ + department_custom_mobile_reason: "" }) }, doUploadFile(event) { + console.log("index douploadFIle: ", event); + const scene = event.currentTarget.dataset.scene; + const field_name = event.currentTarget.dataset.field_name; + const file_multiple = event.currentTarget.dataset.file_multiple;//是否为多张图 + console.log("scene: ", scene); + console.log("field_name: ", field_name); + console.log("file_multiple: ", file_multiple); + let _this = this; + api.getOssSign({user_type:2,scene:scene}).then(response => { + console.log(response); + const { file } = event.detail; + + file.forEach(item => { + console.log("file: ", item); + const filename = FileUtil.getFileName(item); + const host = response.data.host; + const signature = response.data.signature; + const ossAccessKeyId = response.data.accessid; + const policy = response.data.policy; + const key = response.data.dir+filename; + const filePath = item.url; // 待上传文件的文件路径。 + wx.uploadFile({ + url: host, // 开发者服务器的URL。 + filePath: filePath, + name: 'file', // 必须填file。 + formData: { + key, + policy, + OSSAccessKeyId: ossAccessKeyId, + signature, + }, + success: (res) => { + console.log("upload: ", res); + let reason_name = field_name + "_reason";//错误原因置空 + if (res.statusCode === 204) { + if(scene == 1){ + this.setData({ + is_avatar: true + }) + } + wx.showToast({title: '上传成功'}) + if(file_multiple == "true"){//多张图 + let img = {} + img.url = host+"/"+key; + img.isImg = true; + + let img_list = _this.data[field_name]; + console.log("img_list: ", img_list); + img_list.push(img); + console.log("img_list: ", img_list); + + reason_name = field_name=='zhiye_file_list'?'license_cert_reason':field_name=='zige_file_list'?'qualification_cert_reason':'work_cert_reason'; + this.setData({ + [field_name]: img_list, + [reason_name]: "" + }); + }else{ + this.setData({ + [field_name]: host+"/"+key, + [reason_name]: "" + }); + } + } + }, + fail: err => { + console.log(err); + } + }); + }) + + }).catch(errors => { + console.error(errors); + }) + }, + doUploadPhoto(event) { console.log("index douploadFIle: ", event); const scene = event.currentTarget.dataset.scene; const field_name = event.currentTarget.dataset.field_name; @@ -711,6 +833,7 @@ Component({ }, success: (res) => { console.log("upload: ", res); + let reason_name = field_name + "_reason";//错误原因置空 if (res.statusCode === 204) { if(scene == 1){ this.setData({ @@ -727,12 +850,17 @@ Component({ console.log("img_list: ", img_list); img_list.push(img); console.log("img_list: ", img_list); - + + reason_name = field_name=='zhiye_file_list'?'license_cert_reason':field_name=='zige_file_list'?'qualification_cert_reason':'work_cert_reason'; this.setData({ - [field_name]: img_list + [field_name]: img_list, + [reason_name]: "" }); }else{ - this.setData({[field_name]: host+"/"+key}); + this.setData({ + [field_name]: host+"/"+key, + [reason_name]: "" + }); } } }, diff --git a/commpents/myprofile/index.wxml b/commpents/myprofile/index.wxml index 1f943bd..d4eff7f 100644 --- a/commpents/myprofile/index.wxml +++ b/commpents/myprofile/index.wxml @@ -1,6 +1,6 @@ 头像 * - + 真人正脸 @@ -39,7 +39,6 @@ round > - - + + + + + + + {{ department_custom_name_reason }} + + + + @@ -172,15 +181,16 @@ + > + 科室电话 * + @@ -238,6 +248,7 @@ upload_cell_note="查看示例" has_error_content="{{ license_cert_reason }}" wx:if="{{indentity}}" + is_multiple="true" /> - - {{iden_auth_status_txt}} - \ No newline at end of file + {{iden_auth_status_txt}} + + + {{iden_auth_status_txt}} + + + + \ No newline at end of file diff --git a/commpents/myprofile/index.wxss b/commpents/myprofile/index.wxss index 70dd2b1..6a38235 100644 --- a/commpents/myprofile/index.wxss +++ b/commpents/myprofile/index.wxss @@ -1,6 +1,4 @@ -.required{ - color: #e34d59; -} + .photo{ position: relative; padding: 32rpx 32rpx 32rpx 0; @@ -67,6 +65,9 @@ margin: 20rpx 10rpx 20rpx 0; font-size: 28rpx; } +.t-radio__icon--checked { + color: #49B9AD !important; +} .t-tabs__item--active{ color: #49B9AD !important; } @@ -119,10 +120,6 @@ height: 300rpx; background-color: cadetblue; } -/* 自定义 vant required 小红点位置 */ -.van-cell--required::before { - left: 4.7rem !important; -} .zhuanchang_box{ display: flex; flex-wrap: wrap; @@ -142,7 +139,6 @@ } .zhuanchang_block { width: 100vw; - height: 240px; background: #fff; border-top-left-radius: 16rpx; border-top-right-radius: 16rpx; @@ -220,4 +216,7 @@ .van-search { top: -270px !important; position: relative !important; +} +.custom_keshi_error{ + display: none; } \ No newline at end of file diff --git a/commpents/upload-cell/index.js b/commpents/upload-cell/index.js index afdf91e..bc98b18 100644 --- a/commpents/upload-cell/index.js +++ b/commpents/upload-cell/index.js @@ -12,6 +12,10 @@ Component({ type: Boolean, value: true, }, + disabled: { + type: Boolean, + value: false, + }, upload_cell_note: { type: String, value: '示例备注', @@ -39,6 +43,10 @@ Component({ max_count:{ type: Number, value: 1 + }, + is_multiple:{ + type: Boolean, + value: false, } }, diff --git a/commpents/upload-cell/index.wxml b/commpents/upload-cell/index.wxml index a423d5c..2a90ff0 100644 --- a/commpents/upload-cell/index.wxml +++ b/commpents/upload-cell/index.wxml @@ -1,7 +1,7 @@ {{ upload_cell_name }} * - + {{ upload_cell_note }} @@ -10,7 +10,7 @@ {{ upload_cell_desc }} - + diff --git a/commpents/wenzhen_data/index.js b/commpents/wenzhen_data/index.js index 837b185..34528c0 100644 --- a/commpents/wenzhen_data/index.js +++ b/commpents/wenzhen_data/index.js @@ -1,3 +1,5 @@ +import { API } from "../../utils/network/api"; +const api = new API() // commpents/wenzhen_data/index.js Component({ /** @@ -87,6 +89,8 @@ Component({ this.setData({ show: false }) + + console.log("开始订阅消息"); wx.requestSubscribeMessage({ tmplIds: ['jhYUf91ULCTX_f69hazqAYwImdFf8ELasRAwB6X-MTM'], success (res) { @@ -100,6 +104,24 @@ Component({ } }) }, + postDoctorInquiry(e){ + this.setData({ + show: false + }) + console.log("order_inquiry_id: ", e.currentTarget.dataset.order_inquiry_id); + let params = {}; + params.order_inquiry_id = e.currentTarget.dataset.order_inquiry_id; + console.log("params: ",params) + api.postDoctorInquiry(params).then(response => { + console.log("开始接诊"); + console.log(response); + }).then(() => { + this.goChat(e); + }).catch(errors => { + console.error(errors); + }) + + }, tabShow(){ this.setData({ show: true diff --git a/commpents/wenzhen_data/index.wxml b/commpents/wenzhen_data/index.wxml index 753f406..1e4d7b3 100644 --- a/commpents/wenzhen_data/index.wxml +++ b/commpents/wenzhen_data/index.wxml @@ -14,7 +14,7 @@ 去接诊 - 问诊详情 + 问诊详情 @@ -27,7 +27,7 @@ 为保障服务质量，请您查看患者病历信息在选择是否接诊。 去查看 - 去接诊 + 去接诊 \ No newline at end of file diff --git a/custom-tab-bar/index.js b/custom-tab-bar/index.js index 52db41a..e99326d 100644 --- a/custom-tab-bar/index.js +++ b/custom-tab-bar/index.js @@ -29,21 +29,21 @@ Component({ "list2":[ { "pagePath": "/Pages/yishi/index/index", - "text": "首页(Y)", + "text": "首页", "iconPath": "/static/images/yishi/tabbar_icon/index.png", "selectedIconPath": "/static/images/yishi/tabbar_icon/index_select.png", "info": "" }, { "pagePath": "/Pages/yishi/wenzhen_v2/wenzhen", - "text": "问诊(Z)", + "text": "问诊", "iconPath": "/static/images/yishi/tabbar_icon/wenzhen.png", "selectedIconPath": "/static/images/yishi/tabbar_icon/wenzhen_select.png", "info": "99" }, { "pagePath": "/Pages/yishi/my/index", - "text": "我的(Y)", + "text": "我的", "iconPath": "/static/images/yishi/tabbar_icon/my.png", "selectedIconPath": "/static/images/yishi/tabbar_icon/my_select.png", "info": "" @@ -56,6 +56,7 @@ Component({ index_info: "", wenzhen_info: "", my_info: "", + next_url: "/Pages/yishi/identity/index" }, attached() { const usertype = wx.getStorageSync('usertype') @@ -102,27 +103,45 @@ Component({ // }, onChange(e) { console.log("custom tab bar onChange"); - - let idcard_status = wx.getStorageSync('idcard_status'); - let iden_auth_status = wx.getStorageSync('iden_auth_status'); + let userID = wx.getStorageSync('user_id'); + let idcard_status = wx.getStorageSync(userID+'_idcard_status'); + let iden_auth_status = wx.getStorageSync(userID+'_iden_auth_status'); + let multi_point_status = wx.getStorageSync(userID+'_multi_point_status'); + let is_bind_bank = wx.getStorageSync(userID+'_is_bind_bank'); + const usertype = wx.getStorageSync('usertype'); console.log("idcard_status: ", idcard_status); console.log("iden_auth_status: ", iden_auth_status); - if(idcard_status != 1){ + console.log("multi_point_status: ", iden_auth_status); + console.log("is_bind_bank: ", is_bind_bank); + + if(idcard_status != 1 && usertype != 3){ this.setData({ dialog_visible: true, - dialog_content: "请您先实名认证" + dialog_content: "请您先实名认证", + next_url: "/Pages/yishi/identity/index", }) return; } - if(iden_auth_status != 1){ + console.log(111); + if(iden_auth_status != 1 && usertype != 3){ this.setData({ dialog_visible: true, - dialog_content: "请您先医师身份认证" + dialog_content: "请您先医师身份认证", + next_url: "/Pages/yishi/identity/index?selected_tab=1", }) return; } - + console.log(222); + if(is_bind_bank != 1 && usertype != 3){ + this.setData({ + dialog_visible: true, + dialog_content: "请您先绑定结算银行卡", + next_url: "/Pages/yishi/bankcard/index" + }) + return; + } + console.log(333); let url = this.data.items[e.detail].pagePath; console.log(url); wx.switchTab({ @@ -133,7 +152,9 @@ Component({ this.setData({ dialog_visible: false }) - app.go("/Pages/yishi/identity/index"); + console.log("next_url: ", this.data.next_url); + let next_url = this.data.next_url; + app.go(next_url); }, cancelDialog(){ this.setData({ diff --git a/static/images/123.png b/static/images/123.png new file mode 100644 index 0000000..028473a Binary files /dev/null and b/static/images/123.png differ diff --git a/utils/network/api.js b/utils/network/api.js index 033c7a7..4111e8c 100644 --- a/utils/network/api.js +++ b/utils/network/api.js @@ -362,6 +362,38 @@ class API extends HTTP { ...params } }) +} + //获取处方详情 + getDoctorPrescriptionInfo(params) { + return this.request({ + url: `${this.baseUrl}/doctor/prescription/info`, + method: 'GET', + data: { + ...params + } + }) +} + //修改处方 + putDoctorPrescription(params) { + return this.request({ + url: `${this.baseUrl}/doctor/prescription`, + method: 'PUT', + contentType: 'application/json', + data: { + ...params + } + }) +} + //新增处方 + postDoctorPrescription(params) { + return this.request({ + url: `${this.baseUrl}/doctor/prescription`, + method: 'POST', + contentType: 'application/json', + data: { + ...params + } + }) } //获取操作手册列表 getBasicOperationManual(params) { @@ -458,7 +490,17 @@ class API extends HTTP { //获取患者问诊病例 getDoctorInquiryCase(params) { return this.request({ - url: `${this.baseUrl}/doctor/inquiry/case`, + url: `${this.baseUrl}/case`, + method: 'GET', + data: { + ...params + } + }) +} + //获取患者问诊病例 + getCase(params) { + return this.request({ + url: `${this.baseUrl}/case`, method: 'GET', data: { ...params @@ -474,6 +516,94 @@ class API extends HTTP { ...params } }) +} + //药师基本资料 + getPharmacistInfo(params) { + return this.request({ + url: `${this.baseUrl}/pharmacist/info`, + method: 'GET', + data: { + ...params + } + }) +} + //药师端-首页 + getPharmacistIndex(params) { + return this.request({ + url: `${this.baseUrl}/pharmacist/index`, + method: 'GET', + data: { + ...params + } + }) +} + //获取药师审核处方列表 + getPharmacistPrescription(params) { + return this.request({ + url: `${this.baseUrl}/pharmacist/prescription`, + method: 'GET', + data: { + ...params + } + }) +} + //获取处方详情 + getPharmacistPrescriptioninfo(params) { + let order_prescription_id = params.order_prescription_id; + params = {} + return this.request({ + url: `${this.baseUrl}/pharmacist/prescription/info/`+order_prescription_id, + method: 'GET', + data: { + ...params + } + }) +} + //设置上下线 药师端 + putPharmacistOnOff(params) { + return this.request({ + url: `${this.baseUrl}/pharmacist/on-off`, + method: 'PUT', + data: { + ...params + } + }) +} + //药师基本资料 + getPharmacistInfo(params) { + return this.request({ + url: `${this.baseUrl}/pharmacist/info`, + method: 'GET', + data: { + ...params + } + }) +} + //审核处方 + putPharmacistPrescriptionVerify(params) { + let order_prescription_id = params.order_prescription_id; + delete params['order_prescription_id']; + return this.request({ + url: `${this.baseUrl}/pharmacist/prescription/verify/`+order_prescription_id, + method: 'PUT', + data: { + ...params + } + }) +} + //医生接诊 + postDoctorInquiry(params) { + console.log("params from api: ", params); + let order_inquiry_id = params.order_inquiry_id; + console.log("order_inquiry_id: ", order_inquiry_id); + delete params['order_inquiry_id']; + return this.request({ + url: `${this.baseUrl}/doctor/inquiry/`+order_inquiry_id, + method: 'POST', + data: { + ...params + } + }) } } diff --git a/utils/network/request.js b/utils/network/request.js index e0c1d2d..cf4b2c1 100644 --- a/utils/network/request.js +++ b/utils/network/request.js @@ -1,5 +1,5 @@ const env = require('./config').dev - +const app = getApp() class HTTP { constructor() { this.baseUrl = env.baseUrl, @@ -21,6 +21,7 @@ class HTTP { _request(url, resolve, reject, data = {}, method = 'GET', contentType = 'application/x-www-form-urlencoded', showLoading = true) { if(showLoading) wx.showLoading(); + let usertype = wx.getStorageSync('usertype'); wx.request({ url: url, method: method, @@ -28,13 +29,13 @@ class HTTP { header: { 'content-type': contentType, 'appId': this.appId, - 'Authorization': "Bearer " + wx.getStorageSync('AUTH_TOKEN') + 'Authorization': "Bearer " + wx.getStorageSync('AUTH_TOKEN_'+usertype) }, success: (res) => { console.log("header Authorization: ", res.header.Authorization); var Authorization_token = res.header.Authorization; if(Authorization_token){ - wx.setStorageSync('AUTH_TOKEN', Authorization_token);//当token快过期时，服务器会返回新token，本地刷新 + wx.setStorageSync('AUTH_TOKEN_'+usertype, Authorization_token);//当token快过期时，服务器会返回新token，本地刷新 } if (res.data) { const code = res.data.code; @@ -42,33 +43,38 @@ class HTTP { resolve(res.data) } else if(code == 401 || code == 403 || code == 405 || code == 406){ wx.navigateTo({ - url: "/Pages/index/index" + url: app.globalData.login_url }) } else { reject(res.data.message) - this._show_error(res.data.message) + this._show_error(showLoading, res.data.message) } } else { - resolve(res.data) + reject(res.data) + this._show_error(showLoading, err.data.message) } }, fail: (err) => { reject() - this._show_error(err.data.message) + this._show_error(showLoading, err.data.message) }, - complete: () => { - if(showLoading) wx.hideLoading(); + complete: (res) => { + console.log("res from cmplete： ",res) + const code = res.data.code; + if (code == 200) { + if(showLoading) wx.hideLoading(); + } } }) } - _show_error(_message) { + _show_error(showLoading, _message) { + if(showLoading) wx.hideLoading(); wx.showToast({ title: `${_message}`, icon: 'none', duration: 2000 }) - } }