H1H1T 8 سال پیش
والد
کامیت
b8b2e16e7a

+ 2 - 1
www/webapp/o2o/css/balanceLog.css

@@ -3,7 +3,8 @@
 }
 .spa-page-balanceLog .balance-log{
   margin: 15px auto;
-  border:1px solid rgba(0,0,0,0.3);
+  border-top:1px solid rgba(0,0,0,0.3);
+  border-bottom:1px solid rgba(0,0,0,0.3);
   background-color: white;
 }
 .spa-page-balanceLog div.balance-log:nth-child(1){

+ 7 - 7
www/webapp/o2o/css/myOrder.css

@@ -12,7 +12,7 @@
 .spa-page-my-order .order-desc-line {
   font-size: 0;
 }
-.spa-page-my-order .order-service-name {
+.spa-page-my-order .order-service-name ,.spa-page-balanceLog .order-service-name{
   margin-right: -50px;
   position: relative;
   padding-left: 41px;
@@ -24,21 +24,21 @@
   color: #f37b1d;
   font-size: 12px;
 }
-.spa-page-my-order .order-service-name .order-desc-title {
+.spa-page-my-order .order-service-name .order-desc-title,.spa-page-balanceLog .order-service-name .order-desc-title {
   position: absolute;
   left: 0;
 }
-.spa-page-my-order .order-service-name .order-desc-more {
+.spa-page-my-order .order-service-name .order-desc-more ,.spa-page-balanceLog .order-service-name .order-desc-more {
   margin-left: 0;
 }
-.spa-page-my-order .order-desc-title {
+.spa-page-my-order .order-desc-title,.spa-page-balanceLog .order-desc-title {
   font-size: 13px;
   color: #999;
   display: inline-block;
   vertical-align: top;
 }
 
-.spa-page-my-order .order-desc-more {
+.spa-page-my-order .order-desc-more,.spa-page-balanceLog .order-desc-more {
   font-size: 12px;
   color: #767A92;
   display: inline-block;
@@ -64,7 +64,7 @@
 .order-btn {
 
 }
-.spa-page-my-order .order-btn {
+.spa-page-my-order .order-btn,.spa-page-balanceLog .order-btn {
   display: inline-block;
   padding-left: 0.6rem;
   padding-right: 0.6rem;
@@ -107,7 +107,7 @@
 /*.spa-page-my-order .btn-alert-info {
   background: #d2d2d2;
 }*/
-.spa-page-my-order .order-number {
+.spa-page-my-order .order-number,.spa-page-balanceLog .order-number {
   margin-right: -50px;
   background: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWlkWU1pZCIgd2lkdGg9IjE2IiBoZWlnaHQ9IjI3IiB2aWV3Qm94PSIwIDAgMTYgMjciPgogIDxkZWZzPgogICAgPHN0eWxlPgogICAgICAuY2xzLTEgewogICAgICAgIGZpbGw6ICM5OTk7CiAgICAgICAgZmlsbC1ydWxlOiBldmVub2RkOwogICAgICB9CiAgICA8L3N0eWxlPgogIDwvZGVmcz4KICA8cGF0aCBkPSJNMS4yNzksMy41NDcgTDExLjEwMywxMy4zNzEgTDEuMTUwLDIzLjMyMyBMMS4xNTEsMjMuMzI0IEMwLjgyNiwyMy42NjEgMC42MjUsMjQuMTIwIDAuNjI1LDI0LjYyNSBDMC42MjUsMjUuNjYxIDEuNDY0LDI2LjUwMCAyLjUwMCwyNi41MDAgQzMuMDA2LDI2LjUwMCAzLjQ2NCwyNi4zMDAgMy44MDEsMjUuOTc1IEwzLjgwMiwyNS45NzUgTDE1LjA1MiwxNC43MjUgTDE1LjA1MSwxNC43MjUgQzE1LjQwNSwxNC4zODMgMTUuNjI1LDEzLjkwNSAxNS42MjUsMTMuMzc1IEMxNS42MjUsMTMuMzc0IDE1LjYyNSwxMy4zNzIgMTUuNjI1LDEzLjM3MSBDMTUuNjI1LDEzLjM3MCAxNS42MjUsMTMuMzY4IDE1LjYyNSwxMy4zNjcgQzE1LjYyNSwxMi44MzcgMTUuNDA1LDEyLjM1OCAxNS4wNTEsMTIuMDE4IEwxNS4wNTIsMTIuMDE3IEwzLjgwMiwwLjc2NyBMMy43OTcsMC43NzIgQzMuNDYwLDAuNDQ5IDMuMDAzLDAuMjUwIDIuNTAwLDAuMjUwIEMxLjQ2NCwwLjI1MCAwLjYyNSwxLjA5MCAwLjYyNSwyLjEyNSBDMC42MjUsMi42OTQgMC44NzgsMy4yMDMgMS4yNzksMy41NDcgWiIgY2xhc3M9ImNscy0xIi8+Cjwvc3ZnPgo=) no-repeat;
   background-position: right center;

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
www/webapp/o2o/dist/css/main.css


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
www/webapp/o2o/dist/js/build/template.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
www/webapp/o2o/dist/js/main.js


+ 1 - 1
www/webapp/o2o/dist/js/page/balanceLog.js

@@ -1 +1 @@
-define(["$","template","IScroll","user","product","native","config","address","api"],function(e,t,n,r,i,s,o,u,a){function c(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:f,pushData:{dontNeedReload:!0}})}var f,l,h={};return{title:"余额明细",body:"",init:function(t,r){var i=this,s=e(document);i.on("swipeRight",function(e){c.call(this,e)}),e.newTouch(".back-button",function(e){c.call(this,e)},i),i.on("tapBackButton",function(e){c.call(this,e)}),e.newTouch(".control-item",function(r){var o=e(this).data("order-type");console.log(o),e(".type-container",i).hide();switch(o){case 1:e("#descContainer").show(),setTimeout(function(){t.scroll=new n("#productDescScroll")},300);break;case 2:e("#reviewContainer").show(),s.trigger("spa:openloader");break;default:}},i),r.resolve()},beforeopen:function(e,t){var n=e.pushData;f=n.backHash?n.backHash:"",t.resolve()},afteropen:function(n,i){var s=this,o=e(document);a.getBalanceLog({id:r.id},function(n){if(n.success){var i=new Date,u=i.getFullYear(),f=i.getMonth();if(!h.massage){var l="2017-05-01",c="2017-05-30";a.getUserTotalOrder({user_id:r.id,start_time:l,end_time:c},function(n){if(!n.success){o.trigger("spa:openpanel",["simpleAlert",{message:"暂无订单数据!"}]);return}h.massage=n.massage;var i=t("balanceLog/index",{balanceLog:n.message,year:u,month:f,userBalance:r.balance,Order:h.massage});e(".spa-page-body",s).html(i)})}}else n.error&&console.log("失败!")}),i.resolve()},beforeclose:function(e,t){t.resolve()}}});
+define(["$","template","IScroll","user","product","native","config","address","api"],function(e,t,n,r,i,s,o,u,a){function p(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:f,pushData:{dontNeedReload:!0}})}var f,l=new Date,c=l.getFullYear(),h=l.getMonth(),d={};return{title:"余额明细",body:"",init:function(t,r){var i=this,s=e(document);i.on("swipeRight",function(e){p.call(this,e)}),e.newTouch(".back-button",function(e){p.call(this,e)},i),i.on("tapBackButton",function(e){p.call(this,e)}),e.newTouch(".control-item",function(r){var s=e(this).data("order-type");e(".type-container",i).hide();switch(s){case 1:e("#descContainer").show(),setTimeout(function(){t.scroll=new n("#productDescScroll")},100);break;case 2:e("#reviewContainer").show(),setTimeout(function(){t.scroll=new n("#orderContainer")},100)}},i),e.newTouch(".month",function(e){e.preventDefault(),console.log(c),console.log(h)},i),r.resolve()},beforeopen:function(i,s){var o=i.pushData;f=o.backHash?o.backHash:"";var u=this,l=e(document);a.getBalanceLog({id:r.id},function(s){if(s.success){var o=s.message;if(!d.massage){h<10&&(h="0"+(parseInt(h)+1));var f=c+"-"+h+"-01",p=c+"-"+h+"-30";a.getUserTotalOrder({user_id:r.id,start_time:f,end_time:p},function(s){if(s.success){var a=t("balanceLog/index",{balanceLog:o,year:c,month:h,userBalance:r.balance,total:s.message.total,orders:s.message.result});e(".spa-page-body",u).html(a),setTimeout(function(){i.scroll=new n("#productDescScroll")},100)}else l.trigger("spa:openpanel",["simpleAlert",{message:"暂无订单数据!"}])})}}else s.error&&console.log("失败!")}),s.resolve()},afteropen:function(t,n){var r=this,i=e(document);n.resolve()},beforeclose:function(e,t){t.resolve()}}});

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 3 - 3
www/webapp/o2o/js/build/template.js


+ 53 - 36
www/webapp/o2o/js/page/balanceLog.js

@@ -1,8 +1,11 @@
 define(['$', 'template', 'IScroll', 'user', 'product', 'native', 'config', 'address', 'api'], function ($, template, IScroll, user, product, native, config, address, api) {
   var backHash;
-  var balanceLog;
+  var myDate = new Date();
+  var year = myDate.getFullYear();
+  var month = myDate.getMonth();
 
-  function back(event) {
+
+  function back (event) {
     event.preventDefault();
     $(document).trigger('spa:navigate', {
       hash: backHash,
@@ -35,24 +38,32 @@ define(['$', 'template', 'IScroll', 'user', 'product', 'native', 'config', 'addr
       //tab切换
       $.newTouch('.control-item', function (event) {
         var type = $(this).data('order-type');
-        console.log(type);
         $('.type-container', $view).hide();
         switch (type) {
           case 1:
-          $('#descContainer').show();
-          setTimeout(function () {
-            pageData.scroll = new IScroll('#productDescScroll');
-          }, 300);
-          break;
+            $('#descContainer').show();
+            setTimeout(function () {
+              pageData.scroll = new IScroll('#productDescScroll');
+            }, 100);
+            break;
           case 2:
-          $('#reviewContainer').show();
-            $doc.trigger('spa:openloader');
-          break;
-          default:
-          break;
+            $('#reviewContainer').show();
+            setTimeout(function () {
+              pageData.scroll = new IScroll('#orderContainer');
+            }, 100);
+            break;
         }
       }, $view);
 
+      // 切换时间
+      $.newTouch('.month', function (event) {
+        event.preventDefault();
+        // var year = $('.year').text();
+        // var month = $('.month').text();
+        console.log(year);
+        console.log(month);
+      }, $view);
+
 
       dtd.resolve();
     },
@@ -60,41 +71,42 @@ define(['$', 'template', 'IScroll', 'user', 'product', 'native', 'config', 'addr
       /*获取上一页跳转的路由名称*/
       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) {
         if (res.success) {
-          var myDate=new Date();
-          var year=myDate.getFullYear();
-          var month=myDate.getMonth();
-          if(!cachePageData.massage){
-            var startTime='2017-05-01';
-            var endTime='2017-05-30';
+          var balanceLog = res.message;
+          if (!cachePageData.massage) {
+            if(month<10){
+              month='0'+(parseInt(month)+1);
+            }
+            var startTime = year+'-'+month+'-01';
+            var endTime = year+'-'+month+'-30';
             api.getUserTotalOrder({
-              user_id:user.id,
-              start_time:startTime,
-              end_time:endTime,
-            },function(res){
-              if(res.success){
-                cachePageData.massage=res.massage;
+              user_id: user.id,
+              start_time: startTime,
+              end_time: endTime,
+            }, function (res) {
+              if (res.success) {
                 var tpl = template('balanceLog/index', {
-                  balanceLog: res.message,
-                  year:year,
-                  month:month,
+                  balanceLog: balanceLog,
+                  year: year,
+                  month: month,
                   userBalance: user.balance,
-                  Order:cachePageData.massage,
+                  total: res.message.total,
+                  orders: res.message.result
                 });
                 $('.spa-page-body', $view).html(tpl);
-              }else {
+                setTimeout(function () {
+                  pageData.scroll = new IScroll('#productDescScroll');
+                }, 100);
+              } else {
                 $doc.trigger('spa:openpanel', ['simpleAlert', {
-                    message: '暂无订单数据!'
-                }]);
-                return;
+                  message: '暂无订单数据!'
+                }])
               }
             })
           }
@@ -102,6 +114,11 @@ define(['$', 'template', 'IScroll', 'user', 'product', 'native', 'config', 'addr
           console.log('失败!');
         }
       });
+      dtd.resolve();
+    },
+    afteropen: function (pageData, dtd) {
+      var $view = this;
+      var $doc = $(document);
 
       dtd.resolve();
     },

+ 4 - 8
www/webapp/o2o/tpl/balanceLog/index.html

@@ -8,12 +8,12 @@
               {{year}}年
             </div>
             <div class="month">
-              {{month+1}}月
+              {{month}}月
             </div>
           </div>
           <div class="width-percent-33 expenditure">
             <div>当月支出</div>
-            <div>{{Order.result.total}}元</div>
+            <div>{{total}}元</div>
           </div>
           <div class="width-percent-33 remaining">
             <div>余额</div>
@@ -47,14 +47,10 @@
 
           <div class="box-container hide type-container" id="reviewContainer">
             <div class="box-container box box-vertical">
-              <div id="productReviewScroll" class="scroll-container box-flex-1">
+              <div id="orderContainer" class="scroll-container box-flex-1">
                 <div class="scroller">
                   <ul class="table-view list-content">
-                  {{each Order.result as result}}
-                    <div>
-                      {{result.book_status_str}}
-                    </div>
-                  {{/each}}
+                    {{include '../myOrder/list'}}
                   </ul>
                   <div class="btn-more-container box-center hide">
                     <a class="btn btn-block btn-more-review">加载更多</a>

برخی فایل ها در این مقایسه diff نمایش داده نمی شوند زیرا تعداد فایل ها بسیار زیاد است