test

www/webapp/moonclub/dist/js/build.txt

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

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

@@ -1 +1 @@
-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()}}});
+define(["$","template","recharge","native","config","user","product"],function(e,t,n,r,i,s,o){function u(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){u.call(this,e)}),e.newTouch(".back-button",function(e){u.call(this,e)},r),r.on("tapBackButton",function(e){u.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:""}})},r),n.resolve()},beforeopen:function(e,t){t.resolve()},afteropen:function(n,r){var s=this,o=e(document),u=n.pushData,a=u.product;if(s){o.trigger("spa:openloader");if(o){o.trigger("spa:closeloader");var f=t("month/index",{product:a,showNavBar:i.isWX});e(".spa-page-body",s).html(f),setTimeout(function(){n.scroll=new IScroll("#mOneScroll")},700)}}r.resolve()},beforeclose:function(e,t){t.resolve()}}});

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

@@ -40,8 +40,11 @@ define(['$', 'template', 'user', 'config', 'api'], function ($, template, user,
                     showNavBar: !config.isWX && !config.isChubao
                 };
                 var tpl = template('advisory/index', tmpData);
+
                 $('.spa-page-body', $view).html(tpl);
+
             }
+
             dtd.resolve();
             if (config.isWX) {
                 wx.ready(function () {

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

@@ -1,47 +1,33 @@
-define(['template', 'native', 'config'], function (template, native, config) {
+define(['$', 'template', 'recharge', 'native', 'config', 'user','product'], function ($, template, recharge, native, config, user,product) {
     function back(event) {
         event.preventDefault();
-
         $(document).trigger('spa:navigate', {
-            hash: ''
+            hash: '',
+            pushData: {
+                dontNeedReload: true
+            }
         });
     }
-
     return {
-        title: '壹管家上门服务',
+        title: '企业服务',
         body: '',
         init: function (pageData, dtd) {
+            /* this是什么？ */
             var $view = this;
             var $doc = $(document);
-            var product=pageData.pushData.product;
 
-            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);
-            //返回
+            // 返回
+            $view.on('swipeRight', function (event) {
+                back.call(this, event);
+            });
             $.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();
@@ -59,7 +45,35 @@ define(['template', 'native', 'config'], function (template, native, config) {
                     }
                 })
             }, $view);
+
+            dtd.resolve();
+        },
+        beforeopen: function (pageData, dtd) {
+            dtd.resolve();
+        },
+        afteropen: function (pageData, dtd) {
+            var $view = this;
+            var $doc = $(document);
+            var pushData=pageData.pushData;
+            var product=pushData.product;
+            if ($view) {
+                $doc.trigger('spa:openloader');
+                if ($doc) {
+                    $doc.trigger('spa:closeloader');
+                    var tpl = template('month/index', {
+                        product:product,
+                        showNavBar:config.isWX
+                    });
+                    $('.spa-page-body', $view).html(tpl);
+                    setTimeout(function () {
+                        pageData.scroll = new IScroll('#mOneScroll');
+                    }, 700);
+                }
+            }
+            dtd.resolve();
+        },
+        beforeclose: function (pageData, dtd) {
             dtd.resolve();
         }
     }
-})
+});

www/webapp/o2o/dist/js/page/address/addressList.js

@@ -1 +1 @@
-define(["$","template","native","config","address","user","api","order"],function(e,t,n,r,i,s,o,u){function a(t,n){t.preventDefault(),e(document).trigger("spa:navigate",{hash:n})}var f={};return{title:"壹管家上门服务",body:"",init:function(t,n){var r=this,u=e(document);e.newTouch(".back-button",function(e){a.call(this,e,t.pushData.backHash)},r),r.on("tapBackButton",function(e){a.call(this,e,t.pushData.backHash)}),r.on("swipeRight",function(e){a.call(this,e,t.pushData.backHash)}),e.newTouch(".address-item",function(n){var a=e(this).data("id"),f=e(this).data("index");o.checkAddress({address_id:a,user_id:s.id},function(n){n.success?(r.trigger("tapBackButton"),t.callback&&e.isFunction(t.callback.onSelect)&&t.callback.onSelect(i.list[f],n.data.station)):u.trigger("spa:openpanel",["simpleAlert",{message:n.message}])})},r),e.newTouch(".btn-add",function(e){console.log(f.callback),u.trigger("spa:navigate",{hash:"addressAdd",pushData:{needReload:!0},callback:f.callback})},r),e.newTouch(".btn-edit",function(t){var n=e(this),r=e(this).data("id"),i=e(this).data("index");u.trigger("spa:navigate",{hash:"addressDetail",pushData:{addressIndex:i,addressID:r,needReload:!0},callback:{onSelect:function(e){}}})},r),n.resolve()},beforeopen:function(n,o){var u=this,a=e(document),l=n.pushData;f.needReload=l.hasOwnProperty("needReload")?l.needReload:!1,f.callback=n.callback,i.getList({request_from:"weixin",user_id:s.id},function(n){if(n.success){var s=t("address/list/index",{showNavBar:!r.isWX&&!r.isChubao,addText:"添加地址",addresses:i.list});e(".spa-page-body",u).html(s),f.scroll&&(f.scroll.destroy(),f.scroll=null),setTimeout(function(){f.scroll=new IScroll("#addressListScroll")},10)}}),o.resolve()},afteropen:function(e,t){t.resolve()}}});
+define(["$","template","native","config","address","user","api","order"],function(e,t,n,r,i,s,o,u){function a(t,n){t.preventDefault(),e(document).trigger("spa:navigate",{hash:n})}var f,l={};return{title:"壹管家上门服务",body:"",init:function(t,n){var r=this,u=e(document);e.newTouch(".back-button",function(e){a.call(this,e,f)},r),r.on("tapBackButton",function(e){a.call(this,e,f)}),r.on("swipeRight",function(e){a.call(this,e,f)}),e.newTouch(".address-item",function(n){var a=e(this).data("id"),f=e(this).data("index");o.checkAddress({address_id:a,user_id:s.id},function(n){n.success?(r.trigger("tapBackButton"),t.callback&&e.isFunction(t.callback.onSelect)&&t.callback.onSelect(i.list[f],n.data.station)):u.trigger("spa:openpanel",["simpleAlert",{message:n.message}])})},r),e.newTouch(".btn-add",function(e){u.trigger("spa:navigate",{hash:"addressAdd",pushData:{needReload:!0},callback:l.callback})},r),e.newTouch(".btn-edit",function(t){var n=e(this),r=e(this).data("id"),i=e(this).data("index");u.trigger("spa:navigate",{hash:"addressDetail",pushData:{addressIndex:i,addressID:r,needReload:!0},callback:{onSelect:function(e){}}})},r),n.resolve()},beforeopen:function(n,o){var u=this,a=e(document),c=n.pushData;f=c.backHash,f!=="mine"&&(f="placeOrder"),l.needReload=c.hasOwnProperty("needReload")?c.needReload:!1,l.callback=n.callback,i.getList({request_from:"weixin",user_id:s.id},function(n){if(n.success){var s=t("address/list/index",{showNavBar:!r.isWX&&!r.isChubao,addText:"添加地址",addresses:i.list});e(".spa-page-body",u).html(s),l.scroll&&(l.scroll.destroy(),l.scroll=null),setTimeout(function(){l.scroll=new IScroll("#addressListScroll")},10)}}),o.resolve()},afteropen:function(e,t){t.resolve()}}});

www/webapp/o2o/js/page/address/addressList.js

@@ -1,4 +1,4 @@
-define(['$','template', 'native', 'config', 'address', 'user', 'api', 'order'], function ($,template, native, config, address, user, api, order) {
+define(['$', 'template', 'native', 'config', 'address', 'user', 'api', 'order'], function ($, template, native, config, address, user, api, order) {
     /* 返回上一级 */
     function back(event, backHash) {
         event.preventDefault();
@@ -6,6 +6,8 @@ define(['$','template', 'native', 'config', 'address', 'user', 'api', 'order'],
             hash: backHash
         });
     }
+
+    var hash;
     var cachePageData = {}; //page内部的数据传递
 
     return {
@@ -16,13 +18,13 @@ define(['$','template', 'native', 'config', 'address', 'user', 'api', 'order'],
             var $doc = $(document);
             /* 三个返回操作 */
             $.newTouch('.back-button', function (event) {
-                back.call(this, event, pageData.pushData.backHash);
+                back.call(this, event, hash);
             }, $view);
             $view.on('tapBackButton', function (event) {
-                back.call(this, event, pageData.pushData.backHash);
+                back.call(this, event, hash);
             });
             $view.on('swipeRight', function (event) {
-                back.call(this, event, pageData.pushData.backHash);
+                back.call(this, event, hash);
             });
 
             /* 点击一条地址 */
@@ -51,7 +53,6 @@ define(['$','template', 'native', 'config', 'address', 'user', 'api', 'order'],
 
             // 新增地址
             $.newTouch('.btn-add', function (event) {
-                console.log(cachePageData.callback);
                 $doc.trigger('spa:navigate', {
                     hash: 'addressAdd',
                     pushData: {
@@ -83,17 +84,21 @@ define(['$','template', 'native', 'config', 'address', 'user', 'api', 'order'],
             }, $view);
             dtd.resolve();
         },
-        beforeopen: function(pageData, dtd) {
+        beforeopen: function (pageData, dtd) {
             var $view = this;
             var $doc = $(document);
             var pushData = pageData.pushData;
+            hash = pushData.backHash;
+            if (hash !== 'mine') {
+                hash = 'placeOrder';
+            }
             cachePageData.needReload = pushData.hasOwnProperty('needReload') ? pushData.needReload : false;
             // if (cachePageData.needReload) {
             cachePageData.callback = pageData.callback;
             address.getList({
                 request_from: 'weixin',
                 user_id: user.id
-            }, function(res) {
+            }, function (res) {
                 if (res.success) {
                     var tpl = template('address/list/index', {
                         showNavBar: !config.isWX && !config.isChubao,
@@ -105,10 +110,11 @@ define(['$','template', 'native', 'config', 'address', 'user', 'api', 'order'],
                         cachePageData.scroll.destroy();
                         cachePageData.scroll = null;
                     }
-                    setTimeout(function() {
+                    setTimeout(function () {
                         cachePageData.scroll = new IScroll('#addressListScroll');
                     }, 10);
-                };
+                }
+                ;
             });
             // }