Эх сурвалжийг харах

Merge branch 'master' into xqc_1027

bding 1 сар өмнө
parent
commit
fb771e44c3

+ 2 - 3
src/views/rai_manage/cygxManage/components/lableDlg.vue

@@ -11,7 +11,7 @@
           添加活动
         </div>
       </div>
-      <div class="text-content" v-else>{{ visibleText }}</div>
+      <div class="text-content" v-else v-html="visibleText"></div>
       <span slot="footer" class="dialog-footer">
         <template v-if="dataRegular.TagType == 1">
           <el-button @click="handleClose">取 消</el-button>
@@ -58,7 +58,7 @@ export default {
           : this.dataRegular.TagType == 4
           ? "所有问答系列音频"
           : this.dataRegular.TagType == 5
-          ? "医药-趋势观察 ,科技-产业跟踪 ,智造-产业跟踪 ,消费-月度调研,策略-每日复盘,固收-债市复盘"
+          ? "医药-趋势观察 ,科技-产业跟踪 ,智造-产业跟踪 ,消费-月度调研,策略-每日复盘<br/>固收-债市复盘,消费-产业跟踪"
           : "";
       return str;
     },
@@ -165,7 +165,6 @@ export default {
 .lable-add-content {
   .text-content {
     width: 620px;
-    height: 40px;
     line-height: 40px;
     border-radius: 4px;
     border: 1px solid #dcdfe6;