Browse Source

Merge remote-tracking branch 'origin/master'

wgl 4 years ago
parent
commit
ba60de241d

+ 1 - 1
src/assets/css/xpgj.css

@@ -125,7 +125,7 @@
 	display: flex;
 	margin-bottom:10px
 }
-.vongi-shop-img{
+.vongi-shop-img img{
 	width:100%;
 	object-fit: cover;
 }

+ 2 - 9
src/projects/business/views/Master/Home.vue

@@ -100,21 +100,14 @@
 				<div class="vongi-index-inter flew-sp">
 					<div class="mui-col-xs-12">
 						<ul class="mui-table-view mui-grid-view mui-grid-9 vongi-floor-padded">
-							<li class="mui-table-view-cell mui-media mui-col-xs-4">
+							<li class="mui-table-view-cell mui-media mui-col-xs-6">
 								<a href="javascript:void(0)">
 									<div class="vongi-shop-img"><img src="~$project/assets/img/01.png" width="100%" /></div>
 									<div class="mui-media-body">老人防丢手环</div>
 									<div class="mui-media-body color-yellow">¥299.0</div>
 								</a>
 							</li>
-							<li class="mui-table-view-cell mui-media mui-col-xs-4">
-								<a href="javascript:void(0)">
-									<div class="vongi-shop-img"><img src="~$project/assets/img/01.png" width="100%" /></div>
-									<div class="mui-media-body">老人防丢手环</div>
-									<div class="mui-media-body color-yellow">¥299.0</div>
-								</a>
-							</li>
-							<li class="mui-table-view-cell mui-media mui-col-xs-4">
+							<li class="mui-table-view-cell mui-media mui-col-xs-6">
 								<a href="javascript:void(0)">
 									<div class="vongi-shop-img"><img src="~$project/assets/img/01.png" width="100%" /></div>
 									<div class="mui-media-body">老人防丢手环</div>

+ 1 - 1
src/projects/pension/views/Master/Home.vue

@@ -100,7 +100,7 @@
 				<div class="vongi-index-inter flew-sp">
 					<div class="mui-col-xs-12">
 						<ul class="mui-table-view mui-grid-view mui-grid-9 vongi-floor-padded">
-							<li class="mui-table-view-cell mui-media mui-col-xs-4">
+							<li class="mui-table-view-cell mui-media mui-col-xs-6">
 								<a  @click="toPay()" >
 									<div class="vongi-shop-img"><img src="http://oss.xiaoxinda.com/smart/person/2020/10/18172509063.png" width="100%" /></div>
 									<div class="mui-media-body">老人智能安全监控手表</div>