Browse Source

Merge branch 'feature/0517' into develop

zhengxy 1 year ago
parent
commit
29bfeabe00

+ 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.8aba09abcddeecec5d5460ded8733484.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.54db302575019e5fa316.js></script><script type=text/javascript src=./static/js/app.0ce40c580a5762d8d1ef.js></script></body></html>
10
+      })();</script><link href=./static/css/app.ee1c215ff48c7b7b4462b8a19a8d3c30.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.052f5080d7bd63a8fe79.js></script><script type=text/javascript src=./static/js/app.a1f1157b50186347d0d3.js></script></body></html>

+ 7 - 1
project/src/components/customerAlerts/index.vue

@@ -1,6 +1,12 @@
1 1
 <template>
2 2
   <div v-loading="loading" class="customerAlerts-wrap">
3
-    <div class="screenBox">
3
+    <div class="self-hint">
4
+      <i class="el-icon-message-solid" />
5
+      <div>
6
+        <p>客服绑定投放账号近1小时内消耗金额小于300元时不予预警</p>
7
+      </div>
8
+    </div>
9
+    <div style="margin-top:10px;" class="screenBox">
4 10
       <el-button type="primary" size="mini" @click="onClickCreateWarnBtn">新建预警</el-button>
5 11
     </div>
6 12
     <el-table :height="height" :data="list" tooltip-effect="dark" style="width: 100%;margin-top:10px">

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


File diff suppressed because it is too large
+ 1 - 1
static/js/0.54edbb6ef6404ac0de87.js


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


File diff suppressed because it is too large
+ 352 - 0
static/js/app.a1f1157b50186347d0d3.js


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