diff --git a/App.vue b/App.vue
index 3e091bc..8f98eb1 100644
--- a/App.vue
+++ b/App.vue
@@ -6,6 +6,7 @@ export default {
if (options.query?.token) {
setToken(options.query?.token)
+ console.log('🌈ad', options.query?.token)
}
const whiteList = [
'pages/shareRegist/index',
diff --git a/config/bonus.js b/config/bonus.js
index 543418e..4984744 100644
--- a/config/bonus.js
+++ b/config/bonus.js
@@ -12,7 +12,7 @@ export const getGradeList = params =>
http.get('/system/api/grade/list', {
params,
})
-//三单轮次
+//三单轮次。
export const nextRound = params =>
http.get('/member/api/market-news/round-his', { params })
diff --git a/config/request.js b/config/request.js
index f7009c6..1f704ab 100644
--- a/config/request.js
+++ b/config/request.js
@@ -20,7 +20,7 @@ module.exports = vm => {
//#ifdef DEV_SERVER
console.log('DEV_SERVER')
- config.baseURL = 'http://localhost:8080'
+ config.baseURL = 'http://192.168.0.102:8080'
//#endif
//#ifdef QA_SERVER
diff --git a/pages/bonus/index.vue b/pages/bonus/index.vue
index f8d17d3..35ad318 100644
--- a/pages/bonus/index.vue
+++ b/pages/bonus/index.vue
@@ -119,7 +119,7 @@ export default {
pageSize: 10,
},
BONUS_FIELD_MAP: {
- levelGapIncome: '级差收益',
+ levelGapIncome: '直推收益',
peerIncome: '平级收益',
regionalIncome: '区域收益',
welfareLevelGapIncome: '福利级差收益',
diff --git a/pages/bonus/real-time.vue b/pages/bonus/real-time.vue
index db25734..aa43dcf 100644
--- a/pages/bonus/real-time.vue
+++ b/pages/bonus/real-time.vue
@@ -8,7 +8,7 @@
¥
- {{ bonusData.totalIssued || '0.00' }}
+ {{ bonusData.realIncomeTotal || '0.00' }}
@@ -16,7 +16,7 @@
奖金日期
- {{ bonusData.date }}
+ {{ bonusData.settleDate }}
{{ label }}
@@ -46,23 +46,23 @@ export default {
return {
// 使用截图中的数据作为示例
bonusData: {
- totalIssued: 84.0,
- date: '2025-03-16',
- levelDifferenceIncome: 84.0,
- peerIncome: 0.0,
- regionalIncome: 0.0,
- welfareLevelDifferenceIncome: 0.0,
- welfareDividendIncome: 0.0,
- repeatConsumptionIncome: 8.4,
- subtotal: 75.6,
+ totalIssued: 0,
+ date: '',
+ retailRangeIncome: 0,
+ retailSameLevelIncome: 0.0,
+ retailAreaIncome: 0.0,
+ // welfareLevelDifferenceIncome: 0.0,
+ // welfareDividendIncome: 0.0,
+ backPoints: 0,
+ subtotal: 0,
},
detailLabels: {
- levelDifferenceIncome: '级差收益(¥)',
- peerIncome: '平级收益(¥)',
- regionalIncome: '区域收益(¥)',
- welfareLevelDifferenceIncome: '福利级差收益(¥)',
- welfareDividendIncome: '福利分红收益(¥)',
- repeatConsumptionIncome: '重消收益(¥)',
+ retailRangeIncome: '直推收益(¥)',
+ retailSameLevelIncome: '平级收益(¥)',
+ retailAreaIncome: '区域收益(¥)',
+ // welfareLevelDifferenceIncome: '福利级差收益(¥)',
+ // welfareDividendIncome: '福利分红收益(¥)',
+ backPoints: '重消收益(¥)',
},
}
},
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index 2be6a59..fdb6b58 100644
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -21,23 +21,19 @@
{{ userInfo.memberCode }}
-
-
-
+
会员等级
{{
userInfo.pkGradeVal || '-'
}}
+
+
-
-
- 当月奖衔
- {{
- userInfo.pkAwardsVal || '-'
- }}
-
荣誉奖衔
@@ -45,6 +41,13 @@
userInfo.pkMaxAwardsVal || '-'
}}
+
+
+ 当月奖衔
+ {{
+ userInfo.pkAwardsVal || '-'
+ }}
+
@@ -145,17 +148,25 @@