diff --git a/components/bonus/sgsy.vue b/components/bonus/sgsy.vue index 6fee7e6..e7c596c 100644 --- a/components/bonus/sgsy.vue +++ b/components/bonus/sgsy.vue @@ -1,65 +1,64 @@ - \ No newline at end of file +.search-bg { + width: 432rpx; + height: 35rpx; + background: #f5f6f8; + border-radius: 33rpx; + display: flex; + position: relative; + padding: 20rpx 50rpx; + margin-left: 20rpx; +} + diff --git a/config/request.js b/config/request.js index a7de8a3..87a834b 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://192.168.0.86:8080' + config.baseURL = '/prod-api' //#endif //#ifdef QA_SERVER diff --git a/pages/bonus/index.vue b/pages/bonus/index.vue index 2d7ff6b..3d29c95 100644 --- a/pages/bonus/index.vue +++ b/pages/bonus/index.vue @@ -53,10 +53,11 @@ - {{ fieldName }}(¥) - {{ dailyBonus[fieldKey] }} + + {{ fieldName }}(¥) + {{ dailyBonus[fieldKey] }} + @@ -115,7 +116,8 @@ export default { retailSameLevelIncome: '平级收益', retailAreaIncome: '区域收益', retailBenefitRangeIncome: '福利级差收益', - retailMonthRepurchaseIncome: '复购级差收益', + repurRangeIncome: '复购级差收益', + retailMonthRepurchaseIncome: '月复购级差收益', coachIncome: '培育津贴', retailBenefitIncomeTotal: '福利分红收益', backPoints: '重消收益', diff --git a/pages/bonus/real-time.vue b/pages/bonus/real-time.vue index 99853ae..2cb4195 100644 --- a/pages/bonus/real-time.vue +++ b/pages/bonus/real-time.vue @@ -21,11 +21,22 @@ }} - {{ label }} - - ¥ - {{ bonusData[key] || '0.00' }} - + + @@ -63,6 +74,7 @@ export default { retailRangeIncome: '直推收益(¥)', retailSameLevelIncome: '平级收益(¥)', retailAreaIncome: '区域收益(¥)', + repurRangeIncome: '复购级差收益(¥)', // welfareLevelDifferenceIncome: '福利级差收益(¥)', // welfareDividendIncome: '福利分红收益(¥)', backPoints: '重消收益(¥)',