修改榜单单位

2024-06-21 16:13:53 +08:00
parent d7e7d04fc2
commit df4b647d2a
24 changed files with 135 additions and 80 deletions
--- a/view/molistar/common/js/common2.js
+++ b/view/molistar/common/js/common2.js
@@ -827,7 +827,7 @@ function fuzzyMatchUpdateQueryStringParameterFun() {
 }
 function langCodeFun(langCode) {
    if (window.location.href.match(/guildAr/)) {
-     return
+        return
    }
    var body = document.body;
    body.style.display = 'none';
@@ -837,10 +837,10 @@ function langCodeFun(langCode) {
    if (langCode == "ar") {
        document.documentElement.setAttribute("dir", "rtl");
        document.body.classList.add('arabic');
-        
-    if (window.location.href.match(/guildAr/)) {
-        document.documentElement.setAttribute("dir", "ltr");
-    }
+
+        if (window.location.href.match(/guildAr/)) {
+            document.documentElement.setAttribute("dir", "ltr");
+        }
    }
 }
 // 获取整条url
@@ -1011,9 +1011,9 @@ function unitProcessingAr(val, toFixeds) { //值 保留几位小数
    if (val < 1000) {
        return val;
    } else if (val >= 1000 && val < 1000000) {
-        return (Math.floor(val / 1000)).toFixed(toFixeds) + 'K'
+        return (val / 1000).toFixed(toFixeds) + 'K'
    } else if (val >= 1000000) {
-        return (Math.floor(val / 1000000)).toFixed(toFixeds) + 'M'
+        return (val / 1000000).toFixed(toFixeds) + 'M'
    }
 }
 // 封装 在ios环境中 配置公共参数的回调函数
--- a/view/molistar/modules/charm/index.html
+++ b/view/molistar/modules/charm/index.html
@@ -34,7 +34,7 @@
  <script src="./local/en.js"></script>
  <script src="./local/zh.js"></script>
  <script src="./local/ar.js"></script>
-  <script src="js/index.js?v=2.4"></script>
+  <script src="js/index.js?v=2.5"></script>
  <script src="../../common/local/langHandler.js"></script>
 </body>

--- a/view/molistar/modules/charm/js/index.js
+++ b/view/molistar/modules/charm/js/index.js
@@ -56,7 +56,7 @@ $(function () {
        </p>
        <p class="user-charm">
          <img src="./images/heart.png" alt="" />
-          <span>${item.score}</span>
+          <span>${unitProcessingAr(item.score,1)}</span>
        </p>
      </div>`
      }
@@ -82,7 +82,7 @@ $(function () {
      </div>
      <p class="user-charm">
        <img src="./images/heart.png" alt="" />
-        <span>${item.score}</span>
+        <span>${unitProcessingAr(item.score,1)}</span>
      </p>
    </div>`
    })
@@ -127,13 +127,13 @@ $(function () {
          },
          error(err) {
            hideLoading(layerIndex)
-            toastMsg('網絡錯誤，請退出重進')
+            // toastMsg('網絡錯誤，請退出重進')
          }
        })
      },
      error(err) {
        hideLoading(layerIndex)
-        toastMsg('網絡錯誤，請退出重進')
+        // toastMsg('網絡錯誤，請退出重進')
      }
    })
  }
--- a/view/molistar/modules/rank/index.html
+++ b/view/molistar/modules/rank/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=UTF-8><meta name=viewport content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1"><title>molistar</title><link href=./static/css/app.816d18a4a19c64f496b1f35a68fb3a2d.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.1244b84e5bdc6ca4325c.js></script><script type=text/javascript src=./static/js/vendor.15ea60415f84b9c5a7e3.js></script><script type=text/javascript src=./static/js/app.f9cd1a971030e0feba78.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=UTF-8><meta name=viewport content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1"><title>molistar</title><link href=./static/css/app.58b0733a13f43850a9ed3127eb5033fc.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.b407b340f7bdc9b43edf.js></script><script type=text/javascript src=./static/js/vendor.15ea60415f84b9c5a7e3.js></script><script type=text/javascript src=./static/js/app.6073143aaecac844f980.js></script></body></html>
--- a/view/molistar/modules/rank/static/css/app.58b0733a13f43850a9ed3127eb5033fc.css
+++ b/view/molistar/modules/rank/static/css/app.58b0733a13f43850a9ed3127eb5033fc.css
--- a/view/molistar/modules/rank/static/css/app.816d18a4a19c64f496b1f35a68fb3a2d.css
+++ b/view/molistar/modules/rank/static/css/app.816d18a4a19c64f496b1f35a68fb3a2d.css
--- a/view/molistar/modules/rank/static/js/1.9055ef482eb71804ed40.js
+++ b/view/molistar/modules/rank/static/js/1.9055ef482eb71804ed40.js
--- a/view/molistar/modules/rank/static/js/2.c400ed84fcfb7544002c.js
+++ b/view/molistar/modules/rank/static/js/2.c400ed84fcfb7544002c.js
--- a/view/molistar/modules/rank/static/js/2.ee817bfbe2f0f7f4ffcf.js
+++ b/view/molistar/modules/rank/static/js/2.ee817bfbe2f0f7f4ffcf.js
--- a/view/molistar/modules/rank/static/js/app.6073143aaecac844f980.js
+++ b/view/molistar/modules/rank/static/js/app.6073143aaecac844f980.js
--- a/view/molistar/modules/rank/static/js/app.f9cd1a971030e0feba78.js
+++ b/view/molistar/modules/rank/static/js/app.f9cd1a971030e0feba78.js
--- a/view/molistar/modules/rank/static/js/manifest.b407b340f7bdc9b43edf.js
+++ b/view/molistar/modules/rank/static/js/manifest.b407b340f7bdc9b43edf.js
@@ -1,2 +1,2 @@
-!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,a,c){for(var f,i,u,d=0,s=[];d<r.length;d++)i=r[d],t[i]&&s.push(t[i][0]),t[i]=0;for(f in a)Object.prototype.hasOwnProperty.call(a,f)&&(e[f]=a[f]);for(n&&n(r,a,c);s.length;)s.shift()();if(c)for(d=0;d<c.length;d++)u=o(o.s=c[d]);return u};var r={},t={9:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var a=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,o.nc&&c.setAttribute("nonce",o.nc),c.src=o.p+"static/js/"+e+"."+{0:"8df79ff5365eaaec9298",1:"1bd9d8db377a897451e8",2:"ee817bfbe2f0f7f4ffcf",3:"7a4dfeb0d7ea325598f5",4:"74c8770604d782011a1a",5:"36de0cf38e7936e529ee",6:"92d7991962d3719f0ac8"}[e]+".js";var f=setTimeout(i,12e4);function i(){c.onerror=c.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return c.onerror=c.onload=i,a.appendChild(c),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="./",o.oe=function(e){throw console.error(e),e}}([]);
-//# sourceMappingURL=manifest.1244b84e5bdc6ca4325c.js.map
+!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,a){for(var f,i,u,s=0,d=[];s<r.length;s++)i=r[s],t[i]&&d.push(t[i][0]),t[i]=0;for(f in c)Object.prototype.hasOwnProperty.call(c,f)&&(e[f]=c[f]);for(n&&n(r,c,a);d.length;)d.shift()();if(a)for(s=0;s<a.length;s++)u=o(o.s=a[s]);return u};var r={},t={9:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var c=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,o.nc&&a.setAttribute("nonce",o.nc),a.src=o.p+"static/js/"+e+"."+{0:"8df79ff5365eaaec9298",1:"9055ef482eb71804ed40",2:"c400ed84fcfb7544002c",3:"7a4dfeb0d7ea325598f5",4:"74c8770604d782011a1a",5:"36de0cf38e7936e529ee",6:"92d7991962d3719f0ac8"}[e]+".js";var f=setTimeout(i,12e4);function i(){a.onerror=a.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return a.onerror=a.onload=i,c.appendChild(a),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="./",o.oe=function(e){throw console.error(e),e}}([]);
+//# sourceMappingURL=manifest.b407b340f7bdc9b43edf.js.map
--- a/view/molistar/modules/room_rank/hourRank.html
+++ b/view/molistar/modules/room_rank/hourRank.html
@@ -57,7 +57,7 @@
  <script src="./local/en.js"></script>
  <script src="./local/zh.js"></script>
  <script src="./local/ar.js"></script>
-  <script src="./js/hourRank.js"></script>
+  <script src="./js/hourRank.js?v=1.0"></script>
  <script src="../../common/local/langHandler.js"></script>
 </body>

--- a/view/molistar/modules/room_rank/index.html
+++ b/view/molistar/modules/room_rank/index.html
@@ -111,5 +111,5 @@
 <script src="./local/en.js"></script>
 <script src="./local/zh.js"></script>
 <script src="./local/ar.js"></script>
-<script src="./js/index.js?v=1.0"></script>
+<script src="./js/index.js?v=1.1"></script>
 <script src="../../common/local/langHandler.js"></script>
--- a/view/molistar/modules/room_rank/js/hourRank.js
+++ b/view/molistar/modules/room_rank/js/hourRank.js
@@ -88,9 +88,6 @@ const renderLastHourThree = () => {
  }
  let str = ''
  lastHourRank.map((item, index) => {
-    if(item.score > 10000) {
-      item.score = ( Math.floor(item.score/1000) ) / 10 + 'W'
-    }
    str += `
      <div class="top_three_item">
        <div class="avatar" data-uid=${item.uid}>
@@ -102,7 +99,7 @@ const renderLastHourThree = () => {
          ${
            index == 0 ?
            '<img src="./images/single/first-icon.png" alt=""></img>' :
-            `<span>${item.score}</span><br>${langReplace(localLang.demoModule.hour_text8)}`
+            `<span>${unitProcessingAr(item.score,1)}</span><!-- <br> -->${langReplace(localLang.demoModule.hour_text8)}`
          }
        </div>
      </div>
@@ -157,9 +154,6 @@ const renderCurrentList = () => {
  }
  let str = ''
  currHourRank.map((item, index) => {
-    if(item.score > 10000) {
-      item.score = ( Math.floor(item.score/1000) ) / 10 + 'W'
-    }
    str += `
      <li>
        <div class="index">${index+1}</div>
@@ -171,7 +165,7 @@ const renderCurrentList = () => {
          ${
            index === 0 ?
            langReplace(localLang.demoModule.hour_text10) :
-            `${langReplace(localLang.demoModule.hour_text8)}<br><span>${item.score}</span>`
+            `${langReplace(localLang.demoModule.hour_text8)}<!-- <br> --><span>${unitProcessingAr(item.score,1)}</span>`
          }
        </div>
      </li>
@@ -186,11 +180,12 @@ const renderCurrentRoomInfo = () => {
  currHourRank.forEach((item, index) => {
    if(item.uid == currRoomInfo.uid) {
      rank = index+1
-      if(item.score > 10000) {
-        score = ( Math.floor(item.score/1000) ) / 10 + 'W'
-      }else {
-        score = item.score
-      }
+      // if(item.score > 10000) {
+      //   score = ( Math.floor(item.score/1000) ) / 10 + 'W'
+      // }else {
+      //   score = item.score
+      // }
+      score = unitProcessingAr(item.score,1)
    }
  })
  $('.mine_index').html(rank ? rank : langReplace(localLang.demoModule.hour_text11))
--- a/view/molistar/modules/room_rank/js/index.js
+++ b/view/molistar/modules/room_rank/js/index.js
@@ -189,7 +189,7 @@ function listDomFun(res, num) {
        // $(`.largestBox .top3 .no${i + 1} .box .icon .icon2`).attr('src', charmImgUrl + `${res.charmSeq <= 9 ? '0' + res.charmSeq : res.charmSeq}.png`)
        $(`.largestBox .top3 .no${i + 1} .box .icon .icon1`).attr('src', res.experUrl)
        $(`.largestBox .top3 .no${i + 1} .box .icon .icon2`).attr('src', res.charmUrl)
-        $(`.largestBox .top3 .no${i + 1} .box .score`).text(unitProcessing(res.goldAmount, 10000, 1, 'W'));
+        $(`.largestBox .top3 .no${i + 1} .box .score`).text(unitProcessingAr(res.goldAmount,1));
    })
    // 處理非前三
    var notTop3 = res.data.rankings.slice(3);
@@ -207,7 +207,7 @@ function listDomFun(res, num) {
                     <img src="${res.charmUrl}" alt="" class="icon2">
                 </div>
                 <div class="score">
-                     <p>${unitProcessing(res.goldAmount, 10000, 1, 'W')}</p>
+                     <p>${unitProcessingAr(res.goldAmount,1)}</p>
                     <span>${num == 1 ? langReplace(localLang.demoModule.room_text1) : langReplace(localLang.demoModule.room_text2)}</span>
                 </div>
             </li>
--- a/view/molistar/modules/room_rank/local/ar.js
+++ b/view/molistar/modules/room_rank/local/ar.js
@@ -17,9 +17,11 @@ langAr = {
        hour_text5: 'جاري التحميل...',
        hour_text6: 'اكتمال العملية',
        hour_text7: 'خطأ في الشبكة',
-        hour_text8: 'بعيداً عن السابق',
+        // hour_text8: 'بعيداً عن السابق',
+        hour_text8: ' ',
        hour_text9: 'مكان شاغر في انتظار',
-        hour_text10: 'في قمة القائمة',
+        hour_text10: ' ',
+        // hour_text10: 'في قمة القائمة',
        hour_text11: 'غير مدرج في القائمة',
        // =============================房间榜==============================
        roomImg1: './images/title-ar.png',
--- a/view/molistar/modules/room_rank/local/en.js
+++ b/view/molistar/modules/room_rank/local/en.js
@@ -17,9 +17,11 @@ langEn = {
        hour_text5: 'Loading...',
        hour_text6: 'Operation Completed',
        hour_text7: 'Network Error',
-        hour_text8: 'Away from the Previous',
+        // hour_text8: 'Away from the Previous',
+        hour_text8: ' ',
        hour_text9: 'Awaiting Position',
-        hour_text10: 'At the Top of the List',
+        // hour_text10: 'At the Top of the List',
+        hour_text10: ' ',
        hour_text11: 'Not Listed',
        // =============================房间榜==============================
        roomImg1: './images/title-en.png',
--- a/view/molistar/modules/room_rank/local/zh.js
+++ b/view/molistar/modules/room_rank/local/zh.js
@@ -17,8 +17,10 @@ langZh = {
        hour_text5: '加載中...',
        hour_text6: '操作完成',
        hour_text7: '網絡錯誤',
-        hour_text8: '距上一名',
+        // hour_text8: '距上一名',
+        hour_text8: ' ',
        hour_text9: '虛位以待',
+        // hour_text10: '高居榜首',
        hour_text10: '高居榜首',
        hour_text11: '未上榜',
        // =============================房間榜==============================
--- a/view/molistar/vue-project/wishRank/src/assets/images/rank/gold.png
+++ b/view/molistar/vue-project/wishRank/src/assets/images/rank/gold.png
--- a/view/molistar/vue-project/wishRank/src/i18n/langs/ar.js
+++ b/view/molistar/vue-project/wishRank/src/i18n/langs/ar.js
@@ -6,7 +6,8 @@ const ar = {
        "公会榜": "قائمة الوكالات",
        "日榜": "قائمة اليومية",
        "周榜": "قائمة الأسبوعية",
-        "距上一名": "بعيد عن السابق",
+        // "距上一名": "بعيد عن السابق",
+        "距上一名": "",
        "未上榜": "غير مدرج",
        "加載中": "جاري التحميل"
    }
--- a/view/molistar/vue-project/wishRank/src/i18n/langs/en.js
+++ b/view/molistar/vue-project/wishRank/src/i18n/langs/en.js
@@ -6,7 +6,8 @@ const en = {
        "公会榜": "Guild List",
        "日榜": "Daily List",
        "周榜": "Weekly List",
-        "距上一名": "Away from the Previous",
+        // "距上一名": "Away from the Previous",
+        "距上一名": "",
        "未上榜": "Not Listed",
        "加載中": "Loading..."
    }
--- a/view/molistar/vue-project/wishRank/src/i18n/langs/zh.js
+++ b/view/molistar/vue-project/wishRank/src/i18n/langs/zh.js
@@ -6,7 +6,8 @@ const zh = {
        公会榜: '公会榜',
        日榜: '日榜',
        周榜: '周榜',
-        距上一名: '距上一名',
+        // 距上一名: '距上一名',
+        距上一名: '',
        未上榜: '未上榜',
        加載中: '加載中',
    }
--- a/view/molistar/vue-project/wishRank/src/view/rank/Rank.vue
+++ b/view/molistar/vue-project/wishRank/src/view/rank/Rank.vue
@@ -73,9 +73,11 @@
          <p class="new-rank-num" v-if="tabType != 3">
            <span v-if="index">
              <span class="distance-num"
-                >{{
-                  formatTotal(topThree[index - 1].totalNum - item.totalNum)
-                }}
+                >{{ formatTotal(item.totalNum) }}
+                <img
+                  class="goldImg"
+                  src="@/assets/images/rank/gold.png"
+                  alt="" />
                <br
              /></span>
              {{ $t(`rank.距上一名`) }}
@@ -84,7 +86,10 @@
              <img src="@/assets/images/rank/first-icon.png" alt="" />
            </span>
          </p>
-          <p :class="`new-rank-icon icon-${index}`" v-if="tabType == 3 && item.levelIcon  ">
+          <p
+            :class="`new-rank-icon icon-${index}`"
+            v-if="tabType == 3 && item.levelIcon"
+          >
            <img :src="item.levelIcon" alt="" />
          </p>
          <!-- <p class="detail" v-if="tabType != 3">ID:{{ item.erbanNo }}</p> -->
@@ -144,17 +149,19 @@
                <!-- <p v-if="tabType != 3">ID:{{ item.erbanNo }}</p> -->
              </div>
              <p class="rank-user-num" v-if="tabType != 3">
-                <span>{{ $t(`rank.距上一名`) }}</span
-                ><br />
+                <span>{{ $t(`rank.距上一名`) }}</span>
+                <!-- <br /> -->
                {{
                  index
-                    ? formatTotal(value[index - 1].totalNum - item.totalNum)
-                    : formatTotal(
-                        topThree[topThree.length - 1].totalNum - item.totalNum
-                      )
-                }}
+                    ? formatTotal(item.totalNum)
+                    : formatTotal(item.totalNum)
+                }}<img
+                  class="goldImg"
+                  src="@/assets/images/rank/gold.png"
+                  alt=""
+                />
              </p>
-              <p class="new-rank-icon" v-if="tabType == 3 && item.levelIcon  ">
+              <p class="new-rank-icon" v-if="tabType == 3 && item.levelIcon">
                <img :src="item.levelIcon" alt="" />
              </p>
            </div>
@@ -182,9 +189,10 @@
          <!-- <p>ID:{{ me.erbanNo }}</p> -->
        </div>
        <p class="rank-user-num" v-if="me.seqNo != 0 && me.seqNo != 1">
-          <span>{{ $t(`rank.距上一名`) }}</span
-          ><br />
-          {{ totalList[me.seqNo - 2].totalNum - me.totalNum }}
+          <span>{{ $t(`rank.距上一名`) }}</span>
+          <!-- <br /> -->
+          {{ formatTotal(me.totalNum) }}
+          <img class="goldImg" src="@/assets/images/rank/gold.png" alt="" />
        </p>
        <p v-else-if="me.seqNo == 0" class="not-rank">
          {{ $t(`rank.未上榜`) }}
@@ -333,9 +341,16 @@ export default {
      this.chooseType = index;
      this.getList();
    },
-    formatTotal(num) {
-      if (num >= 10000) return (num / 10000).toFixed(1) + "W";
-      return num;
+    formatTotal(val) {
+      // if (num >= 10000) return (num / 10000).toFixed(1) + "W";
+      if (val < 1000) {
+        return val;
+      } else if (val >= 1000 && val < 1000000) {
+        return (val / 1000).toFixed(1) + "K";
+      } else if (val >= 1000000) {
+        return (val / 1000000).toFixed(1) + "M";
+      }
+      return val;
    },
    openPerson(erbanUid) {
      //   if(this.tabType == 0 || this.tabType == 1) {
@@ -538,6 +553,11 @@ body {
            width: 28px;
            height: 34px;
          }
+          .goldImg {
+            width: 25px;
+            height: 25px;
+            vertical-align: middle;
+          }
        }
        .detail {
          color: #dd574a;
@@ -664,6 +684,13 @@ body {
          span {
            font-size: 12px;
            color: #cccccc;
+            display: none;
+          }
+          .goldImg {
+            width: 25px;
+            height: 25px;
+            vertical-align: middle;
+            margin-left: 0.1rem;
          }
        }
        .new-rank-icon {
@@ -725,6 +752,12 @@ body {
          font-size: 12px;
          color: #cccccc;
        }
+        .goldImg {
+          width: 25px;
+          height: 25px;
+          vertical-align: middle;
+          margin-left: 0.05rem;
+        }
      }
      .not-rank {
        margin-right: 24px;
@@ -772,6 +805,12 @@ body {
          .rank-user-num {
            color: #8c9bff;
          }
+          .goldImg {
+            width: 25px;
+            height: 25px;
+            vertical-align: middle;
+            margin-left: 0.05rem;
+          }
          .me {
            background: #dbf0fd;
          }
@@ -819,6 +858,12 @@ body {
          .rank-user-num {
            color: #8c9bff;
          }
+          .goldImg {
+            width: 25px;
+            height: 25px;
+            vertical-align: middle;
+            margin-left: 0.05rem;
+          }
          .me {
            background: #e7d1f6;
          }
@@ -884,6 +929,12 @@ body {
          .rank-user-num {
            color: #3895de;
          }
+          .goldImg {
+            width: 25px;
+            height: 25px;
+            vertical-align: middle;
+            margin-left: 0.05rem;
+          }
          .user-list {
            &:nth-last-child(2) {
              margin-bottom: 0;