洪海涛 8 jaren geleden
bovenliggende
commit
ab8a382b18

+ 4 - 0
www/webapp/o2o/css/ratchetOverloading.css

@@ -93,4 +93,8 @@
 
 .btn {
 	border-radius: 0 !important;
+}
+/*双十一*/
+#activitiesScroll img{
+	/*float: left;*/
 }

File diff suppressed because it is too large
+ 0 - 0
www/webapp/o2o/dist/js/build/template.js


File diff suppressed because it is too large
+ 0 - 0
www/webapp/o2o/dist/js/main.js


File diff suppressed because it is too large
+ 0 - 1
www/webapp/o2o/js/build/template.js


+ 13 - 13
www/webapp/o2o/tpl/activities/day.html

@@ -12,34 +12,34 @@
 			<div class="box-container box box-vertical" style="background: #fff">
 				<img style="width: 100%;" src="http://odulvej8l.bkt.clouddn.com/%E5%8F%8C%E5%8D%81%E4%B8%801-%E7%AC%AC%E4%B8%80%E9%83%A8%E5%88%86.jpg" alt="">
 				<!--下单-->
-				<span style="position: relative;margin-top: -0.22rem;margin-bottom: -0.22rem;">
+				<!--<span style="position: relative;margin-top: -0.22rem;margin-bottom: -0.22rem;">-->
 					<img style="width: 100%;" src="http://odulvej8l.bkt.clouddn.com/%E5%8F%8C%E5%8D%81%E4%B8%801.jpg" alt="">
 					<span style="    width: 32.7%;
     padding-bottom: 10.5%;
     position: absolute;
     left: 35.6%;
-    top: 0;" class="btn-appliances" data-product-type="9" ></span>
-				</span>
+    <!--top: 0;" class="btn-appliances" data-product-type="9" ></span>-->
+				<!--</span>-->
 				<img style="width: 100%;" src="http://odulvej8l.bkt.clouddn.com/%E5%8F%8C%E5%8D%81%E4%B8%803-%E7%AC%AC%E4%BA%8C%E9%83%A8%E5%88%86.jpg" alt="">
 				<!--优惠券-->
-				<div style="position: relative;margin-top: -0.22rem;margin-bottom: -0.22rem;">
+				<!--<div style="position: relative;margin-top: -0.22rem;margin-bottom: -0.22rem;">-->
 					<img style="width: 100%;" src="http://odulvej8l.bkt.clouddn.com/%E5%8F%8C%E5%8D%81%E4%B8%802.jpg" alt="">
 					<div style="    width: 32.7%;
     padding-bottom: 10.5%;
     position: absolute;
     left: 35.6%;
-    top: 0;" class="btn-banner-coupon"></div>
-				</div>
+    <!--top: 0;" class="btn-banner-coupon"></div>-->
+				<!--</div>-->
 				<img style="width: 100%;" src="http://odulvej8l.bkt.clouddn.com/%E5%8F%8C%E5%8D%81%E4%B8%805-%E7%AC%AC%E4%B8%89%E9%83%A8%E5%88%86.jpg" alt="">
 				<!--充值卡-->
-				<div style="position: relative;margin-top: -0.22rem;margin-bottom: -0.22rem;">
+				<!--<div style="position: relative;margin-top: -0.22rem;margin-bottom: -0.22rem;">-->
 					<img style="width: 100%;" src="http://odulvej8l.bkt.clouddn.com/%E5%8F%8C%E5%8D%81%E4%B8%803.jpg" alt="">
-					<div style="    width: 32.7%;
-    padding-bottom: 10.5%;
-    position: absolute;
-    left: 35.6%;
-    top: 0;" class="btn-banner-recharge"></div>
-				</div>
+					<!--<div style="    width: 32.7%;-->
+    <!--padding-bottom: 10.5%;-->
+    <!--position: absolute;-->
+    <!--left: 35.6%;-->
+    <!--&lt;!&ndash;top: 0;" class="btn-banner-recharge"></div>&ndash;&gt;-->
+				<!--</div>-->
 				<img style="width: 100%;" src="http://odulvej8l.bkt.clouddn.com/%E5%8F%8C%E5%8D%81%E4%B8%807-%E7%AC%AC%E5%9B%9B%E9%83%A8%E5%88%86.jpg" alt="">
 			</div>
 		</div>

Some files were not shown because too many files changed in this diff