2

www/protected/modules/moonclub/views/web/index.php

@@ -11,22 +11,22 @@
     <meta http-equiv="Pragma" content="no-cache">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <link rel="stylesheet"
-          href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/framework/ratchet-2.0.2/dist/css/ratchet.min.css?v=201702131">
+          href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/framework/ratchet-2.0.2/dist/css/ratchet.min.css?v=201702132">
     <link rel="stylesheet"
-          href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/framework/ratchet-2.0.2/dist/css/ratchet-theme-ios.min.css?v=201702131">
+          href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/framework/ratchet-2.0.2/dist/css/ratchet-theme-ios.min.css?v=201702132">
     <!--  <link rel="stylesheet" href="-->
     <?php //echo Yii::app()->request->baseUrl; ?><!--/webapp/moonclub/dist/css/main.css?v=-->
     <?php //echo time();?><!--">-->
     <link rel="stylesheet"
-          href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/moonclub/dist/css/main.css?v=201702131">
-    <link href="<?php echo Yii::app()->request->baseUrl; ?>/css/common_o2o/swiper.css?v=201702131" rel="stylesheet">
-    <script src="<?php echo Yii::app()->request->baseUrl; ?>/js/o2o/swiper.min.js?v=201702131"></script>
-    <script src="<?php echo Yii::app()->request->baseUrl; ?>/webapp/framework/iscroll5/iscroll-probe.js?v=201702131"></script>
+          href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/moonclub/dist/css/main.css?v=201702132">
+    <link href="<?php echo Yii::app()->request->baseUrl; ?>/css/common_o2o/swiper.css?v=201702132" rel="stylesheet">
+    <script src="<?php echo Yii::app()->request->baseUrl; ?>/js/o2o/swiper.min.js?v=201702132"></script>
+    <script src="<?php echo Yii::app()->request->baseUrl; ?>/webapp/framework/iscroll5/iscroll-probe.js?v=201702132"></script>
     <style>
         html{height:100%}body{position:relative;margin:0;padding:0;width:100%;height:100%;overflow:hidden}.spa-fullscreen{position:absolute;left:0;top:0;margin:0;padding:0;width:100%;visibility:hidden;overflow:hidden;z-index:-1}.spa-page{position:absolute;left:0;top:0;bottom:0;right:0;margin:0;padding:0;overflow:hidden;z-index:2000;-webkit-transform:translateZ(0);-webkit-backface-visibility:hidden;-webkit-transform-style:preserve-3d}.spa-page-bg{position:absolute;left:0;top:0;bottom:0;right:0;margin:0;padding:0}.spa-page-body{position:absolute;left:0;top:0;bottom:0;right:0;margin:0;padding:0;overflow:hidden;-webkit-transform:translateZ(0);-webkit-backface-visibility:hidden;-webkit-transform-style:preserve-3d}.spa-scroll{overflow:auto}.spa-scroll-touch{-webkit-overflow-scrolling:touch}.spa-scroll-x{overflow-y:hidden}.spa-scroll-y{overflow-x:hidden}.spa-cover{display:none;position:absolute;left:0;right:0;top:0;bottom:0;text-align:center;z-index:5000}.spa-loader{position:absolute;left:0;right:0;top:0;bottom:0;text-align:center;overflow:hidden;z-index:5001}.loading{position:absolute;width:70%;height:100%;left:15%;background:rgba(255,255,255,0.21);z-index:99}.loading p{position:fixed;left:50%;top:50%;-webkit-transform:translate(-50%,-50%);text-align:center;color:#222;font-size:.8rem}.loading .process{position:absolute;top:45%;left:50%;-webkit-transform:translate(-50%,-50%);width:90%;height:10px;border-radius:10px;border:1px solid #ccc;background:rgba(255,255,255,0.34);overflow:hidden}.loading .process .cs{background:rgba(78,26,66,0.79);width:0;height:100%;animation:myfirst 4s infinite;-moz-animation:myfirst 4s infinite;-webkit-animation:myfirst 4s infinite;-o-animation:myfirst 4s infinite}@keyframes myfirst{0%{width:0}100%{width:100%}}
     </style>
-    <script type="text/javascript" src="https://dn-bughd-web.qbox.me/bughd.min.js?v=201702131" crossOrigin="anonymous"></script>
-    <script src="//cdn.bootcss.com/iScroll/5.2.0/iscroll-probe.min.js?v=201702131"></script>
+    <script type="text/javascript" src="https://dn-bughd-web.qbox.me/bughd.min.js?v=201702132" crossOrigin="anonymous"></script>
+    <script src="//cdn.bootcss.com/iScroll/5.2.0/iscroll-probe.min.js?v=201702132"></script>
     <script type="text/javascript">
         window.bughd = window.bughd || function () {
             };
@@ -84,7 +84,7 @@
         }
         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=201702131';
+        var main = '<?php echo Yii::app()->request->baseUrl;?>/webapp/moonclub/dist/js/main.js?v=201702132';
         if (debug) {
             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';

www/protected/modules/o2o/views/web/index.php

@@ -13,7 +13,7 @@
         href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/framework/ratchet-2.0.2/dist/css/ratchet.min.css">
   <link rel="stylesheet"
         href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/framework/ratchet-2.0.2/dist/css/ratchet-theme-ios.min.css">
-  <link rel="stylesheet" href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/o2o/dist/css/main.css?v=2016032401">
+  <link rel="stylesheet" href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/o2o/dist/css/main.css?v=20170213">
     <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>
   <style>
@@ -79,7 +79,7 @@
       location.hash = '';
     }
     var debug = false;
-    var main = '<?php echo Yii::app()->request->baseUrl;?>/webapp/o2o/dist/js/main.js?v=20160960804';
+    var main = '<?php echo Yii::app()->request->baseUrl;?>/webapp/o2o/dist/js/main.js?v=20170213';
     if (debug) {
       main = '<?php echo Yii::app()->request->baseUrl;?>/webapp/o2o/js/main.js?v=' + (new Date()).getTime();
       document.getElementById('debugMain').src = '<?php echo Yii::app()->request->baseUrl; ?>/webapp/common/js/debuggap.js';

www/webapp/moonclub/js/build/template.js

@@ -11,8 +11,8 @@ a("common/star",function(a){"use strict";var b=this,c=(b.$helpers,a.score),d="";
 a("desc/index",function(a){"use strict";var b=this,c=(b.$helpers,a.showNavBar),d="";return c&&(d+=' <header class="bar bar-nav"> <a class="left-button back-button"> <div class="icon icon-left-nav"></div> </a> <h1 class="title">\u670d\u52a1\u4ecb\u7ecd</h1> </header> '),d+=' <div class="content" id="descScroll"> <div class="scroller"> <div></div> </div> </div>',new k(d)}),/*v:3*/
 a("home/index",function(a){"use strict";var b=this,c=(b.$helpers,a.showNavBar),d="";return c&&(d+=' <header class="bar bar-nav"> <a class="left-button back-button"> <div class="icon icon-left-nav"></div> </a> <a class="right-button service-telephone"> <div></div> </a> <h1 class="title">\u58f9\u7ba1\u5bb6</h1> </header> '),d+=' <div class="content"> <div class="box-container"> <div class="box-container box box-vertical"> <div id="homeScroll" class="scroll-container box-flex-1"> <div class="scroller"> <div class="home-content">  <div class="swiper-container"> <div class="swiper-wrapper"> <div class="swiper-slide btn-banner-recharge"> <img class="lazy" src="http://odulvej8l.bkt.clouddn.com/banner-01-10.jpg" alt=""> </div> </div> <div class="pagination"></div> </div> <div class="box"> <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="month-one"></div> <div class="month-two"></div> <div class="month-three"></div> <div class="month-four"></div> </div> <div class="characteristic"></div> </div> </div> </div> <div style="width: 100%;margin-bottom: 17%;"></div> </div> <div class="box-footer"> <div class="appointment" style="height: 65px;padding-top: 10px;"><img src="http://odulvej8l.bkt.clouddn.com/%E9%A2%84%E7%BA%A6-01.png" alt="" width="20" height="20"><div>\u9884\u7ea6</div></div> <div class="im" style="height: 65px;"></div> <div class="im" style="height: 65px;padding-top: 10px;"><img src="http://odulvej8l.bkt.clouddn.com/%E5%92%A8%E8%AF%A2-01.png" alt="" width="20" height="20"><div>\u54a8\u8be2</div></div> </div> <div style="position: fixed;width: 100%;bottom: 0;"><img src="http://odulvej8l.bkt.clouddn.com/footer%28BAT-2%29.png" style="display: block;width: 100%;" alt=""></div> </div> </div> </div> </div>',new k(d)}),/*v:1*/
 a("month/Consultation",function(a){"use strict";var b=this,c=(b.$helpers,a.showNavBar),d=b.$escape,e=a.title,f="";return c&&(f+=' <header class="bar bar-nav"> <a class="left-button back-button"> <div class="icon icon-left-nav"></div> </a> <h1 class="title">',f+=d(e),f+="</h1> </header> "),f+=' <div class="content"> <div class="box-container"> <div class="box-container box box-vertical"> <div id="ConsultationScroll" class="scroll-container box-flex-1" style="background: #dadada;"> <div class="scroller"> <img src="http://odulvej8l.bkt.clouddn.com/1107%E4%BC%81%E4%B8%9A%E6%9C%8D%E5%8A%A1%E8%AF%A6%E6%83%85%E9%A1%B5.jpg" style="width: 100%;">  </div> <div class="request"><div class="appointment">\u9884\u7ea6</div><div class="im">\u54a8\u8be2</div></div> </div> </div> </div> </div>',new k(f)}),/*v:3*/
-a("month/four",function(a){"use strict";var b=this,c=(b.$helpers,a.showNavBar),d="";return c&&(d+=' <header class="bar bar-nav"> <a class="left-button back-button"> <div class="icon icon-left-nav"></div> </a> <h1 class="title">\u81f3\u5c0a\u5957\u9910</h1> </header> '),d+=' <div class="content"> <div class="box-container"> <div class="box-container box box-vertical"> <div id="mFourScroll" class="scroll-container box-flex-1"> <div class="scroller"> <div class="home-stay-content"> <img src="http://odulvej8l.bkt.clouddn.com/2017-01-11-%E5%B0%8A.jpg" style="width: 100%;"> <div style="padding-bottom:10%;"></div> </div> </div> <div class="request">  <div class="width-percent-50 appointment"> \u9884\u7ea6 </div>  <div class="width-percent-50 im"> \u54a8\u8be2 </div> </div> </div> </div> </div> </div>',new k(d)}),/*v:21*/
-a("month/one",function(a){"use strict";var b=this,c=(b.$helpers,a.showNavBar),d="";return c&&(d+=' <header class="bar bar-nav"> <a class="left-button back-button"> <div class="icon icon-left-nav"></div> </a> <h1 class="title">\u81f3\u60e0\u5957\u9910</h1> </header> '),d+=' <div class="content"> <div class="box-container"> <div class="box-container box box-vertical"> <div id="mOneScroll" class="scroll-container box-flex-1"> <div class="scroller"> <div class="home-stay-content"> <img src="http://odulvej8l.bkt.clouddn.com/2017-01-11-%E6%83%A0.jpg" style="width: 100%;"> <div style="padding-bottom:10%;"></div> </div> </div> <div class="request">  <div class="width-percent-50 appointment"> \u9884\u7ea6 </div>  <div class="width-percent-50 im"> \u54a8\u8be2 </div> </div> </div> </div> </div> </div>',new k(d)}),/*v:3*/
+a("month/four",function(a){"use strict";var b=this,c=(b.$helpers,a.showNavBar),d="";return c&&(d+=' <header class="bar bar-nav"> <a class="left-button back-button"> <div class="icon icon-left-nav"></div> </a> <h1 class="title">\u81f3\u5c0a\u5957\u9910</h1> </header> '),d+=' <div class="content"> <div class="box-container"> <div class="box-container box box-vertical"> <div id="mFourScroll" class="scroll-container box-flex-1"> <div class="scroller"> <div class="home-stay-content"> <img src="http://odulvej8l.bkt.clouddn.com/2017-01-11-%E5%B0%8A.jpg" style="width: 100%;"> <div style="padding-bottom:10%;"></div> </div> </div> <div class="request">  <div class="width-percent-50 appointment"> \u9884\u7ea6 </div>  <div class="width-percent-50 im"> \u54a8\u8be2 </div> </div> </div> </div> </div> </div>',new k(d)}),/*v:22*/
+a("month/one",function(a){"use strict";var b=this,c=(b.$helpers,a.showNavBar),d="";return c&&(d+=' <header class="bar bar-nav"> <a class="left-button back-button"> <div class="icon icon-left-nav"></div> </a> <h1 class="title">\u81f3\u60e0\u5957\u9910</h1> </header> '),d+=' <div class="content"> <div class="box-container"> <div class="box-container box box-vertical"> <div id="mOneScroll" class="scroll-container box-flex-1"> <div class="scroller"> <div class="home-stay-content"> <img src="http://odulvej8l.bkt.clouddn.com/18888.jpg" style="width: 100%;"> <div style="padding-bottom:10%;"></div> </div> </div> <div class="request">  <div class="width-percent-50 appointment"> \u9884\u7ea6 </div>  <div class="width-percent-50 im"> \u54a8\u8be2 </div> </div> </div> </div> </div> </div>',new k(d)}),/*v:3*/
 a("month/three",function(a){"use strict";var b=this,c=(b.$helpers,a.showNavBar),d="";return c&&(d+=' <header class="bar bar-nav"> <a class="left-button back-button"> <div class="icon icon-left-nav"></div> </a> <h1 class="title">\u81f3\u4eab\u5957\u9910</h1> </header> '),d+=' <div class="content"> <div class="box-container"> <div class="box-container box box-vertical"> <div id="mThreeScroll" class="scroll-container box-flex-1"> <div class="scroller"> <div class="home-stay-content"> <img src="http://odulvej8l.bkt.clouddn.com/2017-01-11-%E4%BA%AB.jpg" style="width: 100%;"> <div style="padding-bottom:10%;"></div> </div> </div> <div class="request">  <div class="width-percent-50 appointment"> \u9884\u7ea6 </div>  <div class="width-percent-50 im"> \u54a8\u8be2 </div> </div> </div> </div> </div> </div>',new k(d)}),/*v:3*/
 a("month/two",function(a){"use strict";var b=this,c=(b.$helpers,a.showNavBar),d="";return c&&(d+=' <header class="bar bar-nav"> <a class="left-button back-button"> <div class="icon icon-left-nav"></div> </a> <h1 class="title">\u81f3\u60a6\u5957\u9910</h1> </header> '),d+=' <div class="content"> <div class="box-container"> <div class="box-container box box-vertical"> <div id="mTwoScroll" class="scroll-container box-flex-1"> <div class="scroller"> <div class="home-stay-content"> <img src="http://odulvej8l.bkt.clouddn.com/2017-01-11-%E6%82%A6.jpg" style="width: 100%;"> <div style="padding-bottom:10%;"></div> </div> </div> <div class="request">  <div class="width-percent-50 appointment"> \u9884\u7ea6 </div>  <div class="width-percent-50 im"> \u54a8\u8be2 </div> </div> </div> </div> </div> </div>',new k(d)}),/*v:1*/
 a("myCoupon/cell",function(a){"use strict";var b=this,c=(b.$helpers,b.$escape),d=a.coupon,e=a.isRemind,f=a.start_time_str,g=a.end_time_str,h=a.selected,i="";return i+='<div class="box"> <div class="coupon-left"> <div class="coupon-value-box box-center"> <div> \uffe5<span class="coupon-value">',i+=c(d.value),i+='</span> </div> </div> </div> <div class="coupon-right box box-vertical"> <div class="box box-align-center box-flex-1"> <div class="coupon-name">',i+=c(d.name),i+='</div> </div> <div class="box box-align-center box-flex-1"> <div class="coupon-desc"> ',"0"==d.type?(i+=" <div>\u6ee1",i+=c(d.min_price),i+="\u5143\u53ef\u7528 \u4e0d\u542b\u9644\u52a0\u9879\u76ee</div> "):(i+=" <div>\u4ec5\u9650",i+=c(d.type_str),i+=" \u6ee1",i+=c(d.min_price),i+="\u5143\u53ef\u7528</div> "),i+=' <div class="',e&&(i+="coupon-remind"),i+='">\u6709\u6548\u671f\uff1a',i+=c(f),i+="-",i+=c(g),i+="</div> ",0!==d.workday_limit?(i+=' <span class="limit">',i+=c(d.workday_limit_str),i+="</span> ",d.time_limit_start&&d.time_limit_end?(i+=' <span class="limit">',i+=c(d.time_limit_start),i+="\u70b9 - ",i+=c(d.time_limit_end),i+="\u70b9\u4f7f\u7528</span> "):i+=" \u4f7f\u7528 ",i+=" "):(i+=" ",d.time_limit_start&&d.time_limit_end&&(i+=' <span class="limit">\u4ec5\u9650\u6bcf\u65e5',i+=c(d.time_limit_start),i+="\u70b9 - ",i+=c(d.time_limit_end),i+="\u70b9\u4f7f\u7528</span> "),i+=" "),i+=" </div> </div> </div> ",h&&(i+=' <div class="box box-flex-1 box-pack-end box-align-center coupon-selected"> <span class="icon icon-check"></span> </div> '),i+=" </div> ",new k(i)}),/*v:1*/

www/webapp/moonclub/tpl/month/one.html

@@ -12,7 +12,7 @@
             <div id="mOneScroll" class="scroll-container box-flex-1">
                 <div class="scroller">
                     <div class="home-stay-content">
-                        <img src="http://odulvej8l.bkt.clouddn.com/2017-01-11-%E6%83%A0.jpg" style="width: 100%;">
+                        <img src="http://odulvej8l.bkt.clouddn.com/18888.jpg" style="width: 100%;">
                         <div style="padding-bottom:10%;"></div>
                     </div>
                 </div>

www/webapp/o2o/js/page/home.js

@@ -44,13 +44,13 @@ define(['$', 'template', 'IScroll', 'product', 'user', 'native', 'config', 'addr
 			}, $view);
 
 			//加载弹框
-			setTimeout(function () {
-				$doc.trigger('spa:openpanel', ['simpleAlert', {
-					title: '通知',
-					message: '2017年1月20日至2月11日放假调休，共23天。2017年2月12日正常服务给您造成的不便敬请谅解，感谢大家长期对我们工作的大力支持与信任。祝您节日愉快!'
-				}]);
-				return;
-			},500);
+			// setTimeout(function () {
+			// 	$doc.trigger('spa:openpanel', ['simpleAlert', {
+			// 		title: '通知',
+			// 		message: '2017年1月20日至2月11日放假调休，共23天。2017年2月12日正常服务给您造成的不便敬请谅解，感谢大家长期对我们工作的大力支持与信任。祝您节日愉快!'
+			// 	}]);
+			// 	return;
+			// },500);
 			setInterval(function () {
 				$('.swiper-container').height($('.swiper-container img').height());
 				// $('.pagination').css('bottom', '0.15rem');
@@ -118,7 +118,7 @@ define(['$', 'template', 'IScroll', 'product', 'user', 'native', 'config', 'addr
 						backHash: ''
 					}
 				});
-			});
+			},$view);
 			/* 点击产品列表的某一项 */
 			$.newTouch('.btn-appliances', function (event) {
 				event.preventDefault();
@@ -135,7 +135,7 @@ define(['$', 'template', 'IScroll', 'product', 'user', 'native', 'config', 'addr
 						needReset: true
 					}
 				});
-			} );
+			},$view );
 			/* 点击标签
 			 $.newTouch('.btn-product-group', function (event) {
 			 event.preventDefault();