Merge remote-tracking branch 'origin/3-30'

# Conflicts:
#	pages.json
#	pages/ConsultationDetails/ConsultationDetails.vue
#	pages/Nursingstationserviceorder/Nursingstationserviceorder.vue
#	pages/appointmenttime/appointmenttime.vue
#	pages/homepage/homepage.vue
#	pages/medicine/medicine.scss
#	static/yis.png
#	store/index.js
This commit is contained in:
曹辉 2023-04-13 15:55:24 +08:00
commit c5e16bfdc0
25 changed files with 476 additions and 368 deletions

View File

@ -13,7 +13,6 @@ const app = new Vue({
})
app.$mount()
// #endif
// #ifdef VUE3
import {
createSSRApp

View File

@ -4,61 +4,62 @@
},
"pages": [ //pageshttps://uniapp.dcloud.io/collocation/pages
{
"path": "pages/Personal/Personal",
"style": {
"navigationBarTitleText": "个人中心",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#ffffff",
"navigationStyle": "custom"
}
},{
"path": "pages/startup/startup",
"style": {
"navigationBarTitleText": "",
"navigationStyle": "custom"
}
}, {
"path": "pages/medicine/medicine",
"path": "pages/information/information",
"style": {
"navigationBarTitleText": "齐鲁名医",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#ffffff",
"disableScroll": true
"navigationBarTitleText": "完善个人信息",
"enablePullDownRefresh": false
}
}, {
"path": "pages/Nursingstationserviceorder/Nursingstationserviceorder",
"style": {
"navigationBarTitleText": "护理机构服务订单",
"onReachBottomDistance": 40, // px
"enablePullDownRefresh": true //true
}
}, {
"path": "pages/appointmenttime/appointmenttime",
"style": {
"navigationBarTitleText": "预约时间",
"enablePullDownRefresh": false
}
}, {
"path": "pages/medicine/medicine",
"style": {
"navigationBarTitleText": "健康咨询",
"enablePullDownRefresh": false,
"disableScroll": true
}
},{
"path": "pages/integral/integral",
"style": {
"navigationBarTitleText": "积分",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#ffffff"
"enablePullDownRefresh": false
}
}, {
"path": "pages/confirmation/confirmation",
"style": {
},{
"path" : "pages/Informationconfirmation/Informationconfirmation",
"style" :
{
"navigationBarTitleText": "",
"enablePullDownRefresh": false,
"navigationBarTitleText": "预约时间"
}
}, {
"path": "pages/information/information",
"style": {
"navigationBarTitleText": "完善个人信息",
"navigationBarBackgroundColor": "#ffffff", //
"enablePullDownRefresh": false
}
}, {
"path": "pages/CommodityDetails/CommodityDetails",
"style": {
"navigationBarTitleText": "商品详情",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#ffffff"
"enablePullDownRefresh": false
}
}, {
"path": "pages/coupon/coupon",
"style": {
"navigationBarTitleText": "优惠券",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#ffffff",
"onReachBottomDistance": 40, // px
"enablePullDownRefresh": true //true
}
@ -67,28 +68,24 @@
"style": {
"navigationBarTitleText": "个人中心",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#ffffff",
"navigationStyle": "custom"
}
}, {
"path": "pages/modify/modify",
"style": {
"navigationBarTitleText": "修改信息",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#ffffff" //
"enablePullDownRefresh": false
}
}, {
"path": "pages/ProjectDetails/ProjectDetails",
"style": {
"navigationBarTitleText": "护理项目详情",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#ffffff" //
"enablePullDownRefresh": false
}
}, {
"path": "pages/modifyAddress/modifyAddress",
"style": {
"navigationBarTitleText": "修改地址",
"navigationBarBackgroundColor": "#ffffff", //
"enablePullDownRefresh": true //true
}
},
@ -96,30 +93,19 @@
"path": "pages/lookrate/lookrate",
"style": {
"navigationBarTitleText": "查看评价",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#ffffff"
"enablePullDownRefresh": false
}
}, {
"path": "pages/ServiceDetails/ServiceDetails",
"style": {
"navigationBarTitleText": "服务详情",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#ffffff" //
"enablePullDownRefresh": false
}
}, {
"path": "pages/goodsorderRate/goodsorderRate",
"style": {
"navigationBarTitleText": "发表评价",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#ffffff" //
}
},
{
"path": "pages/appointmenttime/appointmenttime",
"style": {
"navigationBarTitleText": "预约时间",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#ffffff" //
"enablePullDownRefresh": false
}
}, {
"path": "pages/paysuccess/paysuccess",
@ -128,8 +114,7 @@
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
},
{
}, {
"path": "pages/ratesuccess/ratesuccess",
"style": {
"navigationBarTitleText": "",
@ -140,7 +125,6 @@
"path": "pages/shopping/shopping", //
"style": {
"navigationBarTitleText": "医路优品",
"navigationBarBackgroundColor": "#ffffff",
"onReachBottomDistance": 40, // px
"enablePullDownRefresh": true //true
}
@ -148,101 +132,71 @@
"path": "pages/CommodityOrder/CommodityOrder",
"style": {
"navigationBarTitleText": "商品订单",
"navigationBarBackgroundColor": "#ffffff",
"onReachBottomDistance": 40, // px
"enablePullDownRefresh": true //true
}
},
{
}, {
"path": "pages/orderDetails/orderDetails",
"style": {
"navigationBarTitleText": "订单详情",
"navigationBarBackgroundColor": "#ffffff",
"enablePullDownRefresh": false
}
},
{
}, {
"path": "pages/payorderDetails/payorderDetails",
"style": {
"navigationBarTitleText": "订单详情",
"navigationBarBackgroundColor": "#ffffff",
"enablePullDownRefresh": false
}
},
{
}, {
"path": "pages/login/login",
"style": {
"navigationBarTitleText": "登录",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#ffffff" //
"enablePullDownRefresh": false
}
},
{
}, {
"path": "pages/cancelorder/cancelorder",
"style": {
"navigationBarTitleText": "取消订单",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#ffffff" //
"enablePullDownRefresh": false
}
},
{
"path": "pages/Nursingstationserviceorder/Nursingstationserviceorder",
"style": {
"navigationBarTitleText": "护理机构服务订单",
"navigationBarBackgroundColor": "#ffffff", //
"onReachBottomDistance": 40, // px
"enablePullDownRefresh": true //true
}
},
{
}, {
"path": "pages/logistics/logistics",
"style": {
"navigationBarTitleText": "查看物流",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#ffffff"
"enablePullDownRefresh": false
}
},
{
}, {
"path": "pages/Aftersalesdetails/Aftersalesdetails",
"style": {
"navigationBarTitleText": "售后详情",
"navigationBarBackgroundColor": "#ffffff",
"enablePullDownRefresh": false
}
},
{
}, {
"path": "pages/Applforrefund/Applforrefund",
"style": {
"navigationBarTitleText": "申请退款",
"navigationBarBackgroundColor": "#ffffff",
"enablePullDownRefresh": false
}
},
{
}, {
"path": "pages/refundType/refundType",
"style": {
"navigationBarTitleText": "选择退款类型",
"navigationBarBackgroundColor": "#ffffff",
"enablePullDownRefresh": false
}
},
{
}, {
"path": "pages/menttimeorder/menttimeorder",
"style": {
"navigationBarTitleText": "预约详情",
"enablePullDownRefresh": false
}
},
{
}, {
"path": "pages/homepage/homepage",
"style": {
"navigationBarTitleText": "泉医到家",
"navigationStyle": "custom",
"navigationBarBackgroundColor": "#ffffff",
"enablePullDownRefresh": false
}
},
{
}, {
"path": "pages/confirmOrder/confirmOrder",
"style": {
"navigationBarTitleText": "确认订单",
@ -250,74 +204,58 @@
"navigationBarBackgroundColor": "#4C7BC9", //
"navigationBarTextStyle": "white"
}
},
{
}, {
"path": "pages/disease/disease",
"style": {
"navigationBarTitleText": "疾病类型选择",
"navigationBarBackgroundColor": "#ffffff", //
"enablePullDownRefresh": false
}
},
{
}, {
"path": "pages/doctorslist/doctorslist",
"style": {
"navigationBarTitleText": "预约医生",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#ffffff"
"enablePullDownRefresh": false
}
},
{
}, {
"path": "pages/ProductList/ProductList", //
"style": {
"navigationBarTitleText": "医路优品",
"navigationBarBackgroundColor": "#ffffff",
"onReachBottomDistance": 40, // px
"enablePullDownRefresh": true //true
}
},
{
}, {
"path": "pages/nursestation/nursestation",
"style": {
"navigationBarTitleText": "护理机构详情",
"navigationBarBackgroundColor": "#ffffff",
"onReachBottomDistance": 100, // px
"enablePullDownRefresh": true //true
}
},
{
}, {
"path": "pages/site/site",
"style": {
"navigationBarTitleText": "护理机构",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#ffffff", //
"onReachBottomDistance": 100, // px
"enablePullDownRefresh": true //true
}
},
{
}, {
"path": "pages/diseasemanagement/diseasemanagement",
"style": {
"navigationBarTitleText": "专病管理",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#ffffff"
"enablePullDownRefresh": false
}
},
{
}, {
"path": "pages/utabs/u-tabs",
"style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#ffffff"
"enablePullDownRefresh": false
}
},
{
}, {
"path": "pages/classification/classification",
"style": {
"navigationBarTitleText": "分类",
"enablePullDownRefresh": false,
"disableScroll": true
// "navigationBarBackgroundColor": "#ffffff",
// "onReachBottomDistance": 50 // px
// "enablePullDownRefresh": true //true
}
@ -325,50 +263,42 @@
"path": "pages/Healthknowledge/Healthknowledge",
"style": {
"navigationBarTitleText": "健康常识",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#ffffff"
"enablePullDownRefresh": false
}
}, {
"path": "pages/Healthitem/Healthitem",
"style": {
"navigationBarTitleText": "健康常识",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#ffffff"
"enablePullDownRefresh": false
}
},
{
}, {
"path": "pages/customerservice/customerservice",
"style": {
"navigationBarTitleText": "在线客服",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#ffffff"
"enablePullDownRefresh": false
}
}, {
"path": "pages/materialbenefits/materialbenefits",
"style": {
"navigationBarTitleText": "新人福利",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#ffffff"
"enablePullDownRefresh": false
}
}, {
"path": "pages/geriatricdisease/geriatricdisease",
"style": {
"navigationBarTitleText": "国家老年病中心",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#ffffff"
"enablePullDownRefresh": false
}
}, {
"path": "pages/Healthrecords/Healthrecords",
"style": {
"navigationBarTitleText": "健康档案",
"navigationBarBackgroundColor": "#ffffff",
"enablePullDownRefresh": false
}
}, {
"path": "pages/ConsultationDetails/ConsultationDetails",
"style": {
"navigationBarTitleText": "齐鲁名医",
"navigationBarBackgroundColor": "#ffffff",
"enablePullDownRefresh": false
}
}
@ -376,7 +306,7 @@
"globalStyle": {
"navigationBarTextStyle": "black",
"navigationBarTitleText": "",
"navigationBarBackgroundColor": "#F8F8F8",
"navigationBarBackgroundColor": "#ffffff",
"backgroundColor": "#F8F8F8"
},
"uniIdRouter": {},

View File

@ -12,17 +12,27 @@
return {
imageurl: null,
imageurls: null,
goto: '',
};
},
onShow() {
this.imageurl = baseurl + '/profile/appletPicture/healthyOne.png'
this.imageurls = baseurl + '/profile/appletPicture/healthyDetails.png'
},
onLoad(options) {
this.goto = options.goto
},
methods: {
godetal() {
uni.navigateBack({
delta: 1
})
if (this.goto == 'homepage') {
uni.navigateTo({
url: '/pages/medicine/medicine'
})
} else {
uni.navigateBack({
delta: 1
})
}
}
}
}

View File

@ -69,12 +69,13 @@
}
.title {
padding-left: 3%;
padding: 0 3%;
font-size: 38rpx;
font-weight: bold;
white-space: normal;
word-break: break-all;
margin-bottom: 20rpx;
text-align: justify;
}
.text {

View File

@ -168,6 +168,7 @@
-webkit-line-clamp: 5; //
line-clamp: 5;
-webkit-box-orient: vertical;
text-align: justify;
}
}
}

View File

@ -3,7 +3,7 @@
.masks{
image{
position: absolute;
bottom:380rpx;
top:50rpx;
left:50%;
transform: translateX(-50%);
z-index: 999;
@ -14,43 +14,43 @@
.ratetitle{
font-size: 34rpx;
position: absolute;
bottom:320rpx;
top:320rpx;
left:50%;
transform: translateX(-50%);
z-index: 999;
}
.title{
position: absolute;
top:40rpx;
left:50%;
transform: translateX(-50%);
font-size: 42rpx;
}
::v-deep .u-star-wrap{
padding-right:10rpx;
}
.mask{
position: absolute;
bottom:0;
width: 750rpx;
height: 703rpx;
background: #FFFFFF;
border-radius: 30rpx 30rpx 0px 0px;
display: flex;
justify-content: space-around;
.rateitem{
margin-top:200rpx;
width: 217rpx;
height: 222rpx;
line-height: 222rpx;
text-align: center;
color: #ffffff;
background: #BFBFBF;
font-size: 40rpx;
border-radius: 25rpx;
}
.lookrateitem{
font-size: 32rpx;
margin-top:440rpx;
width: 200rpx;
height: 200rpx;
line-height: 200rpx;
text-align: center;
color: #ffffff;
background: #BFBFBF;
border-radius: 25rpx;
}
top:200rpx;
left: 70rpx;
}
.btn{
width: 70%;
height: 71rpx;
background: #4C7BC9;
border-radius: 26rpx;
position: absolute;
top:530rpx;
left: 15%;
text-align: center;
line-height: 71rpx;
color: #fff;
}
.rateitem{
position: absolute;
top:350rpx;
left: 80rpx;
font-size: 42rpx;
}
}

View File

@ -41,37 +41,40 @@
<u-empty mode="list" icon-size='220' text='暂无服务订单'></u-empty>
</view>
<u-toast ref="uToast" />
<u-mask :show="rateshow" @tap="rateshow = false" class='masks'>
<view class="mask">
<view class="rateitem" @tap="taprate('SATISFIED')">
满意
</view>
<view class="rateitem" @tap="taprate('COMMONLY')">
一般
</view>
<view class="rateitem" @tap="taprate('DISSATISFIED')">
不满意
</view>
<u-popup v-model="rateshow" mode="bottom" length="50%" border-radius="20" :closeable='true' class='masks'>
<view class="title">
综合评价
</view>
</u-mask>
<u-mask :show="lookrateshow" @tap="lookrateshow = false" class='masks'>
<view class="mask">
<u-rate :count="5" v-model="rateval" :size='70' active-color='#F4EA2A'></u-rate>
</view>
<view class="rateitem">
{{rateval==5?'非常满意':''}}
{{rateval==4?'满意':''}}
{{rateval==3?'一般':''}}
{{rateval==2?'差':''}}
{{rateval==1?'非常差':''}}
</view>
<view class="btn" @tap='taprate'>
确认
</view>
</u-popup>
<u-popup v-model="lookrateshow" mode="bottom" length="60%" border-radius="20" :closeable='true' class='masks'>
<image :src="baseurl+rateimgtitle.img" mode=""></image>
<view class="ratetitle">
{{rateimgtitle.title}}
</view>
<view class="mask">
<view class="lookrateitem" :style="ratelist.evaluateSatisfaction=='SATISFIED'?'background: #4C7BC9':''">
满意
</view>
<view class="lookrateitem" :style="ratelist.evaluateSatisfaction=='COMMONLY'?'background: #4C7BC9':''">
一般
</view>
<view class="lookrateitem"
:style="ratelist.evaluateSatisfaction=='DISSATISFIED'?'background: #4C7BC9':''">
不满意
</view>
<view class="mask" style="top: 450rpx;">
<u-rate :count="5" v-model="rateval" :size='70' active-color='#F4EA2A' disabled></u-rate>
</view>
</u-mask>
<view class="rateitem" style="top: 580rpx;">
{{rateval==5?'非常满意':''}}
{{rateval==4?'满意':''}}
{{rateval==3?'一般':''}}
{{rateval==2?'差':''}}
{{rateval==1?'非常差':''}}
</view>
</u-popup>
</view>
</template>
<script>
@ -91,21 +94,24 @@
export default {
data() {
return {
rateimgtitle: {
timer: null, //time
baseurl: null,
rateimgtitle: { //mask
img: null,
title: null,
},
ratelist: null, //list
rateshow: false, //
lookrateshow: false, //
baseurl: '',
openid: null,
patientId: null,
openid: null, //opedn
patientId: null, //patientId
rateval: 0, //
evaluateSatisfaction: null, //////
pageNum: 1,
total: 0,
pageSize: 15,
list: [],
orderNo: null,
list: [], //list
orderNo: null, //
}
},
onShow() {
@ -133,40 +139,70 @@
})
}
},
watch: { //
rateval() {
if (this.rateval == 5) {
this.evaluateSatisfaction = 'VERYSATISFIED'
} else if (this.rateval == 4) {
this.evaluateSatisfaction = 'SATISFIED'
} else if (this.rateval == 3) {
this.evaluateSatisfaction = 'COMMONLY'
} else if (this.rateval == 2) {
this.evaluateSatisfaction = 'DISSATISFIED'
} else if (this.rateval == 1) {
this.evaluateSatisfaction = 'VERYDISSATISFIED'
}
},
},
methods: {
//
lookrate(item) {
this.rateval = 0
this.evaluateSatisfaction = null
this.rateimgtitle.img = item.itemPictureUrl
this.rateimgtitle.title = item.nurseItemName
this.lookrateshow = true
lookrate(item.orderNo).then(res => {
this.ratelist = res.data
this.rateval = res.data.compositeScore
this.lookrateshow = true
})
},
//
gorate(item) {
this.rateval = 0
this.evaluateSatisfaction = null
this.orderNo = item.orderNo
this.rateshow = true
},
//
taprate(item) {
taprate() {
var obj = {
"patientId": this.patientId,
"openid": this.openid,
"orderNo": this.orderNo,
"evaluateChannel": "WE_CHAT_APPLET",
"evaluateSatisfaction": item,
"evaluateSatisfaction": this.evaluateSatisfaction,
"compositeScore": this.rateval
}
addAppointmentEvaluate(obj).then(res => {
uni.setStorageSync("Refresh", 'Refresh')
if (res.code == 200) {
uni.setStorageSync("Refresh", 'Refresh')
this.getinfo();
this.orderNo = null
this.rateshow = false
this.$refs.uToast.show({
title: '评价成功',
type: 'success',
duration: '1500',
url: '/pages/ratesuccess/ratesuccess'
duration: '1500'
})
if (this.timer) {
clearTimeout(this.timer)
}
this.timer = setTimeout(e => {
uni.navigateTo({
url: `/pages/ratesuccess/ratesuccess?delta=${1}`
})
}, 1500)
}
})
},

View File

@ -123,14 +123,14 @@
.item {
margin: 0 auto;
width: 100%;
height: 200rpx;
height: 100rpx;
background: #FFFFFF;
.text{
padding: 40rpx 20% 0 40rpx;
padding: 0 40rpx 0 40rpx;
width: 100%;
height: 81rpx;
font-size: 38rpx;
font-weight: 500;
line-height: 100rpx;
}
}

View File

@ -21,8 +21,6 @@
</view>
<view class="text" v-else>暂无
</view>
<view class="classtype">
</view>
<!-- <view class="pingfen">
<u-rate :count="5" value="2"></u-rate>
</view> -->

View File

@ -4,59 +4,59 @@
font-size: 36rpx;
padding-top: 10rpx;
font-size: 34rpx;
.masks{
image{
position: absolute;
bottom:380rpx;
left:50%;
transform: translateX(-50%);
z-index: 999;
width: 250rpx;
border-radius: 25rpx;
height: 250rpx;
}
.ratetitle{
font-size: 34rpx;
position: absolute;
bottom:320rpx;
left:50%;
transform: translateX(-50%);
z-index: 999;
}
.mask{
position: absolute;
bottom:0;
width: 750rpx;
height: 703rpx;
background: #FFFFFF;
border-radius: 30rpx 30rpx 0px 0px;
display: flex;
justify-content: space-around;
.rateitem{
margin-top:200rpx;
width: 217rpx;
height: 222rpx;
line-height: 222rpx;
text-align: center;
color: #ffffff;
background: #BFBFBF;
font-size: 40rpx;
border-radius: 25rpx;
}
.lookrateitem{
font-size: 32rpx;
margin-top:440rpx;
width: 200rpx;
height: 200rpx;
line-height: 200rpx;
text-align: center;
color: #ffffff;
background: #BFBFBF;
border-radius: 25rpx;
}
}
.masks{
image{
position: absolute;
top:50rpx;
left:50%;
transform: translateX(-50%);
z-index: 999;
width: 250rpx;
border-radius: 25rpx;
height: 250rpx;
}
.ratetitle{
font-size: 34rpx;
position: absolute;
top:320rpx;
left:50%;
transform: translateX(-50%);
z-index: 999;
}
.title{
position: absolute;
top:40rpx;
left:50%;
transform: translateX(-50%);
font-size: 42rpx;
}
::v-deep .u-star-wrap{
padding-right:10rpx;
}
.mask{
position: absolute;
top:200rpx;
left: 70rpx;
}
.btn{
width: 70%;
height: 71rpx;
background: #4C7BC9;
border-radius: 26rpx;
position: absolute;
top:530rpx;
left: 15%;
text-align: center;
line-height: 71rpx;
color: #fff;
}
.rateitem{
position: absolute;
top:350rpx;
left: 80rpx;
font-size: 42rpx;
}
}
.time{
height: 80rpx;
width: 95%;
@ -66,26 +66,6 @@
margin: 20rpx auto 0rpx;
border-radius: 20rpx;
}
.mask{
position: absolute;
bottom:0;
width: 750rpx;
height: 703rpx;
background: #FFFFFF;
border-radius: 30rpx 30rpx 0px 0px;
display: flex;
justify-content: space-around;
.rateitem{
margin-top:200rpx;
width: 217rpx;
height: 222rpx;
line-height: 222rpx;
text-align: center;
color: #ffffff;
background: #BFBFBF;
border-radius: 25rpx;
}
}
.OrderStatus{
text-align: center;
width: 300rpx;
@ -279,6 +259,7 @@
}
.bottom {
height: 60rpx;
view {
font-size: 25rpx;
color: #969394;

View File

@ -69,7 +69,7 @@
<view class="cancelorder" @tap="cancelorderment()"
v-if="list.orderStatus=='PAY'||list.orderStatus=='WAIT_DISPATCH'||list.orderStatus=='NOT_FINISH'">取消订单
</view>
<view class="cancelorder" style="background: #60c5f1;" @tap='rateshow= true'
<view class="cancelorder" style="background: #60c5f1;" @tap='rateshowtrue'
v-if="list.orderStatus=='COMPLETE'">立即评价
</view>
<view class="cancelorder" @tap='buy' style="background-color: darkorange;"
@ -79,8 +79,24 @@
<view class="cancelorder" style="background: #4C7BC9;" v-if="list.orderStatus=='EVALUATED'"
@tap='lookrate(list)'>查看评价</view>
</view>
<u-mask :show="rateshow" @tap="rateshow = false">
<u-popup v-model="rateshow" mode="bottom" length="50%" border-radius="20" :closeable='true' class='masks'>
<view class="title">
综合评价
</view>
<view class="mask">
<u-rate :count="5" v-model="rateval" :size='70' active-color='#F4EA2A'></u-rate>
</view>
<view class="rateitem">
{{rateval==5?'非常满意':''}}
{{rateval==4?'满意':''}}
{{rateval==3?'一般':''}}
{{rateval==2?'差':''}}
{{rateval==1?'非常差':''}}
</view>
<view class="btn" @tap='taprate'>
确认
</view>
<!-- <view class="mask">
<view class="rateitem" @tap="taprate('SATISFIED')">
满意
</view>
@ -90,26 +106,24 @@
<view class="rateitem" @tap="taprate('DISSATISFIED')">
不满意
</view>
</view>
</u-mask>
<u-mask :show="lookrateshow" @tap="lookrateshow = false" class='masks'>
</view> -->
</u-popup>
<u-popup v-model="lookrateshow" mode="bottom" length="60%" border-radius="20" :closeable='true' class='masks'>
<image :src="baseurl+rateimgtitle.img" mode=""></image>
<view class="ratetitle">
{{rateimgtitle.title}}
</view>
<view class="mask">
<view class="lookrateitem" :style="ratelist.evaluateSatisfaction=='SATISFIED'?'background: #4C7BC9':''">
满意
</view>
<view class="lookrateitem" :style="ratelist.evaluateSatisfaction=='COMMONLY'?'background: #4C7BC9':''">
一般
</view>
<view class="lookrateitem"
:style="ratelist.evaluateSatisfaction=='DISSATISFIED'?'background: #4C7BC9':''">
不满意
</view>
<view class="mask" style="top: 450rpx;">
<u-rate :count="5" v-model="rateval" :size='70' active-color='#F4EA2A' disabled></u-rate>
</view>
</u-mask>
<view class="rateitem" style="top: 580rpx;">
{{rateval==5?'非常满意':''}}
{{rateval==4?'满意':''}}
{{rateval==3?'一般':''}}
{{rateval==2?'差':''}}
{{rateval==1?'非常差':''}}
</view>
</u-popup>
<u-toast ref="uToast" />
</view>
</template>
@ -129,6 +143,8 @@
data() {
return {
rateshow: false, //
rateval: 0, //
evaluateSatisfaction: null, //////
baseurl: '',
patientId: '', //id
openid: '', //id
@ -159,13 +175,37 @@
}
this.getlist()
},
watch: { //
rateval() {
if (this.rateval == 5) {
this.evaluateSatisfaction = 'VERYSATISFIED'
} else if (this.rateval == 4) {
this.evaluateSatisfaction = 'SATISFIED'
} else if (this.rateval == 3) {
this.evaluateSatisfaction = 'COMMONLY'
} else if (this.rateval == 2) {
this.evaluateSatisfaction = 'DISSATISFIED'
} else if (this.rateval == 1) {
this.evaluateSatisfaction = 'VERYDISSATISFIED'
}
},
},
methods: {
//
rateshowtrue() {
this.rateval = 0
this.evaluateSatisfaction = null
this.rateshow = true
},
//
lookrate(item) {
this.rateval = 0
this.evaluateSatisfaction = null
this.rateimgtitle.img = item.itemPictureUrl
this.rateimgtitle.title = item.nurseItemName
lookrate(item.orderNo).then(res => {
this.ratelist = res.data
this.rateval = res.data.compositeScore
this.lookrateshow = true
})
},
@ -217,29 +257,31 @@
})
},
//
taprate(item) {
taprate() {
var obj = {
"patientId": this.patientId,
"openid": this.openid,
"orderNo": this.orderNo,
"evaluateChannel": "WE_CHAT_APPLET",
"evaluateSatisfaction": item,
"evaluateSatisfaction": this.evaluateSatisfaction,
"compositeScore": this.rateval
}
addAppointmentEvaluate(obj).then(res => {
if (res.code == 200) {
this.getlist();
this.$refs.uToast.show({
title: '评价成功',
type: 'success',
duration: '1500'
})
this.rateshow = false
uni.setStorageSync("Refresh", 'Refresh')
this.getlist();
if (this.timer) {
clearTimeout(this.timer)
}
this.timer = setTimeout(e => {
uni.navigateTo({
url: `/pages/ratesuccess/ratesuccess?delta=${3}`
url: `/pages/ratesuccess/ratesuccess?delta=${1}`
})
}, 1500)
} else {

View File

@ -6,7 +6,7 @@
.mask {
.Agreement {
width: 100%;
background-color: #F4F5F7;
background-color: #fff;
text-align: center;
height: 1000rpx;
position: absolute;
@ -183,17 +183,20 @@
margin-top: 20rpx;
position: relative;
span {
.span {
display: inline-block;
width: 60%;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
width: 20%;
// overflow: hidden;
// text-overflow: ellipsis;
// white-space: nowrap;
position: absolute;
top:50%;
transform: translateY(-50%);
}
.input-placeholder{
color: #C5C3C3;
font-size: 30rpx;
}
input {
position: absolute;
top: 50%;
@ -350,7 +353,12 @@
border-radius: 20rpx;
margin-top: 20rpx;
position: relative;
.checkboxs{
margin-top: 30rpx;
::v-deep .u-checkbox{
padding-right: 40rpx;
}
}
.detail {
overflow: hidden;
text-overflow: ellipsis;

View File

@ -73,8 +73,24 @@
</u-checkbox-group>
</view>
</view>
<view class="Package" style="height: 170rpx;">
是否失能
<span style='color:#F44B2F;padding-left: 10rpx;'>*</span>
<span style='color:#C5C3C3;padding-left: 10rpx;font-size: 30rpx;'>(请选择)</span>
<view class="checkboxs">
<u-checkbox-group @change="checkboxGroupChangetwo">
<u-checkbox @change="checkboxChangetwo(item)" v-model="item.checked" size='40' shape="circle"
v-for="(item, index) in checkboxlist" :key="index" :name="item.name">{{item.name}}</u-checkbox>
</u-checkbox-group>
</view>
</view>
<view class="remarks" v-if="disablingCondition == 'DISABLED'">
<span class='span' style='width: 25%;'>失能情况
<span style='color:#F44B2F;padding-left: 10rpx;'>*</span></span>
<input style="left:27%;width: 73%;" placeholder="请输入" v-model="personInfo.disablingReason">
</view>
<view class="remarks">
<span>备注</span>
<span class='span'>备注</span>
<input placeholder="请输入" v-model="orderlist.remark">
</view>
<view class="radio-content">
@ -137,7 +153,9 @@
patientId: null,
useritem: null, //optionsuser
consumableTotalPrice: 0, //
disablingCondition: null, //
orderlist: {
disablingCondition: null,
orderCount: 1,
patientId: '',
stationId: '',
@ -153,10 +171,20 @@
consumableTotalPrice: '',
totalPrice: '',
remark: "",
disablingReason: '',
orderConsumableList: [],
orderChannel: '',
},
timeindex: 0,
checkboxlist: [{
name: '是',
checked: false,
},
{
name: '否',
checked: false,
}
]
}
},
onShow() {
@ -175,14 +203,15 @@
})
},
onLoad(options) {
this.disablingCondition = null
var that = this
const value = uni.getStorageSync('openid');
if (value) {
that.openid = value
}
this.userinfo();
//
this.getPatientInfo(options.stationId, options.stationItemId, options.stationItemPriceId)
this.userinfo();
},
methods: {
//
@ -208,6 +237,12 @@
that.patientId = value
//
getAppPatientList(that.patientId).then(response => {
if (response.data.disablingCondition == 'NOT_DISABLED') {
that.checkboxlist[1].checked = true
} else if (response.data.disablingCondition == 'DISABLED') {
that.checkboxlist[0].checked = true
that.disablingCondition = 'DISABLED'
}
that.personInfo = response.data
that.personInfo.address = response.data.areaName + response.data.address
})
@ -235,14 +270,14 @@
this.orderlist.serviceStartTime = res.data.appointmentTimeList[0].morningList[0]
this.orderlist.serviceDate = res.data.appointmentTimeList[0].date
this.consumableTotalPrice = res.data.consumableTotalPrice
this.orderlist.orderCommissionAmount = res.data.commissionAmount
this.orderlist.disablingCondition = this.personInfo.disablingCondition
}
})
},
//
updata() {
var that = this
this.orderlist.consumableTotalPrice = null
this.orderlist.orderChannel = 'WECHAT_APPLET'
if (this.radio == 1) {
this.$refs.uToast.show({
title: '请阅读用户协议并同意',
@ -259,12 +294,18 @@
}
})
}
this.orderlist.consumableTotalPrice = null
this.orderlist.orderChannel = 'WECHAT_APPLET'
this.orderlist.disablingReason = this.personInfo.disablingReason
this.orderlist.afternoonOpenEndTime = this.orderlist.afternoonOpenEndTime.slice(0, 5)
this.orderlist.afternoonOpenStartTime = this.orderlist.afternoonOpenStartTime.slice(0, 5)
this.orderlist.morningOpenEndTime = this.orderlist.morningOpenEndTime.slice(0, 5)
this.orderlist.morningOpenStartTime = this.orderlist.morningOpenStartTime.slice(0, 5)
this.orderlist.patientId = this.patientId
this.orderlist.serviceAddress = this.personInfo.areaName + this.personInfo.address
this.orderlist.serviceAddress = this.personInfo.address
if (this.orderlist.disablingCondition == 'NOT_DISABLED') {
this.orderlist.disablingReason = null
}
submitAppointment(this.orderlist).then(res => {
if (res.code == 500) {
that.$refs.uToast.show({
@ -329,6 +370,7 @@
this.radio = 2;
this.maskshow = false
},
// checkbox
checkboxChange(e) {
if (e.radio) {
this.orderlist.totalPrice = this.argSubtr(this.orderlist.totalPrice, e.consumablePrice)
@ -336,6 +378,24 @@
this.orderlist.totalPrice = this.argAdd(this.orderlist.totalPrice, e.consumablePrice)
}
},
// checkbox
checkboxChangetwo(e) {
this.checkboxlist.forEach(e => {
e.checked = false
})
e.checked = true
},
// checkboxcheckbox-group
checkboxGroupChangetwo(e) {
if (e[0] == '否') {
this.disablingCondition = 'NOT_DISABLED'
} else if (e[0] == '是') {
this.disablingCondition = 'DISABLED'
} else {
this.disablingCondition = null
}
this.orderlist.disablingCondition = this.disablingCondition
},
argAdd(arg1, arg2) {
//
var _this = this,

View File

@ -1,5 +1,5 @@
<template>
<view class="">
<view class="" style="text-align: justify;padding: 0 2%;">
<view class="">
为确保护理安全及双方权益请认真阅读此知情同意书并签字若因违反此协议而造成的后果由双方各自承担相应的责任
</view>

View File

@ -87,6 +87,7 @@
width: 657rpx;
padding: 0 20rpx;
line-height: 56rpx;
text-align: justify;
}
.detailed view {

View File

@ -133,14 +133,44 @@
this.swiperImglink.forEach(e => {
e.image = baseurl + e.posterPictureUrl
if (e.image == item) {
if (e.jumpLink == '/pages/homepage/homepage' || e.jumpLink == '/pages/Personal/Personal') {
uni.switchTab({
url: e.jumpLink
})
if (e.dictLabel == '专病管理') {
const phone = uni.getStorageSync('phone');
if (phone) {
uni.navigateToMiniProgram({
appId: 'wxa690d053c34ceebd',
path: '/pages/index/index',
extraData: {
'from': 'qy',
'phone': phone
},
success(res) {}
})
} else {
this.$refs.uToast.show({
title: '您未登录,请先登录',
type: 'error',
duration: '1000',
url: '/pages/login/login'
})
}
} else if (e.dictLabel == '新医象') {
this.goycjc();
} else {
uni.navigateTo({
url: e.jumpLink
})
if (e.jumpLink == '/pages/ConsultationDetails/ConsultationDetails') {
const url = `/pages/ConsultationDetails/ConsultationDetails?goto=${'homepage'}`
uni.navigateTo({
url: url
})
} else if (e.jumpLink == '/pages/homepage/homepage' || e.jumpLink ==
'/pages/Personal/Personal') {
uni.switchTab({
url: e.jumpLink
})
} else {
uni.navigateTo({
url: e.jumpLink
})
}
}
}
})
@ -445,6 +475,7 @@
-webkit-line-clamp: 5; //
line-clamp: 5;
-webkit-box-orient: vertical;
text-align: justify;
}
}
}

View File

@ -6,7 +6,7 @@
}
.Agreement{
width: 100%;
background-color: #F4F5F7;
background-color: #fff;
text-align: center;
height: 1000rpx;
position: absolute;

View File

@ -1,5 +1,5 @@
<template>
<view class="">
<view style="text-align: justify;padding: 0 2%;">
泉医到家简称我们深知个人信息对您的重要性也感谢您对我们的信任
我们将通过本政策向您说明我们如何收集存储保护使用及对外提供您的信息并说明您享有的权利其中要点如下
<view class="">

View File

@ -177,6 +177,17 @@
children: data.data,
};
this.tabbars.push(current);
if (this.tabCurrentIndex == 2) {
this.tabbars[3].children.unshift({
areaCode: "",
areaLevel: 4,
areaName: "暂不选择",
children: null,
id: 999999,
parentId: 999999999,
sort: null,
})
}
this.tabCurrentIndex++;
//
this.$set(this, 'scrollTop', 0)

View File

@ -11,7 +11,7 @@
text-align: center;
color: #FFFFFF;
position: relative;
.determine,
.cancel {
width: 200rpx;
@ -22,23 +22,23 @@
position: absolute;
top: 74%;
}
.determine {
background: #4C7BC9;
right: 36rpx;
}
.cancel {
background: #C5BFBF;
left: 36rpx;
}
.title {
font-size: 42rpx;
margin-top: 40rpx;
color: #000000;
}
image {
width: 100rpx;
height: 100rpx;
@ -53,35 +53,35 @@
width: 96%;
height: 380rpx;
z-index: 999;
.swiper-box {
width: 100%;
height: 380rpx;
}
.swiper-item {
height: 380rpx;
text-align: center;
image {
width: 100%;
height: 380rpx !important;
z-index: 999;
}
}
video {
height: 100%;
width: 100%;
}
}
.hospital {
width: 96%;
margin: 0 auto;
height: 100%;
background-color: #fff;
.appointmenthospital {
height: 90rpx;
font-size: 35rpx;
@ -91,24 +91,24 @@
margin: 0 auto;
font-weight: 600;
}
.tabbar {
display: flex;
height: calc(100vh - 470rpx);
width: 100%;
.lefttabbar {
width: 30%;
// display: inline-block;
height: 100%;
padding-top: 20rpx;
.lefttabbarlist {
overflow: scroll;
-webkit-overflow-scrolling: touch;
height: 100%;
.actives {
width: 80%;
color: red;
@ -123,7 +123,7 @@
font-size: 30rpx;
// border-radius: 25rpx 0 0 25rpx;
}
.active {
text-align: center;
overflow: hidden;
@ -137,11 +137,11 @@
}
}
}
.righttabbar {
width: 70%;
height: 100%;
.productlist {
padding-bottom: 40rpx;
overflow: scroll;
@ -154,13 +154,13 @@
flex-wrap: wrap;
justify-content: space-evenly;
background-color: #ffffff;
.content {
height: 500rpx;
position: relative;
width: 100%;
border-bottom: 1rpx solid #D8D4D4;
.hospitalimage {
position: absolute;
width: 120rpx;
@ -168,23 +168,23 @@
top: 30rpx;
left: 30rpx;
}
.hospitalteacher {
font-size: 36rpx;
position: absolute;
top: 60rpx;
left: 180rpx;
}
.physician {
font-size: 24rpx;
color: #666666;
position: absolute;
top: 120rpx;
left: 183rpx;
}
.words {
white-space: normal;
word-break: break-all;
@ -199,8 +199,9 @@
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 4;
text-align: justify;
}
.appointment {
position: absolute;
bottom: 25rpx;
@ -218,4 +219,4 @@
}
}
}
}
}

View File

@ -10,7 +10,7 @@
.Agreement {
width: 100%;
background-color: #F4F5F7;
background-color: #fff;
text-align: center;
height: 1000rpx;
position: absolute;

View File

@ -166,6 +166,7 @@
},
//
getpickerParentValue(e) {
e = e.filter(ele => ele.localName != '暂不选择')
this.addresslength = e
this.infolist.address = ''
this.infolist.areaCode = ''

View File

@ -39,7 +39,11 @@
uni.navigateBack({
delta: 2
});
}else{
} else if (this.delta == 1) {
uni.navigateBack({
delta: 1
});
} else {
uni.navigateBack({
delta: 2
});

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

View File

@ -1,9 +1,6 @@
import Vue from 'vue'
import Vuex from 'vuex'
Vue.use(Vuex)
import {
insertSubscribeMessageRecord
} from '@/api/store/index.js'
const store = new Vuex.Store({
state: {
//公共的变量这里的变量不能随便修改只能通过触发mutations的方法才能改变
@ -12,8 +9,6 @@ const store = new Vuex.Store({
//相当于同步的操作
//点击确认
subscribesuccess(state) {
const openids = uni.getStorageSync('openid');
const patientIds = uni.getStorageSync('patientId');
wx.requestSubscribeMessage({
tmplIds: [
'-IxZeEkkXFhoSwGtBHbipKQ6kjEmkdTkswKeOypSsNQ',
@ -26,8 +21,6 @@ const store = new Vuex.Store({
})
},
integralsubscribesuccess(state) {
const openids = uni.getStorageSync('openid');
const patientIds = uni.getStorageSync('patientId');
wx.requestSubscribeMessage({
tmplIds: [
'S_c9bR4znSWpXg-6ACIMn7AkaR11dzo113XM8w4CKz0'