This commit is contained in:
kbing1981 2024-07-22 11:17:19 +08:00
parent 3b925b58f2
commit cb3fdff276
4 changed files with 81 additions and 50 deletions

View File

@ -28,7 +28,7 @@
<view <view
class="position_view" :animation="animationData1" class="position_view" :animation="animationData1"
style="background: linear-gradient(90deg, #019C88, #28BA92, #35C495); style="background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
border-radius: 27rpx;width: 81.25rpx;" border-radius: 8rpx;width: 81.25rpx;"
></view> ></view>
</view> </view>
</template> </template>
@ -56,11 +56,11 @@ export default {
}, },
bj_color:{ bj_color:{
type:String, type:String,
default:'#F2F2F2' default:'#fff'
}, },
checked_bj_color:{ checked_bj_color:{
type:String, type:String,
default:'#1989fa' default:'#8dddd0'
}, },
checked_color:{ checked_color:{
type:String, type:String,
@ -146,10 +146,11 @@ export default {
.switch-container { .switch-container {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
width: 144rpx; width: 126rpx;
height: 53rpx; height: 48rpx;
background: #f7f7f7; background: #fff;
border-radius: 27rpx; border: 1rpx #41b9a6 solid;
border-radius: 10rpx;
position: relative; position: relative;
.switch_view{ .switch_view{
position: absolute; position: absolute;
@ -161,7 +162,7 @@ export default {
display: flex; display: flex;
border-radius: 100upx; border-radius: 100upx;
.switch-item { .switch-item {
color: #666; color: #41b9a6;
font-size: 24upx; font-size: 24upx;
height: 100%; height: 100%;
width: 40%; width: 40%;

View File

@ -16,7 +16,7 @@
src="https://admin.sjajk.com/file/uploadPath/2023/02/16/9ae1b7e9fa931b5fc24cd8edecc10d9f.png" src="https://admin.sjajk.com/file/uploadPath/2023/02/16/9ae1b7e9fa931b5fc24cd8edecc10d9f.png"
style="width: 30rpx;height: 36rpx;position: absolute;z-index: 99;top: 40rpx;left: 110rpx;"> style="width: 30rpx;height: 36rpx;position: absolute;z-index: 99;top: 40rpx;left: 110rpx;">
</image> </image>
<image class="touxiang-frame" src="../../static/vip/grade6.png"></image> <!--<image class="touxiang-frame" src="../../static/vip/grade6.png"></image>-->
<view class="zpmore_view" v-if="item.lifePhoto" @click.stop="saveImgss(item.lifePhoto,0)">更多照片</view> <view class="zpmore_view" v-if="item.lifePhoto" @click.stop="saveImgss(item.lifePhoto,0)">更多照片</view>
</view> </view>
@ -26,7 +26,15 @@
<view class="text-bold text-30 margin-right-xs" style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;"> <view class="text-bold text-30 margin-right-xs" style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">
{{item.artificerName}} {{item.artificerName}}
</view> </view>
</view> </view>
<view class="keyuyue">
<view class="flex">
<view class="timea-fu">{{item.status == 1?"可服务":"休息中"}}</view>
<view class="timea-time" v-if="item.status == 1">{{item.time}}</view>
</view>
</view>
<!--
<view class="keyuyue"> <view class="keyuyue">
<view class="[item.state == 1 || item.state == 2?'kfw_view':'byy_view']"> <view class="[item.state == 1 || item.state == 2?'kfw_view':'byy_view']">
{{item.state == 1?'可服务':item.state == 2?'可预约':'休息中'}} {{item.state == 1?'可服务':item.state == 2?'可预约':'休息中'}}
@ -34,7 +42,7 @@
<view v-if="item.status == 1 && item.time"> <view v-if="item.status == 1 && item.time">
{{item.time}} {{item.time}}
</view> </view>
</view> </view>-->
</view> </view>
<view class="flex" style="margin: 16rpx 0 6px 0;justify-content: start;"> <view class="flex" style="margin: 16rpx 0 6px 0;justify-content: start;">
<view class="flex align-center"> <view class="flex align-center">
@ -260,19 +268,38 @@
</script> </script>
<style lang="scss"> <style lang="scss">
.keyuyue{ .keyuyue{
// width: 160rpx; padding: 0rpx 10rpx;
height: 20px; height: 44rpx;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
background: linear-gradient(90deg, #fee9ca, #fde4c6); background: #eefdf8;
border: 1px #decbae solid; border-radius: 30rpx 20rpx 20rpx 30rpx ;
border-radius: 30rpx 30rpx 30rpx 2rpx;
padding: 3rpx 18rpx;
color:#8d500f; color:#8d500f;
font-size: 22rpx; font-size: 24rpx;
margin-left: 15rpx; }
.timea-img{
background:#2dbe93 url('../../static/timea.png') 2rpx 1rpx;
background-size: 28rpx 28rpx;
background-repeat: no-repeat;
width: 30rpx;
height: 30rpx;
border-radius:8rpx;
margin-top: 8rpx;
}
.timea-fu{
font-size: 24rpx;
color: #2dbe93;
line-height: 44rpx;
margin-left: 8rpx;
margin-right: 5rpx;
}
.timea-time{
font-size: 25rpx;
color: #2dbe93;
line-height: 44rpx;
padding-right: 10rpx;
} }
.icon-text{ .icon-text{
margin-left: 2px; margin-left: 2px;
@ -421,10 +448,10 @@
} }
.touxiang-frame{ .touxiang-frame{
position: absolute; position: absolute;
width: 98%; width: 100rpx;
height: 292rpx; height: 38rpx;
left:2rpx; left: 46rpx;
top:-5rpx; bottom:5rpx;
} }

View File

@ -11,7 +11,7 @@
:show-action="true" :animation="true" bg-color="#fff" color="#019c88" @search="onSearch()" :show-action="true" :animation="true" bg-color="#fff" color="#019c88" @search="onSearch()"
action-text="搜索" @custom="onSearch()"> action-text="搜索" @custom="onSearch()">
</u-search> </u-search>
<view class="flex align-center justify-between"> <view class="flex align-center justify-between" style="margin-left: 8rpx;">
<selectSwitchDitu @change="switch1Change" :switchList="switchList"/> <selectSwitchDitu @change="switch1Change" :switchList="switchList"/>
</view> </view>
<!--<view class="map-list"> <!--<view class="map-list">
@ -20,6 +20,7 @@
</view>--> </view>-->
</view> </view>
<view class="fenlei"> <view class="fenlei">
<image class="fenlei-img" src="../../static/excel1.png"></image>
<z-tabs class="z-tabs-fenlei" :list="tabList" @change="tabChange" @changeClick="changeClick"/> <z-tabs class="z-tabs-fenlei" :list="tabList" @change="tabChange" @changeClick="changeClick"/>
</view> </view>
</view> </view>
@ -49,7 +50,6 @@
</view> </view>
<view class="keyuyue"> <view class="keyuyue">
<view class="flex"> <view class="flex">
<image class="timea-img"></image>
<view class="timea-fu">{{item.status == 1?"可服务":"休息中"}}</view> <view class="timea-fu">{{item.status == 1?"可服务":"休息中"}}</view>
<view class="timea-time" v-if="item.status == 1">{{item.time}}</view> <view class="timea-time" v-if="item.status == 1">{{item.time}}</view>
</view> </view>
@ -1263,7 +1263,11 @@ import permision from "@/components/permission.js";
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.fenlei-img{
width: 170rpx;
height: 34rpx;
margin: 0 20rpx;
}
.fenlei{ .fenlei{
display: flex; display: flex;
flex-direction: row; flex-direction: row;
@ -1408,39 +1412,37 @@ import permision from "@/components/permission.js";
color: #13141A; color: #13141A;
} }
.keyuyue{ .keyuyue{
padding: 0rpx; padding: 0rpx 10rpx;
height: 44rpx; height: 44rpx;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
border: 1px #2dbe93 solid; background: #eefdf8;
border-radius: 20rpx 30rpx 30rpx 20rpx; border-radius: 30rpx 20rpx 20rpx 30rpx ;
color:#8d500f; color:#8d500f;
font-size: 22rpx; font-size: 24rpx;
margin-left: 6rpx;
} }
.timea-img{ .timea-img{
background:#2dbe93 url('../../static/timea.png') 4rpx 3rpx; background:#2dbe93 url('../../static/timea.png') 2rpx 1rpx;
background-size: 35rpx 35rpx; background-size: 28rpx 28rpx;
background-repeat: no-repeat; background-repeat: no-repeat;
width: 40rpx; width: 30rpx;
height: 40rpx; height: 30rpx;
border-radius: 8rpx 0 0 8rpx; border-radius:8rpx;
margin-top: 1rpx; margin-top: 8rpx;
} }
.timea-fu{ .timea-fu{
font-size: 22rpx; font-size: 24rpx;
color: #2dbe93; color: #2dbe93;
line-height: 44rpx; line-height: 44rpx;
margin-left: 8rpx; margin-left: 8rpx;
margin-right: 5rpx; margin-right: 5rpx;
} }
.timea-time{ .timea-time{
font-size: 24rpx; font-size: 25rpx;
color: #2dbe93; color: #2dbe93;
line-height: 44rpx; line-height: 44rpx;
padding-right: 10rpx; padding-right: 10rpx;
} }
.list-right-top-view image{ .list-right-top-view image{
//width: 168.75rpx; //width: 168.75rpx;
@ -1523,7 +1525,6 @@ import permision from "@/components/permission.js";
height: 150rpx; height: 150rpx;
border-radius:120rpx; border-radius:120rpx;
margin: 14rpx 22rpx; margin: 14rpx 22rpx;
} }
.touxiang-left-view{ .touxiang-left-view{
width: 100%; width: 100%;
@ -1555,7 +1556,6 @@ import permision from "@/components/permission.js";
// height: 32px; // height: 32px;
line-height: 32px; line-height: 32px;
border-radius: 4px; border-radius: 4px;
margin-left: 10px;
} }
.padding-top-sm{ .padding-top-sm{
width: 95%; width: 95%;
@ -1580,13 +1580,13 @@ import permision from "@/components/permission.js";
// overflow: auto; // overflow: auto;
} }
/deep/.u-content{ /deep/.u-content{
height: 55rpx!important; height: 48rpx!important;
border-radius: 30px !important; border-radius: 5px !important;
} }
.flex-sub{ .flex-sub{
width: 260rpx !important; width: 260rpx !important;
height:60rpx !important; height:52rpx !important;
border: 1px solid #41b9a6; border: 1px solid #e5e5e5;
border-radius: 10rpx; border-radius: 10rpx;
color: #fff!important; color: #fff!important;
} }

View File

@ -629,7 +629,7 @@
width: 750rpx; width: 750rpx;
/* #endif */ /* #endif */
flex-direction: row; flex-direction: row;
height: 66rpx; height: 70rpx;
} }
.z-tabs-scroll-view-conatiner{ .z-tabs-scroll-view-conatiner{
@ -688,7 +688,7 @@
flex-direction: row; flex-direction: row;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
padding: 0px 20rpx; padding: 2px 20rpx;
} }
.z-tabs-item-title-container{ .z-tabs-item-title-container{
@ -700,7 +700,7 @@
} }
.z-tabs-item-title{ .z-tabs-item-title{
/* font-weight: bold; */ font-weight: bold;
font-size: 28rpx; font-size: 28rpx;
color: #019c88; color: #019c88;
} }
@ -723,14 +723,17 @@
.z-tabs-bottom{ .z-tabs-bottom{
position: absolute; position: absolute;
bottom: 0; bottom: 0;
left: 0; left: 40rpx;
right: 0; right: 0;
margin-bottom: -4px; margin-bottom: -4px;
} }
.z-tabs-bottom-dot{ .z-tabs-bottom-dot{
border-radius: 100px; border-radius: 100px;
text-align: center;
width: 60rpx!important;
background: linear-gradient(90deg,rgba(44, 189, 147,0.1),rgba(1, 156, 136,0.7)) !important; background: linear-gradient(90deg,rgba(44, 189, 147,0.1),rgba(1, 156, 136,0.7)) !important;
} }
.z-tabs-left,.z-tabs-right{ .z-tabs-left,.z-tabs-right{