Compare commits

...

2 Commits

Author SHA1 Message Date
kbing1981 ebd411d0a6 Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_user
# Conflicts:
#	my/order/payModifyTcMyDaiB.vue
2024-07-23 14:08:39 +08:00
kbing1981 27136897ed 修改 2024-07-23 13:58:27 +08:00
12 changed files with 3147 additions and 3352 deletions

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1,14 +1,18 @@
<template>
<view class="content">
<view class="cooperate-tetle">-选择您的身份-</view>
<view class="cooperate-line" @click="goNav('/pages/my/hehuo')">
<image class="cooperate-img" src="../../static/cooperate/cooperate1.png" mode=""></image>
</view>
<view class="cooperate-line" @click="goNav('/pages/my/cooperation')">
<image class="cooperate-img" src="../../static/cooperate/cooperate2.png" mode=""></image>
</view>
<view class="cooperate-line" @click="goNav('/pages/cooperate/hehuo')">
<image class="cooperate-img" src="../../static/cooperate/cooperate3.png" mode=""></image>
<view class="cooperate-bgimg">
<view class="cooperate-tetle"><image class="cop-img" src="../../static/seckill5.png" mode=""></image></view>
<view class="cooperate-line" @click="goNav('/pages/my/hehuo')">
<span>应聘技师</span>
<image class="cooperate-img" src="../../static/cooperate/cooperate1.png" mode=""></image>
<span>了解更多</span>
</view>
<view class="cooperate-line" @click="goNav('/pages/my/cooperation')">
<image class="cooperate-img" src="../../static/cooperate/cooperate2.png" mode=""></image>
</view>
<view class="cooperate-line" @click="goNav('/pages/cooperate/hehuo')">
<image class="cooperate-img" src="../../static/cooperate/cooperate3.png" mode=""></image>
</view>
</view>
</view>
</template>
@ -37,6 +41,7 @@
</script>
<style scoped>
.content {
width: 100%;
height: 100vh;
@ -46,12 +51,28 @@
background-size: 100% 100%;
overflow: auto;
}
.cooperate-bgimg{
height:300rpx;
background-image: url(../../static/background-img4.png);
background-repeat: no-repeat;
background-size: 100% 100%;
position: relative;
}
.cop-img{
width:400rpx;
height: 60rpx;
position: absolute;
top:120rpx;
left:40rpx;
}
.cooperate-tetle{
margin: 50rpx auto;
/*margin: 50rpx auto;*/
text-align: center;
color: #333;
font-size: 30rpx;
font-weight: bold;
height:260rpx;
}
.cooperate-line{
width: 94%;

View File

@ -10,10 +10,10 @@
<view class="my-head-top-text">
<span>{{userName}}</span>
<view class="my-head-top-id" v-if="vipNameType!=null">
<image v-if="vipNameType=='0'" class="my-head-vip" style="width:60rpx; height: 60rpx;" src="../../static/vip/membership5.png"></image>
<image v-if="vipNameType=='1'" class="my-head-vip" style="width:60rpx; height: 60rpx;" src="../../static/vip/membership6.png"></image>
<image v-if="vipNameType=='2'" class="my-head-vip" style="width:60rpx; height: 60rpx;" src="../../static/vip/membership4.png"></image>
<span>{{vipNameType=='0'?'':vipNameType=='1'?'':''}}会员</span>
<image v-if="vipNameType=='0'" class="my-head-vip" style="width:120rpx; height: 36rpx;" src="../../static/vip/membership5.gif"></image>
<image v-if="vipNameType=='1'" class="my-head-vip" style="width:120rpx; height: 36rpx;" src="../../static/vip/membership6.gif"></image>
<image v-if="vipNameType=='2'" class="my-head-vip" style="width:120rpx; height: 36rpx;" src="../../static/vip/membership7.gif"></image>
<span>{{vipNameType=='0'?'':vipNameType=='1'?'':''}}</span>
</view>
</view>
@ -1010,7 +1010,7 @@
width: 26%;
padding: 3rpx 5rpx 6rpx 22rpx;
text-align: center;
background:linear-gradient(to right,#ff996b,#ff9966,#ff5e62);
/*ckground-image: url(../../static/vip/membership5.png);*/
border-radius: 0 30rpx 30rpx 0 ;
color: #fff;
position: relative;

View File

@ -33,7 +33,7 @@
<!-- <view class="u-tips-color">{{item.createTime}}</view> -->
</view>
<view class="margin-top-sm" style="width: 100%;height: 1rpx;background: #f7f7f7;"></view>
<view class=" u-flex u-p-t-30">
<view class=" u-flex u-p-t-30" >
<view class="u-m-r-10">
<u-avatar
:src="item.ordersMassageList[0].massageType?item.ordersMassageList[0].massageType.massageImg: item.ordersMassageList[0].userPackageDetail.massageImg"
@ -56,7 +56,7 @@
</view>
</view>
<view class="flex u-p-t-20 justify-between align-center" style="justify-content: flex-end;">
<view class="flex u-p-t-20 justify-between align-center" style="justify-content: flex-end; margin-top: 20rpx;">
<view class="flex text-right" style="flex-direction: column;width: 100%;">
<view class="showBtn" v-if="item.status ==1">
<u-button
@ -1028,9 +1028,11 @@
top: var(--window-top);
flex-wrap: wrap;
align-content: flex-start;
background:url('../../static/background-img4.png') bottom;
background-repeat: no-repeat;
background-size: 100% 100%;
background: #fff;
border-bottom: 1px solid #f7f7f7;
//background:url('../../static/background-img4.png') bottom;
//background-repeat: no-repeat;
//background-size: 100% 100%;
}
.sticky-tabs-list image{
width: 52.08rpx;

Binary file not shown.

Before

Width:  |  Height:  |  Size: 379 KiB

After

Width:  |  Height:  |  Size: 324 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 22 KiB

BIN
static/seckill5.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.8 KiB

BIN
static/vip/membership5.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 96 KiB

After

Width:  |  Height:  |  Size: 6.0 KiB

BIN
static/vip/membership6.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

BIN
static/vip/membership7.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB