Skip to content

T
tl_estate
Commit 73bea567 authored by zw's avatar zw
Browse files
Options

Merge branch '1109-v2.9.8' into test

parents ed5ba904 d7391e6b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 4 deletions
application/index/view/cell_phone/agentIndex.html
View file @ 73bea567
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
<span class="btn btn-default btn3 ld-Marheight" id="search">搜索</span> <span class="btn btn-default btn3 ld-Marheight" id="search">搜索</span>
<span class="btn btn-default btn3 ld-Marheight" id="reset">重置</span> <span class="btn btn-default btn3 ld-Marheight" id="reset">重置</span>
<span class="text-danger" style="float: right;margin-top: 15px;">注：此统计不包含当日通话统计</span>
</form> </form>
</td> </td>
</tr> </tr>
......
application/index/view/performance_ranking/performance_ranking.html
View file @ 73bea567
...@@ -254,7 +254,7 @@ ...@@ -254,7 +254,7 @@
<span class="title-time" id="table-time"></span> <span class="title-time" id="table-time"></span>
</div> </div>
<div style="max-height:6.97rem;;overflow-y:scroll"> <div style="height:6.97rem;;overflow-y:scroll">
<table class="table table-striped" data-toggle="table" data-height="460" style="max-width:500px;"> <table class="table table-striped" data-toggle="table" data-height="460" style="max-width:500px;">
<thead> <thead>
<tr> <tr>
...@@ -264,7 +264,9 @@ ...@@ -264,7 +264,9 @@
<th data-field="performance">排业绩（元）</th> <th data-field="performance">排业绩（元）</th>
</tr> </tr>
</thead> </thead>
<tbody id="tbody" ></tbody > <tbody id="tbody" >
</tbody >
</table> </table>
</div> </div>
</div> </div>
......
public/app/dist/index.html
View file @ 73bea567
...@@ -23,4 +23,4 @@ ...@@ -23,4 +23,4 @@
if(!doc.addEventListener) return; if(!doc.addEventListener) return;
win.addEventListener(resizeEvt, recalc, false); win.addEventListener(resizeEvt, recalc, false);
doc.addEventListener('DOMContentLoaded', recalc, false); doc.addEventListener('DOMContentLoaded', recalc, false);
})(document, window);</script><link href=./static/css/app.93f59333e744f9b3945451e05c22239f.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.94d51f6620cb57f6116c.js></script><script type=text/javascript src=./static/js/app.ffa0a90c4b77ff326107.js></script></body></html> })(document, window);</script><link href=./static/css/app.404838a0fd049b0395f88adbf3d2bbb0.css rel=stylesheet></head><body><div id=app></div><script src=https://cdn.bootcss.com/vue/2.5.16/vue.min.js></script><script src=https://cdn.bootcss.com/vue-router/3.0.1/vue-router.min.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.74698e64579a16bcf167.js></script><script type=text/javascript src=./static/js/app.48c3c44ec668acd2d9fd.js></script></body></html>
\ No newline at end of file \ No newline at end of file
public/app/dist/static/css/app.93f59333e744f9b3945451e05c22239f.css.map deleted 100644 → 0
View file @ ed5ba904
This source diff could not be displayed because it is too large. You can view the blob instead.
public/app/dist/static/js/app.48c3c44ec668acd2d9fd.js 0 → 100644
View file @ 73bea567
This source diff could not be displayed because it is too large. You can view the blob instead.
public/app/dist/static/js/app.ffa0a90c4b77ff326107.js deleted 100644 → 0
View file @ ed5ba904
This diff is collapsed.
public/app/dist/static/js/vendor.74698e64579a16bcf167.js 0 → 100644
View file @ 73bea567
This diff is collapsed.
public/appnew/build/webpack.base.conf.js
View file @ 73bea567
This diff is collapsed.
public/appnew/config/index.js
View file @ 73bea567
This diff is collapsed.
public/appnew/index.html
View file @ 73bea567
This diff is collapsed.
public/appnew/src/main.js
View file @ 73bea567
This diff is collapsed.
public/appnew/src/router/index.js
View file @ 73bea567
This diff is collapsed.
public/resource/js/performance_ranking.js
View file @ 73bea567
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment