From 144a9b2e1a23ec93db1b377d2883d43f98a2a1f9 Mon Sep 17 00:00:00 2001
From: buffeyu <271839173@qq.com>
Date: Sun, 9 Jan 2022 11:32:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B7=AF=E7=94=B1=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                |  3 ++-
 pages/my-offer/index.vue  | 26 ++++++++++++++++++++------
 pages/trade/orderList.vue |  2 +-
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/pages.json b/pages.json
index 4f49eaf..a981a98 100644
--- a/pages.json
+++ b/pages.json
@@ -104,7 +104,8 @@
     {
       "path": "pages/my-offer/index",
       "style": {
-        "navigationBarTitleText": "我的报价",
+        "navigationBarTitleText": "我的报价",
+		 "navigationStyle": "custom",
         "enablePullDownRefresh": false
       }
     },
diff --git a/pages/my-offer/index.vue b/pages/my-offer/index.vue
index a6800fa..a9ef9fa 100644
--- a/pages/my-offer/index.vue
+++ b/pages/my-offer/index.vue
@@ -1,11 +1,17 @@
 <template>
 	<view class="my-offer">
-		<uni-nav-bar left-icon="back" @clickLeft="back" statusBar fixed title="我的报价"></uni-nav-bar>
+		<view>
+			<uni-nav-bar left-icon="back" @clickLeft="back" statusBar fixed title="">
+				<view class="my-offer-title">我的报价</view>
+				<view slot="left"></view>
+				<view slot="right"></view>
+			</uni-nav-bar>
+		</view>
 		<scroll-list style="touch-action: none" ref="orderRef" :option="orderOption" @load="orderUp" @refresh="orderDown">
 			<view  v-for="(items,index) in orderData" :key="index" @click="myPriceInfo(items)">
 				<view class="list-border list-title-line">
 					<text class="list-title">广州民族印刷有限公司</text>
-					<text class="list-title-Subtitle">{{ items.orderStatus }}</text>
+					<text class="list-title-Subtitle">{{controlItems[items.orderStatus -1] }}</text>
 				</view>
 				<view class="list-border list-info-line" v-for="(item, index) in items.orderItemList" :key="index">
 					<view class="list-info" :class="index===items.orderItemList.length?'list-border':''">
@@ -57,7 +63,7 @@ export default {
 			},
 			orderData: [],
 			controlCurrent:0,
-			controlItems: ['全部', '待确认', '待发货', '已完成'],
+			controlItems: ['待付款', '待发货', '待收货', '已完成','已关闭'],
 			orderOption: {
 				size: 10,
 				auto: true,
@@ -73,10 +79,9 @@ export default {
 			}
 		}
 	},
+	filters:{
+	},
 	watch: {
-		// queryOrderData(value) {
-		// 	console.log('value', value)
-		// },
 		orderParams: {
 			handler(val) {
 				this.getTradingQurty()
@@ -159,6 +164,15 @@ export default {
 		padding-left: 48rpx;
 		background: #FFFFFF;
 	}
+	.my-offer-title {
+		width: 100%;
+		font-family: PingFangSC-Medium;
+		font-size: 36rpx;
+		color: #000000;
+		letter-spacing: 0;
+		text-align: center;
+		font-weight: 500;
+	}
 	.list-title {
 		font-family: PingFangSC-Semibold;
 		font-size: 30rpx;
diff --git a/pages/trade/orderList.vue b/pages/trade/orderList.vue
index 4ce60ac..e1deb0d 100644
--- a/pages/trade/orderList.vue
+++ b/pages/trade/orderList.vue
@@ -5,7 +5,7 @@
 			<view v-for="(items, index) in orderData" :key="index">
 				<view class="list-border list-title-line">
 					<text class="list-title">广州民族印刷有限公司</text>
-					<text class="list-title-Subtitle">{{ items.orderStatus }}</text>
+					<text class="list-title-Subtitle">{{controlItems[items.orderStatus-1]  }}</text>
 				</view>
 				<view class="list-border list-info-line" v-for="(item, index) in items.orderItemList" :key="index">
 					<view class="list-info " :class="index===items.orderItemList.length?'list-border':''">