Merge branch 'test' of git.oschina.net:yiguanjia/php into test

www/webapp/o2o/build.js

@@ -32,6 +32,7 @@
 			'pageAddressPoisiton',
 			'pageBeautician',
 			'pageBeauticianDetail',
+			'pageBalanceLog',
 			'pageHire',
 			'panelAlert',
 			'panelDataPicker',

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

@@ -45,6 +45,7 @@ bdmapapi.js
 page/address/addressPoi.js
 page/beautician.js
 page/beauticianDetail.js
+page/balanceLog.js
 page/hire.js
 panel/alert.js
 panel/dataPicker.js

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

@@ -0,0 +1 @@
+define(["$","template","IScroll","user","product","native","config","address","api"],function(e,t,n,r,i,s,o,u,a){function l(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:f,pushData:{dontNeedReload:!0}})}var f;return{title:"家庭保洁",body:"",init:function(t,n){var r=this,i=e(document);r.on("swipeRight",function(e){l.call(this,e)}),e.newTouch(".back-button",function(e){l.call(this,e)},r),r.on("tapBackButton",function(e){l.call(this,e)}),n.resolve()},beforeopen:function(e,t){var n=e.pushData;f=n.backHash?n.backHash:"",t.resolve()},afteropen:function(i,s){var u=this,f=e(document);a.getBalanceLog({id:r.id},function(e){console.log(e),e.success?console.log(e):e.error&&console.log("error")});if(i.pushData&&i.pushData.needReset){var l=t("balanceLog/index",{showNavBar:!o.isWX});e(".spa-page-body",u).html(l),setTimeout(function(){i.scroll=new n("#balanceLogScroll")},500)}s.resolve()},beforeclose:function(e,t){t.resolve()}}});

www/webapp/o2o/js/api.js

@@ -80,6 +80,28 @@ define(['config', 'base'], function (config, base) {
             }
         });
     };
+    //获取余额消费信息
+    API.prototype.getBalanceLog = function (data,callback) {
+        var that = this;
+        this.isLoading = true;
+        $.signAjax({
+            url: 'http://admin.yiguanjia.me/index.php?r=rUser/balanceLog',
+            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.getAgreement = function (data, callback) {
         var that = this;

www/webapp/o2o/js/main.js

@@ -65,6 +65,7 @@ require.config({
         pageBeauticianDetail: './page/beauticianDetail',
         pageMine: './page/mine',
         pageSecondary: './page/secondary',
+        pageBalanceLog:'./page/balanceLog',
         //panel
         panelAlert: './panel/alert',
         panelActionSheet: './panel/actionSheet',
@@ -114,6 +115,18 @@ require(['$', 'spa', 'native', 'helper', 'ratchet', 'config', 'user'], function
             })
         }
     };
+    // 余额消费列表
+    var pageBalanceLog = {
+        route: 'balanceLog',
+        classname: 'balanceLog',
+        animate: 'pushInLeft',
+        view: function () {
+            var $page = this;
+            requirejs(['pageBalanceLog'], function (viewData) {
+                $doc.trigger('spa:initpage', [$page, viewData])
+            })
+        }
+    };
     //家庭保洁
     var pageSecondary = {
         route: 'secondary',
@@ -533,7 +546,7 @@ require(['$', 'spa', 'native', 'helper', 'ratchet', 'config', 'user'], function
         }
     };
 
-    $doc.trigger('spa:route', [pageHome, pageRecharge, pageAbout, pageHelp, pageMine, pageSecondary, pageHomestay, pageHomeenterprise, pageProduct, pageProductInfo, pageDesc, pagePlaceOrder, pagePicker, pagePay, pageAppendPay, pagePaySuccess, pageMyOrder, pageMyOrderDetail, pageMyCoupon, pageAgreement, pageAddressList, pageAddressAdd, pageAddressDetail, pageAddressPoisiton, pageHire, pageComing, pageActivityCat, pageActivityText, pageActivityRule, pageAppend, pageRefund, pageRefundSuccess, pageOrderDone, pageBeautician, pageBeauticianDetail]);
+    $doc.trigger('spa:route', [pageHome, pageRecharge, pageAbout, pageHelp, pageMine, pageSecondary,pageBalanceLog, pageHomestay, pageHomeenterprise, pageProduct, pageProductInfo, pageDesc, pagePlaceOrder, pagePicker, pagePay, pageAppendPay, pagePaySuccess, pageMyOrder, pageMyOrderDetail, pageMyCoupon, pageAgreement, pageAddressList, pageAddressAdd, pageAddressDetail, pageAddressPoisiton, pageHire, pageComing, pageActivityCat, pageActivityText, pageActivityRule, pageAppend, pageRefund, pageRefundSuccess, pageOrderDone, pageBeautician, pageBeauticianDetail]);
 
     var panelAlert = {
         id: 'simpleAlert',

www/webapp/o2o/js/page/balanceLog.js

@@ -0,0 +1,76 @@
+define(['$', 'template', 'IScroll', 'user', 'product', 'native', 'config', 'address','api'], function ($, template, IScroll, user, product, native, config, address,api) {
+    var backHash;
+    function back(event) {
+        event.preventDefault();
+        $(document).trigger('spa:navigate', {
+            hash: backHash,
+            pushData: {
+                dontNeedReload: true
+            }
+        });
+    }
+    return {
+        title: '家庭保洁',
+        body: '',
+        init: function (pageData, dtd) {
+            /* this是什么？ */
+            var $view = this;
+            var $doc = $(document);
+
+            /* 定义按钮事件。
+             * 为什么不是$(selector).onclick(function)呢？
+             */
+
+
+            // 返回
+            $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) {
+            /*获取上一页跳转的路由名称*/
+            var pushData = pageData.pushData;
+            backHash = pushData.backHash ? pushData.backHash : '';
+            dtd.resolve();
+        },
+        afteropen: function (pageData, dtd) {
+            var $view = this;
+            var $doc = $(document);
+            api.getBalanceLog({
+                id:user.id
+            },function (res) {
+                console.log(res);
+                if(res.success){
+                    console.log(res);
+                }else if(res.error){
+                    console.log('error');
+                }
+            });
+            if (pageData.pushData && pageData.pushData.needReset) {
+                var tpl = template('balanceLog/index', {showNavBar: !config.isWX});
+                $('.spa-page-body', $view).html(tpl);
+                setTimeout(function () {
+                    pageData.scroll = new IScroll('#balanceLogScroll');
+                }, 500);
+
+            }
+
+            /* 又是这个。不知道什么玩意…… */
+            dtd.resolve();
+        },
+        beforeclose: function (pageData, dtd) {
+            dtd.resolve();
+        }
+    }
+})

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

@@ -55,6 +55,16 @@ define(['$', 'template', 'IScroll', 'user', 'native', 'config', 'address', 'prod
 					}
 				});
 			}, $view);
+			// 我的余额
+			$.newTouch('.user-balance', function (event) {
+				event.preventDefault();
+				$doc.trigger('spa:navigate', {
+					hash: 'balanceLog',
+					pushData: {
+						needReload: true
+					}
+				});
+			}, $view);
 
 			// 常用地址
 			$.newTouch('.btn-address-list', function (event) {

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

@@ -0,0 +1,20 @@
+{{ 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">
+    <div class="box-container">
+        <div class="box-container box box-vertical">
+            <div id="balanceLogScroll" class="scroll-container box-flex-1">
+                <div class="scroller">
+                    <h4>用户余额</h4>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>