xinyilu/xinelu-applet-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
闫晓茹 2023-11-14 15:17:02 +08:00
commit 74e7b1f5f9
6 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pagesB/ExpertlookOrder/ExpertlookOrder.vue
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> -->

2
pagesB/confirmation/confirmation.vue
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) {

1
pagesB/consultationplatform/consultationplatform.vue
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}}

9
pagesB/consulted/consulted.vue
View File

@ -6,7 +6,7 @@
<view class="title" v-if="list.orderStatus=='WAIT_REFUND'" @tap="goprevious">退款中</view>
<view class="title" v-if="list.orderStatus=='CANCEL'" @tap="goprevious">已取消</view>
<view class="title" v-if="list.orderStatus=='WAIT_RECEIVED_GOODS'" @tap="goprevious">待接单</view>
<view class="title" v-if="list.orderStatus=='COMPLETED'" @tap="goprevious">待评价</view>
<view class="title" v-if="list.orderStatus=='RECEIVED_GOODS'" @tap="goprevious">待服务</view>
<view class="title" v-if="list.orderStatus=='EVALUATED'" @tap="goprevious">已评价</view>
@ -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')
@ -270,4 +271,4 @@
</script>
<style lang="scss">
@import './consulted.scss'
</style>
</style>

5
pagesB/refundType/refundType.vue
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
}

4
pagesC/seekadvicefrom/seekadvicefrom.vue
View File

@ -38,7 +38,7 @@
</scroll-view>
<!-- 底部输入 -->
<view class="input-box" :class="{ 'input-box-mpInputMargin': mpInputMargin }"
:style="{'padding-bottom':bottomVal+'px'}">
v-if='Number(currentItem.status)!=2' :style="{'padding-bottom':bottomVal+'px'}">
<view class="input-box-flex">
<!--弹出常用 -->
<!-- <image class="icon_img" :src="require('@/static/ico/often.png')" @tap="oftenx"></image> -->
@ -184,7 +184,7 @@
},
methods: {
lookimage(item) {
wx.previewImage({
uni.previewImage({
urls: [item], //需要预览的图片http链接列表，多张的时候，url直接写在后面就行了
current: 1, // 当前显示图片的http链接，默认是第一个
success: function(res) {},