From 64b3c0c2ffba040be9aa10666bafa79b84202ea5 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Tue, 19 Dec 2023 09:41:55 +0800
Subject: [PATCH] =?UTF-8?q?12.19=20=E6=82=A3=E8=80=85bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../MessageElements/AudioMessage/index.js | 2 +-
.../MessageElements/AudioMessage/index.wxml | 6 +-
.../MessageElements/AudioMessage/index.wxss | 6 +-
.../MessageElements/CustomMessage/index.js | 5 +-
.../MessageElements/CustomMessage/index.wxml | 38 +++++-------
.../TUIChat/components/MessageInput/index.js | 33 +++++++++--
.../TUIChat/components/MessageList/index.js | 13 ++++
.../TUIChat/components/MessageList/index.wxml | 7 ++-
TUIService/TUIKit/utils/constant.js | 2 +-
pages/inquiryForm/inquiryForm.js | 59 +++++++++++++------
pages/inquiryForm/inquiryForm.json | 1 +
pages/inquiryForm/inquiryForm.wxml | 11 ++--
pages/inquiryForm/inquiryForm.wxss | 23 ++++++--
pages/memberDetail/memberDetail.js | 8 ++-
pages/message/message.wxml | 3 +-
pages/sickDetail/sickDetail.js | 6 +-
pages/sickDetail/sickDetail.wxml | 23 +++++---
pages/sickDetail/sickDetail.wxss | 30 +++++++++-
pages/sickManage/sickManage.js | 21 +++++--
pages/sickManage/sickManage.wxml | 4 +-
pages/sickRecord/sickRecord.js | 9 +--
pages/sickRecord/sickRecord.wxml | 8 ++-
pages/sickRecord/sickRecord.wxss | 32 ++++++++--
23 files changed, 250 insertions(+), 100 deletions(-)
diff --git a/TUIService/TUIKit/components/TUIChat/components/MessageElements/AudioMessage/index.js b/TUIService/TUIKit/components/TUIChat/components/MessageElements/AudioMessage/index.js
index 30ae25a..00e12f4 100644
--- a/TUIService/TUIKit/components/TUIChat/components/MessageElements/AudioMessage/index.js
+++ b/TUIService/TUIKit/components/TUIChat/components/MessageElements/AudioMessage/index.js
@@ -79,7 +79,7 @@ Component({
audioPlay(e) {
const { id } = e.currentTarget.dataset;
const { audioSave } = this.data;
-
+ this.triggerEvent("closeAudio",false)
// 设置状态
audioSave.forEach((message, index) => {
message.isPlaying = false;
diff --git a/TUIService/TUIKit/components/TUIChat/components/MessageElements/AudioMessage/index.wxml b/TUIService/TUIKit/components/TUIChat/components/MessageElements/AudioMessage/index.wxml
index ae09e4c..f467a4e 100644
--- a/TUIService/TUIKit/components/TUIChat/components/MessageElements/AudioMessage/index.wxml
+++ b/TUIService/TUIKit/components/TUIChat/components/MessageElements/AudioMessage/index.wxml
@@ -2,12 +2,14 @@
- {{renderDom[0].second}}s
+ {{renderDom[0].second}}"
- {{renderDom[0].second}}s
+ {{renderDom[0].second}}"
+
diff --git a/TUIService/TUIKit/components/TUIChat/components/MessageElements/AudioMessage/index.wxss b/TUIService/TUIKit/components/TUIChat/components/MessageElements/AudioMessage/index.wxss
index 46d0319..160dd91 100644
--- a/TUIService/TUIKit/components/TUIChat/components/MessageElements/AudioMessage/index.wxss
+++ b/TUIService/TUIKit/components/TUIChat/components/MessageElements/AudioMessage/index.wxss
@@ -22,6 +22,7 @@
border-style: none none solid solid
}
.audio {
+ width:200rpx;
/*border-radius: 2px 10px 10px 10px;*/
height: 60rpx;
font-family: PingFangSC-Medium;
@@ -30,7 +31,10 @@
line-height: 28rpx;
display: flex;
align-items: center;
- justify-content: flex-end;
+ justify-content: flex-start;
+}
+.my-audio .audio{
+ flex-direction: row-reverse;
}
.image{
width: 16px;
diff --git a/TUIService/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js b/TUIService/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js
index 0b0d4f0..f6c3a1c 100644
--- a/TUIService/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js
+++ b/TUIService/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js
@@ -244,14 +244,13 @@ Component({
}];
return renderDom;
}
- if (customMessage.message_type === 12) {
+ if (customMessage.message_type == 12) {
let data = customMessage.data;
- console.log(data)
const renderDom = [{
type: 'wenzhen_form',
order_inquiry_id:data.order_inquiry_id,
message_path:data.message_path,
- case_patient_message_path:data.case_patient_message_path,
+ //case_patient_message_path:data.case_patient_message_path,
case_filled_fields:data.case_filled_fields,
case_not_fill_fields:data.case_not_fill_fields
}];
diff --git a/TUIService/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxml b/TUIService/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxml
index 11da253..98de95a 100644
--- a/TUIService/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxml
+++ b/TUIService/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxml
@@ -1,5 +1,5 @@
-
+
{{renderDom[0].text}}
{{renderDom[0].desc}}
-
-
+
+
+
+ {{renderDom[0].case_not_fill_fields?'问诊表':'问诊表-已填写'}}
+
+
+ {{renderDom[0].case_not_fill_fields?'等待填写':'点击查看'}}
+
+
+
+
-
+
{{renderDom[0].title}}报告
@@ -92,22 +102,6 @@
查看报告
-
-
-
-
-
- 问诊表
-
-
-
- 问诊表-已填写
-
-
- 等待填写
-
-
- 点击查看
-
+
\ No newline at end of file
diff --git a/TUIService/TUIKit/components/TUIChat/components/MessageInput/index.js b/TUIService/TUIKit/components/TUIChat/components/MessageInput/index.js
index 335e7e5..20e1a09 100644
--- a/TUIService/TUIKit/components/TUIChat/components/MessageInput/index.js
+++ b/TUIService/TUIKit/components/TUIChat/components/MessageInput/index.js
@@ -222,7 +222,14 @@ Component({
//wx.$TUIKit.off(wx.$TUIKitTIM.EVENT.SDK_READY, this.$onMessageReady,this);
}
},
-
+pageLifetimes:{
+ hide: function () {
+ let THIS=this;
+ if(THIS.data.isRecording){
+ THIS.handleTouchEnd()
+ }
+ },
+},
/**
* 组件的方法列表
@@ -269,6 +276,20 @@ Component({
// 打开录音开关
switchAudio() {
wx.hideKeyboard();
+ if(!this.data.isAudio){
+ wx.getSetting({
+ success(res) {
+ if (!res.authSetting['scope.record']) {
+ wx.authorize({
+ scope: 'scope.record',
+ success () {
+
+ }
+ })
+ }
+ }
+ })
+ }
this.setData({
isAudio: !this.data.isAudio,
isEmoji: false,
@@ -315,11 +336,14 @@ Component({
},
// 长按录音
handleLongPress(e) {
+ this.setData({
+ recordtime:0
+ })
this.openRecord(e,this.recording);
},
recording(e,THIS){
- console.log(THIS);
+
if(THIS.setMsgRound()){
wx.aegis.reportEvent({
name: 'messageType',
@@ -335,7 +359,8 @@ Component({
format: 'aac', // 音频格式,选择此格式创建的音频消息,可以在即时通信 IM 全平台(Android、iOS、微信小程序和Web)互通
});
THIS.timer=setInterval(()=>{
- if(THIS.data.recordtime>60){
+ if(THIS.data.recordtime>=60){
+ THIS.handleTouchEnd();
clearInterval(THIS.timer)
};
THIS.setData({
@@ -385,7 +410,7 @@ Component({
this.setData({
isRecording: false,
popupToggle: false,
-
+ recordtime:0
});
wx.hideLoading();
this.recorderManager.stop();
diff --git a/TUIService/TUIKit/components/TUIChat/components/MessageList/index.js b/TUIService/TUIKit/components/TUIChat/components/MessageList/index.js
index dae6b47..0d75119 100644
--- a/TUIService/TUIKit/components/TUIChat/components/MessageList/index.js
+++ b/TUIService/TUIKit/components/TUIChat/components/MessageList/index.js
@@ -159,6 +159,19 @@ Component({
this.triggerEvent("popComment",e.detail);
},
+ closeAudio(data){
+ //关闭其他语音
+ this.data.messageList.forEach((item)=>{
+ if(item.type=="TIMSoundElem"){
+ let ele=this.selectComponent('#audio'+item.ID);
+ ele.setData({
+ isPlay:false
+ })
+
+ }
+
+ })
+ },
changeCommnentStatus(id){
let cpn = this.selectComponent(".custom"+id);
let renderDom=cpn.data.renderDom;
diff --git a/TUIService/TUIKit/components/TUIChat/components/MessageList/index.wxml b/TUIService/TUIKit/components/TUIChat/components/MessageList/index.wxml
index e9c806e..a95879b 100644
--- a/TUIService/TUIKit/components/TUIChat/components/MessageList/index.wxml
+++ b/TUIService/TUIKit/components/TUIChat/components/MessageList/index.wxml
@@ -2,7 +2,7 @@
没有更多啦
- {{filter.toS(messageList[messageList.length-1])}}
+
@@ -35,7 +35,8 @@
-
+
+
已读
未读
@@ -47,7 +48,7 @@
-
+
diff --git a/TUIService/TUIKit/utils/constant.js b/TUIService/TUIKit/utils/constant.js
index 5125093..41ca0cd 100644
--- a/TUIService/TUIKit/utils/constant.js
+++ b/TUIService/TUIKit/utils/constant.js
@@ -18,7 +18,7 @@ const constant = {
ORDER: 'order',
LINK: 'text_link',
CREATE_GROUP: 'group_create',
- CONSULTION: 'consultion',
+ CONSULTION: 'consultion'
},
STRING_TEXT: {
diff --git a/pages/inquiryForm/inquiryForm.js b/pages/inquiryForm/inquiryForm.js
index 82b3738..d9ddabb 100644
--- a/pages/inquiryForm/inquiryForm.js
+++ b/pages/inquiryForm/inquiryForm.js
@@ -2,18 +2,20 @@
const app = getApp()
import {nation,job} from "../../api/common"
import {sendFields} from "../../api/sickRecord"
+import {throttle} from "../../utils/util"
Page({
/**
* 页面的初始数据
*/
data: {
+ showDialog:false,
obj:{
height:'身高',
weight:'体重',
+ marital_status:'婚姻状态',
nation_id:'民族',
job_id:'职业',
- marital_status:'婚姻状态',
allergy_history:'是否有过敏史?',
family_history:'是否有家族病史?',
is_pregnant:'是否处于备孕、妊娠、哺乳期?',
@@ -100,8 +102,38 @@ Page({
}
},
+ confirmDialog:throttle(function(event){
+ if(event.detail){
+ this.handleSend();
+ }
+}),
+handleSend(){
+ const {order_inquiry_id,personInfo,obj}=this.data;
+ let dataObj={};
+ for (const key in obj) {
+ if(personInfo[key] || personInfo[key]==0){
+ dataObj[key]=personInfo[key];
+ }
+ }
+ let res=Object.assign({},dataObj,personInfo);
+ sendFields({
+ order_inquiry_id,
+ fields:res,
+ }).then(data=>{
+ wx.showToast({
+ title: '发送成功',
+ icon:'none'
+ }),
+ wx.navigateBack()
+ thi.setData({
+ showDialog:false
+ })
+
+
+ })
+},
handleSendFields(){
- const {order_inquiry_id,personInfo,list1,list2,marital_name,jobname,nationname}=this.data;
+ const {order_inquiry_id,personInfo,list1,list2,marital_name,jobname,nationname,obj}=this.data;
console.log(personInfo)
const fields=[];
for (let i = 0; i {
- wx.showToast({
- title: '发送成功',
- icon:'none'
- }),
- wx.navigateBack()
-
- })
+ this.setData({
+ showDialog:true
+ })
},
openMaritalPicker() {
wx.hideKeyboard();
- if(showBtn){
+ if(this.data.showBtn){
this.setData({
showMarital: true
})
@@ -387,7 +410,7 @@ for (let i = 0; i < list2.length; i++) {
},
showNation() {
wx.hideKeyboard();
- if(showBtn){
+ if(this.data.showBtn){
this.setData({
showNation: true
})
@@ -412,7 +435,7 @@ for (let i = 0; i < list2.length; i++) {
},
showJob() {
wx.hideKeyboard();
- if(showBtn){
+ if(this.data.showBtn){
this.setData({
showJob: true
})
diff --git a/pages/inquiryForm/inquiryForm.json b/pages/inquiryForm/inquiryForm.json
index 6d8bea0..29299d7 100644
--- a/pages/inquiryForm/inquiryForm.json
+++ b/pages/inquiryForm/inquiryForm.json
@@ -5,6 +5,7 @@
"van-datetime-picker": "@vant/weapp/datetime-picker/index",
"van-popup": "@vant/weapp/popup/index",
"van-radio-group": "@vant/weapp/radio-group/index",
+ "dialog":"../../components/dialog/dialog",
"nav":"../../components/nav/nav"
},
"navigationStyle":"custom",
diff --git a/pages/inquiryForm/inquiryForm.wxml b/pages/inquiryForm/inquiryForm.wxml
index 4cab3c5..0501cd9 100644
--- a/pages/inquiryForm/inquiryForm.wxml
+++ b/pages/inquiryForm/inquiryForm.wxml
@@ -2,7 +2,8 @@
-
+
+
基本信息
@@ -33,7 +34,7 @@
{{filter.formatwenzhenList(list1,'marital_status').NUMBER}}、婚姻状况
-
+
@@ -45,7 +46,7 @@
{{filter.formatwenzhenList(list1,'nation_id').NUMBER}}、民族
-
+
@@ -56,7 +57,7 @@
{{filter.formatwenzhenList(list1,'job_id').NUMBER}}、职业
-
+
@@ -229,6 +230,7 @@
发送给医生
+
@@ -248,3 +250,4 @@
+
\ No newline at end of file
diff --git a/pages/inquiryForm/inquiryForm.wxss b/pages/inquiryForm/inquiryForm.wxss
index fc45642..27f9448 100644
--- a/pages/inquiryForm/inquiryForm.wxss
+++ b/pages/inquiryForm/inquiryForm.wxss
@@ -1,10 +1,15 @@
/* pages/inquiryForm/inquiryForm.wxss */
.page {
-
+
display: flex;
flex-direction: column;
overflow: hidden;
}
+.pagecon{
+ height:100%;
+ display: flex;
+ flex-direction: column;
+}
.cellbox{
background-color: #fff;
}
@@ -37,7 +42,7 @@
.iptbox{
display: flex;
flex:1;
-
+ margin-top:4rpx;
justify-content: flex-end;
}
.righticon{
@@ -62,6 +67,8 @@
width:100%;
text-align: right;
color: #666666;
+ line-height: 48rpx;
+ margin-left: 160rpx;
font-size: 28rpx;
}
.basictitle{
@@ -161,10 +168,16 @@ color: #FFFFFF;
align-items: center;
background: #3CC7C0;
border-radius: 8rpx;
- margin:40rpx 32rpx;
+ margin:50rpx 32rpx;
+}
+.van-radio__icon--disabled{
+ background-color: #fff!important;
}
.van-radio__icon--disabled.van-radio__icon--checked{
- color:#3cc7c0!important;
- background-color: #fff;
+ color:#fff!important;
+ background-color: #3cc7c0!important;
border-color:#3cc7c0 ;
+}
+.van-radio__label--disabled{
+ color:#000!important;
}
\ No newline at end of file
diff --git a/pages/memberDetail/memberDetail.js b/pages/memberDetail/memberDetail.js
index 49e179e..b475442 100644
--- a/pages/memberDetail/memberDetail.js
+++ b/pages/memberDetail/memberDetail.js
@@ -91,6 +91,7 @@ Page({
user_info: {
name: '',
+ fromtype:'',
id_number: '',
province_id: '',
city_id: '',
@@ -608,7 +609,7 @@ Page({
}
}
if (height) {
- if (!/^3[5-9](\.\d+)?$|^[4-9][0-9](\.\d+)?$|^1[0-9][0-9](\.\d+)?$|^2[1-4][0-9](\.\d+)?$|250/.test(height)) {
+ if (!/^3[5-9](\.\d+)?$|^[4-9][0-9](\.\d+)?$|^1[0-9][0-9](\.\d+)?$|^2[0-4][0-9](\.\d+)?$|250/.test(height)) {
wx.showToast({
title: `请输入范围内身高!`,
icon: 'none',
@@ -1027,6 +1028,11 @@ Page({
this.hnadleGetpersonal(family_id);
this.handleGetHealthy(family_id)
}
+ if(options.fromtype){
+ this.setData({
+ fromtype:options.fromtype
+ })
+ }
this.provinceList();
this.getSick();
this.getNation();
diff --git a/pages/message/message.wxml b/pages/message/message.wxml
index 646a185..fc59b3d 100644
--- a/pages/message/message.wxml
+++ b/pages/message/message.wxml
@@ -48,7 +48,8 @@
{{item.lastMessage.payload.text}}
{{filters.formateText(item.lastMessage.payload.data).title}}
- 图片消息
+ [图片]
+ [语音]
diff --git a/pages/sickDetail/sickDetail.js b/pages/sickDetail/sickDetail.js
index 4f32b61..b2c5fec 100644
--- a/pages/sickDetail/sickDetail.js
+++ b/pages/sickDetail/sickDetail.js
@@ -2,7 +2,7 @@
const app = getApp()
import {pathographyDetail} from "../../api/sickRecord"
import {throttle} from "../../utils/util"
-import {pathographyListDelte} from "../../api/sickRecord"
+import {pathographyDelete} from "../../api/sickRecord"
Page({
/**
@@ -33,7 +33,7 @@ Page({
}),
previewImage(event) {
let id = event.currentTarget.dataset.id;
- let urls = this.data.sick.diagnose_images;
+ let urls = this.data.sickInfo.diagnose_images;
wx.previewImage({
current: urls[id], // 当前显示图片的http链接
urls: urls // 需要预览的图片http链接列表
@@ -41,7 +41,7 @@ Page({
},
handlePathographyListDelte(){
let id=this.data.pathography_id
- pathographyListDelte(id).then(data=>{
+ pathographyDelete(id).then(data=>{
wx.showToast({
title: '删除成功',
icon:'none'
diff --git a/pages/sickDetail/sickDetail.wxml b/pages/sickDetail/sickDetail.wxml
index 792d1cb..bee740e 100644
--- a/pages/sickDetail/sickDetail.wxml
+++ b/pages/sickDetail/sickDetail.wxml
@@ -19,12 +19,16 @@
- 身高:{{sickInfo.height}}cm
- 体重:{{sickInfo.weight}}kg
-
- 民族:{{sickInfo.nation_name}}
- 职业:{{sickInfo.job_name}}
- 婚姻:未婚已婚离异
+
+ 身高:{{sickInfo.height}}cm 未知
+ 体重:{{sickInfo.weight}}kg
+ 未知
+ 民族:{{sickInfo.nation_name}}未知
+
+
+ 职业:{{sickInfo.job_name}}未知
+ 婚姻:未婚已婚离异未知
+
@@ -33,7 +37,7 @@
确诊日期:
- {{sickInfo.diagnosis_date}}
+ {{filters.transforDay(sickInfo.diagnosis_date,"date")}}
确诊医院:
@@ -61,7 +65,8 @@
复诊凭证(病例/处方单/检查报告/住院单)
-
+
+
@@ -83,7 +88,7 @@
是否备孕、妊娠或者哺乳期:
- {{sickInfo.is_pregnant==0?"无":'是'}}
+ {{sickInfo.is_pregnant==0?"否":'是'}}
{{sickInfo.pregnant}}
diff --git a/pages/sickDetail/sickDetail.wxss b/pages/sickDetail/sickDetail.wxss
index ca909aa..35062a7 100644
--- a/pages/sickDetail/sickDetail.wxss
+++ b/pages/sickDetail/sickDetail.wxss
@@ -58,11 +58,18 @@ padding:20rpx;
border-radius: 10rpx;
}
.infocell .cell{
+ flex:1;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ overflow: hidden;
line-height: 60rpx;
-margin-right: 21rpx;
+
}
+.infocell .cell:nth-child(2){
+ text-align: center;
+ }
.infocell .cell:nth-child(3){
- margin-right: 0rpx;
+ text-align: right;
}
.cell .desc{
@@ -99,4 +106,23 @@ color: #666666;
padding:20rpx;
font-size: 26rpx;
color: #999999;
+}
+.img{
+ width:200rpx;
+ margin-right: 25rpx;
+ height:200rpx;
+}
+.imgtip{
+ margin-top: 20rpx;
+}
+.img:nth-child(3n){
+ margin-right: 0rpx;
+}
+.rowcell{
+ width: 100%;
+ display: flex;
+ justify-content: space-between;
+}
+.rowcell:last-child{
+ width:66.66%;
}
\ No newline at end of file
diff --git a/pages/sickManage/sickManage.js b/pages/sickManage/sickManage.js
index cb5eef4..b259074 100644
--- a/pages/sickManage/sickManage.js
+++ b/pages/sickManage/sickManage.js
@@ -30,14 +30,22 @@ Page({
},
goInfo:throttle(function(){
app.method.navigateTo({
- url: '/pages/familyDoc/familyDoc',
+ url: '/pages/memberDetail/memberDetail?fromtype=manage',
})
}),
goRecord:throttle(function(event){
- let id=event.currentTarget.dataset.id;
- app.method.navigateTo({
- url: '/pages/sickRecord/sickRecord?family_id='+id+"&showRadio=false",
- })
+ let {id,count}=event.currentTarget.dataset;
+ if(count==0){
+ wx.showToast({
+ title: '暂无病例数据',
+ icon:'none'
+ })
+ }else{
+ app.method.navigateTo({
+ url: '/pages/sickRecord/sickRecord?family_id='+id+"&showRadio=false",
+ })
+ }
+
}),
/**
* 生命周期函数--监听页面加载
@@ -58,7 +66,8 @@ Page({
*/
onShow() {
this.setData({
- img_host:app.hostConfig().imghost
+ img_host:app.hostConfig().imghost,
+ list:[]
});
this.handleFamily();
},
diff --git a/pages/sickManage/sickManage.wxml b/pages/sickManage/sickManage.wxml
index 3b26407..0f481bc 100644
--- a/pages/sickManage/sickManage.wxml
+++ b/pages/sickManage/sickManage.wxml
@@ -4,9 +4,9 @@
-
+
- {{item.name}} 男 女 未知|{{item.age}}岁
+ {{item.card_name}} 男 女 未知|{{item.age}}岁
共有{{item.count}}份病例
diff --git a/pages/sickRecord/sickRecord.js b/pages/sickRecord/sickRecord.js
index db2fd7f..8037aa9 100644
--- a/pages/sickRecord/sickRecord.js
+++ b/pages/sickRecord/sickRecord.js
@@ -1,6 +1,6 @@
const app = getApp()
-import {pathographyList,pathographyListDelte} from "../../api/sickRecord"
+import {pathographyList,pathographyDelete} from "../../api/sickRecord"
import {throttle} from "../../utils/util"
Page({
@@ -44,7 +44,8 @@ Page({
}
}),
handlePathographyListDelte(){
- pathographyListDelte(id).then(data=>{
+ let id=this.data.currentId
+ pathographyDelete(id).then(data=>{
wx.showToast({
title: '删除成功',
icon:'none'
@@ -133,7 +134,7 @@ Page({
showRadio:true
})
}
- this.handleFamily();
+
},
/**
@@ -150,7 +151,7 @@ Page({
this.setData({
img_host:app.hostConfig().imghost
});
-
+ this.handleRefresher();
},
diff --git a/pages/sickRecord/sickRecord.wxml b/pages/sickRecord/sickRecord.wxml
index e81dd3b..d653c22 100644
--- a/pages/sickRecord/sickRecord.wxml
+++ b/pages/sickRecord/sickRecord.wxml
@@ -1,5 +1,5 @@
-
+
@@ -11,7 +11,7 @@
{{item.created_at}}
- {{item.disease_class_name}}
+ {{item.disease_class_name}}
{{item.disease_desc}}
@@ -23,6 +23,10 @@
+
+
+ 暂无数据
+
diff --git a/pages/sickRecord/sickRecord.wxss b/pages/sickRecord/sickRecord.wxss
index c092d57..47e0b9b 100644
--- a/pages/sickRecord/sickRecord.wxss
+++ b/pages/sickRecord/sickRecord.wxss
@@ -47,7 +47,6 @@
align-items: center;
padding:0 20rpx 0 30rpx;
background: #FFFFFF;
- box-sizing: content-box;
border-radius: 10rpx;
}
@@ -57,12 +56,17 @@ color: #333333;
}
.rightcon{
flex:1;
+ margin-right: 30rpx;
}
.namecell .disease{
- flex:1;
display: flex;
+ align-items: center;
margin-top: 10rpx;
font-size: 24rpx;
+ width:540rpx;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
color: #666666;
}
.disease{
@@ -70,12 +74,20 @@ color: #333333;
}
.disease_desc{
flex:1;
- margin-left: 8rpx;
-}
-.desctext{
- width:80%;
+ display: flex;
+ align-items: center;
white-space: nowrap;
overflow: hidden;
+
+ text-overflow: ellipsis;
+ margin-left: 8rpx;
+ word-break: break-all;
+}
+.desctext{
+ width:100%;
+ white-space: nowrap;
+ overflow: hidden;
+
text-overflow: ellipsis;
}
@@ -127,4 +139,12 @@ color: #999999;
justify-content: center;
background: #FA541C;
color: #fff;
+}
+.nodata{
+ margin-top: -172rpx;
+ flex:1;
+ display: flex;
+ font-size: 24rpx;
+ color: #999999;
+ flex-direction: column;
}
\ No newline at end of file