Skip to content

T
tl_estate
Commit 1a35dda9 authored by zw's avatar zw
Browse files
Options

Merge branch '0213-v3.0.7' of https://gitee.com/zwyjjc/tl_estate into 0213-v3.0.7

parents 5e42330e cccd0d9d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
application/api/controller/Banner.php
View file @ 1a35dda9
...@@ -46,7 +46,7 @@ class Banner extends Basic ...@@ -46,7 +46,7 @@ class Banner extends Basic
$where_["type"] = array("in",[2,3]); $where_["type"] = array("in",[2,3]);
} }
$field = "id,title,CONCAT('".CK_IMG_URL."' , pic_path) as pic_path, url, type,sort,is_show,create_time,update_time"; $field = "id,title,CONCAT('".CK_IMG_URL.'images/'."' , pic_path) as pic_path, url, type,sort,is_show,create_time,update_time";
$where_['is_show'] = array( "eq", 0 ); $where_['is_show'] = array( "eq", 0 );
......
application/index/view/houses/houseList.html
View file @ 1a35dda9
...@@ -235,7 +235,7 @@ ...@@ -235,7 +235,7 @@
<div class="pull-right"> <div class="pull-right">
<ul class="bread_btn"> <ul class="bread_btn">
<li> <li>
<a href="/admin.php/index/houseAdd" data-toggle="modal" class="btn btn-default"><i class="icon-plus"></i>新增商铺</a> <a href="/admin.php/index/houseAdd" class="btn btn-default"><i class="icon-plus"></i>新增商铺</a>
</li> </li>
</ul> </ul>
</div> </div>
......
public/app/dist/index.html
View file @ 1a35dda9
...@@ -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.49e7068bb37112ab84a6f844f9088bbe.css rel=stylesheet></head><body><div id=app></div><script src=https://api.tonglianjituan.com/app/js/libs/vue.min.js></script><script src=https://api.tonglianjituan.com/app/js/libs/vue-router.min.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.1b35a927314506fe4a4f.js></script><script type=text/javascript src=./static/js/app.f54574412330d2feee20.js></script></body></html> })(document, window);</script><link href=./static/css/app.8e7a1294243657c878b001aee61ce09a.css rel=stylesheet></head><body><div id=app></div><script src=https://api.tonglianjituan.com/app/js/libs/vue.min.js></script><script src=https://api.tonglianjituan.com/app/js/libs/vue-router.min.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.1b35a927314506fe4a4f.js></script><script type=text/javascript src=./static/js/app.b438912f1795b396e5e3.js></script></body></html>
\ No newline at end of file \ No newline at end of file
public/app/dist/static/js/app.b438912f1795b396e5e3.js 0 → 100644
View file @ 1a35dda9
This source diff could not be displayed because it is too large. You can view the blob instead.
public/app/dist/static/js/app.f54574412330d2feee20.js deleted 100644 → 0
View file @ 5e42330e
This source diff could not be displayed because it is too large. You can view the blob instead.
public/resource/js/banner.js
View file @ 1a35dda9
This diff is collapsed.
public/resource/js/schoolBusinessNew.js
View file @ 1a35dda9
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