diff --git a/src/pagesOrder/detail/components/PageSkeleton.vue b/src/pagesOrder/detail/components/PageSkeleton.vue
new file mode 100644
index 0000000..e69de29
diff --git a/src/pagesOrder/detail/detail.vue b/src/pagesOrder/detail/detail.vue
index 7f76fa6..52a8565 100644
--- a/src/pagesOrder/detail/detail.vue
+++ b/src/pagesOrder/detail/detail.vue
@@ -248,7 +248,7 @@ const onCopy = (id: string) => {
}
// 获取页面参数
const query = defineProps<{
- id: string
+ id: string // 订单ID
}>()
// 获取当前页面栈
diff --git a/src/pagesOrder/list/components/OrderListSkeleton.vue b/src/pagesOrder/list/components/OrderListSkeleton.vue
new file mode 100644
index 0000000..232193c
--- /dev/null
+++ b/src/pagesOrder/list/components/OrderListSkeleton.vue
@@ -0,0 +1,359 @@
+
+
+
+
+
+ 2023-04-14 13:14:20
+ 待发货
+
+
+
+
+
+
+ ins风小碎花泡泡袖衬110-160cm
+ 米底碎花 130
+
+
+
+ 共2件商品
+ 实付
+ ¥203.00
+
+
+
+ 再次购买
+
+
+
+
+
+ 2023-04-14 13:14:20
+ 待发货
+
+
+
+
+
+
+ 经典品种交响曲,智利混酿干白750毫升
+ 礼袋(单支/双支均适用)
+
+
+
+ 共1件商品
+ 实付
+ ¥11.90
+
+
+
+ 再次购买
+
+
+
+
+
+
+
+
diff --git a/src/pagesOrder/list/components/orderList.vue b/src/pagesOrder/list/components/orderList.vue
new file mode 100644
index 0000000..e03ffa1
--- /dev/null
+++ b/src/pagesOrder/list/components/orderList.vue
@@ -0,0 +1,346 @@
+
+
+
+
+
+
+ {{ item.createTime }}
+
+ {{ OrderStateList[item.orderState].text }}
+
+ 删除订单
+
+
+
+
+
+
+
+ {{ sku.name }}
+ {{ sku.attrsText.replaceAll(',', ' ') }}
+
+
+
+
+ 共{{ item.totalNum }}件商品
+ 实付
+ ¥{{ item.payMoney.toFixed(2) }}
+
+
+
+
+
+ 支付剩余
+
+ 去支付
+
+
+
+ 再次购买
+
+
+ 确认收货
+
+
+
+
+
+ {{ isLoading ? '正在加载...' : '没有更多数据~' }}
+
+
+
+
+
+
+
diff --git a/src/pagesOrder/list/list.vue b/src/pagesOrder/list/list.vue
new file mode 100644
index 0000000..66d7f7d
--- /dev/null
+++ b/src/pagesOrder/list/list.vue
@@ -0,0 +1,112 @@
+
+
+
+
+
+ {{ item.title }}
+
+
+
+
+
+ {
+ activeTab = e.detail.current
+ }
+ "
+ >
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/utils/http.ts b/src/utils/http.ts
index a0d2fb4..17174ac 100644
--- a/src/utils/http.ts
+++ b/src/utils/http.ts
@@ -21,7 +21,7 @@ const interceptorOptions = {
options.url = baseUrl + options.url
}
// 2. 超时时间, 默认60s
- options.timeout = 10 * 1000
+ options.timeout = 60 * 1000
// 3. 请求头
options.header = {
...options.header,