diff --git a/TUIService/TUIKit/components/TUIChat/components/MessageInput/index.js b/TUIService/TUIKit/components/TUIChat/components/MessageInput/index.js index f6ed94d..5b67756 100644 --- a/TUIService/TUIKit/components/TUIChat/components/MessageInput/index.js +++ b/TUIService/TUIKit/components/TUIChat/components/MessageInput/index.js @@ -268,11 +268,15 @@ Component({ // 打开录音开关 switchAudio() { + wx.hideKeyboard(); this.setData({ isAudio: !this.data.isAudio, isEmoji: false, text: '按住说话', focus: false, + message:'', + displayFlag:'', + sendMessageBtn:false }); }, openRecord(e,callback){ @@ -781,6 +785,12 @@ Component({ }, sendTextMessage(msg, flag) { + if(this.data.isAudio){ + this.setData({ + isAudio:false + }); + return false + } if(!this.data.message){ wx.showToast({ title: '输入内容不能为空', diff --git a/TUIService/TUIKit/components/TUIChat/components/MessageInput/index.wxml b/TUIService/TUIKit/components/TUIChat/components/MessageInput/index.wxml index 9ea8092..abb5f76 100644 --- a/TUIService/TUIKit/components/TUIChat/components/MessageInput/index.wxml +++ b/TUIService/TUIKit/components/TUIChat/components/MessageInput/index.wxml @@ -23,7 +23,7 @@ {{text}} - + diff --git a/api/sickRecord.js b/api/sickRecord.js index c3f0084..28510c0 100644 --- a/api/sickRecord.js +++ b/api/sickRecord.js @@ -1,24 +1,25 @@ import {request} from '../utils/request.js' function isExist(data){ //检测家庭成员是否存在病情记录 - return request('/patient/pathography/exist','GET',data,false) + return request('/pathography/exist','GET',data,false) }; function pathographyList(data){ //获取家庭成员病情记录列表 - return request('/patient/pathography','GET',data) + return request('/pathography','GET',data) }; function pathographyDetail(id){ //获取家庭成员病情记录列表 - return request('/patient/pathography/'+id,'GET') + return request('/pathography/'+id,'GET') }; function pathographyGroup(){ //获取家庭成员病情记录分组 - return request('/patient/pathography/group','GET') + return request('/pathography/group','GET') }; function pathographyDelete(id){ // 删除家庭成员病情记录 - return request('/patient/pathography/'+id,'DELETE') + return request('/pathography/'+id,'DELETE') }; function sendFields(data){ // 删除家庭成员病情记录 return request('/case/fields/patient','POST',data,true) }; module.exports={ + pathographyDelete, pathographyGroup, sendFields, isExist, diff --git a/pages/inquiryForm/inquiryForm.js b/pages/inquiryForm/inquiryForm.js index 45a358b..ad57ca8 100644 --- a/pages/inquiryForm/inquiryForm.js +++ b/pages/inquiryForm/inquiryForm.js @@ -300,9 +300,11 @@ for (let i = 0; i < list2.length; i++) { }, openMaritalPicker() { wx.hideKeyboard(); - this.setData({ - showMarital: true - }) + if(showBtn){ + this.setData({ + showMarital: true + }) + } }, closeMaritalPicker() { this.setData({ @@ -379,9 +381,12 @@ for (let i = 0; i < list2.length; i++) { }, showNation() { wx.hideKeyboard(); + if(showBtn){ this.setData({ showNation: true }) + } + }, onCancelNation() { @@ -401,9 +406,12 @@ for (let i = 0; i < list2.length; i++) { }, showJob() { wx.hideKeyboard(); + if(showBtn){ this.setData({ showJob: true }) + } + }, onCancelJob() { this.setData({ diff --git a/pages/inquiryForm/inquiryForm.wxss b/pages/inquiryForm/inquiryForm.wxss index 04511c0..fc45642 100644 --- a/pages/inquiryForm/inquiryForm.wxss +++ b/pages/inquiryForm/inquiryForm.wxss @@ -10,6 +10,7 @@ } .questionbox{ overflow-y: scroll; + -webkit-overflow-scrolling: touch; margin-top: 172rpx; flex:1; } @@ -161,4 +162,9 @@ color: #FFFFFF; background: #3CC7C0; border-radius: 8rpx; margin:40rpx 32rpx; +} +.van-radio__icon--disabled.van-radio__icon--checked{ + color:#3cc7c0!important; + background-color: #fff; + border-color:#3cc7c0 ; } \ No newline at end of file