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:
Mr.jiang 2024-07-04 19:13:37 +08:00
parent 4c3abc3612 3e859e9749
commit cb7342a2db
7 changed files with 180 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
my/gird/shoucang.vue
View File

@ -343,8 +343,11 @@
border-bottom-left-radius: 10rpx; border-bottom-left-radius: 10rpx;
} }
.byy_view { .byy_view {
color: #000000; color: #666;
background-color: #ebebeb; background-color: #ebebeb;
border-radius: 20rpx;
font-size: 24rpx;
padding: 3rpx 20rpx;
} }
.kfw_view { .kfw_view {

11
my/order/pay.vue
View File

@ -313,8 +313,7 @@
<view class="showBtn-view" v-if="gengBtnShow==true" :style="gengNum==index?{display:'inline-block'}:{display:'none'}"> <view class="showBtn-view" v-if="gengBtnShow==true" :style="gengNum==index?{display:'inline-block'}:{display:'none'}">
<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat" <u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
class="dingshi">联系客服</u-button> class="dingshi">联系客服</u-button>
<u-button @click="cancelOrder(order)" shape="circle" class="btns" :hair-line="false" <u-button @click="cancelOrder(order)" shape="circle" class="btns" :hair-line="false">
>
取消订单 取消订单
</u-button> </u-button>
<u-button <u-button
@ -365,7 +364,7 @@
class="dingshi">联系客服</u-button> class="dingshi">联系客服</u-button>
</view> </view>
<view class="showBtn" v-if="order.status ==9"> <view class="showBtn" v-if="order.status ==9">
<u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle2" :hair-line="false" <u-button class="dingshi" @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false"
> >
取消订单 取消订单
</u-button> </u-button>
@ -556,8 +555,8 @@
orderList: [], orderList: [],
loading: true, loading: true,
customStyle: { customStyle: {
// backgroundColor: '#e5e5e5', backgroundColor: '#e5e5e5',
// color: '#FFFFFF', color: '#FFFFFF',
// #ifdef MP-WEIXIN // #ifdef MP-WEIXIN
width: "310upx", width: "310upx",
@ -570,7 +569,7 @@
}, },
customStyle2: { customStyle2: {
backgroundColor: '', backgroundColor: '',
color: '#FFFFFF', color: '#fff',
// #ifdef MP-WEIXIN // #ifdef MP-WEIXIN
width: "310upx", width: "310upx",
// #endif // #endif

2
pages/my/cika.vue
View File

@ -64,7 +64,7 @@
</view> </view>
<view class="item-view-bottom"> <view class="item-view-bottom">
<view class="item-view-xiangmu"> <view class="item-view-xiangmu">
<span>已售</span><span>已售{{item.sales}}w+ <!-- | 好评{{item.esteemRate}}% --></span> <span>已售</span><span>{{item.sales}}w+ <!-- | 好评{{item.esteemRate}}% --></span>
</view> </view>
<view class="item-view-bottom-btn"> <view class="item-view-bottom-btn">
查看 查看

33
pages/my/fuwuxiangm.vue
View File

@ -25,11 +25,12 @@
<image :src="item.massageImg" mode=""></image> <image :src="item.massageImg" mode=""></image>
</view> </view>
<view class="item-view"> <view class="item-view">
<view class="item-view-title"> <view class="view-cata">
{{item.title}} <span class="item-view-title">{{item.title}}</span>
<span class="xiaoer item-view-biao">{{item.classifyName}}</span>
</view> </view>
<view class="item-view-xiangmu"> <view class="item-view-xiangmu">
<span class="xiaoer item-view-biao">{{item.classifyName}}</span>
<view class="item-view-bottom-qian"> <view class="item-view-bottom-qian">
<span>￥</span> <span>￥</span>
<span style="color: #F95900;">{{item.price}}</span> <span style="color: #F95900;">{{item.price}}</span>
@ -40,8 +41,11 @@
<view class="item-view-jianjie"> <view class="item-view-jianjie">
{{item.jianjie}} {{item.jianjie}}
</view> </view>
<view class="item-view-bottom"> <view class="item-view-bottom">
<span>已售{{item.sales}}w+ <!-- | 好评{{item.esteemRate}}% --></span> <view class="item-view-xiangmu" style="align-items: flex-end; ">
<span style="font-size: 26rpx; color: #999; margin-right: 8rpx;">已售</span><span style="font-size: 26rpx; color: #333;">{{item.sales}}w+ <!-- | 好评{{item.esteemRate}}% --></span>
</view>
<view class="item-view-bottom-btn"> <view class="item-view-bottom-btn">
查看 查看
</view> </view>
@ -216,7 +220,7 @@
} }
.item-view-bottom-qian span:nth-child(3){ .item-view-bottom-qian span:nth-child(3){
font-weight: 400; font-weight: 400;
font-size: 20rpx; font-size: 26rpx;
color: #F95900; color: #F95900;
} }
.item-view-bottom{ .item-view-bottom{
@ -238,18 +242,19 @@
text-overflow: ellipsis; text-overflow: ellipsis;
} }
.item-view-biao{ .item-view-biao{
padding: 1px 2px; border-radius: 15rpx 3rpx 15rpx 3rpx;
border-radius: 6rpx;
} }
.tuina{ .tuina{
background-color:#d1f2df; background-color:#d1f2df;
color: #17984d; color: #17984d;
} }
.xiaoer{ .xiaoer{
padding: 2px 8px; width: 120rpx;
height: 35rpx;
line-height: 35rpx;
text-align: center;
background-color:#f1f8d7; background-color:#f1f8d7;
color: #58b314; color: #58b314;
border-radius: 3px;
font-size: 20rpx; font-size: 20rpx;
} }
.taishi{ .taishi{
@ -273,9 +278,13 @@
margin-top: 5px; margin-top: 5px;
} }
.item-view-title{ .item-view-title{
width: 76%;
font-weight: bold; font-weight: bold;
font-size: 32rpx; font-size: 32rpx;
color: #333333; color: #333333;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
} }
.item-view{ .item-view{
width: 55%; width: 55%;
@ -432,5 +441,9 @@
justify-content: space-between; justify-content: space-between;
background-color: #fff; background-color: #fff;
} }
.view-cata{
display: flex;
flex-direction: row;
align-items: center;
}
</style> </style>

21
pages/my/indextaociliaoList.vue
View File

@ -72,7 +72,6 @@
titleNmae:'', titleNmae:'',
classifyId:'', classifyId:'',
getName:'', getName:'',
scrollTop: false,
} }
}, },
onLoad(e){ onLoad(e){
@ -85,17 +84,6 @@
this.page = 1; this.page = 1;
this.getData() this.getData()
}, },
onPageScroll: function(e) {
this.scrollTop = e.scrollTop > 200;
},
onReachBottom: function() {
this.page = this.page + 1;
this.getData('');
},
onPullDownRefresh: function() {
this.page = 1;
this.getData('Refresh');
},
methods: { methods: {
// 加载更多 // 加载更多
loadMore: async function() { loadMore: async function() {
@ -174,15 +162,14 @@
background-color: #f7f7f7; background-color: #f7f7f7;
} }
/deep/.refresh-body{ /deep/.refresh-body{
border-top: 2px solid #f7f7f7; height: 100% !important;
margin-top: 50px; border-top: 2px solid #f7f7f7;
height: 800px !important; margin: 50px 0px;
overflow: scroll;
} }
.content-view{ .content-view{
width: 100%; width: 100%;
height: 100vh; height: 100vh;
overflow: scroll; overflow: auto;
background-color: #f7f7f7; background-color: #f7f7f7;
position: relative; position: relative;
} }

122
pages/order/index.vue
View File

@ -19,16 +19,16 @@
</image> </image>
<view class="margin-left-xs ">{{item.artificerName}}</view> <view class="margin-left-xs ">{{item.artificerName}}</view>
</view> </view>
<view class="text-green" v-if="item.status ==1"><span>{{item.ordersNo}}</span><span>待支付</span></view> <view v-if="item.status ==1"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-a">待支付</span></view>
<view class="text-green" v-if="item.status ==2"><span>{{item.ordersNo}}</span><span>待服务</span></view> <view v-if="item.status ==2"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-b">待服务</span></view>
<view class="text-green" v-if="item.status ==3"><span>{{item.ordersNo}}</span><span>待评价</span></view> <view v-if="item.status ==3"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-c">待评价</span></view>
<view class="text-green" v-if="item.status ==4"><span>{{item.ordersNo}}</span><span>已取消</span></view> <view v-if="item.status ==4"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-d">已取消</span></view>
<view class="text-green" v-if="item.status ==5"><span>{{item.ordersNo}}</span><span>已完成</span></view> <view v-if="item.status ==5"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-e">已完成</span></view>
<view class="text-green" v-if="item.status ==6"><span>{{item.ordersNo}}</span><span>服务中</span></view> <view v-if="item.status ==6"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-f">服务中</span></view>
<view class="text-green" v-if="item.status ==7"><span>{{item.ordersNo}}</span><span>技师出发</span></view> <view v-if="item.status ==7"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-h">技师出发</span></view>
<view class="text-green" v-if="item.status ==8"><span>{{item.ordersNo}}</span><span>技师到达</span></view> <view v-if="item.status ==8"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-i">技师到达</span></view>
<view class="text-green" v-if="item.status ==9"><span>{{item.ordersNo}}</span><span>待确认</span></view> <view v-if="item.status ==9"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-g">待确认</span></view>
<view class="text-green" v-if="item.status ==10"><span>{{item.ordersNo}}</span><span>待补单</span></view> <view v-if="item.status ==10"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-h">待补单</span></view>
<!-- <view class="u-tips-color">{{item.createTime}}</view> --> <!-- <view class="u-tips-color">{{item.createTime}}</view> -->
</view> </view>
@ -48,10 +48,10 @@
{{item.ordersMassageList[0].massageType?item.ordersMassageList[0].massageType.title:item.ordersMassageList[0].userPackageDetail.title}} {{item.ordersMassageList[0].massageType?item.ordersMassageList[0].massageType.title:item.ordersMassageList[0].userPackageDetail.title}}
</view> </view>
</view> </view>
<view class="u-font-12 u-tips-color flex justify-between" style="margin-top: 6rpx;"> <view class="u-font-13 u-tips-color flex justify-between" style="margin-top: 6rpx;">
预约时间：{{item.serveTime}} 预约时间：{{item.serveTime}}
</view> </view>
<view class="flex-sub u-font-12 margin-top-xs" style="color: #999999;"> <view class="flex-sub u-font-13 margin-top-xs" style="color: #999999;">
实付：<text class="text-df" style="color: #FF1200;">￥</text><text class="text-xl text-bold" style="color: #FF1200;">{{item.payMoneyTotal}}</text> 实付：<text class="text-df" style="color: #FF1200;">￥</text><text class="text-xl text-bold" style="color: #FF1200;">{{item.payMoneyTotal}}</text>
</view> </view>
</view> </view>
@ -127,21 +127,24 @@
<view class="gengduo" @click.stop="gengBtn(index)" v-show="item.status ==6||item.status ==1"> <view class="gengduo" @click.stop="gengBtn(index)" v-show="item.status ==6||item.status ==1">
更多 更多
</view> </view>
<u-button <view class="gengduoShow">
v-if="item.addNum==null&&item.oldOrdersId==null" <u-button
:custom-style="customStyle" shape="circle" :plain="true" v-if="item.addNum==null&&item.oldOrdersId==null"
class="btns xianshi" :custom-style="customStyle" shape="circle" :plain="true"
@click="cancelOrder(item)"> class="btns xianshi"
取消订单 @click="cancelOrder(item)">
</u-button> 取消订单
<u-button :custom-style="customStyle1" class="btns" shape="circle" :plain="true" </u-button>
@click="goNav('/my/wallet/index?artificerId='+item.artificerId+'&ordersId='+item.ordersId,item)"> <u-button :custom-style="customStyle1" class="btns" shape="circle" :plain="true"
充值 @click="goNav('/my/wallet/index?artificerId='+item.artificerId+'&ordersId='+item.ordersId,item)">
</u-button> 充值
<u-button v-if="item.addNum ==null" :custom-style="customStyle1" class="btns" shape="circle" :plain="true" </u-button>
@click="goNav('/my/order/pay?ordersId='+item.ordersId,item)"> <u-button v-if="item.addNum ==null" :custom-style="customStyle1" class="btns" shape="circle" :plain="true"
加钟 @click="goNav('/my/order/pay?ordersId='+item.ordersId,item)">
</u-button> 加钟
</u-button>
</view>
<view class="showBtn-view" v-if="gengBtnShow==true" :style="gengNum==index?{display:'inline-block'}:{display:'none'}"> <view class="showBtn-view" v-if="gengBtnShow==true" :style="gengNum==index?{display:'inline-block'}:{display:'none'}">
<view @click="goNav('/my/order/pay?ordersId='+item.ordersId)" class="gengduoBtn"> <view @click="goNav('/my/order/pay?ordersId='+item.ordersId)" class="gengduoBtn">
@ -804,6 +807,11 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.gengduoShow{
display: flex;
flex-direction: row;
align-items: center;
}
.gengduoBtn{ .gengduoBtn{
background: #fff; background: #fff;
color: #019C88; color: #019C88;
@ -827,7 +835,7 @@
margin-top: 5px !important; margin-top: 5px !important;
} }
/deep/.justify-between{ /deep/.justify-between{
height: 60rpx; height: 54rpx;
} }
.gengduo{ .gengduo{
font-weight: 400; font-weight: 400;
@ -849,8 +857,10 @@
bottom: 0; bottom: 0;
background-color: #fff; background-color: #fff;
padding: 10px; padding: 10px;
margin-bottom: 50px; margin-bottom: 48px;
margin-left: 10px; margin-left: 7px;
box-shadow: 1px 1px 3px 1px #f5f5f5;
border-radius:20rpx 20rpx 20rpx 1rpx;
} }
.showBtn{ .showBtn{
} }
@ -1035,4 +1045,56 @@
.bg { .bg {
background-color: #FFFFFF; background-color: #FFFFFF;
} }
.margin-left-xs{
font-size: 31rpx;
font-weight: bold;
}
.status-button{
font-weight: bold;
color: #019c88;
font-size: 31rpx;
}
.status-button-a{
font-weight: bold;
color: #ff932a;
}
.status-button-b{
font-weight: bold;
color: #7446fc;
}
.status-button-d{
font-weight: bold;
color: #888888;
}
.status-button-e{
font-weight: bold;
color: #999999;
}
.status-button-f{
font-weight: bold;
color: #019c88;
}
.status-button-g{
font-weight: bold;
color: #e04f3c;
}
.status-button-h{
font-weight: bold;
color: #965fb9;
}
.status-button-i{
font-weight: bold;
color: #002ea4;
}
.status-button-g{
font-weight: bold;
color: #43b943;
}
.status-button-h{
font-weight: bold;
color: #1bcada;
}
.status-num{
margin-right: 15rpx;
}
</style> </style>

81
pages/therapist/therapistDingdan.vue
View File

@ -58,39 +58,38 @@
</view> </view>
<view class="therapist-mian"> <view class="therapist-mian">
<view class="therapist-mian-top"> <view class="therapist-mian-top">
<view class="therapist-mian-view"> <view class="therap-pin">
<image src="../../static/dituzhaoren3.png" mode=""> <!--<image src="../../static/dituzhaoren3.png" mode="">
</image> </image>-->
<span>评论</span> <span>评论</span>
<view class="therapist-mian-view-text"> <span class="therapist-mian-view-text">
{{ item.commentCount ? item.commentCount : 0 }} {{ item.commentCount ? item.commentCount : 0 }}
</view> </span>
</view> </view>
<view class="therapist-mian-view" style="margin-left: 10px;"> <view class="therap-pin" >
<image src="../../static/dituzhaoren4.png" mode=""> <!--<image src="../../static/dituzhaoren4.png" mode="">
</image> </image>-->
<span>收藏</span> <span>收藏</span>
<view class="therapist-mian-view-text"> <span class="therapist-mian-view-text">
{{ item.collectCount ? item.collectCount : 0 }} {{ item.collectCount ? item.collectCount : 0 }}
</view> </span>
</view> </view>
</view> </view>
<view class="therapist-mian-bottom"> <view class="therapist-mian-bottom">
<view class="flex flex-wrap align-center" v-if="item.consortiaName"> <view class="flex flex-wrap align-center" >
<image class="therapist-bottom-img" src="../../static/dituzhaoren5.png"> <image class="therapist-bottom-img" src="../../static/dituzhaoren5.png">
</image> </image>
<view class="therapist-mian-bottom-text">{{item.consortiaName}}</view> <view v-if="item.consortiaName" class="therapist-mian-bottom-text">{{item.consortiaName}}</view>
</view>
<view>
<view class="terap-button" v-if="item.status == 1" @click.stop="goOrder(item)">
立即预约
</view>
<view class="text-center text-sm" @click.stop="showTips()" v-else
style="background: #d9d9d9;color: #ffffff;width: 100%;border-radius: 30upx;height: 60upx;line-height: 60upx;margin-top: 10rpx;">
立即预约
</view>
</view> </view>
</view>
<view class="text-center text-sm" v-if="item.status == 1"
style="background: linear-gradient(90deg, #019C88, #0FA78B, #35C495);color: #ffffff;width: 100%;border-radius: 30upx;height: 60upx;line-height: 60upx;margin-top: 10rpx;"
@click.stop="goOrder(item)">
立即预约
</view>
<view class="text-center text-sm" @click.stop="showTips()" v-else
style="background: #d9d9d9;color: #ffffff;width: 100%;border-radius: 30upx;height: 60upx;line-height: 60upx;margin-top: 10rpx;">
立即预约
</view> </view>
</view> </view>
@ -163,17 +162,17 @@
getOrderByCurrentMarkerIndex().ordersScore }}.0</text> getOrderByCurrentMarkerIndex().ordersScore }}.0</text>
</view> --> </view> -->
<view class="therapist-mian-view"> <view class="therap-pin">
<image src="../../static/dituzhaoren3.png" mode=""> <!--<image src="../../static/dituzhaoren3.png" mode="">
</image> </image>-->
<span>评论</span> <span>评论</span>
<view class="therapist-mian-view-text"> <view class="therapist-mian-view-text">
{{ getOrderByCurrentMarkerIndex().commentCount ? getOrderByCurrentMarkerIndex().commentCount : 0 }} {{ getOrderByCurrentMarkerIndex().commentCount ? getOrderByCurrentMarkerIndex().commentCount : 0 }}
</view> </view>
</view> </view>
<view class="therapist-mian-view" style="margin-left: 10px;"> <view class="therap-pin" >
<image src="../../static/dituzhaoren4.png" mode=""> <!--<image src="../../static/dituzhaoren4.png" mode="">
</image> </image>-->
<span>收藏</span> <span>收藏</span>
<view class="therapist-mian-view-text"> <view class="therapist-mian-view-text">
{{ getOrderByCurrentMarkerIndex().collectCount ? getOrderByCurrentMarkerIndex().collectCount : 0 }} {{ getOrderByCurrentMarkerIndex().collectCount ? getOrderByCurrentMarkerIndex().collectCount : 0 }}
@ -1318,7 +1317,7 @@
} }
.therapist-mian-bottom-text{ .therapist-mian-bottom-text{
font-weight: bold; font-weight: bold;
font-size: 23rpx; font-size: 30rpx;
color: #222222; color: #222222;
} }
.therapist-mian-bottom{ .therapist-mian-bottom{
@ -1377,7 +1376,8 @@
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
text-align: left; text-align: left;
font-size: 36rpx; font-weight: bold;
font-size: 32rpx;
color: #13141A; color: #13141A;
} }
.keyuyue{ .keyuyue{
@ -1427,6 +1427,7 @@
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
justify-content: space-between;
} }
.list-right-top{ .list-right-top{
width: 100%; width: 100%;
@ -1846,4 +1847,24 @@
line-height: 30px; line-height: 30px;
margin-top: 5px; margin-top: 5px;
} }
.therap-pin{
display: flex;
align-items: flex-end;
margin-right: 10rpx;
}
.therap-pin span:nth-child(2){
color: #019c88;
}
.therap-pin span:nth-child(1){
color: #666;
margin-right: 10rpx;
}
.terap-button{
background: linear-gradient(90deg, #019C88, #0FA78B, #35C495);
color: #ffffff;
width:200rpx;
height: 60rpx;
border-radius: 30upx;
line-height: 58rpx;
}
</style> </style>