diff --git a/src/assets/img/ranking/none01.png b/src/assets/img/ranking/none01.png new file mode 100644 index 0000000..848ff21 Binary files /dev/null and b/src/assets/img/ranking/none01.png differ diff --git a/src/components/assets/assetsHeader.vue b/src/components/assets/assetsHeader.vue index eab480a..0ee95cb 100644 --- a/src/components/assets/assetsHeader.vue +++ b/src/components/assets/assetsHeader.vue @@ -7,9 +7,9 @@ Dynamic Image
-
+
{{ localWalletStore.showAddress ? localWalletStore.showAddress : 'User Address' }} @@ -63,9 +63,9 @@ 0

-
Stake
+ -
  • +
  • diff --git a/src/configs/priceCalculate.js b/src/configs/priceCalculate.js index c00c7f3..20e3aa7 100644 --- a/src/configs/priceCalculate.js +++ b/src/configs/priceCalculate.js @@ -39,6 +39,10 @@ export const sliceAddress = (address) => { export const timeFormat = (value) => { return moment(value).format('YYYY-MM-DD HH:mm:ss') } +export const rankTimeFormat = (value) => { + if(value == 0) return '-' + return moment(value).format('MM.DD') +} export const timeReward = (value) => { return moment(Number(value)*1000).format('MM.DD') } diff --git a/src/utils/marketplace.js b/src/utils/marketplace.js index 2374150..b7562f3 100644 --- a/src/utils/marketplace.js +++ b/src/utils/marketplace.js @@ -256,3 +256,15 @@ export const apiCircuitRewardHistory = async (data) => { const url = `${KingSome}/webapp/index.php?c=OutAppCircuit&a=getCircuitRewardHistory` return httpGet(url,data) } + +// 巡回赛周赛 +export const apiCircuitRanking = async (data) => { + const url = `${API_BASE}/api/circuit_ranking` + return httpGet(url,data) +} + +// 巡回赛总赛 +export const apiPhaseRanking = async (data) => { + const url = `${API_BASE}/api/circuit_phase_ranking` + return httpGet(url,data) +} \ No newline at end of file diff --git a/src/views/rankingView.vue b/src/views/rankingView.vue index 0db093c..587d429 100644 --- a/src/views/rankingView.vue +++ b/src/views/rankingView.vue @@ -57,7 +57,8 @@
  • -
    {{ Number(0) == 0 ? '-' : 100 }}
    +
    {{ rankingCircuitInfo.score == 0 ? '-' : rankingCircuitInfo.score }}
    +
    {{ rankingPhaseInfo.score == 0 ? '-' : rankingPhaseInfo.score }}
    @@ -66,12 +67,11 @@
    My Ranking
    - - History
    -

    10

    +

    {{ rankingCircuitInfo.ranking == 0 ? '-' : rankingCircuitInfo.ranking }}

    +

    {{ rankingPhaseInfo.ranking == 0 ? '-' : rankingPhaseInfo.ranking }}

  • @@ -88,29 +88,34 @@

    The current phase

    -
    -

    10.1

    +
    +

    {{ rankTimeFormat(rankingCircuitInfo.start_time) }}

    -

    -

    10.10

    +

    {{ rankingCircuitInfo.end_time == 0 ? '-' : timeReward(rankingCircuitInfo.end_time) }}

    +
    +
    +

    {{ rankTimeFormat(rankingPhaseInfo.start_time) }}

    +

    -

    +

    {{ rankingPhaseInfo.end_time == 0 ? '-' : timeReward(rankingPhaseInfo.end_time) }}

    -
    -
    +
    +

    None

    -
  • +
  • - - - - {{ item.rank }} + + + + {{ item.ranking }}
    @@ -121,14 +126,49 @@
    Username
    -
    {{ item.nickname }}
    +
    {{ item.name }}
  • -
    Points
    -
    Gems
    -
    {{ item.score }} (+0)
    +
    Points
    +
    {{ item.score }} (+{{ item.score_boost }})
    +
    + +
    +
    +
    +
    +
    +

    None

    +
    +
    +
    +
  • +
    +
    +
    + + + + {{ item.ranking }} +
    +
    +
    +
    + + + +
    +
    +
    Username
    +
    {{ item.name }}
    +
    +
    +
    +
    +
    Points
    +
    {{ item.score }} (+{{ item.score_boost }})
  • @@ -168,8 +208,8 @@