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 @@
+
-
-
-
-
-
-
- {{ item }}
-
-
-
-
-
-
-
-
- {{index + 1}}
-
-
-
-
-
- {{ item.nickname }}
-
- ¥{{ fen2yuan(item.brokeragePrice) }}
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+ {{ item }}
+
+
+
+
+
+
+
+
+ {{ index + 1 }}
+
+
+
+
+
+ {{ item.nickname }}
+
+ ¥{{ fen2yuan(item.brokeragePrice) }}
+
+
+
+
+
+
+
+
+
\ 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 }}
-
-
-
-
- {{ agentInfo.level_info?.name }}
-
-
-
-
@@ -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 @@
-
+
-
-
-
-
-
- 预计佣金:¥{{ item.commission }}
-
-
-
-
-
-
-
-
+
+
+
+
+ 预计佣金:计算中
+
+ 预计佣金:{{ fen2yuan(item.brokerageMinPrice) }}
+
+
+ 预计佣金:{{ fen2yuan(item.brokerageMinPrice) }} ~ {{ fen2yuan(item.brokerageMaxPrice) }}
+
+
+
+
+
+
+
+
+
-
+ }"
+ @tap="loadMore"
+ />
+
\ 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 @@
-
+
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
- 佣金:
- {{ item.rewards[0]?.commission }}
-
-
- {{ item.commission_order_status_text }}
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
+ }"
+ @tap="loadMore"
+ />
+
+
\ 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 @@