diff --git a/components.d.ts b/components.d.ts
index f346c00..d819104 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -24,7 +24,9 @@ declare module '@vue/runtime-core' {
VanDivider: typeof import('vant/es')['Divider']
VanField: typeof import('vant/es')['Field']
VanIcon: typeof import('vant/es')['Icon']
+ VanImage: typeof import('vant/es')['Image']
VanList: typeof import('vant/es')['List']
+ VanPullRefresh: typeof import('vant/es')['PullRefresh']
VanStepper: typeof import('vant/es')['Stepper']
}
}
diff --git a/src/views/badge/myOrder.vue b/src/views/badge/myOrder.vue
index 0d1c051..4871941 100644
--- a/src/views/badge/myOrder.vue
+++ b/src/views/badge/myOrder.vue
@@ -30,7 +30,7 @@ function getOrder() {
loading.value = true
badgeApi.getMyOrder({
page: page.value,
- pageSize: 10,
+ size: 30,
status: 0,
}).then(res => {
if(page.value === 1) {
@@ -38,7 +38,7 @@ function getOrder() {
} else {
orders.value.push(...res.list)
}
- if(res.list.length < 10) {
+ if(res.total <= orders.value.length) {
finished.value = true
} else {
page.value++
diff --git a/src/views/badge/record.vue b/src/views/badge/record.vue
index 21577c2..b429152 100644
--- a/src/views/badge/record.vue
+++ b/src/views/badge/record.vue
@@ -5,69 +5,88 @@
注:可点击效果图进行下单打印
-
-
-
-
-
-
-
-
- 设计中
-
-
- 设计失败
+
+
+
+
+
+
+
+
+
+ 设计中
+
+
+ 设计失败
+
-
-
-

-
-
+
+ 加载中...
+
+
+

+
+
+
+
+
\ No newline at end of file
+.header {
+ display: flex;
+ align-items: center;
+ height: 40px;
+ font-size: 14px;
+ color: #999;
+ padding: 16px 16px 0 16px;
+}
+
+.back-icon {
+ margin-right: 8px;
+ color: #222;
+ font-size: 16px;
+ cursor: pointer;
+}
+
+.record-container {
+ padding: 16px;
+}
+
+.record-note {
+ font-size: 12px;
+ color: #999;
+ margin-bottom: 16px;
+}
+
+.record-images {
+ display: grid;
+ grid-template-columns: repeat(2, 1fr);
+ gap: 16px;
+}
+
+.record-image-item {
+ width: 100%;
+ padding-bottom: 100%;
+ position: relative;
+ overflow: hidden;
+ cursor: pointer;
+ border-radius: 12px;
+}
+
+.record-image {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ border-radius: 50%;
+ object-fit: cover;
+}
+
+.record-image-item-shadow {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ object-fit: cover;
+ box-shadow: inset 2px 2px 4px rgba(255, 255, 255, 0.5), inset -2px -2px 4px rgba(0, 0, 0, 0.2);
+ border-radius: 50%;
+}
+
+.record-image-item-loading {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ background: #f5f5f5;
+ border-radius: 50%;
+ font-size: 16px;
+ color: #999;
+}
+
+.record-image-item-null {
+ height: 50vh;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+}
+
+.record-image-item-null img {
+ width: 80vw;
+ height: 200px;
+}
+
\ No newline at end of file