修复魅力榜单

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.3"></script>
+  <script src="js/index.js?v=2.4"></script>
   <script src="../../common/local/langHandler.js"></script>
 </body>
 

view/molistar/modules/charm/js/index.js

@@ -1,4 +1,5 @@
 let info = {}
+let urlPrefix = getUrlPrefix()
 
 var langReplace;
 var localLang;
@@ -11,22 +12,6 @@ $(function () {
   let countPage;        //用来判断加载的次数，跟res.data.totalPage比较，countPage为0时不再加载
   let isLock = true
   if (EnvCheck() == 'test') { let vConsole = new VConsole };
-
-  if (browser.app) {
-    if (browser.ios) {
-      info.uid = tools.cookieUtils.get('uid');
-      window.webkit.messageHandlers.getTicket.postMessage(null);
-      window.webkit.messageHandlers.getRoomUid.postMessage(null);
-    } else if (browser.android) {
-      if (androidJsObj && typeof androidJsObj === 'object') {
-        info.uid = parseInt(window.androidJsObj.getUid());
-        info.ticket = window.androidJsObj.getTicket();
-        info.roomUid = window.androidJsObj.getRoomUid();
-      }
-    }
-  } else {
-    info.uid = 900143;
-  }
   getInfoFromClient()
   fuzzyMatchUpdateQueryStringParameterFun(); // 判断语言
   //渲染数据
@@ -114,31 +99,41 @@ $(function () {
 
   //获取数据
   const getData = (pageNum) => {
-    $.ajax({
+    networkRequest({
-      type: "GET",
+      type: 'GET',
-      // url: 'http://120.79.211.243/room/gift/value/ranking',
+      url: urlPrefix + '/user/detail/get',
-      async: browser.ios ? true : false,
-      url: api + '/room/gift/value/ranking',
       data: {
-        roomUid: urlData.uid,
+        uid: urlData.uid
-        micUid: urlData.uid,
-        // roomUid: 1005060,
-        // micUid: 1005060,
-        page: pageNum,
-        pageSize: pageSize,
       },
-      headers: {
+      success(val) {
-
+        console.log(pubInfo);
-      },
+        networkRequest({
-      success: (res) => {
+          type: 'GET',
-        // console.log(res)
+          url: urlPrefix + '/room/gift/value/ranking',
-        if (res.data.totalPage >= pageNum) {
+          data: {
-          randerList(res.data.ranking)
+            roomUid: browser.ios ? val.data.roomUid : pubInfo.roomUid,
-          countPage = res.data.totalPage - pageNum
+            micUid: urlData.uid,//
-          if (pageNum != 1) {
+            page: pageNum,
-            isLock = true
+            pageSize: pageSize,
+          },
+          success(res) {
+            if (res.data.totalPage >= pageNum) {
+              randerList(res.data.ranking)
+              countPage = res.data.totalPage - pageNum
+              if (pageNum != 1) {
+                isLock = true
+              }
+            }
+          },
+          error(err) {
+            hideLoading(layerIndex)
+            toastMsg('網絡錯誤，請退出重進')
           }
-        }
+        })
+      },
+      error(err) {
+        hideLoading(layerIndex)
+        toastMsg('網絡錯誤，請退出重進')
       }
     })
   }
@@ -149,8 +144,8 @@ $(function () {
     translateFun();
     getData(pageNum);
     setTimeout(function () {
-            $('#body').show();
+      $('#body').show();
-        }, 300)
+    }, 300)
   }, 100)
   function translateFun() {
     var langReplace = window.lang.replace;
@@ -187,9 +182,3 @@ $(function () {
     }
   })
 })
-
-
-
-// function getMessage(key, value) {
-//   info[key] = value;
-// }