修改bug-爱的告白

view/molistar/activity/act-nameplate/css/index.css

@@ -12,7 +12,7 @@
 
 .max {
   width: 10rem;
-  height: 30.84rem;
+  height: 34.02667rem;
   background: url("../images/max.png?v=1.0") no-repeat;
   background-size: 100% 100%;
   font-family: 'pingfang-bold';
@@ -21,10 +21,10 @@
 .max .record {
   position: absolute;
   position: absolute;
-  top: 5.9rem;
+  top: 6.61333rem;
   right: 0;
-  width: 1.5rem;
-  height: 1.4rem;
+  width: 1.64rem;
+  height: 0.57333rem;
 }
 
 .max .record img {
@@ -34,23 +34,23 @@
 
 .max .btn {
   position: absolute;
-  top: 15.8rem;
-  left: 1.68rem;
-  width: 2.53333rem;
-  height: 1.01333rem;
+  top: 16.1rem;
+  left: 1.61rem;
+  width: 2.94667rem;
+  height: 1.46667rem;
 }
 
 .max .btn.basics-receive {
-  left: 5.6rem;
+  left: 5rem;
 }
 
 .max .btn.advance-send {
-  top: 22.34667rem;
+  top: 23.34667rem;
 }
 
 .max .btn.advance-receive {
-  top: 22.34667rem;
-  left: 5.6rem;
+  top: 23.34667rem;
+  left: 5rem;
 }
 
 .max .btn img {
@@ -257,8 +257,8 @@
 .max .shade-mask-new .shade-content .apply-btn,
 .max .shade-mask-new .shade-content-delay .apply-btn,
 .max .shade-mask-new .shade-content-new .apply-btn {
-  width: 4.90667rem;
-  height: 1.2rem;
+  width: 6.37333rem;
+  height: 0.82667rem;
   background: url("../images/apply-new.png") no-repeat 0 0/100% 100%;
   margin: 0.64rem auto 0;
 }
@@ -367,9 +367,9 @@
 }
 
 .max .shade-mask-delay .shade-content-delay .apply-btn {
-  width: 4.90667rem;
-  height: 1.2rem;
-  background: url("../images/confirm.png") no-repeat 0 0/100% 100%;
+  width: 6.37333rem;
+  height: 0.82667rem;
+  background: url("../images/apply-new.png") no-repeat 0 0/100% 100%;
   margin: 0.85333rem auto 0;
 }
 
@@ -484,9 +484,9 @@
 }
 
 .max .shade-mask-new .shade-content-new .apply-btn {
-  width: 4.90667rem;
-  height: 1.2rem;
-  background: url("../images/confirm.png") no-repeat 0 0/100% 100%;
+  width: 6.37333rem;
+  height: 0.82667rem;
+  background: url("../images/apply-new.png") no-repeat 0 0/100% 100%;
   margin: 0.61333rem auto 0;
 }
 
@@ -510,3 +510,7 @@
 ::-webkit-scrollbar {
   display: none;
 }
+
+.english .max {
+  height: 35.76rem;
+}

view/molistar/activity/act-nameplate/css/index.scss

@@ -21,7 +21,7 @@
 // @import '../../../common/css/flex.scss';
 .max {
   width: px2rem(750);
-  height: px2rem(2313);
+  height: px2rem(2552);
   background: url('../images/max.png?v=1.0') no-repeat;
   background-size: 100% 100%;
   font-family: 'pingfang-bold';
@@ -29,10 +29,10 @@
   .record {
     position: absolute;
     position: absolute;
-    top: 5.9rem;
+    top: px2rem(496);
     right: 0;
-    width: 1.5rem;
-    height: 1.4rem;
+    width: px2rem(123);
+    height: px2rem(43);
 
     img {
       width: 100%;
@@ -42,22 +42,22 @@
 
   .btn {
     position: absolute;
-    top: 15.8rem;
-    left: px2rem(126);
-    width: px2rem(190);
-    height: px2rem(76);
+    top: 16.1rem;
+    left: 1.61rem;
+    width: px2rem(221);
+    height: px2rem(110);
 
     &.basics-receive {
-      left: 5.6rem;
+      left: 5rem;
     }
 
     &.advance-send {
-      top: 22.34667rem;
+      top: 23.34667rem;
     }
 
     &.advance-receive {
-      top: 22.34667rem;
-      left: 5.6rem;
+      top: 23.34667rem;
+      left: 5rem;
     }
 
     img {
@@ -181,8 +181,8 @@
       }
 
       .apply-btn {
-        width: px2rem(368);
-        height: px2rem(90);
+        width: px2rem(478);
+        height: px2rem(62);
         background: url('../images/apply-new.png') no-repeat 0 0/100% 100%;
         margin: px2rem(48) auto 0;
       }
@@ -277,9 +277,9 @@
       }
 
       .apply-btn {
-        width: px2rem(368);
-        height: px2rem(90);
-        background: url('../images/confirm.png') no-repeat 0 0/100% 100%;
+        width: px2rem(478);
+        height: px2rem(62);
+        background: url('../images/apply-new.png') no-repeat 0 0/100% 100%;
         margin: px2rem(64) auto 0;
       }
     }
@@ -397,9 +397,9 @@
       }
 
       .apply-btn {
-        width: px2rem(368);
-        height: px2rem(90);
-        background: url('../images/confirm.png') no-repeat 0 0/100% 100%;
+        width: px2rem(478);
+        height: px2rem(62);
+        background: url('../images/apply-new.png') no-repeat 0 0/100% 100%;
         margin: px2rem(46) auto 0;
       }
     }
@@ -425,4 +425,10 @@
 
 ::-webkit-scrollbar {
   display: none;
+}
+
+.english{
+  .max{
+    height: px2rem(2682);
+  }
 }

view/molistar/activity/act-nameplate/index.html

@@ -17,7 +17,8 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
   <meta name="viewport"
     content="width=device-width,initial-scale=1.0,maximum-scale=1.0,minimum-scale=1.0,user-scalable=no, viewport-fit=cover" />
-  <title>精美铭牌送不停</title>
+  <title class="title_t"></title>
+  <!-- 私人訂製 -->
 
   <link rel="stylesheet" href="../../common/css/reset.css">
   <link rel="stylesheet" href="./css/index.css?v=11">
@@ -28,7 +29,7 @@
 <body>
   <div class="max">
     <div class="record">
-      <!-- <img src="./images/record.png" alt=""> -->
+      <img src="./images/record.png" alt="">
     </div>
     
     <div class="btn basics-send"><img src="./images/disabled-btn.png" alt=""></div>
@@ -62,7 +63,7 @@
       <div class="shade-content-delay">
         <!-- <div class="top">延期期限</div> -->
         <div class="nameplate-style">
-          <span>铭牌样式：</span>
+          <span class="text1">铭牌样式：</span>
           <div>
             <p>
               <img alt="">
@@ -71,10 +72,10 @@
           </div>
         </div>
         <div class="delay-time">
-            <span>申请时长：</span>
+            <span class="text2">申请时长：</span>
             <div>
               <img src="./images/decrease.png" alt="" class="decrease">
-              <p><span></span>天</p>
+              <p><span></span><b class="text3">天</b></p>
               <img src="./images/increase.png" alt="" class="increase">
             </div>
         </div>
@@ -88,20 +89,20 @@
       <div class="shade-content-new">
         <!-- <div class="top">申请新铭牌</div> -->
         <div class="nameplate-style">
-          <span>铭牌样式：</span>
+          <span class="text1"></span>
           <ul class="apply-new-ul">
             
           </ul>
         </div>
         <div class="new-nameplate-desc-wrap">
-          <span>铭牌文字：</span>
-          <input type="text" class="new-nameplate-desc" placeholder="请输入4个字" maxlength="4">
+          <span class="text4"></span>
+          <input class="text5" type="text" class="new-nameplate-desc" placeholder="" maxlength="">
         </div>
         <div class="delay-time">
-            <span>申请时长：</span>
+            <span class="text2"></span>
             <div>
               <img src="./images/decrease.png" alt="" class="decrease">
-              <p><span></span>天</p>
+              <p><span></span><b class="text3"></b></p>
               <img src="./images/increase.png" alt="" class="increase">
             </div>
         </div>
@@ -114,7 +115,11 @@
   <script src="../../common/js/common2.js"></script>
   <script src="../../common/js/layer.js"></script>
   <script src="../../common/js/vconsole.min.js"></script>
+  <script src="./local/en.js"></script>
+  <script src="./local/zh.js"></script>
+  <script src="./local/ar.js"></script>
   <script src="./js/public.js?v=10"></script>
+  <script src="../../common/local/langHandler.js"></script>
 </body>
 
 </html>

view/molistar/activity/act-nameplate/js/public.js

@@ -4,31 +4,210 @@ var browser = checkVersion();
 var info = {};
 if (EnvCheck() === 'test') new VConsole
 // 封裝layer消息提醒框
-let layerIndex
-const showLoading = (content = '加載中...') => {
-    layer.open({
-        type: 2,
-        shadeClose: false,
-        content,
-        success(e) {
-            layerIndex = $(e).attr('index')
-        }
-    })
+let layerIndex;
+var langReplace;
+var localLang;
+const showLoading = (content = langReplace(localLang.demoModule.layerIndex1)) => {
+  layer.open({
+    type: 2,
+    shadeClose: false,
+    content,
+    success(e) {
+      layerIndex = $(e).attr('index')
+    }
+  })
 }
 const hideLoading = (index) => {
-    layer.close(index)
+  layer.close(index)
 }
-const toastMsg = (content = '操作完成', time = 2) => {
-    layer.open({
-        content,
-        time,
-        skin: 'msg'
-    })
+const toastMsg = (content = langReplace(localLang.demoModule.layerIndex2), time = 2) => {
+  layer.open({
+    content,
+    time,
+    skin: 'msg'
+  })
 }
 
 let delayLock = false, newApplyLock = false
-
 let btnStatus = []
+var partitionId = null;
+$(function () {
+  getInfoFromClient()
+  fuzzyMatchUpdateQueryStringParameterFun(); // 判断语言
+  setTimeout(() => {
+    langReplace = window.lang.replace;
+    localLang = window.lang;
+    fuzzyMatchUpdateQueryStringParameterFun(); // 判断语言
+    translateFun();
+    getUserNameplateInfo()
+    userGet()
+  }, 50)
+  function translateFun() {
+    var langReplace = window.lang.replace;
+    var localLang = window.lang;
+    $('.max').attr('style', langReplace(localLang.demoModule.max))
+    $('.max .shade-mask-new .shade-content-new').attr('style', langReplace(localLang.demoModule.img4))
+    $('.max .shade-mask .shade-content, .max .shade-mask-delay .shade-content-delay').attr('style', langReplace(localLang.demoModule.img44))
+    $('.apply-btn').attr('style', langReplace(localLang.demoModule.img5))
+    $('.max .btn img').attr('src', langReplace(localLang.demoModule.img2))
+    $('.max .record img').attr('src', langReplace(localLang.demoModule.img6))
+    $('.title_t').html(langReplace(localLang.demoModule.title_t));
+    $('.text1').html(langReplace(localLang.demoModule.text1));
+    $('.text2').html(langReplace(localLang.demoModule.text2));
+    $('.text3').html(langReplace(localLang.demoModule.text3));
+    $('.text4').html(langReplace(localLang.demoModule.text4));
+    $('.text5').attr('placeholder', langReplace(localLang.demoModule.text5));
+  }
+  if (browser.app) {
+    _hmt.push(['_trackEvent', 'client', 'click', "act_nameplate"]);
+  }
+
+  // 點擊申請記錄按鈕
+  $('.record').on('click', function () {
+    window.location.href = './record.html'
+  })
+
+  // 關閉彈窗
+  $('.shade-mask .close').on('click', () => {
+    $('.shade-mask').hide()
+    $('body').css('overflow', 'auto')
+  })
+  $('.shade-mask-delay .close').on('click', () => {
+    $('.shade-mask-delay').hide()
+    $('body').css('overflow', 'auto')
+  })
+  $('.shade-mask-new .close').on('click', () => {
+    $('.shade-mask-new').hide()
+    $('body').css('overflow', 'auto')
+    newNameplateId = ''
+    $(this).find('input').val('')
+  })
+
+  let maxApplyDay, nameplateId, type, text
+  // 監聽 延長期限 按鈕點擊事件
+  $('.select-ul').on('click', '.delay-btn', function () {
+    let li = $(this).parent();
+    let src = li.find('.nameplate img').attr('src');
+    let desc = li.find('.nameplate span').html();
+    maxApplyDay = li.data('applyDay');
+    nameplateId = li.data('nameplateId');
+    type = li.data('type');
+    text = li.data('text');
+
+    $('.shade-mask-delay .nameplate-style img').attr('src', src);
+    $('.shade-mask-delay .nameplate-style p span').html(desc);
+    $('.shade-mask-delay .delay-time p span').html(maxApplyDay);
+
+    $('.shade-mask-delay').show().siblings('.shade-mask, .shade-mask-new').hide()
+  })
+
+  // 延期彈窗 點擊減按鈕
+  $('.shade-mask-delay').on('click', '.decrease', function () {
+    let applyDay = parseInt($(this).parent().find('span').html());
+    if (applyDay > 7) {
+      applyDay -= 7;
+    } else {
+      toastMsg(langReplace(localLang.demoModule.text6))
+    }
+    $('.shade-mask-delay .delay-time p span').html(applyDay);
+  })
+  //延期彈窗 點擊加按鈕
+  $('.shade-mask-delay').on('click', '.increase', function () {
+    let applyDay = parseInt($(this).parent().find('span').html());
+    if (applyDay >= maxApplyDay) {
+      toastMsg(langReplace(localLang.demoModule.text7))
+    } else {
+      applyDay += 7;
+    }
+    $('.shade-mask-delay .delay-time p span').html(applyDay);
+  })
+  // 監聽申請延期確定按鈕點擊事件
+  $('.shade-mask-delay').on('click', '.apply-btn', function () {
+    // applyType 1申請新銘牌，2延長
+    if (!delayLock) {
+      delayLock = true
+      let params = {
+        type,
+        nameplateId,
+        applyDay: parseInt($(this).parent().find('.delay-time div p span').html()),
+        applyType: 2,
+        text
+      };
+      delayNamaplateConfirm(params)
+    }
+  })
+
+  /*************************           ******************************/
+
+  // 監聽 申請新銘牌 按鈕點擊事件
+  $('.shade-mask').on('click', '.apply-btn', function () {
+    let type = $(this).parent().find('.select-ul li').eq(0).data('type');
+    getNewNameplateList(type)
+  })
+
+  // 申請新銘牌彈窗 點擊減按鈕
+  $('.shade-mask-new').on('click', '.decrease', function () {
+    let applyDay = parseInt($(this).parent().find('span').html());
+    if (applyDay > 7) {
+      applyDay -= 7;
+    } else {
+      toastMsg(langReplace(localLang.demoModule.text6))
+    }
+    $('.shade-mask-new .delay-time p span').html(applyDay);
+  })
+  // 申請新銘牌彈窗 點擊加按鈕
+  $('.shade-mask-new').on('click', '.increase', function () {
+    let applyDay = parseInt($(this).parent().find('span').html());
+    let maxApplyDay = parseInt($(this).parent().parent().parent().find('.apply-new-ul li').eq(0).data('applyDay'));
+    if (applyDay >= maxApplyDay) {
+      toastMsg(langReplace(localLang.demoModule.text7))
+    } else {
+      applyDay += 7;
+    }
+    $('.shade-mask-new .delay-time p span').html(applyDay);
+  })
+
+  // 申請新銘牌彈窗 點擊銘牌列錶事件
+  $('.shade-mask-new').on('click', 'li', function () {
+    $(this).addClass('active').siblings('li').removeClass('active');
+    newNameplateId = $(this).data('nameplateId');
+  })
+
+  // 申請新銘牌彈窗 確定申請 按鈕點擊事件
+  $('.shade-mask-new').on('click', '.apply-btn', function () {
+    let content = $(this).parent();
+    // let ipt = content.find('input.new-nameplate-desc').val()
+    let ipt = $('.text5').val();
+    if (!newNameplateId) {
+      toastMsg(langReplace(localLang.demoModule.text8));
+      return
+    }
+    if (!ipt) {
+      toastMsg(langReplace(localLang.demoModule.text9));
+      return
+    }
+    // else {
+    // if (ipt.length !== 4) {
+    //   toastMsg(langReplace(localLang.demoModule.text10));
+    //   return
+    // }
+    // }
+
+    // applyType 1申請新銘牌，2延長
+    if (!newApplyLock) {
+      newApplyLock = true
+      let params = {
+        applyType: 1,
+        nameplateId: newNameplateId,
+        text: ipt,
+        type: parseInt(content.find('ul.apply-new-ul li').eq(0).data('type')),
+        applyDay: parseInt(content.find('.delay-time div p span').html())
+      }
+      applyNewNamaplateConfirm(params)
+    }
+  })
+
+});
 // 獲取用戶銘牌狀態
 const getUserNameplateInfo = () => {
   showLoading()
@@ -38,42 +217,70 @@ const getUserNameplateInfo = () => {
     data: {
       uid: pubInfo.uid
     },
-    success(res){
+    success(res) {
       hideLoading(layerIndex);
-      if(res.code === 200){
+      if (res.code === 200) {
         btnStatus = res.data
         renderBtnStatus()
-      }else{
+      } else {
         toastMsg(res.message)
       }
     },
-    error(){
+    error() {
       hideLoading(layerIndex);
-      toastMsg('網絡錯誤')
+      toastMsg(langReplace(localLang.demoModule.layerIndex3))
+    }
+  })
+}
+const userGet = () => {
+  showLoading()
+  networkRequest({
+    type: 'GET',
+    url: urlPrefix + '/user/get',
+    data: {
+      uid: pubInfo.uid
+    },
+    success(res) {
+      hideLoading(layerIndex);
+      if (res.code === 200) {
+        partitionId = res.data.partitionId
+        if (partitionId == 1 || partitionId == 2) {
+          $('.text5').attr('maxlength', 13);
+        } else {
+          $('.text5').attr('maxlength', 4);
+        }
+        renderBtnStatus()
+      } else {
+        toastMsg(res.message)
+      }
+    },
+    error() {
+      hideLoading(layerIndex);
+      toastMsg(langReplace(localLang.demoModule.layerIndex3))
     }
   })
 }
 
 // 渲染首頁按鈕狀態
 const renderBtnStatus = () => {
-  btnStatus.map( (item,index) => {
-      if(index > 1){
-        // 進階款式
-        $('.btn').eq(index).find('img').attr('src', `${item > 0 ? './images/apply-btn-basics.png' : './images/disabled-btn.png'}`)
-        if(item > 0){
-          $('.btn').eq(index).on('click', () => {
-            getUserNameplateList(index+1)
-          })
-        }
-      }else{
-        // 基礎款式
-        $('.btn').eq(index).find('img').attr('src', `${item > 0 ? './images/apply-btn-basics.png' : './images/disabled-btn.png'}`)
-        if(item > 0){
-          $('.btn').eq(index).on('click', () => {
-            getUserNameplateList(index+1)
-          })
-        }
+  btnStatus.map((item, index) => {
+    if (index > 1) {
+      // 進階款式
+      $('.btn').eq(index).find('img').attr('src', `${item > 0 ? langReplace(localLang.demoModule.img3) : langReplace(localLang.demoModule.img2)}`)
+      if (item > 0) {
+        $('.btn').eq(index).on('click', () => {
+          getUserNameplateList(index + 1)
+        })
       }
+    } else {
+      // 基礎款式
+      $('.btn').eq(index).find('img').attr('src', `${item > 0 ? langReplace(localLang.demoModule.img3) : langReplace(localLang.demoModule.img2)}`)
+      if (item > 0) {
+        $('.btn').eq(index).on('click', () => {
+          getUserNameplateList(index + 1)
+        })
+      }
+    }
   })
 }
 
@@ -88,22 +295,22 @@ const getUserNameplateList = (type) => {
       uid: pubInfo.uid,
       type
     },
-    success(res){
+    success(res) {
       hideLoading(layerIndex)
-      if(res.code === 200){
-        if(!res.data.length){
+      if (res.code === 200) {
+        if (!res.data.length) {
           getNewNameplateList(type)
-        }else{
+        } else {
           userNameplateList = res.data
           renderNameplateList()
         }
-      }else{
+      } else {
         toastMsg(res.message)
       }
     },
-    error(){
+    error() {
       hideLoading(layerIndex);
-      toastMsg('網絡錯誤')
+      toastMsg(langReplace(localLang.demoModule.layerIndex3))
     }
   })
 }
@@ -111,16 +318,16 @@ const getUserNameplateList = (type) => {
 // 渲染銘牌列錶(選擇彈窗)
 const renderNameplateList = () => {
   let str = ''
-  userNameplateList.map( item => {
+  userNameplateList.map(item => {
     str += `
       <li data-apply-day=${item.applyDay} data-nameplate-id=${item.nameplateId} data-type=${item.type} data-text=${item.fixedWord}>
-        <p>剩余${item.expireDays}天</p>
+        <p>${langReplace(localLang.demoModule.text13)}${item.expireDays}${langReplace(localLang.demoModule.text3)}</p>
         <div class="nameplate">
           <img src="${item.nameplateImage}" alt="">
           <span>${item.word}</span>
         </div>
         <div class="delay-btn">
-          <img src="./images/delay-btn.png" alt="">
+          <img src="${langReplace(localLang.demoModule.img7)}" alt="">
         </div>
       </li>
     `
@@ -143,22 +350,22 @@ const getNewNameplateList = (type) => {
       uid: pubInfo.uid,
       type
     },
-    success(res){
+    success(res) {
       hideLoading(layerIndex)
-      if(res.code === 200){
-        if(!res.data.length){
-          toastMsg('暫時沒有銘牌可申請')
+      if (res.code === 200) {
+        if (!res.data.length) {
+          toastMsg(langReplace(localLang.demoModule.text11))
           return
         }
         newNameplateList = res.data
         renderNewNameplateList()
-      }else{
+      } else {
         toastMsg(res.message)
       }
     },
-    error(){
+    error() {
       hideLoading(layerIndex);
-      toastMsg('網絡錯誤')
+      toastMsg(langReplace(localLang.demoModule.layerIndex3))
     }
   })
 }
@@ -167,7 +374,7 @@ let newNameplateId  //只有一個可選時，默認選中
 // 渲染申請新銘牌彈窗
 const renderNewNameplateList = () => {
   let str = '';
-  newNameplateList.map( item => {
+  newNameplateList.map(item => {
     str += `
       <li data-apply-day=${item.applyDay} data-nameplate-id=${item.id} data-type=${item.type}>
         <div>
@@ -177,7 +384,7 @@ const renderNewNameplateList = () => {
     `
   })
   $('.apply-new-ul').html(str)
-  if(newNameplateList.length === 1){
+  if (newNameplateList.length === 1) {
     let onlyLi = $('.apply-new-ul').find('li').eq(0);
     newNameplateId = onlyLi.data('nameplateId');
     onlyLi.addClass('active')
@@ -201,23 +408,23 @@ const delayNamaplateConfirm = (params) => {
       applyType: params.applyType,
       text: params.text
     },
-    success(res){
+    success(res) {
       hideLoading(layerIndex)
-      if(res.code === 200){
-        toastMsg('申請成功')
+      if (res.code === 200) {
+        toastMsg(langReplace(localLang.demoModule.text12))
         $('.shade-mask-delay').hide()
         $('body').css('overflow', 'auto')
         delayLock = false
-        setTimeout(()=>{
+        setTimeout(() => {
           location.reload()
         }, 500)
-      }else{
+      } else {
         toastMsg(res.message)
       }
     },
-    error(){
+    error() {
       hideLoading(layerIndex);
-      toastMsg('網絡錯誤')
+      toastMsg(langReplace(localLang.demoModule.layerIndex3))
     }
   })
 }
@@ -236,180 +443,26 @@ const applyNewNamaplateConfirm = (params) => {
       applyType: params.applyType,
       text: params.text
     },
-    success(res){
+    success(res) {
       hideLoading(layerIndex)
-      if(res.code === 200){
-        toastMsg('申請成功')
+      if (res.code === 200) {
+        toastMsg(langReplace(localLang.demoModule.text12))
         $('.shade-mask-new').hide()
         $('body').css('overflow', 'auto')
-        newApplyLock  = false
-        setTimeout(()=>{
+        newApplyLock = false
+        setTimeout(() => {
           location.reload()
         }, 500)
-      }else{
-        newApplyLock  = false
+      } else {
+        newApplyLock = false
         toastMsg(res.message)
       }
     },
-    error(){
+    error() {
       hideLoading(layerIndex);
-      toastMsg('網絡錯誤,請退出重進')
+      toastMsg(langReplace(localLang.demoModule.layerIndex3))
     }
   })
 }
 
-$(function () {
-  getInfoFromClient()
-  setTimeout( () => {
-    getUserNameplateInfo()
-  }, 50)
-
-  if (browser.app) {
-    _hmt.push(['_trackEvent', 'client', 'click', "act_nameplate"]);
-  }
-
-  // 點擊申請記錄按鈕
-  $('.record').on('click', function(){
-    window.location.href = './record.html'
-  })
-
-  // 關閉彈窗
-  $('.shade-mask .close').on('click', () => {
-    $('.shade-mask').hide()
-    $('body').css('overflow', 'auto')
-  })
-  $('.shade-mask-delay .close').on('click', () => {
-    $('.shade-mask-delay').hide()
-    $('body').css('overflow', 'auto')
-  })
-  $('.shade-mask-new .close').on('click', () => {
-    $('.shade-mask-new').hide()
-    $('body').css('overflow', 'auto')
-    newNameplateId = ''
-    $(this).find('input').val('')
-  })
-
-  let maxApplyDay, nameplateId, type, text
-  // 監聽 延長期限 按鈕點擊事件
-  $('.select-ul').on('click', '.delay-btn', function() {
-    let li = $(this).parent();
-    let src = li.find('.nameplate img').attr('src');
-    let desc = li.find('.nameplate span').html();
-    maxApplyDay = li.data('applyDay');
-    nameplateId = li.data('nameplateId');
-    type = li.data('type');
-    text = li.data('text');
-    
-    $('.shade-mask-delay .nameplate-style img').attr('src', src);
-    $('.shade-mask-delay .nameplate-style p span').html(desc);
-    $('.shade-mask-delay .delay-time p span').html(maxApplyDay);
-
-    $('.shade-mask-delay').show().siblings('.shade-mask, .shade-mask-new').hide()
-  })
-
-  // 延期彈窗 點擊減按鈕
-  $('.shade-mask-delay').on('click', '.decrease', function(){
-    let applyDay = parseInt( $(this).parent().find('span').html() );
-    if(applyDay > 7){
-      applyDay -= 7;
-    }else{
-      toastMsg('銘牌至少申請7天')
-    }
-    $('.shade-mask-delay .delay-time p span').html(applyDay);
-  })
-  //延期彈窗 點擊加按鈕
-  $('.shade-mask-delay').on('click', '.increase', function(){
-    let applyDay = parseInt( $(this).parent().find('span').html() );
-    if(applyDay >= maxApplyDay){
-      toastMsg('已達最大申請時長')
-    }else{
-      applyDay += 7;
-    }
-    $('.shade-mask-delay .delay-time p span').html(applyDay);
-  })
-  // 監聽申請延期確定按鈕點擊事件
-  $('.shade-mask-delay').on('click', '.apply-btn', function(){
-    // applyType 1申請新銘牌，2延長
-    if(!delayLock){
-      delayLock = true
-      let params = {
-        type,
-        nameplateId,
-        applyDay: parseInt( $(this).parent().find('.delay-time div p span').html() ),
-        applyType: 2,
-        text
-      };
-      delayNamaplateConfirm(params)
-    }
-  })
-
-  /*************************           ******************************/
-
-  // 監聽 申請新銘牌 按鈕點擊事件
-  $('.shade-mask').on('click', '.apply-btn', function(){
-    let type = $(this).parent().find('.select-ul li').eq(0).data('type');
-    getNewNameplateList(type)
-  })
-
-  // 申請新銘牌彈窗 點擊減按鈕
-  $('.shade-mask-new').on('click', '.decrease', function(){
-    let applyDay = parseInt( $(this).parent().find('span').html() );
-    if(applyDay > 7){
-      applyDay -= 7;
-    }else{
-      toastMsg('銘牌至少申請7天')
-    }
-    $('.shade-mask-new .delay-time p span').html(applyDay);
-  })
-  // 申請新銘牌彈窗 點擊加按鈕
-  $('.shade-mask-new').on('click', '.increase', function(){
-    let applyDay = parseInt( $(this).parent().find('span').html() );
-    let maxApplyDay = parseInt( $(this).parent().parent().parent().find('.apply-new-ul li').eq(0).data('applyDay') );
-    if(applyDay >= maxApplyDay){
-      toastMsg('已達最大申請時長')
-    }else{
-      applyDay += 7;
-    }
-    $('.shade-mask-new .delay-time p span').html(applyDay);
-  })
-  
-  // 申請新銘牌彈窗 點擊銘牌列錶事件
-  $('.shade-mask-new').on('click', 'li', function(){
-    $(this).addClass('active').siblings('li').removeClass('active');
-    newNameplateId = $(this).data('nameplateId');
-  })
-
-  // 申請新銘牌彈窗 確定申請 按鈕點擊事件
-  $('.shade-mask-new').on('click', '.apply-btn', function(){
-    let content = $(this).parent();
-    let ipt = content.find('input.new-nameplate-desc').val()
-    if(!newNameplateId){
-      toastMsg('請選擇樣式');
-      return
-    }
-    if(!ipt){
-      toastMsg('請添加銘牌文字');
-      return
-    }else{
-      if(ipt.length !== 4){
-        toastMsg('請添加4個字的銘牌文字');
-        return
-      }
-    }
-    
-    // applyType 1申請新銘牌，2延長
-    if(!newApplyLock){
-      newApplyLock = true
-      let params = {
-        applyType: 1,
-        nameplateId: newNameplateId,
-        text: ipt,
-        type: parseInt( content.find('ul.apply-new-ul li').eq(0).data('type') ),
-        applyDay: parseInt( content.find('.delay-time div p span').html() )
-      }
-      applyNewNamaplateConfirm(params)
-    }
-  })
-
-});
 

view/molistar/activity/act-nameplate/js/record.js

@@ -1,9 +1,11 @@
 let urlPrefix = getUrlPrefix();
 if (EnvCheck() === 'test') new VConsole
 
-// 封装layer消息提醒框
-let layerIndex
-const showLoading = (content = '加載中...') => {
+// 封裝layer消息提醒框
+let layerIndex;
+var langReplace;
+var localLang;
+const showLoading = (content = langReplace(localLang.demoModule.layerIndex1)) => {
     layer.open({
         type: 2,
         shadeClose: false,
@@ -16,7 +18,7 @@ const showLoading = (content = '加載中...') => {
 const hideLoading = (index) => {
     layer.close(index)
 }
-const toastMsg = (content = '操作完成', time = 2) => {
+const toastMsg = (content = langReplace(localLang.demoModule.layerIndex2), time = 2) => {
     layer.open({
         content,
         time,
@@ -40,53 +42,52 @@ const getUserApplyRecord = () => {
             pageNumber,
             pageSize
         },
-        success(res){
+        success(res) {
             hideLoading(layerIndex)
-            if(res.code === 200){
-                if(!res.data.length){
+            if (res.code === 200) {
+                if (!res.data.length) {
                     $('.max').hide()
-                }else{
+                } else {
                     $('.no-record-wrap').hide()
                 }
 
-                if(res.data.length === pageSize){
+                if (res.data.length === pageSize) {
                     // 能够继续请求下一页
                     canNext = true
-                }else{
+                } else {
                     canNext = false
                 }
                 recordList.push(...res.data)
                 renderRecord()
                 isLock = true
-            }else{
-              toastMsg(res.message)
+            } else {
+                toastMsg(res.message)
             }
-          },
-          error(){
+        },
+        error() {
             hideLoading(layerIndex);
-            toastMsg('網絡錯誤')
-          }
+            toastMsg(langReplace(localLang.demoModule.layerIndex3))
+        }
     })
 }
 // 渲染申请记录
 const renderRecord = () => {
     let str = '';
-    recordList.map( item => {
+    recordList.map(item => {
         str += `
             <li>
                 <div class="nameplate-style"><img src="${item.iconPic}" alt=""></div>
                 <div class="nameplate-desc-wrap">
                     <span class="nameplate-desc">${item.text}</span>
                     <p>
-                        <span>${item.applyType === 1 ? '申请' : '延长'}${item.applyDay}天</span>
+                        <span>${item.applyType === 1 ? langReplace(localLang.demoModule.text16) : langReplace(localLang.demoModule.text17)}${item.applyDay}${langReplace(localLang.demoModule.text3)}</span>
                         <span>${dateFormat(item.createTime, "yyyy-MM-dd")}</span>
                     </p>
                 </div>
                 <div class="isPass">
-                    <p class='${item.auditType === 1 ? 'not-pass' : ''}'>${item.auditType === 0 ? '申请中' : (item.auditType === 1 ? '不通过' : '已通过')}</p>
-                    ${
-                        item.remark ? (item.remark.length > 8 ? `<p class="result">${item.remark.slice(0, 8) + '...'}</p>` : `<p class="result">${item.remark}</p>`) : ''
-                    }
+                    <p class='${item.auditType === 1 ? 'not-pass' : ''}'>${item.auditType === 0 ? langReplace(localLang.demoModule.text18) : (item.auditType === 1 ? langReplace(localLang.demoModule.text19) : langReplace(localLang.demoModule.text20))}</p>
+                    ${item.remark ? (item.remark.length > 8 ? `<p class="result">${item.remark.slice(0, 8) + '...'}</p>` : `<p class="result">${item.remark}</p>`) : ''
+            }
                     
                 </div>
             </li>
@@ -95,21 +96,32 @@ const renderRecord = () => {
     $('.max').html(str)
 }
 
-$(function(){
+$(function () {
     getInfoFromClient()
-    setTimeout( () => {
+    fuzzyMatchUpdateQueryStringParameterFun(); // 判断语言
+    setTimeout(() => {
+        langReplace = window.lang.replace;
+        localLang = window.lang;
+        fuzzyMatchUpdateQueryStringParameterFun(); // 判断语言
+        translateFun();
         getUserApplyRecord()
     }, 50)
+    function translateFun() {
+        var langReplace = window.lang.replace;
+        var localLang = window.lang;
+        $('.text14').text(langReplace(localLang.demoModule.text14));
+        $('.text15').text(langReplace(localLang.demoModule.text15));
+    }
 
     // 监听滚动
-    $('ul').scroll(function(){
+    $('ul').scroll(function () {
         let scrollTop = $(this).scrollTop()
         let scrollHeight = $('ul')[0].scrollHeight
         let ulHeight = $(this).innerHeight()
-        if(scrollTop + ulHeight + 100 >= scrollHeight){
-            if(isLock){
+        if (scrollTop + ulHeight + 100 >= scrollHeight) {
+            if (isLock) {
                 // 请求下一页
-                if(canNext){
+                if (canNext) {
                     getUserApplyRecord(pageNumber++)
                     isLock = false
                 }

view/molistar/activity/act-nameplate/local/ar.js

@@ -0,0 +1,40 @@
+// 阿拉伯
+langAr = {
+    // 模块
+    demoModule: {
+        layerIndex1: `التحميل...`,
+        layerIndex2: `اكتمال العملية`,
+        layerIndex3: `خطأ في الشبكة`,
+        max: `background:url("./images/max-ar.png") no-repeat;background-size:100% 100%;`,
+        img4: `background-image: url(./images/new-bg-ar.png);`,
+        img44: `background-image: url(./images/select-bg-ar.png);`,
+        img5: `background: url('./images/apply-new-ar.png') no-repeat 0 0/100% 100%;`,
+        img2: `./images/disabled-btn-ar.png`,
+        img3: `./images/apply-btn-basics-ar.png`,
+        img6: `./images/record-ar.png`,
+        img7: `./images/delay-btn-ar.png`,
+        title_t: `مخصص`,
+        text1: `نمط اللوحة:`,
+        text2: `مدة التطبيق:`,
+        text3: `أيام`,
+        text4: `نص اللوحة:`,
+        text5: `الرجاء إدخال...`,
+        text55: `13`,
+        text6: `يجب تطبيق اللوحة لمدة 7 أيام على الأقل`,
+        text7: `تم بلوغ أقصى مدة للتطبيق`,
+        text8: `يرجى اختيار نمط`,
+        text9: `يرجى إضافة نص اللوحة`,
+        text10: `يرجى إضافة نص اللوحة من 4 أحرف`,
+        text11: `لا توجد لوحات متاحة حالياً`,
+        text12: `تم التطبيق بنجاح`,
+        text13: 'متبقٍ',
+        text14: 'سجل الطلبات',
+        text15: 'لا توجد سجلات للطلبات',
+        text16: 'تقديم الطلب',
+        text17: 'تمديد',
+        text18: 'قيد الطلب',
+        text19: 'لم يتم القبول',
+        text20: 'تم القبول'
+    }
+
+}

view/molistar/activity/act-nameplate/local/en.js

@@ -0,0 +1,40 @@
+// 英文
+langEn = {
+    // 模块
+    demoModule: {
+        layerIndex1: `Loading...`,
+        layerIndex2: `Operation completed`,
+        layerIndex3: `Network error`,
+        max: `background:url("./images/max-en.png") no-repeat;background-size:100% 100%;`,
+        img4: `background-image: url(./images/new-bg-en.png);`,
+        img44: `background-image: url(./images/select-bg-en.png);`,
+        img5: `background: url('./images/apply-new-en.png') no-repeat 0 0/100% 100%;`,
+        img2: `./images/disabled-btn-en.png`,
+        img3: `./images/apply-btn-basics-en.png`,
+        img6: `./images/record-en.png`,
+        img7: `./images/delay-btn-en.png`,
+        title_t: `Customized`,
+        text1: `Style: `,
+        text2: `Duration: `,
+        text3: `days`,
+        text4: `Text: `,
+        text5: `please enter...`,
+        text55: `13`,
+        text6: `Minimum 7 days required`,
+        text7: `Maximum duration reached`,
+        text8: `Select a style`,
+        text9: `Add text`,
+        text10: `Add 4 characters of text`,
+        text11: `No nameplates available`,
+        text12: `Successful`,
+        text13: 'Remaining',
+        text14: 'Application Records',
+        text15: 'No Application Records',
+        text16: 'Apply',
+        text17: 'Extend',
+        text18: 'In Progress',
+        text19: 'Rejected',
+        text20: 'Approved',
+    }
+
+}

view/molistar/activity/act-nameplate/local/zh.js

@@ -0,0 +1,39 @@
+// 中文
+langZh = {
+    // 模塊
+    demoModule: {
+        layerIndex1: `加載中...`,
+        layerIndex2: `操作完成`,
+        layerIndex3: `網路錯誤`,
+        max: `background:url("./images/max.png") no-repeat;background-size:100% 100%;`,
+        img4: `background-image: url(./images/new-bg.png);`,
+        img44: `background-image: url(./images/select-bg.png);`,
+        img5: `background: url('./images/apply-new.png') no-repeat 0 0/100% 100%;`,
+        img2: `./images/disabled-btn.png`,
+        img3: `./images/apply-btn-basics.png`,
+        img6: `./images/record.png`,
+        img7: `./images/delay-btn.png`,
+        title_t: `私人訂製`,
+        text1: `銘牌樣式：`,
+        text2: `申請時長：`,
+        text3: `天`,
+        text4: `銘牌文字：`,
+        text5: `請輸入4個字`,
+        text55: `4`,
+        text6: `銘牌至少申請7天`,
+        text7: `已達最大申請時長`,
+        text8: `請選擇樣式`,
+        text9: `請添加銘牌文字`,
+        text10: `請添加4個字的銘牌文字`,
+        text11: `暫時沒有銘牌可申請`,
+        text12: `申請成功`,
+        text13: `剩余`,
+        text14: `申请记录`,
+        text15: `暂无申请记录`,
+        text16: `申请`,
+        text17: `延长`,
+        text18: `申请中`,
+        text19: `不通过`,
+        text20: `已通过`,
+    }
+}

view/molistar/activity/act-nameplate/record.html

@@ -9,7 +9,8 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
   <meta name="viewport"
     content="width=device-width,initial-scale=1.0,maximum-scale=1.0,minimum-scale=1.0,user-scalable=no, viewport-fit=cover" />
-  <title>申请记录</title>
+  <title class="text14"></title>
+  <!-- 申请记录  -->
 
   <link rel="stylesheet" href="../../common/css/reset.css">
   <link rel="stylesheet" href="./css/record.css">
@@ -23,13 +24,17 @@
   </ul>
   <div class="no-record-wrap">
     <img src="./images/default.png" alt="">
-    <span>暂无申请记录</span>
+    <span class="text15"></span>
   </div>
   <script src="../../common/js/jquery-3.2.1.min.js"></script>
   <script src="../../common/js/common2.js"></script>
   <script src="../../common/js/layer.js"></script>
   <script src="../../common/js/vconsole.min.js"></script>
+  <script src="./local/en.js"></script>
+  <script src="./local/zh.js"></script>
+  <script src="./local/ar.js"></script>
   <script src="./js/record.js"></script>
+  <script src="../../common/local/langHandler.js"></script>
 </body>
 
 </html>

view/molistar/common/js/common2.js

@@ -261,7 +261,7 @@ function convert(_url) {
 // 根据域名适配环境
 function EnvCheck() {
     if (window.location.href) {
-        if(window.location.pathname.match(/payAr/)){
+        if (window.location.pathname.match(/payAr/)) {
             pubInfo['Accept-Language'] = "ar";
         }
         var _url = window.location.host;
@@ -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,11 +837,13 @@ function langCodeFun(langCode) {
     if (langCode == "ar") {
         document.documentElement.setAttribute("dir", "rtl");
         document.body.classList.add('arabic');
-        
+
+    }else if(langCode == "en"){
+        document.body.classList.add('english');
+    }
     if (window.location.href.match(/guildAr/)) {
         document.documentElement.setAttribute("dir", "ltr");
     }
-    }
 }
 // 获取整条url
 function updateQueryStringParameter(uri, key, value) {
@@ -1011,9 +1013,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环境中 配置公共参数的回调函数

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>
 

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('網絡錯誤，請退出重進')
       }
     })
   }

view/molistar/modules/pkRank/js/index.js

@@ -178,7 +178,7 @@ function getRecord() {
         success(res) {
             if (res.code === 200) {
                 var str = '';
-                if (res.data.length == 0 && pageNumPk == 1) {
+                if (res.data.length == 0) {
                     lockPk = false;
                 } else {
                     res.data.forEach((res, i) => {

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.f93eab06805cd0eec251914bdfcfb4d4.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.7ef0f6b11dd8f8fd1487.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>

view/molistar/modules/rank/static/js/manifest.1244b84e5bdc6ca4325c.js

@@ -1,2 +0,0 @@
-!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

view/molistar/modules/rank/static/js/manifest.7ef0f6b11dd8f8fd1487.js

@@ -0,0 +1,2 @@
+!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,a){for(var i,u,f,s=0,d=[];s<r.length;s++)u=r[s],t[u]&&d.push(t[u][0]),t[u]=0;for(i in c)Object.prototype.hasOwnProperty.call(c,i)&&(e[i]=c[i]);for(n&&n(r,c,a);d.length;)d.shift()();if(a)for(s=0;s<a.length;s++)f=o(o.s=a[s]);return f};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:"2660322e6ec3ab36d36b",2:"c400ed84fcfb7544002c",3:"7a4dfeb0d7ea325598f5",4:"74c8770604d782011a1a",5:"36de0cf38e7936e529ee",6:"92d7991962d3719f0ac8"}[e]+".js";var i=setTimeout(u,12e4);function u(){a.onerror=a.onload=null,clearTimeout(i);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return a.onerror=a.onload=u,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.7ef0f6b11dd8f8fd1487.js.map

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>
 

view/molistar/modules/room_rank/hourRankLicense.html

@@ -59,5 +59,5 @@
 <script src="./local/en.js"></script>
 <script src="./local/zh.js"></script>
 <script src="./local/ar.js"></script>
-<script src="./js/hourRankLicense.js"></script>
+<script src="./js/hourRankLicense.js?v=1.0"></script>
 <script src="../../common/local/langHandler.js"></script>

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>

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))

view/molistar/modules/room_rank/js/hourRankLicense.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}>
@@ -101,7 +98,7 @@ const renderLastHourThree = () => {
         <div class="num" style="display:${item.score === '' ? 'none' : 'block'}">
           ${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>
@@ -156,9 +153,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>
@@ -169,7 +163,7 @@ const renderCurrentList = () => {
         <div class="others_num" style="display:${item.score === '' ? 'none' : 'block'}">
           ${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>
@@ -184,11 +178,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)}`)

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>

view/molistar/modules/room_rank/local/ar.js

@@ -17,15 +17,17 @@ 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',
         room_title: 'قائمة الغرفة',
-        room_text1: 'قائمة الحب',
-        room_text2: 'قائمة السحر',
+        room_text1: 'قائمة الأغنياء',
+        room_text2: 'قائمة الجاذبية',
         room_text3: 'القائمة اليومية',
         room_text4: 'القائمة الأسبوعية',
         room_text5: 'القائمة الشهرية',

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',

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: '未上榜',
         // =============================房間榜==============================

view/molistar/vue-project/wishRank/src/i18n/langs/ar.js

@@ -1,12 +1,13 @@
 const ar = {
     rank: {
         "爱意榜": "قائمة الأغنياء",
-        "魅力榜": "قائمة السحر",
+        "魅力榜": "قائمة الجاذبية",
         "房间榜": "قائمة الغرف",
         "公会榜": "قائمة الوكالات",
         "日榜": "قائمة اليومية",
         "周榜": "قائمة الأسبوعية",
-        "距上一名": "بعيد عن السابق",
+        // "距上一名": "بعيد عن السابق",
+        "距上一名": "",
         "未上榜": "غير مدرج",
         "加載中": "جاري التحميل"
     }

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..."
     }

view/molistar/vue-project/wishRank/src/i18n/langs/zh.js

@@ -6,7 +6,8 @@ const zh = {
         公会榜: '公会榜',
         日榜: '日榜',
         周榜: '周榜',
-        距上一名: '距上一名',
+        // 距上一名: '距上一名',
+        距上一名: '',
         未上榜: '未上榜',
         加載中: '加載中',
     }

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: 23px;
+            height: 23px;
+            vertical-align: middle;
+          }
         }
         .detail {
           color: #dd574a;
@@ -626,7 +646,7 @@ body {
           color: #999999;
           font-size: 16px;
           font-weight: bold;
-          width: 20px;
+          width: 23px;
           text-align: center;
           margin-right: 22px;
         }
@@ -656,14 +676,22 @@ body {
           }
         }
         .rank-user-num {
-          width: 80px;
+          width: 120px;
           text-align: right;
           font-size: 16px;
           font-weight: bold;
           color: #ffb435;
+          margin-right: -8px;
           span {
             font-size: 12px;
             color: #cccccc;
+            display: none;
+          }
+          .goldImg {
+            width: 23px;
+            height: 23px;
+            vertical-align: middle;
+            margin-left: 0.1rem;
           }
         }
         .new-rank-icon {
@@ -715,16 +743,22 @@ body {
         }
       }
       .rank-user-num {
-        width: 80px;
+        width: 120px;
         text-align: right;
         font-size: 16px;
         font-weight: bold;
         color: #ffb435;
-        margin-right: 24px;
+        margin-right: 5px;
         span {
           font-size: 12px;
           color: #cccccc;
         }
+        .goldImg {
+          width: 23px;
+          height: 23px;
+          vertical-align: middle;
+          margin-left: 0.05rem;
+        }
       }
       .not-rank {
         margin-right: 24px;
@@ -772,6 +806,12 @@ body {
           .rank-user-num {
             color: #8c9bff;
           }
+          .goldImg {
+            width: 23px;
+            height: 23px;
+            vertical-align: middle;
+            margin-left: 0.05rem;
+          }
           .me {
             background: #dbf0fd;
           }
@@ -819,6 +859,12 @@ body {
           .rank-user-num {
             color: #8c9bff;
           }
+          .goldImg {
+            width: 23px;
+            height: 23px;
+            vertical-align: middle;
+            margin-left: 0.05rem;
+          }
           .me {
             background: #e7d1f6;
           }
@@ -884,6 +930,12 @@ body {
           .rank-user-num {
             color: #3895de;
           }
+          .goldImg {
+            width: 23px;
+            height: 23px;
+            vertical-align: middle;
+            margin-left: 0.05rem;
+          }
           .user-list {
             &:nth-last-child(2) {
               margin-bottom: 0;