From 5f802e60acf345330ee01c1d6b5b6b0e26cbba62 Mon Sep 17 00:00:00 2001
From: sx <2427911852@qq.com>
Date: Sun, 19 Jan 2025 22:56:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jiuyi2/api/shop.js                            |  40 ++++
 jiuyi2/common/js/config.js                    |  21 +-
 jiuyi2/common/js/order.js                     |  34 +++
 .../public/jy-commodity-address/index.vue     |  10 +-
 jiuyi2/components/shop/order/item.vue         |  20 +-
 jiuyi2/components/shop/order/order.js         | 113 ---------
 jiuyi2/pages/shop/commodity/payment.vue       | 217 +++++++++++++-----
 jiuyi2/pages/shop/order/index.vue             | 151 +++++++++---
 jiuyi2/readme.md                              |  15 ++
 9 files changed, 386 insertions(+), 235 deletions(-)
 create mode 100644 jiuyi2/common/js/order.js
 delete mode 100644 jiuyi2/components/shop/order/order.js

diff --git a/jiuyi2/api/shop.js b/jiuyi2/api/shop.js
index 7614a2b7..f8763317 100644
--- a/jiuyi2/api/shop.js
+++ b/jiuyi2/api/shop.js
@@ -292,6 +292,19 @@ const shop = {
 		})
 	},
 
+	/**
+	 * 获取用户订单列表
+	 * @param {Object} param
+	 */
+	getOrderList(param) {
+		return util.request({
+			url: `/shopify/appOrder/getOrderList`,
+			query: param.query,
+			method: 'GET',
+			load: true,
+		})
+	},
+
 	/**
 	 * 获取订单详情
 	 * @param {Object} param
@@ -304,6 +317,33 @@ const shop = {
 			load: true,
 		})
 	},
+
+	/**
+	 * 订单支付
+	 * @param {Object} param
+	 */
+	orderPay(param) {
+		return util.request({
+			url: `/shopify/appOrder/payOrder`,
+			query: param.query,
+			data: param.data,
+			method: 'POST',
+			load: true,
+		})
+	},
+
+	/**
+	 * 订单取消
+	 * @param {Object} param
+	 */
+	orderCancel(param) {
+		return util.request({
+			url: `/shopify/appOrder/cancelOrder`,
+			query: param.query,
+			method: 'PUT',
+			load: true,
+		})
+	},
 }
 
 export default shop
\ No newline at end of file
diff --git a/jiuyi2/common/js/config.js b/jiuyi2/common/js/config.js
index cf8cf25e..e6cd4728 100644
--- a/jiuyi2/common/js/config.js
+++ b/jiuyi2/common/js/config.js
@@ -8,16 +8,17 @@ const config = {
 	host: 'https://539c1514.r24.cpolar.top',
 	// host: 'http://gfjds5.natappfree.cc',
 	// #endif
-	// 上传文件二级路径
-	uploadFilePath: "/homecommon/file/preview?fileName=",
-	// 上传视频二级路径
-	uploadVideoPath: '/homecommon/file/play?fileName=',
-	// 图片大小 单位m
-	img_size: 5,
-	// 视频限制大小 单位m
-	video_size: 300,
-	// h5路径
-	h5: '',
+	// 支付方式配置
+	payType: {
+		score: {
+			name: '积分',
+			img: '/static/images/pay/wechat.png',
+		},
+		balance: {
+			name: '余额',
+			img: '/static/images/pay/wechat.png',
+		},
+	},
 	// 腾讯im聊天
 	TChat: {
 		// appid
diff --git a/jiuyi2/common/js/order.js b/jiuyi2/common/js/order.js
new file mode 100644
index 00000000..9c18c29d
--- /dev/null
+++ b/jiuyi2/common/js/order.js
@@ -0,0 +1,34 @@
+// 工具库
+import util from '@/common/js/util.js'
+// api
+import api from '@/api/index.js'
+
+const order = {
+	/**
+	 * 订单支付
+	 * @param {Object} event 事件对象
+	 */
+	orderPay: (event) => {
+		return new Promise((resolve, reject) => {
+			api.shop.orderPay({
+				query: {
+					...event.query,
+				},
+				data: [
+					event.orderId,
+				],
+			}).then(rs => {
+				if (res.code == 200) {
+					resolve(res.data)
+					return
+				}
+				util.alert({
+					content: res.msg,
+					showCancel: false,
+				})
+			})
+		})
+	}
+}
+
+export default order
\ No newline at end of file
diff --git a/jiuyi2/components/public/jy-commodity-address/index.vue b/jiuyi2/components/public/jy-commodity-address/index.vue
index c783b8bc..5b4d1448 100644
--- a/jiuyi2/components/public/jy-commodity-address/index.vue
+++ b/jiuyi2/components/public/jy-commodity-address/index.vue
@@ -8,7 +8,8 @@
 		computed,
 		watch,
 		onMounted,
-		onUnmounted
+		onUnmounted,
+		defineEmits,
 	} from 'vue'
 
 	const props = defineProps({
@@ -21,6 +22,8 @@
 			default: () => ({})
 		}
 	})
+	// 
+	const emit = defineEmits(['update:address'])
 
 	onMounted(() => {
 		// 开启监听
@@ -36,7 +39,8 @@
 	function addListener() {
 		// 选择收货地址
 		uni.$on('selectAddress', (event) => {
-			emit('update:value', event.target.value);
+			console.log('selectAddress', event)
+			emit('update:address', event);
 		})
 	}
 
@@ -74,7 +78,7 @@
 		</view>
 
 		<!-- 选择地址 -->
-		<view v-if="shopEdit" class="btn ti warmHollow plr20 ml20" @click="link('/pages/mine/address/index')">
+		<view v-if="shopEdit" class="btn ti warmHollow plr20 ml20" @click="link('/pages/mine/address/index?select=1')">
 			<text class="cFF9B27">选择地址</text>
 		</view>
 	</view>
diff --git a/jiuyi2/components/shop/order/item.vue b/jiuyi2/components/shop/order/item.vue
index 7cf4d847..17d72fa9 100644
--- a/jiuyi2/components/shop/order/item.vue
+++ b/jiuyi2/components/shop/order/item.vue
@@ -33,10 +33,8 @@
 		<view class="header line rows ptb20 f28">
 			<!-- 店铺 -->
 			<view class="store df aic thd f1" v-if="mode == 'mine'">
-				<image class="wh50 br10"
-					src="https://img13.360buyimg.com/n1/jfs/t1/117234/35/34799/82687/6449f2b4Fd6e2eef9/a754c5e178c9e9be.jpg.avif"
-					mode="aspectFill" />
-				<view class="name ml10 c333">家纺专营店</view>
+				<image class="wh50 br10" :src="item.merImg" mode="aspectFill" />
+				<view class="name ml10 c333">{{item.merName}}</view>
 			</view>
 			<!-- 购买用户 -->
 			<view class="store df aic thd f1" v-else-if="mode == 'shop'">
@@ -53,24 +51,22 @@
 		<!-- 商品信息 -->
 		<view class="product line df ptb20">
 			<view class="poster wh160">
-				<image class="wh160 br10"
-					src="https://img13.360buyimg.com/n1/jfs/t1/117234/35/34799/82687/6449f2b4Fd6e2eef9/a754c5e178c9e9be.jpg.avif"
-					mode="aspectFill" />
+				<image class="wh160 br10" :src="item.productImage" mode="aspectFill" />
 			</view>
 
 			<!-- 产品名称 和 购买的规格 -->
 			<view class="info mlr20 f1">
-				<view class="name c333 f28">靠枕 纯棉靠枕 车载居家 纯棉100% 卡通靠枕 人体工学</view>
-				<view class="spec mt10 c999 f26">款式：普通款 小熊</view>
+				<view class="name t2hd c333 f28">{{item.productName}}</view>
+				<view class="spec mt10 thd c999 f26">款式：{{item.sku}}</view>
 			</view>
 
 			<!-- 单价 数量 -->
 			<view class="tar">
 				<view class="price c666">
 					<text class="f20">￥</text>
-					<text class="f26">89</text>
+					<text class="f26">{{item.productPrice}}</text>
 				</view>
-				<view class="number f24 c999">x 1</view>
+				<view class="number f24 c999">x {{item.totalNum}}</view>
 			</view>
 		</view>
 
@@ -80,7 +76,7 @@
 				<text v-if="mode == 'mine'">应付：</text>
 				<text v-else-if="mode == 'shop'">实收：</text>
 				<text class="cFF9B27 f20">￥</text>
-				<text class="cFF9B27">89</text>
+				<text class="cFF9B27">{{item.totalPrice}}</text>
 			</view>
 		</view>
 
diff --git a/jiuyi2/components/shop/order/order.js b/jiuyi2/components/shop/order/order.js
deleted file mode 100644
index d3f8bae0..00000000
--- a/jiuyi2/components/shop/order/order.js
+++ /dev/null
@@ -1,113 +0,0 @@
-const menu = {
-	// '1 待付款'
-	// '2 待发货'
-	// '3 待收货'
-	// '4 待评价'
-	// '5 售后/退款'
-	// '6 已完成'
-	// '7 已取消'
-
-	// 
-	user: [{
-			name: '取消订单',
-			type: 'black',
-			value: 'cancel_order',
-			status: [2]
-		},
-		{
-			name: '继续付款',
-			type: 'orange',
-			value: 'continue_paying',
-			status: [2]
-		},
-		{
-			name: '申请退款',
-			type: 'black',
-			value: 'refund',
-			status: [3, 4, 5]
-		},
-		{
-			name: '崔发货',
-			type: 'orange',
-			status: [3]
-		},
-		{
-			name: '查看物流',
-			type: 'black',
-			status: [4]
-		}, {
-			name: '确认收货',
-			type: 'orange',
-			status: [4]
-		}, {
-			name: '评价',
-			type: 'orange',
-			status: [5]
-		}, {
-			name: '删除记录',
-			type: 'black',
-			status: [6]
-		}, {
-			name: '售后详情',
-			type: 'black',
-
-			status: [6]
-		}, {
-			name: '钱款去向',
-			type: 'black',
-			value: 'money_whereabouts',
-			status: [6]
-		}, {
-			name: '平台介入',
-			type: 'orange',
-			status: [6]
-		}
-	],
-	shop: [{
-		name: '改价',
-		type: 'orange',
-		value: 'change_price',
-		status: [2]
-	}, {
-		name: '发货',
-		type: 'orange',
-		value: 'delivery',
-		status: [3]
-	}, {
-		name: '拒绝退款',
-		type: 'black',
-		value: 'refund_refund',
-		status: [5]
-	}, {
-		name: '同意退款',
-		type: 'black',
-		value: 'agree_refund',
-		status: [5]
-	}, {
-		name: '联系用户',
-		type: 'orange',
-		value: 'contact_users',
-		status: [5]
-	}],
-	manage: [{
-		name: '上架',
-		type: 'black',
-		value: 'grounding',
-		status: [1]
-	}, {
-		name: '下架',
-		type: 'black',
-		value: 'discontinue',
-		status: [1]
-	}, {
-		name: '编辑',
-		type: 'orange',
-		value: 'edit',
-		status: [1]
-	}]
-}
-
-export default {
-	// 功能菜单
-	menu,
-}
\ No newline at end of file
diff --git a/jiuyi2/pages/shop/commodity/payment.vue b/jiuyi2/pages/shop/commodity/payment.vue
index 23533308..7033ad91 100644
--- a/jiuyi2/pages/shop/commodity/payment.vue
+++ b/jiuyi2/pages/shop/commodity/payment.vue
@@ -1,6 +1,8 @@
 <script setup>
 	import {
 		ref,
+		reactive,
+		getCurrentInstance,
 	} from 'vue'
 	import {
 		onReachBottom,
@@ -19,36 +21,53 @@
 	import api from '@/api/index.js'
 	// util
 	import util from '@/common/js/util';
-
+	// 订单方法
+	import order from '@/common/js/order.js'
+	// 二级支付
+	import secondPwd from '@/components/mine/payPwd.vue'
+	const {
+		proxy
+	} = getCurrentInstance()
 	// 订单id
 	const orderId = ref('')
 	// 支付方式
-	const paytype = ref('1')
+	const paytype = ref('')
+	// 订单详情
+	const detail = reactive({
+		createTime: '',
+		coutDownTime: '',
+		orderDetailList: [],
+	})
 	// 支付方式列表
-	// 要么先用积分 要么用余额 不够的话 全部的积分和剩下的余额 在个人中心增加一个优先支付的选项
-	const paytypeList = [{
-			name: '微信支付',
-			value: '1',
-			icon: '/static/shop-weixin-pay.png'
-		},
-		{
-			name: '支付宝支付',
-			value: '2',
-			icon: '/static/shop-alipay-payment.png'
-		},
-		{
-			name: '余额支付',
-			value: '3',
-			icon: '/static/shop-apply-pay.png'
-		}
-	]
+	const paytypeList = reactive([])
+	// 当前时间
+	const date = reactive(new Date())
 
 	onLoad((option) => {
 		if (option.orderId) orderId.value = option.orderId
+		// 获取支付顺序
+		getPaymentOrder()
 		// 获取订单详情
 		getDetail()
 	})
 
+	// 获取支付顺序
+	function getPaymentOrder() {
+		api.mine.getPaymentOrder({}).then(res => {
+			if (res.code == 200) {
+				Object.assign(paytypeList, res.data.map(item => {
+					item.name = util.config.payType[item.paymentMethod].name
+					return item
+				}))
+				return
+			}
+			util.alert({
+				content: res.msg,
+				showCancel: false,
+			})
+		})
+	}
+
 	// 获取订单详情
 	function getDetail() {
 		api.shop.getOrderDetail({
@@ -57,19 +76,95 @@
 			}
 		}).then(res => {
 			if (res.code == 200) {
+				const result = res.data
+				let time = new Date(result.createTime)
 				// 
-			} else {
-				uni.showToast({
-					title: res.msg,
-					icon: 'none'
-				})
+				result.createTime = new Date(result.createTime).valueOf()
+				result.coutDownTime = time.setMinutes(time.getMinutes() + 30).valueOf()
+				// 如果未到倒计时 计算相差时间
+				if (date.valueOf() < result.coutDownTime) {
+					let timeDiff = timeDifference(new Date(), result.coutDownTime)
+					result.hours = timeDiff.hours
+					result.minutes = timeDiff.minutes
+					result.seconds = timeDiff.seconds
+				}
+
+				Object.assign(detail, {}, result)
+				return
 			}
+			util.alert({
+				content: res.msg,
+				showCancel: false,
+			})
 		})
 	}
 
+	/**
+	 * 相差时间
+	 * @param {Object} startTimeStr 开始时间
+	 * @param {Object} endTimeStr 结束时间
+	 */
+	function timeDifference(startTimeStr, endTimeStr) {
+		// 将时间字符串转换为 Date 对象
+		let startDate = new Date(startTimeStr);
+		let endDate = new Date(endTimeStr);
+
+		// 计算时间差（毫秒）
+		let timeDiff = endDate - startDate;
+
+		// 计算小时、分钟和秒
+		let hours = Math.floor(timeDiff / (1000 * 60 * 60));
+		let minutes = Math.floor((timeDiff % (1000 * 60 * 60)) / (1000 * 60));
+		let seconds = Math.floor((timeDiff % (1000 * 60)) / 1000);
+
+		return {
+			hours,
+			minutes,
+			seconds
+		}
+	}
+
 	// 选择支付方式
 	function handlePayment(ev) {
-		// 
+		let value = ev.detail.value
+		if (value == paytype.value) return
+		paytype.value = value
+	}
+
+	// 提交
+	function handleSubmit() {
+		api.shop.orderPay({
+			query: {
+				payType: paytype.value,
+				addrId: detail.address.id,
+			},
+			data: [
+				orderId.value,
+			],
+		}).then(res => {
+			if (res.code == 200) {
+				// 触发自定义事件
+				uni.$off('updateOrderList')
+				uni.$off('updateOrderDetail')
+				uni.navigateBack()
+				return
+			}
+			util.alert({
+				content: res.msg,
+				showCancel: false,
+			})
+		})
+	}
+
+	// 打开密码
+	function showPwd() {
+		if (!paytype.value) {
+			util.alert('请选择支付方式')
+			return
+		}
+
+		// 打开
+		proxy.$refs.secondPwd.open()
 	}
 </script>
 
@@ -77,94 +172,90 @@
 	<view class="app">
 		<view class="bfff p25">
 			<!-- 地址 -->
-			<JyCommodityAddress></JyCommodityAddress>
+			<JyCommodityAddress v-model:address="detail.address" />
 		</view>
 
 		<!-- 店铺和商家信息 -->
 		<view class="detail oh mtb20 plr30 bfff">
 			<!-- 店铺 -->
 			<view class="store mtb20 plr10 df aic">
-				<image class="avaar wh60 cir" src="/static/qq.png" mode="aspectFill" />
-				<view class="name ml10 c333 f28">店铺名称</view>
+				<image class="avaar wh60 br10" :src="detail.merImg" mode="aspectFill" />
+				<view class="name ml20 c333 f28">{{detail.merName}}</view>
 			</view>
 
 			<!-- 商品信息 -->
-			<view class="goods mtb20 plr10 df">
+			<view class="goods mtb20 plr10 df" v-for="(item,index) in detail.orderDetailList">
 				<!-- 产品图 -->
-				<image class="wh180 br10"
-					src="https://img13.360buyimg.com/n1/jfs/t1/117234/35/34799/82687/6449f2b4Fd6e2eef9/a754c5e178c9e9be.jpg.avif"
-					mode="aspectFill"></image>
+				<image class="wh180 br10" :src="item.productInfo.sliderImage.split(',')[0]" mode="aspectFill" />
 				<!-- 产品信息 -->
-				<view class="f1 mlr10">
-					<view class="name f30">靠枕 纯棉靠枕 车载居家 纯棉100% 卡通靠枕 人体工学</view>
-					<view class="spec mt10 c999 f26">升级款 小熊</view>
+				<view class="f1 ml20 mr10">
+					<view class="name f30 t2hd">{{item.productName}}</view>
+					<view class="spec mt10 c999 f26">升级款 {{item.sku}}</view>
 				</view>
 				<!-- 其他 -->
-				<view class=" tar">
+				<view class="tar">
 					<view class="price">
 						<text class="f20">￥</text>
-						<text class="f30">5.48</text>
+						<text class="f30">{{item.price}}</text>
 					</view>
-					<view class="c999 f28">x1</view>
+					<view class="c999 f28">x{{item.payNum}}</view>
 				</view>
 			</view>
 
-			<!-- 积分抵扣 -->
-			<view class="line df jcr aic ptb20 plr10">
-				<text class="c333 f28">积分抵扣：</text>
-				<text class="price f20 cFF9B27">-￥</text>
-				<text class="price f32 cFF9B27">5.00</text>
-			</view>
 			<!-- 应付 -->
 			<view class="line df jcr aic ptb20 plr10">
 				<text class="c333 f28">应付：</text>
 				<text class="price f20 cFF9B27">￥</text>
-				<text class="price f32 cFF9B27">5.00</text>
+				<text class="price f32 cFF9B27">{{detail.totalPrice}}</text>
 			</view>
 		</view>
 
 		<!-- 支付方式选择 -->
 		<radio-group class="payType mtb20 plr20 bfff" @change="handlePayment">
-			<label class="item rows ptb20 plr10" v-for="(item, index) in paytypeList" :key="item.value">
+			<label class="item rows ptb20 plr10" v-for="(item, index) in paytypeList" :key="item.paymentMethod">
 				<image :src="item.icon" class="wh60" mode="aspectFit" />
 				<view class="f1 mlr20 c333 f28">{{item.name}}</view>
-				<radio class="radio" color="#4cd964" :value="item.value" :checked="item.value === paytype" />
-			</label>
-			<label class="item rows ptb20 plr10">
-				<image src="/static/shop-bank-payment.png" class="wh60" mode="aspectFit" />
-				<view class="f1 mlr20 c333 f28">添加银行卡</view>
-				<uni-icons type="right" />
+				<radio class="radio" color="#4cd964" :value="item.paymentMethod"
+					:checked="item.paymentMethod === paytype" />
 			</label>
 		</radio-group>
 
 		<!-- 订单备注 -->
-		<view class="remark mtb20 ptb20 plr20 bfff">
+		<view class="remark mtb20 ptb20 plr20 bfff" v-if="0">
 			<view class="title f30">订单备注</view>
 			<view class="txtarea mt10">
 				<uni-easyinput :inputBorder="false" type="textarea" placeholder="选填" />
 			</view>
 		</view>
 
-		<view class="fill" style="height: 210rpx;"></view>
+		<view class="fill" style="height: 210rpx;" />
 
 		<!-- 提交订单 -->
-		<view class="footer df jcr plr20 bfff">
+		<view class="footer df jcr plr20 bfff" v-if="detail.id">
 			<view class="df aic">
 				<text class="c333 f28">应付：</text>
 				<text class="price f20 cFF9B27">￥</text>
-				<text class="price f36 cFF9B27">5.48</text>
+				<text class="price f36 cFF9B27">{{detail.totalPrice}}</text>
 			</view>
 
-			<view class="btn ti primary ml20 plr60">
-				<text class="cfff f24">继续付款</text>
-				<view class="df cfff aic f20">
-					<text class="">剩余：</text>
-					<uni-countdown splitorColor="#fff" color="#fff" :show-day="false" :hour="12" :minute="12"
-						:second="12" />
+			<template v-if="date.valueOf() < detail.coutDownTime">
+				<view class="btn ti primary ml20 plr60" @click="showPwd">
+					<text class="cfff f24">继续付款</text>
+					<view class="df cfff aic f20">
+						<text class="">剩余：</text>
+						<uni-countdown splitorColor="#fff" color="#fff" :show-day="false" :hour="detail.hours"
+							:minute="detail.minutes" :second="detail.seconds" @timeup="getDetail" />
+					</view>
 				</view>
-			</view>
+			</template>
+			<template v-else>
+				<view class="btn disabled  ml20 plr60">订单已过期</view>
+			</template>
 		</view>
 	</view>
+
+	<!-- 二级密码 -->
+	<secondPwd ref="secondPwd" :check="true" @confirm="handleSubmit" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/jiuyi2/pages/shop/order/index.vue b/jiuyi2/pages/shop/order/index.vue
index 0de64458..d82dc1a1 100644
--- a/jiuyi2/pages/shop/order/index.vue
+++ b/jiuyi2/pages/shop/order/index.vue
@@ -6,6 +6,9 @@
 	} from 'vue'
 	import {
 		onLoad,
+		onUnload,
+		onReachBottom,
+		onPullDownRefresh,
 		onPageScroll
 	} from '@dcloudio/uni-app';
 	// 顶部
@@ -17,71 +20,129 @@
 	import orderItem from '@/components/shop/order/item.vue';
 	// 工具库
 	import util from '@/common/js/util';
-
+	// api
+	import api from '@/api/index.js';
 	// tabs
 	const tabs = reactive([{
 			id: '',
 			name: '全部'
 		},
 		{
-			id: 2,
+			id: 0,
 			name: '待付款'
 		},
 		{
-			id: 3,
+			id: 1,
 			name: '待发货'
 		},
 		{
 			id: 4,
-			name: '待收货'
+			name: '已收货'
 		},
 		{
 			id: 5,
-			name: '待评价'
-		}, {
+			name: '待收货'
+		},
+		{
 			id: 6,
-			name: '售后/退款'
+			name: '已完成'
+		}, {
+			id: 9,
+			name: '已取消'
 		}
 	])
-
-	// 列表
-	const list = reactive({
-		data: [{
-			status: 1,
-			status_text: '待付款',
-		}, {
-			status: 2,
-			status_text: '待发货',
-		}, {
-			status: 3,
-			status_text: '待收货',
-		}, {
-			status: 4,
-			status_text: '已完成',
-		}, {
-			status: 5,
-			status_text: '已取消',
-		}, {
-			status: 6,
-			status_text: '售后中',
-		}],
-	})
 	// 
 	const params = reactive({
 		currentTab: 0,
 		search: ''
 	})
+	// 列表
+	const list = reactive({
+		data: [],
+		pageSize: 10,
+		pageNum: 1,
+		total: 0,
+	})
 	// 顶部导航背景颜色
 	const apexBgColor = ref('#ffffff00')
 
 	onLoad((options) => {
 		// this.params.currentTab = options.currentTab / 1
+		// 获取订单列表
+		getList()
+		// 开启监听
+		addListener()
+	})
+
+	onUnload(() => {
+		// 移除监听
+		removeListener()
 	})
 
 	onPageScroll((ev) => {
 		apexBgColor.value = ev.scrollTop > 44 ? '#fff' : '#ffffff00'
 	})
 
+	onReachBottom(() => {
+		// 获取更多列表
+		getMoreList()
+	})
+
+	onPullDownRefresh(() => {
+		// 重载列表
+		refreshList()
+	})
+
+	// 开启监听
+	function addListener() {
+		uni.$on('updateOrderList', (data) => {
+			// 重载列表
+			refreshList()
+		})
+	}
+
+	// 移除监听
+	function removeListener() {
+		uni.$off('updateOrderList')
+	}
+
+	// 重载列表
+	function refreshList() {
+		list.pageNum = 1
+		getList()
+	}
+
+	// 获取更多列表
+	function getMoreList() {
+		if (listlist.data.length >= list.total) return
+		list.pageNum++
+		getList()
+	}
+
+	// 获取订单列表
+	function getList() {
+		api.shop.getOrderList({
+			query: {
+				pageNum: list.pageNum,
+				pageSize: list.pageSize,
+			},
+		}).then(res => {
+			if (res.code == 200) {
+				if (list.pageNum == 1) list.data.length = 0
+				list.data.push(...res.rows.map(item => {
+					item.status = Number(item.status)
+					return item
+				}))
+				list.total = res.total
+				return
+			}
+			util.alert({
+				content: rs.msg,
+				showCancel: false
+			})
+		})
+	}
+
 	/**
 	 * 点击订单列表项
 	 * @param {Object} ev 订单列表项
@@ -91,6 +152,27 @@
 			url: util.setUrl('/pages/shop/order/detail')
 		})
 	}
+
+	/**
+	 * 点击tab
+	 * @param {Object} ev
+	 */
+	function itemClick(ev) {
+		// 重载列表
+		refreshList()
+	}
+
+	/**
+	 * 支付
+	 * @param {Object} item 订单
+	 */
+	function handlePay(item) {
+		uni.navigateTo({
+			url: util.setUrl('/pages/shop/commodity/payment', {
+				orderId: item.id,
+			})
+		})
+	}
 </script>
 
 <template>
@@ -118,12 +200,13 @@
 					<view class="mtb30">
 						<orderItem :item="item" mode="mine" @item="handleItem">
 							<template #menu="scope">
-								<view class="menu ptb20 df jcr" v-if="[1,2,3,4,6].includes(scope.item.status)">
-									<template v-if="scope.item.status == 1">
+								<view class="menu ptb20 df jcr" v-if="[0,1,4,5,6].includes(scope.item.status)">
+									<template v-if="scope.item.status == 0">
 										<view class="btn bar closeHollow plr30">取消订单</view>
-										<view class="btn bar warmHollow plr30">继续付款</view>
+										<view class="btn bar warmHollow plr30" @click.stop="handlePay(scope.item)">继续付款
+										</view>
 									</template>
-									<template v-if="scope.item.status == 2">
+									<template v-if="scope.item.status == 1">
 										<view class="btn bar closeHollow plr30">申请退款</view>
 										<view class="btn bar warmHollow plr30">催发货</view>
 									</template>
diff --git a/jiuyi2/readme.md b/jiuyi2/readme.md
index 443637a8..157d64cd 100644
--- a/jiuyi2/readme.md
+++ b/jiuyi2/readme.md
@@ -60,6 +60,9 @@ collectsVideo 收藏夹视频端
 commentVideo 视频评论
 deleteVideo 删除视频
 selectAddress 选择地址
+updateOrderList 更新订单列表
+updateOrderDetail 更新订单详情
+
 
 缓存
 ---
@@ -374,3 +377,15 @@ likeType
 7 商家和用户进行交流
 
 
+用户订单状态
+订单状态
+0：待支付
+1：待发货
+4：待收货
+5：已收货
+6：已完成
+9：已取消
+
+
+1737292587952
+1737378810000
\ No newline at end of file