洪海涛 8 vuotta sitten
vanhempi
sitoutus
9ba032b43d

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

@@ -53,6 +53,7 @@
 	margin-bottom:10px;
 	margin-bottom:10px;
 	position: relative;
 	position: relative;
 	border-bottom: 1px solid rgb(142, 160, 160)!important;
 	border-bottom: 1px solid rgb(142, 160, 160)!important;
+	padding-bottom: 0.5rem;
 }
 }
 
 
 .btn-add-recharge span {
 .btn-add-recharge span {

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
www/webapp/o2o/dist/js/build/template.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
www/webapp/o2o/dist/js/main.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
www/webapp/o2o/dist/js/page/home.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 1
www/webapp/o2o/js/build/template.js


+ 10 - 10
www/webapp/o2o/js/page/home.js

@@ -183,16 +183,16 @@ define(['$', 'template', 'IScroll', 'product', 'user', 'native', 'config', 'addr
 			 }, $view);  */
 			 }, $view);  */
 
 
 			// 双十一活动
 			// 双十一活动
-			// $.newTouch('.btn-home-day', function (event) {
-			// 	event.preventDefault();
-			// 	$doc.trigger('spa:navigate', {
-			// 		hash: 'activity-day',
-			// 		pushData: {
-			// 			needReset: true
-			// 		}
-			// 	});
-			// }, $view);
-			// 民宿保洁
+			$.newTouch('.btn-home-day', function (event) {
+				event.preventDefault();
+				$doc.trigger('spa:navigate', {
+					hash: 'activity-day',
+					pushData: {
+						needReset: true
+					}
+				});
+			}, $view);
+			//民宿保洁
 			$.newTouch('.btn-homestay', function (event) {
 			$.newTouch('.btn-homestay', function (event) {
 				event.preventDefault();
 				event.preventDefault();
 				$doc.trigger('spa:navigate', {
 				$doc.trigger('spa:navigate', {

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

@@ -15,10 +15,10 @@
 					<div class="box-container">
 					<div class="box-container">
 						<div class="box-container box box-vertical" style="background: #fff">
 						<div class="box-container box box-vertical" style="background: #fff">
 							<img style="width: 100%;"
 							<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"
+							     src="http://odulvej8l.bkt.clouddn.com/1114%E8%AF%A6%E6%83%85%E9%A1%B5_01.jpg"
 							     alt="">
 							     alt="">
 							<!--下单-->
 							<!--下单-->
-							<div style="position: relative;">
+							<!--<div style="position: relative;">
 							<img style="width: 100%;" src="http://odulvej8l.bkt.clouddn.com/%E7%82%B9%E5%87%BB%E6%8A%A2%E8%B4%AD.jpg"
 							<img style="width: 100%;" src="http://odulvej8l.bkt.clouddn.com/%E7%82%B9%E5%87%BB%E6%8A%A2%E8%B4%AD.jpg"
 							     alt="">
 							     alt="">
 							<div style="
 							<div style="
@@ -30,11 +30,11 @@
 							</div>
 							</div>
 							<img style="width: 100%;"
 							<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"
 							     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="">
+							     alt="">-->
 							<!--优惠券-->
 							<!--优惠券-->
 							<div style="position: relative;">
 							<div style="position: relative;">
 								<img style="width: 100%;"
 								<img style="width: 100%;"
-								     src="http://odulvej8l.bkt.clouddn.com/%E7%82%B9%E5%87%BB%E9%A2%86%E5%8F%96.jpg" alt="">
+								     src="http://odulvej8l.bkt.clouddn.com/1114%E8%AF%A6%E6%83%85%E9%A1%B5_02.jpg" alt="">
 								<div style="    width: 32.7%;
 								<div style="    width: 32.7%;
     padding-bottom: 10.5%;
     padding-bottom: 10.5%;
     position: absolute;
     position: absolute;
@@ -42,12 +42,12 @@
     top: 0;" class="btn-banner-coupon"></div>
     top: 0;" class="btn-banner-coupon"></div>
 							</div>
 							</div>
 							<img style="width: 100%;"
 							<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"
+							     src="http://odulvej8l.bkt.clouddn.com/1114%E8%AF%A6%E6%83%85%E9%A1%B5_03.jpg"
 							     alt="">
 							     alt="">
 							<!--充值卡-->
 							<!--充值卡-->
 							<div style="position: relative;">
 							<div style="position: relative;">
 								<img style="width: 100%;"
 								<img style="width: 100%;"
-								     src="http://odulvej8l.bkt.clouddn.com/%E7%82%B9%E5%87%BB%E6%9F%A5%E7%9C%8B.jpg" alt="">
+								     src="http://odulvej8l.bkt.clouddn.com/1114%E8%AF%A6%E6%83%85%E9%A1%B5_04.gif" alt="">
 								<div style="    width: 32.7%;
 								<div style="    width: 32.7%;
 							padding-bottom: 10.5%;
 							padding-bottom: 10.5%;
 							position: absolute;
 							position: absolute;
@@ -55,7 +55,7 @@
 							top: 0;" class="btn-banner-recharge"></div>
 							top: 0;" class="btn-banner-recharge"></div>
 							</div>
 							</div>
 							<img style="width: 100%;"
 							<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"
+							     src="http://odulvej8l.bkt.clouddn.com/1114%E8%AF%A6%E6%83%85%E9%A1%B5_05.gif"
 							     alt="">
 							     alt="">
 						</div>
 						</div>
 					</div>
 					</div>

+ 2 - 2
www/webapp/o2o/tpl/recharge/index.html

@@ -9,8 +9,8 @@
 <div class="content">
 <div class="content">
     <div class="box-container box box-vertical">
     <div class="box-container box box-vertical">
         <div id="rechargeScroll" class="scroll-container box-flex-1">
         <div id="rechargeScroll" class="scroll-container box-flex-1">
-            <img src="http://odulvej8l.bkt.clouddn.com/1101%E5%85%85%E5%80%BC%E5%8D%A1.jpg" style="width: 100%;">
-            <ul class="table-view list-content list-recharge" style="padding-top: 5px;padding-bottom: 5px">
+            <img src="http://odulvej8l.bkt.clouddn.com/1101%E5%85%85%E5%80%BC%E5%8D%A1.jpg" style="width: 100%;display: block;">
+            <ul class="list-content list-recharge" style="padding-top: 5px;padding-bottom: 5px">
                 {{include './cell'}}
                 {{include './cell'}}
             </ul>
             </ul>
         </div>
         </div>

Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä