代码更新

pagesOrder/index/compoents/order-item.vue

@@ -25,12 +25,12 @@
 		<view class="u-m-t-26">
 			<view class="u-flex u-col-bottom u-font-24 color-999">
 				<up-avatar :size="33"></up-avatar>
-				<view class="u-m-l-16">{{formatTime(data.createdAt)}}</view>
+				<view class="u-m-l-16">{{formatTime(data.createTime)}}</view>
 			</view>
 			<view class="u-m-t-32">
 				<view class="u-font-32">{{goosZhonglei}}种商品，共{{goodsNumber}}件</view>
 				<view class="border-bottom u-p-b-32">
-					<view class="" v-for="(item,index) in data.detailList" :key="index">
+					<view class="" v-for="(item,index) in data.goods" :key="index">
 						<view class="u-flex u-row-between u-col-top u-m-t-32" v-if="item.productId!=-999">
 							<view>
 								<view class=""> {{item.productName}}</view>
@@ -48,7 +48,7 @@
 										</view>
 									</view>
 								</template>
-								<template v-else-if="item.isMember&&data.memberId&&item.memberPrice&&item.memberPrice!=item.price">
+								<template v-else-if="item.isMember&&data.userId&&item.memberPrice&&item.memberPrice!=item.price">
 									<view class="u-text-right u-relative" :style="computedPriceStyle()">
 										<text class="line-th">￥{{goodsPriceAmount(item)}}</text>
 										<view class="u-absolute" style="bottom: 100%;right: 0;">
@@ -141,7 +141,7 @@
 						productName: '客座费',
 						priceAmount: 0
 					},
-					detailList: []
+					goods: []
 				}
 			}
 		},
@@ -168,7 +168,7 @@
 		return (price * item.num).toFixed(2)
 	}
 	// const packeFee=computed(()=>{
-	// 	return props.data.detailList.reduce((prve,cur)=>{
+	// 	return props.data.goods.reduce((prve,cur)=>{
 	// 		return prve+cur.packAmount
 	// 	},0).toFixed(2)
 	// })
@@ -182,8 +182,8 @@
 	// })
 
 	function goodsMapInit() {
-		for (let i in props.data.detailList) {
-			const goods = props.data.detailList[i]
+		for (let i in props.data.goods) {
+			const goods = props.data.goods[i]
 			if ($goodsMap.hasOwnProperty(goods.productId)) {
 				$goodsMap[goods.productId] += goods.num * 1
 				goodsNumber.value += goods.num * 1
@@ -195,7 +195,7 @@
 		}
 	}
 	goodsMapInit()
-	watch(() => props.data.detailList.length, (newval) => {
+	watch(() => props.data.goods.length, (newval) => {
 		goodsNumber.value = 0
 		goodsMapInit()
 	})

pagesOrder/index/index.vue

@@ -44,8 +44,8 @@
 		list: [],
 		total: 0,
 		query: {
-			platformType: "admin-app",
 			orderNo: "",
+			platformType: "APP",
 			page: 1,
 			pageSize: 10,
 			startTime: today.start,
@@ -140,9 +140,6 @@
 	}
 	
 	
-	
-	
-	
 </script>
 
 <style>