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

Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_user

This commit is contained in:
kbing1981 2024-08-08 15:08:37 +08:00
parent 1ec059d994 b7f3b90b56
commit e2ddfbcc95
11 changed files with 147 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
my/gird/shoucang.vue
View File

@ -30,50 +30,32 @@
<image class="touxiang-frame" style="width: 100rpx;height: 38rpx;" :src="item.technicianType=='3'?'../../static/vip/grade1.gif':item.technicianType=='4'?'../../static/vip/grade2.gif':'../../static/vip/grade3.gif'"></image> <image class="touxiang-frame" style="width: 100rpx;height: 38rpx;" :src="item.technicianType=='3'?'../../static/vip/grade1.gif':item.technicianType=='4'?'../../static/vip/grade2.gif':'../../static/vip/grade3.gif'"></image>
</view> </view>
<view class="keyuyue"> <view class="keyuyue keyuyue-lan" v-if="item.status == 1">
<view class="flex"> <view class="flex">
<view class="timea-fu">{{item.status == 1?"可服务":"休息中"}}</view> <view class="timea-fu">可服务</view>
<view class="timea-time" v-if="item.status == 1">{{item.time}}</view> <view class="timea-time">{{item.time}}</view>
</view> </view>
</view> </view>
<!-- <view class="keyuyue keyuyue-hui" v-else>
<view class="keyuyue"> <view class="flex">
<view class="[item.state == 1 || item.state == 2?'kfw_view':'byy_view']"> <view class="timea-hui">休息中</view>
{{item.state == 1?'可服务':item.state == 2?'可预约':'休息中'}}
</view> </view>
<view v-if="item.status == 1 && item.time"> </view>
{{item.time}}
</view>
</view>-->
</view> </view>
<view class="therapist-mian-top"> <view class="therapist-mian-top">
<view class="therap-pin"> <view class="therap-pin">
<!--<image style="width: 33rpx; height: 33rpx; margin-right: 3rpx;" src="../../static/dituzhaoren3.png" mode="">
</image>-->
<span>评论</span> <span>评论</span>
<span class="therapist-mian-view-text"> <span class="therapist-mian-view-text">
{{ item.commentCount ? item.commentCount : 0 }} {{ item.commentCount ? item.commentCount : 0 }}
</span> </span>
</view> </view>
<view class="therap-pin"> <view class="therap-pin">
<!--<image style="width: 32rpx; height: 32rpx; margin-right: 3rpx;" src="../../static/dituzhaoren4.png" mode="">
</image>-->
<span>收藏</span> <span>收藏</span>
<span class="therapist-mian-view-text"> <span class="therapist-mian-view-text">
{{ item.collectCount ? item.collectCount : 0 }} {{ item.collectCount ? item.collectCount : 0 }}
</span> </span>
</view> </view>
</view> </view>
<!-- <view style="width: 100%;display: flex;justify-content: start;align-items: center;">
<view class="flex flex-wrap align-center" style="width: 120rpx;">
<image src="../../static/images/shangjia.png" style="width: 24rpx;height: 24rpx;"></image>
<view style="margin-left: 10rpx;color: #999;font-size: 26rpx;">商家</view>
</view>
<view class="flex" style="font-size: 24rpx;color: #f49650;font-weight: bold;" v-if="item.tripWay == 3">
免出行费
</view>
</view> -->
<view class="list-right-top-bottom"> <view class="list-right-top-bottom">
正规绿色服务!擅长精油SPA、中式推拿，有按摩师证，手法专业，期待正规绿色服务!擅长精油SPA、中式推拿正规绿色服务!擅长精油SPA、中式推拿 正规绿色服务!擅长精油SPA、中式推拿，有按摩师证，手法专业，期待正规绿色服务!擅长精油SPA、中式推拿正规绿色服务!擅长精油SPA、中式推拿
</view> </view>
@ -255,7 +237,47 @@
} }
</script> </script>
<style lang="scss"> <style lang="scss" scoped>
.keyuyue{
padding: 0rpx 10rpx;
height: 44rpx;
display: flex;
flex-direction: row;
align-items: center;
border-radius: 30rpx 20rpx 20rpx 30rpx ;
font-size: 24rpx;
}
.keyuyue-lan{
background: #eefdf8;
}
.keyuyue-hui{
background: #d9d9d9;
}
.timea-fu{
color: #2dbe93;
font-size: 24rpx;
line-height: 44rpx;
margin-left: 8rpx;
margin-right: 5rpx;
}
.timea-hui{
color: #ffffff;
font-size: 24rpx;
line-height: 44rpx;
margin-left: 8rpx;
margin-right: 5rpx;
}
.therapist-mian-bottom-text{
font-weight: bold;
font-size: 26rpx;
color: #222222;
white-space: pre-wrap;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 1;
overflow: hidden;
width: 60px;
}
.therap-pin{ .therap-pin{
font-size: 24rpx; font-size: 24rpx;
display: flex; display: flex;
@ -274,17 +296,7 @@
display: flex; display: flex;
flex-direction:row; flex-direction:row;
} }
.keyuyue{
padding: 0rpx 10rpx;
height: 44rpx;
display: flex;
flex-direction: row;
align-items: center;
background: #eefdf8;
border-radius: 30rpx 20rpx 20rpx 30rpx ;
color:#8d500f;
font-size: 24rpx;
}
.timea-img{ .timea-img{
background:#2dbe93 url('../../static/timea.png') 2rpx 1rpx; background:#2dbe93 url('../../static/timea.png') 2rpx 1rpx;
background-size: 28rpx 28rpx; background-size: 28rpx 28rpx;
@ -294,13 +306,7 @@
border-radius:8rpx; border-radius:8rpx;
margin-top: 8rpx; margin-top: 8rpx;
} }
.timea-fu{
font-size: 24rpx;
color: #2dbe93;
line-height: 44rpx;
margin-left: 8rpx;
margin-right: 5rpx;
}
.timea-time{ .timea-time{
font-size: 25rpx; font-size: 25rpx;
color: #2dbe93; color: #2dbe93;
@ -358,11 +364,7 @@
height: 30rpx; height: 30rpx;
margin-right:3px; margin-right:3px;
} }
.therapist-mian-bottom-text{
font-weight: bold;
font-size: 26rpx;
color: #222222;
}
.therapist-mian-bottom{ .therapist-mian-bottom{
width: 100%; width: 100%;
display: flex; display: flex;

17
my/order/payModifyCi.vue
View File

@ -15,7 +15,7 @@
</view> </view>
</view> </view>
<view class="flex align-center"> <view class="flex align-center">
<view style="width: 100%;"> <view class="jiage">
<view class="flex justify-between"> <view class="flex justify-between">
<view class="money-pay-zhen"> <view class="money-pay-zhen">
<text class="title-font">次卡价格：</text> <text class="title-font">次卡价格：</text>
@ -1255,6 +1255,13 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.jiage{
width: 100%;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
}
.header-bottom-money-jia{ .header-bottom-money-jia{
font-size: 28rpx; font-size: 28rpx;
color: #848484; color: #848484;
@ -1299,7 +1306,6 @@
margin-left: 5px; margin-left: 5px;
} }
.money-pay{ .money-pay{
width: 100%;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
@ -1863,12 +1869,7 @@
align-items: flex-end; align-items: flex-end;
margin-top:4rpx; margin-top:4rpx;
} }
.money-pay{
width: 100%;
display: flex;
flex-direction: row;
align-items: center;
}
.content{ .content{
padding-top: 1px; padding-top: 1px;

17
my/order/payModifyLiao.vue
View File

@ -15,7 +15,7 @@
</view> </view>
</view> </view>
<view class="flex align-center"> <view class="flex align-center">
<view style="width: 100%;"> <view class="jiage">
<view class="flex justify-between"> <view class="flex justify-between">
<view class="money-pay-zhen"> <view class="money-pay-zhen">
<text class="title-font">疗程价格：</text> <text class="title-font">疗程价格：</text>
@ -1253,6 +1253,13 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.jiage{
width: 100%;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
}
.detail-foot-taititle{ .detail-foot-taititle{
font-weight: bold; font-weight: bold;
font-size: 30rpx; font-size: 30rpx;
@ -1305,7 +1312,6 @@
margin-left: 5px; margin-left: 5px;
} }
.money-pay{ .money-pay{
width: 100%;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
@ -1883,13 +1889,6 @@
align-items: flex-end; align-items: flex-end;
margin-top:4rpx; margin-top:4rpx;
} }
.money-pay{
width: 100%;
display: flex;
flex-direction: row;
align-items: center;
}
.content{ .content{
padding-top: 1px; padding-top: 1px;
width: 100%; width: 100%;

17
my/order/payModifyMs.vue
View File

@ -15,7 +15,7 @@
</view> </view>
</view> </view>
<view class="flex align-center"> <view class="flex align-center">
<view style="width: 100%;"> <view class="jiage">
<view class="flex justify-between"> <view class="flex justify-between">
<view class="money-pay-zhen"> <view class="money-pay-zhen">
<text class="title-font">秒杀价格：</text> <text class="title-font">秒杀价格：</text>
@ -1314,6 +1314,13 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.jiage{
width: 100%;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
}
.ske-padding{ .ske-padding{
padding: 5rpx 30rpx 36rpx 30rpx; padding: 5rpx 30rpx 36rpx 30rpx;
@ -1355,7 +1362,6 @@
margin-left: 5px; margin-left: 5px;
} }
.money-pay{ .money-pay{
width: 100%;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
@ -1925,12 +1931,7 @@
align-items: flex-end; align-items: flex-end;
margin-top:4rpx; margin-top:4rpx;
} }
.money-pay{
width: 100%;
display: flex;
flex-direction: row;
align-items: center;
}
.content{ .content{
padding-top: 1px; padding-top: 1px;

17
my/order/payModifyPt.vue
View File

@ -16,7 +16,7 @@
</view> </view>
<view class="flex align-center"> <view class="flex align-center">
<view style="width: 100%;"> <view class="jiage">
<view class="flex justify-between"> <view class="flex justify-between">
<view class="money-pay-zhen"> <view class="money-pay-zhen">
<text class="title-font">拼团价格：</text> <text class="title-font">拼团价格：</text>
@ -263,6 +263,13 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.jiage{
width: 100%;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
}
.ske-padding{ .ske-padding{
padding: 5rpx 30rpx 36rpx 30rpx; padding: 5rpx 30rpx 36rpx 30rpx;
@ -304,7 +311,6 @@
margin-left: 5px; margin-left: 5px;
} }
.money-pay{ .money-pay{
width: 100%;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
@ -877,12 +883,7 @@
align-items: flex-end; align-items: flex-end;
margin-top:4rpx; margin-top:4rpx;
} }
.money-pay{
width: 100%;
display: flex;
flex-direction: row;
align-items: center;
}
.content{ .content{
padding-top: 1px; padding-top: 1px;

18
my/order/payModifyQy.vue
View File

@ -15,13 +15,12 @@
</view> </view>
</view> </view>
<view class="flex align-center"> <view class="flex align-center">
<view style="width: 100%;"> <view class="jiage">
<view class="flex justify-between"> <view class="flex justify-between">
<view class="money-pay-zhen"> <view class="money-pay-zhen">
<text class="title-font">项目价格：</text> <text class="title-font">项目价格：</text>
<span class="money-pay-zhen-a1">￥</span> <span class="money-pay-zhen-a1">￥</span>
<span class="money-pay-zhen-a2">{{detailData[0].packagePrice}}</span> <span class="money-pay-zhen-a2">{{detailData[0].packagePrice}}</span>
<span class="money-pay-zhen-a1">/{{orderXm.serviceCount}}次</span>
</view> </view>
</view> </view>
<view class="money-pay justify-between"> <view class="money-pay justify-between">
@ -1258,6 +1257,13 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.jiage{
width: 100%;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
}
.header-bottom-money-jia{ .header-bottom-money-jia{
font-size: 28rpx; font-size: 28rpx;
color: #848484; color: #848484;
@ -1302,7 +1308,6 @@
margin-left: 5px; margin-left: 5px;
} }
.money-pay{ .money-pay{
width: 100%;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
@ -1866,13 +1871,6 @@
align-items: flex-end; align-items: flex-end;
margin-top:4rpx; margin-top:4rpx;
} }
.money-pay{
width: 100%;
display: flex;
flex-direction: row;
align-items: center;
}
.content{ .content{
padding-top: 1px; padding-top: 1px;
width: 100%; width: 100%;

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" style="width: 100%;justify-content: space-between;">
<view class="money-pay-zhen" v-if="order.ordersPackageList[0].type =='114'"> <view class="money-pay-zhen" v-if="order.ordersPackageList[0].type =='114'">
<span>￥</span> <span>￥</span>
<span>{{order.ordersPackageList[0].packagePrice}}/{{order.ordersPackageList[0].num}}次</span> <span>{{order.ordersPackageList[0].packagePrice}}</span>
</view> </view>
<view class="money-pay-zhen" v-else> <view class="money-pay-zhen" v-else>
<span>￥</span> <span>￥</span>

6
pages/shop/index.vue
View File

@ -36,11 +36,9 @@
<view class="item-view-bottom-qian"> <view class="item-view-bottom-qian">
<span></span> <span></span>
<span>￥{{item.price}}</span> <span>￥{{item.price}}</span>
<span>/ <text v-if="item.type!='104'">{{item.serviceCount}}</text>
{{typeData=='104'?'套':typeData=='105'?'次':'次'}}</span>
<span></span> <span></span>
<span>￥{{item.oldPrice}}<text <span>￥{{item.oldPrice}}</span>
v-if="item.type!='104'">/{{item.serviceCount}}</text>{{typeData=='104'?'套':typeData=='105'?'次':'次'}}</span>
</view> </view>
<view class="flex" style="margin-top: 10rpx;"> <view class="flex" style="margin-top: 10rpx;">
<view class="shop_label" v-if="item.tagsData!=''"> <view class="shop_label" v-if="item.tagsData!=''">

14
pages/shop/qiyeDatail.vue
View File

@ -10,9 +10,9 @@
<view class="header-bottom-title"> <view class="header-bottom-title">
<view class="header-bottom-title-text"> <view class="header-bottom-title-text">
<span>{{mainData.title}}</span> <span>{{mainData.title}}</span>
<span class="header-bottom-title-liao"> <!-- <span class="header-bottom-title-liao">
次卡 项目
</span> </span> -->
</view> </view>
<view class="header-bottom-title-num"> <view class="header-bottom-title-num">
<span>{{mainData.sales}}</span> <span>{{mainData.sales}}</span>
@ -25,17 +25,11 @@
<view class="header-bottom-money-zhen"> <view class="header-bottom-money-zhen">
<span></span> <span></span>
<span>￥{{mainData.price}}</span> <span>￥{{mainData.price}}</span>
<span v-if="dataList.name=='index'">/{{serviceCount}}次</span>
<span v-else>/{{mainData.serviceCount}}次</span>
</view> </view>
<view v-if="dataList.name=='index'" class="header-bottom-money-jia" style="text-decoration: line-through;"> <view v-if="dataList.name=='index'" class="header-bottom-money-jia" style="text-decoration: line-through;">
￥{{mainData.oldPrice}}/{{serviceCount}}次 ￥{{mainData.oldPrice}}
</view>
<view v-else class="header-bottom-money-jia" style="text-decoration: line-through;">
￥{{mainData.oldPrice}}/{{mainData.serviceCount}}次
</view> </view>
</view> </view>
<!-- <view class="xiaoer item-view-biao">{{mainData.levelName}}</view> -->
</view> </view>
</view> </view>
<view class="header-bottom-foot"> <view class="header-bottom-foot">

27
pages/shop/qiyeListMy.vue
View File

@ -52,10 +52,8 @@
<span class="xiaoer item-view-biao">{{item.levelName}}</span> <span class="xiaoer item-view-biao">{{item.levelName}}</span>
</view> </view>
<view class="item-view-bottom-qian"> <view class="item-view-bottom-qian">
<span></span>
<span>￥{{item.price}}</span> <span>￥{{item.price}}</span>
<span>/{{item.serviceCount}}次</span> <span>￥{{item.oldPrice}}</span>
<span>￥{{item.oldPrice}}/{{item.serviceCount}}次</span>
</view> </view>
<view class="flex" style="margin-top: 10rpx;"> <view class="flex" style="margin-top: 10rpx;">
<view class="shop_label" v-if="item.tagsData!=''"> <view class="shop_label" v-if="item.tagsData!=''">
@ -202,33 +200,16 @@
color: #FFFFFF; color: #FFFFFF;
} }
.item-view-bottom-qian span:nth-child(5) { .item-view-bottom-qian span:nth-child(2) {
font-size: 28rpx; font-size: 12px;
color: #848484;
text-decoration-line: line-through;
}
.item-view-bottom-qian span:nth-child(4) {
font-size: 26rpx;
color: #848484; color: #848484;
text-decoration-line: line-through; text-decoration-line: line-through;
margin-left: 5px; margin-left: 5px;
} }
.item-view-bottom-qian span:nth-child(3) {
font-size: 28rpx;
color: #FF6000;
}
.item-view-bottom-qian span:nth-child(2) {
font-weight: bold;
font-size: 36.81rpx;
color: #FF6000;
}
.item-view-bottom-qian span:nth-child(1) { .item-view-bottom-qian span:nth-child(1) {
font-weight: 400; font-weight: 400;
font-size: 26rpx; font-size: 17px;
color: #FF6000; color: #FF6000;
} }

49
pages/therapist/therapist.vue
View File

@ -24,7 +24,7 @@
<view class="liebiao" v-show="current === 0"> <view class="liebiao" v-show="current === 0">
<view v-if="orderList.length" class="flex text-center flex-wrap list-view"> <view v-if="orderList.length" class="flex text-center flex-wrap list-view">
<view class="margin-bottom-sm radius touxiang-left"> <view class="margin-bottom-sm radius touxiang-left">
<view class="flex align-center touxiang-left-view" v-if="item.status=='1'" v-for="(item, index) in orderList" :key='index' @click="goOrder(item)"> <view class="flex align-center touxiang-left-view" v-for="(item, index) in orderList" :key='index' @click="goOrder(item)">
<view class="touxiang-left-content"> <view class="touxiang-left-content">
<image style="border: 2px solid #e2e2e2;" class="touxiang-left-content-img" :src="item.artificerImg ? item.artificerImg : '../../static/logo.png'" @click.stop="saveImgs(item.artificerImg)" mode="aspectFill"></image> <image style="border: 2px solid #e2e2e2;" class="touxiang-left-content-img" :src="item.artificerImg ? item.artificerImg : '../../static/logo.png'" @click.stop="saveImgs(item.artificerImg)" mode="aspectFill"></image>
<image class="touxiang-left-content-img" v-if="item.isHot == 1" src="https://admin.sjajk.com/file/uploadPath/2023/02/16/9ae1b7e9fa931b5fc24cd8edecc10d9f.png"></image> <image class="touxiang-left-content-img" v-if="item.isHot == 1" src="https://admin.sjajk.com/file/uploadPath/2023/02/16/9ae1b7e9fa931b5fc24cd8edecc10d9f.png"></image>
@ -37,12 +37,17 @@
<view class="list-right-top-name"> <view class="list-right-top-name">
{{ item.artificerName }} {{ item.artificerName }}
</view> </view>
<view class="keyuyue"> <view class="keyuyue keyuyue-lan" v-if="item.status == 1">
<view class="flex"> <view class="flex">
<view class="timea-fu">{{item.status == 1?"可服务":"休息中"}}</view> <view class="timea-fu">可服务</view>
<view class="timea-time" v-if="item.status == 1">{{item.time}}</view> <view class="timea-time">{{item.time}}</view>
</view> </view>
</view> </view>
<view class="keyuyue keyuyue-hui" v-else>
<view class="flex">
<view class="timea-hui">休息中</view>
</view>
</view>
</view> </view>
</view> </view>
@ -120,15 +125,27 @@
<view class="list-right-top-name"> <view class="list-right-top-name">
{{ getOrderByCurrentMarkerIndex().artificerName }} {{ getOrderByCurrentMarkerIndex().artificerName }}
</view> </view>
<view class="timea-fu flex" style="margin-right: 45px;"> <!-- <view class="timea-fu flex" style="margin-right: 45px;">
<view> <view>
{{getOrderByCurrentMarkerIndex().state == 1?"可服务":getOrderByCurrentMarkerIndex().state == 2?"今日可约":"休息中"}} {{getOrderByCurrentMarkerIndex().state == 1?"可服务":getOrderByCurrentMarkerIndex().state == 2?"今日可约":"休息中"}}
</view> </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 class="keyuyue keyuyue-lan" v-if="getOrderByCurrentMarkerIndex().status == 1">
<view class="flex">
<view class="timea-fu">可服务</view>
<view class="timea-time">{{getOrderByCurrentMarkerIndex().time}}</view>
</view>
</view>
<view class="keyuyue keyuyue-hui" v-else>
<view class="flex">
<view class="timea-hui">休息中</view>
</view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<view class="item-view-jianjie"> <view class="item-view-jianjie">
{{getOrderByCurrentMarkerIndex().content}} {{getOrderByCurrentMarkerIndex().content}}
</view> </view>
@ -1371,11 +1388,29 @@ import permision from "@/components/permission.js";
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
background: #eefdf8;
border-radius: 30rpx 20rpx 20rpx 30rpx ; border-radius: 30rpx 20rpx 20rpx 30rpx ;
color:#8d500f;
font-size: 24rpx; font-size: 24rpx;
} }
.keyuyue-lan{
background: #eefdf8;
}
.keyuyue-hui{
background: #d9d9d9;
}
.timea-fu{
color: #2dbe93;
font-size: 24rpx;
line-height: 44rpx;
margin-left: 8rpx;
margin-right: 5rpx;
}
.timea-hui{
color: #ffffff;
font-size: 24rpx;
line-height: 44rpx;
margin-left: 8rpx;
margin-right: 5rpx;
}
.timea-img{ .timea-img{
background:#2dbe93 url('../../static/timea.png') 2rpx 1rpx; background:#2dbe93 url('../../static/timea.png') 2rpx 1rpx;
background-size: 28rpx 28rpx; background-size: 28rpx 28rpx;