12.19 bug
This commit is contained in:
zoujiandong
parent
93965b3ba4
commit
d3137d149e
@ -112,6 +112,7 @@ color: #333333;
|
||||
.cashbox{
|
||||
margin:20rpx 30rpx 0;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
}
|
||||
.accountNum{
|
||||
font-size: 64rpx;
|
||||
@ -124,7 +125,7 @@ font-weight: 400;
|
||||
color: #999999;
|
||||
}
|
||||
.today,.finish{
|
||||
flex:1;
|
||||
/* flex:1; */
|
||||
}
|
||||
.money{
|
||||
margin-top: 16rpx;
|
||||
|
||||
@ -460,7 +460,7 @@ Page({
|
||||
let prescription_num=this.data.prescription_num?this.data.prescription_num:5
|
||||
if(save_durg_prescription_product_num > prescription_num){
|
||||
Dialog.alert({
|
||||
message: '每个药品数量不允许添加超过'+prescription_num+'个',
|
||||
message: '药品数量不允许添加超过'+prescription_num+'个',
|
||||
}).then(() => {
|
||||
this.setData({
|
||||
save_durg_prescription_product_num:''
|
||||
|
||||
@ -17,9 +17,9 @@ Page({
|
||||
obj:{
|
||||
height:'身高',
|
||||
weight:'体重',
|
||||
marital_status:'婚姻状态',
|
||||
nation_id:'民族',
|
||||
job_id:'职业',
|
||||
marital_status:'婚姻状态',
|
||||
allergy_history:'是否有过敏史？',
|
||||
family_history:'是否有家族病史？',
|
||||
is_pregnant:'是否处于备孕、妊娠、哺乳期？',
|
||||
@ -106,7 +106,7 @@ Page({
|
||||
return false
|
||||
}
|
||||
if (list1[i]=='height' && personInfo.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(personInfo.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(personInfo.height)) {
|
||||
wx.showToast({
|
||||
title: `请输入范围内身高！`,
|
||||
icon: 'none',
|
||||
@ -496,7 +496,8 @@ for (let i = 0; i < list2.length; i++) {
|
||||
let data=JSON.parse(options.case_filled_fields);
|
||||
let arr1=[];
|
||||
let arr2=[];
|
||||
|
||||
console.log('----------加载');
|
||||
console.log(data);
|
||||
this.setData({
|
||||
personInfo:data,
|
||||
showBtn:false
|
||||
@ -560,6 +561,7 @@ for (let i = 0; i < list2.length; i++) {
|
||||
}
|
||||
if(options.params){
|
||||
let data=JSON.parse(options.params);
|
||||
|
||||
let {obj}=this.data;
|
||||
let arr1=[];
|
||||
let arr2=[];
|
||||
|
||||
@ -36,7 +36,7 @@ page{
|
||||
.iptbox{
|
||||
display: flex;
|
||||
flex:1;
|
||||
|
||||
margin-top:4rpx;
|
||||
justify-content: flex-end;
|
||||
}
|
||||
.righticon{
|
||||
@ -55,13 +55,17 @@ page{
|
||||
text-align: right;
|
||||
font-size: 28rpx;
|
||||
font-weight: 400;
|
||||
|
||||
color: #C5C8CB;
|
||||
}
|
||||
.ipt{
|
||||
width:100%;
|
||||
text-align: right;
|
||||
color: #666666;
|
||||
line-height: 48rpx;
|
||||
font-size: 28rpx;
|
||||
|
||||
margin-left: 160rpx;
|
||||
}
|
||||
.basictitle{
|
||||
margin-top: 30rpx;
|
||||
@ -145,8 +149,14 @@ margin-bottom: 20rpx;
|
||||
.van-radio{
|
||||
margin-bottom: 10rpx!important;
|
||||
}
|
||||
.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;
|
||||
}
|
||||
@ -14,11 +14,11 @@ Page({
|
||||
title: '问诊表', //导航栏 中间的标题
|
||||
},
|
||||
obj:{
|
||||
height:'身高',
|
||||
weight:'体重',
|
||||
height:'身高（CM）',
|
||||
weight:'体重（KG）',
|
||||
marital_status:'婚姻状态',
|
||||
nation_id:'民族',
|
||||
job_id:'职业',
|
||||
marital_status:'婚姻状态',
|
||||
allergy_history:'是否有过敏史？',
|
||||
family_history:'是否有家族病史？',
|
||||
is_pregnant:'是否处于备孕、妊娠、哺乳期？',
|
||||
@ -39,6 +39,7 @@ Page({
|
||||
this.setData({
|
||||
result: event.detail,
|
||||
});
|
||||
console.log(event.detail);
|
||||
},
|
||||
|
||||
toggle(event) {
|
||||
@ -74,7 +75,7 @@ Page({
|
||||
})
|
||||
},
|
||||
handleSend(){
|
||||
let {order_inquiry_id,result}=this.data;
|
||||
let {order_inquiry_id,result,obj}=this.data;
|
||||
if(result.length==0){
|
||||
wx.showToast({
|
||||
title: '请至少选择一项',
|
||||
@ -82,10 +83,15 @@ Page({
|
||||
})
|
||||
return false;
|
||||
}
|
||||
console.log(this.data.result);
|
||||
let fields=[];
|
||||
for (const key in obj) {
|
||||
if(result.indexOf(key)!=-1){
|
||||
fields.push(key)
|
||||
}
|
||||
}
|
||||
api.doctorSendUnfilled({
|
||||
order_inquiry_id,
|
||||
fields:this.data.result
|
||||
fields:fields
|
||||
}).then(data=>{
|
||||
if(data.code==200){
|
||||
wx.navigateBack();
|
||||
|
||||
@ -16,7 +16,8 @@ page{
|
||||
}
|
||||
.container{
|
||||
width: 100vw;
|
||||
height:100vh;
|
||||
|
||||
height:calc(100vh - 136rpx);
|
||||
display:flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
@ -37,14 +38,13 @@ background:#fff;
|
||||
}
|
||||
.bottom{
|
||||
background-color: #FFFFFF;
|
||||
height:300rpx;
|
||||
height:160rpx;
|
||||
width:100%;
|
||||
}
|
||||
.bottom .btn{
|
||||
|
||||
margin:40rpx 30rpx;
|
||||
height: 80rpx;
|
||||
font-size: 30rpx;
|
||||
margin:20rpx 30rpx 0rpx;
|
||||
height: 80rpx;
|
||||
font-size: 30rpx;
|
||||
color: #FFFFFF;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
@ -69,4 +69,8 @@ border-radius: 8rpx;
|
||||
}
|
||||
.van-cell{
|
||||
align-items: center;
|
||||
}
|
||||
.van-cell__title{
|
||||
font-size: 34rpx!important;
|
||||
color:#000;
|
||||
}
|
||||
@ -77,9 +77,10 @@ Component({
|
||||
|
||||
// 音频播放
|
||||
audioPlay(e) {
|
||||
|
||||
const { id } = e.currentTarget.dataset;
|
||||
const { audioSave } = this.data;
|
||||
|
||||
this.triggerEvent("closeAudio",false)
|
||||
// 设置状态
|
||||
audioSave.forEach((message, index) => {
|
||||
message.isPlaying = false;
|
||||
@ -132,6 +133,7 @@ Component({
|
||||
audioStop(e) {
|
||||
const { key } = e.currentTarget.dataset;
|
||||
const { audioSave } = this.data;
|
||||
console.log(audioSave);
|
||||
// 设置状态
|
||||
audioSave.forEach((message, index) => {
|
||||
message.isPlaying = false;
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
<block>
|
||||
<view class="audio-message {{isMine?'my-audio':'your-audio'}}">
|
||||
<!-- 默认状态 未播放 -->
|
||||
<view class='audio' wx:if="{{!isPlay}}" bindtap='audioPlay' data-id="{{message.ID}}" >
|
||||
<image class="image {{isMine?'my-image':''}}" src="{{isMine?'../../../../../static/images/play.png':'../../../../../static/images/playme.png'}}" /> {{renderDom[0].second}}s
|
||||
<view class='audio' wx:if="{{!isPlay}}" bindtap='audioPlay' data-id="{{message.ID}}" >
|
||||
<image class="image {{isMine?'my-image':''}}" src="../../../../../static/images/play.png" /> {{renderDom[0].second}}"
|
||||
</view>
|
||||
<!-- 当前正在播放状态 -->
|
||||
<view class='audio' wx:else data-value="{{message}}" bindtap='audioStop' data-id="{{message.ID}}" >
|
||||
<image class="image {{isMine?'my-image':''}}" src="{{isMine?'../../../../../static/images/play.gif':'../../../../../static/images/playme.gif'}}" /> {{renderDom[0].second}}s
|
||||
<view class='audio' wx:else data-value="{{message}}" bindtap='audioStop' id="audio{{message.ID}}" data-id="{{message.ID}}" >
|
||||
<image class="image {{isMine?'my-image':''}}" src="../../../../../static/images/play.gif" /> {{renderDom[0].second}}"
|
||||
</view>
|
||||
</view>
|
||||
</block>
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
padding: 10rpx 18rpx;
|
||||
border-radius: 2px 10px 10px 10px;
|
||||
border: 1px solid #D9D9D9;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.my-audio {
|
||||
@ -10,6 +11,7 @@
|
||||
background: rgb(212, 239, 241);
|
||||
border: 1rpx solid #1ACAD3;
|
||||
}
|
||||
|
||||
.my-audio::after{
|
||||
content:'';
|
||||
position: absolute;
|
||||
@ -41,6 +43,7 @@
|
||||
border-style: none none solid solid
|
||||
}
|
||||
.audio {
|
||||
width:200rpx;
|
||||
/*border-radius: 2px 10px 10px 10px;*/
|
||||
height: 60rpx;
|
||||
font-family: PingFangSC-Medium;
|
||||
@ -49,7 +52,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;
|
||||
@ -61,4 +67,12 @@
|
||||
width: 16px;
|
||||
height: 16px;
|
||||
transform:rotate(180deg)
|
||||
}
|
||||
.dot{
|
||||
top:10rpx;
|
||||
position: absolute;
|
||||
width:15rpx;
|
||||
height:15rpx;
|
||||
background-color: red;
|
||||
border-radius: 50%;
|
||||
}
|
||||
@ -133,7 +133,7 @@ Component({
|
||||
icon: 'none',
|
||||
});
|
||||
} else {
|
||||
if(resData.duration >= 59000){
|
||||
if(resData.duration >= 60000){
|
||||
wx.showToast({
|
||||
title: '录音时间不能超过60s',
|
||||
duration:2000,
|
||||
@ -266,7 +266,13 @@ Component({
|
||||
}
|
||||
})
|
||||
|
||||
}
|
||||
},
|
||||
hide: function () {
|
||||
let THIS=this;
|
||||
if(THIS.data.isRecording){
|
||||
THIS.handleTouchEnd()
|
||||
}
|
||||
},
|
||||
},
|
||||
|
||||
/**
|
||||
@ -290,6 +296,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,
|
||||
@ -348,7 +368,7 @@ Component({
|
||||
ext3: wx.$chat_SDKAppID,
|
||||
});
|
||||
THIS.recorderManager.start({
|
||||
duration: 60000, // 录音的时长，单位 ms，最大值 600000（10 分钟）
|
||||
duration: 61000, // 录音的时长，单位 ms，最大值 600000（10 分钟）
|
||||
sampleRate: 44100, // 采样率
|
||||
numberOfChannels: 1, // 录音通道数
|
||||
encodeBitRate: 192000, // 编码码率
|
||||
@ -356,14 +376,17 @@ Component({
|
||||
});
|
||||
|
||||
THIS.timer=setInterval(()=>{
|
||||
if(THIS.data.recordtime>59){
|
||||
clearInterval(THIS.timer)
|
||||
if(THIS.data.recordtime>=60){
|
||||
THIS.handleTouchEnd();
|
||||
clearInterval(THIS.timer);
|
||||
|
||||
};
|
||||
THIS.setData({
|
||||
recordtime:THIS.data.recordtime+1
|
||||
});
|
||||
|
||||
},1000)
|
||||
console.log("handleLongPress")
|
||||
THIS.setData({
|
||||
startPoint: e.touches[0],
|
||||
title: '正在录音',
|
||||
@ -378,6 +401,7 @@ Component({
|
||||
|
||||
// 录音时的手势上划移动距离对应文案变化
|
||||
handleTouchMove(e) {
|
||||
console.log("handleTouchMove")
|
||||
if (this.data.isRecording) {
|
||||
if (this.data.startPoint.clientY - e.touches[e.touches.length - 1].clientY > 100) {
|
||||
this.setData({
|
||||
@ -403,11 +427,29 @@ Component({
|
||||
|
||||
// 手指离开页面滑动
|
||||
handleTouchEnd() {
|
||||
wx.nextTick(() => {
|
||||
this.setData({
|
||||
isRecording: false,
|
||||
popupToggle: false,
|
||||
|
||||
});
|
||||
console.log("handleTouchEnd")
|
||||
wx.hideLoading();
|
||||
this.recorderManager.stop();
|
||||
clearInterval(this.timer);
|
||||
this.setData({
|
||||
recordtime:0
|
||||
})
|
||||
})
|
||||
|
||||
},
|
||||
handleTouchCancel(){
|
||||
this.setData({
|
||||
isRecording: false,
|
||||
popupToggle: false,
|
||||
|
||||
});
|
||||
console.log("handleTouchCancel")
|
||||
wx.hideLoading();
|
||||
this.recorderManager.stop();
|
||||
clearInterval(this.timer);
|
||||
|
||||
@ -17,9 +17,11 @@
|
||||
/>
|
||||
</view>
|
||||
<view wx:if="{{isAudio}}" class="TUI-message-input-main"
|
||||
bind:longpress="handleLongPress"
|
||||
bind:touchmove="handleTouchMove"
|
||||
bind:touchend="handleTouchEnd"
|
||||
catchlongpress="handleLongPress"
|
||||
catchtouchmove="handleTouchMove"
|
||||
catchtouchend="handleTouchEnd"
|
||||
catchtap="handleTouchCancel"
|
||||
catchtouchcancel="handleTouchCancel"
|
||||
style="display: flex; justify-content: center; font-size: 32rpx; font-family: PingFangSC-Regular; height: 30px">
|
||||
<text >{{text}}</text>
|
||||
</view>
|
||||
|
||||
@ -293,6 +293,19 @@ Component({
|
||||
url: url,
|
||||
})
|
||||
},
|
||||
closeAudio(data){
|
||||
//关闭其他语音
|
||||
this.data.messageList.forEach((item)=>{
|
||||
if(item.type=="TIMSoundElem"){
|
||||
let ele=this.selectComponent('#audio'+item.ID);
|
||||
ele.setData({
|
||||
isPlay:false
|
||||
})
|
||||
|
||||
}
|
||||
|
||||
})
|
||||
},
|
||||
refreshMessageRounds(message){
|
||||
try {
|
||||
// console.log("messageList refreshMessageRounds message: ", message);
|
||||
|
||||
@ -54,7 +54,7 @@
|
||||
<TextMessage wx:if="{{item.type === 'TIMTextElem'}}" message="{{item}}" isMine="{{item.flow === 'out'}}" />
|
||||
<ImageMessage wx:if="{{item.type === 'TIMImageElem'}}" message="{{item}}" isMine="{{item.flow === 'out'}}" />
|
||||
<VideoMessage wx:if="{{item.type === 'TIMVideoFileElem'}}" message="{{item}}" isMine="{{item.flow === 'out'}}"/>
|
||||
<AudioMessage wx:if="{{item.type === 'TIMSoundElem'}}" message="{{item}}" data-index ='{{index}}' messageList="{{messageList}}" isMine="{{item.flow === 'out'}}"/>
|
||||
<AudioMessage wx:if="{{item.type === 'TIMSoundElem'}}" message="{{item}}" data-index ='{{index}}' messageList="{{messageList}}" bind:closeAudio="closeAudio" id="audio{{item.ID}}" isMine="{{item.flow === 'out'}}"/>
|
||||
<CustomMessage wx:if="{{item.type === 'TIMCustomElem'}}" message="{{item}}" isMine="{{item.flow === 'out'}}" bindtap="handleJumpLink" data-value = "{{item}}" patient_family_data="{{concat.formateText(item.cloudCustomData).patient_family_data}}"/>
|
||||
<FaceMessage wx:if="{{item.type === 'TIMFaceElem'}}" message="{{item}}" isMine="{{item.flow === 'out'}}"/>
|
||||
<FileMessage wx:if="{{item.type === 'TIMFileElem'}}" message="{{item}}" isMine="{{item.flow === 'out'}}"/>
|
||||
|
||||
@ -163,7 +163,7 @@
|
||||
}
|
||||
.time_desc .item{
|
||||
color:#E34D59;
|
||||
|
||||
margin-top:3rpx;
|
||||
display:inline-flex;
|
||||
white-space: nowrap;
|
||||
align-items: center;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user