diff --git a/Pages/yishi/case/index.js b/Pages/yishi/case/index.js
index 6ba2470..84ebf13 100644
--- a/Pages/yishi/case/index.js
+++ b/Pages/yishi/case/index.js
@@ -19,8 +19,11 @@ Page({
})
},
+ goReport(event){
+ const url=event.currentTarget.dataset.url;
+ },
formatImgList(){
- let diagnose_images = this.data.case_detail.diagnose_images;
+ let diagnose_images = this.data.case_detail.diagnose_images?this.data.case_detail.diagnose_images:[];
let img_list = [];
diagnose_images.forEach(item => {
let img = {};
diff --git a/Pages/yishi/case/index.json b/Pages/yishi/case/index.json
index 3e38f1a..a00e82d 100644
--- a/Pages/yishi/case/index.json
+++ b/Pages/yishi/case/index.json
@@ -2,6 +2,7 @@
"component": true,
"usingComponents": {
"te-nav-bar": "/commpents/te_navbar",
+ "van-icon": "@vant/weapp/icon/index",
"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 baac024..56cf2e2 100644
--- a/Pages/yishi/case/index.wxml
+++ b/Pages/yishi/case/index.wxml
@@ -58,7 +58,16 @@
-
+
+ {{case_detail.detection_project_name}}
+
+
+ 糖组检测
+ {{case_detail.detection_time}}
+
+
+
+
其他信息
diff --git a/Pages/yishi/case/index.wxss b/Pages/yishi/case/index.wxss
index 811db02..e416964 100644
--- a/Pages/yishi/case/index.wxss
+++ b/Pages/yishi/case/index.wxss
@@ -100,3 +100,20 @@ page{
margin-bottom: 50rpx;
}
+.sugar{
+ display: flex;
+ align-items: center;
+ justify-content:space-between ;
+}
+.sugar .name{
+ color:#333;
+
+ font-size: 30rpx;
+}
+.sugar .date{
+ margin-top: 12rpx;
+ font-size: 24rpx;
+ font-weight: 400;
+ color: rgba(0,0,0,0.45);
+
+}
\ No newline at end of file
diff --git a/Pages/yishi/medince_list/index.js b/Pages/yishi/medince_list/index.js
new file mode 100644
index 0000000..b3c975b
--- /dev/null
+++ b/Pages/yishi/medince_list/index.js
@@ -0,0 +1,136 @@
+// Pages/yishi/medince_list/index.js
+import { API } from './../../../utils/network/api'
+import debounce from "./../../../utils/debounce"
+let api = new API()
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ navbarData: {
+
+ showCapsule: 1, //是否显示左上角图标 1表示显示 0表示不显示
+ title: '药品清单', //导航栏 中间的标题
+ },
+ page:1,
+ list:[],
+ isLock:false,
+ per_page:10,
+ keyword:'',
+ },
+ changeInput:debounce(function(event){
+ const { value }= event.detail;
+ this.setData({
+ isLock:false,
+ page:1,
+ list:[],
+ keyword:value
+ })
+ this.handleGetList();
+ },600),
+ goSearch(){
+ this.setData({
+ isLock:false,
+ list:[],
+ page:1
+ })
+ this.handleGetList();
+ },
+ confirmSearch(event){
+ const { value }= event.detail;
+ this.setData({
+ isLock:false,
+ list:[],
+ page:1,
+ keyword:value
+ })
+ this.handleGetList();
+ },
+ lower(){
+ console.log('===触底了！！===');
+ let {page,isLock}=this.data;
+ if(!isLock){
+ page++;
+ this.setData({
+ page:page
+ });
+ this.handleGetList();
+ }
+ },
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ handleGetList(){
+ const {page,per_page,keyword}=this.data;
+ api.getMedinceList({
+ page,
+ per_page,
+ keyword,
+
+ }).then(data=>{
+ let result=data.data.data;
+ if(result.length==0){
+ this.setData({
+ isLock:true
+ });
+ return false;
+ }
+ this.setData({
+ list:this.data.list.concat(result)
+ });
+ }).catch(errors => {console.error(errors);})
+ },
+ onLoad(options) {
+ this.handleGetList();
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload() {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh() {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom() {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage() {
+
+ }
+})
\ No newline at end of file
diff --git a/Pages/yishi/medince_list/index.json b/Pages/yishi/medince_list/index.json
new file mode 100644
index 0000000..152dd7f
--- /dev/null
+++ b/Pages/yishi/medince_list/index.json
@@ -0,0 +1,9 @@
+{
+ "component": true,
+ "usingComponents": {
+ "te-nav-bar": "/commpents/te_navbar",
+ "van-image": "@vant/weapp/image/index",
+ "van-divider": "@vant/weapp/divider/index",
+ "van-empty": "@vant/weapp/empty/index"
+ }
+}
\ No newline at end of file
diff --git a/Pages/yishi/medince_list/index.wxml b/Pages/yishi/medince_list/index.wxml
new file mode 100644
index 0000000..3e27bea
--- /dev/null
+++ b/Pages/yishi/medince_list/index.wxml
@@ -0,0 +1,35 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 处方药品
+ 依据法规不展示包装
+
+
+
+
+
+
+ {{item.product_name}}/{{item.packaging_unit}}
+ {{item.manufacturer}}
+
+
+ ¥ {{item.product_price}}
+ 库存：{{item.stock}}
+
+
+
+ 到底了~
+
+
+
+
\ No newline at end of file
diff --git a/Pages/yishi/medince_list/index.wxss b/Pages/yishi/medince_list/index.wxss
new file mode 100644
index 0000000..baefab1
--- /dev/null
+++ b/Pages/yishi/medince_list/index.wxss
@@ -0,0 +1,117 @@
+/* Pages/yishi/medince_list/index.wxss */
+page{
+ height:100vh;
+ background-color: #F6F6F6;
+}
+ .container{
+ height:calc(100vh - 135rpx);
+ display: flex;
+ overflow: hidden;
+ /* overflow-y: scroll; */
+ /* -webkit-overflow-scrolling: touch; */
+ flex-direction: column;
+}
+.searchCon{
+ width:100%;
+
+ background:#fff;
+}
+.searchbox{
+ display: flex;
+ margin:32rpx;
+ align-items: center;
+ height: 80rpx;
+background: #FFFFFF;
+border-radius: 40rpx;
+border: 2rpx solid #3CC7C0;
+
+}
+.searchIpt{
+ flex:1;
+ margin-left: 32px;
+}
+.searchImg{
+ width: 40rpx;
+ height:40rpx;
+ padding:30rpx;
+}
+.tips{
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ position: absolute;
+ width: 200rpx;
+ height:200rpx;
+ font-size: 22rpx;
+font-weight: 400;
+color: #666666;
+}
+.desc{
+ text-align: center;
+}
+.medimgbox{
+ position: relative;
+ width: 200rpx;
+ height:200rpx;
+ margin-left: 30rpx;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ border-radius:5rpx;
+}
+.medImg{
+ width:120rpx;
+ height:128rpx;
+
+}
+.cell{
+ padding:20rpx 0;
+ background: #FFFFFF;
+box-shadow: 0rpx 2rpx 16rpx 2rpx rgba(0,0,0,0.02);
+border-radius: 12rpx;
+ margin:0 32rpx 20rpx;
+ display: flex;
+}
+.rightbox{
+ flex:1;
+ margin-left: 24rpx;
+ margin-right: 20rpx;
+}
+.scrollbox{
+ margin-top: 20rpx;
+ flex:1;
+ overflow-y: scroll;
+ -webkit-overflow-scrolling: touch;
+}
+.bottombox{
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+}
+.info .name{
+ word-break: break-all;
+font-size: 32rpx;
+ font-weight: 600;
+color: rgba(0,0,0,0.85);
+}
+.company{
+ margin-top: 5rpx;
+ font-size: 26rpx;
+font-weight: 400;
+color: rgba(0,0,0,0.45);
+}
+.price{
+ font-size: 28rpx;
+color: #EF4F20;
+}
+.rightbox{
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+
+}
+.num{
+ font-size: 28rpx;
+font-weight: 400;
+color: rgba(0,0,0,0.65);
+}
\ No newline at end of file
diff --git a/Pages/yishi/my/index.wxml b/Pages/yishi/my/index.wxml
index 2b15b8f..f264281 100644
--- a/Pages/yishi/my/index.wxml
+++ b/Pages/yishi/my/index.wxml
@@ -1,7 +1,7 @@
{{ title }}
-
+
@@ -18,7 +18,7 @@
-
+
@@ -47,7 +47,8 @@
-
+
+
diff --git a/Pages/yishi/my/index.wxss b/Pages/yishi/my/index.wxss
index 09dd19c..1d4d4ec 100644
--- a/Pages/yishi/my/index.wxss
+++ b/Pages/yishi/my/index.wxss
@@ -2,6 +2,10 @@ page{
background-color: #F5F5F5;
}
.container{
+ background: linear-gradient(180deg, #3CC7C0 0%, rgba(60,199,192,0) 50%);
+
+ padding-bottom: 100rpx;
+ min-height:100vh;
width: 100vw;
color: #fff;
position: relative;
@@ -9,7 +13,7 @@ page{
.top{
width: 100%;
height: 500rpx;
- background-color: #3CC7C0;
+ /* background-color: #3CC7C0; */
position: absolute;
}
.title{
@@ -17,6 +21,7 @@ page{
text-align: center;
}
.info_box{
+ margin-top: 24rpx;
width: 100%;
height: 200rpx;
position: relative;
@@ -62,6 +67,7 @@ page{
width: 92vw;
margin: 0 auto;
height: 272rpx;
+ margin-top: 24rpx;
position: relative;
border-radius: 20rpx;
display: flex;
@@ -104,8 +110,8 @@ page{
.content{
width: 92vw;
background-color: #fff;
- margin: 0 auto;
- position: relative;
+ margin: 24rpx auto 0;
+ position: static;
border-radius: 20rpx;
padding: 20rpx 0;
}
diff --git a/Pages/yishi/mycard/index.js b/Pages/yishi/mycard/index.js
index 1277699..c733b4b 100644
--- a/Pages/yishi/mycard/index.js
+++ b/Pages/yishi/mycard/index.js
@@ -12,6 +12,7 @@ Page({
showText: false,
saveImgPath: "",
info: {},
+ codeImg:'',
// https://github.com/Kujiale-Mobile/Painter
template: {
width: '750px',
@@ -160,6 +161,7 @@ Page({
console.log(response);
this.setData({
info: response.data,
+ codeImg:response.data.qr_code_url+"?v=3.0",
"template.views[3].url" : response.data.qr_code_url,
"template.views[4].url" : response.data.avatar,
"template.views[5].text" : response.data.user_name,
diff --git a/Pages/yishi/mycard/index.wxml b/Pages/yishi/mycard/index.wxml
index 1c02a13..e04e41c 100644
--- a/Pages/yishi/mycard/index.wxml
+++ b/Pages/yishi/mycard/index.wxml
@@ -14,7 +14,7 @@
-
+
让您的患者微信扫码，线上复诊更便捷
diff --git a/Pages/yishi/onlinechufang/index.js b/Pages/yishi/onlinechufang/index.js
index 5f52d24..5ba3f6b 100644
--- a/Pages/yishi/onlinechufang/index.js
+++ b/Pages/yishi/onlinechufang/index.js
@@ -10,6 +10,8 @@ Page({
showCapsule: 1, //是否显示左上角图标 1表示显示 0表示不显示
title: '在线开方', //导航栏 中间的标题
},
+ autoHeight:{ minHeight: 100},
+ add_disease_desc:'',//医生填写的病情主诉
height: app.globalData.height,
zhenduan_popshow: false,
drugs_popshow: false,
@@ -323,6 +325,11 @@ Page({
})
}
},
+ onChangeTextAraa(event){
+ this.setData({
+ add_disease_desc:event.detail
+ })
+ },
getAdvice(e){
console.log(e.detail.value)
this.setData({
@@ -351,7 +358,19 @@ Page({
params.prescription_product = this.data.drugs_box_item_list;
console.log(params);
-
+ //糖组检测需要填病情主诉；
+ let disease_desc=this.data.case_detail.disease_desc;
+ params.disease_desc=disease_desc?disease_desc:this.data.add_disease_desc;
+ if(!params.disease_desc){
+ wx.showToast({
+ title: '请填写病情主诉',
+ icon: "error"
+ })
+ this.setData({
+ sub_disabled: false
+ })
+ return;
+ }
if(prescription_icd.length == 0){
wx.showToast({
title: '请选择诊断',
diff --git a/Pages/yishi/onlinechufang/index.wxml b/Pages/yishi/onlinechufang/index.wxml
index 649fa42..8e0ea30 100644
--- a/Pages/yishi/onlinechufang/index.wxml
+++ b/Pages/yishi/onlinechufang/index.wxml
@@ -1,5 +1,5 @@
-
+
@@ -12,7 +12,8 @@
病情主诉：
- {{case_detail.disease_desc}}
+
+ {{case_detail.disease_desc}}
用药意向：
@@ -30,11 +31,11 @@
-
+
+添加诊断
-
+
{{item.icd_name}}
@@ -77,140 +78,38 @@
-
+
添加药品
药品名称
-
+
-
+
-
- {{item.product_name}}
- {{item.manufacturer}}
+
+ {{item.product_name}}
+ {{item.manufacturer}}
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
保存
@@ -218,35 +117,13 @@
-
-
+
+
-
+
诊断
-
+
{{item.icd_name}}
@@ -258,4 +135,4 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/Pages/yishi/wenzhen_v2/wenzhen.js b/Pages/yishi/wenzhen_v2/wenzhen.js
index a198244..f7e768b 100644
--- a/Pages/yishi/wenzhen_v2/wenzhen.js
+++ b/Pages/yishi/wenzhen_v2/wenzhen.js
@@ -12,15 +12,16 @@ Page({
height: app.globalData.height,
static_host: api.getStaticHost(),
has_data: false,
- data_list_1: [],
- data_list_2: [],
- data_list_3: [],
- data_list_4: [],
- data_list_5: [],
- data_list_5_loading: false,
+ data_list_1: [],//在线问诊
+ data_list_2: [],//快速问诊
+ data_list_3: [],//公益问诊
+ data_list_4: [], //问诊购药
+ data_list_5: [],//糖组检测
+ data_list_6: [],//问诊结束
+ data_list_6_loading: false,
conversationList: [],
message_inquiry_type: 99999,
- now_message_inquiry_type: 5,
+ now_message_inquiry_type: 6,
system_notice_unreadnnum: "",
service_notice_unreadnnum: "",
hasOnShow: false,
@@ -37,9 +38,10 @@ Page({
dot_2: false,
dot_3: false,
dot_4: false,
+ dot_5: false,
},
onLoad() {
- // console.log("wenzhen onloadddd");
+ console.log("wenzhen onloadddd");
// if(wx.$TUIKit){
// wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, this.$onMessageReceived, this);
@@ -73,7 +75,7 @@ Page({
service_notice_unreadnnum: service_notice_unreadnnum,
})
- 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){
+ 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.data.data_list_6.length > 0){
_this.setData({
has_data: true
})
@@ -141,6 +143,7 @@ Page({
data_list_3: [],
data_list_4: [],
data_list_5: [],
+ data_list_6: [],
message_inquiry_type: 9999,
now_message_inquiry_type: 5,
unreadnnum_inter: 0,
@@ -153,6 +156,7 @@ Page({
dot_2: false,
dot_3: false,
dot_4: false,
+ dot_5: false,
})
wx.$TUIKit.off(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, this.$onMessageReceived);
wx.$TUIKit.off(wx.$TUIKitTIM.EVENT.SDK_READY, this.onSDKReady);
@@ -162,7 +166,7 @@ Page({
this.setData({
hasOnShow: false,
message_inquiry_type: 9999,
- now_message_inquiry_type: 5,
+ now_message_inquiry_type: 6,
})
},
onSDKReady(){
@@ -350,7 +354,8 @@ Page({
item.patient_sex = order.patient_sex;
new_conversationList.push(item);
})
- }
+ };
+ //console.log(new_conversationList);
this.setData({
conversationList: new_conversationList
})
@@ -361,22 +366,26 @@ Page({
},
formatConversationList(){
let session_list = [];
+
let session_data_list_1 = [];
let session_data_list_2 = [];
let session_data_list_3 = [];
let session_data_list_4 = [];
let session_data_list_5 = [];
+ let session_data_list_6 = [];
session_list.push(session_data_list_1);
session_list.push(session_data_list_2);
session_list.push(session_data_list_3);
session_list.push(session_data_list_4);
session_list.push(session_data_list_5);
+ session_list.push(session_data_list_6);
let usertype = wx.getStorageSync('usertype');
let userID = wx.getStorageSync('user_id_'+usertype);
let totalUnreadCount = 0;
let message_inquiry_type = this.data.message_inquiry_type;
-
+ console.log("conversationList---------");
+ console.log(this.data.conversationList);
this.data.conversationList.forEach(item => {
let conversationID = item.conversationID;
if(conversationID == "C2Cadministrator") return;//如果是管理员消息直接跳过
@@ -391,7 +400,7 @@ Page({
if(!order_inquiry_id) return;
let inquiry_type = cloudCustomDataJson.inquiry_type;
if(!inquiry_type) return;
- if(inquiry_type > 4) return;
+ if(inquiry_type > 5) return;
if(inquiry_type < message_inquiry_type){
message_inquiry_type = inquiry_type;
}
@@ -452,17 +461,20 @@ Page({
}
}
session_list[inquiry_type - 1].push(session_item);
+ console.log("--------------------")
+ console.log(session_list)
})
wx.setStorageSync(userID+'_wenzhen_info', totalUnreadCount);
-
+ console.log(session_data_list_3)
this.setData({
data_list_1: session_data_list_1,
data_list_2: session_data_list_2,
data_list_3: session_data_list_3,
data_list_4: session_data_list_4,
+ data_list_5: session_data_list_5,
message_inquiry_type: message_inquiry_type
})
wx.stopPullDownRefresh()
@@ -559,21 +571,21 @@ Page({
onReachBottom() {
// console.log('===触底了！！===');
let now_message_inquiry_type = this.data.now_message_inquiry_type;
- if(now_message_inquiry_type == 5){
+ if(now_message_inquiry_type == 6){
if(this.data.current_page < this.data.last_page){//最后一页时停止分页
this.getDoctorInquiryFinishMessage()
}
}
},
getDoctorInquiryFinishMessage(){
- let data_list_5 = this.data.data_list_5;
+ let data_list_6= this.data.data_list_6;
let params = {};
params.page = this.data.current_page + 1;
- this.setData({data_list_5_loading: true})
+ this.setData({data_list_6_loading: true})
api.getDoctorInquiryFinishMessage(params).then(response => {
// console.log(response);
this.setData({
- "data_list_5": data_list_5.concat(response.data.data),
+ "data_list_6": data_list_6.concat(response.data.data),
current_page: response.data.current_page,
total: response.data.total,
per_page: response.data.per_page,
@@ -581,9 +593,9 @@ Page({
})
// this.selectComponent('#tabs').resize();
}).then(res =>{
- this.setData({ data_list_5_loading: false})
+ this.setData({ data_list_6_loading: false})
}).catch(errors => {
- this.setData({ data_list_5_loading: false})
+ this.setData({ data_list_6_loading: false})
console.error(errors);
})
}
diff --git a/Pages/yishi/wenzhen_v2/wenzhen.wxml b/Pages/yishi/wenzhen_v2/wenzhen.wxml
index a7a0df2..6155ac1 100644
--- a/Pages/yishi/wenzhen_v2/wenzhen.wxml
+++ b/Pages/yishi/wenzhen_v2/wenzhen.wxml
@@ -23,11 +23,11 @@
-
+
未收到任何消息
- 加载中...
+ 加载中...
@@ -334,8 +334,52 @@
不接诊24小时后自动取消
-
-
+
+
+
+
+
+
+ 就诊人：
+ {{item.patient_name}} {{item.patient_sex==1?'男':'女'}}｜{{item.patient_age}}
+
+ {{item.message_send_time}}
+
+ {{item.last_message_content.Text}}
+
+ {{ item.inquiry_status==1?'待支付':item.inquiry_status==2?'待分配':item.inquiry_status==3?'待接诊':item.inquiry_status==4?'接诊中':item.inquiry_status==5?'已完成':item.inquiry_status==6?'已结束':item.inquiry_status==7?'已取消':'其他' }}
+
+ 查看病历
+ 去接诊
+
+
+ 问诊详情
+
+
+
+ 不接诊72小时后自动取消
+
+
+
+
就诊人：
@@ -351,10 +395,10 @@
- 加载中...
+ 加载中...
-
- 到底了~
+
+ 到底了~
diff --git a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js
index a3e5e7d..76f7bab 100644
--- a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js
+++ b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js
@@ -17,6 +17,15 @@ Component({
});
},
},
+ patient_family_data:{
+ type: Object,
+ value: {},
+ observer(newVal) {
+ this.setData({
+ patient_family_data: newVal,
+ });
+ }
+ },
isMine: {
type: Boolean,
value: true,
@@ -174,6 +183,25 @@ Component({
}];
return renderDom;
}
+ // 10:糖组检测
+ if (customMessage.message_type === GDXZ_CUSTOM_MSEEAGE.SUGAR_CHECK) {
+ let data = customMessage.data;
+ const renderDom = [{
+ type: 'sugar_check',
+ title:customMessage.title,
+ disease_class_names:data.disease_class_names
+ }];
+ return renderDom;
+ }
+ // 11:患者信息
+ if (customMessage.message_type === GDXZ_CUSTOM_MSEEAGE.PATIENT_INFO) {
+ let data = customMessage.data;
+ const renderDom = [{
+ type: 'patient_info',
+ path:data.message_path
+ }];
+ return renderDom;
+ }
} catch (error) {
}
// 客服咨询
@@ -223,6 +251,12 @@ Component({
} catch (error) {
}
},
+
+ goSick(event){
+ const url=event.currentTarget.dataset.url;
+ console.log(url);
+ app.go(url);
+ },
openLink(e) {
if (e.currentTarget.dataset.value.key === '立即前往') {
wx.navigateTo({
diff --git a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.json b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.json
index 785d068..769c6ad 100644
--- a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.json
+++ b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.json
@@ -1,6 +1,7 @@
{
"component": true,
"usingComponents": {
- "van-rate": "@vant/weapp/rate/index"
+ "van-rate": "@vant/weapp/rate/index",
+ "van-icon": "@vant/weapp/icon/index"
}
}
\ No newline at end of file
diff --git a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxml b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxml
index c793ed4..eaa7050 100644
--- a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxml
+++ b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxml
@@ -1,4 +1,4 @@
-
+
@@ -86,5 +86,34 @@
+
+
+
+ {{renderDom[0].title}}报告
+
+
+ 就诊人：{{patient_family_data.patient_name}}（男女未知｜{{patient_family_data.patient_age}}岁）
+ 所患疾病：{{renderDom[0].disease_class_names}}
+
+
+
+ 查看报告
+
+
+
+
+
+ 患者信息
+
+ 就诊人：{{patient_family_data.patient_name}}（男女未知｜{{patient_family_data.patient_age}}岁）
+
+ 查看详情
+
+
+
+
+
+
diff --git a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxss b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxss
index dda23ff..225c55e 100644
--- a/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxss
+++ b/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxss
@@ -233,4 +233,104 @@ line-height: 42rpx;
padding: 15rpx 30rpx;
border-radius: 40rpx;
font-size: 30rpx;
+}
+/* 糖组检测 */
+
+.back{
+ width:24rpx;
+ height:48rpx;
+ transform: rotate(180deg);
+}
+.sugarbox{
+ position: relative;
+ width: 420rpx;
+ background: rgb(255, 255, 255);
+ border: 1rpx solid #D8D8D8;
+ border-radius: 12rpx;
+}
+.sugarbox::after{
+ content:'';
+ position: absolute;
+ top: 35rpx;
+ left: 0;
+ transform: translate(-50%,-50%) rotate(45deg);
+ width: 16rpx;
+ height: 16rpx;
+ background: rgb(255, 255, 255);
+ border: 1rpx solid #D8D8D8;
+ border-style: none none solid solid;
+}
+.sugarcon{
+ margin:0rpx 24rpx 0;
+
+}
+.patient_info{
+ font-size: 28rpx;
+font-weight: 400;
+color: rgba(0,0,0,0.65);
+line-height: 40rpx;
+}
+.sugarcon{
+ border-bottom: 1rpx solid rgba(0,0,0,0.12);
+ padding-bottom: 24rpx;
+}
+.sugarcon .title{
+ margin:24rpx 0 20rpx;
+ font-size: 32rpx;
+ font-weight: 500;
+color: #3CC7C0;
+}
+.sugarbox .detail{
+ display: flex;
+ margin:0 24rpx;
+ height:88rpx;
+ font-size: 32rpx;
+font-weight: 400;
+color: rgba(0,0,0,0.85);
+ justify-content: space-between;
+ align-items: center;
+}
+/* 患者信息 */
+.patientbox{
+ display: flex;
+ flex-direction: column;
+ width: calc(100vw - 40rpx);
+ text-align: center;
+ background-color: #fff;
+ border-radius: 12rpx;
+ overflow: hidden;
+ position: relative;
+ box-shadow: 0 0 6rpx 0 #ccc;
+}
+.patientbox .title{
+ position: relative;
+ text-align: left;
+ padding:0 24rpx;
+ height: 90rpx;
+font-size: 32rpx;
+border-bottom: 1rpx solid rgba(0,0,0,0.12);
+font-weight: 550;
+color: rgba(0,0,0,0.85);
+line-height: 90rpx;
+}
+.patientbox .name{
+ color: rgba(0,0,0,0.85);
+ font-size: 32rpx;
+}
+.bg{
+ position: absolute;
+ z-index:0;
+ width:100%;
+ height:90rpx;
+}
+.patientbox .patient_info{
+ padding:40rpx 0;
+ margin:0 24rpx;
+display: flex;
+justify-content:space-between;
+}
+.look{
+ display: flex;
+ color:rgba(0,0,0,0.45);
+ align-items: center;
}
\ No newline at end of file
diff --git a/TUIKit/components/TUIChat/components/MessageList/concat.wxs b/TUIKit/components/TUIChat/components/MessageList/concat.wxs
index 107669b..cad2a6c 100644
--- a/TUIKit/components/TUIChat/components/MessageList/concat.wxs
+++ b/TUIKit/components/TUIChat/components/MessageList/concat.wxs
@@ -7,7 +7,15 @@ var concat = function() {
var connect = function() {
return arguments[0] + arguments[1]
}
+var formateText=function (value){
+ if(!value){
+ return {}
+ }else{
+ return JSON.parse(value)
+ }
+}
module.exports = {
concat: concat,
- connect: connect
+ connect: connect,
+ formateText:formateText
};
\ 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 a1d3f7c..da76b75 100644
--- a/TUIKit/components/TUIChat/components/MessageList/index.js
+++ b/TUIKit/components/TUIChat/components/MessageList/index.js
@@ -355,7 +355,7 @@ Component({
let show_avatar = true;
if(type === "TIMCustomElem"){
const customMessage = JSON.parse(message.payload.data);
- if(Number(customMessage.message_type) != GDXZ_CUSTOM_MSEEAGE.PRESCRIBE && Number(customMessage.message_type) != GDXZ_CUSTOM_MSEEAGE.PRESCRIBE_VERIFY){
+ if(Number(customMessage.message_type) != GDXZ_CUSTOM_MSEEAGE.PRESCRIBE && Number(customMessage.message_type) != GDXZ_CUSTOM_MSEEAGE.PRESCRIBE_VERIFY && Number(customMessage.message_type) != GDXZ_CUSTOM_MSEEAGE.SUGAR_CHECK){
show_avatar = false;
}
if(Number(customMessage.message_type) == GDXZ_CUSTOM_MSEEAGE.TRABECULA && refreshBaseInfo){
@@ -374,6 +374,7 @@ Component({
},
// 历史消息渲染
$handleMessageRender(messageList, currentMessageList) {
+ console.log(messageList);
// console.log("handleMessageRenderhandleMessageRenderhandleMessageRender");
// this.showHistoryMessageTime(currentMessageList);
if (messageList.length > 0) {
@@ -944,6 +945,11 @@ Component({
});
}
},
+ goMedinceList(){
+ wx.navigateTo({
+ url: '/Pages/yishi/medince_list/index',
+ })
+ },
},
});
diff --git a/TUIKit/components/TUIChat/components/MessageList/index.wxml b/TUIKit/components/TUIChat/components/MessageList/index.wxml
index 87963a9..ece4633 100644
--- a/TUIKit/components/TUIChat/components/MessageList/index.wxml
+++ b/TUIKit/components/TUIChat/components/MessageList/index.wxml
@@ -55,7 +55,7 @@
-
+
@@ -69,6 +69,7 @@
+
diff --git a/TUIKit/components/TUIChat/components/MessageList/index.wxss b/TUIKit/components/TUIChat/components/MessageList/index.wxss
index 3c1a567..2aa17b1 100644
--- a/TUIKit/components/TUIChat/components/MessageList/index.wxss
+++ b/TUIKit/components/TUIChat/components/MessageList/index.wxss
@@ -1,6 +1,7 @@
.container{
width: 100%;
height: 100%;
+ position: relative;
background-color: #F4F4F4;
}
.message-list-container {
@@ -267,4 +268,11 @@
.content_desc{
font-size: 28rpx;
color: rgb(146, 144, 144);
+}
+.medList{
+ position: absolute;
+ left:0;
+ bottom:10rpx;
+ width:153rpx;
+ height: 159rpx;
}
\ No newline at end of file
diff --git a/TUIKit/static/images/back.png b/TUIKit/static/images/back.png
new file mode 100644
index 0000000..4eafa0d
Binary files /dev/null and b/TUIKit/static/images/back.png differ
diff --git a/TUIKit/static/images/patient_bg.png b/TUIKit/static/images/patient_bg.png
new file mode 100644
index 0000000..90a1d93
Binary files /dev/null and b/TUIKit/static/images/patient_bg.png differ
diff --git a/TUIKit/utils/constant.js b/TUIKit/utils/constant.js
index bbb9fa9..59612aa 100644
--- a/TUIKit/utils/constant.js
+++ b/TUIKit/utils/constant.js
@@ -49,6 +49,8 @@ const constant = {
PRESCRIBE: 6,//6:处方开具成功（医生端）
PRESCRIBE_VERIFY: 7,//7:处方审核通过（患者端）
BANNER_MESSAGE: 8,//8 弹框消息
+ SUGAR_CHECK:10,//糖组检测
+ PATIENT_INFO:11,//患者信息
},
OPERATING_ENVIRONMENT: 'imWxTuikit'
diff --git a/app.json b/app.json
index d997cdf..ff1d525 100644
--- a/app.json
+++ b/app.json
@@ -57,7 +57,8 @@
"Pages/yishi/yizhensetupprice/index",
"Pages/yishi/wenzhenorderV2/index",
"Pages/yishi/wenzhen_v3/wenzhen",
- "Pages/agreement_page/index"
+ "Pages/agreement_page/index",
+ "Pages/yishi/medince_list/index"
],
"window": {
"navigationBarBackgroundColor": "#ffffff",
diff --git a/static/images/yishi/tabbar_icon/medinceList.png b/static/images/yishi/tabbar_icon/medinceList.png
new file mode 100644
index 0000000..0f9d0c8
Binary files /dev/null and b/static/images/yishi/tabbar_icon/medinceList.png differ
diff --git a/static/images/yishi/tabbar_icon/ss.png b/static/images/yishi/tabbar_icon/ss.png
new file mode 100644
index 0000000..6276d5d
Binary files /dev/null and b/static/images/yishi/tabbar_icon/ss.png differ
diff --git a/static/images/yishi/tabbar_icon/zhiyao.png b/static/images/yishi/tabbar_icon/zhiyao.png
new file mode 100644
index 0000000..e357366
Binary files /dev/null and b/static/images/yishi/tabbar_icon/zhiyao.png differ
diff --git a/utils/debounce.js b/utils/debounce.js
new file mode 100644
index 0000000..3306bdf
--- /dev/null
+++ b/utils/debounce.js
@@ -0,0 +1,10 @@
+function debounce(fn, delay){
+ let timer = null;
+ return function(){
+ clearTimeout(timer);
+ timer = setTimeout(()=> {
+ fn.apply(this, arguments);
+ }, delay)
+ }
+}
+export default debounce
\ No newline at end of file
diff --git a/utils/network/api.js b/utils/network/api.js
index a209594..2a58a49 100644
--- a/utils/network/api.js
+++ b/utils/network/api.js
@@ -798,6 +798,16 @@ class API extends HTTP {
}
})
}
+//药品清单
+ getMedinceList(params) {
+ return this.request({
+ url: `${this.baseUrl}/basic/product`,
+ method: 'GET',
+ data: {
+ ...params
+ }
+ })
+}
}
export { API }