Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
2023-11-14 15:29:14 +08:00
commit 1ec6a1dffa
7 changed files with 22 additions and 13 deletions

View File

@ -32,12 +32,12 @@
</view>
<view class="details" @tap='goorderdetails(item)'>
<view class="detailslist">
<image :src="baseurl+item.attributePitureUrl" mode=""
v-if="item.orderType =='HEALTH_CONSULTATION'&&item.attributePitureUrl"></image>
<image :src="baseurl+item.attributePitureUrl" mode=""
<image :src="baseurl+item.personPictureUrl" mode=""
v-if="item.orderType =='HEALTH_CONSULTATION'"></image>
<!-- <image :src="baseurl+item.attributePitureUrl" mode=""
v-if="item.orderType =='HEALTH_CONSULTATION'&&!item.attributePitureUrl"></image>
<image :src="baseurl+item.attributePitureUrl" mode=""
v-if="item.orderType !='HEALTH_CONSULTATION'"></image>
v-if="item.orderType !='HEALTH_CONSULTATION'"></image> -->
<view class="model">
<view class="top">
<span v-if="item.orderType =='HEALTH_CONSULTATION'">{{item.hospitalPersonName}}</span>
@ -82,9 +82,9 @@
去评价
<!-- </view> -->
</view>
<view class="logistics harvest" @tap='Receipt(item)'
<!-- <view class="logistics harvest" @tap='Receipt(item)'
v-if="item.orderStatus=='WAIT_RECEIVED_GOODS'&&item.orderType !='HEALTH_CONSULTATION'">
确认收货</view>
确认收货</view> -->
<!-- <view class="logistics harvest" @tap='Receipt(item)'
v-if="item.orderStatus=='WAIT_RECEIVED_GOODS'&&item.orderType =='HEALTH_CONSULTATION'">
咨询完成</view> -->

View File

@ -201,6 +201,7 @@
address: null,
doctorId: null,
doctorName: null,
schedulePlanDetailId:null,
consultationType: 'VIDEO_CONSULTATION',
problemDescription: null,
situationDescription: null,
@ -264,6 +265,7 @@
console.log(item, '8')
this.formdata.appointmentStartTime = item.starttime
this.formdata.appointmentEndTime = item.endtime
this.formdata.schedulePlanDetailId = item.schedulePlanDetailId
this.timeindex = index
},
timechange(index) {

View File

@ -34,6 +34,7 @@
{{ item.academicTitle=='ATTENDING_DOCTOR'?'主治医师':''}}
{{ item.academicTitle=='PHYSICIAN'?'医师':''}}
{{ item.academicTitle=='HEALER'?'医士':''}}
{{ item.academicTitle=='RESIDENT_PHYSICIAN'?'住院医师':''}}
</view>
<view class="text">
{{item.personIntroduce}}

View File

@ -35,7 +35,7 @@
</view>
<view class="orderitem">
<view class="details">
<image src="../../static/headsculpture.png" mode=""></image>
<image :src="baseurl+list.personPictureUrl" mode=""></image>
<view class="ppointment">
<view class="doctorname">
<span>{{list.hospitalPersonName}}</span>
@ -133,6 +133,7 @@
export default {
data() {
return {
baseurl:'',
timestamp: 0,
countvalue: 0,
list: [],
@ -163,7 +164,7 @@
onLoad(options) {
// if(options.item){
this.list = JSON.parse(options.item)
// console.log(this.list, '555')
console.log(this.list, '555')
this.orderTypeList.orderStatus = this.list.orderStatus
this.orderTypeList.goodsOrderId = this.list.goodsOrderId
// console.log(this.orderTypeList.orderStatus, '25256')

View File

@ -153,7 +153,7 @@
.text {
position: absolute;
left: 190rpx;
top: 220rpx;
top: 190rpx;
font-size: 28rpx;
font-weight: 400;
color: #5F5F5F;
@ -172,7 +172,7 @@
.name {
position: absolute;
left: 190rpx;
top: 120rpx;
top: 125rpx;
font-size: 32rpx;
font-weight: 500;
color: #000000;

View File

@ -125,7 +125,12 @@
this.order = JSON.parse(options.order)
this.order.id = this.order.goodsOrderId
}else if(options.list){
this.order = JSON.parse(options.list)
this.order.attributePitureUrl=this.order.personPictureUrl
// console.log(this.order,'78787')
this.order.id = this.order.goodsOrderId
}