3

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

@@ -9,19 +9,19 @@
     <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=20170415">
-    <link rel="stylesheet" href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/framework/ratchet-2.0.2/dist/css/ratchet-theme-ios.min.css?v=20170415">
+    <link rel="stylesheet" href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/framework/ratchet-2.0.2/dist/css/ratchet.min.css?v=20170418">
+    <link rel="stylesheet" href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/framework/ratchet-2.0.2/dist/css/ratchet-theme-ios.min.css?v=20170418">
 <!--      <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=20170415">
-<!--    <link href="--><?php //echo Yii::app()->request->baseUrl; ?><!--/css/common_o2o/swiper.css?v=20170415" rel="stylesheet">-->
-<!--     <script src="--><?php //echo Yii::app()->request->baseUrl; ?><!--/js/o2o/swiper.min.js?v=20170415"></script> -->
+    <link rel="stylesheet" href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/moonclub/dist/css/main.css?v=20170418">
+<!--    <link href="--><?php //echo Yii::app()->request->baseUrl; ?><!--/css/common_o2o/swiper.css?v=20170418" rel="stylesheet">-->
+<!--     <script src="--><?php //echo Yii::app()->request->baseUrl; ?><!--/js/o2o/swiper.min.js?v=20170418"></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=20170415"></script>
+    <script src="<?php echo Yii::app()->request->baseUrl; ?>/webapp/framework/iscroll5/iscroll-probe.js?v=20170418"></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=20170415" crossOrigin="anonymous"></script>
-    <script src="//cdn.bootcss.com/iScroll/5.2.0/iscroll-probe.min.js?v=20170415"></script>
+    <script type="text/javascript" src="https://dn-bughd-web.qbox.me/bughd.min.js?v=20170418" crossOrigin="anonymous"></script>
+    <script src="//cdn.bootcss.com/iScroll/5.2.0/iscroll-probe.min.js?v=20170418"></script>
     <script type="text/javascript">
         window.bughd = window.bughd || function () {
             };
@@ -79,7 +79,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=20170415';
+        var main = '<?php echo Yii::app()->request->baseUrl;?>/webapp/moonclub/dist/js/main.js?v=20170418';
         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/webapp/moonclub/dist/js/build.txt

@@ -29,5 +29,4 @@ panel/productOption.js
 autosize.js
 panel/postReview.js
 page/MyService.js
-model/recharge.js
 page/month.js

www/webapp/moonclub/dist/js/page/advisory/advisory.js

@@ -1 +1 @@
-define(["$","template","user","config","api"],function(e,t,n,r,i){function o(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:"",pushData:{dontNeedReload:!1,product:s}})}var s;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){s=n.pushData.product,u.trigger("spa:closeloader");var a={showNavBar:!r.isWX&&!r.isChubao},f=t("advisory/index",a);console.log(s),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"],function(e,t,n,r,i){function s(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){s.call(this,e)}),e.newTouch(".back-button",function(e){s.call(this,e)},r),r.on("tapBackButton",function(e){s.call(this,e)}),n.resolve()},beforeopen:function(n,i){var s=this,o=e(document);o.trigger("spa:openloader");if(!n.pushData.dontNeedReload){o.trigger("spa:closeloader");var u={showNavBar:!r.isWX&&!r.isChubao},a=t("advisory/index",u);e(".spa-page-body",s).html(a)}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"})})}}});

www/webapp/moonclub/dist/js/page/month.js

@@ -1 +1 @@
-define(["$","template","recharge","native","config","user","product"],function(e,t,n,r,i,s,o){function a(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:"",pushData:{dontNeedReload:!1}})}var u={};return{title:"企业服务",body:"",init:function(t,n){var r=this,i=e(document);r.on("swipeRight",function(e){a.call(this,e)}),e.newTouch(".back-button",function(e){a.call(this,e)},r),r.on("tapBackButton",function(e){a.call(this,e)}),e.newTouch(".appointment",function(e){e.preventDefault(),window.location.href="/index.php?r=moonclub/reserve/month&user_id="+s.id},r),e.newTouch(".im",function(e){e.preventDefault(),i.trigger("spa:navigate",{hash:"advisory-advisory",pushData:{needReset:!0,backHash:"",product:productUrl}})},r),n.resolve()},beforeopen:function(e,t){t.resolve()},afteropen:function(n,r){var s=this,o=e(document);u.pushData=n.pushData,console.log(u.pushData.product),productUrl=u.pushData.product.url;if(s){o.trigger("spa:openloader");if(o){o.trigger("spa:closeloader");var a=t("month/index",{productUrl:productUrl,showNavBar:i.isWX});e(".spa-page-body",s).html(a),setTimeout(function(){n.scroll=new IScroll("#mOneScroll"),console.log(productUrl)},700)}}r.resolve()},beforeclose:function(e,t){t.resolve()}}});
+define(["template","native","config"],function(e,t,n){function r(e){e.preventDefault(),$(document).trigger("spa:navigate",{hash:""})}return{title:"壹管家上门服务",body:"",init:function(t,i){var s=this,o=$(document),u=t.pushData.product,a=e("month/index",{product:u,showNavBar:!n.isWX&&!n.isChubao});$(".spa-page-body",s).html(a),setTimeout(function(){t.scroll=new IScroll("#mOneScroll")},700),$.newTouch(".back-button",function(e){r.call(this,e)},s),s.on("tapBackButton",function(e){r.call(this,e)}),s.on("swipeRight",function(e){r.call(this,e)}),$.newTouch(".appointment",function(e){e.preventDefault(),window.location.href="/index.php?r=moonclub/reserve/month&user_id="+user.id},s),$.newTouch(".im",function(e){e.preventDefault(),o.trigger("spa:navigate",{hash:"advisory-advisory",pushData:{needReset:!0,backHash:""}})},s),i.resolve()}}});

www/webapp/moonclub/js/page/advisory/advisory.js

@@ -1,12 +1,10 @@
 define(['$', 'template', 'user', 'config', 'api'], function ($, template, user, config, api) {
-    var product;
     function back(event) {
         event.preventDefault();
         $(document).trigger('spa:navigate', {
             hash: '',
             pushData: {
-                dontNeedReload: false,
-                product:product
+                dontNeedReload: true
             }
         });
     }
@@ -37,17 +35,13 @@ define(['$', 'template', 'user', 'config', 'api'], function ($, template, user,
             var $doc = $(document);
             $doc.trigger('spa:openloader');
             if (!pageData.pushData.dontNeedReload) {
-                product=pageData.pushData.product;
                 $doc.trigger('spa:closeloader');
                 var tmpData = {
                     showNavBar: !config.isWX && !config.isChubao
                 };
                 var tpl = template('advisory/index', tmpData);
-console.log(product);
                 $('.spa-page-body', $view).html(tpl);
-
             }
-
             dtd.resolve();
             if (config.isWX) {
                 wx.ready(function () {

www/webapp/moonclub/js/page/month.js

@@ -1,34 +1,47 @@
-define(['$', 'template', 'recharge', 'native', 'config', 'user','product'], function ($, template, recharge, native, config, user,product) {
-    var cachePageData={};//内部数据通信
+define(['template', 'native', 'config'], function (template, native, config) {
     function back(event) {
         event.preventDefault();
+
         $(document).trigger('spa:navigate', {
-            hash: '',
-            pushData: {
-                dontNeedReload: false
-            }
+            hash: ''
         });
     }
+
     return {
-        title: '企业服务',
+        title: '壹管家上门服务',
         body: '',
         init: function (pageData, dtd) {
-            /* this是什么？ */
             var $view = this;
             var $doc = $(document);
+            var product=pageData.pushData.product;
 
-
-            // 返回
-            $view.on('swipeRight', function (event) {
-                back.call(this, event);
+            var tpl = template('month/index', {
+                product:product,
+                showNavBar: !config.isWX && !config.isChubao
             });
+            $('.spa-page-body', $view).html(tpl);
+
+            setTimeout(function () {
+                pageData.scroll = new IScroll('#mOneScroll');
+            }, 700);
+            //返回
             $.newTouch('.back-button', function (event) {
                 back.call(this, event);
             }, $view);
+
             $view.on('tapBackButton', function (event) {
                 back.call(this, event);
             });
 
+            $view.on('swipeRight', function (event) {
+                back.call(this, event);
+            });
+
+            // //客服电话
+            // $.newTouch('.service-telephone', function (event) {
+            //     event.preventDefault();
+            //     native.call('400-0328-170');
+            // }, $view);
             //预约
             $.newTouch('.appointment', function (event) {
                 event.preventDefault();
@@ -42,42 +55,11 @@ define(['$', 'template', 'recharge', 'native', 'config', 'user','product'], func
                     hash: 'advisory-advisory',
                     pushData: {
                         needReset: true,
-                        backHash: '',
-                        product:productUrl
+                        backHash: ''
                     }
                 })
             }, $view);
-
-            dtd.resolve();
-        },
-        beforeopen: function (pageData, dtd) {
-            dtd.resolve();
-        },
-        afteropen: function (pageData, dtd) {
-            var $view = this;
-            var $doc = $(document);
-            cachePageData.pushData=pageData.pushData;
-            console.log(cachePageData.pushData.product);
-            productUrl=cachePageData.pushData.product.url;
-            if ($view) {
-                $doc.trigger('spa:openloader');
-                if ($doc) {
-                    $doc.trigger('spa:closeloader');
-                    var tpl = template('month/index', {
-                        productUrl:productUrl,
-                        showNavBar:config.isWX
-                    });
-                    $('.spa-page-body', $view).html(tpl);
-                    setTimeout(function () {
-                        pageData.scroll = new IScroll('#mOneScroll');
-                        console.log(productUrl);
-                    }, 700);
-                }
-            }
-            dtd.resolve();
-        },
-        beforeclose: function (pageData, dtd) {
             dtd.resolve();
         }
     }
-});
+})

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

@@ -12,7 +12,7 @@
             <div id="mOneScroll" class="scroll-container box-flex-1">
                 <div class="scroller">
                     <div class="home-stay-content">
-                        <img src="{{productUrl}}" style="width: 100%;">
+                        <img src="{{product.url}}" style="width: 100%;">
                         <div style="padding-bottom:10%;"></div>
                     </div>
                 </div>