baichun 5 anos atrás
pai
commit
69a5ae3fbd
53 arquivos alterados com 24 adições e 16 exclusões
  1. 1 1
      _src/components/hotGame/hotGame.scss
  2. 2 2
      _src/components/hotGroup/hotGroup.scss
  3. 1 1
      _src/mixins/login.js
  4. 0 4
      _src/pages/h5/main.js
  5. 0 4
      _src/pages/index/main.js
  6. 0 0
      dist/css/chunk-1e6a2ebb.0237fd7e.css
  7. 1 1
      dist/css/chunk-2e7e4d8a.fd3b7528.css
  8. 0 0
      dist/css/chunk-vendors.1a0a44a6.css
  9. 0 0
      dist/css/pc.654ee091.css
  10. 0 0
      dist/css/pc.af7ff679.css
  11. 4 1
      dist/h5.html
  12. 0 0
      dist/js/chunk-074cda02.a1defa4e.js
  13. 0 0
      dist/js/chunk-0a2f1101.fdcfbbea.js
  14. 0 0
      dist/js/chunk-1a710e5c.fa2449ef.js
  15. 0 0
      dist/js/chunk-1e6a2ebb.9bd77157.js
  16. 0 0
      dist/js/chunk-20f2b187.3c55d4fe.js
  17. 0 0
      dist/js/chunk-2781551f.de25be0b.js
  18. 0 0
      dist/js/chunk-2e7e4d8a.ff228f6d.js
  19. 0 0
      dist/js/chunk-3028e170.138f0608.js
  20. 0 0
      dist/js/chunk-335f5c5d.15593bbb.js
  21. 0 0
      dist/js/chunk-38822a98.58e2f06d.js
  22. 0 0
      dist/js/chunk-42e7d288.2604ca45.js
  23. 0 0
      dist/js/chunk-451c71fa.b70f0b9e.js
  24. 0 0
      dist/js/chunk-5aae9c76.9370a913.js
  25. 0 0
      dist/js/chunk-6c13bb44.7556948b.js
  26. 0 0
      dist/js/chunk-6e987cd2.647666b0.js
  27. 0 0
      dist/js/chunk-6f498702.decc4a3a.js
  28. 0 0
      dist/js/chunk-70ed3fb8.b7f0cce9.js
  29. 0 0
      dist/js/chunk-72b48984.ea81ef05.js
  30. 0 0
      dist/js/chunk-79914fca.f8f91c33.js
  31. 0 0
      dist/js/chunk-7bbde94a.076b712f.js
  32. 0 0
      dist/js/chunk-7d4da030.4cd03299.js
  33. 0 0
      dist/js/chunk-90cf752e.8f112681.js
  34. 0 0
      dist/js/chunk-a7081a9a.7c5b1470.js
  35. 0 0
      dist/js/chunk-acbed89a.3bbd4811.js
  36. 0 0
      dist/js/chunk-c173b1d8.2c2c3940.js
  37. 0 0
      dist/js/chunk-common.52e4b008.js
  38. 0 0
      dist/js/chunk-d3efe52c.b10b4a2e.js
  39. 0 0
      dist/js/chunk-e59b4412.74e42ce3.js
  40. 0 0
      dist/js/chunk-f0006e14.0e830021.js
  41. 0 0
      dist/js/chunk-vendors.e280fd66.js
  42. 0 0
      dist/js/h5.aac643e6.js
  43. 0 0
      dist/js/h5.f186ecc9.js
  44. 0 0
      dist/js/mini.a99c3a00.js
  45. 0 0
      dist/js/pc.aae04995.js
  46. 0 0
      dist/js/pc.ee01f15b.js
  47. 4 0
      dist/pc.html
  48. 0 0
      dist/sw.js
  49. 0 0
      mini.html
  50. 3 1
      protected/views/h5.html
  51. 0 0
      protected/views/pc.html
  52. 4 1
      public/h5.html
  53. 4 0
      public/pc.html

+ 1 - 1
_src/components/hotGame/hotGame.scss

@@ -33,7 +33,7 @@
 
 .game-title{
     color: #666;
-    font-size: px2rem(33);
+    font-size: px2rem(24);
     text-align: center;
     line-height: px2rem(60);
     @include ellipsis();

+ 2 - 2
_src/components/hotGroup/hotGroup.scss

@@ -240,10 +240,10 @@
         position: absolute;
         top: 50%;
         right: 0;
-				margin-top: px2rem(-30);
+		margin-top: px2rem(-30);
         width: px2rem(120);
         height: px2rem(56);
         padding: 0;
-        font-size: px2rem(16);
+        // font-size: px2rem(16);
     }
 }

+ 1 - 1
_src/mixins/login.js

@@ -169,7 +169,7 @@ export const accountLoginMixin = {
                 if (typeof e == 'string') {
                   err = JSON.parse(e)
                 }
-                if (err.code == '500') showError(e)
+                if (err.code == '500') showError(e.error && e.error.what)
                 this.$store.commit('setAccount', '')
                 await (ScatterJS.scatter && ScatterJS.scatter.forgetIdentity && ScatterJS.scatter.forgetIdentity())
               }

+ 0 - 4
_src/pages/h5/main.js

@@ -39,7 +39,3 @@ new Vue({
   i18n,
   store
 }).$mount('#app')
-
-if (!(navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i))) {
-  location.replace('/pc.html' + location.search + location.hash)
-}

+ 0 - 4
_src/pages/index/main.js

@@ -43,7 +43,3 @@ new Vue({
   i18n,
   router: pcRouter
 }).$mount('#app')
-
-if ((navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i))) {
-  location.replace('/h5.html' + location.search + location.hash)
-}

Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/css/chunk-1e6a2ebb.0237fd7e.css


+ 1 - 1
dist/css/chunk-2e7e4d8a.1657fb5f.css → dist/css/chunk-2e7e4d8a.fd3b7528.css

@@ -1 +1 @@
-.list-game[data-v-0201ee5e]{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;margin:0 -1.57867rem 0 .512rem}.game-item[data-v-0201ee5e]{width:2.56rem;margin:0 1.57867rem .34133rem 0}.game-item a[data-v-0201ee5e]{display:block;text-decoration:none}.game-item a[data-v-0201ee5e]:hover{text-decoration:none}.game-cover[data-v-0201ee5e]{height:2.56rem;border-radius:.128rem;overflow:hidden}.game-cover img[data-v-0201ee5e]{width:100%;height:100%;-o-object-fit:cover;object-fit:cover}.game-cover .user-avatar[data-v-0201ee5e]{width:100%;height:100%}.game-title[data-v-0201ee5e]{color:#666;font-size:.704rem;text-align:center;line-height:1.28rem;white-space:nowrap;overflow:hidden;-ms-text-overflow:ellipsis;text-overflow:ellipsis}.dis-box[data-v-8108a15c]{background:#fff;overflow:hidden;margin-bottom:.448rem;border-bottom:1px solid #d8d8d8}.dis-box.box-game .box-bd[data-v-8108a15c]{padding-top:.512rem}.box-hd[data-v-8108a15c]{color:#333;font-size:.704rem;text-align:center;line-height:1.856rem;border-bottom:1px solid #eee}
+.list-game[data-v-0201ee5e]{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;margin:0 -1.57867rem 0 .512rem}.game-item[data-v-0201ee5e]{width:2.56rem;margin:0 1.57867rem .34133rem 0}.game-item a[data-v-0201ee5e]{display:block;text-decoration:none}.game-item a[data-v-0201ee5e]:hover{text-decoration:none}.game-cover[data-v-0201ee5e]{height:2.56rem;border-radius:.128rem;overflow:hidden}.game-cover img[data-v-0201ee5e]{width:100%;height:100%;-o-object-fit:cover;object-fit:cover}.game-cover .user-avatar[data-v-0201ee5e]{width:100%;height:100%}.game-title[data-v-0201ee5e]{color:#666;font-size:.512rem;text-align:center;line-height:1.28rem;white-space:nowrap;overflow:hidden;-ms-text-overflow:ellipsis;text-overflow:ellipsis}.dis-box[data-v-8108a15c]{background:#fff;overflow:hidden;margin-bottom:.448rem;border-bottom:1px solid #d8d8d8}.dis-box.box-game .box-bd[data-v-8108a15c]{padding-top:.512rem}.box-hd[data-v-8108a15c]{color:#333;font-size:.704rem;text-align:center;line-height:1.856rem;border-bottom:1px solid #eee}

+ 0 - 0
dist/css/chunk-vendors.cb2042b6.css → dist/css/chunk-vendors.1a0a44a6.css


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/css/pc.654ee091.css


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/css/pc.af7ff679.css


+ 4 - 1
dist/h5.html

@@ -13,7 +13,10 @@
     <meta name="msapplication-TileColor" content="#2d2f34">
     <meta name="theme-color" content="#2d2f34">
     <link rel=apple-touch-icon href="/dist/img/icons/meechat.png?imageview/0/w/152?v=1.1.2">
-
+    <script>
+    if (!(navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i))) {
+      location.replace('/pc.html' + location.search + location.hash)
+    }</script>
     <script>!function(d,a){var e=d.documentElement,c="orientationchange"in window?"orientationchange":"resize",v=function(){
       var f=e.clientWidth;
       var p=20*(f/320)

+ 0 - 0
dist/js/chunk-074cda02.70b6fbdf.js → dist/js/chunk-074cda02.a1defa4e.js


+ 0 - 0
dist/js/chunk-0a2f1101.041e91ed.js → dist/js/chunk-0a2f1101.fdcfbbea.js


+ 0 - 0
dist/js/chunk-1a710e5c.b09dc525.js → dist/js/chunk-1a710e5c.fa2449ef.js


+ 0 - 0
dist/js/chunk-1e6a2ebb.9c2ca618.js → dist/js/chunk-1e6a2ebb.9bd77157.js


+ 0 - 0
dist/js/chunk-20f2b187.d06d8656.js → dist/js/chunk-20f2b187.3c55d4fe.js


+ 0 - 0
dist/js/chunk-2781551f.b86afb62.js → dist/js/chunk-2781551f.de25be0b.js


+ 0 - 0
dist/js/chunk-2e7e4d8a.7b62cb7e.js → dist/js/chunk-2e7e4d8a.ff228f6d.js


+ 0 - 0
dist/js/chunk-3028e170.7db37633.js → dist/js/chunk-3028e170.138f0608.js


+ 0 - 0
dist/js/chunk-335f5c5d.9e2ee217.js → dist/js/chunk-335f5c5d.15593bbb.js


+ 0 - 0
dist/js/chunk-38822a98.7159a091.js → dist/js/chunk-38822a98.58e2f06d.js


+ 0 - 0
dist/js/chunk-42e7d288.8fb60370.js → dist/js/chunk-42e7d288.2604ca45.js


+ 0 - 0
dist/js/chunk-451c71fa.19520f89.js → dist/js/chunk-451c71fa.b70f0b9e.js


+ 0 - 0
dist/js/chunk-5aae9c76.8cd46626.js → dist/js/chunk-5aae9c76.9370a913.js


+ 0 - 0
dist/js/chunk-6c13bb44.67daf247.js → dist/js/chunk-6c13bb44.7556948b.js


+ 0 - 0
dist/js/chunk-6e987cd2.254e4856.js → dist/js/chunk-6e987cd2.647666b0.js


+ 0 - 0
dist/js/chunk-6f498702.a914e820.js → dist/js/chunk-6f498702.decc4a3a.js


+ 0 - 0
dist/js/chunk-70ed3fb8.3c6b9959.js → dist/js/chunk-70ed3fb8.b7f0cce9.js


+ 0 - 0
dist/js/chunk-72b48984.521180cc.js → dist/js/chunk-72b48984.ea81ef05.js


+ 0 - 0
dist/js/chunk-79914fca.146e699d.js → dist/js/chunk-79914fca.f8f91c33.js


+ 0 - 0
dist/js/chunk-7bbde94a.20df49e4.js → dist/js/chunk-7bbde94a.076b712f.js


+ 0 - 0
dist/js/chunk-7d4da030.40b77165.js → dist/js/chunk-7d4da030.4cd03299.js


+ 0 - 0
dist/js/chunk-90cf752e.016c7cb6.js → dist/js/chunk-90cf752e.8f112681.js


+ 0 - 0
dist/js/chunk-a7081a9a.e54b4eb2.js → dist/js/chunk-a7081a9a.7c5b1470.js


+ 0 - 0
dist/js/chunk-acbed89a.eb8fdd84.js → dist/js/chunk-acbed89a.3bbd4811.js


+ 0 - 0
dist/js/chunk-c173b1d8.956779a9.js → dist/js/chunk-c173b1d8.2c2c3940.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/chunk-common.52e4b008.js


+ 0 - 0
dist/js/chunk-d3efe52c.709cbecd.js → dist/js/chunk-d3efe52c.b10b4a2e.js


+ 0 - 0
dist/js/chunk-e59b4412.d85bb218.js → dist/js/chunk-e59b4412.74e42ce3.js


+ 0 - 0
dist/js/chunk-f0006e14.a53e0511.js → dist/js/chunk-f0006e14.0e830021.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/chunk-vendors.e280fd66.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/h5.aac643e6.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/h5.f186ecc9.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/mini.a99c3a00.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/pc.aae04995.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/js/pc.ee01f15b.js


+ 4 - 0
dist/pc.html

@@ -20,6 +20,10 @@
     <meta name="msapplication-TileImage" content="<%= BASE_URL %>img/icons/meechat.png?imageview/0/w/144?v=1.0">
     <meta name="msapplication-TileColor" content="#2d2f34">
     <meta name="theme-color" content="#2d2f34">
+    <script>
+    if ((navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i))) {
+  location.replace('/h5.html' + location.search + location.hash)
+}</script>
 </head>
 <body>
 <div id="app"></div>

Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/sw.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
mini.html


Diferenças do arquivo suprimidas por serem muito extensas
+ 3 - 1
protected/views/h5.html


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
protected/views/pc.html


+ 4 - 1
public/h5.html

@@ -13,7 +13,10 @@
     <meta name="msapplication-TileColor" content="#2d2f34">
     <meta name="theme-color" content="#2d2f34">
     <link rel=apple-touch-icon href="/dist/img/icons/meechat.png?imageview/0/w/152?v=1.1.2">
-
+    <script>
+    if (!(navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i))) {
+      location.replace('/pc.html' + location.search + location.hash)
+    }</script>
     <script>!function(d,a){var e=d.documentElement,c="orientationchange"in window?"orientationchange":"resize",v=function(){
       var f=e.clientWidth;
       var p=20*(f/320)

+ 4 - 0
public/pc.html

@@ -20,6 +20,10 @@
     <meta name="msapplication-TileImage" content="<%= BASE_URL %>img/icons/meechat.png?imageview/0/w/144?v=1.0">
     <meta name="msapplication-TileColor" content="#2d2f34">
     <meta name="theme-color" content="#2d2f34">
+    <script>
+    if ((navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i))) {
+  location.replace('/h5.html' + location.search + location.hash)
+}</script>
 </head>
 <body>
 <div id="app"></div>

Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff