diff --git a/src/App.vue b/src/App.vue index c2e155a..00bd85a 100644 --- a/src/App.vue +++ b/src/App.vue @@ -26,7 +26,8 @@ const routesWithBottomNav = [ '/mainpage', '/myprofile', '/mymatching', - '/myshop' + '/myshop', + '/customerservice' ] // 计算是否显示底部导航 diff --git a/src/components/BottomNav.vue b/src/components/BottomNav.vue index 1d25210..c46a2f9 100644 --- a/src/components/BottomNav.vue +++ b/src/components/BottomNav.vue @@ -13,7 +13,7 @@ :class="{ active: isActive('/mymatching') }" @click="handleNavClick('/mymatching')" > - + 货款匹配
- + 积分商城
- + + + 退出登录 +
-
-
- + +
+
+
+ +
+
+
{{ stats.total_merchants || 0 }}
+
招募商户
+
已审核:{{ stats.approved_merchants || 0 }}
+
-
-
{{ stats.total_merchants || 0 }}
-
招募商户
-
已审核:{{ stats.approved_merchants || 0 }}
+ +
+
+ +
+
+
¥{{ (Number(stats.total_commission) || 0).toFixed(2) }}
+
总佣金
+
已到账:¥{{ (Number(stats.paid_commission) || 0).toFixed(2) }}
+
- -
-
- -
-
-
¥{{ (Number(stats.total_commission) || 0).toFixed(2) }}
-
总佣金
-
已到账:¥{{ (Number(stats.paid_commission) || 0).toFixed(2) }}
-
-
- -
+ + +
@@ -118,7 +128,18 @@ v-model:page-size="merchantsPageSize" :total="merchantsTotal" :page-sizes="[10, 20, 50]" - layout="total, sizes, prev, pager, next, jumper" + layout="total, sizes" + @current-change="loadMerchants" + @size-change="loadMerchants" + /> +
+
+ @@ -177,7 +198,18 @@ v-model:page-size="commissionsPageSize" :total="commissionsTotal" :page-sizes="[10, 20, 50]" - layout="total, sizes, prev, pager, next, jumper" + layout="total, sizes" + @current-change="loadCommissions" + @size-change="loadCommissions" + /> +
+
+ @@ -406,12 +438,10 @@ onMounted(() => { \ No newline at end of file diff --git a/src/views/EditDetailsPage.vue b/src/views/EditDetailsPage.vue index aecd426..498233c 100644 --- a/src/views/EditDetailsPage.vue +++ b/src/views/EditDetailsPage.vue @@ -32,10 +32,6 @@ - - - - @@ -225,7 +221,6 @@ const userStore = useUserStore() const form = reactive({ username: '', nickname: '', - email: '', phone: '', realName: '', idCard: '', @@ -251,10 +246,6 @@ const rules = { { required: true, message: '请输入用户名', trigger: 'blur' }, { min: 3, max: 20, message: '用户名长度在 3 到 20 个字符', trigger: 'blur' } ], - email: [ - { required: true, message: '请输入邮箱', trigger: 'blur' }, - { type: 'email', message: '请输入正确的邮箱格式', trigger: 'blur' } - ], realName: [ { required: true, message: '请输入真实姓名', trigger: 'blur' }, { min: 2, max: 10, message: '真实姓名长度在 2 到 10 个字符', trigger: 'blur' } diff --git a/src/views/MainPage.vue b/src/views/MainPage.vue index 61fb792..58e6cf2 100644 --- a/src/views/MainPage.vue +++ b/src/views/MainPage.vue @@ -113,12 +113,12 @@ export default { { image: '/imgs/mainpage/客服中心.png', text: '客服中心', - path: '/support', + path: '/customerservice', }, { image: '/imgs/mainpage/系统公告.png', text: '系统公告', - path: '/announcements', + path: '#', }, ]); const newsItems = ref([ diff --git a/src/views/Matching.vue b/src/views/Matching.vue index 965aa0c..a19d1b8 100644 --- a/src/views/Matching.vue +++ b/src/views/Matching.vue @@ -103,7 +103,7 @@

• 金额范围:5000-50000元

• 15000元以下:分成3笔随机金额

• 15000元以上:随机分拆,每笔1000-8000元

-

• 优先匹配已完成出款的用户

+

• 优先匹配已完成进货的用户

diff --git a/src/views/MyMatching.vue b/src/views/MyMatching.vue index 32974cc..e9d7ad6 100644 --- a/src/views/MyMatching.vue +++ b/src/views/MyMatching.vue @@ -41,7 +41,7 @@

• 系统将为您匹配3笔转账,总金额5000元

-

• 优先匹配已完成出款的用户

+

• 优先匹配已完成进货的用户

• 每笔金额随机分配,确保资金循环

@@ -84,7 +84,7 @@

• 金额范围:5000-50000元

• 15000元以下:分成3笔随机金额

• 15000元以上:随机分拆,每笔1000-8000元

-

• 优先匹配已完成出款的用户

+

• 优先匹配已完成进货的用户

diff --git a/src/views/MyShop.vue b/src/views/MyShop.vue index 4eac683..9dabaee 100644 --- a/src/views/MyShop.vue +++ b/src/views/MyShop.vue @@ -30,33 +30,57 @@
分类区
-
-
-
-
{{ category.icon }}
-
{{ category.name }}
+
+
+
{{ category.icon }}
+
{{ category.name }}
+
+ + +
+ +
+ 加载中... +
+
+
+ +
+
{{ product.name }}
+
+ {{ product.points }} + {{ product.originalPoints }} +
+
+
+ +
+
+
+