e 8 年之前
父節點
當前提交
7f9bde6514

+ 2 - 1
www/protected/modules/moonclub/controllers/ReserveController.php

@@ -128,7 +128,8 @@ class ReserveController extends MoonClubBaseController
             }
             }
             $data[$key]['num'] = $reserve->num;
             $data[$key]['num'] = $reserve->num;
 
 
-            if (emtpy($reserve->homeType)) {
+
+            if($reserve->homeType == ''){
                 $data[$key]['homeType'] = '未选择套餐';
                 $data[$key]['homeType'] = '未选择套餐';
             } else {
             } else {
                 $data[$key]['homeType'] = $reserve->homeType;
                 $data[$key]['homeType'] = $reserve->homeType;

+ 2 - 2
www/protected/modules/moonclub/views/web/index.php

@@ -17,7 +17,7 @@
     <?php //echo Yii::app()->request->baseUrl; ?><!--/webapp/moonclub/dist/css/main.css?v=-->
     <?php //echo Yii::app()->request->baseUrl; ?><!--/webapp/moonclub/dist/css/main.css?v=-->
     <?php //echo time();?><!--">-->
     <?php //echo time();?><!--">-->
     <link rel="stylesheet"
     <link rel="stylesheet"
-          href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/moonclub/dist/css/main.css?v=2017011013">
+          href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/moonclub/dist/css/main.css?v=2017011018">
     <link href="<?php echo Yii::app()->request->baseUrl; ?>/css/common_o2o/swiper.css" rel="stylesheet">
     <link href="<?php echo Yii::app()->request->baseUrl; ?>/css/common_o2o/swiper.css" rel="stylesheet">
     <script src="<?php echo Yii::app()->request->baseUrl; ?>/js/o2o/swiper.min.js"></script>
     <script src="<?php echo Yii::app()->request->baseUrl; ?>/js/o2o/swiper.min.js"></script>
     <style>
     <style>
@@ -81,7 +81,7 @@
         }
         }
         var debug = false;
         var debug = false;
 //    var main = '<?php //echo Yii::app()->request->baseUrl;?>///webapp/moonclub/dist/js/main.js?v=20160960804';
 //    var main = '<?php //echo Yii::app()->request->baseUrl;?>///webapp/moonclub/dist/js/main.js?v=20160960804';
-        var main = '<?php echo Yii::app()->request->baseUrl;?>/webapp/moonclub/dist/js/main.js?v=2017011013';
+        var main = '<?php echo Yii::app()->request->baseUrl;?>/webapp/moonclub/dist/js/main.js?v=2017011018';
         if (debug) {
         if (debug) {
             main = '<?php echo Yii::app()->request->baseUrl;?>/webapp/moonclub/js/main.js?v=' + (new Date()).getTime();
             main = '<?php echo Yii::app()->request->baseUrl;?>/webapp/moonclub/js/main.js?v=' + (new Date()).getTime();
             document.getElementById('debugMain').src = '<?php echo Yii::app()->request->baseUrl; ?>/webapp/common/js/debuggap.js';
             document.getElementById('debugMain').src = '<?php echo Yii::app()->request->baseUrl; ?>/webapp/common/js/debuggap.js';

文件差異過大導致無法顯示
+ 0 - 0
www/webapp/moonclub/dist/js/build/template.js


文件差異過大導致無法顯示
+ 0 - 0
www/webapp/moonclub/dist/js/main.js


文件差異過大導致無法顯示
+ 0 - 0
www/webapp/moonclub/js/build/template.js


+ 2 - 2
www/webapp/moonclub/tpl/home/index.html

@@ -19,14 +19,14 @@
 						<div class="swiper-container">
 						<div class="swiper-container">
 							<div class="swiper-wrapper">
 							<div class="swiper-wrapper">
 								<div class="swiper-slide btn-banner-recharge">
 								<div class="swiper-slide btn-banner-recharge">
-									<img class="lazy" src="http://odulvej8l.bkt.clouddn.com/banner.jpg" alt="">
+									<img class="lazy" src="http://odulvej8l.bkt.clouddn.com/banner-01-10.jpg" alt="">
 								</div>
 								</div>
 							</div>
 							</div>
 							<div class="pagination"></div>
 							<div class="pagination"></div>
 						</div>
 						</div>
 
 
 						<div class="box">
 						<div class="box">
-							<img style="width: 100%;" src="http://odulvej8l.bkt.clouddn.com/40456740739231372%28BAT%29.jpg" alt="">
+							<img style="width: 100%;" src="http://odulvej8l.bkt.clouddn.com/home-%E5%A5%97%E9%A4%90%E5%9B%BE.jpg" alt="">
 							<div class="box-package">
 							<div class="box-package">
 								<div class="month-one"></div>
 								<div class="month-one"></div>
 								<div class="month-two"></div>
 								<div class="month-two"></div>

+ 1 - 1
www/webapp/moonclub/tpl/month/four.html

@@ -13,7 +13,7 @@
 			<div id="monthFourScroll" class="scroll-container box-flex-1" style="background: #7f6b8e;">
 			<div id="monthFourScroll" class="scroll-container box-flex-1" style="background: #7f6b8e;">
 				<div class="scroller">
 				<div class="scroller">
 					<img
 					<img
-						src="http://odulvej8l.bkt.clouddn.com/52%E5%A4%A9%E5%8E%8B%E7%BC%A9.jpg"
+						src="http://odulvej8l.bkt.clouddn.com/52%E5%A4%A9%E8%87%B3%E5%B0%8A.jpg"
 						style="width: 100%;">
 						style="width: 100%;">
 				</div>
 				</div>
 				<div class="request"><div class="appointment">预约</div><div class="im">咨询</div></div>
 				<div class="request"><div class="appointment">预约</div><div class="im">咨询</div></div>

+ 1 - 1
www/webapp/moonclub/tpl/month/one.html

@@ -13,7 +13,7 @@
 			<div id="monthOneScroll" class="scroll-container box-flex-1" style="background: #7f6b8e;">
 			<div id="monthOneScroll" class="scroll-container box-flex-1" style="background: #7f6b8e;">
 				<div class="scroller">
 				<div class="scroller">
 					<img
 					<img
-						src="http://odulvej8l.bkt.clouddn.com/26%E5%A4%A9%E8%87%B3%E6%83%A0%E5%8E%8B%E7%BC%A9.jpg"
+						src="http://odulvej8l.bkt.clouddn.com/26%E5%A4%A9%E8%87%B3%E6%83%A0.jpg"
 						style="width: 100%;">
 						style="width: 100%;">
 				</div>
 				</div>
 				<div class="request"><div class="appointment">预约</div><div class="im">咨询</div></div>
 				<div class="request"><div class="appointment">预约</div><div class="im">咨询</div></div>

+ 1 - 1
www/webapp/moonclub/tpl/month/three.html

@@ -13,7 +13,7 @@
 			<div id="monthThreeScroll" class="scroll-container box-flex-1" style="background: #7f6b8e;">
 			<div id="monthThreeScroll" class="scroll-container box-flex-1" style="background: #7f6b8e;">
 				<div class="scroller">
 				<div class="scroller">
 					<img
 					<img
-						src="http://odulvej8l.bkt.clouddn.com/42%E5%A4%A9%E5%8E%8B%E7%BC%A9.jpg"
+						src="http://odulvej8l.bkt.clouddn.com/42%E5%A4%A9%E8%87%B3%E4%BA%AB.jpg"
 						style="width: 100%;">
 						style="width: 100%;">
 				</div>
 				</div>
 				<div class="request"><div class="appointment">预约</div><div class="im">咨询</div></div>
 				<div class="request"><div class="appointment">预约</div><div class="im">咨询</div></div>

+ 1 - 1
www/webapp/moonclub/tpl/month/two.html

@@ -13,7 +13,7 @@
 			<div id="monthTwoScroll" class="scroll-container box-flex-1" style="background:#7f6b8e;">
 			<div id="monthTwoScroll" class="scroll-container box-flex-1" style="background:#7f6b8e;">
 				<div class="scroller">
 				<div class="scroller">
 					<img
 					<img
-						src="http://odulvej8l.bkt.clouddn.com/26%E5%A4%A9-%E8%87%B3%E6%82%A6%E5%8E%8B%E7%BC%A9.jpg"
+						src="http://odulvej8l.bkt.clouddn.com/26%E5%A4%A9-%E8%87%B3%E6%82%A6-01.jpg"
 						style="width: 100%;">
 						style="width: 100%;">
 				</div>
 				</div>
 				<div class="request"><div class="appointment">预约</div><div class="im">咨询</div></div>
 				<div class="request"><div class="appointment">预约</div><div class="im">咨询</div></div>

部分文件因文件數量過多而無法顯示