From 74b450ec3c6c69400bf9dfcc24852c3ee3e8d85a Mon Sep 17 00:00:00 2001 From: YunaiV Date: Wed, 27 Dec 2023 18:52:17 +0800 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20=E5=88=86=E9=94=80=EF=BC=9A?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=80=BB=E8=BE=91=E6=8E=A5=E5=85=A5=20100%?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 24 +- pages/commission/apply.vue | 290 -------- pages/commission/commission-ranking.vue | 429 ++++++------ .../commission/components/commission-info.vue | 11 - .../commission/components/commission-menu.vue | 2 +- pages/commission/goods.vue | 245 ++++--- pages/commission/order.vue | 658 ++++++++---------- pages/commission/promoter.vue | 121 ++-- pages/commission/team.vue | 2 +- .../commission.vue => commission/wallet.vue} | 185 +++-- sheep/api/commission.js | 68 +- sheep/api/trade/brokerage.js | 59 +- sheep/api/user.js | 7 - sheep/platform/share.js | 1 + sheep/store/user.js | 1 - 15 files changed, 855 insertions(+), 1248 deletions(-) delete mode 100644 pages/commission/apply.vue rename pages/{user/wallet/commission.vue => commission/wallet.vue} (72%) diff --git a/pages.json b/pages.json index 1bd22d74..8fd0a1ae 100644 --- a/pages.json +++ b/pages.json @@ -309,18 +309,6 @@ "group": "用户中心" } }, - { - "path": "wallet/commission", - "style": { - "navigationBarTitleText": "我的佣金" - }, - "meta": { - "auth": true, - "sync": true, - "title": "用户佣金", - "group": "分销中心" - } - }, { "path": "wallet/score", "style": { @@ -349,6 +337,18 @@ "group": "分销商城" } }, + { + "path": "wallet", + "style": { + "navigationBarTitleText": "我的佣金" + }, + "meta": { + "auth": true, + "sync": true, + "title": "用户佣金", + "group": "分销中心" + } + }, { "path": "goods", "style": { diff --git a/pages/commission/apply.vue b/pages/commission/apply.vue deleted file mode 100644 index 7f0662b8..00000000 --- a/pages/commission/apply.vue +++ /dev/null @@ -1,290 +0,0 @@ - - - - - - diff --git a/pages/commission/commission-ranking.vue b/pages/commission/commission-ranking.vue index e1384006..f4b1c5c2 100644 --- a/pages/commission/commission-ranking.vue +++ b/pages/commission/commission-ranking.vue @@ -1,241 +1,248 @@ + + \ No newline at end of file + .CommissionRank .wrapper .list .item .people { + width: 175rpx; + text-align: right; + } + diff --git a/pages/commission/components/commission-info.vue b/pages/commission/components/commission-info.vue index 02ea14ed..65f2c592 100644 --- a/pages/commission/components/commission-info.vue +++ b/pages/commission/components/commission-info.vue @@ -9,16 +9,6 @@ {{ userInfo.nickname }} - @@ -30,7 +20,6 @@ import { computed, reactive } from 'vue'; const userInfo = computed(() => sheep.$store('user').userInfo); - const agentInfo = computed(() => sheep.$store('user').agentInfo); const headerBg = sheep.$url.css('/static/img/shop/commission/background.png'); const state = reactive({ diff --git a/pages/commission/components/commission-menu.vue b/pages/commission/components/commission-menu.vue index cb48f6ba..5655ca74 100644 --- a/pages/commission/components/commission-menu.vue +++ b/pages/commission/components/commission-menu.vue @@ -31,7 +31,7 @@ { img: '/static/img/shop/commission/commission_icon2.png', title: '佣金明细', - path: '/pages/user/wallet/commission', + path: '/pages/commission/wallet', }, { img: '/static/img/shop/commission/commission_icon3.png', diff --git a/pages/commission/goods.vue b/pages/commission/goods.vue index 1d4ce36d..d4678490 100644 --- a/pages/commission/goods.vue +++ b/pages/commission/goods.vue @@ -1,123 +1,150 @@ - + \ No newline at end of file + .share-btn { + width: 120rpx; + height: 50rpx; + border-radius: 25rpx; + } + } + diff --git a/pages/commission/order.vue b/pages/commission/order.vue index 3de1c879..18b1bf54 100644 --- a/pages/commission/order.vue +++ b/pages/commission/order.vue @@ -1,417 +1,331 @@ - + \ No newline at end of file + .order-status { + line-height: 30rpx; + padding: 0 10rpx; + border-radius: 30rpx; + margin-left: 20rpx; + font-size: 24rpx; + color: var(--ui-BG-Main); + } + } + } + diff --git a/pages/commission/promoter.vue b/pages/commission/promoter.vue index d598a025..b7d0a89b 100644 --- a/pages/commission/promoter.vue +++ b/pages/commission/promoter.vue @@ -4,33 +4,33 @@ - + {{ item }} - + - + - {{state.Two.nickname}} - {{ state.Two.brokerageUserCount }}人 + {{state.two.nickname}} + {{ state.two.brokerageUserCount }}人 - + - + - {{state.One.nickname}} - {{ state.One.brokerageUserCount }}人 + {{state.one.nickname}} + {{ state.one.brokerageUserCount }}人 - + - + - {{state.Three.nickname}} - {{ state.Three.brokerageUserCount }}人 + {{state.three.nickname}} + {{ state.three.brokerageUserCount }}人 @@ -54,66 +54,57 @@