Merge branch '1130-v3.0.1' into test

0f922c7c · zw · 92b11951 · e0e9bd4c · 0f922c7c · 0f922c7c
Commit 0f922c7c authored Dec 10, 2018 by zw
6 changed files
--- 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.12344a9c35bd0edb3041ec77de794ca3.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.c6a55585eae0ec40fcb7.js></script></body></html>
\ No newline at end of file
+			})(document, window);</script><link href=./static/css/app.25142b5f14196db60cdac4fcb319a8e5.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.1fd02b6508900ade5c5e.js></script></body></html>
\ No newline at end of file
--- a/public/app/dist/static/css/app.12344a9c35bd0edb3041ec77de794ca3.css
+++ b/public/app/dist/static/css/app.12344a9c35bd0edb3041ec77de794ca3.css
--- a/public/app/dist/static/js/app.1fd02b6508900ade5c5e.js
+++ b/public/app/dist/static/js/app.1fd02b6508900ade5c5e.js
--- a/public/app/dist/static/js/app.c6a55585eae0ec40fcb7.js
+++ b/public/app/dist/static/js/app.c6a55585eae0ec40fcb7.js
--- a/public/appnew/src/components/shop/shopList.vue
+++ b/public/appnew/src/components/shop/shopList.vue
@@ -30,7 +30,7 @@
 				<section v-for="(item, index) in mainData" v-show="index === initTabNumMain">
 					    <ul>
 					    	<li class="main-sec-li" v-for="(item2, index2) in item.dataList" @click="toShopDetail(item2.id)">
-					    		<div class="shop-list-img shop-list">
+					    		<div class="shop-list-img shop-list flex-center">
 					    			<img-error :datasrc="selesctImg(item2)" :imgtype="'house'"></img-error>
 								</div>
 								<div class="shop-list-con shop-list">
@@ -683,7 +683,7 @@
    	float: left;
    }
    .main-sec-li .shop-list{
-    	height: 1.6rem;
+    	height: 1.7rem;
    }
    .shop-list>img{
    	height: 1.6rem;
@@ -707,7 +707,7 @@
 		display: -webkit-box;
 		-webkit-line-clamp: 2;
 		-webkit-box-orient: vertical;
-		margin-top: -.05rem;
+		/*margin-top: -.05rem;*/
 	}
 	.shop-list-con .shop-rent{
 		font-size: .20rem;
@@ -726,9 +726,11 @@
 		box-sizing: border-box;
 		border: 1px solid rgba(255, 186, 18,0.5);
 		border-radius: 2px;
+		float: left;
 	}
    .shop-list-top-three{
    	margin-top: .08rem;
+    	overflow: hidden;
    }
 	/*选择项样式*/
 	nav>.nav-main-choose {

--- a/public/appnew/src/components/shopSearch/shopSearchList.vue
+++ b/public/appnew/src/components/shopSearch/shopSearchList.vue
@@ -30,7 +30,7 @@
 				<pagination-load :canload="!item.isStop" :distance="10" @load="getList">
 				    <ul>
 				    	<li class="main-sec-li" v-for="(item2, index2) in item.dataList" @click="toShopDetail(item2.id)">
-				    		<div class="shop-list-img shop-list">
+				    		<div class="shop-list-img shop-list flex-center">
 				    			<img-error :datasrc="selesctImg(item2)" :imgtype="'house'"></img-error>
 							</div>
 							<div class="shop-list-con shop-list">
@@ -585,7 +585,7 @@
    	float: left;
    }
    .main-sec-li .shop-list{
-    	height: 1.6rem;
+    	height: 1.7rem;
    }
    .shop-list>img{
    	height: 1.6rem;
@@ -608,7 +608,6 @@
 		display: -webkit-box;
 		-webkit-line-clamp: 2;
 		-webkit-box-orient: vertical;
-		margin-top: -.05rem;
 	}
 	.shop-list-con .shop-rent{
 		font-size: .20rem;
@@ -627,9 +626,11 @@
 		box-sizing: border-box;
 		border: 1px solid rgba(255, 186, 18,0.5);
 		border-radius: 2px;
+		float: left;
 	}
    .shop-list-top-three{
    	margin-top: .08rem;
+    	overflow: hidden;
    }
 	/*选择项样式*/
 	nav>.nav-main-choose {