From f37cebec8c493e8ff156fcbbce8cc100a826fc36 Mon Sep 17 00:00:00 2001
From: xvv <cccccc420590@163.com>
Date: Sun, 22 Sep 2024 15:14:08 +0800
Subject: [PATCH] 9.22

---
 gasStation-uni/pages.json                     |  4 +-
 .../pagesHome/myPointsOrder/myPointsOrder.vue | 99 +++++++++----------
 2 files changed, 47 insertions(+), 56 deletions(-)

diff --git a/gasStation-uni/pages.json b/gasStation-uni/pages.json
index 474b7e88b..f9a64a047 100644
--- a/gasStation-uni/pages.json
+++ b/gasStation-uni/pages.json
@@ -135,8 +135,8 @@
 				{
 					"path": "myPointsOrder/myPointsOrder",
 					"style": {
-						"navigationBarTitleText": "我的订单",
-						"navigationStyle": "custom"
+						"navigationBarTitleText": "我的订单"
+
 					}
 				},
 				{
diff --git a/gasStation-uni/pagesHome/myPointsOrder/myPointsOrder.vue b/gasStation-uni/pagesHome/myPointsOrder/myPointsOrder.vue
index 23295d104..fb4658f67 100644
--- a/gasStation-uni/pagesHome/myPointsOrder/myPointsOrder.vue
+++ b/gasStation-uni/pagesHome/myPointsOrder/myPointsOrder.vue
@@ -1,25 +1,28 @@
 <template>
 	<view class="content">
 		<view class="container">
-			<view class="my-header">
-				<view class="my-icons" @click="goback"> <uni-icons type="left" size="16"></uni-icons> </view>
-				<view class="my-text">我的订单</view>
-				<view class="my-icons"></view>
-			</view>
+
 			<!-- 顶部区域 -->
 			<view class="tap-box">
 				<view class="box-tap" :class="{ 'act' :actinput == index }" v-for="(item,index) in taplist" :key="index"
 					@click="getindex(index)">
 					<view class="">{{item.title }}</view>
-					<view class="gang" v-if="actinput == index"></view>
+					<!-- 	<view class="gang" v-if="actinput == index"></view> -->
 				</view>
 			</view>
 
 
 			<u-empty text="积分订单" v-if="orderList.length == 0" icon="http://cdn.uviewui.com/uview/empty/list.png">
 			</u-empty>
+			<view class="box_f">
+				<view class="box_top">
+					<view class="">订单号：xxxxxxxxxxxxxxxxxxxx</view>
+					<view class="">未使用</view>
+				</view>
+				<view class="box_cont"></view>
+			</view>
 
-			<view class="goods-box" v-for="(item,index) in orderList" :key="item.id" @click="orderDetails(item)">
+			<!-- 			<view class="goods-box" v-for="(item,index) in orderList" :key="item.id" @click="orderDetails(item)">
 				<view class="goods-top">
 					<view class="goods-img">
 						<image :src="baseUrl+item.coverImage" mode="aspectFit"></image>
@@ -42,17 +45,8 @@
 						<text>确认收货</text>
 					</view>
 				</view>
-				<!-- <view class="goods-bottom" v-if="actinput == 2 ">
-					<view class="sh-anniu" @click="refund()">
-						<text>点击退款</text>
-					</view>
-				</view> -->
-				<!-- <view class="goods-bottom" v-if="actinput == 3 ">
-					<view class="sh-anniu" @click="payment()">
-						<text>去付款</text>
-					</view>
-				</view> -->
-			</view>
+		
+			</view> -->
 
 			<u-empty v-if="arrList.length == 0" mode="list" icon="http://cdn.uviewui.com/uview/empty/list.png">
 			</u-empty>
@@ -81,17 +75,12 @@
 						title: '全部'
 					},
 					{
-						title: '待收货'
+						title: '未使用'
 					},
 					{
 						title: '已完成'
 					},
-					// {
-					// 	title: '已退款'
-					// },
-					// {
-					// 	title: '待支付'
-					// },
+
 
 
 				],
@@ -103,7 +92,7 @@
 
 		},
 		onShow() {
-			this.getIntegralOrderList()
+			// this.getIntegralOrderList()
 		},
 		methods: {
 			getindex(index) {
@@ -185,56 +174,41 @@
 
 	.container {
 		width: 100%;
-		height: 100%;
+		height: 100vh;
 		box-sizing: border-box;
-		padding-top: 88px;
+		background: #f4f5f6;
+
 	}
 
-	.my-header {
-		width: 100%;
-		height: 88px;
-		background: #ffffff;
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		color: #000;
-		box-sizing: border-box;
-		padding: 0px 15px;
-		padding-top: 40px;
-
-		.my-icons {
-			width: 20px;
-
-		}
-
-		position: fixed;
-		top: 0px;
-	}
 
 	.tap-box {
 		width: 100%;
-		height: 50px;
+		height: 30px;
 		display: flex;
 		align-items: center;
+		justify-content: space-around;
 		background-color: #ffffff;
 
 	}
 
 	.box-tap {
-		width: 20%;
+		width: 15%;
 		text-align: center;
+		height: 100%;
+		border-bottom: 2px solid transparent;
 
 	}
 
 	.act {
-		color: #2979ff;
+		color: #FA6400;
+		border-bottom: 2px solid #FA6400 !important;
 		font-weight: bold;
 	}
 
 	.gang {
 		width: 25px;
 		height: 5px;
-		background-color: #2979ff;
+		background-color: #FA6400;
 		border-radius: 8px;
 		margin: 2px auto;
 	}
@@ -313,7 +287,24 @@
 		box-sizing: border-box;
 		padding: 5px 10px;
 		border-radius: 50px;
-		border: 1px solid #2979ff;
-		color: #2979ff;
+		border: 1px solid #FA6400;
+		color: #FA6400;
+	}
+
+	.box_f {
+		width: 95%;
+		border-radius: 8px;
+		background: #ffffff;
+		margin: 15px auto;
+	}
+
+	.box_top {
+		width: 100%;
+		box-sizing: border-box;
+		padding: 10px;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		font-size: 14px;
 	}
 </style>
\ No newline at end of file