diff --git a/Pages/mobile_login/index.js b/Pages/mobile_login/index.js index ac6fef6..0b9409c 100644 --- a/Pages/mobile_login/index.js +++ b/Pages/mobile_login/index.js @@ -21,11 +21,19 @@ Page({ }); }, phone_change(e){ - let phone = this.data.phone; - if(phone != ""){ + let phone = e.detail.value; + this.setData({ + phone: e.detail.value + }) + let phone_reg = /^1[3-9]\d{9}$/; + if(phone_reg.test(phone)){ this.setData({ btn_color: "#3CC7C0" }) + }else{ + this.setData({ + btn_color: "#ccc" + }) } }, getCodePhone(e){ @@ -139,7 +147,7 @@ Page({ }) }else{ _this.setData({ - btn_msg: "获取验证码", + btn_msg: "重新获取验证码", btn_disabled: false }) clearInterval(time_index); diff --git a/Pages/mobile_login/index.wxml b/Pages/mobile_login/index.wxml index 2a0684a..1c9f1ee 100644 --- a/Pages/mobile_login/index.wxml +++ b/Pages/mobile_login/index.wxml @@ -3,22 +3,21 @@ - + + +86 + + + + {{btn_msg}} diff --git a/Pages/mobile_login/index.wxss b/Pages/mobile_login/index.wxss index ec68852..5f9ba0d 100644 --- a/Pages/mobile_login/index.wxss +++ b/Pages/mobile_login/index.wxss @@ -10,4 +10,44 @@ .btn{ font-size: 28rpx; color: #666666; +} +.van-cell { + padding: 32rpx !important; + font-size: 34rpx !important; +} +.mylabel{ + background-color: red; + width: 100rpx !important; +} +.label-class{ + background-color: royalblue !important; +} +.phone_box{ + display: flex; + padding: 32rpx; + position: relative; +} +.country{ + flex: 1; + height: 24px; + line-height: 24px; +} +.phone{ + flex: 7; + height: 24px; +} +.phone_box:after { + border-bottom: 1px solid #ebedf0; + bottom: 0; + box-sizing: border-box; + content: " "; + left: 16px; + pointer-events: none; + position: absolute; + right: 16px; + transform: scaleY(.5); + transform-origin: center; + border-bottom-width: 1px; + border-bottom-style: solid; + border-bottom-color: rgb(235, 237, 240); } \ No newline at end of file diff --git a/Pages/yishi/case/index.js b/Pages/yishi/case/index.js index e73cfb4..da1e13b 100644 --- a/Pages/yishi/case/index.js +++ b/Pages/yishi/case/index.js @@ -9,20 +9,38 @@ Page({ }, height: app.globalData.height, order_inquiry_id: "", - case_detail: {} + case_detail: {}, + imglist: [] }, onLoad(options){ this.setData({ order_inquiry_id: options.order_inquiry_id }) - }, - onShow(){ //获取患者问诊病例 api.getDoctorInquiryCase({order_inquiry_id: this.data.order_inquiry_id}).then(response => { console.log(response); this.setData({ case_detail: response.data }) + }).then(res => { + this.formatImgList(); }).catch(errors => {console.error(errors);}) - } + }, + formatImgList(){ + let diagnose_images = this.data.case_detail.diagnose_images; + let img_list = []; + diagnose_images.forEach(item => { + let img = {}; + img.isImage = true; + img.url = item; + img_list.push(img); + }) + this.setData({ + imglist: img_list + }) + }, + onShow(){ + + }, + }) \ No newline at end of file diff --git a/Pages/yishi/case/index.json b/Pages/yishi/case/index.json index ee34b87..3e38f1a 100644 --- a/Pages/yishi/case/index.json +++ b/Pages/yishi/case/index.json @@ -2,6 +2,6 @@ "component": true, "usingComponents": { "te-nav-bar": "/commpents/te_navbar", - "t-image": "tdesign-miniprogram/image/image" + "van-uploader": "@vant/weapp/uploader/index" } } \ No newline at end of file diff --git a/Pages/yishi/case/index.wxml b/Pages/yishi/case/index.wxml index 85ce54d..2fdb5b4 100644 --- a/Pages/yishi/case/index.wxml +++ b/Pages/yishi/case/index.wxml @@ -48,46 +48,47 @@ - 问诊本人复诊凭证(病例/处方单/检查报告/住院单可任选其一)： - 无 + 复诊凭证(病例/处方单/检查报告/住院单)： + 无 - + + 其他信息 - + 过敏史： {{case_detail.is_allergy_history==0?'否':case_detail.allergy_history}} - + 家族史： {{case_detail.is_family_history==0?'否':case_detail.family_history}} - + 是否备孕、妊娠或者哺乳期： {{case_detail.is_pregnant==0?'否':case_detail.pregnant}} - + 饮酒史： {{case_detail.drink_wine_status==1?'从不':case_detail.drink_wine_status==2?'偶尔':case_detail.drink_wine_status==3?'经常':case_detail.drink_wine_status==4?'每天':case_detail.drink_wine_status==5?'已戒酒':'其他'}} - + 吸烟史： {{case_detail.smoke_status==1?'从不':case_detail.smoke_status==2?'偶尔':case_detail.smoke_status==3?'经常':case_detail.smoke_status==4?'每天':case_detail.smoke_status==5?'已戒烟':'其他'}} - + 手术史： {{case_detail.is_operation==0?'否':case_detail.operation}} - + 接触化学物： {{case_detail.chemical_compound_status==1?'从不':case_detail.chemical_compound_status==2?'偶尔':case_detail.chemical_compound_status==3?'经常':case_detail.chemical_compound_status==4?'每天':'其他'}} - + 详细描述:{{case_detail.chemical_compound_describe}} diff --git a/Pages/yishi/case/index.wxss b/Pages/yishi/case/index.wxss index e04e7a1..91cb70e 100644 --- a/Pages/yishi/case/index.wxss +++ b/Pages/yishi/case/index.wxss @@ -2,7 +2,7 @@ page{ background-color: #F6F6F6; } .container{ - width: 100vw; + /* width: 100vw; */ padding: 0 4vw; } .main_title{ @@ -38,14 +38,14 @@ page{ } .info_item{ text-align: center; - width: 180rpx; + /* width: 180rpx; */ height: 60rpx; display: flex; align-items: center; margin-left: 20rpx; } .info_title{ - font-size: 30rpx; + font-size: 28rpx; color: #333333; } .info_val{ @@ -77,7 +77,19 @@ page{ margin-bottom: 20rpx; } .img_box{ - + display: flex; + flex-wrap: wrap; +} +.van-uploader__wrapper{ + display: flex !important; +} +.van-uploader__preview{ + padding: 20rpx 15rpx !important; + background-color: #E4E4E4 !important; + border-radius: 15rpx; + width: 150rpx; + display: flex; + justify-content: center; } .orther{ margin-bottom: 50rpx; diff --git a/Pages/yishi/cashrecord/index.wxml b/Pages/yishi/cashrecord/index.wxml index 6995638..2cf1161 100644 --- a/Pages/yishi/cashrecord/index.wxml +++ b/Pages/yishi/cashrecord/index.wxml @@ -14,7 +14,7 @@ - {{item.account_name}}（尾号{{item.bank_card_code_four}}） + {{item.account_name}}（尾号{{item.bank_card_code_four}}） {{item.examine_time}} @@ -28,13 +28,13 @@ 个人所得税：￥{{item.income_tax}} - + diff --git a/Pages/yishi/chat/index.js b/Pages/yishi/chat/index.js index cc8a0df..d958605 100644 --- a/Pages/yishi/chat/index.js +++ b/Pages/yishi/chat/index.js @@ -1,8 +1,8 @@ const app = getApp() Page({ data: { - patient_account: "10000", - title: '患者姓名', + patient_account: "", + title: '', height: app.globalData.height, order_inquiry_id: "", inquiry_type: "", diff --git a/Pages/yishi/chat/index.json b/Pages/yishi/chat/index.json index cc86b23..adfc67f 100644 --- a/Pages/yishi/chat/index.json +++ b/Pages/yishi/chat/index.json @@ -2,5 +2,6 @@ "usingComponents": { "TUIChat": "../../../TUIKit/components/TUIChat/index" }, - "navigationStyle": "custom" + "navigationStyle": "custom", + "disableScroll":true } \ No newline at end of file diff --git a/Pages/yishi/chufangsetup/index.js b/Pages/yishi/chufangsetup/index.js index 351f298..86eb7f4 100644 --- a/Pages/yishi/chufangsetup/index.js +++ b/Pages/yishi/chufangsetup/index.js @@ -78,5 +78,10 @@ Page({ }) } }).catch(errors => {console.error(errors);}) - } + }, + go(e){ + let url = e.currentTarget.dataset.url; + console.log(url); + app.go(url); + }, }) \ No newline at end of file diff --git a/Pages/yishi/chufangsetup/index.wxml b/Pages/yishi/chufangsetup/index.wxml index 00f5fb3..23bcd32 100644 --- a/Pages/yishi/chufangsetup/index.wxml +++ b/Pages/yishi/chufangsetup/index.wxml @@ -68,7 +68,7 @@ - {{item.pharmacist_audit_status==0?'审核中':item.pharmacist_audit_status==1?'审核成功':'审核驳回'}} + {{item.pharmacist_audit_status==0?'审核中':item.pharmacist_audit_status==1?'审核成功':'驳回'}} @@ -92,63 +92,20 @@ 驳回原因： - {{item.platform_fail_reason}} + {{item.pharmacist_fail_reason}} 问诊记录 - - + 重开处方 - - - - - - - - - 张三三4 - 男 | 30岁 - - 驳回 - - - - - - 病情诊断： - 4年 - - - 病情诊断： - 头疼，腰疼、肩膀酸、等症状已经困 - - - 病情诊断： - 新冠病毒 - - - 处方时间： - 2022年12月23日 12：45 - - - 驳回原因： - 图片不清晰 - - - - - 问诊记录 - - - 重开处方 - + + diff --git a/Pages/yishi/identity/index.wxss b/Pages/yishi/identity/index.wxss index 29d8b6f..fa5afd1 100644 --- a/Pages/yishi/identity/index.wxss +++ b/Pages/yishi/identity/index.wxss @@ -167,6 +167,11 @@ .zhuanchang_btn--confirm { color: #3cc7c0; } + +/* 自定义医院搜索框样式 */ +.van-search__field .van-cell{ + padding: 10rpx !important; +} .van-picker__columns { height: 264px !important; top: 40px !important; @@ -175,6 +180,7 @@ top: -270px !important; position: relative !important; } + .van-picker__confirm{ color: #3cc7c0 !important; } @@ -207,4 +213,13 @@ } .van-picker__title { font-size: 34rpx !important; +} +.van-empty{ + position: absolute; + width: 100%; + left: 50%; + top: 180rpx; + transform: translateX(-50%); + z-index: 9999999; + background: rgb(255, 255, 255); } \ No newline at end of file diff --git a/Pages/yishi/index/index.js b/Pages/yishi/index/index.js index db5a047..0fa641b 100644 --- a/Pages/yishi/index/index.js +++ b/Pages/yishi/index/index.js @@ -1,5 +1,6 @@ // Pages/yishi/index/index.js import { API } from './../../../utils/network/api' +import { rpxTopx } from './../../../utils/util' const api = new API() const app = getApp() Page({ @@ -92,27 +93,44 @@ Page({ skeleton_loading: true, contactKeFu: false, jiesuan_dialog_show: false, - jiesuan_dialog_visible: false + jiesuan_dialog_visible: false, + aa: 0 }, // 获取状态栏信息 getMenuButtonBound() { + let stateHeight = 0; // 接收状态栏高度 const navHeight = wx.getMenuButtonBoundingClientRect().height; // 获取胶囊高度 let top = 0; - wx.getSystemInfo({ - success(res) { - stateHeight = res.statusBarHeight; - }, - }); + top = wx.getMenuButtonBoundingClientRect().top - stateHeight; // 获取top值 console.log('navHeight', navHeight); console.log('top', top); + this.setData({ // navHeight: navHeight + top * 2, // 导航栏高度 navHeight, // 导航栏高度 stateHeight: stateHeight + top, // 状态栏高度 }); }, + getFunboxHeight(){ + console.log("109: ", rpxTopx(109)) + console.log("113: ", rpxTopx(113)) + const { statusBarHeight } = wx.getSystemInfoSync(); + console.log("statusBarHeight: ", rpxTopx(statusBarHeight)); + let funbox_height = wx.getSystemInfoSync().windowHeight - (this.data.stateHeight + this.data.navHeight + 10) - 55;//减去底部空白 + funbox_height = rpxTopx(funbox_height); + // 147 userinfo的高度 + // 155 认证部分的高度 + // 150 广告部分的高度 + // 40 自定义适配 + funbox_height = funbox_height - 147 - 20 - 30 - 20 - 155 - 30 - 150 - 20 - 30 - 30 - 30 - 30 - 40; + funbox_height = funbox_height / 3; + if(funbox_height > 150) funbox_height = 150 + this.setData({ + funbox_height: funbox_height + }) + }, confirmJieSuanDialog(){ this.setData({ jiesuan_dialog_visible: false @@ -145,7 +163,7 @@ Page({ }) } this.getMenuButtonBound(); - + this.getFunboxHeight(); api.yiShiIndex().then(response => { console.log(response); let avatar = response.data.info.avatar; diff --git a/Pages/yishi/index/index.wxml b/Pages/yishi/index/index.wxml index 1844c43..8849dbd 100644 --- a/Pages/yishi/index/index.wxml +++ b/Pages/yishi/index/index.wxml @@ -1,6 +1,6 @@ - + @@ -12,7 +12,7 @@ - + {{info.user_name}} @@ -90,7 +90,7 @@ - + 简介管理 - + 在线问诊管理 - + 快速问诊管理 - + 公益问诊管理 - + - + {{dateText}} diff --git a/Pages/yishi/myaccount/index.wxss b/Pages/yishi/myaccount/index.wxss index f84c243..3b5f6cb 100644 --- a/Pages/yishi/myaccount/index.wxss +++ b/Pages/yishi/myaccount/index.wxss @@ -44,10 +44,13 @@ page{ .account_left{ flex: 1; text-align: center; + text-align: left; + margin-left: 20rpx; } .account_right{ flex: 1; text-align: center; + text-align: left; } .txt_title{ font-size: 30rpx; diff --git a/Pages/yishi/myprofile/index.wxss b/Pages/yishi/myprofile/index.wxss index 30adba9..4ad7c06 100644 --- a/Pages/yishi/myprofile/index.wxss +++ b/Pages/yishi/myprofile/index.wxss @@ -25,4 +25,26 @@ } .van-cell { padding: 32rpx !important; +} + +/* 自定义医院搜索框样式 */ +.van-search__field .van-cell{ + padding: 10rpx !important; +} +.van-picker__columns { + height: 264px !important; + top: 40px !important; +} +.van-search { + top: -270px !important; + position: relative !important; +} +.van-empty{ + position: absolute; + width: 100%; + left: 50%; + top: 180rpx; + transform: translateX(-50%); + z-index: 9999999; + background: rgb(255, 255, 255); } \ No newline at end of file diff --git a/Pages/yishi/notice_deatil/index.js b/Pages/yishi/notice_deatil/index.js index efef67f..e73a51c 100644 --- a/Pages/yishi/notice_deatil/index.js +++ b/Pages/yishi/notice_deatil/index.js @@ -1,3 +1,5 @@ +import { API } from './../../../utils/network/api' +const api = new API() const app = getApp() Page({ data: { @@ -5,7 +7,25 @@ Page({ showCapsule: 1, //是否显示左上角图标 1表示显示 0表示不显示 title: '公告详情', //导航栏 中间的标题 }, - height: app.globalData.height, + height: app.globalData.height, + notice: {} + }, + onLoad(options){ + let notice_id = options.notice_id; + api.getDoctorMessageSystemDetail({notice_id: notice_id}).then(response => { + console.log(response); + this.setData({ + notice: response.data + }) + }).catch(errors => {console.error(errors);}) + }, + go(e){ + let link_type = this.data.notice.link_type; + let link_params = this.data.notice.link_params; + wx.showToast({ + title: '无数据，不能调试', + icon: "error" + }) } }) \ No newline at end of file diff --git a/Pages/yishi/notice_deatil/index.wxml b/Pages/yishi/notice_deatil/index.wxml index f0020fe..7000760 100644 --- a/Pages/yishi/notice_deatil/index.wxml +++ b/Pages/yishi/notice_deatil/index.wxml @@ -3,20 +3,24 @@ 发信人： - 肝胆小秘书 + {{notice.from_name}} 标题： - 9月份的服务费结算 + {{notice.notice_title}} 时间： - 2022-11-02 12:22:11 + {{notice.notice_send_time}} 内容： - XX医生您好，您9月份的服务费已结算至您的银行卡，请注意查收。 + {{notice.notice_content}} - 我的账户 + 我的账户 + 联系客服 + 查看协议 + 订单详情 + 查看处方 \ No newline at end of file diff --git a/Pages/yishi/onlinechufang/index.js b/Pages/yishi/onlinechufang/index.js index 982245f..e9d32dc 100644 --- a/Pages/yishi/onlinechufang/index.js +++ b/Pages/yishi/onlinechufang/index.js @@ -20,7 +20,7 @@ Page({ drug_content_show: false, search_drug_list_empty: true, search_drug_list: [], - select_drug_name: "", + product_name: "", select_drug_id: "", save_durg_product_id: "", save_durg_prescription_product_num: "", @@ -30,9 +30,11 @@ Page({ save_durg_frequency_use: "", save_durg_available_days: "", order_inquiry_id: "", + order_prescription_id: "", doctor_advice: "", doctors_advice_focus: false, - case_detail: {} + case_detail: {}, + sub_disabled: false, }, onDoctorsAdviceFocus(){ this.setData({ @@ -41,21 +43,28 @@ Page({ }, onLoad(options){ let order_inquiry_id = options.order_inquiry_id; + let order_prescription_id = options.order_prescription_id ; //获取患者问诊病例 api.getDoctorInquiryCase({order_inquiry_id: order_inquiry_id}).then(response => { console.log(response); this.setData({ case_detail: response.data }) + }).then(res => { + //有处方id，才去请求详情 + if(order_prescription_id){ + this.getDoctorPrescriptionInfo(order_inquiry_id, order_prescription_id); + } }).catch(errors => {console.error(errors);}) this.setData({ - order_inquiry_id: order_inquiry_id + order_inquiry_id: order_inquiry_id, + order_prescription_id: order_prescription_id, }) }, select_drug(e){ this.setData({ drug_content_show: true, - select_drug_name: e.currentTarget.dataset.product_name, + product_name: e.currentTarget.dataset.product_name, select_drug_id: e.currentTarget.dataset.product_id, save_durg_product_id: e.currentTarget.dataset.product_id }); @@ -110,7 +119,7 @@ Page({ this.delDrugBox(product_id); let save_durg = {}; - save_durg.select_drug_name = this.data.select_drug_name; + save_durg.product_name = this.data.product_name; save_durg.product_id = this.data.save_durg_product_id; save_durg.prescription_product_num = this.data.save_durg_prescription_product_num; save_durg.single_unit = this.data.save_durg_single_unit; @@ -123,7 +132,7 @@ Page({ this.setData({ drugs_box_item_list: list, drugs_popshow: false, - select_drug_name: "", + product_name: "", drug_content_show: false, search_drug_list: [], save_durg_product_id: "", @@ -154,8 +163,8 @@ Page({ search(){ //搜索诊断 let params = {}; - params.disease_class_name = this.data.disease_class_name; - api.getBasicDiseaseSearch(params).then(response => { + params.icd_keyword = this.data.disease_class_name; + api.getBasicIcdSearch(params).then(response => { console.log(response); this.setData({ zhenduan_search_list: response.data @@ -167,7 +176,7 @@ Page({ searchDrug(){ //搜索药品 let params = {}; - params.product_keyword = this.data.select_drug_name; + params.product_keyword = this.data.product_name; api.getBasicProductSearch(params).then(response => { console.log(response); if(response.data.length > 0){ @@ -197,17 +206,17 @@ Page({ }) }, addZhenDuan(e){ - let disease_class_name = e.currentTarget.dataset.disease_class_name; - let disease_class_id = e.currentTarget.dataset.disease_class_id; - console.log("disease_class_name: ", disease_class_name); - console.log("disease_class_id: ", disease_class_id); + let icd_name = e.currentTarget.dataset.icd_name; + let icd_id = e.currentTarget.dataset.icd_id; + console.log("icd_name: ", icd_name); + console.log("icd_id: ", icd_id); let disease_obj = {}; - disease_obj.disease_class_name = disease_class_name; - disease_obj.disease_class_id = disease_class_id; + disease_obj.icd_name = icd_name; + disease_obj.icd_id = icd_id; let list = this.data.zhenduan_list; let find_index = list.findIndex(item => { - return item.disease_class_id == disease_class_id + return item.icd_id == icd_id }); if(find_index == -1){ list.push(disease_obj); @@ -245,7 +254,7 @@ Page({ console.log(drug); this.setData({ drugs_popshow: true, - select_drug_name: drug.select_drug_name, + product_name: drug.product_name, drug_content_show: true, save_durg_product_id: drug.product_id, save_durg_prescription_product_num: drug.prescription_product_num, @@ -280,37 +289,172 @@ Page({ doctor_advice: e.detail.value }) }, - postDoctorPrescription(){//新增处方 + postDoctorPrescription(e){//新增处方 + + let sub_disabled = this.data.sub_disabled; + if(sub_disabled) return + console.log("postDoctorPrescription postDoctorPrescription"); + //先置灰，避免重复提交 + this.setData({ + sub_disabled: true + }) + 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); + prescription_icd.push(item.icd_id); }) params.prescription_icd = prescription_icd; params.prescription_product = this.data.drugs_box_item_list; console.log(params); + if(prescription_icd.length == 0){ + wx.showToast({ + title: '请选择诊断', + icon: "error" + }) + this.setData({ + sub_disabled: false + }) + return; + } + if(params.prescription_product.length == 0){ + wx.showToast({ + title: '请选择药品', + icon: "error" + }) + this.setData({ + sub_disabled: false + }) + return; + } + if(this.data.doctor_advice == ""){ + wx.showToast({ + title: '请填写医嘱', + icon: "error" + }) + this.setData({ + sub_disabled: false + }) + return; + } + if(this.data.doctor_advice.length < 5 || this.data.doctor_advice.length > 200){ + wx.showToast({ + title: '医嘱字数5-20', + icon: "error" + }) + this.setData({ + sub_disabled: false + }) + return; + } + + api.postDoctorPrescription(params).then(response => { console.log(response); - - }).catch(errors => {console.error(errors);}) + wx.showToast({ + title: '提交成功', + icon: "success" + }) + }).catch(errors => { + console.error(errors); + this.setData({ + sub_disabled: false + }) + }) }, putDoctorPrescription(){//修改处方 + let sub_disabled = this.data.sub_disabled; + if(sub_disabled) return + + console.log("putDoctorPrescription putDoctorPrescription"); + //先置灰，避免重复提交 + this.setData({ + sub_disabled: true + }) + let params = {}; + params.order_prescription_id = this.data.order_prescription_id; + params.doctor_advice = this.data.doctor_advice; + let prescription_icd = []; + this.data.zhenduan_list.forEach(item => { + prescription_icd.push(item.icd_id); + }) + params.prescription_icd = prescription_icd; + params.prescription_product = this.data.drugs_box_item_list; + + console.log(params); + + if(prescription_icd.length == 0){ + wx.showToast({ + title: '请选择诊断', + icon: "error" + }) + this.setData({ + sub_disabled: false + }) + return; + } + if(params.prescription_product.length == 0){ + wx.showToast({ + title: '请选择药品', + icon: "error" + }) + this.setData({ + sub_disabled: false + }) + return; + } + if(this.data.doctor_advice == ""){ + wx.showToast({ + title: '请填写医嘱', + icon: "error" + }) + this.setData({ + sub_disabled: false + }) + return; + } + if(this.data.doctor_advice.length < 5 || this.data.doctor_advice.length > 200){ + wx.showToast({ + title: '医嘱字数5-20', + icon: "error" + }) + this.setData({ + sub_disabled: false + }) + return; + } + + api.putDoctorPrescription(params).then(response => { console.log(response); - - }).catch(errors => {console.error(errors);}) + wx.showToast({ + title: '提交成功', + icon: "success" + }) + }).catch(errors => { + console.error(errors); + this.setData({ + sub_disabled: false + }) + }) }, - getDoctorPrescriptionInfo(){//获取处方详情 + getDoctorPrescriptionInfo(order_inquiry_id, order_prescription_id){//获取处方详情 let params = {}; + params.order_inquiry_id = order_inquiry_id; + params.order_prescription_id = order_prescription_id; api.getDoctorPrescriptionInfo(params).then(response => { console.log(response); - + this.setData({ + doctor_advice: response.data.prescription.doctor_advice, + zhenduan_list: response.data.prescription_icd, + drugs_box_item_list: response.data.prescription_product, + }) }).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 3fd8665..347fd9e 100644 --- a/Pages/yishi/onlinechufang/index.wxml +++ b/Pages/yishi/onlinechufang/index.wxml @@ -33,7 +33,7 @@ +添加诊断 - {{item.disease_class_name}} + {{item.icd_name}} @@ -45,7 +45,7 @@ - {{ drugs.select_drug_name }}(数量{{ drugs.prescription_product_num}}) + {{ drugs.product_name }}(数量{{ drugs.prescription_product_num}}) 用法用量：{{ drugs.single_use }}；{{ drugs.frequency_use }}；{{ drugs.single_unit }} @@ -56,16 +56,18 @@ - +添加药品 + +添加药品 +
+ 医嘱 + + + + + {{ order_prescription_id == ''?'提交审核':'重开处方' }} + - 医嘱 - - - - - 提交审核 - +
药品名称 - - - {{item.disease_class_name}} + + {{item.icd_name}} + + + \ No newline at end of file diff --git a/Pages/yishi/quickreply/index.js b/Pages/yishi/quickreply/index.js index 55c2cb0..f5617fb 100644 --- a/Pages/yishi/quickreply/index.js +++ b/Pages/yishi/quickreply/index.js @@ -6,7 +6,7 @@ Page({ data: { navbarData: { - showCapsule: 2, //是否显示左上角图标 1表示显示 0表示不显示 + showCapsule: 1, //是否显示左上角图标 1表示显示 0表示不显示 title: '常用语', //导航栏 中间的标题 }, height: app.globalData.height, diff --git a/Pages/yishi/quickreply/index.wxml b/Pages/yishi/quickreply/index.wxml index 8f92b0e..a9d8d89 100644 --- a/Pages/yishi/quickreply/index.wxml +++ b/Pages/yishi/quickreply/index.wxml @@ -26,7 +26,7 @@ - 添加常用语 + 添加常用语 @@ -44,7 +44,7 @@ - 添加常用语 + 添加常用语 @@ -62,6 +62,7 @@ model:value="{{ add_message }}" type="textarea" placeholder="请输入文字" + placeholder-style="font-size: 32rpx;font-weight: 400;" autosize maxlength="500" custom-style="height: 100%;" diff --git a/Pages/yishi/quickreply/index.wxss b/Pages/yishi/quickreply/index.wxss index e2ce446..d410237 100644 --- a/Pages/yishi/quickreply/index.wxss +++ b/Pages/yishi/quickreply/index.wxss @@ -13,10 +13,10 @@ page{ } .t-tabs__item--active{ color: #49B9AD !important; - font-size: 32rpx !important; + font-size: 36rpx !important; } .t-tabs__item-inner--line{ - font-size: 28rpx !important; + font-size: 32rpx !important; } .t-tabs__track{ background-color: var(--td-tab-track-color, var(--td-primary-color, #49B9AD)) !important; @@ -25,7 +25,7 @@ page{ height: 130rpx; background-color: #fff; position: fixed; - bottom: 0; + bottom: 50rpx; width: 100%; } .popup_box{ @@ -69,5 +69,4 @@ page{ padding: 32rpx !important; font-size: 34rpx !important; color: #333 !important; - font-weight: bolder !important; } \ No newline at end of file diff --git a/Pages/yishi/service_notice/index.js b/Pages/yishi/service_notice/index.js index 6bb080b..c37c0f1 100644 --- a/Pages/yishi/service_notice/index.js +++ b/Pages/yishi/service_notice/index.js @@ -1,3 +1,5 @@ +import { API } from './../../../utils/network/api' +const api = new API() const app = getApp() Page({ data: { @@ -7,5 +9,43 @@ Page({ }, height: app.globalData.height, visible: false, + list: [], + current_page: 0, + total: 0, + per_page: 0, + last_page: 0, + }, + onShow(){ + this.getList(); + + }, + getList(){ + let current_page = this.data.current_page; + current_page = current_page + 1; + this.setData({ + current_page: current_page + }) + let list = this.data.list; + api.getDoctorMessageService({page: current_page}).then(response => { + console.log(response); + this.setData({ + list: list.concat(response.data.data), + current_page: response.data.current_page, + total: response.data.total, + per_page: response.data.per_page, + last_page: response.data.last_page, + }) + }).catch(errors => {console.error(errors);}) + }, + onReachBottom() { + console.log('===触底了！！==='); + if(this.data.current_page < this.data.last_page){//最后一页时停止分页 + this.getList() + } + }, + putMessageReadNoticeAll(){ + api.putMessageReadNoticeAll({notice_type: 1}).then(response => { + console.log(response); + }).catch(errors => {console.error(errors);}) } }) \ No newline at end of file diff --git a/Pages/yishi/service_notice/index.json b/Pages/yishi/service_notice/index.json index f84f19a..c57d952 100644 --- a/Pages/yishi/service_notice/index.json +++ b/Pages/yishi/service_notice/index.json @@ -2,6 +2,10 @@ "component": true, "usingComponents": { "te-nav-bar": "/commpents/te_navbar", - "van-image": "@vant/weapp/image/index" - } + "van-image": "@vant/weapp/image/index", + "van-divider": "@vant/weapp/divider/index", + "van-empty": "@vant/weapp/empty/index" + }, + "enablePullDownRefresh": false, + "onReachBottomDistance": 50 } \ No newline at end of file diff --git a/Pages/yishi/service_notice/index.wxml b/Pages/yishi/service_notice/index.wxml index 5ce3c76..dc9084a 100644 --- a/Pages/yishi/service_notice/index.wxml +++ b/Pages/yishi/service_notice/index.wxml @@ -2,7 +2,30 @@ - + + + + 快速问诊 + + + + 快速问诊 + + + + 公益问诊 + + + + 问诊购药 + + + {{item.notice_send_time}} + + {{item.notice_title}} + + + - + - + - + + + + 到底了~ + + + \ No newline at end of file diff --git a/Pages/yishi/system_notice/index.js b/Pages/yishi/system_notice/index.js index b362c1a..f341cad 100644 --- a/Pages/yishi/system_notice/index.js +++ b/Pages/yishi/system_notice/index.js @@ -1,3 +1,5 @@ +import { API } from './../../../utils/network/api' +const api = new API() const app = getApp() Page({ data: { @@ -7,23 +9,77 @@ Page({ }, height: app.globalData.height, visible: false, + list: [], + current_page: 0, + total: 0, + per_page: 0, + last_page: 0, }, go(e){ - wx.navigateTo({ - url: e.currentTarget.dataset.url, - events: { - // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据 - acceptDataFromOpenedPage: function(data) { - console.log(data) - }, - someEvent: function(data) { - console.log(data) - } - }, - success: function(res) { - // 通过 eventChannel 向被打开页面传送数据 - res.eventChannel.emit('acceptDataFromOpenerPage', { data: 'test' }) - } + this.putMessageReadNotice(e); + app.go(e.currentTarget.dataset.url); + }, + onShow(){ + this.setData({ + list: [], + current_page: 0, + total: 0, + per_page: 0, + last_page: 0, }) + let ap = this.getList(); + ap.then(res => { + this.check() + }) + }, + check(){ + // 不满一页自动加载下一页 + wx.createSelectorQuery().select('#list').boundingClientRect(res2 => { + console.log(res2.height) + console.log(wx.getSystemInfoSync().windowHeight) + if (res2.height < wx.getSystemInfoSync().windowHeight) { + this.getList().then(res => { + if(this.data.current_page < this.data.last_page){ + this.check() + } + }); + } + }).exec() + }, + getList(){ + let current_page = this.data.current_page; + current_page = current_page + 1; + this.setData({ + current_page: current_page + }) + let list = this.data.list; + return api.getDoctorMessageSystem({page: current_page}).then(response => { + console.log(response); + this.setData({ + list: list.concat(response.data.data), + current_page: response.data.current_page, + total: response.data.total, + per_page: response.data.per_page, + last_page: response.data.last_page, + }) + }).catch(errors => {console.error(errors);}) + }, + onReachBottom() { + console.log('===触底了！！==='); + if(this.data.current_page < this.data.last_page){//最后一页时停止分页 + this.getList() + } + }, + putMessageReadNotice(e){ + let notice_id = e.currentTarget.dataset.notice_id; + api.putMessageReadNotice({notice_id: notice_id}).then(response => { + console.log(response); + + }).catch(errors => {console.error(errors);}) + }, + putMessageReadNoticeAll(){ + api.putMessageReadNoticeAll({notice_type: 2}).then(response => { + console.log(response); + }).catch(errors => {console.error(errors);}) } }) \ No newline at end of file diff --git a/Pages/yishi/system_notice/index.json b/Pages/yishi/system_notice/index.json index f84f19a..c57d952 100644 --- a/Pages/yishi/system_notice/index.json +++ b/Pages/yishi/system_notice/index.json @@ -2,6 +2,10 @@ "component": true, "usingComponents": { "te-nav-bar": "/commpents/te_navbar", - "van-image": "@vant/weapp/image/index" - } + "van-image": "@vant/weapp/image/index", + "van-divider": "@vant/weapp/divider/index", + "van-empty": "@vant/weapp/empty/index" + }, + "enablePullDownRefresh": false, + "onReachBottomDistance": 50 } \ No newline at end of file diff --git a/Pages/yishi/system_notice/index.wxml b/Pages/yishi/system_notice/index.wxml index 93a9f34..9189956 100644 --- a/Pages/yishi/system_notice/index.wxml +++ b/Pages/yishi/system_notice/index.wxml @@ -1,45 +1,22 @@ - - - + + - 9月份的服务费结算通知 + {{item.notice_title}} - + - - - - - - - 8月份的服务费结算通知 - - - - - - - - - 7月份的服务费结算通知 - - - - - - - - - 6月份的服务费结算通知 - - - + + + 到底了~ + + + \ No newline at end of file diff --git a/Pages/yishi/wenzhen_v2/wenzhen.js b/Pages/yishi/wenzhen_v2/wenzhen.js index 6093403..2d5039b 100644 --- a/Pages/yishi/wenzhen_v2/wenzhen.js +++ b/Pages/yishi/wenzhen_v2/wenzhen.js @@ -10,7 +10,7 @@ Page({ title: '问诊消息', //导航栏 中间的标题 }, height: app.globalData.height, - has_data: true, + has_data: false, data_list_1: [], data_list_2: [], data_list_3: [], @@ -248,6 +248,10 @@ Page({ if(!order_inquiry_id) return; let inquiry_type = cloudCustomDataJson.inquiry_type; if(!inquiry_type) return; + if(inquiry_type > 4) return; + let patient_family_data = cloudCustomDataJson.patient_family_data; + if(!patient_family_data) return; + console.log("patient_family_data: ", patient_family_data); let session_item = {}; session_item.inquiry_status = item.inquiry_status;//订单状态暂无 let txt = {}; @@ -257,10 +261,10 @@ Page({ session_item.message_type = type; session_item.order_inquiry_id = order_inquiry_id; session_item.inquiry_type = inquiry_type; - session_item.patient_age = item.patient_age;//暂无 - session_item.patient_name = userProfile.nick; + session_item.patient_age = patient_family_data.patient_age; + session_item.patient_name = patient_family_data.patient_name; + session_item.patient_sex = patient_family_data.patient_sex; session_item.from_account = userProfile.userID; - session_item.patient_sex = item.patient_sex;//暂无 let unreadCount = item.unreadCount; if(unreadCount > 0){ session_item.message_dot = true; @@ -276,7 +280,7 @@ Page({ data_list_4: session_data_list_4, }) - if(session_data_list_1.length == 0 && session_data_list_2.length == 0 && session_data_list_3.length == 0 && session_data_list_4.length == 0 && session_data_list_5.length == 0){ + if(this.data.data_list_1.length == 0 && this.data.data_list_2.length == 0 && this.data.data_list_3.length == 0 && this.data.data_list_4.length == 0 && this.data.data_list_5.length == 0){ this.setData({has_data: false}) }else{ this.setData({has_data: true}) diff --git a/Pages/yishi/wenzhenorder/index.wxml b/Pages/yishi/wenzhenorder/index.wxml index d0372f4..fd82797 100644 --- a/Pages/yishi/wenzhenorder/index.wxml +++ b/Pages/yishi/wenzhenorder/index.wxml @@ -3,7 +3,7 @@ - + diff --git a/Pages/yishi/yizhensetup/index.wxss b/Pages/yishi/yizhensetup/index.wxss index 50f6015..0e38bb0 100644 --- a/Pages/yishi/yizhensetup/index.wxss +++ b/Pages/yishi/yizhensetup/index.wxss @@ -116,3 +116,7 @@ page{ .t-picker__confirm,.t-class-confirm{ color: #49B9AD !important; } +.van-cell__value{ + font-size: 32rpx !important; + color: red !important; +} \ 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 eddcb4c..e0348d3 100644 --- a/TUIKit/components/TUIChat/components/MessageInput/index.js +++ b/TUIKit/components/TUIChat/components/MessageInput/index.js @@ -63,8 +63,8 @@ Component({ notShow: false, isShow: true, commonFunction: [ - { name: '查看病例', key: '10' }, - { name: '开处方', key: '11' }, + { name: '查看完整病例', key: '10' }, + { name: '在线开处方', key: '11' }, ], displayServiceEvaluation: false, showErrorImageFlag: 0, @@ -296,12 +296,45 @@ Component({ // 发送图片消息 handleSendImageMessage(file) { + + //获取最后一条消息 + let message_length = this.data.messageList.length; + let last_message = {}; + if(message_length > 0){ + last_message = this.data.messageList[message_length - 1]; + } + console.log("last_message: ", last_message); + let cloudCustomData = ""; + let cloudCustomDataJson = ""; + if(last_message.cloudCustomData){ + cloudCustomData = last_message.cloudCustomData; + } + if(cloudCustomData){ + cloudCustomDataJson = JSON.parse(cloudCustomData); + } + let message_rounds = 0; + let patient_family_data = ""; + if(cloudCustomDataJson){ + message_rounds = cloudCustomDataJson.message_rounds; + patient_family_data = cloudCustomDataJson.patient_family_data + } + + const mycloudCustomData = JSON.stringify({ + order_inquiry_id: this.data.order_inquiry_id, + inquiry_type: this.data.inquiry_type, + message_type: 0, + is_system: 0, + message_rounds: message_rounds, + patient_family_data: patient_family_data + }); + const message = wx.$TUIKit.createImageMessage({ to: this.getToAccount(), conversationType: this.data.conversation.type, payload: { file, }, + cloudCustomData: mycloudCustomData, onProgress: (percent) => { message.percent = percent; }, @@ -359,13 +392,31 @@ Component({ app.go("/Pages/yishi/case/index?order_inquiry_id="+this.data.order_inquiry_id) break; case '11'://在线开方 - app.go("/Pages/yishi/onlinechufang/index?order_inquiry_id="+this.data.order_inquiry_id) + let userID = wx.getStorageSync('user_id'); + let multi_point_status = wx.getStorageSync(userID+'_multi_point_status'); + if(multi_point_status == 1){ + app.go("/Pages/yishi/onlinechufang/index?order_inquiry_id="+this.data.order_inquiry_id) + }else{ + this.setData({ + dialog_visible: true + }) + } break; default: break; } }, - + cancelDialog(){ + this.setData({ + dialog_visible: false + }) + }, + confirmDialog(){ + app.go("/Pages/yishi/zhiye_identity/index") + this.setData({ + dialog_visible: false + }) + }, handleSendOrder() { this.setData({ displayOrderList: true, @@ -504,21 +555,51 @@ Component({ ext2: wx.$chat_reportType, ext3: wx.$chat_SDKAppID, }); + + //获取最后一条消息 + let message_length = this.data.messageList.length; + let last_message = {}; + if(message_length > 0){ + last_message = this.data.messageList[message_length - 1]; + } + console.log("last_message: ", last_message); + let cloudCustomData = ""; + let cloudCustomDataJson = ""; + if(last_message.cloudCustomData){ + cloudCustomData = last_message.cloudCustomData; + } + if(cloudCustomData){ + cloudCustomDataJson = JSON.parse(cloudCustomData); + } + let message_rounds = 0; + let patient_family_data = ""; + if(cloudCustomDataJson){ + message_rounds = cloudCustomDataJson.message_rounds; + patient_family_data = cloudCustomDataJson.patient_family_data + } + const to = this.getToAccount(); const text = flag ? msg : this.data.message; + const { FEAT_NATIVE_CODE } = constant; + const mycloudCustomData = JSON.stringify({ + order_inquiry_id: this.data.order_inquiry_id, + inquiry_type: this.data.inquiry_type, + message_type: 0, + is_system: 0, + message_rounds: message_rounds, + patient_family_data: patient_family_data + }); + + console.log("mycloudCustomData: ", mycloudCustomData); + console.log("text: ", text); const message = wx.$TUIKit.createTextMessage({ to, conversationType: this.data.conversation.type, payload: { text, }, - cloudCustomData: JSON.stringify({ - order_inquiry_id: this.data.order_inquiry_id, - inquiry_type: this.data.inquiry_type, - message_type: 0, - is_system: 0 - }), + cloudCustomData: mycloudCustomData }); this.setData({ message: '', diff --git a/TUIKit/components/TUIChat/components/MessageInput/index.json b/TUIKit/components/TUIChat/components/MessageInput/index.json index 10d10cc..9e27a6f 100644 --- a/TUIKit/components/TUIChat/components/MessageInput/index.json +++ b/TUIKit/components/TUIChat/components/MessageInput/index.json @@ -4,6 +4,7 @@ "Emoji": "../MessageElements/Emoji/index", "CommonWords": "../MessagePrivate/CommonWords/index", "OrderList": "../MessagePrivate/OrderList/index", - "ServiceEvaluation": "../MessagePrivate/ServiceEvaluation/index" + "ServiceEvaluation": "../MessagePrivate/ServiceEvaluation/index", + "t-dialog": "tdesign-miniprogram/dialog/dialog" } } diff --git a/TUIKit/components/TUIChat/components/MessageInput/index.wxml b/TUIKit/components/TUIChat/components/MessageInput/index.wxml index 03fcbe7..f97004c 100644 --- a/TUIKit/components/TUIChat/components/MessageInput/index.wxml +++ b/TUIKit/components/TUIChat/components/MessageInput/index.wxml @@ -101,4 +101,15 @@ {{title}} - + + + 取消 + + + 确定 + + diff --git a/TUIKit/components/TUIChat/components/MessageInput/index.wxss b/TUIKit/components/TUIChat/components/MessageInput/index.wxss index 16393b2..f40509b 100644 --- a/TUIKit/components/TUIChat/components/MessageInput/index.wxss +++ b/TUIKit/components/TUIChat/components/MessageInput/index.wxss @@ -1,40 +1,43 @@ .TUI-message-input-container { - background-color: #fff; + background-color: #fff; + width: 100vw; + z-index: 9999; } .TUI-message-input { - display: flex; - padding-bottom: 16rpx; - background-color: #fff; - width: 95vw; - overflow: scroll; - margin: 0 auto; + display: flex; + padding-bottom: 16rpx; + background-color: #fff; + width: 95vw; + overflow: scroll; + margin: 0 auto; } .TUI-commom-function { - background-color: blueviolet; - display: flex; - flex-wrap: nowrap; - width: 750rpx; - height: 106rpx; - background-color: #FFF; - align-items: center; + background-color: blueviolet; + display: flex; + flex-wrap: nowrap; + width: 95vw; + height: 106rpx; + background-color: #FFF; + align-items: center; + margin: 0 auto; } .TUI-commom-function-item { - background-color: brown; - display: flex; - width: 136rpx; - justify-content: center; - align-items: center; - font-size: 28rpx; - color: #3CC7C0; - height: 48rpx; - margin-left: 16rpx; - border-radius: 10rpx; - background-color: #fff; - border: 1px solid #3CC7C0; + display: flex; + justify-content: center; + align-items: center; + font-size: 28rpx; + color: #3CC7C0; + height: 48rpx; + margin-left: 16rpx; + border-radius: 10rpx; + background-color: #fff; + border: 1px solid #3CC7C0; + padding: 0 20rpx; } .TUI-commom-function-item:first-child{ - margin-left: 48rpx; + border: 1px solid #999; + color: #999; } .TUI-message-input-functions { flex: 2; @@ -63,7 +66,6 @@ } .TUI-message-input-area { width: 100%; - height: 100%; max-height: 300rpx; /* 最多显示10行 */ line-height: 30rpx; @@ -185,4 +187,18 @@ background-color: #fff; font-size: 30rpx; color: #666666; +} +.dialog{ + width: 50%; + text-align: center; + height: 100rpx; + line-height: 100rpx; +} +.dialog_cancel_btn{ + border-top: 1px solid #E9E9E9; + border-right: 1px solid #E9E9E9; +} +.dialog_confirm_btn{ + border-top: 1px solid #E9E9E9; + color: #3CC7C0; } \ No newline at end of file diff --git a/TUIKit/components/TUIChat/components/MessageList/index.js b/TUIKit/components/TUIChat/components/MessageList/index.js index ece384b..c700ff8 100644 --- a/TUIKit/components/TUIChat/components/MessageList/index.js +++ b/TUIKit/components/TUIChat/components/MessageList/index.js @@ -1,6 +1,8 @@ import dayjs from '../../../../utils/dayjs'; import logger from '../../../../utils/logger'; import constant from '../../../../utils/constant'; +import { API } from './../../../../../utils/network/api' +const api = new API() // eslint-disable-next-line no-undef const app = getApp(); Component({ @@ -20,6 +22,10 @@ Component({ }); }, }, + order_inquiry_id:{ + type: String, + value: "", + }, unreadCount: { type: Number, value: '', @@ -81,10 +87,13 @@ Component({ errorMessage: {}, errorMessageID: '', typingMessage: {}, + dialog_visible: false, + }, lifetimes: { attached() { + }, ready() { if (this.data.unreadCount > 12) { @@ -112,6 +121,7 @@ Component({ wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, this.$onMessageReceived, this); wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.MESSAGE_READ_BY_PEER, this.$onMessageReadByPeer, this); wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.MESSAGE_REVOKED, this.$onMessageRevoked, this); + }, detached() { @@ -123,6 +133,26 @@ Component({ }, methods: { + //结束问诊 + putDoctorInquiryFinish() { + this.setData({ + dialog_visible: true + }) + }, + cancelDialog(){ + this.setData({ + dialog_visible: false + }) + }, + confirmDialog(){ + api.putDoctorInquiryFinish({order_inquiry_id: this.data.order_inquiry_id}).then(response => { + console.log(response); + + }).catch(errors => {console.error(errors);}) + this.setData({ + dialog_visible: false + }) + }, // 刷新消息列表 refresh() { if (this.data.isCompleted) { diff --git a/TUIKit/components/TUIChat/components/MessageList/index.json b/TUIKit/components/TUIChat/components/MessageList/index.json index 2bd9367..097c754 100644 --- a/TUIKit/components/TUIChat/components/MessageList/index.json +++ b/TUIKit/components/TUIChat/components/MessageList/index.json @@ -12,6 +12,7 @@ "FaceMessage": "../MessageElements/FaceMessage/index", "FileMessage": "../MessageElements/FileMessage/index", "MergerMessage": "../MessageElements/MergerMessage/index", - "RevokeMessage": "../MessageElements/RevokeMessage/index" + "RevokeMessage": "../MessageElements/RevokeMessage/index", + "t-dialog": "tdesign-miniprogram/dialog/dialog" } } \ No newline at end of file diff --git a/TUIKit/components/TUIChat/components/MessageList/index.wxml b/TUIKit/components/TUIChat/components/MessageList/index.wxml index 7ce6171..5a18336 100644 --- a/TUIKit/components/TUIChat/components/MessageList/index.wxml +++ b/TUIKit/components/TUIChat/components/MessageList/index.wxml @@ -1,14 +1,5 @@ - - - 张三三 - 男｜30岁 - 接诊中 - - - 结束问诊 - - + 没有更多啦 @@ -88,3 +79,16 @@ + + + + 取消 + + + 确定 + + diff --git a/TUIKit/components/TUIChat/components/MessageList/index.wxss b/TUIKit/components/TUIChat/components/MessageList/index.wxss index c6a7137..fea4021 100644 --- a/TUIKit/components/TUIChat/components/MessageList/index.wxss +++ b/TUIKit/components/TUIChat/components/MessageList/index.wxss @@ -4,8 +4,9 @@ background-color: #F4F4F4; } .message-list-container { + /* margin-top: 20rpx; */ width: 100%; - height: calc(100% - 120rpx); + height: calc(100%); background-color: #F4F4F4; } .t-message-item { @@ -13,7 +14,8 @@ padding: 14rpx 0; } .t-message{ - position: relative + position: relative; + z-index: -9; } .t-recieve-message { display: flex; @@ -250,45 +252,17 @@ padding-left: 5px; color: blue; } -.info{ +.dialog{ + width: 50%; + text-align: center; height: 100rpx; - background-color: #fff; - display: flex; - justify-content: space-around; - align-items: center; - box-shadow: 0px 2px 4px 0px rgba(0,0,0,0.08); + line-height: 100rpx; } -.left{ - display: flex; - justify-content: space-around; - align-items: center; - flex: 2; +.dialog_cancel_btn{ + border-top: 1px solid #E9E9E9; + border-right: 1px solid #E9E9E9; } -.right{ - flex: 1; - text-align: right; - font-size: 28rpx; - color: #FFFFFF; - padding-right: 20rpx; -} -.right_txt{ - background: #3CC7C0; - border-radius: 29rpx; - padding: 10rpx 20rpx; -} -.name{ - font-size: 34rpx; +.dialog_confirm_btn{ + border-top: 1px solid #E9E9E9; color: #3CC7C0; -} -.age{ - font-size: 34rpx; - color: #666666; -} -.status{ - background: #FFF2E8; - box-shadow: 0px 2px 4px 0px rgba(0,0,0,0.08); - border-radius: 10rpx; - font-size: 24rpx; - color: #FA541C; - padding: 10rpx 20rpx; } \ No newline at end of file diff --git a/TUIKit/components/TUIChat/index.js b/TUIKit/components/TUIChat/index.js index 9bb6b4f..60cf663 100644 --- a/TUIKit/components/TUIChat/index.js +++ b/TUIKit/components/TUIChat/index.js @@ -1,11 +1,14 @@ // TUIKit-WChat/Chat/index.js import logger from '../../utils/logger'; import constant from '../../utils/constant'; +import { API } from './../../../utils/network/api' +const api = new API() // eslint-disable-next-line no-undef const app = getApp(); const inputStyle = ` - --padding: 25px + --padding: 0px; + z-index: 9999999; `; let newInputStyle = ` @@ -66,7 +69,31 @@ Component({ showTips: true, }); } + + let rect = null; + if (wx.getMenuButtonBoundingClientRect) { + rect = wx.getMenuButtonBoundingClientRect(); + } + console.log("rect: ", rect) + wx.getSystemInfo({ + success: (res) => { + const { statusBarHeight } = wx.getSystemInfoSync(); + console.log("statusBarHeight: ", statusBarHeight); + console.log("${rect.height}px: ", `${rect.height}`); + let height = Number.parseInt(statusBarHeight) + Number.parseInt(`${rect.height}`) + 50; + this.setData({ + navbar_height: height + }) + }, + fail: (err) => { + console.error('navbar 获取系统信息失败', err); + }, + }); + }, + ready() { + this.getInquiryMessageBasic() + } }, /** * 组件的初始数据 @@ -95,16 +122,31 @@ Component({ showTips: false, showGroupTips: false, showAll: false, + navbarData: { + showCapsule: 2, //是否显示左上角图标 1表示显示 0表示不显示 + title: '', //导航栏 中间的标题 + }, + baseInfo: {}, + navbar_height: 0 }, /** * 组件的方法列表 */ methods: { + //获取问诊订单消息内页基础数据 + getInquiryMessageBasic() { + console.log("order_inquiry_id: ", this.data.order_inquiry_id); + api.getInquiryMessageBasic({order_inquiry_id: this.data.order_inquiry_id}).then(response => { + console.log(response); + this.setData({ + baseInfo: response.data, + "navbarData.title": response.data.patient_name + }) + }).catch(errors => {console.error(errors);}) + }, init() { - console.warn("TUIChat js: init", this.data.conversationID) - wx.$TUIKit.setMessageRead({ conversationID: this.data.conversationID }).then(() => { logger.log('| TUI-chat | setMessageRead | ok'); }); diff --git a/TUIKit/components/TUIChat/index.json b/TUIKit/components/TUIChat/index.json index c0873f0..664d8ba 100644 --- a/TUIKit/components/TUIChat/index.json +++ b/TUIKit/components/TUIChat/index.json @@ -3,6 +3,8 @@ "usingComponents": { "MessageList": "./components/MessageList/index", "MessageInput": "./components/MessageInput/index", - "TUIGroup": "../TUIGroup/index" - } + "TUIGroup": "../TUIGroup/index", + "te-nav-bar": "/commpents/te_navbar" + }, + "disableScroll":true } \ No newline at end of file diff --git a/TUIKit/components/TUIChat/index.wxml b/TUIKit/components/TUIChat/index.wxml index 19aa985..8c5557a 100644 --- a/TUIKit/components/TUIChat/index.wxml +++ b/TUIKit/components/TUIChat/index.wxml @@ -1,18 +1,30 @@ + - - + + + {{baseInfo.patient_name}} + {{baseInfo.patient_sex==1?'男':'女'}}｜{{baseInfo.patient_age}}岁 + {{baseInfo.inquiry_status==1?'待支付':baseInfo.inquiry_status==2?'待分配':baseInfo.inquiry_status==3?'待接诊':baseInfo.inquiry_status==4?'已接诊':baseInfo.inquiry_status==5?'已完成':baseInfo.inquiry_status==6?'已结束':baseInfo.inquiry_status==7?'已取消':'未知'}} + + + 结束问诊 + + + + + + - + - + @@ -24,4 +36,7 @@ bind:handleCall="handleCall" > + + + diff --git a/TUIKit/components/TUIChat/index.wxss b/TUIKit/components/TUIChat/index.wxss index 098291a..070f9ca 100644 --- a/TUIKit/components/TUIChat/index.wxss +++ b/TUIKit/components/TUIChat/index.wxss @@ -1,7 +1,7 @@ .container { width: 100vw; - /* height: 100vh; */ - background-color: #dcaceb; + height: 100vh; + background-color: #F4F4F4; } .safetytips-box{ background: rgba(255, 149, 0, 0.1); @@ -25,7 +25,7 @@ top: 0; width: 750rpx; height: 172rpx; - background-color: #bae46b; + background-color: #ffffff; } .tui-navigatorbar-back{ @@ -80,10 +80,9 @@ align-items: center; } .list-box { - position: absolute; + /* position: absolute; */ width: 100vw; - height: calc(100vh - 210px); - top: 172rpx; + /* position: fixed; */ } .list-box-notips { height: calc(100vh - 284px); @@ -98,8 +97,10 @@ } .input-area { position: absolute; - bottom: 0; - } + bottom: 20px; + z-index: 999999; + /* height: 200rpx; */ +} .message-list { width: 100%; height: 100%; @@ -110,6 +111,7 @@ width: 100%; padding-bottom: var(--padding); background-color: #ffffff; + z-index: 999999; } .calling { position: fixed; @@ -124,3 +126,47 @@ z-index: 8; position: absolute; } +.info{ + /* position: relative; */ + z-index: 9; + height: 100rpx; + background-color: rgb(255, 255, 255); + display: flex; + justify-content: space-around; + align-items: center; + box-shadow: 0px 2px 4px 0px rgba(0,0,0,0.08); +} +.left{ + display: flex; + justify-content: space-around; + align-items: center; + flex: 2; +} +.right{ + flex: 1; + text-align: right; + font-size: 28rpx; + color: #FFFFFF; + padding-right: 20rpx; +} +.right_txt{ + background: #3CC7C0; + border-radius: 29rpx; + padding: 10rpx 20rpx; +} +.name{ + font-size: 34rpx; + color: #3CC7C0; +} +.age{ + font-size: 34rpx; + color: #666666; +} +.status{ + background: #FFF2E8; + box-shadow: 0px 2px 4px 0px rgba(0,0,0,0.08); + border-radius: 10rpx; + font-size: 24rpx; + color: #FA541C; + padding: 10rpx 20rpx; +} \ No newline at end of file diff --git a/app.js b/app.js index 238b2fb..1441b59 100644 --- a/app.js +++ b/app.js @@ -58,6 +58,11 @@ App({ imInit(){ let userID = wx.getStorageSync('user_id'); + let usertype = wx.getStorageSync('usertype'); + if(usertype != 2){//只登录医师端 + return; + } + if(userID == ""){ return; } diff --git a/commpents/myprofile/index.js b/commpents/myprofile/index.js index bc99575..d101a08 100644 --- a/commpents/myprofile/index.js +++ b/commpents/myprofile/index.js @@ -98,6 +98,8 @@ Component({ work_cert_reason: "", department_custom_name_reason: '', zhuanchang_note: '请选择专长', + jianjie_show: false, + shanchang_show: false, }, options: { @@ -363,7 +365,9 @@ Component({ onChangeCity(e) { this.setData({ select_county_id: "", - select_yiyuan_id: "" + select_yiyuan_id: "", + yiyuan_note: "请选择医院", + city_note: "请选择城市", }) console.log("onChangeCity"); const { selectedOptions } = e.detail; @@ -595,10 +599,30 @@ Component({ onshowJianJieNote(e){ e.detail // 自定义组件触发事件时提供的 detail 对象 console.log("onshowJianJieNote"); + this.setData({ + jianjie_show: true, + }); + }, + onJianjieClose(e){ + e.detail // 自定义组件触发事件时提供的 detail 对象 + console.log("onshowJianJieNote"); + this.setData({ + jianjie_show: false, + }); }, onshowShanChangNote(e){ e.detail // 自定义组件触发事件时提供的 detail 对象 console.log("onshowShanChangNote"); + this.setData({ + shanchang_show: true, + }); + }, + onshowShanChangNoteClose(e){ + e.detail // 自定义组件触发事件时提供的 detail 对象 + console.log("onshowShanChangNote"); + this.setData({ + shanchang_show: false, + }); }, onshowZhiYeNote(e){ e.detail // 自定义组件触发事件时提供的 detail 对象 diff --git a/commpents/myprofile/index.json b/commpents/myprofile/index.json index dd3b01c..e03f7ea 100644 --- a/commpents/myprofile/index.json +++ b/commpents/myprofile/index.json @@ -19,6 +19,7 @@ "van-toast": "@vant/weapp/toast/index", "van-button": "@vant/weapp/button/index", "van-icon": "@vant/weapp/icon/index", - "van-search": "@vant/weapp/search/index" + "van-search": "@vant/weapp/search/index", + "van-empty": "@vant/weapp/empty/index" } } diff --git a/commpents/myprofile/index.wxml b/commpents/myprofile/index.wxml index fca0589..a0b74af 100644 --- a/commpents/myprofile/index.wxml +++ b/commpents/myprofile/index.wxml @@ -46,7 +46,8 @@ default-index="{{select_yiyuan_index}}" bind:cancel="onYiYuanCancel" bind:confirm="onYiYuanConfirm" - bind:change="onYiYuanChange" /> + bind:change="onYiYuanChange" + /> + + + @@ -146,6 +150,30 @@ + + + 博士，xxxx医院肝病科副主任医师，硕士研究生导师；中华医学会肝病学分会青年委员，北京医学会感染病学分会委员；2015首都十大杰出青年医生，2020年中华医学会抗击新冠优秀个人；作为主要研究者参与各级科研课题10项，发表学术论文10余篇，其中SCI文章2篇 + + + + + + 肝病的个体化治疗、致力于各种肝病尤其肝衰竭的临床诊治，尤其专注于终末期肝病营养相关临床和基础研究。 + + + @@ -190,7 +218,7 @@ model:value="{{ office_phone }}" bind:change="onOfficePhoneChange" placeholder="请输入科室电话" - placeholder-style="font-size:25rpx;letter-spacing: 2rpx;color:rgba(0, 0, 0, 0.4);" + placeholder-style="font-size:30rpx;letter-spacing: 2rpx;color:rgba(0, 0, 0, 0.4);" input-align="right" type="number" clearable @@ -242,7 +270,7 @@ textarea_val="{{textarea_shanchang}}" has_error_content="{{ be_good_at_reason }}" textarea_cell_content_placeholder="您的专业领域、擅长疾病、研究方法等信息（10~1000字）" - textarea_cell_note="查看示例" data-textarea_name="textarea_shanchang" bindTextAreaBlur="getTextAreaVal" /> + data-textarea_name="textarea_shanchang" bindTextAreaBlur="getTextAreaVal" /> { } return result; } +// px 转换为 rpx ，传参类型是数字（Number） +const rpxTopx = px => { + let deviceWidth = wx.getSystemInfoSync().windowWidth; //获取设备屏幕宽度 + let rpx = (750 / deviceWidth) * Number(px) + return Math.floor(rpx); +} module.exports = { formatTime, getDateArr, formatNumber, getTimeAgo, + rpxTopx }