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

_src/components/popup/userInfo/index.vue

@@ -106,8 +106,8 @@ export default {
         this.isEditName = false
         return
       }
-      if (this.newNickName.length > 36) {
-        this.$showTips('用户呢称过长，请输入36个字符以内')
+      if (this.newNickName.length > 16) {
+        this.$showTips('用户呢称过长，请输入16个字符以内')
         return
       }
 
@@ -131,8 +131,8 @@ export default {
         this.isEditIntroduce = false
         return
       }
-      if (!/^[a-zA-Z_0-9]{5,36}$/i.test(this.newUserName)) {
-        this.$showTips('只能是5-20位的数字，字母下，划线')
+      if (!/^[a-zA-Z_0-9]{2,16}$/i.test(this.newUserName)) {
+        this.$showTips('只能是2-16位的数字，字母下，划线')
         return
       }
 

_src/mixins/chat.js

@@ -26,6 +26,8 @@ export const chatMixin = {
       if (lastVal && lastVal.msg_type == 4) {
         // 自己发的红包自动滚动到底部
         this.$nextTick(this.resizeToBottom)
+      } else if (this.isBottom) {
+        this.$nextTick(this.resizeToBottom)
       }
     },
     isJoinGroup (val) {

_src/pages/h5/view/chatRoom.vue

@@ -41,7 +41,7 @@
             <at-me :atList="atList" class="mini" @scrollToMsg="scrollToMsg"></at-me>
             <div class="msg-unread"
               @click="doSetRead"
-              v-if="unreadNums > 0 && enableScroll && !isBottom">
+              v-show="unreadNums > 0 && enableScroll && !isBottom">
               <em><i class="el-icon-d-arrow-right"></i>{{unreadNums}}条未读消息</em>
             </div>
           </div>

_src/pages/index/App.vue

@@ -38,7 +38,7 @@ export default {
   },
   data () {
     return {
-      pwa: getUrlParam('pwa') === '1'
+      pwa: getUrlParam('pwa') == '1'
     }
   },
   methods: {