Merge branch 'liu-tuiguang' into test

# Conflicts: # public/appnew/index.html # public/resource/js/houseList.js

Merge branch 'liu-tuiguang' into test
0b26340c · agping · c4e68e4a · 1950b27d · 0b26340c · 0b26340c
Commit 0b26340c authored Nov 20, 2018 by agping
11 changed files
--- a/application/index/view/houses/houseList.html
+++ b/application/index/view/houses/houseList.html
@@ -487,7 +487,15 @@
                   生成推广链接
                </h4>
            </div>
+            
            <div class="modal-body modal-body-one">
+            	<div class="tuiguang-type">
+            	   <a href="javascript:;" class="btn btn-info">百度推广</a>
+                   <a href="javascript:;" class="btn btn-default">腾讯推广</a>
+                   <a href="javascript:;" class="btn btn-default">今日头条推广</a>
+                   <a href="javascript:;" class="btn btn-default">其他</a>
+            	</div>	
+            <br>
            <br>
            <br>
            <div>

--- a/public/app/dist/index.html
+++ b/public/app/dist/index.html
@@ -23,4 +23,4 @@
 				if(!doc.addEventListener) return;
 				win.addEventListener(resizeEvt, recalc, false);
 				doc.addEventListener('DOMContentLoaded', recalc, false);
-			})(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
+			})(document, window);</script><link href=./static/css/app.3e3d1cf8f1e7102ed3f9e0a87c7e2479.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.74698e64579a16bcf167.js></script><script type=text/javascript src=./static/js/app.561b182690cb8ed73774.js></script></body></html>
\ No newline at end of file
--- a/public/app/dist/static/css/app.404838a0fd049b0395f88adbf3d2bbb0.css
+++ b/public/app/dist/static/css/app.404838a0fd049b0395f88adbf3d2bbb0.css
--- a/public/app/dist/static/js/app.48c3c44ec668acd2d9fd.js
+++ b/public/app/dist/static/js/app.48c3c44ec668acd2d9fd.js
--- a/public/app/dist/static/js/app.561b182690cb8ed73774.js
+++ b/public/app/dist/static/js/app.561b182690cb8ed73774.js
--- a/public/app/js/detaila_tl.js
+++ b/public/app/js/detaila_tl.js
--- a/public/app/js/libs/vue-router.min.js
+++ b/public/app/js/libs/vue-router.min.js
--- a/public/app/js/libs/vue.min.js
+++ b/public/app/js/libs/vue.min.js
--- a/public/appnew/index.html
+++ b/public/appnew/index.html
--- a/public/appnew/src/components/shop/shopList.vue
+++ b/public/appnew/src/components/shop/shopList.vue
--- a/public/resource/js/houseList.js
+++ b/public/resource/js/houseList.js