合并分支 'dev' 到 'master'

Dev



查看合并请求 !183

components/modules/menuBox/menuClass/imageText.vue

@@ -52,12 +52,14 @@ export default {
     },
     },
     getpreview(e) {
     getpreview(e) {
       if (e.target.tagName === 'IMG') {
       if (e.target.tagName === 'IMG') {
+        setTimeout(() => {
         this.$refs.showImg.forEach(item => {
         this.$refs.showImg.forEach(item => {
           if (item.firstChild ? item.firstChild.src === e.target.src : false) {
           if (item.firstChild ? item.firstChild.src === e.target.src : false) {
             item.firstChild.click()
             item.firstChild.click()
           }
           }
         })
         })
-      }
+      }, 100)
+    }
     }
     }
   }
   }
 };
 };

components/modules/menuBox/menuClass/invite/index.vue

@@ -255,6 +255,11 @@ export default {
           width: calc(100% - 0.16rem);
           width: calc(100% - 0.16rem);
           margin: 0.08rem;
           margin: 0.08rem;
           font-size: 0.13rem;
           font-size: 0.13rem;
+          // line-height: 0.2rem;
+          height: 0.16rem;
+          display: flex;
+          align-items: center;
+          justify-content: center;
           color: var(--chatBox-text-color);
           color: var(--chatBox-text-color);
           word-break: break-all;
           word-break: break-all;
           font-weight: 800;
           font-weight: 800;

components/modules/playerBox/watch-state.vue

 <template>
 <template>
   <div class="watch-state" v-if="liveNowStatus">
   <div class="watch-state" v-if="liveNowStatus">
      <span :class="`type ${liveNowStatus.class}`" :style="{maxWidth: afterStatus ? '375px' : 0, transform: afterStatus ? '' : 'translateX(20px)' , opacity: afterStatus ? 1 : 0}">
      <span :class="`type ${liveNowStatus.class}`" :style="{maxWidth: afterStatus ? '375px' : 0, transform: afterStatus ? '' : 'translateX(20px)' , opacity: afterStatus ? 1 : 0}">
-       {{ afterStatus ? liveNowStatus.name: '' }}
+       <div class="state">{{ afterStatus ? liveNowStatus.name: '' }}</div>
        <div class="icon-box" v-if="afterStatus && liveNowStatus.icon">
        <div class="icon-box" v-if="afterStatus && liveNowStatus.icon">
           <div class="loader">
           <div class="loader">
             <div class="line"></div>
             <div class="line"></div>
@@ -98,6 +98,12 @@ export default {
      white-space:nowrap;
      white-space:nowrap;
      height: .2rem;
      height: .2rem;
      transform: scale(0.9);
      transform: scale(0.9);
+     .state {
+       height: 100%;
+       display: flex;
+       justify-content: center;
+       align-items: center;
+     }
      .icon-box {
      .icon-box {
        margin: 0 0.03rem;
        margin: 0 0.03rem;
        display: inline-block;
        display: inline-block;

package.json

 {
 {
   "name": "ssr-program-live",
   "name": "ssr-program-live",
-  "version": "1.5.2", 
+  "version": "1.5.3", 
   "description": "My superb Nuxt.js project",
   "description": "My superb Nuxt.js project",
   "author": "1006903445@qq.com",
   "author": "1006903445@qq.com",
   "private": true,
   "private": true,