From b03cd456d3df4601dc5dabeef9d1ff9f47ce4301 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E9=98=81=E8=BE=89?=
 <yanggehui@chalco-steering.com>
Date: Fri, 7 Jan 2022 09:26:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B7=AF=E7=94=B1=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                    |  23 +---
 pages/trade/my-offer.vue      | 208 ----------------------------------
 pages/trade/quotationList.vue |   2 +-
 3 files changed, 2 insertions(+), 231 deletions(-)
 delete mode 100644 pages/trade/my-offer.vue

diff --git a/pages.json b/pages.json
index 3ea8906..46a2131 100644
--- a/pages.json
+++ b/pages.json
@@ -101,28 +101,7 @@
       }
     },
     {
-      "path": "components/not-logged/not-logged",
-      "style": {
-        "navigationBarTitleText": "",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "pages/trade/quotationList",
-      "style": {
-        "navigationBarTitleText": "",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "pages/trade/orderList",
-      "style": {
-        "navigationBarTitleText": "",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "pages/trade/my-offer",
+      "path": "pages/my-offer/index",
       "style": {
         "navigationBarTitleText": "我的报价",
         "enablePullDownRefresh": false
diff --git a/pages/trade/my-offer.vue b/pages/trade/my-offer.vue
deleted file mode 100644
index fd75c55..0000000
--- a/pages/trade/my-offer.vue
+++ /dev/null
@@ -1,208 +0,0 @@
-<template>
-	<view class="my-offer">
-		<!-- <uni-segmented-control :current="controlCurrent" :values="controlItems" @clickItem="onClickItem" styleType="text" activeColor="#007AFF"></uni-segmented-control> -->
-		<scroll-list style="touch-action: none" ref="orderRef" :option="orderOption" @load="orderUp" @refresh="orderDown">
-			<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>
-				</view>
-				<view class="list-border list-info-line" v-for="(item, index) in items.orderItemList" :key="index">
-					<view class="list-info list-border">
-						<view class=""><image class="list-image" :src="item.productImg" mode=""></image></view>
-						<view class="list-info-contant">
-							<view class="list-info-title">{{ item.brandName }}{{ item.categoryName }}</view>
-							<view class="list-info-text">
-								{{ item.categoryName }}/{{ item.brandName }}/{{ item.gramWeight }}g/{{ item.length }}*{{ item.width }}/{{ item.pieceQuantity }}张
-							</view>
-						</view>
-					</view>
-				</view>
-				<view class="list-border list-bottom-contant">
-					<view>
-						<text class="list-time">三分钟前</text>
-						<text class="list-title-Subtitle">¥{{ items.totalOfferPrice }}</text>
-					</view>
-				</view>
-				<uGap></uGap>
-			</view>
-		</scroll-list>
-	</view>
-</template>
-
-<script>
-import uGap from '@/components/u-gap/u-gap.vue'
-import scrollList from '@/components/scroll-list/scroll-list.vue'
-import { getEnterpriseList, gettradingHallList } from '@/apis/trade'
-export default {
-	// props: {
-	// 	queryOrderData: {
-	// 		type: Object,
-	// 		default: () => {}
-	// 	}
-	// },
-	components: {
-		uGap
-	},
-
-	data() {
-		return {
-			orderPagination: {
-				pageNum: 0, // 初始会执行一次下拉加载
-				pageSize: 10
-			},
-			orderData: [],
-			orderOption: {
-				size: 10,
-				auto: true,
-				emptyText: '暂无报价信息~',
-				background: '#F7F8FA',
-				fontSize: '40rpx'
-			},
-			orderParams: {
-				cooperationState: 0,
-				latitude: 23.12616,
-				longitude: 113.38466,
-				km: 5
-			}
-		}
-	},
-	watch: {
-		// queryOrderData(value) {
-		// 	console.log('value', value)
-		// },
-		orderParams: {
-			handler(val) {
-				this.getTradingQurty()
-			},
-			deep: true
-		}
-	},
-	onLoad(option) {
-		if (option) {
-			option.latitude && (this.params.latitude = option.latitude)
-			option.longitude && (this.params.longitude = option.longitude)
-			option.km && (this.params.km = option.km)
-		}
-		this.getTradingQurty()
-	},
-	methods: {
-		// 获取订单列表
-		getTradingQurty() {
-			return new Promise((resolve, reject) => {
-				gettradingHallList({ ...this.orderParams, ...this.orderPagination })
-					.then(res => {
-						if (res) {
-							if (this.orderPagination.pageNum == 1) {
-								this.orderData = res.records
-							} else {
-								this.orderData = this.orderData.concat(res.records)
-							}
-							resolve({ list: this.orderData, total: res.total })
-						}
-					})
-					.catch(err => {
-						reject(err)
-					})
-			})
-		},
-		//订单分页
-		orderUp(page) {
-			this.orderPagination.pageNum++
-			this.getTradingQurty()
-				.then(({ list, total }) => {
-					this.$refs.orderRef.loadSuccess({ list, total })
-				})
-				.catch(() => {
-					this.$refs.orderRef.loadFail()
-				})
-		},
-		//订单分页
-		orderDown() {
-			this.orderPagination.pageNum = 1
-			this.getTradingQurty()
-				.then(({ list, total }) => {
-					this.$refs.orderRef.refreshSuccess({ list, total })
-				})
-				.catch(() => {
-					this.$refs.orderRef.refreshFail()
-				})
-		}
-	}
-}
-</script>
-
-<style lang="scss">
-.my-offer {
-	margin-bottom: 0px;
-	.list-border {
-		// border-top: 1px solid #dddddd;
-		border-bottom: 1px solid #dddddd;
-	}
-	.list-title-line {
-		line-height: 44px;
-		padding-left: 24px;
-	}
-	.list-title {
-		font-family: PingFangSC-Semibold;
-		font-size: 30rpx;
-		color: #000000;
-		letter-spacing: 0;
-		font-weight: 600;
-	}
-	.list-title-Subtitle {
-		font-family: PingFangSC-Medium;
-		font-size: 30rpx;
-		color: #ff5368;
-		letter-spacing: 0;
-		text-align: right;
-		font-weight: 500;
-		float: right;
-		margin-right: 32rpx;
-	}
-	.list-info-line {
-		padding-left: 24px;
-		line-height: 35px;
-	}
-	.list-info-contant {
-		margin-left: 24px;
-	}
-	.list-info-title {
-		font-family: PingFangSC-Medium;
-		font-size: 30rpx;
-		color: #333333;
-		letter-spacing: 0;
-		text-align: left;
-		font-weight: 550;
-	}
-	.list-info-text {
-		font-family: PingFangSC-Regular;
-		font-size: 26rpx;
-		color: #888888;
-		letter-spacing: 0;
-		text-align: left;
-		line-height: 32px;
-		font-weight: 400;
-	}
-	.list-image {
-		width: 100rpx;
-		height: 100rpx;
-		margin-top: 10px;
-	}
-	.list-info {
-		display: flex;
-	}
-	.list-bottom-contant {
-		line-height: 35px;
-		padding-left: 24px;
-	}
-	.list-time{
-		font-family: PingFangSC-Regular;
-		font-size: 26rpx;
-		color: #888888;
-		letter-spacing: 0;
-		line-height: 32px;
-		font-weight: 400;
-	}
-}
-</style>
diff --git a/pages/trade/quotationList.vue b/pages/trade/quotationList.vue
index 8b8de06..2a3d3d5 100644
--- a/pages/trade/quotationList.vue
+++ b/pages/trade/quotationList.vue
@@ -160,7 +160,7 @@ export default {
 		nativeTo(){
 			console.log(11)
 			uni.navigateTo({
-			    url: 'my-offer'
+			    url: '../my-offer/index'
 			});
 		},
 	}