洪海涛 hace 8 años
padre
commit
0a645f6950

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

@@ -10,22 +10,22 @@
     <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/>
     <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=20170301004">
-    <link rel="stylesheet" href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/framework/ratchet-2.0.2/dist/css/ratchet-theme-ios.min.css?v=20170301004">
+    <link rel="stylesheet" href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/framework/ratchet-2.0.2/dist/css/ratchet.min.css?v=20170301301">
+    <link rel="stylesheet" href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/framework/ratchet-2.0.2/dist/css/ratchet-theme-ios.min.css?v=20170301301">
     <!--  <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=20170301004">
-<!--    <link href="--><?php //echo Yii::app()->request->baseUrl; ?><!--/css/common_o2o/swiper.css?v=20170301004" rel="stylesheet">-->
-    <!-- <script src="<?php echo Yii::app()->request->baseUrl; ?>/js/o2o/swiper.min.js?v=20170301004"></script> -->
+          href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/moonclub/dist/css/main.css?v=20170301301">
+<!--    <link href="--><?php //echo Yii::app()->request->baseUrl; ?><!--/css/common_o2o/swiper.css?v=20170301301" rel="stylesheet">-->
+    <!-- <script src="<?php echo Yii::app()->request->baseUrl; ?>/js/o2o/swiper.min.js?v=20170301301"></script> -->
     <link rel="stylesheet" href="https://raw.githubusercontent.com/andreruffert/rangeslider.js/develop/dist/rangeslider.css" media="screen" title="no title">
-    <script src="<?php echo Yii::app()->request->baseUrl; ?>/webapp/framework/iscroll5/iscroll-probe.js?v=20170301004"></script>
+    <script src="<?php echo Yii::app()->request->baseUrl; ?>/webapp/framework/iscroll5/iscroll-probe.js?v=20170301301"></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=20170301004" crossOrigin="anonymous"></script>
-    <script src="//cdn.bootcss.com/iScroll/5.2.0/iscroll-probe.min.js?v=20170301004"></script>
+    <script type="text/javascript" src="https://dn-bughd-web.qbox.me/bughd.min.js?v=20170301301" crossOrigin="anonymous"></script>
+    <script src="//cdn.bootcss.com/iScroll/5.2.0/iscroll-probe.min.js?v=20170301301"></script>
     <script type="text/javascript">
         window.bughd = window.bughd || function () {
             };
@@ -83,7 +83,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=20170301004';
+        var main = '<?php echo Yii::app()->request->baseUrl;?>/webapp/moonclub/dist/js/main.js?v=20170301301';
         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';

+ 1 - 1
www/webapp/moonclub/css/MyService.css

@@ -1,6 +1,6 @@
 h1.title{
 	position: absolute;
-	top:-1000px;
+	top:0px;
 }
 .booking {
 	min-width: 300px;

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
www/webapp/moonclub/dist/css/main.css


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
www/webapp/moonclub/dist/js/build/template.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
www/webapp/moonclub/dist/js/main.js


+ 1 - 1
www/webapp/moonclub/dist/js/page/MyOrder.js

@@ -1 +1 @@
-define(["$","template","user","config","api","product"],function(e,t,n,r,i,s){function o(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:"",pushData:{dontNeedReload:!0}})}return{title:"壹管家上门服务",body:"",init:function(t,n){var r=this,i=e(document);r.on("swipeRight",function(e){o.call(this,e)}),e.newTouch(".back-button",function(e){o.call(this,e)},r),r.on("tapBackButton",function(e){o.call(this,e)}),n.resolve()},beforeopen:function(n,i){var o=this,u=e(document);console.log(s.myOrderList),u.trigger("spa:openloader");if(!n.pushData.dontNeedReload){u.trigger("spa:closeloader");var a={showNavBar:!r.isWX&&!r.isChubao,orderList:s.myOrderList},f=t("MyOrder/index",a);e(".spa-page-body",o).html(f)}i.resolve(),r.isWX&&wx.ready(function(){wx.onMenuShareTimeline({title:"家政服务,首选壹管家",link:"http://www.yiguanjia.me/o2o/web/index",imgUrl:"http://wozhua-others.qiniudn.com/icon-o2o-home.jpg"}),wx.onMenuShareAppMessage({title:"家政服务,首选壹管家",desc:"全程管家,精心每一个细节!",link:"http://www.yiguanjia.me/o2o/web/index",imgUrl:"http://wozhua-others.qiniudn.com/icon-o2o-home.jpg"})})}}});
+define(["$","template","user","config","api","product"],function(e,t,n,r,i,s){function o(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:"",pushData:{dontNeedReload:!0}})}return{title:"壹管家上门服务",body:"",init:function(t,n){var r=this,i=e(document);r.on("swipeRight",function(e){o.call(this,e)}),e.newTouch(".back-button",function(e){o.call(this,e)},r),r.on("tapBackButton",function(e){o.call(this,e)}),n.resolve()},beforeopen:function(n,i){var o=this,u=e(document);u.trigger("spa:openloader");if(!n.pushData.dontNeedReload){u.trigger("spa:closeloader");var a={orderList:s.myOrderList},f=t("MyOrder/index",a);e(".spa-page-body",o).html(f)}i.resolve(),r.isWX&&wx.ready(function(){wx.onMenuShareTimeline({title:"家政服务,首选壹管家",link:"http://www.yiguanjia.me/o2o/web/index",imgUrl:"http://wozhua-others.qiniudn.com/icon-o2o-home.jpg"}),wx.onMenuShareAppMessage({title:"家政服务,首选壹管家",desc:"全程管家,精心每一个细节!",link:"http://www.yiguanjia.me/o2o/web/index",imgUrl:"http://wozhua-others.qiniudn.com/icon-o2o-home.jpg"})})}}});

+ 1 - 1
www/webapp/moonclub/dist/js/page/home.js

@@ -1 +1 @@
-define(["$","template","user","native","config","address","api","product"],function(e,t,n,r,i,s,o,u){function a(e){e.preventDefault(),r.back()}return{title:"壹管家上门服务",body:"",init:function(t,i){var s=this,o=e(document);e.newTouch(".back-button",function(e){a.call(this,e)},s),s.on("tapBackButton",function(e){a.call(this,e)}),e.newTouch(".service-telephone",function(e){e.preventDefault(),r.call("4000328170")},s),e.newTouch(".btn-month",function(){event.preventDefault();var t=parseInt(e(this).attr("data-product-type"));o.trigger("spa:navigate",{hash:"month",pushData:{needReset:!0,product:u.allList[t],backHash:""}})},s),e.newTouch(".appointment",function(e){e.preventDefault(),window.location.href="/index.php?r=moonclub/reserve/month&user_id="+n.id},s),e.newTouch(".im",function(e){e.preventDefault(),o.trigger("spa:navigate",{hash:"advisory-advisory",pushData:{needReset:!0,backHash:""}})},s),i.resolve()},beforeopen:function(o,u){localStorage.removeItem("cart_products"),u.resolve(),r.switchPopGesture(!0);var a=this,f=e(document);if(!o.pushData.dontNeedReload){f.trigger("spa:openloader");var l=t("home/index",{showNavBar:!i.isWX&&!i.isChubao});e(".spa-page-body",a).html(l),s.getList({request_from:"weixin",user_id:n.id}),f.trigger("spa:closeloader")}},afteropen:function(t,n){n.resolve(),t.prevPage=e(".spa-page-empty")},beforeclose:function(e,t){t.resolve(),r.switchPopGesture(!1)}}});
+define(["$","template","user","native","config","address","api","product"],function(e,t,n,r,i,s,o,u){function a(e){e.preventDefault(),r.back()}return{title:"壹管家上门服务",body:"",init:function(t,i){var s=this,o=e(document);e.newTouch(".back-button",function(e){a.call(this,e)},s),s.on("tapBackButton",function(e){a.call(this,e)}),e.newTouch(".service-telephone",function(e){e.preventDefault(),r.call("4000328170")},s),e.newTouch(".btn-month",function(){event.preventDefault();var t=parseInt(e(this).attr("data-product-type"));o.trigger("spa:navigate",{hash:"month",pushData:{needReset:!0,product:u.allList[t],backHash:""}})},s),e.newTouch(".appointment",function(e){e.preventDefault(),window.location.href="/index.php?r=moonclub/reserve/month&user_id="+n.id},s),e.newTouch(".im",function(e){e.preventDefault(),o.trigger("spa:navigate",{hash:"advisory-advisory",pushData:{needReset:!0,backHash:""}})},s),i.resolve()},beforeopen:function(o,u){localStorage.removeItem("cart_products"),u.resolve(),r.switchPopGesture(!0);var a=this,f=e(document);if(!o.pushData.dontNeedReload){f.trigger("spa:openloader");var l=t("home/index",{showNavBar:!i.isWX&&!i.isChubao});e(".spa-page-body",a).html(l),setTimeout(function(){o.scroll=new IScroll("#homeScroll")},700),s.getList({request_from:"weixin",user_id:n.id}),f.trigger("spa:closeloader")}},afteropen:function(t,n){n.resolve(),t.prevPage=e(".spa-page-empty")},beforeclose:function(e,t){t.resolve(),r.switchPopGesture(!1)}}});

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
www/webapp/moonclub/js/build/template.js


+ 1 - 2
www/webapp/moonclub/js/page/MyOrder.js

@@ -39,12 +39,11 @@ define(['$', 'template', 'user', 'config',  'api','product'], function ($, templ
         beforeopen: function (pageData, dtd) {
             var $view = this;
             var $doc = $(document);
-            console.log(product.myOrderList);
             $doc.trigger('spa:openloader');
             if (!pageData.pushData.dontNeedReload) {
                 $doc.trigger('spa:closeloader');
                 var tmpData = {
-                    showNavBar: !config.isWX && !config.isChubao,
+                    // showNavBar: !config.isWX && !config.isChubao,
                     orderList:product.myOrderList
                 };
                 var tpl = template('MyOrder/index', tmpData);

+ 3 - 0
www/webapp/moonclub/js/page/home.js

@@ -95,6 +95,9 @@ define(['$', 'template',  'user', 'native', 'config', 'address', 'api','product'
 					showNavBar: !config.isWX && !config.isChubao
 				});
 				$('.spa-page-body', $view).html(tpl);
+                setTimeout(function () {
+                    pageData.scroll = new IScroll('#homeScroll');
+                }, 700);
 				/* 建立IScroll-setInterval- setTimeout*/
 				// setTimeout(function () {
 				// 	var swiper = new Swiper('.swiper-container', {

+ 1 - 4
www/webapp/moonclub/tpl/MyOrder/index.html

@@ -1,16 +1,13 @@
-{{ if showNavBar }}
 <header class="bar bar-nav">
     <a class="left-button back-button">
         <div class="icon icon-left-nav"></div>
     </a>
     <h1 class="title">我的订单</h1>
 </header>
-{{ /if }}
-
 <div class="content" id="MyOrderScroll" style="background: #fff;">
     <div class="page-content">
         {{ each orderList as order index }}
-        <div data-extra-type="{{index}}" style="padding: 3%;border-bottom: 1px solid rgba(0, 0, 0, 0.38);">
+        <div data-extra-type="{{index}}" style="padding: 3%;border-bottom: 1px solid rgba(0, 0, 0, 0.1);">
             <!--服务-->
             <div style="margin: 1% 0">{{order.name}}</div>
             <!--进度-->

+ 20 - 18
www/webapp/moonclub/tpl/home/index.html

@@ -13,31 +13,33 @@
 	<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">
-						<!-- Swiper -->
-						<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 class="scroll">
+					<div class="scroller">
+						<div class="home-content">
+							<!-- Swiper -->
+							<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="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 btn-month" data-product-type="0"></div>
-								<div class="month-two btn-month" data-product-type="1"></div>
-								<div class="month-three btn-month" data-product-type="2"></div>
-								<div class="month-four btn-month" data-product-type="3"></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 btn-month" data-product-type="0"></div>
+									<div class="month-two btn-month" data-product-type="1"></div>
+									<div class="month-three btn-month" data-product-type="2"></div>
+									<div class="month-four btn-month" data-product-type="3"></div>
+								</div>
+								<div class="characteristic"></div>
 							</div>
-							<div class="characteristic"></div>
 						</div>
 					</div>
+					<div style="width: 100%;margin-bottom: 17%;"></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>预约</div></div>

Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio