Merge branch 'feature/9月迭代' of http://git.gicdev.com/memberTag/memberTag-web

src/components/tag/tag-config-options.vue

@@ -788,8 +788,12 @@
                 <el-option
                   v-for="agreement in parent.options"
                   :key="agreement.agreementId"
-                  :label="agreement.agreementName"
+                   :label="agreement.agreementName"
                   :value="agreement.agreementId">
+                  <div>
+                    <p class="agreement-name">{{agreement.agreementName}}</p>
+                    <p class="create-time">{{agreement.createTime|formatDate}}</p>
+                  </div>
                 </el-option>
               </el-select>
           </div>
@@ -1459,11 +1463,7 @@ export default {
         .post(`${this.baseUrl}/api-admin/list-service-privacy-agreement`, qs.stringify(para))
         .then(res => {
           if (res.data.errorCode === 0) {
-            const data = res.data.result;
-            data.forEach((el, index) => {
-              el.agreementName = `${el.agreementName} （${moment(el.createTime).format('MM-DD hh:mm')}）`;
-            });
-            this.tag025.options = [].concat(data);
+            this.tag025.options = [].concat(res.data.result||[]);
           }
         })
         .catch(err => {
@@ -2081,6 +2081,9 @@ export default {
       }
       return '';
     },
+    formatDate(date) {
+      return moment(date).format('YYYY-MM-DD hh:mm:ss');
+    }
   }
 };
 </script>
@@ -2265,7 +2268,7 @@ export default {
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
-    max-width: 120px;
+    max-width: 130px;
     display: inline-block;
   }
   .el-tag__close.el-icon-close{
@@ -2275,6 +2278,28 @@ export default {
 </style>
 <style>
 .tag025-scrollbar{
-    width: 370px;
+  width: 260px;
+}
+.tag025-scrollbar .el-select-dropdown__wrap{
+  max-height: 300px;
 }
+/* .tag025-scrollbar .el-select-dropdown__list{
+  max-height: 300px;
+  overflow-y: scroll;
+ } */
+.tag025-scrollbar .el-select-dropdown__item{
+  height:56px;
+  padding-top: 9px;
+ }
+.tag025-scrollbar .el-select-dropdown__item .agreement-name{
+  margin-bottom: 2px;
+  font-size: 14px;
+  font-weight: 400;
+  line-height: 20px;
+ }
+.tag025-scrollbar .el-select-dropdown__item .create-time{
+  font-size: 12px;
+  font-weight: 300;
+  line-height: 17px;
+ }
 </style>

src/view/memberGroup/edit-tag.vue

@@ -138,7 +138,7 @@ export default {
   }
   .tag-config-options {
     max-height: 50vh;
-    overflow-y: scroll;
+    overflow-y: auto;
   }
   .tag-value {
     margin-top: 10px;