diff --git a/imgs/loading.png b/public/imgs/loading.png similarity index 100% rename from imgs/loading.png rename to public/imgs/loading.png diff --git a/imgs/login.png b/public/imgs/login.png similarity index 100% rename from imgs/login.png rename to public/imgs/login.png diff --git a/imgs/mainpage/交易记录.png b/public/imgs/mainpage/交易记录.png similarity index 100% rename from imgs/mainpage/交易记录.png rename to public/imgs/mainpage/交易记录.png diff --git a/imgs/mainpage/客服中心.png b/public/imgs/mainpage/客服中心.png similarity index 100% rename from imgs/mainpage/客服中心.png rename to public/imgs/mainpage/客服中心.png diff --git a/imgs/mainpage/系统公告.png b/public/imgs/mainpage/系统公告.png similarity index 100% rename from imgs/mainpage/系统公告.png rename to public/imgs/mainpage/系统公告.png diff --git a/imgs/mainpage/订单查询.png b/public/imgs/mainpage/订单查询.png similarity index 100% rename from imgs/mainpage/订单查询.png rename to public/imgs/mainpage/订单查询.png diff --git a/imgs/point.png b/public/imgs/point.png similarity index 100% rename from imgs/point.png rename to public/imgs/point.png diff --git a/imgs/profile/地址.png b/public/imgs/profile/地址.png similarity index 100% rename from imgs/profile/地址.png rename to public/imgs/profile/地址.png diff --git a/imgs/profile/收藏.png b/public/imgs/profile/收藏.png similarity index 100% rename from imgs/profile/收藏.png rename to public/imgs/profile/收藏.png diff --git a/imgs/profile/购物车.png b/public/imgs/profile/购物车.png similarity index 100% rename from imgs/profile/购物车.png rename to public/imgs/profile/购物车.png diff --git a/imgs/shop.png b/public/imgs/shop.png similarity index 100% rename from imgs/shop.png rename to public/imgs/shop.png diff --git a/imgs/top/1.jpg b/public/imgs/top/1.jpg similarity index 100% rename from imgs/top/1.jpg rename to public/imgs/top/1.jpg diff --git a/imgs/top/2.jpg b/public/imgs/top/2.jpg similarity index 100% rename from imgs/top/2.jpg rename to public/imgs/top/2.jpg diff --git a/imgs/top/3.jpg b/public/imgs/top/3.jpg similarity index 100% rename from imgs/top/3.jpg rename to public/imgs/top/3.jpg diff --git a/src/components/BottomNav.vue b/src/components/BottomNav.vue index 9d80341..a5056d0 100644 --- a/src/components/BottomNav.vue +++ b/src/components/BottomNav.vue @@ -10,8 +10,8 @@
资金匹配 diff --git a/src/views/MainPage.vue b/src/views/MainPage.vue index a965361..c14fb95 100644 --- a/src/views/MainPage.vue +++ b/src/views/MainPage.vue @@ -40,12 +40,12 @@
-
-
-
开始
-
匹配
-
+ +
+
开始
+
匹配
+
💎
@@ -87,38 +87,19 @@ export default { Swiper, SwiperSlide }, - methods:{ - async startMatching(type = 'small', amount = null) { - // 先导航到匹配页面 - await this.$router.push('/matching') - - // 等待页面加载完成后触发匹配 - setTimeout(() => { - // 通过全局事件总线触发匹配页面的匹配方法 - window.dispatchEvent(new CustomEvent('autoStartMatching', { - detail: { - type, - amount - } - })) - }, 500) - } - }, - setup(){ - - + setup() { // 响应式数据 const userPoints = ref(0) const carouselItems = ref([ - { image: '../..../../imgs/top/1.jpg', title: '限时优惠活动' }, - { image: '../../imgs/top/2.jpg', title: '新用户专享' }, - { image: '../../imgs/top/3.jpg', title: '积分兑换' } + { image: '/imgs/top/1.jpg', title: '限时优惠活动' }, + { image: '/imgs/top/2.jpg', title: '新用户专享' }, + { image: '/imgs/top/3.jpg', title: '积分兑换' } ]) const headerItems = ref([ - { image: "../../imgs/mainpage/交易记录.png", text: "交易记录", path: "/transfers" }, - { image: "../../imgs/mainpage/订单查询.png", text: "订单查询", path: "/points-history" }, - { image: "../../imgs/mainpage/客服中心.png", text: "客服中心", path: "/support" }, - { image: "../../imgs/mainpage/系统公告.png", text: "系统公告", path: "/announcements" } + { image: "/imgs/mainpage/交易记录.png", text: "交易记录", path: "/transfers" }, + { image: "/imgs/mainpage/订单查询.png", text: "订单查询", path: "/points-history" }, + { image: "/imgs/mainpage/客服中心.png", text: "客服中心", path: "/support" }, + { image: "/imgs/mainpage/系统公告.png", text: "系统公告", path: "/announcements" } ]) const newsItems = ref([ "最新活动：双十一特惠", @@ -164,7 +145,7 @@ export default { carouselItems, headerItems, newsItems, - getUserPoints// 如果需要外部调用可以暴露 + getUserPoints // 如果需要外部调用可以暴露 } } } diff --git a/src/views/MyMatching.vue b/src/views/MyMatching.vue index b95b4a7..547c48c 100644 --- a/src/views/MyMatching.vue +++ b/src/views/MyMatching.vue @@ -89,6 +89,52 @@
+ +
+

待处理分配

+
+
+
+
+ 订单 #{{ allocation.matching_order_id }} + 第{{ allocation.cycle_number }}轮 +
+
+

转账给: {{ allocation.to_user_real_name }}

+

金额: ¥{{ allocation.amount }}

+

总金额: ¥{{ allocation.total_amount }}

+

+ 转账时效: + + {{ allocation.time_left }} + + ({{ formatDeadline(allocation.deadline) }}前) +

+
+ + {{ allocation.timeout_reason }} +
+
+
+
+ +
+
+
+
+ +
@@ -196,6 +242,8 @@ export default { stats: { userStats: null }, + autoStartProcessed: false, + pendingAllocations: [], creating: false, processing: false, matchingOrders: [], @@ -205,8 +253,23 @@ export default { customAmount: '' // 大额匹配自定义金额 } }, + created() { + if (this.$route.query.autoStart) { + // 执行匹配逻辑 + this.matchingType = this.$route.query.type || 'small'; + if (this.matchingType === 'large' && this.$route.query.amount) { + this.customAmount = this.$route.query.amount; + } + this.createOrder(); + + // 清除query参数，防止刷新后再次触发 + this.$router.replace({ ...this.$route, query: {} }); + } +}, async mounted() { await this.loadData() + + this.handleAutoStartFromHome() // 监听自动开始匹配事件 const handleAutoStartMatching = async (event) => { @@ -225,12 +288,44 @@ export default { } window.addEventListener('autoStartMatching', handleAutoStartMatching) - }, methods: { + handleAutoStartFromHome() { + // 获取路由查询参数 + const { autoStart, type, amount } = this.$route.query + + // 如果参数存在且未处理过 + if (autoStart === 'true' && !this.autoStartProcessed) { + this.autoStartProcessed = true // 防止重复触发 + + // 根据参数设置匹配类型 + if (type === 'large' && amount) { + this.matchingType = 'large' + this.customAmount = amount + } else { + this.matchingType = 'small' + } + + // 延迟触发匹配，确保页面已渲染完成 + setTimeout(() => { + this.createOrder() + }, 500) + } + }, + async loadPendingAllocations() { + try { + const response = await api.get('/matching/pending-allocations') + this.pendingAllocations = response.data.data || [] + } catch (error) { + console.error('加载待处理分配失败:', error) + } + }, async loadData() { try { await this.loadMatchingOrders() + await Promise.all([ + this.loadPendingAllocations(), + ]) } catch (error) { console.error('加载数据失败:', error) this.$message.error('加载数据失败') @@ -277,7 +372,7 @@ export default { cancelButtonText: '取消', type: 'warning' }).then(() => { - this.$router.push('/profile') + this.$router.push('/editdetailspage') }).catch(() => {}) } else { this.$message.error(errorMessage) @@ -910,4 +1005,118 @@ input:checked + .slider:before { font-size: 14px !important; } } + +.pending-section, +.orders-section { + background: white; + padding: 20px; + border-radius: 10px; + box-shadow: 0 2px 10px rgba(0,0,0,0.1); + margin-bottom: 20px; +} + +.pending-section h3, +.orders-section h3 { + margin-bottom: 15px; + color: #2c3e50; +} + +.allocation-list, +.orders-list { + display: grid; + gap: 15px; +} + +.allocation-card { + display: flex; + justify-content: space-between; + align-items: center; + padding: 15px; + border: 1px solid #e1e8ed; + border-radius: 8px; + background: #f8f9fa; +} + +.allocation-header { + display: flex; + gap: 10px; + margin-bottom: 10px; +} + +.order-id, +.cycle { + background: #3498db; + color: white; + padding: 2px 8px; + border-radius: 12px; + font-size: 12px; +} + +.allocation-details p { + margin: 5px 0; + font-size: 14px; +} + +.deadline-info { + display: flex; + align-items: center; + gap: 8px; + flex-wrap: wrap; +} + +.time-left { + font-weight: bold; + padding: 2px 6px; + border-radius: 4px; + font-size: 12px; +} + +.time-left.normal { + background: #d4edda; + color: #155724; +} + +.time-left.urgent { + background: #fff3cd; + color: #856404; +} + +.time-left.expired { + background: #f8d7da; + color: #721c24; + animation: blink 1s infinite; +} + +.deadline-time { + color: #6c757d; + font-size: 12px; +} + +@keyframes blink { + 0%, 50% { opacity: 1; } + 51%, 100% { opacity: 0.5; } +} + +.allocation-actions { + display: flex; + gap: 10px; +} + +.confirm-btn { + padding: 8px 16px; + border: none; + border-radius: 5px; + cursor: pointer; + font-size: 14px; +} + +.confirm-btn { + background: #27ae60; + color: white; +} + +.confirm-btn:hover { + background: #229954; +} + \ No newline at end of file diff --git a/src/views/MyShop.vue b/src/views/MyShop.vue index 54291e7..c05b393 100644 --- a/src/views/MyShop.vue +++ b/src/views/MyShop.vue @@ -10,7 +10,7 @@
点击查看积分明细
 - 积分商城图标 + 积分商城图标
@@ -23,7 +23,7 @@ - +
diff --git a/src1.rar b/src1.rar new file mode 100644 index 0000000..667acde Binary files /dev/null and b/src1.rar differ