This commit is contained in:
haomingming 2023-05-12 16:23:36 +08:00
parent c3ef53d336
commit 6cc0c9d3b3
9 changed files with 46 additions and 17 deletions

View File

@ -45,7 +45,7 @@
<view class="disease_box_item" wx:if="{{case_detail.product.length > 0}}"> <view class="disease_box_item" wx:if="{{case_detail.product.length > 0}}">
<view class="title">用药意向:</view> <view class="title">用药意向:</view>
<view class="conent"> <view class="conent">
<text wx:for="{{case_detail.product}}">{{item}};</text> <view wx:for="{{case_detail.product}}">{{item}};</view>
</view> </view>
</view> </view>
<view class="disease_box_item" wx:if="{{case_detail.diagnose_images.length > 0}}"> <view class="disease_box_item" wx:if="{{case_detail.diagnose_images.length > 0}}">
@ -59,9 +59,13 @@
</view> </view>
</view> </view>
<view class="main_title" wx:if="{{!(case_detail.is_allergy_history == null && case_detail.is_family_history == null && case_detail.is_pregnant == null && case_detail.drink_wine_status == null && case_detail.smoke_status == null && case_detail.is_operation == null && case_detail.chemical_compound_status == null && case_detail.chemical_compound_status == null)}}">其他信息</view> <view class="main_title" wx:if="{{!(case_detail.is_taboo == null && case_detail.is_allergy_history == null && case_detail.is_family_history == null && case_detail.is_pregnant == null && case_detail.drink_wine_status == null && case_detail.smoke_status == null && case_detail.is_operation == null && case_detail.chemical_compound_status == null && case_detail.chemical_compound_status == null)}}">其他信息</view>
<view class="data_box orther" wx:if="{{!(case_detail.is_allergy_history == null && case_detail.is_family_history == null && case_detail.is_pregnant == null && case_detail.drink_wine_status == null && case_detail.smoke_status == null && case_detail.is_operation == null && case_detail.chemical_compound_status == null && case_detail.chemical_compound_status == null)}}"> <view class="data_box orther" wx:if="{{!(case_detail.is_taboo == null && case_detail.is_allergy_history == null && case_detail.is_family_history == null && case_detail.is_pregnant == null && case_detail.drink_wine_status == null && case_detail.smoke_status == null && case_detail.is_operation == null && case_detail.chemical_compound_status == null && case_detail.chemical_compound_status == null)}}">
<view class="disease_box"> <view class="disease_box">
<view class="disease_box_item" wx:if="{{case_detail.is_taboo != null}}">
<view class="title">是否服用过您想购买的药品且无相关禁忌:</view>
<view class="conent">{{case_detail.is_taboo==0?'否':'是'}}</view>
</view>
<view class="disease_box_item" wx:if="{{case_detail.is_allergy_history != null}}"> <view class="disease_box_item" wx:if="{{case_detail.is_allergy_history != null}}">
<view class="title">过敏史:</view> <view class="title">过敏史:</view>
<view class="conent">{{case_detail.is_allergy_history==0?'否':case_detail.allergy_history}}</view> <view class="conent">{{case_detail.is_allergy_history==0?'否':case_detail.allergy_history}}</view>

View File

@ -67,6 +67,8 @@ page{
flex: 1; flex: 1;
font-size: 28rpx; font-size: 28rpx;
color: #666666; color: #666666;
word-wrap:break-word;
word-break:break-all;
} }
.disease_info{ .disease_info{
background: #FAFAFA; background: #FAFAFA;

View File

@ -230,7 +230,7 @@
width="100vw" width="100vw"
src="{{static_host}}/applet/doctor/static/images/collection.png" src="{{static_host}}/applet/doctor/static/images/collection.png"
/> />
<van-button color="rgba(0, 0, 0, .1)" style="position: fixed;bottom: 50rpx;left: 50%;transform: translateX(-50%);width: 90vw;border: 1px solid #fff;border-radius: 50px;" block round bind:click="onClickHideOverlay">我知道了</van-button> <van-button color="rgba(0, 0, 0, .1)" style="position: fixed;bottom: 100rpx;left: 50%;transform: translateX(-50%);width: 80vw;border: 1px solid #fff;border-radius: 50px;" block round bind:click="onClickHideOverlay">我知道了</van-button>
</van-overlay> </van-overlay>
<t-dialog <t-dialog

View File

@ -251,4 +251,7 @@ page{
border-top: 2px solid #E9E9E9 !important; border-top: 2px solid #E9E9E9 !important;
border-left: 2px solid var(--td-border-color, #E9E9E9); border-left: 2px solid var(--td-border-color, #E9E9E9);
border-top-color: #E9E9E9 !important; border-top-color: #E9E9E9 !important;
}
.overlay_show{
} }

View File

@ -1,4 +1,3 @@
import dayjs from '../../../../utils/dayjs';
import logger from '../../../../utils/logger'; import logger from '../../../../utils/logger';
import constant from '../../../../utils/constant'; import constant from '../../../../utils/constant';
import { wechatTimeFormat } from './../../../../../utils/wechatTime' import { wechatTimeFormat } from './../../../../../utils/wechatTime'
@ -91,6 +90,7 @@ Component({
typingMessage: {}, typingMessage: {},
autoToButtom: true, autoToButtom: true,
cachTime: "", cachTime: "",
cachRealTime: "",
list_first_loading: false, list_first_loading: false,
message_rounds: 0, message_rounds: 0,
static_host: api.getStaticHost() static_host: api.getStaticHost()
@ -235,7 +235,7 @@ Component({
}, },
refreshMessageRounds(message){ refreshMessageRounds(message){
try { try {
// console.log("messageList refreshMessageRounds message: ", message); console.log("messageList refreshMessageRounds message: ", message);
let cloudCustomData = ""; let cloudCustomData = "";
let cloudCustomDataJson = ""; let cloudCustomDataJson = "";
if(message.cloudCustomData){ if(message.cloudCustomData){
@ -245,6 +245,12 @@ Component({
cloudCustomDataJson = JSON.parse(cloudCustomData); cloudCustomDataJson = JSON.parse(cloudCustomData);
} }
let order_inquiry_id = cloudCustomDataJson.order_inquiry_id;
let now_order_inquiry_id = this.data.order_inquiry_id
if(order_inquiry_id != now_order_inquiry_id){
return
}
let payload = message.payload.data; let payload = message.payload.data;
if(payload){ if(payload){
const payloadData = JSON.parse(message.payload.data); const payloadData = JSON.parse(message.payload.data);
@ -535,9 +541,16 @@ Component({
// return // return
// } // }
let selectedMessage = this.data.messageList[index]
if(selectedMessage.type === 'TIMCustomElem'){
return
}
if(selectedMessage.type === 'TIMImageElem'){
return
}
this.setData({ this.setData({
messageID: e.currentTarget.id, messageID: e.currentTarget.id,
selectedMessage: this.data.messageList[index], selectedMessage: selectedMessage,
Show: true, Show: true,
}); });
wx.vibrateShort({ wx.vibrateShort({
@ -748,6 +761,14 @@ Component({
}, },
cachMessageTime(messageTime){ cachMessageTime(messageTime){
// console.log("cachMessageTime messageTime 参数:", messageTime) // console.log("cachMessageTime messageTime 参数:", messageTime)
let cachRealTime = this.data.cachRealTime
if(cachRealTime > messageTime){
return ["", false]
}
this.setData({
cachRealTime: messageTime
})
let time = wechatTimeFormat(messageTime) let time = wechatTimeFormat(messageTime)
// console.log("cachMessageTime: ", time) // console.log("cachMessageTime: ", time)
if(time){ if(time){

View File

@ -28,12 +28,10 @@
<view wx:if="{{Show}}" catchtap="handleEditToggleAvatar"> <view wx:if="{{Show}}" catchtap="handleEditToggleAvatar">
<view class="label-pop" wx:if="{{messageID === concat.connect('ID-',item.ID)}}" class="{{item.flow === 'out' ? 'label-self-body' : 'label-recieve-body'}}" > <view class="label-pop" wx:if="{{messageID === concat.connect('ID-',item.ID)}}" class="{{item.flow === 'out' ? 'label-self-body' : 'label-recieve-body'}}" >
<view class="label-pop-mask" > <view class="label-pop-mask" >
<view class="copymessage" wx:if="{{item.type === 'TIMTextElem'|| item.type === 'TIMFaceElem'}}" catchtap="copyMessage" > <text>复制|</text> <view class="copymessage" wx:if="{{item.type === 'TIMTextElem'|| item.type === 'TIMFaceElem'}}" catchtap="copyMessage" > <text>复制</text>
</view>
<view class="deletemessage" catchtap="deleteMessage" > <text> 删除</text>
</view>
<view class="revokemessage" wx:if="{{item.flow === 'out'}}" bindtap="revokeMessage"><text> |撤回</text>
</view> </view>
<!-- <view class="deletemessage" catchtap="deleteMessage" > <text> 删除</text></view>
<view class="revokemessage" wx:if="{{item.flow === 'out'}}" bindtap="revokeMessage"><text> |撤回</text></view> -->
</view> </view>
</view> </view>
</view> </view>

View File

@ -147,7 +147,7 @@
border-width: 20px; border-width: 20px;
position: absolute; position: absolute;
bottom: -27px; bottom: -27px;
left: 55px; left: 0px;
border-style: solid dashed dashed; border-style: solid dashed dashed;
border-color: black transparent transparent; border-color: black transparent transparent;
font-size: 0; font-size: 0;

View File

@ -247,7 +247,7 @@ Component({
that._canvasDetectionPosition(); that._canvasDetectionPosition();
}, },
imgSrc(value, that){ imgSrc(value, that){
that.pushImg(); // that.pushImg();
}, },
cut_top(value, that) { cut_top(value, that) {
that._cutDetectionPosition(); that._cutDetectionPosition();
@ -471,6 +471,7 @@ Component({
_img_top: wx.getSystemInfoSync().windowHeight / 2, _img_top: wx.getSystemInfoSync().windowHeight / 2,
_img_left: wx.getSystemInfoSync().windowWidth / 2, _img_left: wx.getSystemInfoSync().windowWidth / 2,
}) })
this.pushImg()
// console.log(wx.getSystemInfoSync().windowHeight / 2, "-", wx.getSystemInfoSync().windowWidth / 2,) // console.log(wx.getSystemInfoSync().windowHeight / 2, "-", wx.getSystemInfoSync().windowWidth / 2,)
}, },
/** /**

View File

@ -6,14 +6,14 @@ export const dev = {
} }
// 测试环境url // 测试环境url
export const test = { export const test = {
baseUrl: "http://www.xxx.com", baseUrl: "https://dev.hospital.applets.igandanyiyuan.com",
staticHost: "https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com",//静态资源host staticHost: "https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com",//静态资源host
appId: 'wxbdb4d63f81d98228' //此处为appId appId: 'wxbdb4d63f81d98228' //此处为appId
} }
// 线上环境url // 线上环境url
export const prod = { export const prod = {
baseUrl: 'https://www.xxx.com', baseUrl: 'https://prod.hospital.applets.igandanyiyuan.com',
staticHost: "https://gdxz-hospital.oss-cn-chengdu.aliyuncs.com",//静态资源host staticHost: "https://oss.prod.applets.igandanyiyuan.com",//静态资源host
appId: 'wxbdb4d63f81d98228' //此处为appId appId: 'wxbdb4d63f81d98228' //此处为appId
} }