balanceLog

www/webapp/o2o/css/balanceLog.css

@@ -184,15 +184,21 @@
 .spa-page-balanceLog .time-year>div{
   width: 50%;
   float: left;
+  padding-left: 15px;
 }
 
 /*充值明细*/
-.spa-page-balanceLog .recharge-details{
+ .recharge-details{
   width: 100%;
-  padding: 15px 0;
   margin-bottom: 10px;
   background-color: white;
+  border-top: 1px solid rgba(0, 0, 0, 0.3);
+  border-bottom: 1px solid rgba(0, 0, 0, 0.3);
+}
+.recharge-details>div{
+  line-height: 1.8rem;
+  padding-left: 15px;
 }
-.spa-page-balanceLog .recharge-details>div{
-  line-height: 1rem;
+.recharge-details>div:nth-child(1){
+  border-bottom:1px solid rgba(0, 0, 0, 0.3);``
 }

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

@@ -51,11 +51,12 @@ function time(view,pageData){
         ordersLength=true;
       }
       $('.total').text(res.message.total);
-      var tpl = template('myOrder/list', {
-        orders: res.message.result,
-        ordersLength:ordersLength,
-      });
-      $('.list-content', view).html(tpl);
+      // console.log(res.message.result);
+      // var tpl = template('myOrder/list', {
+      //   orders: res.message.result,
+      //   ordersLength:ordersLength,
+      // });
+      // $('.list-content', view).html(tpl);
       setTimeout(function () {
         pageData.scroll = new IScroll('#orderContainer');
       }, 100);
@@ -179,9 +180,8 @@ function time(view,pageData){
         if (res.success) {
           var balanceLog = res.message;
           if (!cachePageData.massage) {
-            console.log(month);
             if(month<11){
-              month=(parseInt(month)+1);
+              month=(parseInt(month));
             }
             var startTime = year+'-'+month+'-01';
             var endTime = year+'-'+month+'-30';

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

@@ -19,7 +19,7 @@
               <span class="year-span">{{year}}</span>年
             </div>
             <div class="month">
-              <span class="month-span">{{month}}</span>月
+              <span class="month-span">{{month+1}}</span>月
             </div>
           </div>
           <div class="segmented-control order-type-control">
@@ -35,16 +35,16 @@
             <div class="box-container box box-vertical">
               <div id="productDescScroll" class="box-flex-1">
                 <div class="pad-b-1" style="background-color:#d2d2d2;">
-                  {{each balanceLog as Log}}
-                  {{if Log.amount>0}}
-                  <div class="recharge-details">
-                    <div class="time-str">您在{{Log.time}}</div>
-                    <div class="">
-                      <span class="green">充值{{Log.amount}}</span>元
-                    </div>
-                    {{/if}}
-                  </div>
-                  {{/each}}
+                    {{each balanceLog as Log}}
+                      {{if Log.amount>0 && Log.memo!=="微信下订单" && Log.memo!=="下订单"}}
+                      <div class="recharge-details">
+                        <div class="time-str">您在{{Log.time}}</div>
+                        <div class="">
+                          <span class="green">充值{{Log.amount}}</span>元
+                        </div>
+                      </div>
+                      {{/if}}
+                    {{/each}}
                 </div>
               </div>
             </div>
@@ -54,8 +54,17 @@
             <div class="box-container box box-vertical">
               <div id="orderContainer" class="scroll-container box-flex-1">
                 <div class="scroller">
-                  <ul class="table-view list-content">
-                    {{include '../myOrder/list'}}
+                  <ul class="table-view list-content" style="background-color: rgb(210, 210, 210);">
+                    {{each balanceLog as Log}}
+                      {{if Log.memo=="微信下订单" || Log.memo=="下订单" || Log.amount<0}}
+                      <div class="recharge-details">
+                        <div class="time-str">您在{{Log.time}}</div>
+                        <div class="">
+                          <span class="red">消费{{Log.amount}}</span>元
+                        </div>
+                      </div>
+                      {{/if}}
+                    {{/each}}
                   </ul>
                 </div>
               </div>