Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
shidongli
commit
5fe779814e
19
api/pagesB/solution/solution.js
Normal file
19
api/pagesB/solution/solution.js
Normal file
@ -0,0 +1,19 @@
|
||||
import request from "@/api/request.js"
|
||||
export function getUserSig(userId) {
|
||||
return request({
|
||||
url: '/nurseApplet/consultation/getUserSig/'+userId,
|
||||
method: 'get',
|
||||
header: {
|
||||
region: uni.getStorageSync('region'),
|
||||
},
|
||||
})
|
||||
}
|
||||
export function getRoomId(goodsOrderId) {
|
||||
return request({
|
||||
url: '/nurseApplet/consultation/getRoomId/'+goodsOrderId,
|
||||
method: 'get',
|
||||
header: {
|
||||
region: uni.getStorageSync('region'),
|
||||
}
|
||||
})
|
||||
}
|
||||
@ -22,7 +22,7 @@
|
||||
<span v-if="item.orderStatus=='CANCEL'">已取消</span>
|
||||
<span v-if="item.orderStatus=='COMPLETED'">待评价</span>
|
||||
<span v-if="item.orderStatus=='WAIT_RECEIVED_GOODS'">待接单</span>
|
||||
<span v-if="item.orderStatus=='RECEIVED_GOODS'">待咨询</span>
|
||||
<span v-if="item.orderStatus=='RECEIVED_GOODS'">待服务</span>
|
||||
<!-- <span v-if="item.orderStatus=='RECEIVED_GOODS'">待服务</span> -->
|
||||
<span v-if="item.orderStatus=='EVALUATED'">已评价</span>
|
||||
<span v-if="item.orderStatus=='PAY'">待发货</span>
|
||||
@ -32,10 +32,10 @@
|
||||
</view>
|
||||
<view class="details" @tap='goorderdetails(item)'>
|
||||
<view class="detailslist">
|
||||
<image :src="baseurl+item.personPictureUrl" mode=""
|
||||
v-if="item.orderType =='HEALTH_CONSULTATION'&&item.personPictureUrl"></image>
|
||||
<image src="../../static/headsculpture.png" mode=""
|
||||
v-if="item.orderType =='HEALTH_CONSULTATION'&&!item.personPictureUrl"></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'&&!item.attributePitureUrl"></image>
|
||||
<image :src="baseurl+item.attributePitureUrl" mode=""
|
||||
v-if="item.orderType !='HEALTH_CONSULTATION'"></image>
|
||||
<view class="model">
|
||||
@ -142,6 +142,9 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import {
|
||||
getRoomId
|
||||
} from '@/api/pagesB/solution/solution.js'
|
||||
import {
|
||||
lookrate
|
||||
} from '@/api/pagesB/lookrate/index.js'
|
||||
@ -210,7 +213,9 @@
|
||||
img: '', //确认收货页面图片
|
||||
orderStatus: '', //
|
||||
getCodeText: null,
|
||||
|
||||
userId: '',
|
||||
userSig: '',
|
||||
roomId:'',
|
||||
}
|
||||
},
|
||||
watch: { //监听
|
||||
@ -232,7 +237,17 @@
|
||||
this.goodsOrderinfo()
|
||||
},
|
||||
},
|
||||
|
||||
methods: {
|
||||
// info() {
|
||||
// var _this = this
|
||||
// _this.userId = _this.orderTypeList.patientId
|
||||
// console.log(_this.userId, '88585')
|
||||
// getUserSig(_this.userId).then(res => {
|
||||
// console.log(res, '555')
|
||||
// this.userSig = res.data
|
||||
// })
|
||||
// },
|
||||
submit() {
|
||||
console.log(this.orderlist[0], '858')
|
||||
console.log(this.orderlist[0].goOrderNo, '88')
|
||||
@ -266,6 +281,7 @@
|
||||
//点击tabs
|
||||
tabschange(index) {
|
||||
console.log(this.tabslist)
|
||||
console.log(index, '99')
|
||||
this.tabscurrent = index;
|
||||
this.orderTypeList.orderStatus = this.tabslist[index].orderStatus
|
||||
// console.log(this.orderTypeList.orderStatus, '999')
|
||||
@ -275,8 +291,8 @@
|
||||
},
|
||||
//评价
|
||||
rate(item) {
|
||||
if(item.orderStatus=='COMPLETED'){
|
||||
this.rateval=0
|
||||
if (item.orderStatus == 'COMPLETED') {
|
||||
this.rateval = 0
|
||||
}
|
||||
this.evaluatenurse = true;
|
||||
|
||||
@ -379,6 +395,7 @@
|
||||
}
|
||||
})
|
||||
},
|
||||
|
||||
//物流页面
|
||||
gologistics(item) {
|
||||
uni.navigateTo({
|
||||
@ -387,9 +404,26 @@
|
||||
},
|
||||
// 去咨询
|
||||
serve(item) {
|
||||
uni.navigateTo({
|
||||
url: '/pagesB/solution/solution'
|
||||
// this.info()
|
||||
getRoomId(item.goodsOrderId).then(res => {
|
||||
console.log(res, '787')
|
||||
if(res.msg){
|
||||
this.roomId=res.msg
|
||||
uni.navigateTo({
|
||||
url: `/pagesB/solution/solution?item=${JSON.stringify(item)}&&roomId=${this.roomId}`
|
||||
})
|
||||
}
|
||||
else{
|
||||
this.$refs.uToast.show({
|
||||
title: '暂无视频通话',
|
||||
type: 'error'
|
||||
})
|
||||
// uni.navigateTo({
|
||||
// url: `/pagesB/solution/solution?item=${JSON.stringify(item)}`
|
||||
// })
|
||||
}
|
||||
})
|
||||
|
||||
},
|
||||
//订单详情页面
|
||||
goorderdetails(item) {
|
||||
@ -420,6 +454,7 @@
|
||||
})
|
||||
}
|
||||
})
|
||||
// this.roomitem()
|
||||
},
|
||||
//确认收货
|
||||
Receipt(item) {
|
||||
@ -824,4 +859,4 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
</style>
|
||||
@ -361,7 +361,7 @@
|
||||
// this.baseurl = baseurl
|
||||
// var that = this
|
||||
const value = uni.getStorageSync('userinfo');
|
||||
if (value) {
|
||||
// if (value) {
|
||||
const patientid =value.id
|
||||
appPersonal(patientid).then(Response => {
|
||||
if (Response.code == 200) {
|
||||
@ -387,7 +387,7 @@
|
||||
})
|
||||
}
|
||||
})
|
||||
} else {}
|
||||
// } else {}
|
||||
// this.listinfo = JSON.parse(options.updata)
|
||||
// console.log(this.listinfo, '888')
|
||||
}else{
|
||||
|
||||
@ -5,21 +5,37 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import {
|
||||
getUserSig
|
||||
} from '@/api/pagesB/solution/solution.js'
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
src: '',
|
||||
userSig: '',
|
||||
item: {},
|
||||
};
|
||||
},
|
||||
methods: {
|
||||
|
||||
|
||||
info() {
|
||||
// console.log(this.item.patientId, '88585')
|
||||
getUserSig(this.item.patientId).then(res => {
|
||||
this.userSig = res.data
|
||||
this.src =
|
||||
`https://msg.xinyilu.cn?userId=5&userName=王晓燕&userSig=eJyrVgrxCdYrSy1SslIy0jNQ0gHzM1NS80oy0zLBwqZQweKU7MSCgswUJStDMwMgMLM0MYHIpFYUZBalAsVNTU2NgDIQ0ZLMXJCYmaWlsZGRoYUh1JTMdKCZFgGhHiGlhkWBZR6mKanpAVW*bpVuMfpGeY5epUZVad6G5qZBjgGZzk6GvqG2SrUAMZovIA__&roomId=456789`
|
||||
|
||||
console.log(this.src, '555')
|
||||
})
|
||||
},
|
||||
},
|
||||
onLoad(options) {
|
||||
this.src =
|
||||
`https://msg.xinyilu.cn?userId=xinyilu_mp&userName=123&userSig=eJwtjMEKgkAURf9l1iEq816N0EKiMmoRZgtXETmNL0cbTEOJ-r1Jvbt7DpwPSw4n5y1rFjDfcdls*JTJqqE7DbijqifdXkoz2VdWXI2hjAUeunYoOB*N7AzV0nIA8K0ZaUPln6FAsRAIOFVI2Xj*0LmnzjHc1iuRxDCPeYp7xft0i0mB*rgJw3YXAUbPJfv*AIBJMqE_&roomId=123`
|
||||
|
||||
this.item = JSON.parse(options.item)
|
||||
this.roomId = options.roomId
|
||||
// console.log(this.roomId, '88888')
|
||||
this.info()
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
</script>
|
||||
|
||||
|
||||
@ -86,7 +86,7 @@
|
||||
.appoint {
|
||||
position: absolute;
|
||||
right: 5%;
|
||||
top: 50%;
|
||||
top: 58%;
|
||||
transform: translateY(-50%);
|
||||
width: 169rpx;
|
||||
height: 61rpx;
|
||||
@ -99,7 +99,7 @@
|
||||
|
||||
.big {
|
||||
padding: 35rpx 84rpx 24rpx 46rpx;
|
||||
width: 80%;
|
||||
// width: 0%;
|
||||
overflow: hidden;
|
||||
white-space: nowrap;
|
||||
text-overflow: ellipsis;
|
||||
@ -108,6 +108,10 @@
|
||||
font-weight: 500;
|
||||
color: #000000;
|
||||
line-height: 38rpx;
|
||||
span{
|
||||
display: inline;
|
||||
float: right;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
</u-navbar>
|
||||
<view class="content" v-for="(item ,index) in listinfo" :key="index">
|
||||
<view class="big">{{item.projectName}}
|
||||
|
||||
<span v-if="item.sourceType ==1">{{item.performanceCount}}/{{item.serviceFreq}}</span>
|
||||
</view>
|
||||
<view class="servename">
|
||||
{{item.packageName}}
|
||||
@ -61,13 +61,13 @@
|
||||
this.userinfo = uni.getStorageSync('userinfo');
|
||||
this.identity = this.userinfo.cardNo
|
||||
getForm(this.identity, this.projectName).then(res => {
|
||||
if(res.code==500){
|
||||
if (res.code == 500) {
|
||||
this.$refs.uToast.show({
|
||||
title: res.msg,
|
||||
type: 'error',
|
||||
duration: '1000',
|
||||
})
|
||||
}else{
|
||||
} else {
|
||||
this.listinfo = res.data
|
||||
|
||||
}
|
||||
@ -92,4 +92,4 @@
|
||||
|
||||
<style lang="scss">
|
||||
@import './ServiceAppointment.scss'
|
||||
</style>
|
||||
</style>
|
||||
Loading…
Reference in New Issue
Block a user