From 27136897edbe6d5330b1834e0197fb4112659a03 Mon Sep 17 00:00:00 2001
From: kbing1981 <549711992@qq.com>
Date: Tue, 23 Jul 2024 13:58:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 my/order/payModifyTcMyDaiB.vue | 14 +++++++-----
 pages/cooperate/index.vue      | 41 +++++++++++++++++++++++++---------
 pages/my/index.vue             | 10 ++++-----
 pages/order/index.vue          | 12 +++++-----
 4 files changed, 51 insertions(+), 26 deletions(-)

diff --git a/my/order/payModifyTcMyDaiB.vue b/my/order/payModifyTcMyDaiB.vue
index 18eb7fd..2d44d8d 100644
--- a/my/order/payModifyTcMyDaiB.vue
+++ b/my/order/payModifyTcMyDaiB.vue
@@ -226,15 +226,15 @@
 			</view>
 
 			<view class="flex tabber padding-top-sm padding-bottom-sm align-center">
-				<u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false"
+				<u-button class="btns" @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false"
 					v-if="(order.status == 1 || order.status == 2 || order.status == 7 || order.status == 8) && yhqxSel != '否'">取消订单
 				</u-button>
 				<u-button @click="openpay(order)" shape="circle" :custom-style="customStyle2" :hair-line="false"
 					v-if="order.status == 1"
-					class="dingshi">立即支付
+					class="btns">立即支付
 				</u-button>
 				<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
-					class="dingshi">联系客服</u-button>
+					class="btns">联系客服</u-button>
 			</view>
 
 		</view>
@@ -297,7 +297,7 @@
 				},
 				customStyle2: {
 					backgroundColor: '',
-					color: '#FFFFFF',
+					color: '',
 					// #ifdef MP-WEIXIN
 					width: "310upx",
 					// #endif
@@ -1574,8 +1574,10 @@
 		flex-direction: column;
 	}
 	/deep/.btns{
-		background: #019C88 !important;
-		color: #fff !important;
+	 color: #019C88 !important;
+	 margin-left: 10rpx !important;
+	 height:70rpx;
+	 font-size: 30rpx;
 	}
 	/deep/.u-size-default{
 		margin: 5px 0px 0px 0px;
diff --git a/pages/cooperate/index.vue b/pages/cooperate/index.vue
index fe29d30..4db7a73 100644
--- a/pages/cooperate/index.vue
+++ b/pages/cooperate/index.vue
@@ -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%;
diff --git a/pages/my/index.vue b/pages/my/index.vue
index 7b2624f..87c7ac3 100644
--- a/pages/my/index.vue
+++ b/pages/my/index.vue
@@ -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;
diff --git a/pages/order/index.vue b/pages/order/index.vue
index 2b7c8c0..983367d 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -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;