feat(score): new hourly score tooltip info

This commit is contained in:
OldHawk
2018-06-06 19:32:36 +08:00
parent 015b06d8b2
commit 4e79f9a76f
7 changed files with 25 additions and 13 deletions

View File

@@ -1088,7 +1088,7 @@
CURR_VIP_STATE: 'Current VIP status: `{{vip_status | translate}}`.',
CURR_UP_TOTAL_SPEED: 'Current total upload speed is: `{{up_speed | byteFmt: 2}}`.',
CURR_DOWN_TOTAL_SPEED: 'Current total download speed is: `{{down_speed | byteFmt: 2}}`.',
CURR_SCORE_INCOME_HOURS: 'Current estimated hourly earnings of `{{score_hour}}` scores, If you dont understand how to calculate the points, please refer to [{{"ABOUT.MENU_ABOUT_MANUAL_SCORE_RULES" | translate}}](/about/manual/scoreRules).',
CURR_SCORE_INCOME_HOURS: 'Current estimated hourly earnings of `{{score_hour}}` scores, If you dont understand how to calculate the points, please refer to [{{"ABOUT.MENU_ABOUT_MANUAL_SCORE_RULES" | translate}}](/about/manual/scoreRules), Based on this speed projection, {{days}} days are required to reach {{next_level}}, where you can view your [last score data history] (/dataCenter/score).',
EXCHANGE_INVITATION: 'Exchange an invitation ({{score}} scores)',
EXCHANGE_INVITATION_CONFIRM_OK: 'Exchange',
EXCHANGE_INVITATION_CONFIRM_CANCEL: 'Cancel',

View File

@@ -1088,7 +1088,7 @@
CURR_VIP_STATE: '當前 VIP 身份狀態:`{{vip_status | translate}}`。',
CURR_UP_TOTAL_SPEED: '當前上傳總速度為:`{{up_speed | byteFmt: 2}}`。',
CURR_DOWN_TOTAL_SPEED: '當前下載總速度為:`{{down_speed | byteFmt: 2}}`。',
CURR_SCORE_INCOME_HOURS: '當前預計每小時獲得 `{{score_hour}}` 積分,如果你不明白積分怎麼計算,請參閱 [{{"ABOUT.MENU_ABOUT_MANUAL_SCORE_RULES" | translate}}](/about/manual/scoreRules)。',
CURR_SCORE_INCOME_HOURS: '當前預計每小時獲得 `{{score_hour}}` 積分,如果你不明白積分怎麼計算,請參閱 [{{"ABOUT.MENU_ABOUT_MANUAL_SCORE_RULES" | translate}}](/about/manual/scoreRules),照此速度的的推算,到達 {{next_level}} 還需要 {{days}} 天,這裡可查看您最近的 [積分歷史記錄](/dataCenter/score)。',
EXCHANGE_INVITATION: '兌換一個邀請 ({{score}} 積分)',
EXCHANGE_INVITATION_CONFIRM_OK: '兌換',
EXCHANGE_INVITATION_CONFIRM_CANCEL: '取消',

View File

@@ -1088,7 +1088,7 @@
CURR_VIP_STATE: '当前 VIP 身份状态:`{{vip_status | translate}}`。',
CURR_UP_TOTAL_SPEED: '当前上传总速度为:`{{up_speed | byteFmt: 2}}`。',
CURR_DOWN_TOTAL_SPEED: '当前下载总速度为:`{{down_speed | byteFmt: 2}}`。',
CURR_SCORE_INCOME_HOURS: '当前预计每小时获得 `{{score_hour}}` 积分,如果你不明白积分怎么计算,请参阅 [{{"ABOUT.MENU_ABOUT_MANUAL_SCORE_RULES" | translate}}](/about/manual/scoreRules)。',
CURR_SCORE_INCOME_HOURS: '当前预计每小时获得 `{{score_hour}}` 积分,如果你不明白积分怎么计算,请参阅 [{{"ABOUT.MENU_ABOUT_MANUAL_SCORE_RULES" | translate}}](/about/manual/scoreRules),照此速度的的推算,到达 {{next_level}} 还需要 {{days}} 天,这里可查看您最近的 [积分历史记录](/dataCenter/score)。',
EXCHANGE_INVITATION: '兑换一个邀请 ({{score}} 积分)',
EXCHANGE_INVITATION_CONFIRM_OK: '兑换',
EXCHANGE_INVITATION_CONFIRM_CANCEL: '取消',

View File

@@ -2,20 +2,24 @@
.data-center-top {
height: 60px;
text-align: left;
background-color: #2a2a2a;
background-color: rgba(42, 42, 42, 0.9);
text-align: left;
@media(min-width: @screen-sm-min) {
@media (min-width: @screen-sm-min) {
padding-top: 30px;
height: 100px;
}
.container {
padding: 0;
}
.user-info {
width: 100%;
position: relative;
height: 100%;
background-color: #fff;
padding: 10px 30px 0;
@media(min-width: @screen-sm-min) {
padding: 15px 15px 0;
@media (min-width: @screen-sm-min) {
padding: 10px 30px 0;
width: 400px;
border-top-left-radius: 8px;
border-top-right-radius: 8px;
@@ -30,8 +34,12 @@
.info-wrapper {
position: absolute;
position: absolute;
left: 100px;
top: 10px;
left: 85px;
top: 15px;
@media (min-width: @screen-sm-min) {
left: 100px;
top: 10px;
}
h4, .h4 {
margin-top: 5px;
}

View File

@@ -228,7 +228,11 @@
seedScoreTotal = Math.round(seedScoreTotal * 100) / 100;
var tmp = $translate.instant('CURR_SCORE_INCOME_HOURS', {score_hour: seedScoreTotal});
var tmp = $translate.instant('CURR_SCORE_INCOME_HOURS', {
score_hour: seedScoreTotal,
next_level: 'L' + vm.scoreLevelData.nextLevel,
days: Math.ceil((vm.scoreLevelData.nextLevelValue - vm.scoreLevelData.score) / (seedScoreTotal * 24))
});
return marked(tmp, {sanitize: false});
};

View File

@@ -50,8 +50,8 @@
p {
margin-bottom: 0;
}
h5 {
line-height: 1.5;
.alert {
line-height: 1.8;
margin: 0;
}
li {

View File

@@ -51,7 +51,7 @@
<li ng-bind-html="vm.getMarkedCurrDownSpeedString()"></li>
</ul>
<div class="alert alert-warning">
<h5 ng-bind-html="vm.getMarkedCurrScoreString()"></h5>
<span ng-bind-html="vm.getMarkedCurrScoreString()"></span>
</div>
</div>
</div>