Merge remote-tracking branch 'origin/master'

_src/components/chatMini/chatMini.scss

@@ -248,6 +248,7 @@ $offsetRight: 5px;
     text-align: center;
     padding: px2rem(30) 0;
     background: #FFF;
+    cursor: pointer;
   }
   .input-con{
     position: relative;

_src/components/chatRoom/chatRoom.scss

@@ -124,7 +124,7 @@
     font-size: 30px;
   }
   em{
-    font-size: 14px;
+    font-size: 12px;
     line-height: 24px;
     color: #999999;
   }

_src/components/chatSet/style.scss

@@ -68,7 +68,7 @@
   }
   .list-item{
     width: 40px;
-    margin: 0 16px 6px 0;
+    margin: 0 16px 3px 0;
   }
   .avatar{
     display: block;

_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

@@ -20,7 +20,7 @@
     ></div>
     <div class="content">
       <div class="metabar">
-        <span class="name" @contextmenu.prevent="onToolBtn($event,'username')">{{showName}}</span>
+        <span class="name" @contextmenu.prevent="onToolBtn($event,'username')">{{msgItem.ext_info && msgItem.ext_info.event_type}} {{showName}}</span>
         <span class="admin" v-if="creator == userId">
           <i class="icon-creator" v-if="type === 'me'"></i>
           {{$t('public.owner')}}

_src/components/msgItem/style.scss

@@ -139,6 +139,14 @@
           -webkit-background-size: 200% 100%;
           animation: bgp 5s infinite linear;
           opacity: 0.2;
+          font-size: 12px;
+        }
+        &.is-error{
+          &:before{
+            background: url('../../assets/icon-pic-error.png') center no-repeat;
+            animation: none;
+            opacity: 1;
+          }
         }
         &.is-hide{
           transform: scale(0);

_src/components/panel/panel.vue

@@ -95,7 +95,7 @@ export default {
   },
   computed: {
     avatarUrl () {
-      if (/^http/.test(this.userInfo.cover_photo)) return `${this.userInfo.cover_photo}?imageview/0/w/400`
+      if (/^http/.test(this.userInfo.cover_photo)) return `${this.userInfo.cover_photo}?imageview/0/w/180`
       else return this.userInfo.cover_photo
     },
     ...mapState({

_src/components/popup/invite/style.scss

@@ -79,9 +79,6 @@
     &.checked {
         background-color: #d7d7d7;
     }
-    img.user-avatar{
-       background: #cccccc; 
-    }
     .user-avatar {
         border-radius: 2px;
         margin-right: 12px;

_src/components/popup/otherInfo/index.vue

@@ -9,7 +9,7 @@
         <div class="modal-bd" v-if="userInfo">
           <div class="user-top">
             <div class="user-avatar">
-              <img v-if="userInfo.cover_photo" :src="userInfo.cover_photo" @click="$showImgPreview(userInfo.cover_photo)" alt="">
+              <img v-if="userInfo.cover_photo" :src="`${userInfo.cover_photo}?imageview/0/w/180`" @click="$showImgPreview(userInfo.cover_photo)" alt="">
               <div v-else class="user-avatar"
               :class="'avatar_bg' + userInfo.user_id % 9"
               :data-name="userInfo.nick_name.slice(0,2).toUpperCase()"

_src/components/popup/packetGet/index.vue

@@ -32,7 +32,7 @@
         <div class="money" v-if="quantity">
           {{formatNum(quantity)}} <em>{{openInfo.tokenType}}</em>
         </div>
-        <p class="state" v-if="quantity">{{$t('redPacket.transferTo')}}{{openInfo.type.toUpperCase()}}{{$t('redPacket.account')}}</p>
+        <p class="state" v-if="quantity">{{$t('redPacket.transferTo')}}</p>
         <p class="state-num">
           {{ $t('redPacket.tip4', { total: openInfo.num_total, num: openInfo.num_total - openInfo.num_left, unit: $t('redPacket.unit') }) }}
         </p>

_src/components/popup/packetSend/index.vue

@@ -20,8 +20,8 @@
                 <div class="unit">
                   <div class="cur-unit has-arrow">{{symbol}}</div>
                   <div class="code-menu">
-                    <div class="code-item" @click="changeSymbol('EOS')">EOS</div>
-                    <div class="code-item" @click="changeSymbol('MEETONE')">MEETONE</div>
+                    <div :class="['code-item',{'disabled':loginType!='eos'}]" @click="changeSymbol('EOS')" v-if="loginType=='eos'">EOS</div>
+                    <div :class="['code-item',{'disabled':loginType!='meetone'}]"  @click="changeSymbol('MEETONE')">MEETONE</div>
                     <div class="code-item" @click="changeSymbol(group.eosInfo.token)" v-if="group.eosInfo">{{group.eosInfo.token}}</div>
                   </div>
                 </div>
@@ -81,6 +81,8 @@ import backBar from '@/components/backBar'
 export default {
   name: 'packetSend',
   data () {
+    let loginType = getUserOpt('loginType') || 'eos'
+
     return {
       visible: true,
       helpShow: false,
@@ -88,7 +90,8 @@ export default {
       packetNum: 1,
       word: this.$t('redPacket.memo'),
       tips: '',
-      symbol: 'EOS', // 单位
+      loginType: loginType,
+      symbol: loginType.toUpperCase(), // 单位
       isLoading: false,
       isGameToken: false, // 是否为游戏代币
       meechatType: getMeechatType()// meechat版本
@@ -161,20 +164,22 @@ export default {
     },
     // 检测是否有发红包权限
     checkCanSend () {
-      let loginType = getUserOpt('loginType')
+      let loginType = this.loginType
+      let eosType = getUserOpt('eosType') || 'eos'
       let checksSymbol = this.symbol.toLowerCase()
-      let flag = true
 
+      // 判断登录
       if (loginType != 'eos' && loginType != 'meetone') {
-        flag = false
         Message({
           message: this.$t('redPacket.sendForEosTips'),
           type: 'error'
         })
+        return false
       }
 
+      // 判断绑定
       if (checksSymbol == 'eos' || checksSymbol == 'meetone') {
-        flag = this.userInfo.binds.some((item) => {
+        let flag = this.userInfo.binds.some((item) => {
           return item.type == checksSymbol && item.account
         })
 
@@ -183,10 +188,20 @@ export default {
             message: this.$t('redPacket.bindForEosTips', { 'type': checksSymbol }),
             type: 'error'
           })
+          return false
         }
       }
 
-      return flag
+      // 判断scatter现在身份和登录身份是否一致
+      if (loginType != eosType) {
+        Message({
+          message: '重新检查下scatter身份',
+          type: 'error'
+        })
+        return false
+      }
+
+      return true
     },
     async sendPacket () {
       if (!this.checkCanSend()) return

_src/components/popup/packetSend/style.scss

@@ -163,6 +163,10 @@
         &:hover{
           background-color: #e1e1e1;
         }
+        &.disabled{
+          background: #ececec;
+          cursor: no-drop;
+        }
       }
       &::after{
         content: '';

_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/group.js

@@ -355,14 +355,9 @@ export const groupInviteMixins = {
       switch (this.inviteType) {
         // 1建群/2邀请好友进群
         case 1:
-          await this.$store.dispatch('getFriendList')
-          this.checkList = this.friendList
-          break
         case 2:
           await this.$store.dispatch('getFriendList')
-          this.checkList = _.filter(this.friendList, item => {
-            return !this.members[item.user_id]
-          })
+          this.checkList = this.friendList
           break
         // 3删除群成员/4添加群管理/5转让群主
         case 3:
@@ -377,7 +372,17 @@ export const groupInviteMixins = {
         item.isChoosed = false
         item.isShow = true
 
-        // 群管理特殊处理
+        // 邀请好友进群-特殊处理
+        if (this.inviteType == 2) {
+          // 判断是否已经在群
+          let isInGroup = this.membersArray.some((n) => {
+            return n.user_id == item.user_id
+          })
+
+          return !isInGroup
+        }
+
+        // 群管理-特殊处理
         if (this.inviteType == 4 && item.is_admin == 1) {
           item.isChoosed = true
         }

_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/App.vue

@@ -4,14 +4,14 @@
       <router-view></router-view>
     </div>
     <div class="pub-nav" v-show="navShow">
-      <div :class="['nav-item',{'active':$route.name == 'discover'}]" @click="$router.replace('/discover')">
-        <i class="dis-icon"></i>
-        <span class="title">{{$t('h5.discover')}}</span>
-      </div>
       <div :class="['nav-item',{'active':$route.name == 'chatList'}]" @click="$router.replace('/')">
         <i class="chat-icon"></i>
         <span class="title">{{$t('h5.chat')}}</span>
       </div>
+      <div :class="['nav-item',{'active':$route.name == 'discover'}]" @click="$router.replace('/discover')">
+        <i class="dis-icon"></i>
+        <span class="title">{{$t('h5.discover')}}</span>
+      </div>
       <div :class="['nav-item',{'active':$route.name == 'aboutMe'}]" @click="$router.replace('/me')">
         <i class="me-icon"></i>
         <span class="title">{{$t('h5.mine')}}</span>

_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/h5/view/login.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="login-page">
+  <div class="login-page" v-loading="isLogining">
     <div class="logo">
       <p> Access a Better Web , Anywhere .</p>
       <!-- <el-button type="primary" class="login-btn" @click="handleLogin2">{{$t('login.accountLogin')}}</el-button> -->

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

_src/store/index.js

@@ -26,8 +26,7 @@ const getters = {
     }
   },
   muteList: state => {
-    console.log(chat.sessionList)
-    return []
+    return state.chat.sessionList.filter(item => item.is_mute == 1)
   }
 }
 

_src/store/module/group/actions.js

@@ -158,6 +158,14 @@ const actions = {
           let member = msg.data.data.userMap[n.from]
           commit('updateMembers', msg.data.data.userMap)
           if (!member) return
+
+          // 退群消息只能显示给管理员
+          if (n.msg_type == 5 && n.ext_info && n.ext_info.event_type == 'leave_group') {
+            if (!state.adminList.some(item => item == rootState.userId)) {
+              return
+            }
+          }
+
           dList.push({
             name: member ? member.nick_name : 'unknown',
             content: n.msg,
@@ -168,6 +176,7 @@ const actions = {
             type: n.from == state.userId ? 'me' : 'you',
             msg_type: n.msg_type,
             ext: n.ext ? n.ext : null,
+            ext_info: n.ext_info ? n.ext_info : null,
             isShowFullInfo: n.from != lastShowMsgUid
           })
 
@@ -274,6 +283,13 @@ const actions = {
       let member = state.members[n.from]
 
       if (!member) return
+      // 退群消息只能显示给管理员
+      if (n.msg_type == 5 && n.ext_info && n.ext_info.event_type == 'leave_group') {
+        if (!state.adminList.some(item => item == rootState.userId)) {
+          return
+        }
+      }
+
       // 显示信息
       list.push({
         name: member.nick_name || member.user_name || 'unknown',
@@ -542,17 +558,9 @@ const actions = {
           })
         }
 
-        if (data.type === 'leave') {
-          if (data.group_id != state.groupId) return // 不是本群信息-无响应
+        if (data.type === 'leave' && data.group_id == state.groupId) {
           if (data.user_info.user_id == rootState.userId) return // 本人-不走这个ws
 
-          // 退群仅通知管理员
-          // let isAdmin = state.adminList.some(item => { return item == rootState.userId })
-          // if (isAdmin) {
-          //   data.joinMsg = (data.user_info.nick_name || data.user_info.name) + '退出群组'
-          //   commit('addChatItem', data)
-          // }
-
           // 本人退出刷新群信息
           if (data.user_id == rootState.userId) {
             dispatch('getGroupInfo')
@@ -564,8 +572,7 @@ const actions = {
           }
         }
 
-        if (data.type === 'join') {
-          if (data.group_id != state.groupId) return
+        if (data.type === 'join' && data.group_id == state.groupId) {
           if (data.user_info.user_id == rootState.userId) return
 
           data.joinMsg = (data.user_info.nick_name || data.user_info.name) + '加入群组'
@@ -580,11 +587,11 @@ const actions = {
           // commit('addChatItem', data)
         }
 
-        if (data.type === 'pin_msg') {
+        if (data.type === 'pin_msg' && data.group_id == state.groupId) {
           commit('updateGroupPinMsg', data.pinMsg)
         }
 
-        if (data.type === 'unpin_msg') {
+        if (data.type === 'unpin_msg' && data.group_id == state.groupId) {
           commit('updateGroupPinMsg', null)
         }
 

_src/util/lang/en.js

@@ -91,7 +91,7 @@ const en = {
     expiredPacketTips: 'Packet is expired',
     open: 'open',
     seePacketDetail: 'See packet detail',
-    transferTo: 'Transfered to ',
+    transferTo: 'Transferred to the corresponding account',
     account: ' account',
     best: ' Best luck',
     received: 'already received',

_src/util/lang/zh.js

@@ -91,7 +91,7 @@ const zh = {
     expiredPacketTips: '该红包已经过期。',
     open: '開',
     seePacketDetail: '查看领取详情',
-    transferTo: '已转账到',
+    transferTo: '已转到相应账户',
     account: '账户',
     best: '手气最佳',
     received: '已领取',

_src/util/util.js

@@ -576,8 +576,6 @@ export function lazyloadImage ({ wrap, imageArr, derection = 'down' }) {
 
         if (top >= -100 && top < listClientHeight + 300) {
           if (originUrl && originUrl != url) {
-            item.setAttribute('src', originUrl)
-
             // 消息图片
             if (item.getAttribute('class').match('img-msg')) {
               if (!/^data:image/.test(originUrl)) {
@@ -585,8 +583,14 @@ export function lazyloadImage ({ wrap, imageArr, derection = 'down' }) {
                 img.src = originUrl
                 img.onload = () => {
                   item.nextSibling.classList.add('is-hide')
+                  item.setAttribute('src', originUrl)
+                }
+                img.onerror = () => {
+                  item.nextSibling.classList.add('is-error')
                 }
               }
+            } else {
+              item.setAttribute('src', originUrl)
             }
           }
         }

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>

protected/models/Account.php

@@ -199,7 +199,7 @@ class Account extends Model {
      * @return array
      * @throws Exception
      */
-    public static function verifyPlayer($account, $random, $token, $netId) {
+    public static function verifyPlayer($account, $random, $token, $netId = self::TYPE_EOS) {
         if (!$account) {
             throw new Exception('参数错误', CODE_PARAM_ERROR);
         }

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>

public/sw.js

@@ -1,4 +1,4 @@
-const CACHE_NAME = 'MeeChat_v1.3.3';
+const CACHE_NAME = 'MeeChat_v1.3.4';
 let urlsToCache = [];
 // let networkFirstList = ['', 'h5.html', 'mini.html'];
 let networkFirstList = [];