Skip to content

T
tl_estate
Commit 45345fa7 authored by agping's avatar agping
Browse files
Options

Merge branch 'test-liuyinping' into 1109-v2.9.8

# Conflicts: # public/app/dist/index.html # public/app/dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
parents 662d024a 41ffd0bd
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 4 deletions
application/app/view/index/share_detail.html
View file @ 45345fa7
...@@ -255,6 +255,9 @@ ...@@ -255,6 +255,9 @@
</div> </div>
<a href="javascript:;" id="fix_area_bottom_btn"><img src="/app/images/xq_cha@2x.png" /></a> <a href="javascript:;" id="fix_area_bottom_btn"><img src="/app/images/xq_cha@2x.png" /></a>
</div> </div>
<div class="shop-list">
<img src="/app/images/img_more@2x.png" alt="" />
</div>
<!--<script src="/app/js/jquery.js"></script>--> <!--<script src="/app/js/jquery.js"></script>-->
<script src="/app/js/jquery-1122-min.js" charset="UTF-8"></script> <script src="/app/js/jquery-1122-min.js" charset="UTF-8"></script>
......
application/index/view/marchin/marchin_list.html
View file @ 45345fa7
...@@ -81,7 +81,8 @@ ...@@ -81,7 +81,8 @@
<th class="text-center">客户电话</th> <th class="text-center">客户电话</th>
<th class="text-center">进场时间</th> <th class="text-center">进场时间</th>
<th class="text-center">报备人</th> <th class="text-center">报备人</th>
<th class="text-center">商铺</th> <th class="text-center">商铺地址与进场地址的距离</th>
<th class="text-center">进场图片</th>
<th class="text-center">操作</th> <th class="text-center">操作</th>
</tr> </tr>
</thead> </thead>
......
public/app/css/details_tl.css
View file @ 45345fa7
...@@ -439,5 +439,15 @@ body{ ...@@ -439,5 +439,15 @@ body{
text-overflow: ellipsis; text-overflow: ellipsis;
margin-top: 0.16rem; margin-top: 0.16rem;
} }
.shop-list{
position: fixed;
right: .2rem;
bottom: 2rem;
height: 1.6rem;
width: 1.6rem;
display: none;
}
.shop-list img{
width: 1.6rem;
}
public/app/dist/index.html
View file @ 45345fa7
...@@ -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><script type=text/javascript src=./vconsole.min.js></script><script type=text/javascript>if(~location.origin.indexOf('api.tonglianjituan.com')){console.log('正式服')}else{var vConsole=new VConsole()};</script><link href=./static/css/app.578a3bb4e4e27f1bef4abc1dae3024e3.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.63621f4c4d057efe84b1.js></script></body></html> })(document, window);</script><script type=text/javascript src=./vconsole.min.js></script><script type=text/javascript>if(~location.origin.indexOf('api.tonglianjituan.com')){console.log('正式服')}else{var vConsole=new VConsole()};</script><link href=./static/css/app.3587c660835de2f176ec7b2d40bc12ab.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.ce543403b48a84fafbaf.js></script></body></html>
\ No newline at end of file \ No newline at end of file
public/app/dist/static/css/app.3587c660835de2f176ec7b2d40bc12ab.css.map 0 → 100644
View file @ 45345fa7
This source diff could not be displayed because it is too large. You can view the blob instead.
public/app/dist/static/js/app.ce543403b48a84fafbaf.js 0 → 100644
View file @ 45345fa7
This source diff could not be displayed because it is too large. You can view the blob instead.
public/app/dist/static/js/app.ce543403b48a84fafbaf.js.map 0 → 100644
View file @ 45345fa7
This source diff could not be displayed because it is too large. You can view the blob instead.
public/app/images/img_more@2x.png 0 → 100644
View file @ 45345fa7
This diff is collapsed.
public/app/js/detaila_tl.js
View file @ 45345fa7
This diff is collapsed.
public/appnew/src/components/shopSearch/images/icon_down02@2x.png 0 → 100644
View file @ 45345fa7
This diff is collapsed.
public/appnew/src/components/shopSearch/images/icon_down@2x.png 0 → 100644
View file @ 45345fa7
This diff is collapsed.
public/appnew/src/components/shopSearch/images/icon_search@2x.png 0 → 100644
View file @ 45345fa7
This diff is collapsed.
public/appnew/src/components/shopSearch/shopSearchList.vue 0 → 100644
View file @ 45345fa7
This diff is collapsed.
public/appnew/src/router/index.js
View file @ 45345fa7
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