Browse Source

Merge branch 'master' into develop

zhengxy 1 year ago
parent
commit
f323cd5d2e

+ 1 - 1
index.html

@@ -7,4 +7,4 @@
7 7
         hm.src = "https://hm.baidu.com/hm.js?d61b9e2caf4d46ccda7471b5385e2333";
8 8
         var s = document.getElementsByTagName("script")[0];
9 9
         s.parentNode.insertBefore(hm, s);
10
-      })();</script><link href=./static/css/app.ea66c1585b50c7016d41028855fd3857.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.78f106f56087407fe0c3.js></script><script type=text/javascript src=./static/js/app.b234f718f1dc03d7dab1.js></script></body></html>
10
+      })();</script><link href=./static/css/app.7b1ad95606c72a6ca9162e20150a9c96.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.ddc29762a5a51999e868.js></script><script type=text/javascript src=./static/js/app.b234f718f1dc03d7dab1.js></script></body></html>

+ 23 - 1
project/src/components/customManage/manage.vue

@@ -51,6 +51,9 @@
51 51
         <el-button type="primary" plain size="mini" @click="init(1,'export')">导出Excel</el-button>
52 52
       </div>
53 53
     </div>
54
+
55
+    <div v-if="tips" class="tips-wrap"><i class="el-icon-user-solid" />包含客服:{{ tips }}</div>
56
+
54 57
     <!-- table -->
55 58
     <el-table ref="multipleTable" :height='height' :data="tableData" tooltip-effect="dark" style="width: 100%" @selection-change="handleSelectionChange" @select-all="handleSelectAll">
56 59
       <el-table-column type="selection" :selectable="checkSelectable" width="55" align="center"></el-table-column>
@@ -218,7 +221,8 @@ export default {
218 221
       tagVisible: false,
219 222
       tagType: 1,
220 223
       gender: '',
221
-      height: ''
224
+      height: '',
225
+      tips: '',
222 226
     }
223 227
   },
224 228
   created () {
@@ -492,6 +496,7 @@ export default {
492 496
             this.total = res.rst.pageInfo.total;
493 497
             this.pages = res.rst.pageInfo.pages;
494 498
 
499
+            this.tips = res.rst.extra || ''
495 500
             // 回显选择
496 501
             let page_multiple_data = [];
497 502
             if (this.isAll && (this.multipleSelection[this.page] === undefined)) {
@@ -630,4 +635,21 @@ export default {
630 635
 </script>
631 636
 <style lang="scss" scoped>
632 637
 @import "@/style/list.scss";
638
+.tips-wrap {
639
+  background-color: #fff;
640
+  margin-bottom: 5px;
641
+  margin-top: 5px;
642
+  padding: 5px 15px;
643
+  display: flex;
644
+  align-items: flex-start;
645
+  font-size: 13px;
646
+  color: #666;
647
+  line-height: 16px;
648
+  i {
649
+    font-size: 14px;
650
+    font-weight: 600;
651
+    margin-right: 4px;
652
+    margin-top: 1px;
653
+  }
654
+}
633 655
 </style>

File diff suppressed because it is too large
+ 1 - 0
static/css/app.7b1ad95606c72a6ca9162e20150a9c96.css


File diff suppressed because it is too large
+ 0 - 1
static/css/app.ea66c1585b50c7016d41028855fd3857.css


File diff suppressed because it is too large
+ 1 - 0
static/js/30.21b2172df055de8fcf32.js


File diff suppressed because it is too large
+ 0 - 1
static/js/30.6d2976c60a4a9aae7f81.js


File diff suppressed because it is too large
+ 1 - 1
static/js/manifest.78f106f56087407fe0c3.js