guo 2 роки тому
батько
коміт
968931b244
3 змінених файлів з 43 додано та 28 видалено
  1. 9 0
      pages.json
  2. 12 28
      pages/user/myOrder.vue
  3. 22 0
      pages/user/orderDetail/mallOrderDetail.vue

+ 9 - 0
pages.json

@@ -159,6 +159,15 @@
             }
             
         }
+        ,{
+            "path" : "pages/user/orderDetail/mallOrderDetail",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "订单详情",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	"tabBar": {
 		"color": "#8a8a8a",

+ 12 - 28
pages/user/myOrder.vue

@@ -8,21 +8,19 @@
 			
 		</view>
 		<view class="main">
-			<view class="itemBg" v-for="(item,index) in items" @click="goDetail(item.ID)">
+			<view class="itemBg" v-for="(item,index) in items" @click="goDetail(item)">
 				<view class="itemTop">
 					<view style="color: #999999; font-size: 24rpx;">保养订单</view>
 					<view class="itemSheetState" v-if="item.SheetState==1">待付款</view>
-					<view class="itemSheetState" v-if="item.SheetState==2">待确认</view>
-					<view class="itemSheetState" v-if="item.SheetState==3">待收货</view>
-					<view class="itemSheetState" v-if="item.SheetState==4">待服务</view>
-					<view class="itemSheetState" v-if="item.SheetState==5">已完成</view>
+					<view class="itemSheetState" v-if="item.SheetState==3">待服务</view>
+					<view class="itemSheetState" v-if="item.SheetState==4">已完成</view>
 					<view class="itemSheetState" v-if="item.SheetState==0">已取消</view>
 				</view>
 				<view class="itemShopBg">
 					<view class="shopName">{{item.ShopName}}</view>
 					<view class="price">¥{{item.raleMoney}}</view>
 				</view>
-				<view class="itemName">{{item.itemNameList?item.itemNameList:''}},{{item.goodNameList?item.goodNameList:''}}</view>
+				<view class="itemName">{{item.time}}</view>
 				
 				
 
@@ -43,7 +41,7 @@
 			return {
 				page: 1,
 				tabIndex: '',
-				items: [],
+				items: [1,2,3],
 				isload: false,
 				 
 			}
@@ -71,9 +69,10 @@
 				this.page = 1;
 				this.getData()
 			},
-			goDetail(id) {
+			goDetail(item) {
 				uni.navigateTo({
-					url: 'orderDetail?id=' + id
+					url:"../../orderDetail/mallOrderDetail?id=" + item.id
+					
 				})
 			},
 			getData() {
@@ -81,25 +80,10 @@
 					title: '加载中'
 				});
 				this.isload = false;
-				if (this.tabIndex == 6) {
-					var padata = {
-						page: this.page,
-						limit: 10,
-					}
-				} else {
-					if (this.tabIndex == 5) {
-						var padata = {
-							page: this.page,
-							limit: 10,
-							evaluateState: '待评价'
-						}
-					} else {
-						var padata = {
-							page: this.page,
-							limit: 10,
-							state: this.tabIndex
-						}
-					}
+				var padata = {
+					page: this.page,
+					limit: 10,
+					state: this.tabIndex
 				}
 
 				this.$http('worldKeepCar/keepCarMy/listMiNiTMSheetPage', padata, 'GET').then(res => {

+ 22 - 0
pages/user/orderDetail/mallOrderDetail.vue

@@ -0,0 +1,22 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>