Merge branch 'master' of http://svn.ouj.com:3000/eos_sicbo/chat

_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();

_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);
     }
 }

_src/components/msgItem/index.vue

@@ -209,7 +209,7 @@ export default {
       }
     },
     avatarUrl () {
-      let membersCover = this.members[this.userId] && `${this.members[this.userId].cover_photo}?imageview/0/w/180`
+      let membersCover = this.members[this.userId] && this.members[this.userId].cover_photo
 
       return membersCover || this.avatar || ''
     },

_src/components/popup/userInfo/index.vue

@@ -9,7 +9,7 @@
         <div class="modal-bd" v-if="userInfo">
           <div class="user-top">
             <div class="user-avatar" @click="$editUserAvatar(userInfo.cover_photo)">
-              <img v-if="userInfo.cover_photo" :src="userInfo.cover_photo" alt="">
+              <img v-if="avatarUrl" :src="avatarUrl" alt="">
               <div v-else class="user-avatar"
               :class="'avatar_bg' + userInfo.user_id % 9"
               :data-name="userInfo.nick_name.slice(0,2).toUpperCase()"
@@ -87,7 +87,11 @@ export default {
     ...mapState({
       scatter: state => state.scatter,
       userInfo: state => state.userInfo
-    })
+    }),
+    avatarUrl () {
+      if (/^http/.test(this.userInfo.cover_photo)) return `${this.userInfo.cover_photo}?imageview/0/w/180`
+      else return this.userInfo.cover_photo
+    }
   },
   methods: {
     // 账号显示与隐藏

_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())
               }

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

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

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}

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)

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>

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)

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>