upload file

pageE/order/Details.vue

@@ -21,17 +21,19 @@
 			<view class="info-goods">
 				<view class="goods-store">
 					<view class="stoer-title">
-						<image src="../static/mine/23.png" class="store-image"></image>
-						<view class="store-name">胖胖的店</view>
+						<image :src="orderInfo.extend_store.store_avatar" class="store-image"></image>
+						<view class="store-name">{{ orderInfo.extend_store.store_name }}</view>
 						<image src="../static/mine/21.png" class="right-icon"></image>
 					</view>
-					<view class="store-goods">
-						<image src="../static/mine/23.png"></image>
-						<view class="goods-info">
-							<view class="goods-name u-line-2">木糖少女小紫薯西装领连衣裙夏季新款女装夏收腰格子格纹裙子木糖少女小紫薯西装领连衣裙夏季新款女装夏收腰格子格纹裙子</view>
-							<view class="goods-order">
-								<view class="price">￥99</view>
-								<view class="num">x2</view>
+					<view v-for="goods in orderInfo.extend_order_goods" :key="goods.goods_id">
+						<view class="store-goods">
+							<image :src="goods.goods_image"></image>
+							<view class="goods-info">
+								<view class="goods-name u-line-2">{{ goods.goods_name }}</view>
+								<view class="goods-order">
+									<view class="price">￥{{ goods.goods_pay_price }}</view>
+									<view class="num">x{{ goods.goods_num }}</view>
+								</view>
 							</view>
 						</view>
 					</view>
@@ -55,7 +57,7 @@
 					</view>
 					<view>
 						<view class="title">支付方式</view>
-						<view class="price">￥0.00</view>
+						<view class="price">{{ orderInfo.payment_name }}</view>
 					</view>
 				</view>
 			</view>
@@ -83,9 +85,8 @@ export default {
 		}
 	},
 	onLoad(option) {
-		this.current = option.current;
-		console.log(option.current);
 		this.setTitle();
+		this.getOrderInfo(option.id);
 	},
 	methods: {
 		getOrderInfo(id) {
@@ -98,11 +99,9 @@ export default {
 			})
 		},
 		setTitle(){
-			let title = ''
+			let title = '';
 			switch (this.current) {
 				case '1':
-					console.log(title);
-					
 					title = "支付成功"
 					break;
 				default:

pageE/order/Index.vue

@@ -41,7 +41,7 @@ export default {
 			orderList: [],
 			loadStatus: ['loadmore','loadmore','loadmore','loadmore','loadmore','loadmore','loadmore'],
 			page: 0,
-			current: 0,
+			current: Number,
 			swiperCurrent: 0,
 			swiperHeight: '',
 			timer: true,
@@ -51,7 +51,7 @@ export default {
 		OrderItem
 	},
 	watch: {
-		current() {
+		current(value) {
 			this.page = 0;
 			this.getOrderList('again');
 		},
@@ -98,16 +98,16 @@ export default {
 				if(reload) this.orderList = res.data;
 				else this.orderList.push(...res.data);
 			}
-			return res.data.length;
+			return res;
 		},
 		reachBottom() {
 			if(!this.timer) return false;
 			this.timer = false;
 			this.loadStatus.splice(this.current, 1, "loading");
 			this.page++;
-			this.getOrderList.then(length => {
+			this.getOrderList.then(res => {
 				this.loadStatus.splice(this.current, 1, "nomore");
-				if(length == 0) this.page--;
+				if(res.data.length == 0) this.page--;
 			}).catch(() => {
 				this.loadStatus.splice(this.current, 1, "nomore");
 				this.page--;