From aa2e788463565980020e529e75ef722d3a3d6871 Mon Sep 17 00:00:00 2001
From: "Mr.jiang" <714156421@qq.com>
Date: Thu, 4 Jul 2024 16:41:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E9=A1=B9=E7=9B=AE=20?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 my/order/revenueDetails.vue  |  2 +-
 pages/index/game/myOrder.vue | 36 ++++++++++++++++++++++++++----------
 pages/index/index.vue        | 23 ++++++++++++++++++++---
 pages/order/index.vue        |  2 +-
 4 files changed, 48 insertions(+), 15 deletions(-)

diff --git a/my/order/revenueDetails.vue b/my/order/revenueDetails.vue
index 5e77fef..4d0f468 100644
--- a/my/order/revenueDetails.vue
+++ b/my/order/revenueDetails.vue
@@ -1328,7 +1328,7 @@
 		</view>
 		<!-- <u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton> -->
 		<!-- #ifndef H5 -->
-		<image src="../../static/images/index/jinji.png" class="bj_view" @tap="goBaoJing"></image>
+		<image v-if="order.status == 6" src="../../static/images/index/jinji.png" class="bj_view" @tap="goBaoJing"></image>
 		<!-- #endif -->
 		<!-- 支付方式 -->
 		<u-popup v-model="showpay" mode="bottom" :closeable="closeable">
diff --git a/pages/index/game/myOrder.vue b/pages/index/game/myOrder.vue
index ee48fa8..3d85db2 100644
--- a/pages/index/game/myOrder.vue
+++ b/pages/index/game/myOrder.vue
@@ -42,19 +42,16 @@
 			</view>
 		</view>
 
-		
+		<view class="detail-foot-nav">
+			<span class="detail-foot-nav-text">项目详情</span>
+			<span class="detail-foot-nav-bor"></span>
+		</view>
 		<view class="margin-top-sm bg radius u-skeleton-fillet">
-			<view class="text-center padding">服务详情</view>
-			<view v-for="(item,index) in order.contentImg" :key="index" style="width: 100%;height: 80vh;">
-				<image :src="item" style="width: 100%;height: 100%;"></image>
+			<view v-for="(item,index) in order.contentImg" :key="index" style="width: 100%;height: 100%;padding: 15px;">
+				<image :src="item" style="width: 100%;height: 100%;" mode="widthFix"></image>
 			</view>
 
 		</view>
-
-
-
-
-		
 		<!-- <u-picker v-model="show" mode="time" :params="params" @confirm="statusChange"></u-picker> -->
 		<u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton>
 	</view>
@@ -257,7 +254,26 @@
 </script>
 
 <style>
-	
+	.detail-foot-nav-bor{
+		width: 64px;
+		height: 5px;
+		border-radius: 2px;
+		position: absolute;
+		bottom: 0;
+		background: linear-gradient(90deg,rgba(55, 182, 157,0.7),rgba(132, 211, 196,0.7));
+	}
+	.detail-foot-nav-text{
+		font-weight: bold;
+		font-size: 15px;
+		color: #000000;
+	}
+	.detail-foot-nav{
+		width: 90%;
+		display: flex;
+		flex-direction: column;
+		position: relative;
+		margin: 10px auto 17px auto;
+	}
 	page {
 		background-color: #F7F7F7;
 	}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 253622e..b97bad8 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -6,11 +6,12 @@
 					<image :src="avatar" class="head-port"
 						@click="goNav('/pages/my/userinfo')"></image>
 				</view>
-				<view class="u-flex-1 margin-left-sm text-white" v-if="isLogin && userName">
+				<view style="position: relative;" class="u-flex-1 margin-left-sm text-white" v-if="isLogin && userName">
 					<view class="flex align-center justify-between">
 						<view class="">
 							<view class="u-font-18 text-white" @click="goNav('/pages/my/user')">
-								欢迎，{{ userName }}</view>
+								欢迎，{{ userName }}
+							</view>
 							<view class="labe margin-top-xs" @tap="stateSave" v-if="XCXIsSelect != '否'">
 								<view class="online-tag" v-if="isTrue">在线</view>
 								<view class="online-tag" v-if="!isTrue">离线</view>
@@ -18,6 +19,9 @@
 								<switch type="switch" :checked='isTrue' style="padding: 0 10rpx;transform:scale(0.8)"
 									color="#029d88" disabled />
 							</view>
+							<view class="qiandao" @click="goNavs('/my/qiandao/index')">
+								签到
+							</view>
 						</view>
 						
 						<!-- <view class="flex margin-left-sm " style="font-size: 22rpx;font-weight: 500;"
@@ -1485,6 +1489,19 @@ export default {
 
 <style lang="scss" scoped>
 @import url('https://fonts.googleapis.com/css2?family=Open+Sans:wght@300&display=swap');
+	.qiandao{
+		width: 61px;
+		height: 30px;
+		line-height: 30px;
+		border: 1px solid #fff;
+		color: #fff;
+		font-size: 12px;
+		text-align: center;
+		position: absolute;
+		top: 0;
+		right: 0;
+		border-radius: 40px;
+	}
 body {
   font-family: Helvetica Neue, Helvetica, sans-serif;
 }
@@ -1818,7 +1835,7 @@ uni-switch::before {
 	display: flex;
 	justify-content: center;
 	align-items: center;
-	background-image: linear-gradient(230deg, #263d49, #00a65a);
+	background: linear-gradient(-90deg, #019C88, #1BB9A5, #029D88);
 	// box-shadow: inset 40px 20px 60px #107050,
 	// 	inset -20px -40px 60px #00a55a;
 
diff --git a/pages/order/index.vue b/pages/order/index.vue
index 9856b72..58e4b4a 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -1179,6 +1179,6 @@
 		position: relative;
 	}
 	.text-cut{
-		width: 95%;
+		width: 75%;
 	}
 </style>
\ No newline at end of file