diff --git a/Pages/yaoshi/prescription/prescription.js b/Pages/yaoshi/prescription/prescription.js index ff957a0..fce659a 100644 --- a/Pages/yaoshi/prescription/prescription.js +++ b/Pages/yaoshi/prescription/prescription.js @@ -15,7 +15,7 @@ Page({ // 此页面 页面内容距最顶部的距离 height: app.globalData.height, order_prescription_id: "", - prescription_img: "", + prescription_img_oss_path: "", doctor_sign_image: "" }, onLoad(options) { @@ -72,7 +72,7 @@ Page({ api.getPharmacistPrescriptioninfo({order_prescription_id: this.data.order_prescription_id}).then(response => { console.log(response.data); this.setData({ - prescription_img: response.data.prescription_img, + prescription_img_oss_path: response.data.prescription_img_oss_path, doctor_sign_image: response.data.doctor_sign_image }) }).catch(errors => {console.error(errors);}) diff --git a/Pages/yaoshi/prescription/prescription.wxml b/Pages/yaoshi/prescription/prescription.wxml index 3b5b79f..8c6b132 100644 --- a/Pages/yaoshi/prescription/prescription.wxml +++ b/Pages/yaoshi/prescription/prescription.wxml @@ -3,7 +3,7 @@ - + diff --git a/Pages/yishi/case/index.wxml b/Pages/yishi/case/index.wxml index 2fdb5b4..448e608 100644 --- a/Pages/yishi/case/index.wxml +++ b/Pages/yishi/case/index.wxml @@ -1,3 +1,4 @@ + 基础信息 @@ -20,7 +21,7 @@ 确诊日期: - {{case_detail.diagnosis_date}} + {{dateSubstr.substring(case_detail.diagnosis_date,0,10)}} + + + + 我知道了 + + diff --git a/Pages/yishi/onlinechufang/index.js b/Pages/yishi/onlinechufang/index.js index f0f161b..66bb072 100644 --- a/Pages/yishi/onlinechufang/index.js +++ b/Pages/yishi/onlinechufang/index.js @@ -200,6 +200,9 @@ Page({ params.product_keyword = this.data.product_name; api.getBasicProductSearch(params).then(response => { console.log(response); + this.setData({ + drug_content_show: false + }) if(response.data.length > 0){ this.setData({ search_drug_list_empty: false, @@ -252,7 +255,7 @@ Page({ console.log("disease_class_id: ", disease_class_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 == disease_class_id }); console.log("find_idex: ", find_index) list.splice(find_index, 1); diff --git a/Pages/yishi/onlinesetupprice/index.wxml b/Pages/yishi/onlinesetupprice/index.wxml index 9951f9f..13e237f 100644 --- a/Pages/yishi/onlinesetupprice/index.wxml +++ b/Pages/yishi/onlinesetupprice/index.wxml @@ -4,7 +4,7 @@ 每日接诊数量 - + diff --git a/Pages/yishi/quickreply/index.js b/Pages/yishi/quickreply/index.js index 8e02877..67a264e 100644 --- a/Pages/yishi/quickreply/index.js +++ b/Pages/yishi/quickreply/index.js @@ -21,7 +21,8 @@ Page({ current_words_type: 1, focus: false, words_css: "border-radius: 20rpx;margin-bottom: 20rpx;", - from: "" + from: "", + open: false }, onLoad(options){ let from = options.from; @@ -80,7 +81,9 @@ Page({ } api.delDoctorWords({doctor_words_id: doctor_words_id}).then(response => { console.log(response); - + this.setData({ + open: false + }) }).then(()=>{ this.getList(words_type) }).catch(errors => {console.error(errors);}) @@ -122,10 +125,16 @@ Page({ wordsOpen(e){ console.log("open") console.log(e); + this.setData({ + open: true + }) }, wordsClick(e){ console.log("click") console.log(e); + if(this.data.open){ + return + } let words = e.currentTarget.dataset.words; let from = this.data.from; if(from){ diff --git a/Pages/yishi/quickreply/index.wxml b/Pages/yishi/quickreply/index.wxml index 338ab61..06f9500 100644 --- a/Pages/yishi/quickreply/index.wxml +++ b/Pages/yishi/quickreply/index.wxml @@ -38,7 +38,7 @@ - 删除 + 删除 diff --git a/Pages/yishi/wenzhen_v2/wenzhen.js b/Pages/yishi/wenzhen_v2/wenzhen.js index dd2a3dd..21b1831 100644 --- a/Pages/yishi/wenzhen_v2/wenzhen.js +++ b/Pages/yishi/wenzhen_v2/wenzhen.js @@ -31,6 +31,10 @@ Page({ total: 0, per_page: 0, last_page: 0, + dot_1: false, + dot_2: false, + dot_3: false, + dot_4: false, }, onLoad() { console.log("wenzhen onloadddd"); @@ -141,6 +145,10 @@ Page({ total: 0, per_page: 0, last_page: 0, + dot_1: false, + dot_2: false, + dot_3: false, + dot_4: false, }) wx.$TUIKit.off(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, this.$onMessageReceived); }, @@ -412,6 +420,10 @@ Page({ if(unreadCount > 0){ totalUnreadCount = totalUnreadCount + unreadCount; session_item.message_dot = true; + let dot_name = "dot_"+inquiry_type + this.setData({ + [dot_name]: true + }) }else{ if(item.inquiry_status == 3){ totalUnreadCount = totalUnreadCount + 1; diff --git a/Pages/yishi/wenzhen_v2/wenzhen.wxml b/Pages/yishi/wenzhen_v2/wenzhen.wxml index 0c7bf6b..b954de4 100644 --- a/Pages/yishi/wenzhen_v2/wenzhen.wxml +++ b/Pages/yishi/wenzhen_v2/wenzhen.wxml @@ -152,7 +152,7 @@ bind:change="vanTabsChange" wx:if="{{ has_data }}" > - + - + - + - + - + - + diff --git a/utils/substr.wxs b/utils/substr.wxs new file mode 100644 index 0000000..7a50e2c --- /dev/null +++ b/utils/substr.wxs @@ -0,0 +1,12 @@ +var filters = {//截取字符串返回 + substring:function(str,start,end){ + if(!str){ + return + } + //也可做一些判断 //我不需要所以没做其他处理,直接返回的 + return str.substring(start,end); + } +} +module.exports = { + substring:filters.substring +} \ No newline at end of file