From 1d202d3e8688dc1aa3345bbe74a2e0a9d5e5bb97 Mon Sep 17 00:00:00 2001
From: youmengting <2080639302@qq.com>
Date: Wed, 22 Nov 2023 16:51:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AE=A2=E5=8D=95=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                       |  10 +-
 Utils/Request.js                              |   4 +-
 manifest.json                                 |   3 +-
 pages.json                                    |  27 +++--
 pages/home/oderDetails/oderDetails.vue        |  58 +++++----
 pages/login/login/login.vue                   |  14 +--
 pages/login/updatePsd/updatePsd.vue           |  13 +-
 pages/tabBar/home/home.vue                    | 110 +++++++++--------
 pages/tabBar/user/user.vue                    |   5 +-
 .../user/orderStatistics/orderStatistics.vue  | 114 +++++++++++-------
 uni.scss                                      |  23 ++++
 11 files changed, 224 insertions(+), 157 deletions(-)

diff --git a/App.vue b/App.vue
index b485264..07ebc11 100644
--- a/App.vue
+++ b/App.vue
@@ -24,10 +24,16 @@
 			positionGunPrice:0
 		},
 		onLaunch: function() {
-			console.log('App Launch')
+			if(!uni.getStorageSync('oiluser')||!uni.getStorageSync('oiltoken')){
+				uni.reLaunch({
+					url:'/pages/login/login/login'
+				})
+			}
 		},
 		onShow: function() {
-			console.log('App Show')
+			this.globalData.userInfo = uni.getStorageSync('oiluser') || '';
+			this.globalData.token = uni.getStorageSync('oiltoken') || '';
+			
 		},
 		onHide: function() {
 			console.log('App Hide')
diff --git a/Utils/Request.js b/Utils/Request.js
index 38d3043..bccfac4 100644
--- a/Utils/Request.js
+++ b/Utils/Request.js
@@ -18,11 +18,11 @@ function request(method, url, data) {
 					app.globalData.userInfo = '';
 					app.globalData.token = '';
 					uni.setStorage({
-						key: "user",
+						key: "oiluser",
 						data: ''
 					})
 					uni.setStorage({
-						key: "token",
+						key: "oiltoken",
 						data: ''
 					})
 					uni.showToast({
diff --git a/manifest.json b/manifest.json
index 936198d..1877f41 100644
--- a/manifest.json
+++ b/manifest.json
@@ -52,7 +52,8 @@
     "mp-weixin" : {
         "appid" : "wx6c929e52fcd8913a",
         "setting" : {
-            "urlCheck" : false
+            "urlCheck" : true,
+            "minified" : true
         },
         "usingComponents" : true
     },
diff --git a/pages.json b/pages.json
index a738834..c536cb7 100644
--- a/pages.json
+++ b/pages.json
@@ -1,5 +1,19 @@
 {
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+		 {
+		 	"path": "pages/tabBar/home/home",
+		 	"style": {
+		 		"navigationBarTextStyle": "white",
+		 		"navigationBarTitleText": "嗨森逛",
+		 		"navigationBarBackgroundColor": "#0083f5",
+		 		"backgroundColorTop": "#0083f5",
+		 		"onReachBottomDistance": 50,
+		 		"app-plus": {
+		 			"titleNView": false, //禁用原生导航栏
+		 			"softinputNavBar": "none"
+		 		}
+		 	}
+		 }, 
 		 {
 			"path": "pages/login/login/login",
 			"style": {
@@ -27,19 +41,6 @@
 				"enablePullDownRefresh": false
 			}
 
-		}, {
-			"path": "pages/tabBar/home/home",
-			"style": {
-				"navigationBarTextStyle": "white",
-				"navigationBarTitleText": "嗨森逛",
-				"navigationBarBackgroundColor": "#0083f5",
-				"backgroundColorTop": "#0083f5",
-				"onReachBottomDistance": 50,
-				"app-plus": {
-					"titleNView": false, //禁用原生导航栏
-					"softinputNavBar": "none"
-				}
-			}
 		}, {
 			"path": "pages/home/oderDetails/oderDetails",
 			"style": {
diff --git a/pages/home/oderDetails/oderDetails.vue b/pages/home/oderDetails/oderDetails.vue
index a1f0fd5..4531f87 100644
--- a/pages/home/oderDetails/oderDetails.vue
+++ b/pages/home/oderDetails/oderDetails.vue
@@ -1,19 +1,20 @@
 <template>
 	<view>
-		<image class="headimg" src="../../../static/img/odrdes.png"></image>
+		<image class="headimg" mode="aspectFill" src="../../../static/img/odrdes.png"></image>
 		<view class="headsearch">
 			<view class="heads">
 				<view class="ordslef">已支付订单</view>
-				<view class="ordsrig">{{oilorderdetails.payTime | timeFormat('yyyy-mm-dd hh:mm:ss')}}</view>
+				<view class="ordsrig" v-if="oilorderdetails.payTime">{{oilorderdetails.payTime | timeFormat('yyyy-mm-dd hh:mm:ss')}}</view>
 			</view>
 			<view class="heads">
-				<view class="prices">实际支付: <text style="font-size: 16px;margin-left: 5px;">
-						¥{{oilorderdetails.payRealPrice}}</text></view>
+				<view class="prices">实际支付: 
+				<text style="font-size: 16px;margin-left: 5px;" >¥{{oilorderdetails.payPrice || 0}}</text>
+				</view>
 			</view>
 			<view class="line1con"></view>
 			<view style="padding-top: 15px;">
 				<view class="prices">优惠立减: <text style="font-size: 16px;margin-left: 5px;">
-						¥{{oilorderdetails.deductionPrice}}</text></view>
+						¥{{oilorderdetails.totalDeductionPrice || 0 }}</text></view>
 			</view>
 		</view>
 		<view class="width92 height20 titles fcor333 font15 mart15 fontwig6">
@@ -25,19 +26,19 @@
 		</view>
 		<view class="width92 fcor666 font14 mart20 alijusstart">
 			<view class="width20">交易单号</view>
-			<view class="width80p fotrt">{{oilorderdetails.orderNo}}</view>
+			<view class="width80p fotrt">{{oilorderdetails.orderNo || ''}}</view>
 		</view>
 		<view class="width92 fcor666 font14 mart20 alijusstart">
 			<view class="width20">下单时间</view>
-			<view class="width80p fotrt">{{oilorderdetails.createTime | timeFormat('yyyy-mm-dd hh:mm:ss')}}</view>
+			<view class="width80p fotrt" v-if="oilorderdetails.createTime">{{oilorderdetails.createTime | timeFormat('yyyy-mm-dd hh:mm:ss')}}</view>
 		</view>
 		<view class="width92 fcor666 font14 mart20 alijusstart">
 			<view class="width20">油站名称</view>
-			<view class="width80p fotrt">{{oilorderdetails.gasName}}</view>
+			<view class="width80p fotrt">{{oilorderdetails.storeName || ''}}</view>
 		</view>
 		<view class="width92 fcor666 font14 mart20 alijusstart">
 			<view class="width20">地址</view>
-			<view class="width80p fotrt">{{oilorderdetails.gasAddress}}</view>
+			<view class="width80p fotrt">{{oilorderdetails.storeAddress || ''}}</view>
 		</view>
 		<view class="width92 line1 mart15"></view>
 		<view class="width92 height20 fcor333 font15 mart20">
@@ -45,19 +46,19 @@
 		</view>
 		<view class="width92 fcor666 font14 mart20 alijusstart">
 			<view class="width20">油号/油枪</view>
-			<view class="width80p fotrt">{{oilorderdetails.gasOilNo}}#/{{oilorderdetails.gasGunNo}}号枪</view>
+			<view class="width80p fotrt" v-if="oilorderdetails.gasOilNo!= undefined">{{oilorderdetails.gasOilNo}}#/{{oilorderdetails.gasGunNo}}号枪</view>
 		</view>
 		<view class="width92 fcor666 font14 mart20 alijusstart">
-			<view class="width20">油站价</view>
-			<view class="width80p fotrt">¥{{oilorderdetails.gasPriceGun}}</view>
+			<view class="width20">油站单价</view>
+			<view class="width80p fotrt">¥{{oilorderdetails.gasPriceGun || ''}}/L</view>
 		</view>
 		<view class="width92 fcor666 font14 mart20 alijusstart">
 			<view class="width80p">加油升数<text class="fcor999 font13">实际升数以油站加油机为准</text></view>
-			<view class="width20 fotrt">{{oilorderdetails.gasOilLiters}}升</view>
+			<view class="width20 fotrt" v-if="oilorderdetails.gasOilLiters!=undefined">{{oilorderdetails.gasOilLiters}}升</view>
 		</view>
 		<view class="width92 fcor666 font14 mart20 alijusstart">
 			<view class="width20">加油金额</view>
-			<view class="width80p fotrt">¥{{oilorderdetails.totalPrice}}</view>
+			<view class="width80p fotrt">¥{{oilorderdetails.gasRefuelPrice || 0}}</view>
 		</view>
 		<view class="width92 line1 mart15"></view>
 		<view class="width92 height20 fcor333 font15 mart20">
@@ -65,40 +66,36 @@
 		</view>
 		<view class="width92 fcor666 font14 mart20 alijusstart">
 			<view class="width20">加油折扣</view>
-			<view class="width80p fotrt" v-if="oilorderdetails.gasDiscount">¥{{oilorderdetails.gasDiscount}}</view>
-			<view class="width80p fotrt" v-else>0折</view>
+			<view class="width80p fotrt" >{{oilorderdetails.gasDiscount || 0}}折</view>
 		</view>
 		<view class="width92 fcor666 font14 mart20 alijusstart">
 			<view class="width20">加油补贴</view>
-			<view class="width80p fotrt" v-if="oilorderdetails.gasOilSubsidy">¥{{oilorderdetails.gasOilSubsidy}}</view>
-			<view class="width80p fotrt" v-else>¥0</view>
+			<view class="width80p fotrt" >¥{{oilorderdetails.gasOilSubsidy || 0}}</view>
 		</view>
-		<view class="width92 fcor666 font14 mart20 alijusstart">
+		<view class="width92 fcor666 font14 mart20 alijusstart" >
 			<view class="width20">每升优惠</view>
-			<view class="width80p fotrt" v-if="oilorderdetails.gasLitersPreferences">
-				¥{{oilorderdetails.gasLitersPreferences}}</view>
-			<view class="width80p fotrt" v-else>¥0</view>
+			<view class="width80p fotrt" >¥{{oilorderdetails.gasLitersPreferences || 0}}</view>
 		</view>
-		<view class="width92 fcor666 font14 mart20 alijusstart">
+		<view class="width92 fcor666 font14 mart20 alijusstart" >
 			<view class="width20">优惠价格</view>
-			<view class="width80p fotrt" v-if="oilorderdetails.gasPricePreferences">
-				¥{{oilorderdetails.gasPricePreferences}}</view>
-			<view class="width80p fotrt" v-else>¥0</view>
+			<view class="width80p fotrt" >¥{{oilorderdetails.gasPricePreferences || 0}}</view>
 		</view>
 		<view class="width92 line1 mart15"></view>
 		<view class="width92 fcor666 font18 mart20 alijusstart">
 			<view class="width50">加油实付金额</view>
-			<view class="width50 fcor333 fontwig6  fotrt">¥{{oilorderdetails.payRealPrice}}</view>
+			<view class="width50 fcor333 fontwig6  fotrt">¥{{oilorderdetails.payPrice}}</view>
 		</view>
 		<view class="width92 line1 mart15"></view>
 		<view class="width92 fcor666 font16 mart20 alijusstart">
 			<view class="width50" v-if="oilorderdetails.payType == 1">支付宝支付</view>
 			<view class="width50" v-if="oilorderdetails.payType == 2">微信支付</view>
-			<view class="width50" v-if="oilorderdetails.payType == 3">金币支付</view>
+			<view class="width50" v-if="oilorderdetails.payType == 3">积分兑换</view>
 			<view class="width50" v-if="oilorderdetails.payType == 4">汇联通工会卡支付</view>
 			<view class="width50" v-if="oilorderdetails.payType == 5">银联支付</view>
 			<view class="width50" v-if="oilorderdetails.payType == 6">银联分期支付</view>
-			<view class="width50 fotrt">¥{{oilorderdetails.payRealPrice}}</view>
+			<view class="width50" v-if="oilorderdetails.payType == 7">嗨森逛个人油卡</view>
+			<view class="width50" v-if="oilorderdetails.payType == 8">嗨森逛车队油卡</view>
+			<view class="width50 fotrt">¥{{oilorderdetails.payPrice}}</view>
 		</view>
 		<view class="height40p"></view>
 	</view>
@@ -121,7 +118,7 @@
 		},
 		methods: {
 			
-			啊
+			
 			getGasOrderDetail() {
 				uni.showLoading({
 					title: '加载中'
@@ -145,6 +142,7 @@
 		position: absolute;
 		width: 100%;
 		height: 180px;
+		z-index: -1;
 	}
 
 	.headsearch {
diff --git a/pages/login/login/login.vue b/pages/login/login/login.vue
index db771b3..f486608 100644
--- a/pages/login/login/login.vue
+++ b/pages/login/login/login.vue
@@ -74,18 +74,10 @@
 					uni.hideLoading();
 					this.isRotate = false;
 					if (res.return_code == '000000' && res.return_data) {
-						app.globalData.userInfo = res.return_data
-							.object;
+						app.globalData.userInfo = res.return_data.object;
 						app.globalData.token = res.return_data.uniqueCode;
-						uni.setStorage({
-							key: "oiluser",
-							data: res.return_data
-								.object
-						})
-						uni.setStorage({
-							key: "oiltoken",
-							data: res.return_data.uniqueCode
-						})
+						uni.setStorageSync('oiluser',res.return_data.object);
+						uni.setStorageSync('oiltoken',res.return_data.uniqueCode);
 						uni.setStorage({
 							key: "oilaccount",
 							data: this.phoneData
diff --git a/pages/login/updatePsd/updatePsd.vue b/pages/login/updatePsd/updatePsd.vue
index 9b36242..356d049 100644
--- a/pages/login/updatePsd/updatePsd.vue
+++ b/pages/login/updatePsd/updatePsd.vue
@@ -89,7 +89,18 @@
 										duration: 2000,
 										success() {
 											setTimeout(() => {
-												uni.navigateBack({})
+												app.globalData.userInfo = '';
+												app.globalData.token = '';
+												uni.setStorageSync('oiluser','');
+												uni.setStorageSync('oiltoken','');
+												uni.setStorage({
+													key: "oilpass",
+													data: that.conNewPass
+												})
+												uni.redirectTo({
+													url:'/pages/login/login/login'
+												})
+												
 											}, 1500);
 										}
 									})
diff --git a/pages/tabBar/home/home.vue b/pages/tabBar/home/home.vue
index c307629..28706b5 100644
--- a/pages/tabBar/home/home.vue
+++ b/pages/tabBar/home/home.vue
@@ -1,52 +1,43 @@
 <template>
-	<view>
-		<image mode="widthFix" class="width100 headimg" src="../../../static/img/head.png"></image>
-		<view class="headsearch fotct">
+	<view class="font16">
+		<view class="headsearch fotct mart10">
+			<image mode="aspectFill" class="width100 headimg" src="../../../static/img/head.png"></image>
 			<view class="input-box fotlt">
 				<input placeholder="订单搜索" v-model="orderNo" placeholder-style="color:#c0c0c0;" @input="searchOrder()" />
 				<view class="icon search"></view>
 			</view>
 		</view>
-		<view class="width94 alijusstart height50 fotct font14">
-			<view class="width33" :class="[type=='0' ? 'fcor089' : 'fcor333']" @click="updateStu(0)">全部</view>
-			<view class="width33" :class="[type=='3' ? 'fcor089' : 'fcor333']" @click="updateStu(3)">已完成</view>
-			<view class="width33" :class="[type=='4' ? 'fcor089' : 'fcor333']" @click="updateStu(4)">已退款</view>
+		<view class="width94 alijusstart height50 fotct  ">
+			<view class="width33" :class="[type=='0' ? 'fcor089 border-b089 ' : 'fcor333']" @click="updateStu(0)">全部</view>
+			<view class="width33" :class="[type=='2' ? 'fcor089 border-b089' : 'fcor333']" @click="updateStu(2)">已支付</view>
+			<view class="width33" :class="[type=='4' ? 'fcor089 border-b089' : 'fcor333']" @click="updateStu(4)">已退款</view>
 		</view>
-		<view v-if="orderList == ''" class="mart40 fotct font14 fcor666">
+		<view v-if="orderList == ''" class="mart40 fotct  fcor666">
 			<image mode="widthFix" style="width: 70vw;" src="../../../static/img/noorder1.png"></image>
 		</view>
-		<view class="width94 backcorfff headcont mart10" v-for="(item,index) in orderList" :key="index"
+		<view class="width94 backcorfff headcont mart10 pd-main font14" v-for="(item,index) in orderList" :key="index"
 			@click="jumpDetails(item.orderNo)">
-			<view class="alijusstart width94 height30 fcor333 paddtop5">
-				<view class="width70 font14 text1">{{item.orderNo}}</view>
-				<image class="iconw alicntend" mode="widthFix" src="../../../static/img/jtg.png"></image>
-				<text class="width20 font14 fotrt" v-if="item.status == 1">待支付</text>
-				<text class="width20 font14 fotrt" v-if="item.status == 2">已支付</text>
-				<text class="width20 font14 fotrt" v-if="item.status == 3">已完成</text>
-				<text class="width20 font14 fotrt" v-if="item.status == 4">已退款</text>
-				<text class="width20 font14 fotrt" v-if="item.status == 5">已取消</text>
-				<text class="width20 font14 fotrt" v-if="item.status == 6">已退款</text>
-				<text class="width20 font14 fotrt" v-if="item.status == 7">拒绝退款</text>
+			<view class="alijusstart fcor333 paddtop10 paddbotm10 bor-botm1">
+				<text :user-select="true" class="  text1">{{item.orderNo}}</text>
+				<image class="iconw margle " style="height: 15px;" mode="widthFix" src="../../../static/img/jtg.png"></image>
+				<text class="flex-1  fotrt" >{{item.status | filterStatus }}</text>
 			</view>
-			<view class="line1 width94"></view>
-			<view class="width94 mart5">
-				<image :src="item.gasLogo" mode="widthFix" class="counimgs flleft"></image>
-				<view class="counscou paddtop10">
-					<view class="width94 height25 font14 fcor666">
-						油品: <text class="margle marglerig">{{item.gasOilNo}}</text> 升数: <text
-							class="margle">{{item.gasOilLiters}}L</text>
-					</view>
-					<view class="width94 height25 alijusstart ">
-						<view class="width50 font14 fcor666">加油金额: ¥{{item.totalPrice}}</view>
-						<view class="width50 font14 fcor333 fotrt">实付:
-							<text class="font18" v-if="item.payRealPrice">¥{{item.payRealPrice}}</text>
-							<text class="font18" v-else>¥0</text>
-						</view>
+			<view class="paddtop10 paddbotm10 bor-botm1">
+				<view class=" dis-flex  fcor666">
+					油号/枪号: <text class="margle marglerig">{{item.gasOilNo}}#/{{item.gasGunNo}}号枪</text>
+				</view>
+				<view class=" dis-flex  fcor666 mart5">
+					升数:<text class="margle">{{item.gasOilLiters}}L</text>
+				</view>
+				<view class="dis-flex flex-sp mart5">
+					<view class="  fcor666">加油金额: ¥{{item.gasRefuelPrice}}</view>
+					<view class="  fcor333 fotrt dis-flex font18">实付:
+						<text class="margle" >¥{{item.payPrice || 0}}</text>
+						
 					</view>
 				</view>
 			</view>
-			<view class="line1 width94 mart5"></view>
-			<view class="height30 width94 mart5 font14 fcor666">下单时间:
+			<view class="paddtop10 mart5  fcor666">下单时间:
 				{{item.createTime | timeFormat('yyyy-mm-dd hh:mm:ss')}}
 			</view>
 		</view>
@@ -59,7 +50,6 @@
 	} from '../../../Utils/Api.js';
 	let app = getApp();
 	export default {
-		components: {},
 		data() {
 			return {
 				type: 0, // 当前状态
@@ -72,6 +62,26 @@
 				userinfo: '' //用户数据
 			};
 		},
+		filters:{
+			filterStatus(value){
+				switch (value) {
+				    case 1:
+				       return "待支付";
+				    case 2:
+				        return "已支付";
+					case 3:
+					   return "已取消";
+					case 4:
+					    return "已退款";
+					case 5:
+					   return "退款中";
+					case 6:
+					    return "退款失败";
+				    default:
+				        return "未知";
+				}
+			}
+		},
 		onShow() {
 			let that = this;
 			that.userinfo = app.globalData.userInfo;
@@ -105,7 +115,6 @@
 
 		},
 		onLoad() {
-
 			this.socketio();
 		},
 		onReachBottom() { //上拉触底函数
@@ -221,9 +230,9 @@
 	}
 
 	.input-box {
-		width: 90%;
-		margin-left: 5%;
-		top: 55px;
+		width: 76%;
+		margin: 0 auto;
+		// top: 55px;
 		height: 70rpx;
 		background-color: #f5f5f5;
 		border-radius: 10rpx;
@@ -232,13 +241,9 @@
 		align-items: center;
 
 		.icon {
-			display: flex;
-			align-items: center;
-			position: absolute;
-			top: 0;
-			right: 0;
 			width: 60upx;
 			height: 60upx;
+			line-height: 60upx;
 			font-size: 40upx;
 			color: #c0c0c0;
 		}
@@ -253,16 +258,19 @@
 
 	.headimg {
 		position: absolute;
-		max-height: 150px;
+		height: 150px;
 	}
 
 	.headsearch {
 		position: relative;
-		height: 145px;
+		height: 150px;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
 	}
 
 	.headcont {
-		height: 150px;
+		// height: 150px;
 		border-radius: 8px;
 	}
 
@@ -278,4 +286,8 @@
 	.counscou {
 		margin-left: 70px;
 	}
-</style>
+	
+	.border-b089{
+		border-bottom: 3px solid #089bf5;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/tabBar/user/user.vue b/pages/tabBar/user/user.vue
index 6aaaf1c..246028c 100644
--- a/pages/tabBar/user/user.vue
+++ b/pages/tabBar/user/user.vue
@@ -22,10 +22,10 @@
 		<!-- 消息中心 -->
 		<view class="width100  backcorfff" @click="jumpmess">
 			<view class="width94 alijusstart height50">
-				<image src="../../../static/img/mer6.png" mode="widthFix" class="iconw25 marglerig"></image>
+				<image src="../../../static/img/mer6.png" mode="widthFix" class="iconw25 marglerig" style="height: 25px;"></image>
 				<text class="width85 font14">消息中心</text>
 				<!-- <view class="width70 fotrt fcor666 font14">异常商户号通知</view> -->
-				<image class="iconw alicntend" mode="widthFix" src="../../../static/img/jtg.png"></image>
+				<image class="iconw alicntend" mode="widthFix" src="../../../static/img/jtg.png" style="height: 15px;"></image>
 			</view>
 		</view>
 		<!-- 菜单功能 -->
@@ -185,6 +185,7 @@
 
 		.funicon {
 			width: 25px;
+			height: 25px;
 			padding-top: 15px;
 		}
 	}
diff --git a/pages/user/orderStatistics/orderStatistics.vue b/pages/user/orderStatistics/orderStatistics.vue
index 9be09e0..90ceac5 100644
--- a/pages/user/orderStatistics/orderStatistics.vue
+++ b/pages/user/orderStatistics/orderStatistics.vue
@@ -1,46 +1,46 @@
 <template>
-	<view>
-		<view class="headsearch width94 mart15 paddtop15 paddbotm10 fotct">
-			<view class="font15 height40 fcorfff width94">总加油金额</view>
-			<view class="font28 fcorfff width94">¥<text class="margle font40">{{GasOrder.refuelPrice}}</text></view>
+	<view class="pd-main font16">
+		<view class="headsearch   paddtop10 paddbotm10 fotct">
+			<view class="  fcorfff paddtop10 paddbotm10 ">总加油金额</view>
+			<view class="font28 fcorfff ">¥<text class="margle font40">{{GasOrder.refuelPrice || 0}}</text></view>
 			<view class="alijus marb20 mart10">
-				<view class="width50 fcorfff font16">
+				<view class="width50 fcorfff ">
 					<view class="width100">总笔数</view>
-					<view class="width100 mart10 font22">{{GasOrder.refuelNum}} 笔</view>
+					<view class="width100 mart10 font22">{{GasOrder.refuelNum || 0}} 笔</view>
 				</view>
-				<view class="width50 fcorfff font16">
+				<view class="width50 fcorfff ">
 					<view class="width100">总升数</view>
-					<view class="width100 mart10 font22">{{GasOrder.refuelLiters}} 升</view>
+					<view class="width100 mart10 font22">{{GasOrder.refuelLiters || 0}} 升</view>
 				</view>
 			</view>
 		</view>
-		<view class="headsearch width94 mart15 paddtop5 paddbotm10 fotct">
+		<view class="headsearch  mart15 paddtop10 paddbotm10 fotct">
 
-			<view class="mart10 width90 alijusstart">
+			<view class="mart10 width90 dis-flex flex-sp">
 				<view class="fcorfff font14 margleri10 width60 fotlt">开始时间 :</view>
 				<picker mode="date" :value="startdate" :start="startDate" :end="endDate" @change="bindDateChange">
 					<view class="uni-input datetim fcorfff">{{startdate}}<i class="down"></i></view>
 				</picker>
 			</view>
-			<view class="mart10 width90 alijusstart">
+			<view class="mart10 width90 dis-flex flex-sp">
 				<view class="fcorfff font14 margleri10 width60 fotlt">结束时间 :</view>
 				<picker mode="date" :value="enddate" :start="startDate" :end="endDate" @change="bindDateChange1">
 					<view class="uni-input datetim fcorfff">{{enddate}}<i class="down"></i></view>
 				</picker>
 			</view>
-			<view class="mart10 width90 alijusstart">
+			<view class="mart10 width90 dis-flex flex-sp">
 				<view class="fcorfff font14 margleri10 width60 fotlt">油品 :</view>
 				<picker mode="selector" :range="oilList" range-key="codeName" @change="changeUserCard">
 					<view class="uni-input datetim fcorfff font14">{{typeName}}<i class="down"></i></view>
 				</picker>
 			</view>
-			<view class="mart10 width90 alijusstart">
+			<view class="mart10 width90 dis-flex flex-sp">
 				<view class="fcorfff font14 margleri10 width60 fotlt">状态 :</view>
 				<picker mode="selector" :range="statulist" range-key="codeName" @change="changeUserstu">
 					<view class="uni-input datetim fcorfff font14">{{statusname}}<i class="down"></i></view>
 				</picker>
 			</view>
-			<view class="input-box fotlt alijusstart mart15 marb10">
+			<view class="input-box fotlt dis-flex flex-center mart15 marb10">
 				<input placeholder="订单号搜索" v-model="orderNo" placeholder-style="color:#c0c0c0;"
 					@input="searchOrder()" />
 				<view class="icon search"></view>
@@ -50,38 +50,30 @@
 		<view v-if="orderDetailsList == ''" class="mart40 fotct font14 fcor666">
 			<image mode="widthFix" style="width: 70vw;" src="../../../static/img/noorder.png"></image>
 		</view>
-		<view class="width94 backcorfff headcont mart10" v-for="(item,index) in orderDetailsList" :key="index"
+		
+		<view class=" backcorfff headcont mart10 pd-main font14" v-for="(item,index) in orderDetailsList" :key="index"
 			@click="jumpDetails(item.orderNo)">
-			<view class="alijusstart width94 height30 fcor333 paddtop5">
-				<view class="width70 font14 text1">{{item.orderNo}}</view>
-				<image class="iconw alicntend" mode="widthFix" src="../../../static/img/jtg.png"></image>
-				<text class="width20 font14 fotrt" v-if="item.status == 1">待支付</text>
-				<text class="width20 font14 fotrt" v-if="item.status == 2">已支付</text>
-				<text class="width20 font14 fotrt" v-if="item.status == 3">已完成</text>
-				<text class="width20 font14 fotrt" v-if="item.status == 4">已退款</text>
-				<text class="width20 font14 fotrt" v-if="item.status == 5">已取消</text>
-				<text class="width20 font14 fotrt" v-if="item.status == 6">已退款</text>
-				<text class="width20 font14 fotrt" v-if="item.status == 7">拒绝退款</text>
+			<view class="alijusstart fcor333 paddtop10 paddbotm10 bor-botm1">
+				<text :user-select="true" class="  text1">{{item.orderNo}}</text>
+				<image class="iconw margle " style="height: 15px;" mode="widthFix" src="/static/img/jtg.png"></image>
+				<text class="flex-1  fotrt" >{{item.status | filterStatus }}</text>
 			</view>
-			<view class="line1 width94"></view>
-			<view class="width94 mart5">
-				<image :src="item.gasLogo" mode="widthFix" class="counimgs flleft"></image>
-				<view class="counscou paddtop10">
-					<view class="width94 height25 font14 fcor666">
-						油品: <text class="margle marglerig">{{item.gasOilNo}}</text> 升数: <text
-							class="margle">{{item.gasOilLiters}}L</text>
-					</view>
-					<view class="width94 height25 alijusstart ">
-						<view class="width50 font14 fcor666">加油金额: ¥{{item.totalPrice}}</view>
-						<view class="width50 font14 fcor333 fotrt">实付:
-							<text class="font18" v-if="item.payRealPrice">¥{{item.payRealPrice}}</text>
-							<text class="font18" v-else>¥0</text>
-						</view>
+			<view class="paddtop10 paddbotm10 bor-botm1">
+				<view class=" dis-flex  fcor666">
+					油号/枪号: <text class="margle marglerig">{{item.gasOilNo}}#/{{item.gasGunNo}}号枪</text>
+				</view>
+				<view class=" dis-flex  fcor666 mart5">
+					升数:<text class="margle">{{item.gasOilLiters}}L</text>
+				</view>
+				<view class="dis-flex flex-sp mart5">
+					<view class="  fcor666">加油金额: ¥{{item.gasRefuelPrice}}</view>
+					<view class="  fcor333 fotrt dis-flex font18">实付:
+						<text class="margle" >¥{{item.payPrice || 0}}</text>
+						
 					</view>
 				</view>
 			</view>
-			<view class="line1 width94 mart5"></view>
-			<view class="height30 width94 mart5 font14 fcor666">下单时间:
+			<view class="paddtop10 mart5  fcor666">下单时间:
 				{{item.createTime | timeFormat('yyyy-mm-dd hh:mm:ss')}}
 			</view>
 		</view>
@@ -116,15 +108,25 @@
 					codeValue: '',
 					codeName: '全部'
 				}, {
-					codeValue: 3,
-					codeName: '已完成'
+					codeValue: 1,
+					codeName: '待支付'
+				}, {
+					codeValue: 2,
+					codeName: '已支付'
 				}, {
+					codeValue: 3,
+					codeName: '已取消'
+				},{
 					codeValue: 4,
 					codeName: '已退款'
 				}, {
-					codeValue: 6,
+					codeValue: 5,
 					codeName: '退款中'
-				}, ], //状态
+				}, {
+					codeValue: 6,
+					codeName: '退款失败'
+				}, 
+				], //状态
 				statuid: '',
 				statusname: '全部',
 				orderDetailsList: [], //列表数据
@@ -144,6 +146,26 @@
 				return this.getDate('end');
 			}
 		},
+		filters:{
+			filterStatus(value){
+				switch (value) {
+				    case 1:
+				       return "待支付";
+				    case 2:
+				        return "已支付";
+					case 3:
+					   return "已取消";
+					case 4:
+					    return "已退款";
+					case 5:
+					   return "退款中";
+					case 6:
+					    return "退款失败";
+				    default:
+				        return "未知";
+				}
+			}
+		},
 		onReachBottom() { //上拉触底函数
 			if (!this.isLoadMore) { //此处判断，上锁，防止重复请求
 				this.isLoadMore = true
@@ -349,7 +371,7 @@
 	}
 
 	.headcont {
-		height: 150px;
+		// height: 150px;
 		border-radius: 8px;
 	}
 
diff --git a/uni.scss b/uni.scss
index c500f18..2421ee3 100644
--- a/uni.scss
+++ b/uni.scss
@@ -778,4 +778,27 @@ $uni-font-size-paragraph:30upx;
 
 .iconw40{
 	width: 40px;
+}
+
+.pd-main{
+	padding:20rpx;
+	box-sizing: border-box;
+}
+
+.dis-flex{
+	display: flex;
+	align-items: center;
+}
+.flex-sp{
+	justify-content: space-between;
+}
+.flex-center{
+	justify-content: center;
+}
+
+.flex-1{
+	flex:1;
+}
+.flex-s0{
+	flex-shrink: 0;
 }
\ No newline at end of file