yangjun
/
sadjv3_user
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

该bug

This commit is contained in:
Mr.jiang 2024-08-05 20:41:19 +08:00
parent 9545c533da
commit 30b7a776a8
10 changed files with 64 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
my/gird/shoucang.vue
View File

@ -78,12 +78,12 @@
正规绿色服务!擅长精油SPA、中式推拿，有按摩师证，手法专业，期待正规绿色服务!擅长精油SPA、中式推拿正规绿色服务!擅长精油SPA、中式推拿
</view>
<view class="therapist-mian-bottom">
<view class="flex flex-wrap align-center">
<view class="flex flex-wrap align-center" v-if="item.consortiaName">
<image class="therapist-bottom-img" src="../../static/dituzhaoren5.png">
</image>
<view class="therapist-mian-bottom-text">春城有约</view>
<view class="therapist-mian-bottom-text">{{item.consortiaName}}</view>
</view>
<view class="flex align-center" v-if="item.tripWay != 3" >
<view class="flex align-center">
<image class="therapist-bottom-dingwei" src="../../static/dituzhaoren6.png"></image>
<view class="therapist-bottom-dingwei-text">
{{ item.distance }}

1
my/order/payModifyJsDetail.vue
View File

@ -2068,6 +2068,7 @@
line-height: 80rpx;
font-size: 32rpx;
position: fixed;
bottom:0px;
}
.serverAddress {

2
my/order/payModifyTc.vue
View File

@ -1,6 +1,6 @@
<template>
<view class="content">
<view class="padding-bottom u-skeleton">
<view class="u-skeleton" style="padding-bottom: 100px;">
<view class="bgImg u-skeleton-fillet">
<view class="head-top">
<view class="pay-title">{{orderXm.type=='104'?'服务套餐':orderXm.type=='105'?'项目次卡':'服务疗程'}}</view>

2
my/order/paydingTc.vue
View File

@ -26,7 +26,7 @@
<view class="money-pay" style="width: 100%;justify-content: space-between;">
<view class="money-pay-zhen">
<span>￥</span>
<span>{{order.sumMoney}}{{orderXm.type=='104'?'/套':orderXm.type=='105'?'次':'次'}}</span>
<span>{{order.sumMoney}}{{orderXm.type=='104'?'/套':orderXm.type=='105'?'/次':'/次'}}</span>
</view>
<view>
<uni-number-box :disabled="true" :value="order.ordersPackageList[0].num" :width='27' :min="1" @change="changeValue" />

12
pages/my/index.vue
View File

@ -140,13 +140,17 @@
<view class="item-view-bottom-qian">
<span>￥</span>
<span>{{item.price}}</span>
<span v-if="item.type!='104'">
/{{item.serviceCount?item.serviceCount:''}}{{item.type=='105'||item.type=='106'?'次':'元'}}
<span v-if="item.type!='104'&&(item.type=='105'||item.type=='106')">
/{{item.serviceCount?item.serviceCount:''}}次
</span>
<span v-if="item.type=='104'">/套
</span>
<span
v-if="item.type!='104'">￥{{item.oldPrice}}/{{item.serviceCount?item.serviceCount:''}}{{item.type=='105'||item.type=='106'?'次':'元'}}</span>
<span v-if="item.type!='104'" style="font-size: 12px;color: #848484;= -webkit-text-decoration-line: line-through;text-decoration-line: line-through;margin-left: 5px;">
￥{{item.oldPrice}}
</span>
<span v-if="item.type!='104'&&(item.type=='105'||item.type=='106')" style="font-size: 12px;color: #848484;-webkit-text-decoration-line: line-through;text-decoration-line: line-through;margin-left: 5px;">
/{{item.serviceCount?item.serviceCount:''}}次
</span>
<span v-if="item.type=='104'">￥{{item.oldPrice}}/套</span>
</view>

3
pages/my/indextaociliaoList.vue
View File

@ -214,6 +214,9 @@
</script>
<style scoped>
/deep/.z-tabs-item-title /deep/span{
white-space: nowrap;
}
.fenlei{
display: flex;
flex-direction: row;

2
pages/my/newTeamlDetail.vue
View File

@ -169,7 +169,7 @@
let createTimeStamp = new Date(this.user.createTime).getTime() / 1000;
let timeDiff = currentTimeStamp - createTimeStamp;
let day = Math.floor(timeDiff/(60*60*24));
if(day>7){
if(day>7&&this.mainData.isNewer=='1'){
uni.showToast({
icon:'error',
title:'该团购只限新人！'

2
pages/my/newseckilldetails.vue
View File

@ -193,7 +193,7 @@
let createTimeStamp = new Date(this.user.createTime).getTime() / 1000;
let timeDiff = currentTimeStamp - createTimeStamp;
let day = Math.floor(timeDiff/(60*60*24));
if(day>7){
if(day>7&&this.mainData.isNewer=='1'){
uni.showToast({
icon:'error',
title:'该秒杀只限新人！'

16
pages/therapist/orderDetail.vue
View File

@ -76,7 +76,9 @@
style="width: 45rpx;height: 45rpx;position: relative;top: 4upx;" v-else></image> -->
</view>
<view class="oder-mian-guan">
<view :class="[isFollow?'activeG':'activeQ']" @click="guanzhu(order)">
<view @click="guanzhu(order)" class="shoucang-view">
<image class="shouchang-img" v-if="isFollow" src="../../static/follow2.png"></image>
<image class="shouchang-img" v-else src="../../static/follow.png"></image>
<span class="oder-mian-text">收藏</span>
</view>
</view>
@ -701,6 +703,12 @@
</script>
<style scoped>
.shoucang-view{
display: flex;
flex-direction: row;
align-items: center;
justify-content: center;
}
.guanbi{
width: 30px;
height: 30px;
@ -744,6 +752,9 @@
/deep/.uni-popup__wrapper-box{
width: 100%;
height: 100%;
display: flex;
justify-content: center;
align-items: center;
}
.videoHovers image{
width: 100%;
@ -1010,7 +1021,7 @@
background-size:32rpx 32rpx;
}
.oder-mian-text{
padding-left:50rpx;
/* padding-left:50rpx; */
font-size: 28rpx;
font-weight: bold;
@ -1105,6 +1116,7 @@
height:50rpx;
line-height: 52rpx;
margin-left: 8rpx;
margin-top: 5px;
}
.shouchang-img{
width: 30rpx;

58
pages/therapist/therapist.vue
View File

@ -67,11 +67,12 @@
</view>
</view>
<view class="flex thera-lin thera-bottom">
<view class="flex" >
<view class="flex" v-if="item.consortiaName">
<image class="therapist-bottom-img" src="../../static/dituzhaoren5.png"></image>
<view v-if="item.consortiaName" class="therapist-mian-bottom-text">{{item.consortiaName}}</view>
</view>
<view class="flex align-center" >
<view class="flex align-center" v-if="item.distance">
<image class="therapist-bottom-dingwei" src="../../static/dituzhaoren6.png"></image>
<view class="therapist-bottom-dingwei-text">
{{ item.distance }}
</view>
@ -106,43 +107,32 @@
<view class="zpmore_view_left" v-if="getOrderByCurrentMarkerIndex().isNewer==1" @click.stop="saveImgss(getOrderByCurrentMarkerIndex().isNewer, 0)">
<image src="../../static/dituzhaoren1.png" mode=""></image>
</view>
<image style="width: 30%;" class="touxiang-frame" :src="getOrderByCurrentMarkerIndex().technicianType=='3'?'../../static/vip/grade4.png':getOrderByCurrentMarkerIndex().technicianType=='4'?'../../static/vip/grade5.png':'../../static/vip/grade6.png'"></image>
<image style="margin-top:18px;margin-left: 4px;" class="touxiang-frame" :src="technicianType=='3'?'../../static/vip/grade1-1.gif':technicianType=='4'?'../../static/vip/grade2-1.gif':'../../static/vip/grade3-1.gif'"></image>
<!-- <image style="width: 30%;" class="touxiang-frame" :src="getOrderByCurrentMarkerIndex().technicianType=='3'?'../../static/vip/grade4.png':getOrderByCurrentMarkerIndex().technicianType=='4'?'../../static/vip/grade5.png':'../../static/vip/grade6.png'"></image> -->
<!-- <view class="zpmore_view" v-if="getOrderByCurrentMarkerIndex().lifePhoto"
@click.stop="saveImgss(getOrderByCurrentMarkerIndex().lifePhoto, 0)">更多照片</view> -->
</view>
<view class="margin-left flex flex-direction dituList">
<view class="flex align-center" style="justify-content: start;">
<!-- <view class="flex align-center" style="width: 120rpx;">
<view class="text-bold text-30 margin-right-xs"
style="width: 100rpx;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;text-align: left;">
{{ getOrderByCurrentMarkerIndex().artificerName }}
</view>
</view> -->
<view class="flex align-center list-right-top">
<view class="list-right-top-view">
<view class="list-right-top-name">
{{ getOrderByCurrentMarkerIndex().artificerName }}
</view>
<view class="keyuyue">
<view class="timea-fu flex" style="margin-right: 45px;">
<view>
{{getOrderByCurrentMarkerIndex().state == 1?"可服务":getOrderByCurrentMarkerIndex().state == 2?"今日可约":"休息中"}}
</view>
<view v-if="getOrderByCurrentMarkerIndex().status == 1 && getOrderByCurrentMarkerIndex().time">{{ getOrderByCurrentMarkerIndex().time}}</view>
<view v-if="getOrderByCurrentMarkerIndex().status == 1 && getOrderByCurrentMarkerIndex().time">:{{ getOrderByCurrentMarkerIndex().time}}</view>
</view>
</view>
<!-- <view class="list-right-top-bottom">
{{item.technicianTypeName}}
</view> -->
</view>
</view>
<view class="item-view-jianjie">
{{getOrderByCurrentMarkerIndex().content}}
</view>
<view class="therapist-mian-top">
<!-- <view v-if="getOrderByCurrentMarkerIndex().ordersScore">
<image src="../../static/images/start.png" style="width: 24upx;height: 22upx;">
</image>
<text class="margin-left-xs" style="color: #fe831e;">{{
getOrderByCurrentMarkerIndex().ordersScore }}.0</text>
</view> -->
<view class="therapist-mian-view">
<image src="../../static/dituzhaoren3.png" mode="">
</image>
@ -160,15 +150,26 @@
</view>
</view>
</view>
<view class="therapist-mian-bottom">
<view class="flex thera-lin thera-bottom">
<view class="flex" v-if="getOrderByCurrentMarkerIndex().consortiaName">
<image class="therapist-bottom-img" src="../../static/dituzhaoren5.png"></image>
<view v-if="getOrderByCurrentMarkerIndex().consortiaName" class="therapist-mian-bottom-text">{{getOrderByCurrentMarkerIndex().consortiaName}}</view>
</view>
<view class="flex align-center" v-if="getOrderByCurrentMarkerIndex().distance">
<image class="therapist-bottom-dingwei" src="../../static/dituzhaoren6.png"></image>
<view class="therapist-bottom-dingwei-text">
{{ getOrderByCurrentMarkerIndex().distance }}
</view>
</view>
</view>
<!-- <view class="therapist-mian-bottom">
<view class="flex flex-wrap align-center" v-if="getOrderByCurrentMarkerIndex().consortiaName">
<image class="therapist-bottom-img" src="../../static/dituzhaoren5.png">
</image>
<view class="therapist-mian-bottom-text">{{getOrderByCurrentMarkerIndex().consortiaName}}</view>
</view>
</view>
</view> -->
<view class="text-center make-now" v-if="getOrderByCurrentMarkerIndex().status == 1" @click.stop="goOrder(getOrderByCurrentMarkerIndex())">
立即预约
</view>
@ -436,7 +437,8 @@ import permision from "@/components/permission.js";
methods: {
changeClick(index,item){
this.artificerName='';
this.technicianType=item.id
this.technicianType=item.id;
this.page=1;
this.getlist()
},
getlist() {
@ -1200,7 +1202,9 @@ import permision from "@/components/permission.js";
</script>
<style lang="scss" scoped>
/deep/.u-close--top-right{
margin-top:-8px;
}
.localName{
width: 100px;
margin-left: 4rpx;
@ -1254,7 +1258,7 @@ import permision from "@/components/permission.js";
}
.dituList{
width: 85%;
height: 173px;
height: 165px;
display: flex;
flex-direction: column;
justify-content: space-around;