添加 帮助中心 关于

www/webapp/o2o/build.js

@@ -11,6 +11,8 @@
     include: [
       'ratchet',
       'pageHome',
+      'pageHelp',
+      'pageAbout',
       'pageRecharge',
       'pageMine',
       'pageProduct',

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

@@ -20,6 +20,8 @@ build/template.js
 IScroll.js
 page/home.js
 model/recharge.js
+page/help.js
+page/about.js
 page/rechargee.js
 page/mine.js
 model/cart.js

www/webapp/o2o/dist/js/page/about.js

@@ -0,0 +1 @@
+define(["$","template","IScroll","recharge","native","config","api"],function(e,t,n,r,i,s,o){function u(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:"mine"})}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)}),n.resolve()},beforeopen:function(e,t){t.resolve()},afteropen:function(r,i){var u=this,a=e(document);a.trigger("spa:openloader"),o.getAbout({},function(o){if(o.success){var f=t("help/index",{showNavBar:!s.isWX});e(".spa-page-body",u).html(f),e(".page-content",u).html(o.data.content),setTimeout(function(){r.scroll=new n("#helpScroll")},500),i.resolve(),a.trigger("spa:closeloader")}})},beforeclose:function(e,t){t.resolve()}}});

www/webapp/o2o/dist/js/page/help.js

@@ -0,0 +1 @@
+define(["$","template","IScroll","recharge","native","config","api"],function(e,t,n,r,i,s,o){function u(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:"mine"})}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)}),n.resolve()},beforeopen:function(e,t){t.resolve()},afteropen:function(r,i){var u=this,a=e(document);a.trigger("spa:openloader"),o.getHelp({},function(o){if(o.success){var f=t("help/index",{showNavBar:!s.isWX});e(".spa-page-body",u).html(f),e(".page-content",u).html(o.data.content),setTimeout(function(){r.scroll=new n("#helpScroll")},500),i.resolve(),a.trigger("spa:closeloader")}})},beforeclose:function(e,t){t.resolve()}}});

www/webapp/o2o/dist/js/page/mine.js

@@ -1 +1 @@
-define(["$","template","IScroll","user","native","config","address"],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 i=this,s=e(document);i.on("swipeRight",function(e){u.call(this,e)}),e.newTouch(".back-button",function(e){u.call(this,e)},i),i.on("tapBackButton",function(e){u.call(this,e)}),e.newTouch(".btn-my-order",function(e){e.preventDefault(),s.trigger("spa:navigate",{hash:"myOrder/1",pushData:{needReload:!0}})},i),e.newTouch(".btn-address-list",function(t){t.preventDefault(),s.trigger("spa:navigate",{hash:"addressList",pushData:{backHash:"mine"},callback:{onSelect:function(t,n){var r="";t.address.poi?r=t.address.city+t.address.area+t.address.poi.name+t.address.detail:r=t.address.province+t.address.city+t.address.area+t.address.detail,e("#default-address",i).text(r)}}})},i),e.newTouch(".btn-recharge",function(e){e.preventDefault(),s.trigger("spa:navigate",{hash:"recharge",pushData:{needReload:!0}})},i),e.newTouch(".btn-coupon",function(e){e.preventDefault(),r.checkLogin(function(){s.trigger("spa:navigate",{hash:"myCoupon"})})},i),e.newTouch(".btn-helper",function(){event.preventDefault()},i),e.newTouch(".btn-about",function(){event.preventDefault()},i),n.resolve()},beforeopen:function(e,t){t.resolve()},afteropen:function(i,u){var a=this,f=e(document);if(i.pushData&&i.pushData.needReset){var l="",c=o.defaultAddress;c.address.poi?l=c.address.city+c.address.area+c.address.poi.name+c.address.detail:l=c.address.province+c.address.city+c.address.area+c.address.detail;var h=t("mine/index",{showNavBar:!s.isWX,userName:r.name==""?"未登录":r.name,userBalance:r.balance,defaultAddress:l});e(".spa-page-body",a).html(h),setTimeout(function(){i.scroll=new n("#mineScroll")},500)}u.resolve()},beforeclose:function(e,t){t.resolve()}}});
+define(["$","template","IScroll","user","native","config","address"],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 i=this,s=e(document);i.on("swipeRight",function(e){u.call(this,e)}),e.newTouch(".back-button",function(e){u.call(this,e)},i),i.on("tapBackButton",function(e){u.call(this,e)}),e.newTouch(".btn-my-order",function(e){e.preventDefault(),s.trigger("spa:navigate",{hash:"myOrder/1",pushData:{needReload:!0}})},i),e.newTouch(".btn-address-list",function(t){t.preventDefault(),s.trigger("spa:navigate",{hash:"addressList",pushData:{backHash:"mine"},callback:{onSelect:function(t,n){var r="";t.address.poi?r=t.address.city+t.address.area+t.address.poi.name+t.address.detail:r=t.address.province+t.address.city+t.address.area+t.address.detail,e("#default-address",i).text(r)}}})},i),e.newTouch(".btn-recharge",function(e){e.preventDefault(),s.trigger("spa:navigate",{hash:"recharge",pushData:{needReload:!0}})},i),e.newTouch(".btn-coupon",function(e){e.preventDefault(),r.checkLogin(function(){s.trigger("spa:navigate",{hash:"myCoupon"})})},i),e.newTouch(".btn-helper",function(){event.preventDefault(),s.trigger("spa:navigate",{hash:"help"})},i),e.newTouch(".btn-about",function(){event.preventDefault(),s.trigger("spa:navigate",{hash:"about"})},i),n.resolve()},beforeopen:function(e,t){t.resolve()},afteropen:function(i,u){var a=this,f=e(document);if(i.pushData&&i.pushData.needReset){var l="",c=o.defaultAddress;c.address.poi?l=c.address.city+c.address.area+c.address.poi.name+c.address.detail:l=c.address.province+c.address.city+c.address.area+c.address.detail;var h=t("mine/index",{showNavBar:!s.isWX,userName:r.name==""?"未登录":r.name,userBalance:r.balance,defaultAddress:l});e(".spa-page-body",a).html(h),setTimeout(function(){i.scroll=new n("#mineScroll")},500)}u.resolve()},beforeclose:function(e,t){t.resolve()}}});

www/webapp/o2o/js/api.js

@@ -64,12 +64,33 @@ define(['config', 'base'], function(config, base) {
 		});
 	};
 
-	//获取商品列表
-	API.prototype.getProductList = function(data, callback) {
+	API.prototype.getHelp = function(data, callback) {
 		var that = this;
 		this.isLoading = true;
 		$.signAjax({
-			url: config.apiPath + '/index.php?r=o2o/product/list',
+			url: config.apiPath + '/index.php?r=api/common/staticSource&key=help_center',
+			data: data,
+			dataType: 'JSON',
+			success: function(res) {
+				that.isLoading = false;
+				if (callback) {
+					callback(res);
+				}
+			},
+			error: function(res) {
+				that.isLoading = false;
+				if (callback) {
+					callback(apiErrorResult);
+				}
+			}
+		});
+	};
+
+	API.prototype.getAbout = function(data, callback) {
+		var that = this;
+		this.isLoading = true;
+		$.signAjax({
+			url: config.apiPath + '/index.php?r=api/common/staticSource&key=about_us',
 			data: data,
 			dataType: 'JSON',
 			success: function(res) {

www/webapp/o2o/js/build/template.js

@@ -175,6 +175,16 @@
     if (typeof define === 'function') {define(function() {return template;});} else if (typeof exports !== 'undefined') {module.exports = template;} else {this.template = template;}
     
     /*v:1*/
+template('about/index',function($data,$filename
+/**/) {
+'use strict';var $utils=this,$helpers=$utils.$helpers,showNavBar=$data.showNavBar,$escape=$utils.$escape,title=$data.title,$out='';if(showNavBar ){
+$out+=' <header class="bar bar-nav"> <a class="left-button back-button"> <div class="icon icon-left-nav"></div> </a> <h1 class="title">';
+$out+=$escape(title);
+$out+='</h1> </header> ';
+}
+$out+=' <div class="content" id="helpScroll"> <div class="scroller"> <div class="page-content"> </div> </div> </div>';
+return new String($out);
+});/*v:1*/
 template('activities/alert',function($data,$filename
 /**/) {
 'use strict';var $utils=this,$helpers=$utils.$helpers,$escape=$utils.$escape,content=$data.content,$out='';$out+='<div class="box-container box-center"> <div class="activity-body alert-body"> <img src="';
@@ -818,6 +828,16 @@ $out+=' <header class="bar bar-nav"> <a class="left-button back-button"> <div cl
 }
 $out+=' <div class="content" id="descScroll"> <div class="scroller"> <div> </div> </div>';
 return new String($out);
+});/*v:6*/
+template('help/index',function($data,$filename
+/**/) {
+'use strict';var $utils=this,$helpers=$utils.$helpers,showNavBar=$data.showNavBar,$escape=$utils.$escape,title=$data.title,$out='';if(showNavBar ){
+$out+=' <header class="bar bar-nav"> <a class="left-button back-button"> <div class="icon icon-left-nav"></div> </a> <h1 class="title">';
+$out+=$escape(title);
+$out+='</h1> </header> ';
+}
+$out+=' <div class="content" id="helpScroll"> <div class="scroller"> <div class="page-content"> </div> </div> </div>';
+return new String($out);
 });/*v:1*/
 template('hire/index',function($data,$filename
 /**/) {

www/webapp/o2o/js/main.js

@@ -30,6 +30,8 @@ require.config({
     //page
     pageHome: './page/home',
     pageRecharge: './page/rechargee',
+    pageHelp: './page/help',
+    pageAbout: './page/about',
     pageProduct: './page/product',
     pageProductInfo: './page/productInfo',
     pageDesc: './page/desc',
@@ -443,7 +445,31 @@ require(['$', 'spa', 'native', 'helper', 'ratchet', 'config', 'user'], function
     }
   };
 
-  $doc.trigger('spa:route', [pageHome, pageRecharge, pageMine, pageProduct, pageProductInfo, pageDesc, pagePlaceOrder, pagePicker, pagePay, pageAppendPay, pagePaySuccess, pageMyOrder, pageMyOrderDetail, pageMyCoupon, pageAgreement, pageAddressList, pageAddressAdd, pageAddressDetail, pageAddressPoisiton, pageHire, pageComing, pageActivityCat, pageAppend, pageRefund, pageRefundSuccess, pageOrderDone, pageBeautician, pageBeauticianDetail]);
+  var pageHelp = {
+    route: 'help',
+    classname: 'help',
+    animate: 'slideInUp',
+    view: function () {
+      var $page = this;
+      requirejs(['pageHelp'], function (viewData) {
+        $doc.trigger('spa:initpage', [$page, viewData]);
+      })
+    }
+  };
+
+    var pageAbout = {
+        route: 'about',
+        classname: 'about',
+        animate: 'slideInUp',
+        view: function () {
+            var $page = this;
+            requirejs(['pageAbout'], function (viewData) {
+                $doc.trigger('spa:initpage', [$page, viewData]);
+            })
+        }
+    };
+
+  $doc.trigger('spa:route', [pageHome, pageRecharge, pageAbout, pageHelp, pageMine, pageProduct, pageProductInfo, pageDesc, pagePlaceOrder, pagePicker, pagePay, pageAppendPay, pagePaySuccess, pageMyOrder, pageMyOrderDetail, pageMyCoupon, pageAgreement, pageAddressList, pageAddressAdd, pageAddressDetail, pageAddressPoisiton, pageHire, pageComing, pageActivityCat, pageAppend, pageRefund, pageRefundSuccess, pageOrderDone, pageBeautician, pageBeauticianDetail]);
 
   var panelAlert = {
     id: 'simpleAlert',

www/webapp/o2o/js/page/about.js

@@ -0,0 +1,62 @@
+define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'api'], function ($, template, IScroll, recharge, native, config, api) {
+
+    function back(event) {
+        event.preventDefault();
+        $(document).trigger('spa:navigate', {
+            hash: 'mine'
+        });
+    }
+
+    return {
+        title: '关于',
+        body: '',
+        init: function (pageData, dtd) {
+            var $view = this;
+            var $doc = $(document);
+
+            /* 定义按钮事件。*/
+
+            // 返回
+            $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);
+            });
+
+            dtd.resolve();
+        },
+        beforeopen: function (pageData, dtd) {
+            dtd.resolve();
+        },
+        afteropen: function (pageData, dtd) {
+            var $view = this;
+            var $doc = $(document);
+            $doc.trigger('spa:openloader');
+            api.getAbout({}, function (res) {
+                if (res.success) {
+                    var tpl = template('help/index', {
+                        showNavBar: !config.isWX
+                    });
+                    $('.spa-page-body', $view).html(tpl);
+                    $('.page-content', $view).html(res.data.content);
+
+                    setTimeout(function () {
+                        pageData.scroll = new IScroll('#helpScroll');
+                    }, 500);
+
+                    dtd.resolve();
+                    $doc.trigger('spa:closeloader');
+                }
+            });
+        },
+        beforeclose: function (pageData, dtd) {
+            dtd.resolve();
+        }
+    }
+})

www/webapp/o2o/js/page/help.js

@@ -0,0 +1,62 @@
+define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'api'], function ($, template, IScroll, recharge, native, config, api) {
+
+    function back(event) {
+        event.preventDefault();
+        $(document).trigger('spa:navigate', {
+            hash: 'mine'
+        });
+    }
+
+    return {
+        title: '帮助中心',
+        body: '',
+        init: function (pageData, dtd) {
+            var $view = this;
+            var $doc = $(document);
+
+            /* 定义按钮事件。*/
+
+            // 返回
+            $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);
+            });
+
+            dtd.resolve();
+        },
+        beforeopen: function (pageData, dtd) {
+            dtd.resolve();
+        },
+        afteropen: function (pageData, dtd) {
+            var $view = this;
+            var $doc = $(document);
+            $doc.trigger('spa:openloader');
+            api.getHelp({}, function (res) {
+                if (res.success) {
+                    var tpl = template('help/index', {
+                        showNavBar: !config.isWX
+                    });
+                    $('.spa-page-body', $view).html(tpl);
+                    $('.page-content', $view).html(res.data.content);
+
+                    setTimeout(function () {
+                        pageData.scroll = new IScroll('#helpScroll');
+                    }, 500);
+
+                    dtd.resolve();
+                    $doc.trigger('spa:closeloader');
+                }
+            });
+        },
+        beforeclose: function (pageData, dtd) {
+            dtd.resolve();
+        }
+    }
+})

www/webapp/o2o/js/page/mine.js

@@ -103,17 +103,17 @@ define(['$', 'template', 'IScroll', 'user', 'native', 'config', 'address'], func
             // 帮助中心
             $.newTouch('.btn-helper', function () {
                 event.preventDefault();
-                // $doc.trigger('spa:navigate', {
-                //     hash: 'help'
-                // });
+                $doc.trigger('spa:navigate', {
+                    hash: 'help'
+                });
             }, $view);
 
             // 关于
             $.newTouch('.btn-about', function () {
                 event.preventDefault();
-                // $doc.trigger('spa:navigate', {
-                //     hash: 'about'
-                // });
+                $doc.trigger('spa:navigate', {
+                    hash: 'about'
+                });
             }, $view);
 
             /* 定义按钮事件结束。*/

www/webapp/o2o/tpl/about/index.html

@@ -0,0 +1,16 @@
+{{ if showNavBar }}
+<header class="bar bar-nav">
+    <a class="left-button back-button">
+        <div class="icon icon-left-nav"></div>
+    </a>
+    <h1 class="title">{{title}}</h1>
+</header>
+{{ /if }}
+
+<div class="content" id="helpScroll">
+    <div class="scroller">
+        <div class="page-content">
+
+        </div>
+    </div>
+</div>

www/webapp/o2o/tpl/help/index.html

@@ -0,0 +1,16 @@
+{{ if showNavBar }}
+<header class="bar bar-nav">
+    <a class="left-button back-button">
+        <div class="icon icon-left-nav"></div>
+    </a>
+    <h1 class="title">{{title}}</h1>
+</header>
+{{ /if }}
+
+<div class="content" id="helpScroll">
+    <div class="scroller">
+        <div class="page-content">
+
+        </div>
+    </div>
+</div>