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

解决冲突 服务项目

This commit is contained in:
Mr.jiang 2024-07-02 20:58:59 +08:00
parent d35d73df91 9783b9cbfc
commit 08623767b9
9 changed files with 106 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/empty.vue
View File

@ -3,7 +3,7 @@
<view class="centre" v-if="noneData=='地址'">
<image src="../static/address/map1.png" mode=""></image>
<view class="address-tips">
小主，您还没有收货地址呢~
小主，您还没有服务地址哦~
</view>
</view>
<view class="centre" v-else>

7
components/its-calendar/its-calendar.vue
View File

@ -2,7 +2,7 @@
<view>
<view class="calendar">
<view class="calendar_day">
<view class="day_x" :style="{'color': (day_index == index ? '#52C375' : '')}"
<view class="day_x" :style="{'color': (day_index == index ? '#019c88' : '')}"
v-for="(item, index) in dayArr" :key="index" @click.stop="dayList(item,index)">
<view class="day_x_a">{{item.weeks}}</view>
<view class="day_x_b">{{item.days}}</view>
@ -313,7 +313,7 @@
.time_x_sty {
background-color: #E8FAE1;
color: #096f4b !important;
color: #019c88 !important;
}
}
@ -328,6 +328,7 @@
margin: 30rpx auto;
color: #FFFFFF;
font-size: 30rpx;
background: linear-gradient(to right, #223845, #00a85b);
background: linear-gradient(to right, #019c88, #24b791);
}
</style>

12
my/address/Endaddress.vue
View File

@ -301,18 +301,18 @@
}
.btn {
margin: 16rpx 30upx;
position: fixed;
bottom: -2upx;
width: 92%;
height: 92rpx;
height: 80rpx;
background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
border-radius: 46rpx;
margin: 6px auto;
color: white;
text-align: center;
line-height: 92rpx;
letter-spacing: 2upx;
line-height: 80rpx;
font-weight: 400;
font-size: 36rpx;
color: #FFFFFF;
text-align: center;
}
.u-icon__icon{
font-size: 40rpx !important;

1
my/hongbao/youhuijuanList.vue
View File

@ -316,7 +316,6 @@
background-image: url('../../static/youhuijuan/coupons1.png');
}
.youhui-list{
width: 95%;
display: flex;
flex-direction: row;
height: 242rpx;

5
my/order/payModify.vue
View File

@ -68,7 +68,7 @@
</view>
</view>
<view class="ske-padding margin-top-sm header-view">
<view class="fuwu-time" @click="liliaoshi">
<view class="fuwu-time margin-top-lg" @click="liliaoshi">
<view class="fuwu-title" >
<span>技师</span>
<span v-if="jishiName">{{jishiName.technicianTypeName}}</span>
@ -99,8 +99,7 @@
<uni-datetime-picker :hide-second='true' v-model="single" type="datetime">{{single==''?order.serveTime:single}}</uni-datetime-picker>
<image style="margin-left: 5px;" class="fuwu-img" src="../../static/images/my/jiantou.png" mode=""></image>
</view> -->
<view class="flex align-center justify-between"
style="height: 100rpx;line-height: 100rpx;padding: 0rpx 10rpx;">
<view class="flex align-center justify-between" style="margin-top: 15rpx;">
<view class="flex justify-between margin-tb-sm" @click="openData()">
<view v-if="startTime">{{startTime}}</view>
<view class="tetx-sm" v-else>请选择预约时间<span class="view-more"></span></view>

2
pages.json
View File

@ -1061,7 +1061,7 @@
},
"tabBar": {
"color": "#333333",
"selectedColor": "#096f4b",
"selectedColor": "#019c88",
"backgroundColor": "#FFFFFF",
"borderStyle": "black",
"list": [{

4
pages/my/fuwuxiangm.vue
View File

@ -39,7 +39,11 @@
<view class="item-view-bottom-qian">
<span>￥</span>
<span>{{item.price}}</span>
<<<<<<< .mine
<span>/套</span>
=======
<span>元/套</span>
>>>>>>> .theirs
<span>￥</span>
<span style="text-decoration: line-through;">{{item.oldPrice}}</span>
</view>

132
pages/therapist/therapist.vue
View File

@ -8,7 +8,7 @@
<view class="localName">{{ city }}</view>
</view>
<u-search class="flex-sub" placeholder="请输入技师名字" :focus="false" shape="square" v-model="artificerName"
:show-action="true" :animation="true" bg-color="#fff" color="#1A1A1A" @search="onSearch()"
:show-action="true" :animation="true" bg-color="#f5f5f5" color="#1A1A1A" @search="onSearch()"
action-text="搜索" @custom="onSearch()"></u-search>
<view class="flex align-center justify-between">
<selectSwitchDitu @change="switch1Change" />
@ -40,60 +40,57 @@
{{ item.artificerName }}
</view>
<view class="keyuyue">
<view class="keyuyue-btn keyuyue-jinri">
{{item.state == 1?"可服务":item.state == 2?"今日可约":"休息中"}}
<view>
{{item.state == 1?"可服务:":item.state == 2?"今日可约":"休息中"}}
</view>
<view class="keyuyue-btn keyuyue-time" v-if="item.status == 1 && item.time">{{ item.time
<view v-if="item.status == 1 && item.time">{{ item.time
}}</view>
</view>
</view>
</view>
</view>
<view class="therapist-mian">
<view class="therapist-mian-top">
<view class="therapist-mian-view">
<image src="../../static/dituzhaoren3.png" mode="">
</image>
<span>评论</span>
<view class="therapist-mian-view-text">
{{ item.commentCount ? item.commentCount : 0 }}
</view>
</view>
<view class="therapist-mian-view" style="margin-left: 10px;">
<image src="../../static/dituzhaoren4.png" mode="">
</image>
<span>收藏</span>
<view class="therapist-mian-view-text">
{{ item.collectCount ? item.collectCount : 0 }}
</view>
<view class="therapist-mian-top">
<view class="therapist-mian-view">
<image src="../../static/dituzhaoren3.png" mode="">
</image>
<span>评论</span>
<view class="therapist-mian-view-text">
{{ item.commentCount ? item.commentCount : 0 }}
</view>
</view>
<view class="therapist-mian-bottom">
<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">{{item.consortiaName}}</view>
<view class="therapist-mian-view" style="margin-left: 10px;">
<image src="../../static/dituzhaoren4.png" mode="">
</image>
<span>收藏</span>
<view class="therapist-mian-view-text">
{{ item.collectCount ? item.collectCount : 0 }}
</view>
</view>
</view>
<view class="therapist-mian-bottom">
<view class="flex align-center" v-if="item.tripWay != 3" >
<image class="therapist-bottom-dingwei" src="../../static/dituzhaoren6.png"></image>
<view class="therapist-bottom-dingwei-text">
{{ item.distance }}
</view>
</view>
</view>
<view class="text-center text-sm" v-if="item.status == 1"
<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">{{item.consortiaName}}</view>
</view>
</view>
<view class="text-center " 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
<view class="text-center" @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>
</view>
@ -191,12 +188,12 @@
</view>
</view>
</view>
<view class="text-center text-sm" v-if="getOrderByCurrentMarkerIndex().status == 1"
<view class="text-center " v-if="getOrderByCurrentMarkerIndex().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(getOrderByCurrentMarkerIndex())">
立即预约
</view>
<view class="text-center text-sm" @click.stop="showTips()" v-else
<view class="text-center " @click.stop="showTips()" v-else
style="background: #d9d9d9;color: #ffffff;width: 100%;border-radius: 30upx;height: 60upx;line-height: 60upx;margin-top: 10rpx;">
立即预约
</view>
@ -1273,23 +1270,22 @@ import permision from "@/components/permission.js";
// overflow: auto;
}
.therapist-bottom-dingwei-text{
font-weight: bold;
font-size: 23rpx;
font-size: 29rpx;
color: #848485;
}
.therapist-bottom-dingwei{
width: 17.36rpx;
height: 20.14rpx;
width: 26rpx;
height: 30rpx;
margin-right:3px;
}
.therapist-bottom-img{
width: 22.22rpx;
height: 22.22rpx;
width: 30rpx;
height: 30rpx;
margin-right:3px;
}
.therapist-mian-bottom-text{
font-weight: bold;
font-size: 23rpx;
font-size: 30rpx;
color: #222222;
}
.therapist-mian-bottom{
@ -1298,22 +1294,22 @@ import permision from "@/components/permission.js";
flex-direction: row;
justify-content: space-between;
align-items: center;
margin: 5px 0px 3px 0px;
margin-top: 10rpx;
}
.therapist-mian-view-text span{
font-weight: 500;
font-size: 23rpx;
font-size: 30rpx;
color: #222222;
}
.therapist-mian-view span{
font-weight: 400;
font-size: 23rpx;
font-size: 29rpx;
color: #7C8187;
margin-right: 5px;
margin-right: 10px;
}
.therapist-mian-view image{
width: 24rpx;
height: 24rpx;
width: 32rpx;
height: 32rpx;
margin-right: 1px;
}
.therapist-mian-view{
@ -1325,6 +1321,7 @@ import permision from "@/components/permission.js";
width: 100%;
display: flex;
flex-direction:row;
margin-top: 26rpx;
}
.therapist-mian{
width: 100%;
@ -1344,32 +1341,28 @@ import permision from "@/components/permission.js";
text-overflow: ellipsis;
}
.list-right-top-name{
width: 60px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
text-align: left;
font-weight: bold;
font-size: 30rpx;
font-size: 32rpx;
color: #13141A;
}
.keyuyue{
width: 115px;
height: 24px;
height: 20px;
display: flex;
flex-direction: row;
align-items: center;
}
.keyuyue .keyuyue-btn{
width: 50%;
height: 100%;
margin-left:10rpx;
background: linear-gradient(90deg, #fe912e, #28BA92, #35C495);
border-radius: 30rpx 30rpx 30rpx 2rpx;
padding: 3rpx 18rpx;
color:#fff;
font-size: 22rpx;
text-align: center;
display: flex;
flex-direction: row;
align-items: center;
justify-content: center;
}
.keyuyue-jinri{
border-top-left-radius: 7rpx;
border-bottom-left-radius: 7rpx;
@ -1392,7 +1385,6 @@ import permision from "@/components/permission.js";
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
}
.list-right-top{
width: 100%;
@ -1401,7 +1393,7 @@ import permision from "@/components/permission.js";
align-items: center;
}
.list-right{
width: 67%;
width: 61%;
height: 100%;
display: flex;
flex-direction: column;
@ -1429,15 +1421,15 @@ import permision from "@/components/permission.js";
.img-span{
padding: 1px 5px;
font-weight: 400;
font-size: 8px;
font-size: 10px;
color: #FFFFFF;
background: linear-gradient(-90deg, #FF6F48, #FF9E69);
border-radius: 7px 0px 7px 0px;
position: absolute;
bottom: 0px;
right: 0;
margin-bottom: 5px;
margin-right: 5px;
margin-bottom: 10px;
margin-right: 10px;
}
// .zpmore_view_left image{
// position: absolute;
@ -1452,19 +1444,19 @@ import permision from "@/components/permission.js";
height: 306.94rpx;
}
.touxiang-left-content{
width: 202.08rpx;
width: 240.08rpx;
height: auto;
border-radius: 10rpx;
position: relative;
}
.touxiang-left-content-img{
width: 202.08rpx;
height: 173px;
border-radius: 0 120rpx 20rpx 0rpx;
width: 230.08rpx;
height: 150px;
border-radius: 10rpx 130rpx 20rpx 10rpx;
}
.touxiang-left-view{
width: 100%;
height: 173px;
height: 150px;
border-radius: 18rpx;
align-items: flex-start;
justify-content: space-between;

41
pages/therapist/therapistDingdan.vue
View File

@ -8,7 +8,7 @@
<view class="localName">{{ city }}</view>
</view>
<u-search class="flex-sub" placeholder="请输入技师名字" :focus="false" shape="square" v-model="artificerName"
:show-action="true" :animation="true" bg-color="#fff" color="#1A1A1A" @search="onSearch()"
:show-action="true" :animation="true" bg-color="#f5f5f5" color="#1A1A1A" @search="onSearch()"
action-text="搜索" @custom="onSearch()"></u-search>
<view class="flex align-center justify-between">
<selectSwitchDitu @change="switch1Change" />
@ -40,10 +40,10 @@
{{ item.artificerName }}
</view>
<view class="keyuyue">
<view class="keyuyue-btn keyuyue-jinri">
<view>
{{item.state == 1?"可服务":item.state == 2?"今日可约":"休息中"}}
</view>
<view class="keyuyue-btn keyuyue-time" v-if="item.status == 1 && item.time">{{ item.time
<view v-if="item.status == 1 && item.time">{{ item.time
}}</view>
</view>
</view>
@ -1287,7 +1287,8 @@
top: 0rpx;
z-index: 999;
width: 100%;
background-image: url('../../static/topimg.png');
background: #fff;
//background-image: url('../../static/topimg.png');
// background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0), #f7f7f7), url('../../static/background-img.png');
// background-position: center center;
// background-repeat: no-repeat;
@ -1366,13 +1367,11 @@
text-overflow: ellipsis;
}
.list-right-top-name{
width: 60px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
text-align: left;
font-weight: bold;
font-size: 35rpx;
font-size: 36rpx;
color: #13141A;
}
.keyuyue{
@ -1415,7 +1414,6 @@
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
}
.list-right-top{
width: 100%;
@ -1481,18 +1479,32 @@
position: relative;
}
.touxiang-left-content-img{
width: 202.08rpx;
height: 173px;
width: 230rpx;
height: 130px;
border-radius: 20rpx 80rpx 20rpx 20rpx;
}
.touxiang-left-view{
width: 100%;
height: 173px;
border-radius: 14rpx;
height: 150px;
border-radius: 20rpx;
align-items: flex-start;
justify-content: space-between;
background: #fff;
margin-bottom: 20px;
margin-bottom: 12px;
padding-bottom: 10px;
padding: 20rpx;
}
.keyuyue{
height: 20px;
display: flex;
flex-direction: row;
align-items: center;
margin-left: 5px;
background: linear-gradient(90deg, #fe912e, #28BA92, #35C495);
border-radius: 15px 15px 15px 1px;
padding: 1px 9px;
color: #fff;
font-size: 11px;
}
.touxiang-left{
width: 100%;
@ -1523,7 +1535,7 @@
flex-direction: row;
align-items: center;
justify-content: space-between;
}
}
/deep/.page-box{
background: none !important;
}
@ -1533,7 +1545,6 @@
.content{
width: 100%;
height: 100vh;
background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0), #f7f7f7), url('../../static/background-img.png');
background-position: center center;
background-repeat: no-repeat;
background-size: cover;