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-10 15:36:52 +08:00
parent 01a5b43457 5ba8447c89
commit 63b6b9808d
24 changed files with 139 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
my/gird/shoucang.vue
View File

@ -16,9 +16,11 @@
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;">
</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>
<view class="margin-left flex flex-direction list-right-content" style="width: 85%;">
<view class="flex flex-direction list-right-content" style="width: 85%; margin-left: 8rpx;">
<view class="flex align-center" style="justify-content: space-between;">
<view class="flex align-center">
<view class="text-bold text-30 margin-right-xs" style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">
@ -372,12 +374,14 @@
.content-img image{
width: 100%;
height: 100%;
border-radius:17rpx 100rpx 30rpx 17rpx;
border-radius:8rpx;
}
.content-img{
width: 212.08rpx;
width: 300.08rpx;
height: 100%;
position: relative;
padding:20rpx;
}
.content {
width: 100%;
@ -390,8 +394,8 @@
.zpmore_view {
position: absolute;
bottom: 0px;
margin-bottom: 4px;
left: 14rpx;
margin-bottom: 16px;
left: 38rpx;
color: #f9f3d3;
background: linear-gradient(to right, #0a0c16, #4d4d53);
width: 130upx;
@ -402,7 +406,13 @@
font-size: 24rpx;
margin-left: 10rpx;
}
.touxiang-frame{
position: absolute;
width: 98%;
height: 292rpx;
left:2rpx;
top:-5rpx;
}
.bg {

2
my/order/payShengji.vue
View File

@ -2388,7 +2388,7 @@
width: 90%;
margin: 0 auto;
text-align: center;
background: linear-gradient(to right, #223845, #00a85b);
background: linear-gradient(to right, #029c88, #2fc094);
height: 80rpx;
border-radius: 60rpx;
color: #ffffff;

6
pages/cooperate/hehuo.vue
View File

@ -240,12 +240,12 @@
@import '../../static/less/index.less';
@import '../../static/css/index.css';
/deep/.uni-radio-input{
width: 23px;
height: 23px;
width: 20px;
height: 20px;
}
/deep/uni-radio::before{
margin-right: 0px;
margin-right: -1px;
}
.save_btn {
width: 600upx;

4
pages/cooperate/hehuocity.vue
View File

@ -234,9 +234,7 @@
font-size: 28rpx;
flex-direction: column;
}
.adv_lines span:nth-child(1){
width: 70%;
}
.adv_line{
display: flex;
justify-content: space-between;

2
pages/cooperate/index.vue
View File

@ -59,7 +59,7 @@
}
.cooperate-img{
width: 100%;
height:230rpx;
height:240rpx;
}
.shezhi-list-img-text{
font-weight: 400;

55
pages/index/index.vue
View File

@ -93,7 +93,7 @@
<span class="feng_word">逛商城</span>
</view>
<view class="index-project-content" @click="gangBtn(type)">
<image src="../../static/index-fenglei9.png" mode="widthFix"></image>
<image src="../../static/index-fenglei13.png" mode="widthFix"></image>
<span class="feng_word">更多</span>
</view>
</view>
@ -233,25 +233,25 @@
<!-- 提前结束 -->
<uni-popup ref="popup" background-color="#fff">
<view class="popup-content">
<view class="popup-head">
<view class="popup-close"><image @click="closePopup(type)" class="popup-close-img" src="../../static/close.png"></image></view>
<!--<view class="popup-head">
<span></span>
<span @click="closePopup(type)">x</span>
</view>
</view>-->
<view class="popup-mian">
<view class="popup-mian-view">
<view class="index-project-content" @click="yuedao('商家')">
<view class="index-project-content1">
<image src="../../static/index-fenglei11.png" mode="widthFix"></image>
<span class="feng_word">美甲师</span>
</view>
<view class="index-project-content1">
<image src="../../static/index-fenglei12.png" mode="widthFix"></image>
<span class="feng_word">美容师</span>
</view>
<view class="index-project-content1" @click="yuedao()">
<image src="../../static/index-fenglei9.png" mode="widthFix"></image>
<span class="feng_word">约到店</span>
</view>
<view class="index-project-content">
<image src="../../static/index-fenglei8.png" mode="widthFix"></image>
<span class="feng_word">美甲师</span>
</view>
<view class="index-project-content">
<image src="../../static/index-fenglei8.png" mode="widthFix"></image>
<span class="feng_word">美容师</span>
</view>
</view>
<!-- <view class="popup-mian-btn">
@ -1050,6 +1050,7 @@
.popup-mian-btn span:nth-child(2){
background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
}
.popup-mian-btn span{
width: 247rpx;
height: 77rpx;
@ -1105,13 +1106,23 @@
}
.popup-content{
width: 613rpx;
height: 479rpx;
background: #FFFFFF;
height: 320rpx;
background:#fff url(../../static/background-img3.png)no-repeat ;
background-size: 130%;
border-radius: 36rpx;
display: flex;
flex-direction: column;
}
.popup-close{
text-align: right;
margin-top:15rpx;
margin-right: 15rpx;
}
.popup-close-img{
width: 50rpx;
height: 50rpx;
}
/deep/.item-descr{
-webkit-line-clamp: 1;
margin-top: 5px;
@ -1642,6 +1653,18 @@
margin-top: 15px;
height: 58px;
}
.index-project-content1 {
display: flex;
flex-direction: column;
flex-basis: 33%;
align-items: center;
margin-top: 15px;
height: 58px;
}
.index-project-content1 image{
width: 68.75rpx;
height: 72.22rpx;
}
.star-technician-name{
font-weight: bold;
font-size: 37rpx;

24
pages/my/hehuo.vue
View File

@ -1,5 +1,7 @@
<template>
<view class="hehuo_view">
<view class="advantage-title">应聘技师</view>
<view class="advantage-bor"></view>
<view class="text_view">
<view class="item_view">
<view class="item_title">服务城市 </view>
@ -256,15 +258,32 @@
height: 150upx;
background: #f7f7f7;
}
.advantage-title{
font-size: 32rpx;
font-weight: bold;
margin-top: 60rpx;
margin-left: 35rpx;
}
.advantage-bor{
width: 64px;
height: 6px;
border-radius: 3px;
bottom: 0;
background: linear-gradient(90deg, rgba(234, 248, 245, 0.7), rgba(132, 211, 196, 0.7));
margin-bottom: 80rpx;
margin-left: 35rpx;
}
.hehuo_view {
width: 100%;
padding-top: 10px;
height: 100vh;
background-color: #f7f7f7;
background:#fff url(../../static/cooperate/cooperate6.png)no-repeat ;
background-size: 100%;
position: relative;
display: flex;
flex-direction: column;
align-items: center;
//align-items: center;
.text_view {
width: 95%;
@ -272,6 +291,7 @@
background-color: #fff;
border-radius: 10px;
padding: 20px;
margin-top: 50rpx;
.audit_message {
color: red;
width: 650rpx;

18
pages/my/index.vue
View File

@ -100,6 +100,14 @@
<image src="../../static/my-liaocheng.png" mode=""></image>
<span class="my-serve-list-text">服务疗程</span>
</view>
<view class="my-serve-list" @click="meServe('企业预约')">
<image src="../../static/my-liaocheng1.png" mode=""></image>
<span class="my-serve-list-text">企业预约</span>
</view>
<view class="my-serve-list" @click="meServe('约到店')">
<image src="../../static/my-liaocheng2.png" mode=""></image>
<span class="my-serve-list-text">约到店</span>
</view>
</view>
</view>
<view class="my-use width">
@ -613,7 +621,7 @@
flex-wrap: wrap;
}
.my-serve-view{
width: 86%;
width: 98%;
margin: 16px auto;
display: flex;
flex-direction: row;
@ -634,13 +642,13 @@
justify-content: center;
}
.my-serve-list image{
width: 90rpx;
height: 90rpx;
width: 80rpx;
height: 80rpx;
}
.my-serve-list-text{
color: #6C6C6C;
margin-top: 5px;
font-size: 26rpx;;
font-size: 26rpx;
}
.my-serve-title,.my-use-title{
@ -655,7 +663,7 @@
width: 94%;
}
.my-serve{
height: 597rpx;
height: 626rpx;
background: #FFFFFF;
border-radius: 21rpx;
padding: 10px;

14
pages/therapist/therapist.vue
View File

@ -21,6 +21,7 @@
<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="touxiang-left-content">
<image 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"
@ -31,6 +32,7 @@
<image src="../../static/dituzhaoren1.png" mode=""></image>
</view> -->
<span class="img-span">{{item.technicianType=='3'?'新手':item.technicianType=='4'?'专家':'资深'}}</span>
<image class="touxiang-frame" src="../../static/vip/grade4.png"></image>
</view>
<view class="list-right">
<view class="flex align-center" style="justify-content: start;">
@ -1238,6 +1240,13 @@ import permision from "@/components/permission.js";
text-overflow: ellipsis;
text-align: left;
}
.touxiang-frame{
position: absolute;
width: 98%;
height: 270rpx;
left: 8rpx;
}
.dituList{
width: 85%;
height: 173px;
@ -1440,15 +1449,16 @@ import permision from "@/components/permission.js";
height: 306.94rpx;
}
.touxiang-left-content{
width: 235.08rpx;
//width: 235.08rpx;
height: auto;
border-radius: 10rpx;
position: relative;
}
.touxiang-left-content-img{
padding: 20rpx;
width: 230.08rpx;
height: 150px;
border-radius: 10rpx 130rpx 20rpx 10rpx;
border-radius:5rpx;
}
.touxiang-left-view{
width: 100%;

28
pages/therapist/therapistDingdan.vue
View File

@ -21,16 +21,21 @@
<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="touxiang-left-content">
<image 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"
<!--<image class="touxiang-left-content-img" v-if="item.isHot == 1"
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;">
</image>
<!-- <view class="zpmore_view_left" v-if="item.technicianType==1" @click.stop="saveImgss(item.technicianType, 0)">
<view class="zpmore_view_left" v-if="item.technicianType==1" @click.stop="saveImgss(item.technicianType, 0)">
<image src="../../static/dituzhaoren1.png" mode=""></image>
</view> -->
<span class="img-span">{{item.technicianType=='3'?'新手':item.technicianType=='4'?'专家':'资深'}}</span>
<!--<span class="img-span">{{item.technicianType=='3'?'新手':item.technicianType=='4'?'专家':'资深'}}</span>-->
<image class="touxiang-frame" src="../../static/vip/grade5.png"></image>
</view>
<view class="list-right">
<view class="flex align-center" style="justify-content: start;">
@ -1275,6 +1280,11 @@
text-overflow: ellipsis;
text-align: left;
}
.touxiang-frame{
position: absolute;
width: 30%;
height: 262rpx;
}
.dituList{
width: 85%;
height: 173px;
@ -1487,15 +1497,16 @@
height: 306.94rpx;
}
.touxiang-left-content{
width: 202.08rpx;
//width: 212.08rpx;
height: auto;
border-radius: 10rpx;
position: relative;
}
.touxiang-left-content-img{
width: 230rpx;
height: 130px;
border-radius: 20rpx 80rpx 20rpx 20rpx;
width: 230.08rpx;
height: 150px;
border-radius:5rpx;
padding: 20rpx;
position:absolute;
}
.touxiang-left-view{
width: 100%;
@ -1506,7 +1517,6 @@
background: #fff;
margin-bottom: 12px;
padding-bottom: 10px;
padding: 20rpx;
}
.touxiang-left{

16
pages/videoCircle/index.vue
View File

@ -1,8 +1,8 @@
<template>
<view style="height: 100vh;flex:1;width:100%">
<view style="width: 100%;
height: 100%;display: flex;justify-content: center;align-items: center;font-size: 30px;">
敬请期待！
<view class="com-line">
<image style="width: 380rpx; height: 330rpx;" src="../../static/coming.png" mode=""></image>
<view class="com-text">系统建设中,敬请期待！</view>
</view>
<swiper v-if="videoShow==true" @animationfinish="qiehuan" :current="activeIndex" @change="swiper" :circular="index==0?true:false" vertical
class="list">
@ -281,7 +281,15 @@
</script>
<style scoped>
.com-line{
width:80%;
margin: 45% auto;
text-align: center;
}
.com-text{
font-size: 26rpx;
color: #999;
}
.list {
background-color: black;
flex: 1;

BIN
static/background-img3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 249 KiB

BIN
static/close.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.8 KiB

BIN
static/close1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.6 KiB

BIN
static/coming.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 149 KiB

BIN
static/cooperate/cooperate6.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 348 KiB

BIN
static/index-fenglei11.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.8 KiB

BIN
static/index-fenglei12.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.8 KiB

BIN
static/index-fenglei13.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.4 KiB

BIN
static/my-liaocheng1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
static/my-liaocheng2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.5 KiB

BIN
static/vip/grade4.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 50 KiB

BIN
static/vip/grade5.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 58 KiB

BIN
static/vip/grade6.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 76 KiB