From e4713149ad8ca1f90187d452d68dccd7d18a11df Mon Sep 17 00:00:00 2001
From: mullins <476823686@qq.com>
Date: Mon, 25 May 2020 19:02:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E8=AE=A2=E5=8D=95=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages.json                |  10 ++
 src/pages/myOrder/myOrder.vue | 286 ++++++++++++++++++++++--------------------
 2 files changed, 158 insertions(+), 138 deletions(-)

diff --git a/src/pages.json b/src/pages.json
index d01b3ad..195200a 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -193,6 +193,16 @@
                 "query": ""
             },
             {
+                "name": "我的订单",
+                "path": "pages/myOrder/myOrder",
+                "query": ""
+            },
+            {
+                "name": "待付款订单详情",
+                "path": "pages/myOrderPaying/myOrderPaying",
+                "query": ""
+            },
+            {
                 "name": "我的",
                 "path": "pages/user/user",
                 "query": ""
diff --git a/src/pages/myOrder/myOrder.vue b/src/pages/myOrder/myOrder.vue
index 5e825af..b012d7a 100644
--- a/src/pages/myOrder/myOrder.vue
+++ b/src/pages/myOrder/myOrder.vue
@@ -1,147 +1,157 @@
 <template>
-	<view class="content">
-		<view class="header">
-			<!-- 搜索-->
-			<!-- <view class="searchBar">
-				<icon class="searchIcon" type="search" size="14"></icon>
-				<input class="searchIpt" placeholder="搜索订单关键字..." confirm-type="search"/>
-			</view> -->
-			<view class="screenBar">
-				<view  v-for="item in screenItems" :key="item.current" @click="onClickItem(item.current)"  >
-						<view class="screenItem"  v-bind:class="{ active: current === item.current }">{{ item.text }}</view>
-				</view>
-			</view>
-		</view>
-		<view class="orderList" >
-			<view
-			  v-for="(order) in orderList"
-			  :key="order.orderId"
-			>
-				<OrderCard :order = "order" :current="current"></OrderCard>
-			</view>
-		</view>
-		<view class="footer" >没有更多订单了，去商城看看吧~</view>
-	</view>
+  <view class="content">
+    <view class="header">
+      <!-- 搜索-->
+      <!-- <view class="searchBar">
+        <icon class="searchIcon" type="search" size="14"></icon>
+        <input class="searchIpt" placeholder="搜索订单关键字..." confirm-type="search"/>
+      </view> -->
+      <view class="screenBar">
+        <view
+          v-for="item in screenItems"
+          :key="item.current"
+          @click="onClickItem(item.current)"
+        >
+          <view
+            class="screenItem"
+            v-bind:class="{ active: current === item.current }"
+          >{{ item.text }}</view>
+        </view>
+      </view>
+    </view>
+    <view class="orderList">
+      <view
+        v-for="(order) in orderList"
+        :key="order.orderId"
+      >
+        <OrderCard
+          :order="order"
+          :current="current"
+        ></OrderCard>
+      </view>
+    </view>
+    <view class="footer">没有更多订单了，去商城看看吧~</view>
+  </view>
 </template>
 <script>
-	import OrderCard from './components/OrderCard.vue';
-	import store from '@/store';
+import OrderCard from './components/OrderCard.vue'
+import store from '@/store'
 
-	export default {
-		components:{
-			'OrderCard': OrderCard
-		},
-		data() {
-			return {
-				//顶部筛选项
-				screenItems: [
-					{current:"10",text:'全部'},
-					{current:"0",text:'待付款'},
-					{current:"1",text:'待收货'},
-					{current:"2",text:'已完成'},
-					// {current:"3",text:'已评价'},
-					// {current:"4",text:'退款'},
-					],
-				//当前所在item 默认10-->全部
-				current: "10",
-			};
-		},
+export default {
+  components: {
+    OrderCard: OrderCard
+  },
+  data() {
+    return {
+      // 顶部筛选项
+      screenItems: [
+        { current: '10', text: '全部' },
+        { current: '0', text: '待付款' },
+        { current: '1', text: '待收货' },
+        { current: '2', text: '已完成' }
+        // {current:"3",text:'已评价'},
+        // {current:"4",text:'退款'},
+      ],
+      // 当前所在item 默认10-->全部
+      current: '10'
+    }
+  },
 
-		onLoad: function(option) {
-			//获取订单列表
-			store.dispatch('myOrder/getList', {
-				uid: "1",
-				way: "",
-			}); 
-			//从user过来传的status，给current，以显示对应item                 
-			this.current = option.status
-		},
-		computed: {
-			orderList() {
-				// console.log('orderList', this.$store.state.myOrder.orderList);
-				return this.$store.state.myOrder.orderList;
-			}
-		},
-		methods:{
-			//tab点击事件
-			onClickItem(e) {
-				if (this.current !== e) {
-					this.current = e;
-				}
-			}
-			
-		}
-	}
+  onLoad: function(option) {
+    // 获取订单列表
+    store.dispatch('myOrder/getList', {
+      uid: '1',
+      way: ''
+    })
+    // 从user过来传的status，给current，以显示对应item
+    this.current = option.status
+  },
+  computed: {
+    orderList() {
+      // console.log('orderList', this.$store.state.myOrder.orderList);
+      return this.$store.state.myOrder.orderList
+    }
+  },
+  methods: {
+    // tab点击事件
+    onClickItem(e) {
+      if (this.current !== e) {
+        this.current = e
+      }
+    }
+
+  }
+}
 </script>
 
 <style lang="scss">
-	.content {
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		background-color: #F7F6F6;
-		min-height: 100vh;
-		.header{
-			background-color: #ffffff;
-			width: 100%;
-			// height: 232rpx;
-			padding: 20rpx 40rpx 16rpx 40rpx;
-			box-sizing: border-box;
-			position: fixed;
-			top: 0;
-			left: 0;
-			// .searchBar {
-			// 	width: 670rpx;
-			// 	display: flex;
-			// 	justify-content: center;
-			// 	align-items: center;
-			// 	box-sizing: border-box;
-			// 	padding: 0rpx 16rpx;
-			// 	border: 1px solid #FF6B4A;
-			// 	border-radius: 8rpx;
-			// 	background-color: #ffffff;
-			// }
-			
-			.screenBar{
-				width: 670rpx;
-				// height: 110rpx;
-				height: 70rpx;
-				display: flex;
-				flex-direction: row;
-				justify-content: space-between;
-				align-items: center;
-				color: #333333;
-				font-size: 32rpx;
-			}
-			.screenItem{
-				height: 50rpx;
-				font-size: 32rpx;
-				color: #333333;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				transition:all 0.2s;
-			}
-			.active{
-				// font-size: 34rpx;
-				color: #EC5D3B;
-			}
-			.searchIpt {
-				height: 68rpx;
-				width: 670rpx;
-				padding: 16rpx;
-				font-size: 28rpx;
-				box-sizing: border-box;
-			}
-		}
-		.orderList{
-			// margin-top: 232rpx;
-			margin-top: 132rpx;
-		}
-		.footer{
-			font-size: 14px;
-			color: #B8B8B8;
-			margin: 40rpx 0;
-		}
-	}
+.content {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  background-color: #f7f6f6;
+  min-height: 100vh;
+  .header {
+    background-color: #ffffff;
+    width: 100%;
+    // height: 232rpx;
+    padding: 20rpx 40rpx 16rpx 40rpx;
+    box-sizing: border-box;
+    position: fixed;
+    top: 0;
+    left: 0;
+    // .searchBar {
+    //   width: 670rpx;
+    //   display: flex;
+    //   justify-content: center;
+    //   align-items: center;
+    //   box-sizing: border-box;
+    //   padding: 0rpx 16rpx;
+    //   border: 1px solid #ff6b4a;
+    //   border-radius: 8rpx;
+    //   background-color: #ffffff;
+    // }
+
+    .screenBar {
+      width: 670rpx;
+      // height: 110rpx;
+      height: 70rpx;
+      display: flex;
+      flex-direction: row;
+      justify-content: space-between;
+      align-items: center;
+      color: #333333;
+      font-size: 32rpx;
+    }
+    .screenItem {
+      height: 50rpx;
+      font-size: 32rpx;
+      color: #333333;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      transition: all 0.2s;
+    }
+    .active {
+      // font-size: 34rpx;
+      color: #ec5d3b;
+    }
+    .searchIpt {
+      height: 68rpx;
+      width: 670rpx;
+      padding: 16rpx;
+      font-size: 28rpx;
+      box-sizing: border-box;
+    }
+  }
+  .orderList {
+    // margin-top: 232rpx;
+    margin-top: 132rpx;
+  }
+  .footer {
+    font-size: 14px;
+    color: #b8b8b8;
+    margin: 40rpx 0;
+  }
+}
 </style>
-- 
2.0.0