Merge branch 'dev4.5.5' of http://127.0.0.1:8080/qmx/jy into dev4.5.5

src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/css/keyWord.css

@@ -2,13 +2,18 @@
   display: flex;
   align-items: center;
   justify-content: space-between;
+  margin-right: .2rem;
   height: 100%;
 }
+.group-filter-container .group-name {
+  max-width: 2rem;
+}
 .filter-text {
   margin-right: .16rem;
   font-size: .28rem;
   color: #5f5e64;
   line-height: .4rem;
+  white-space: nowrap;
 }
 .filter-button {
   display: flex;

src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/css/keyword-common.css

@@ -163,8 +163,8 @@
   display: flex;
   align-items: center;
   justify-content: space-between;
-  height: .98rem;
-  padding: 0 .32rem;
+  min-height: .98rem;
+  padding: .12rem .32rem;
 }
 
 /* 批量删除按钮 */
@@ -172,6 +172,7 @@
   padding: 0 .32rem;
   color: #2abed1;
   font-size: .28rem;
+  white-space: nowrap;
 }
 .batch-delete.h100 {
   display: flex;

src/jfw/modules/app/src/web/templates/vipsubscribe/keyWord.html

@@ -41,7 +41,7 @@
             <div class="group-filter-container">
                 <div class="filter-text">关键词组分类</div>
                 <div class="filter-button" @click="showFilterPicker(true)">
-                    <span>${ filter.groupName ? filter.groupName : '全部' }</span>
+                    <span class="group-name ellipsis">${ filter.groupName ? filter.groupName : '全部' }</span>
                     <van-icon name="play"></van-icon>
                 </div>
             </div>

src/jfw/modules/app/src/web/templates/vipsubscribe/manageWord.html

@@ -25,6 +25,8 @@
             font-size: .28rem;
             color: #171826;
             line-height: .4rem;
+            word-break: break-all;
+            max-width: 67%;
         }
         .j-key-card .j-key-card-right {
             display: flex;

src/web/staticres/vipsubscribe/css/keyWord.css

@@ -2,13 +2,18 @@
   display: flex;
   align-items: center;
   justify-content: space-between;
+  margin-right: .2rem;
   height: 100%;
 }
+.group-filter-container .group-name {
+  max-width: 2rem;
+}
 .filter-text {
   margin-right: .16rem;
   font-size: .28rem;
   color: #5f5e64;
   line-height: .4rem;
+  white-space: nowrap;
 }
 .filter-button {
   display: flex;

src/web/staticres/vipsubscribe/css/keyword-common.css

@@ -163,8 +163,8 @@
   display: flex;
   align-items: center;
   justify-content: space-between;
-  height: .98rem;
-  padding: 0 .32rem;
+  min-height: .98rem;
+  padding: .12rem .32rem;
 }
 
 /* 批量删除按钮 */
@@ -172,6 +172,7 @@
   padding: 0 .32rem;
   color: #2abed1;
   font-size: .28rem;
+  white-space: nowrap;
 }
 .batch-delete.h100 {
   display: flex;

src/web/templates/weixin/vipsubscribe/keyWord.html

@@ -34,7 +34,7 @@
             <div class="group-filter-container">
                 <div class="filter-text">关键词组分类</div>
                 <div class="filter-button" @click="showFilterPicker(true)">
-                    <span>${ filter.groupName ? filter.groupName : '全部' }</span>
+                    <span class="group-name ellipsis">${ filter.groupName ? filter.groupName : '全部' }</span>
                     <van-icon name="play"></van-icon>
                 </div>
             </div>

src/web/templates/weixin/vipsubscribe/manageWord.html

@@ -29,6 +29,8 @@
             font-size: .28rem;
             color: #171826;
             line-height: .4rem;
+            word-break: break-all;
+            max-width: 67%;
         }
         .j-key-card .j-key-card-right {
             display: flex;