diff --git a/public/imgs/mainpage/dinglianghuoqu1.png b/public/imgs/mainpage/dinglianghuoqu1.png new file mode 100644 index 0000000..9ad0007 Binary files /dev/null and b/public/imgs/mainpage/dinglianghuoqu1.png differ diff --git a/public/imgs/mainpage/dinglianghuoqu2.png b/public/imgs/mainpage/dinglianghuoqu2.png new file mode 100644 index 0000000..ee38604 Binary files /dev/null and b/public/imgs/mainpage/dinglianghuoqu2.png differ diff --git a/public/imgs/mainpage/huoqurongdou1.png b/public/imgs/mainpage/huoqurongdou1.png new file mode 100644 index 0000000..772e362 Binary files /dev/null and b/public/imgs/mainpage/huoqurongdou1.png differ diff --git a/public/imgs/mainpage/huoqurongdou2.png b/public/imgs/mainpage/huoqurongdou2.png new file mode 100644 index 0000000..fce0c08 Binary files /dev/null and b/public/imgs/mainpage/huoqurongdou2.png differ diff --git a/public/imgs/mainpage/shangcheng1.png b/public/imgs/mainpage/shangcheng1.png new file mode 100644 index 0000000..c525497 Binary files /dev/null and b/public/imgs/mainpage/shangcheng1.png differ diff --git a/public/imgs/mainpage/shangcheng2.png b/public/imgs/mainpage/shangcheng2.png new file mode 100644 index 0000000..5abb7eb Binary files /dev/null and b/public/imgs/mainpage/shangcheng2.png differ diff --git a/src/App.vue b/src/App.vue index 00bd85a..6be28ea 100644 --- a/src/App.vue +++ b/src/App.vue @@ -25,7 +25,6 @@ const routesWithBottomNav = [ '/orders', '/mainpage', '/myprofile', - '/mymatching', '/myshop', '/customerservice' ] diff --git a/src/components/BottomNav.vue b/src/components/BottomNav.vue index 29c843b..583ad18 100644 --- a/src/components/BottomNav.vue +++ b/src/components/BottomNav.vue @@ -3,16 +3,16 @@
融豆匹配 - 融豆匹配 + 融豆匹配
{ const backgroundImage = computed(() => { const currentPath = route.path switch (currentPath) { - case '/mymatching': + case '/matching': // return '/imgs/bottomnav/融豆匹配背景.png' return '/imgs/bottomnav/rongdoupipei-background.png' case '/transfers': diff --git a/src/router/index.js b/src/router/index.js index 230de6a..e866b18 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -29,15 +29,6 @@ const routes = [ title: '主页' } }, - { - path: '/mymatching', - name: 'MyMatching', - component: () => import('@/views/Matching.vue'), - meta: { - title: '货款匹配', - requiresAuth: true - } - }, { path: '/myshop', name: 'MyShop', diff --git a/src/views/MainPage.vue b/src/views/MainPage.vue index 701a8e3..196de24 100644 --- a/src/views/MainPage.vue +++ b/src/views/MainPage.vue @@ -37,25 +37,18 @@
- +
-
- -
-
获取
-
融豆
-
+
+ + 定量获取 + + + 获取融豆 + + + 商城 -
-
-
💎
-
当前积分: {{ userPoints }}
-
- -
🛒
-
商城
- -
@@ -331,82 +324,34 @@ export default { margin: 0 auto; } -.action-grid { +.action-grid-horizontal { display: flex; - gap: 20px; /* 修改为20px间距 */ - height: 204px; + justify-content: space-between; + align-items: center; + gap: 10px; + width: 100%; } -.action-main { - width: 159px; - height: 204px; +.action-item { + flex: 1; display: flex; - align-items: center; justify-content: center; - background: linear-gradient(to right, #4facfe 0%, #00f2fe 100%); - color: white; - font-weight: 600; - font-size: 18px; - border-radius: 12px; - box-shadow: var(--box-shadow); + align-items: center; + text-decoration: none; cursor: pointer; transition: var(--transition); - text-decoration: none; - padding: 63px 47px; - opacity: 1; } -.action-main:hover { - transform: scale(1.02); - box-shadow: 0 8px 15px rgba(67, 97, 238, 0.3); +.action-item:hover { + transform: scale(1.05); } -.action-stack { - display: flex; - flex-direction: column; - gap: 20px; /* 修改为20px间距 */ - width: 165px; -} - -.action-sub-item { - display: flex; - flex-direction: column; - align-items: center; - justify-content: center; - background-color: white; - border-radius: 12px; - box-shadow: var(--box-shadow); - cursor: pointer; - transition: var(--transition); - text-decoration: none; - opacity: 1; -} - -.action-sub-item.top { - width: 165px; - height: 92px; - color: var(--primary-color); -} - -.action-sub-item.bottom { - width: 165px; - height: 92px; - color: var(--success-color); -} - -.action-sub-item:hover { - transform: translateY(-2px); -} - -.action-icon { - font-size: 20px; - margin-bottom: 4px; -} - -.action-text { - font-size: 12px; - font-weight: 500; - text-align: center; +.action-image { + width: 100%; + height: auto; + max-width: 110px; + object-fit: contain; + border-radius: 8px; } /* 热门资讯 */ diff --git a/src/views/Matching.vue b/src/views/Matching.vue index 93b2d6c..a3b30f1 100644 --- a/src/views/Matching.vue +++ b/src/views/Matching.vue @@ -458,6 +458,19 @@ export default { tempMatchingType: 'small' // 临时存储切换前的类型 } }, + created() { + + // 处理定量获取参数 + if (this.$route.query.quantitative === 'true') { + this.matchingType = 'large'; + this.tempMatchingType = 'large'; // 同步临时状态 + } + + // 在处理完所有参数后清除query参数 + if (this.$route.query.quantitative) { + this.$router.replace({ ...this.$route, query: {} }); + } + }, async mounted() { await this.loadData() }, @@ -927,6 +940,12 @@ export default { uploadHeaders() { return getUploadConfig().headers } + }, + + watch: { + matchingType(newVal, oldVal) { + console.log('更改匹配模式', oldVal, 'to', newVal); + } } } diff --git a/src/views/MyMatching.vue b/src/views/MyMatching.vue deleted file mode 100644 index edcd8a8..0000000 --- a/src/views/MyMatching.vue +++ /dev/null @@ -1,1167 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/views/Transfers.vue b/src/views/Transfers.vue index bd8573e..ff288fa 100644 --- a/src/views/Transfers.vue +++ b/src/views/Transfers.vue @@ -23,7 +23,7 @@ :key="'allocation-' + allocation.id" class="transfer-item pending" :class="{ 'timeout-item': !allocation.can_transfer }" - @click="router.push(`/mymatching`)" + @click="router.push(`/matching`)" >