fix

virgo.wzfrontend/workark_wx/pages.json

@@ -108,6 +108,16 @@
 			"style": {
 				"navigationBarTitleText": "订单列表"
 			}
+		}, {
+			"path": "orderDetail/orderDetail",
+			"style": {
+				"navigationBarTitleText": "订单详情"
+			}
+		}, {
+			"path": "express/express",
+			"style": {
+				"navigationBarTitleText": "订单物流"
+			}
 		}]
 	}, {
 		"root": "subPages/indexPage",

virgo.wzfrontend/workark_wx/request/api/shop.js

@@ -214,6 +214,50 @@ export function saveOrder(idAddress, idCarts) {
 		method: 'post'
 	})
 }
+/* 
+ * 取消订单
+ * 
+ * 
+ */
+export function cancelOrder(orderNo) {
+	return request({
+		url: `${baseUrl}/user/order/cancel/${orderNo}`,
+		method: 'post'
+	})
+}
+/* 
+ * 取消订单
+ * 
+ * 
+ */
+export function confirmOrder(orderNo) {
+	return request({
+		url: `${baseUrl}/user/order/confirm/${orderNo}`,
+		method: 'post'
+	})
+}
+/* 
+ * 获取订单列表
+ * 
+ * 
+ */
+export function getOrders(order) {
+	return request({
+		url: `${baseUrl}/user/order/getOrders?page=${order.page}&limit=${order.limit}&status=${order.status}`,
+		method: 'get'
+	})
+}
+/* 
+ * 获取订单详情
+ * 
+ * 
+ */
+export function getOrderDetail(orderSn) {
+	return request({
+		url: `${baseUrl}/user/order/${orderSn}`,
+		method: 'get'
+	})
+}
 /* 
  * 获取订单信息
  * 

virgo.wzfrontend/workark_wx/subPages/myPage/myDetail/myDetail.vue

@@ -101,7 +101,7 @@
 			},
 			logout() {
 				uni.showModal({
-					title: '有极提示',
+					title: 'WORKARK提示',
 					content: '是否退出登录',
 					success: res => {
 						if (res.confirm) {

virgo.wzfrontend/workark_wx/subPages/shopPage/express/express.vue

@@ -0,0 +1,114 @@
+<template>
+	<view class="wrap">
+		<view class="base">
+			<view class="title">{{expressInfo.expressCompany}}</view>
+			<view class="item"> 快递单号：{{expressInfo.shippingSn}}</view>
+			<view class="item"> 收货地址：{{order.consigneeAddress}}</view>
+		</view>
+		<view class="list">
+			<uv-steps direction="column">
+				<uv-steps-item v-for="(item, index) in expressInfo.infoList" :key="index">
+					<template v-slot:title>
+						<view>
+							<view v-if="index==0" class="uv-order-title">{{expressInfo.stateStr}}</view>
+							<view class="uv-order-desc">{{item.AcceptStation}}</view>
+						</view>
+					</template>
+					<template v-slot:desc>
+						<view class="uv-order-time">{{ item.AcceptTime }}</view>
+					</template>
+				</uv-steps-item>
+			</uv-steps>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getRequest
+	} from '@/request/api/shop.js'
+	export default {
+		data() {
+			return {
+				order: {
+					consigneeAddress: '',
+					orderSn: '',
+					address: {
+						name: ''
+					}
+				},
+				expressInfo: {
+					shippingSn: ''
+				}
+			}
+		},
+		onLoad(option) {
+			this.order.orderSn = option.orderSn;
+			this.init();
+		},
+		methods: {
+			init() {
+				getRequest('user/order/getExpressInfo/' + this.order.orderSn).then(res => {
+					if (res.state) {
+						this.order = res.data.order;
+						this.expressInfo = res.data.expressInfo;
+					}
+				});
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	page {
+		height: 100%;
+		background-color: #f2f2f2;
+	}
+
+	.base {
+		background-color: #FFFFFF;
+		padding: 20rpx;
+		margin: 30rpx 0;
+
+		.title {
+			color: #F59A23;
+			font-size: 30rpx;
+		}
+
+		.item {
+			padding-top: 10rpx;
+		}
+	}
+
+	.list {
+		background-color: #FFFFFF;
+		padding: 30rpx;
+	}
+
+	.uv-node {
+		width: 44rpx;
+		height: 44rpx;
+		border-radius: 100rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		background: #d0d0d0;
+	}
+
+	.uv-order-title {
+		color: #333333;
+		font-weight: bold;
+		font-size: 32rpx;
+	}
+
+	.uv-order-desc {
+		color: rgb(150, 150, 150);
+		font-size: 28rpx;
+		margin-bottom: 6rpx;
+	}
+
+	.uv-order-time {
+		color: rgb(200, 200, 200);
+		font-size: 26rpx;
+	}
+</style>

virgo.wzfrontend/workark_wx/subPages/shopPage/orderDetail/orderDetail.vue

@@ -0,0 +1,169 @@
+<template>
+	<view class="wrap">
+		<view class="order_detail">
+			<view class="top">
+				<view class="address_detail">
+					<uv-cell-group>
+						<uv-cell icon="map" :title="order.consignee+' '+order.mobile" :label="order.consigneeAddress">
+						</uv-cell>
+					</uv-cell-group>
+				</view>
+				<view class="footer_btn">
+					<uv-button size="mini" type="primary" @click="payment" v-if="order.statusName == '待付款'">
+						立即付款
+					</uv-button>
+					<uv-button size="mini" type="success" @click="confirmReceive" v-if="order.statusName == '已发货'">
+						确认收货
+					</uv-button>
+				</view>
+			</view>
+			<view class="content">
+				<view class="title">
+					{{'订单编号: ' + order.orderSn}}
+				</view>
+				<view class="list">
+					<view class="item" v-for="(item,index) in order.items" :key="index">
+						<uv-row gutter="16">
+							<uv-col :span="3">
+								<uv-image width="100%" height="150rpx" :src="shopImage(item.goods.pic)"></uv-image>
+							</uv-col>
+							<uv-col :span="9">
+								<view class="gl-name">{{item.goods.name}}</view>
+								<view class="gl-descript">{{item.goods.descript}}</view>
+								<view class="gl-price">
+									<uv-row>
+										<uv-col offset="6" :span="3" text-align="right">
+											￥{{formatPrice(item.price)}}
+										</uv-col>
+										<uv-col :span="3" text-align="right">
+											x{{item.count}}
+										</uv-col>
+									</uv-row>
+								</view>
+							</uv-col>
+						</uv-row>
+					</view>
+				</view>
+				<view class="total">合计: {{formatPrice(order.totalPrice)}}</view>
+			</view>
+			<view class="detail">
+				<uv-cell-group title="订单信息">
+					<uv-cell title="订单编号" :value="order.orderSn" :arrow="false"></uv-cell>
+					<uv-cell title="创建时间" :value="order.createTime" :arrow="false"></uv-cell>
+				</uv-cell-group>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getOrderDetail
+	} from '@/request/api/shop.js'
+	export default {
+		data() {
+			return {
+				order: {
+					orderSn: '',
+					consigneeAddress: '',
+					consignee: '',
+					mobile: ''
+				}
+			}
+		},
+		onShow() {
+			this.init();
+		},
+		onLoad(option) {
+			this.order.orderSn = option.orderSn
+			this.init();
+		},
+		methods: {
+			async init() {
+				if (!this.order.orderSn) return;
+				let orderData = await getOrderDetail(this.order.orderSn)
+				if (orderData.state) this.order = orderData.data;
+			},
+			formatPrice(price) {
+				if (!price) return '0.00'
+				return (price / 100).toFixed(2);
+			},
+			payment() {
+				this.$navigateTo('/subPages/shopPage/payment/payment?orderSn=' + this.order.orderSn + '&totalPrice=' + this
+					.order.totalPrice)
+			},
+			confirmReceive() {
+				uni.showModal({
+					title: 'WORKARK提示',
+					content: '是否取消订单',
+					success: res => {
+						if (res.confirm) {
+							cancelOrder(this.order.orderSn).then(res => {
+								if (res.state) {
+									this.$toast('取消成功');
+									this.init();
+								}
+							})
+						}
+					}
+				});
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.order_detail {
+		.top {
+			margin-top: 30rpx;
+			background: #fff;
+
+			.footer_btn {
+				display: flex;
+				padding: 20rpx 30rpx;
+				justify-content: flex-end;
+			}
+		}
+
+		.detail {
+			margin-top: 30rpx;
+			background: #fff;
+		}
+
+		.content {
+			background: #fff;
+			margin-top: 30rpx;
+			padding: 30rpx;
+
+			.total {
+				text-align: right;
+				padding: 10px;
+			}
+
+			.list {
+				.item {
+					margin-top: 20rpx;
+
+					.gl-name {
+						font-size: 26rpx;
+					}
+
+					.gl-descript {
+						margin-top: 14rpx;
+						font-size: 20rpx;
+					}
+
+					.gl-price {
+						margin-top: 26rpx;
+						font-size: 24rpx;
+					}
+				}
+			}
+
+			.total {}
+		}
+
+
+
+	}
+</style>

virgo.wzfrontend/workark_wx/subPages/shopPage/orderList/orderList.vue

@@ -1,277 +1,106 @@
 <template>
-	<view>
-		<view class="wrap">
-			<view class="uv-tabs-box">
-				<uv-tabs ref="tabs" :list="list" :current="current" @change="change" :scrollable="false">
+	<view class="order-list">
+		<z-paging ref="paging" v-model="dataList" @query="queryList">
+			<template #top>
+				<uv-tabs :list="list" @change="changeTab" :customStyle="{
+					background:'#fff'
+				}" :scrollable="false">
 				</uv-tabs>
-			</view>
-			<swiper class="swiper-box" :current="swiperCurrent" @animationfinish="animationfinish">
-				<swiper-item class="swiper-item">
-					<scroll-view scroll-y style="height: 100%;width: 100%;" @scrolltolower="reachBottom">
-						<view class="no-data" v-if="orders[0].length ===0 ">
-							<uv-empty
-								icon="https://file-node.oss-cn-shanghai.aliyuncs.com/youji/fa57e25b38c442ebb0ba023cace796bb"
-								:isImg="true" textSize="14" width="180" text="暂无订单">
-							</uv-empty>
+			</template>
+			<view class="page-box">
+				<view class="order" v-for="(res, index) in  dataList" :key="res.id">
+					<view class="top" @click="toDetail(res.orderSn)">
+						<view class="left">
+							<uv-icon name="home" :size="15" color="rgb(94,94,94)"></uv-icon>
+							<view class="store">{{ res.orderSn }}</view>
+							<uv-icon name="arrow-right" color="rgb(203,203,203)" :size="13"></uv-icon>
 						</view>
-						<view class="page-box" v-else>
-							<view class="order" v-for="(res, index) in orders[0]" :key="res.id">
-								<view class="top" @click="toDetail(res.orderSn)">
-									<view class="left">
-										<uv-icon name="home" :size="30" color="rgb(94,94,94)"></uv-icon>
-										<view class="store">{{ res.orderSn }}</view>
-										<uv-icon name="arrow-right" color="rgb(203,203,203)" :size="26"></uv-icon>
-									</view>
-									<view class="right">{{ res.statusName }}</view>
-								</view>
-								<view class="item" v-for="(item, index) in res.items" :key="index"
-									@click="toDetail(res.orderSn)">
-									<view class="left">
-										<image :src="shopImage(item.goods.pic)" mode="aspectFill"></image>
-									</view>
-									<view class="content">
-										<view class="title uv-line-2">{{ item.goods.name }} </view>
-										<view class="type">{{ item.title }}</view>
-										<view class="delivery-time">付款后5天内发货</view>
-									</view>
-									<view class="right">
-										<view class="price">
-											￥{{ formatPrice(item.price) }}
-										</view>
-										<view class="number">x{{ item.count }}</view>
-									</view>
-								</view>
-								<view class="total" @click="toDetail(res.orderSn)">
-									共{{ totalNum(res.items) }}件商品 合计:
-									<text class="total-price">
-										￥{{ formatPrice(res.totalPrice) }}
-									</text>
-								</view>
-								<view class="bottom">
-									<view class="more">
-										<!-- <uv-icon name="more-dot-fill" color="rgb(203,203,203)"></uv-icon> -->
-									</view>
-									<view class="logistics btn" @click="cancel(res.orderSn)">取消订单</view>
-									<view class="evaluate btn" @click="pay(res.orderSn,totalPrice(res.items)*100)">立即付款
-									</view>
-								</view>
-							</view>
-							<uv-loadmore :status="loadStatus[0]" bgColor="#f2f2f2"></uv-loadmore>
+						<view class="right">{{ res.statusName }}</view>
+					</view>
+					<view class="item" v-for="(item, index) in res.items" :key="index" @click="toDetail(res.orderSn)">
+						<view class="left">
+							<image :src="shopImage(item.goods.pic)" mode="aspectFill"></image>
 						</view>
-					</scroll-view>
-				</swiper-item>
-				<swiper-item class="swiper-item">
-					<scroll-view scroll-y style="height: 100%;width: 100%;" @scrolltolower="reachBottom">
-						<view class="no-data" v-if="orders[1].length ===0 ">
-							<uv-empty
-								icon="https://file-node.oss-cn-shanghai.aliyuncs.com/youji/fa57e25b38c442ebb0ba023cace796bb"
-								:isImg="true" textSize="14" width="180" text="暂无订单">
-							</uv-empty>
+						<view class="content">
+							<view class="title uv-line-2">{{ item.goods.name }} </view>
+							<view class="type">{{ item.title }}</view>
+							<view class="delivery-time" v-if="res.statusName === '待付款' || res.statusName === '待发货'">
+								付款后5天内发货
+							</view>
+							<view class="delivery-time" v-else-if="res.statusName != '已取消'">{{res.statusName}}</view>
 						</view>
-						<view class="page-box" v-else>
-							<view class="order" v-for="(res, index) in orders[1]" :key="res.id">
-								<view class="top" @click="toDetail(res.orderSn)">
-									<view class="left">
-										<uv-icon name="home" :size="30" color="rgb(94,94,94)"></uv-icon>
-										<view class="store">{{ res.orderSn }}</view>
-										<uv-icon name="arrow-right" color="rgb(203,203,203)" :size="26"></uv-icon>
-									</view>
-									<view class="right">{{ res.statusName }}</view>
-								</view>
-								<view class="item" v-for="(item, index) in res.items" :key="index"
-									@click="toDetail(res.orderSn)">
-									<view class="left">
-										<image :src="shopImage(item.goods.pic)" mode="aspectFill"></image>
-									</view>
-									<view class="content">
-										<view class="title uv-line-2">{{ item.goods.name }} </view>
-										<view class="type">{{ item.title }}</view>
-										<view class="delivery-time">付款后5天内发货</view>
-									</view>
-									<view class="right">
-										<view class="price">
-											￥{{ formatPrice(item.price) }}
-										</view>
-										<view class="number">x{{ item.count }}</view>
-									</view>
-								</view>
-								<view class="total" @click="toDetail(res.orderSn)">
-									共{{ totalNum(res.items) }}件商品 合计:
-									<text class="total-price">
-										￥{{ totalPrice(res.items) }}
-
-									</text>
-								</view>
-								<view class="bottom">
-									<view class="more">
-										<!-- <uv-icon name="more-dot-fill" color="rgb(203,203,203)"></uv-icon> -->
-									</view>
-									<view class="evaluate btn" @click="notify(res.orderSn)">提醒发货</view>
-								</view>
+						<view class="right">
+							<view class="price">
+								￥{{ formatPrice(item.price) }}
 							</view>
-							<uv-loadmore :status="loadStatus[1]" bgColor="#f2f2f2"></uv-loadmore>
+							<view class="number">x{{ item.count }}</view>
 						</view>
-					</scroll-view>
-				</swiper-item>
-				<swiper-item class="swiper-item">
-					<scroll-view scroll-y style="height: 100%;width: 100%;" @scrolltolower="reachBottom">
-						<view class="no-data" v-if="orders[2].length ===0 ">
-							<uv-empty
-								icon="https://file-node.oss-cn-shanghai.aliyuncs.com/youji/fa57e25b38c442ebb0ba023cace796bb"
-								:isImg="true" textSize="14" width="180" text="暂无订单">
-							</uv-empty>
+					</view>
+					<view class="total" @click="toDetail(res.orderSn)">
+						共{{ totalNum(res.items) }}件商品 合计:
+						<text class="total-price">
+							￥{{ totalPrice(res.items) }}
+						</text>
+					</view>
+					<view class="bottom">
+						<view class="more">
+							<!-- <uv-icon name="more-dot-fill" color="rgb(203,203,203)"></uv-icon> -->
 						</view>
-						<view class="page-box" v-else>
-							<view class="order" v-for="(res, index) in  orders[2]" :key="res.id">
-								<view class="top" @click="toDetail(res.orderSn)">
-									<view class="left">
-										<uv-icon name="home" :size="30" color="rgb(94,94,94)"></uv-icon>
-										<view class="store">{{ res.orderSn }}</view>
-										<uv-icon name="arrow-right" color="rgb(203,203,203)" :size="26"></uv-icon>
-									</view>
-									<view class="right">{{ res.statusName }}</view>
-								</view>
-								<view class="item" v-for="(item, index) in res.items" :key="index"
-									@click="toDetail(res.orderSn)">
-									<view class="left">
-										<image :src="shopImage(item.goods.pic)" mode="aspectFill"></image>
-									</view>
-									<view class="content">
-										<view class="title uv-line-2">{{ item.goods.name }} </view>
-										<view class="type">{{ item.title }}</view>
-										<view class="delivery-time">付款后5天内发货</view>
-									</view>
-									<view class="right">
-										<view class="price">
-											￥{{ formatPrice(item.price) }}
-										</view>
-										<view class="number">x{{ item.count }}</view>
-									</view>
-								</view>
-								<view class="total" @click="toDetail(res.orderSn)">
-									共{{ totalNum(res.items) }}件商品 合计:
-									<text class="total-price">
-										￥{{ totalPrice(res.items) }}
-									</text>
-								</view>
-								<view class="bottom">
-									<view class="more">
-										<!-- <uv-icon name="more-dot-fill" color="rgb(203,203,203)"></uv-icon> -->
-									</view>
-									<view class="logistics btn" @click="expressInfo(res.orderSn)">查看物流</view>
-									<view class="evaluate btn" @click="confirm(res.orderSn)">确认收货</view>
-								</view>
-							</view>
-							<uv-loadmore :status="loadStatus[2]" bgColor="#f2f2f2"></uv-loadmore>
+						<view class="logistics btn" @click="cancel(res.orderSn)" v-if="res.statusName === '待付款'">
+							取消订单
 						</view>
-					</scroll-view>
-				</swiper-item>
-				<swiper-item class="swiper-item">
-					<scroll-view scroll-y style="height: 100%;width: 100%;" @scrolltolower="reachBottom">
-						<view class="no-data" v-if="orders[3].length ===0 ">
-							<uv-empty
-								icon="https://file-node.oss-cn-shanghai.aliyuncs.com/youji/fa57e25b38c442ebb0ba023cace796bb"
-								:isImg="true" textSize="14" width="180" text="暂无订单">
-							</uv-empty>
+						<view class="evaluate btn" @click="pay(res.orderSn,totalPrice(res.items)*100)"
+							v-if="res.statusName === '待付款'">
+							立即付款
 						</view>
-						<view class="page-box" v-else>
-							<view class="order" v-for="(res, index) in  orders[3]" :key="res.id">
-								<view class="top" @click="toDetail(res.orderSn)">
-									<view class="left">
-										<uv-icon name="home" :size="30" color="rgb(94,94,94)"></uv-icon>
-										<view class="store">{{ res.orderSn }}</view>
-										<uv-icon name="arrow-right" color="rgb(203,203,203)" :size="26"></uv-icon>
-									</view>
-									<view class="right">{{ res.statusName }}</view>
-								</view>
-								<view class="item" v-for="(item, index) in res.items" :key="index"
-									@click="toDetail(res.orderSn)">
-									<view class="left">
-										<image :src="shopImage(item.goods.pic)" mode="aspectFill"></image>
-									</view>
-									<view class="content">
-										<view class="title uv-line-2">{{ item.goods.name }} </view>
-										<view class="type">{{ item.title }}</view>
-										<view class="delivery-time">已确认收货</view>
-									</view>
-									<view class="right">
-										<view class="price">
-											￥{{ formatPrice(item.price) }}
-										</view>
-										<view class="number">x{{ item.count }}</view>
-									</view>
-								</view>
-								<view class="total" @click="toDetail(res.orderSn)">
-									共{{ totalNum(res.items) }}件商品 合计:
-									<text class="total-price">
-										￥{{ totalPrice(res.items) }}
-
-									</text>
-								</view>
-								<view class="bottom">
-									<view class="more">
-										<!-- <uv-icon name="more-dot-fill" color="rgb(203,203,203)"  ></uv-icon> -->
-									</view>
-									<view class="logistics btn" @click="expressInfo(res.orderSn)">查看物流</view>
-									<view class="evaluate btn" @click="comment(res.orderSn)">评价</view>
-								</view>
-							</view>
-							<uv-loadmore :status="loadStatus[3]" bgColor="#f2f2f2"></uv-loadmore>
+						<view class="logistics btn" v-if="res.statusName === '已发货' || res.statusName === '已完成'"
+							@click="$navigateTo('/subPages/shopPage/express/express?orderSn=' + res.orderSn)">
+							查看物流
 						</view>
-					</scroll-view>
-				</swiper-item>
-			</swiper>
-		</view>
-
-		<uv-modal v-model="showCancel" content="确认取消该订单?" :show-cancel-button="true" @confirm="cancelOrder"></uv-modal>
+						<view class="evaluate btn" v-if="res.statusName === '已发货'" @click="confirm(res.orderSn)">
+							确认收货
+						</view>
+					</view>
+				</view>
+				<uv-loadmore :status="loadStatus[2]" bgColor="#f2f2f2"></uv-loadmore>
+			</view>
+		</z-paging>
 	</view>
 </template>
 
 <script>
 	import {
-		getRequest
+		getOrders,
+		cancelOrder,
+		confirmOrder
 	} from '@/request/api/shop.js'
 	export default {
 		data() {
 			return {
-				showCancel: false,
-				cancelOrderSn: '',
-				orders: [
-					[],
-					[],
-					[],
-					[]
-				],
-				listQuery: {
-					page: 1,
-					limit: 20
-				},
 				list: [{
-					name: '待付款'
+					name: '全部',
+					id: 0
 				}, {
-					name: '待发货'
+					name: '待付款',
+					id: 1
 				}, {
-					name: '待收货'
+					name: '待发货',
+					id: 2
 				}, {
-					name: '待评价'
+					name: '已发货',
+					id: 3
+				}, {
+					name: '已完成',
+					id: 4
 				}],
-				current: 0,
-				swiperCurrent: 0,
-				tabsHeight: 0,
-				dx: 0,
-				loadStatus: ['loadmore', 'loadmore', 'loadmore', 'loadmore'],
+				nowCurrent: {
+					name: '全部',
+					id: 0
+				},
+				dataList: []
 			};
 		},
-		onLoad() {
-			//待付款
-			this.getOrders(1);
-			//待发货
-			this.getOrders(2);
-			//已发货
-			this.getOrders(3);
-			//已完成
-			this.getOrders(4);
-		},
+		onLoad() {},
 		computed: {
 			// 价格小数
 			priceDecimal() {
@@ -293,35 +122,20 @@
 
 		},
 		methods: {
-			reachBottom() {
-				const current = this.current
-				if (this.loadStatus[current] == 'nomore') {
+			async queryList(index, size) {
+				let filterOption = {
+					page: index,
+					limit: size,
+					status: this.nowCurrent.id
+				};
+				uni.showLoading()
+				let orderData = await getOrders(filterOption);
+				if (orderData.state) {
+					uni.hideLoading();
+					this.$refs.paging.complete(orderData.data.records);
 					return
 				}
-				this.listQuery.page++
-				this.getOrders(current + 1)
-			},
-			getOrders(status) {
-				const page = this.listQuery.page
-				const limit = this.listQuery.limit
-				this.orders[status - 1] = new Array()
-				this.loadStatus.splice(status - 1, 1, "loading")
-				getRequest('user/order/getOrders?page=' + page + '&limit=' + limit + '&status=' + status).then(res => {
-					if (res.state) {
-						let orderList = res.data.records
-						for (let index in orderList) {
-							let order = orderList[index]
-							order.title = '' + order.createTime
-							order.descript = '' + order.orderSn
-							this.orders[status - 1].push(order)
-						}
-						if (orderList.length < limit) {
-							this.loadStatus.splice(status - 1, 1, "nomore");
-						} else {
-							this.loadStatus.splice(status - 1, 1, "more");
-						}
-					}
-				});
+				this.$refs.paging.complete(false);
 			},
 			formatPrice(val) {
 				return (val / 100).toFixed(2)
@@ -349,79 +163,47 @@
 				}
 				return num;
 			},
-			// tab栏切换
-			change(index) {
-				this.swiperCurrent = index
-			},
-			transition({
-				detail: {
-					dx
-				}
-			}) {
-				this.$refs.tabs.setDx(dx)
-			},
-			animationfinish({
-				detail: {
-					current
-				}
-			}) {
-				this.swiperCurrent = current;
-				this.current = current;
-			},
-			toHome() {
-				this.$u.route({
-					type: 'switchTab',
-					url: '/pages/shop/index'
-				})
+			changeTab(item) {
+				this.nowCurrent = item;
+				this.$refs.paging.reload();
 			},
 			toDetail(orderSn) {
-				this.$u.route({
-					url: '/pages/order/detail',
-					params: {
-						orderSn: orderSn
-					}
-				})
-			},
-			cancel(orderNo) {
-				this.showCancel = true
-				this.cancelOrderSn = orderNo
+				this.$navigateTo('/subPages/shopPage/orderDetail/orderDetail?orderSn=' + orderSn);
 			},
-			cancelOrder() {
-				this.$u.post('user/order/cancel/' + this.cancelOrderSn).then(res => {
-					this.getOrders(1)
-				})
-			},
-			expressInfo(orderNo) {
-				console.log('查看物流信息', orderNo)
-				this.$u.route({
-					url: '/pages/order/express',
-					params: {
-						orderSn: orderNo
+			cancel(orderNo) { //取消订单
+				uni.showModal({
+					title: 'WORKARK提示',
+					content: '是否取消订单',
+					success: res => {
+						if (res.confirm) {
+							cancelOrder(orderNo).then(res => {
+								if (res.state) {
+									this.$toast('取消成功');
+									this.$refs.paging.reload();
+								}
+							})
+						}
 					}
-				})
-			},
-			confirm(orderNo) {
-				console.log('确认收货', orderNo)
-				this.$u.post('user/order/confirm/' + orderNo).then(res => {
-					this.getOrders(3)
 				});
 			},
-			notify(orderSn) {
-				console.log('提醒发货', orderSn)
-				this.$u.toast('敬请期待')
-			},
-			pay(orderNo, totalPrice) {
-				this.$u.route({
-					url: '/pages/order/payment/payment',
-					params: {
-						orderSn: orderNo,
-						totalPrice: totalPrice
+			confirm(orderNo) { //确认收获
+				uni.showModal({
+					title: 'WORKARK提示',
+					content: '是否确认收货',
+					success: res => {
+						if (res.confirm) {
+							confirmOrder(orderNo).then(res => {
+								if (res.state) {
+									this.$toast('收货成功');
+									this.$refs.paging.reload();
+								}
+							})
+						}
 					}
-				})
+				});
 			},
-			comment(orderSn) {
-				console.log('评论', orderSn)
-				this.$u.toast('敬请期待')
+			pay(orderNo, totalPrice) {
+				this.$navigateTo('/subPages/shopPage/payment/payment?orderSn=' + orderNo + '&totalPrice=' + totalPrice);
 			}
 		}
 	};
@@ -585,19 +367,4 @@
 			background: linear-gradient(270deg, rgba(249, 116, 90, 1) 0%, rgba(255, 158, 1, 1) 100%);
 		}
 	}
-
-	.wrap {
-		display: flex;
-		flex-direction: column;
-		height: calc(100vh - var(--window-top));
-		width: 100%;
-	}
-
-	.swiper-box {
-		flex: 1;
-	}
-
-	.swiper-item {
-		height: 100%;
-	}
 </style>

virgo.wzfrontend/workark_wx/subPages/shopPage/payment/payment.vue

@@ -90,8 +90,8 @@
 				})
 			},
 			primaryBtnClick() {
-				this.$navigateTo('/subPages/shopPage/webview/webview?url=' + encodeURIComponent('/order/detail/' + this
-					.orderSn));
+				this.$navigateTo('/subPages/shopPage/orderDetail/orderDetail?orderSn=' + this
+					.orderSn);
 			},
 			secondaryBtnClick() {
 				uni.navigateBack();

virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/app.json

@@ -34,7 +34,9 @@
         "checkout/checkout",
         "addressList/addressList",
         "addressAdd/addressAdd",
-        "orderList/orderList"
+        "orderList/orderList",
+        "orderDetail/orderDetail",
+        "express/express"
       ]
     },
     {

virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -161,6 +161,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.addCart = addCart;
 exports.addGoodCount = addGoodCount;
+exports.cancelOrder = cancelOrder;
+exports.confirmOrder = confirmOrder;
 exports.deleteAddress = deleteAddress;
 exports.getAddressDetail = getAddressDetail;
 exports.getAddressList = getAddressList;
@@ -168,7 +170,9 @@ exports.getCartCount = getCartCount;
 exports.getCartData = getCartData;
 exports.getCategoryList = getCategoryList;
 exports.getGoods = getGoods;
+exports.getOrderDetail = getOrderDetail;
 exports.getOrderResult = getOrderResult;
+exports.getOrders = getOrders;
 exports.getPaymentInformation = getPaymentInformation;
 exports.getRequest = getRequest;
 exports.getSearchHot = getSearchHot;
@@ -395,6 +399,50 @@ function saveOrder(idAddress, idCarts) {
     method: 'post'
   });
 }
+/* 
+ * 取消订单
+ * 
+ * 
+ */
+function cancelOrder(orderNo) {
+  return (0, _request.request)({
+    url: "".concat(baseUrl, "/user/order/cancel/").concat(orderNo),
+    method: 'post'
+  });
+}
+/* 
+ * 取消订单
+ * 
+ * 
+ */
+function confirmOrder(orderNo) {
+  return (0, _request.request)({
+    url: "".concat(baseUrl, "/user/order/confirm/").concat(orderNo),
+    method: 'post'
+  });
+}
+/* 
+ * 获取订单列表
+ * 
+ * 
+ */
+function getOrders(order) {
+  return (0, _request.request)({
+    url: "".concat(baseUrl, "/user/order/getOrders?page=").concat(order.page, "&limit=").concat(order.limit, "&status=").concat(order.status),
+    method: 'get'
+  });
+}
+/* 
+ * 获取订单详情
+ * 
+ * 
+ */
+function getOrderDetail(orderSn) {
+  return (0, _request.request)({
+    url: "".concat(baseUrl, "/user/order/").concat(orderSn),
+    method: 'get'
+  });
+}
 /* 
  * 获取订单信息
  * 

virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/subPages/myPage/myDetail/myDetail.js

@@ -264,7 +264,7 @@ var _default = {
     logout: function logout() {
       var _this3 = this;
       uni.showModal({
-        title: '有极提示',
+        title: 'WORKARK提示',
         content: '是否退出登录',
         success: function success(res) {
           if (res.confirm) {

virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/subPages/shopPage/express/express.json

@@ -0,0 +1,7 @@
+{
+  "navigationBarTitleText": "订单物流",
+  "usingComponents": {
+    "uv-steps": "/uni_modules/uv-steps/components/uv-steps/uv-steps",
+    "uv-steps-item": "/uni_modules/uv-steps/components/uv-steps-item/uv-steps-item"
+  }
+}

virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/subPages/shopPage/express/express.wxss

@@ -0,0 +1,43 @@
+page.data-v-3e307614 {
+  height: 100%;
+  background-color: #f2f2f2;
+}
+.base.data-v-3e307614 {
+  background-color: #FFFFFF;
+  padding: 20rpx;
+  margin: 30rpx 0;
+}
+.base .title.data-v-3e307614 {
+  color: #F59A23;
+  font-size: 30rpx;
+}
+.base .item.data-v-3e307614 {
+  padding-top: 10rpx;
+}
+.list.data-v-3e307614 {
+  background-color: #FFFFFF;
+  padding: 30rpx;
+}
+.uv-node.data-v-3e307614 {
+  width: 44rpx;
+  height: 44rpx;
+  border-radius: 100rpx;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  background: #d0d0d0;
+}
+.uv-order-title.data-v-3e307614 {
+  color: #333333;
+  font-weight: bold;
+  font-size: 32rpx;
+}
+.uv-order-desc.data-v-3e307614 {
+  color: #969696;
+  font-size: 28rpx;
+  margin-bottom: 6rpx;
+}
+.uv-order-time.data-v-3e307614 {
+  color: #c8c8c8;
+  font-size: 26rpx;
+}

virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/subPages/shopPage/orderDetail/orderDetail.json

@@ -0,0 +1,11 @@
+{
+  "navigationBarTitleText": "订单详情",
+  "usingComponents": {
+    "uv-cell-group": "/uni_modules/uv-cell/components/uv-cell-group/uv-cell-group",
+    "uv-cell": "/uni_modules/uv-cell/components/uv-cell/uv-cell",
+    "uv-button": "/uni_modules/uv-button/components/uv-button/uv-button",
+    "uv-row": "/uni_modules/uv-row/components/uv-row/uv-row",
+    "uv-col": "/uni_modules/uv-row/components/uv-col/uv-col",
+    "uv-image": "/uni_modules/uv-image/components/uv-image/uv-image"
+  }
+}

virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/subPages/shopPage/orderDetail/orderDetail.wxss

@@ -0,0 +1,36 @@
+.order_detail .top.data-v-3aa6d8b2 {
+  margin-top: 30rpx;
+  background: #fff;
+}
+.order_detail .top .footer_btn.data-v-3aa6d8b2 {
+  display: flex;
+  padding: 20rpx 30rpx;
+  justify-content: flex-end;
+}
+.order_detail .detail.data-v-3aa6d8b2 {
+  margin-top: 30rpx;
+  background: #fff;
+}
+.order_detail .content.data-v-3aa6d8b2 {
+  background: #fff;
+  margin-top: 30rpx;
+  padding: 30rpx;
+}
+.order_detail .content .total.data-v-3aa6d8b2 {
+  text-align: right;
+  padding: 10px;
+}
+.order_detail .content .list .item.data-v-3aa6d8b2 {
+  margin-top: 20rpx;
+}
+.order_detail .content .list .item .gl-name.data-v-3aa6d8b2 {
+  font-size: 26rpx;
+}
+.order_detail .content .list .item .gl-descript.data-v-3aa6d8b2 {
+  margin-top: 14rpx;
+  font-size: 20rpx;
+}
+.order_detail .content .list .item .gl-price.data-v-3aa6d8b2 {
+  margin-top: 26rpx;
+  font-size: 24rpx;
+}

virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/subPages/shopPage/orderList/orderList.js

@@ -102,18 +102,15 @@ __webpack_require__.r(__webpack_exports__);
 var components
 try {
   components = {
+    zPaging: function () {
+      return Promise.all(/*! import() | uni_modules/z-paging/components/z-paging/z-paging */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/z-paging/components/z-paging/z-paging")]).then(__webpack_require__.bind(null, /*! @/uni_modules/z-paging/components/z-paging/z-paging.vue */ 565))
+    },
     uvTabs: function () {
       return Promise.all(/*! import() | uni_modules/uv-tabs/components/uv-tabs/uv-tabs */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-tabs/components/uv-tabs/uv-tabs")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-tabs/components/uv-tabs/uv-tabs.vue */ 374))
     },
-    uvEmpty: function () {
-      return Promise.all(/*! import() | uni_modules/uv-empty/components/uv-empty/uv-empty */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-empty/components/uv-empty/uv-empty")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-empty/components/uv-empty/uv-empty.vue */ 341))
-    },
     uvIcon: function () {
       return Promise.all(/*! import() | uni_modules/uv-icon/components/uv-icon/uv-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-icon/components/uv-icon/uv-icon")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-icon/components/uv-icon/uv-icon.vue */ 357))
     },
-    uvModal: function () {
-      return Promise.all(/*! import() | uni_modules/uv-modal/components/uv-modal/uv-modal */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uv-modal/components/uv-modal/uv-modal")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uv-modal/components/uv-modal/uv-modal.vue */ 630))
-    },
   }
 } catch (e) {
   if (
@@ -136,116 +133,34 @@ var render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
-  var g0 = _vm.orders[0].length
-  var l1 = !(g0 === 0)
-    ? _vm.__map(_vm.orders[0], function (res, index) {
-        var $orig = _vm.__get_orig(res)
-        var l0 = _vm.__map(res.items, function (item, index) {
-          var $orig = _vm.__get_orig(item)
-          var m0 = _vm.shopImage(item.goods.pic)
-          var m1 = _vm.formatPrice(item.price)
-          return {
-            $orig: $orig,
-            m0: m0,
-            m1: m1,
-          }
-        })
-        var m2 = _vm.totalNum(res.items)
-        var m3 = _vm.formatPrice(res.totalPrice)
-        var m4 = _vm.totalPrice(res.items)
-        return {
-          $orig: $orig,
-          l0: l0,
-          m2: m2,
-          m3: m3,
-          m4: m4,
-        }
-      })
-    : null
-  var g1 = _vm.orders[1].length
-  var l3 = !(g1 === 0)
-    ? _vm.__map(_vm.orders[1], function (res, index) {
-        var $orig = _vm.__get_orig(res)
-        var l2 = _vm.__map(res.items, function (item, index) {
-          var $orig = _vm.__get_orig(item)
-          var m5 = _vm.shopImage(item.goods.pic)
-          var m6 = _vm.formatPrice(item.price)
-          return {
-            $orig: $orig,
-            m5: m5,
-            m6: m6,
-          }
-        })
-        var m7 = _vm.totalNum(res.items)
-        var m8 = _vm.totalPrice(res.items)
-        return {
-          $orig: $orig,
-          l2: l2,
-          m7: m7,
-          m8: m8,
-        }
-      })
-    : null
-  var g2 = _vm.orders[2].length
-  var l5 = !(g2 === 0)
-    ? _vm.__map(_vm.orders[2], function (res, index) {
-        var $orig = _vm.__get_orig(res)
-        var l4 = _vm.__map(res.items, function (item, index) {
-          var $orig = _vm.__get_orig(item)
-          var m9 = _vm.shopImage(item.goods.pic)
-          var m10 = _vm.formatPrice(item.price)
-          return {
-            $orig: $orig,
-            m9: m9,
-            m10: m10,
-          }
-        })
-        var m11 = _vm.totalNum(res.items)
-        var m12 = _vm.totalPrice(res.items)
-        return {
-          $orig: $orig,
-          l4: l4,
-          m11: m11,
-          m12: m12,
-        }
-      })
-    : null
-  var g3 = _vm.orders[3].length
-  var l7 = !(g3 === 0)
-    ? _vm.__map(_vm.orders[3], function (res, index) {
-        var $orig = _vm.__get_orig(res)
-        var l6 = _vm.__map(res.items, function (item, index) {
-          var $orig = _vm.__get_orig(item)
-          var m13 = _vm.shopImage(item.goods.pic)
-          var m14 = _vm.formatPrice(item.price)
-          return {
-            $orig: $orig,
-            m13: m13,
-            m14: m14,
-          }
-        })
-        var m15 = _vm.totalNum(res.items)
-        var m16 = _vm.totalPrice(res.items)
-        return {
-          $orig: $orig,
-          l6: l6,
-          m15: m15,
-          m16: m16,
-        }
-      })
-    : null
+  var l1 = _vm.__map(_vm.dataList, function (res, index) {
+    var $orig = _vm.__get_orig(res)
+    var l0 = _vm.__map(res.items, function (item, index) {
+      var $orig = _vm.__get_orig(item)
+      var m0 = _vm.shopImage(item.goods.pic)
+      var m1 = _vm.formatPrice(item.price)
+      return {
+        $orig: $orig,
+        m0: m0,
+        m1: m1,
+      }
+    })
+    var m2 = _vm.totalNum(res.items)
+    var m3 = _vm.totalPrice(res.items)
+    var m4 = res.statusName === "待付款" ? _vm.totalPrice(res.items) : null
+    return {
+      $orig: $orig,
+      l0: l0,
+      m2: m2,
+      m3: m3,
+      m4: m4,
+    }
+  })
   _vm.$mp.data = Object.assign(
     {},
     {
       $root: {
-        g0: g0,
         l1: l1,
-        g1: g1,
-        l3: l3,
-        g2: g2,
-        l5: l5,
-        g3: g3,
-        l7: l7,
       },
     }
   )
@@ -282,12 +197,15 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
+/* WEBPACK VAR INJECTION */(function(uni) {
 
-
+var _interopRequireDefault = __webpack_require__(/*! @babel/runtime/helpers/interopRequireDefault */ 4);
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ 63));
+var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 65));
 var _shop = __webpack_require__(/*! @/request/api/shop.js */ 115);
 //
 //
@@ -359,201 +277,33 @@ var _shop = __webpack_require__(/*! @/request/api/shop.js */ 115);
 //
 //
 //
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
 var _default = {
   data: function data() {
     return {
-      showCancel: false,
-      cancelOrderSn: '',
-      orders: [[], [], [], []],
-      listQuery: {
-        page: 1,
-        limit: 20
-      },
       list: [{
-        name: '待付款'
+        name: '全部',
+        id: 0
+      }, {
+        name: '待付款',
+        id: 1
       }, {
-        name: '待发货'
+        name: '待发货',
+        id: 2
       }, {
-        name: '待收货'
+        name: '已发货',
+        id: 3
       }, {
-        name: '待评价'
+        name: '已完成',
+        id: 4
       }],
-      current: 0,
-      swiperCurrent: 0,
-      tabsHeight: 0,
-      dx: 0,
-      loadStatus: ['loadmore', 'loadmore', 'loadmore', 'loadmore']
+      nowCurrent: {
+        name: '全部',
+        id: 0
+      },
+      dataList: []
     };
   },
-  onLoad: function onLoad() {
-    //待付款
-    this.getOrders(1);
-    //待发货
-    this.getOrders(2);
-    //已发货
-    this.getOrders(3);
-    //已完成
-    this.getOrders(4);
-  },
+  onLoad: function onLoad() {},
   computed: {
     // 价格小数
     priceDecimal: function priceDecimal() {
@@ -573,36 +323,40 @@ var _default = {
     }
   },
   methods: {
-    reachBottom: function reachBottom() {
-      var current = this.current;
-      if (this.loadStatus[current] == 'nomore') {
-        return;
-      }
-      this.listQuery.page++;
-      this.getOrders(current + 1);
-    },
-    getOrders: function getOrders(status) {
+    queryList: function queryList(index, size) {
       var _this = this;
-      var page = this.listQuery.page;
-      var limit = this.listQuery.limit;
-      this.orders[status - 1] = new Array();
-      this.loadStatus.splice(status - 1, 1, "loading");
-      (0, _shop.getRequest)('user/order/getOrders?page=' + page + '&limit=' + limit + '&status=' + status).then(function (res) {
-        if (res.state) {
-          var orderList = res.data.records;
-          for (var index in orderList) {
-            var order = orderList[index];
-            order.title = '' + order.createTime;
-            order.descript = '' + order.orderSn;
-            _this.orders[status - 1].push(order);
-          }
-          if (orderList.length < limit) {
-            _this.loadStatus.splice(status - 1, 1, "nomore");
-          } else {
-            _this.loadStatus.splice(status - 1, 1, "more");
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+        var filterOption, orderData;
+        return _regenerator.default.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                filterOption = {
+                  page: index,
+                  limit: size,
+                  status: _this.nowCurrent.id
+                };
+                uni.showLoading();
+                _context.next = 4;
+                return (0, _shop.getOrders)(filterOption);
+              case 4:
+                orderData = _context.sent;
+                if (!orderData.state) {
+                  _context.next = 9;
+                  break;
+                }
+                uni.hideLoading();
+                _this.$refs.paging.complete(orderData.data.records);
+                return _context.abrupt("return");
+              case 9:
+                _this.$refs.paging.complete(false);
+              case 10:
+              case "end":
+                return _context.stop();
+            }
           }
-        }
-      });
+        }, _callee);
+      }))();
     },
     formatPrice: function formatPrice(val) {
       return (val / 100).toFixed(2);
@@ -630,79 +384,56 @@ var _default = {
       }
       return num;
     },
-    // tab栏切换
-    change: function change(index) {
-      this.swiperCurrent = index;
-    },
-    transition: function transition(_ref) {
-      var dx = _ref.detail.dx;
-      this.$refs.tabs.setDx(dx);
-    },
-    animationfinish: function animationfinish(_ref2) {
-      var current = _ref2.detail.current;
-      this.swiperCurrent = current;
-      this.current = current;
-    },
-    toHome: function toHome() {
-      this.$u.route({
-        type: 'switchTab',
-        url: '/pages/shop/index'
-      });
+    changeTab: function changeTab(item) {
+      this.nowCurrent = item;
+      this.$refs.paging.reload();
     },
     toDetail: function toDetail(orderSn) {
-      this.$u.route({
-        url: '/pages/order/detail',
-        params: {
-          orderSn: orderSn
-        }
-      });
+      this.$navigateTo('/subPages/shopPage/orderDetail/orderDetail?orderSn=' + orderSn);
     },
     cancel: function cancel(orderNo) {
-      this.showCancel = true;
-      this.cancelOrderSn = orderNo;
-    },
-    cancelOrder: function cancelOrder() {
       var _this2 = this;
-      this.$u.post('user/order/cancel/' + this.cancelOrderSn).then(function (res) {
-        _this2.getOrders(1);
-      });
-    },
-    expressInfo: function expressInfo(orderNo) {
-      console.log('查看物流信息', orderNo);
-      this.$u.route({
-        url: '/pages/order/express',
-        params: {
-          orderSn: orderNo
+      //取消订单
+      uni.showModal({
+        title: 'WORKARK提示',
+        content: '是否取消订单',
+        success: function success(res) {
+          if (res.confirm) {
+            (0, _shop.cancelOrder)(orderNo).then(function (res) {
+              if (res.state) {
+                _this2.$toast('取消成功');
+                _this2.$refs.paging.reload();
+              }
+            });
+          }
         }
       });
     },
     confirm: function confirm(orderNo) {
       var _this3 = this;
-      console.log('确认收货', orderNo);
-      this.$u.post('user/order/confirm/' + orderNo).then(function (res) {
-        _this3.getOrders(3);
-      });
-    },
-    notify: function notify(orderSn) {
-      console.log('提醒发货', orderSn);
-      this.$u.toast('敬请期待');
-    },
-    pay: function pay(orderNo, totalPrice) {
-      this.$u.route({
-        url: '/pages/order/payment/payment',
-        params: {
-          orderSn: orderNo,
-          totalPrice: totalPrice
+      //确认收获
+      uni.showModal({
+        title: 'WORKARK提示',
+        content: '是否确认收货',
+        success: function success(res) {
+          if (res.confirm) {
+            (0, _shop.confirmOrder)(orderNo).then(function (res) {
+              if (res.state) {
+                _this3.$toast('收货成功');
+                _this3.$refs.paging.reload();
+              }
+            });
+          }
         }
       });
     },
-    comment: function comment(orderSn) {
-      console.log('评论', orderSn);
-      this.$u.toast('敬请期待');
+    pay: function pay(orderNo, totalPrice) {
+      this.$navigateTo('/subPages/shopPage/payment/payment?orderSn=' + orderNo + '&totalPrice=' + totalPrice);
     }
   }
 };
 exports.default = _default;
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
 

virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/subPages/shopPage/orderList/orderList.json

@@ -1,9 +1,8 @@
 {
   "navigationBarTitleText": "订单列表",
   "usingComponents": {
+    "z-paging": "/uni_modules/z-paging/components/z-paging/z-paging",
     "uv-tabs": "/uni_modules/uv-tabs/components/uv-tabs/uv-tabs",
-    "uv-empty": "/uni_modules/uv-empty/components/uv-empty/uv-empty",
-    "uv-icon": "/uni_modules/uv-icon/components/uv-icon/uv-icon",
-    "uv-modal": "/uni_modules/uv-modal/components/uv-modal/uv-modal"
+    "uv-icon": "/uni_modules/uv-icon/components/uv-icon/uv-icon"
   }
 }

virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/subPages/shopPage/orderList/orderList.wxss

@@ -128,15 +128,3 @@ page {
   font-size: 26rpx;
   background: linear-gradient(270deg, #f9745a 0%, #ff9e01 100%);
 }
-.wrap.data-v-9f9b5ee8 {
-  display: flex;
-  flex-direction: column;
-  height: calc(100vh - 0px);
-  width: 100%;
-}
-.swiper-box.data-v-9f9b5ee8 {
-  flex: 1;
-}
-.swiper-item.data-v-9f9b5ee8 {
-  height: 100%;
-}

virgo.wzfrontend/workark_wx/unpackage/dist/dev/mp-weixin/subPages/shopPage/payment/payment.js

@@ -277,7 +277,7 @@ var _default = {
       });
     },
     primaryBtnClick: function primaryBtnClick() {
-      this.$navigateTo('/subPages/shopPage/webview/webview?url=' + encodeURIComponent('/order/detail/' + this.orderSn));
+      this.$navigateTo('/subPages/shopPage/orderDetail/orderDetail?orderSn=' + this.orderSn);
     },
     secondaryBtnClick: function secondaryBtnClick() {
       uni.navigateBack();