Merge branch 'xiaoqin' into mergeBranch

src/components/newLayout/index.vue

@@ -56,7 +56,7 @@ export default {
         clearTimeout(this.timer)
       }
       this.timer = setTimeout(() => {
-        if (this.$refs.menu.$el.clientWidth < 1322 && Array.from(this.$refs.menu.$el.getElementsByTagName('li')).filter(item => item.className.indexOf('el-submenu') != -1).length > 8) {
+        if (this.$refs.menu.$el.clientWidth < 1206 && Array.from(this.$refs.menu.$el.getElementsByTagName('li')).filter(item => item.className.indexOf('el-submenu') != -1).length > 8) {
           this.marginTrue = true
         } else {
           this.marginTrue = false
@@ -68,7 +68,7 @@ export default {
     window.addEventListener('resize',this.debouned)
 
     this.$nextTick(() => {
-      if (this.$refs.menu.$el.clientWidth < 1322) {
+      if (this.$refs.menu.$el.clientWidth < 1206) {
         this.marginTrue = true
       } else {
         this.marginTrue = false

src/components/normal-basic-layout/details/modules/group/group.vue

@@ -32,7 +32,7 @@
     </div>
     <div class="flex-align-center" style="border-bottom:1px solid #f1f2f3;padding:0 10px">
       <p style="flex:1;padding:10px 0;color:#999">参与者</p>
-      <el-popover
+      <el-popover 
         placement="right"
         trigger="manual"
         v-model="visible"