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

www/protected/modules/o2o/views/web/index.php

@@ -10,7 +10,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <link rel="stylesheet" href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/framework/ratchet-2.0.2/dist/css/ratchet.min.css">
     <link rel="stylesheet" href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/framework/ratchet-2.0.2/dist/css/ratchet-theme-ios.min.css">
-    <link rel="stylesheet" href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/o2o/dist/css/main.css?v=2017050901">
+    <link rel="stylesheet" href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/o2o/dist/css/main.css?v=2017050902">
     <link href="<?php echo Yii::app()->request->baseUrl; ?>/css/common_o2o/swiper.css" rel="stylesheet">
     <script src="<?php echo Yii::app()->request->baseUrl; ?>/js/o2o/swiper.min.js"></script>
     <style>
@@ -76,7 +76,7 @@
       location.hash = '';
     }
     var debug = false;
-    var main = '<?php echo Yii::app()->request->baseUrl;?>/webapp/o2o/dist/js/main.js?v=2017050901';
+    var main = '<?php echo Yii::app()->request->baseUrl;?>/webapp/o2o/dist/js/main.js?v=2017050902';
     if (debug) {
       main = '<?php echo Yii::app()->request->baseUrl;?>/webapp/o2o/js/main.js?v=' + (new Date()).getTime();
       document.getElementById('debugMain').src = '<?php echo Yii::app()->request->baseUrl; ?>/webapp/common/js/debuggap.js';

www/webapp/o2o/css/balanceLog.css

@@ -64,7 +64,7 @@
   padding-left: 15px;
 }
 .spa-page-balanceLog .new-time>div:nth-child(2),.new-time>div:nth-child(3){
-  padding-left: 15px;
+
 }
 /*第一行字体*/
 .spa-page-balanceLog .width-percent-33>div:nth-child(1){
@@ -73,11 +73,11 @@
   color: rgba(255, 255, 255, 0.83);
 }
 /*三角符号*/
-.spa-page-balanceLog .width-percent-33 .month{
+.spa-page-balanceLog .width-percent-100 .month{
   position: relative;
   transition: 500ms all;
 }
-.spa-page-balanceLog .width-percent-33 .month:after{
+.spa-page-balanceLog .width-percent-100 .month:after{
   width: 0;
   height: 0;
   left: 55px;
@@ -88,9 +88,6 @@
   border-left: 5px solid transparent;
   border-right: 5px solid transparent;
 }
-.spa-page-balanceLog .width-percent-33 .month:active{
-
-}
 
 /*部分样式修改*/
 .spa-page-balanceLog .segmented-control{
@@ -177,3 +174,98 @@
   border-bottom: 2px solid #000000;
   margin-bottom: 0.3rem;
 }
+
+
+/*余额*/
+.spa-page-balanceLog span.user-balance{
+  font-size: 1.2rem;
+  margin: 0 15px;
+}
+.spa-page-balanceLog .time-year>div{
+  width: 50%;
+  float: left;
+  padding-left: 15px;
+}
+
+/*充值明细*/
+.recharge-details{
+  width: 100%;
+  margin-bottom: 10px;
+  position: relative;
+  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{
+  padding-left: 15px;
+  line-height: 1.8rem;
+}
+.recharge-details>div:nth-child(1){
+  border-bottom:1px solid rgba(0, 0, 0, 0.3);``
+}
+
+.recharge-details .extended{
+  height: 0px;
+  display: none;
+
+ -webkit-transition: all .25s;
+    -moz-transition: all .25s;
+     -ms-transition: all .25s;
+      -o-transition: all .25s;
+         transition: all .25s;
+}
+
+/*箭头旋转*/
+.recharge-details .arrow{
+  position: relative;
+}
+.recharge-details .arrow:after{
+  position: absolute;
+  right: 15px;
+  top: 18px;
+  width: 0;
+  height: 0;
+  content: "";
+  border-width: 6px 6px 0 6px;
+  border-style: solid;
+  border-color: #fff transparent;
+
+  -webkit-transition: all .25s;
+      -moz-transition: all .25s;
+       -ms-transition: all .25s;
+        -o-transition: all .25s;
+           transition: all .25s;
+}
+
+.recharge-details .arrow:before {
+    position: absolute;
+    right: 13px;
+    top: 18px;
+    width: 0;
+    height: 0;
+    content: "";
+    border-width: 8px 8px 0 8px;
+    border-style: solid;
+    border-color: #333 transparent;
+    -webkit-transition: transform .25s;
+       -moz-transition: transform .25s;
+        -ms-transition: transform .25s;
+         -o-transition: transform .25s;
+            transition: transform .25s;
+}
+
+.recharge-details .arrow.active:after{
+    top: 20px;
+    -webkit-transform: rotate(180deg);
+       -moz-transform: rotate(180deg);
+        -ms-transform: rotate(180deg);
+         -o-transform: rotate(180deg);
+            transform: rotate(180deg);
+}
+.recharge-details .arrow.active:before{
+    -webkit-transform: rotate(180deg);
+       -moz-transform: rotate(180deg);
+        -ms-transform: rotate(180deg);
+         -o-transform: rotate(180deg);
+            transform: rotate(180deg);
+}

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

@@ -1 +1 @@
-define(["$","template","IScroll","recharge","native","config","user"],function(e,t,n,r,i,s,o){function a(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:u,pushData:{dontNeedReload:!0}})}var u;return{title:"充值规则",body:"",init:function(t,n){var i=this,s=e(document);i.on("swipeRight",function(e){a.call(this,e)}),e.newTouch(".back-button",function(e){a.call(this,e)},i),i.on("tapBackButton",function(e){a.call(this,e)}),e.newTouch(".pay-agreement",function(e){e.preventDefault(),s.trigger("spa:navigate",{hash:"activity-text",pushData:{needReload:!0}})},i),e.newTouch(".pay-rule",function(e){e.preventDefault(),s.trigger("spa:navigate",{hash:"activity-rule",pushData:{needReload:!0}})},i),e.newTouch(".btn-add-recharge",function(t){t.preventDefault(),s.trigger("spa:openloader");var n=e(this).attr("data-value");r.addRechargeorder({user_id:o.id,value:"200",recharge_id:e(this).attr("data-id")},function(e){s.trigger("spa:closeloader"),e.success&&(o.orders[1].data.push({id:e.data._id.$id,products:[{product:{name:"充值"+n+"元"}}],final_price:e.data.price}),s.trigger("spa:navigate",{hash:"pay",pushData:{isRecharge:!0,orderID:e.data._id.$id,backHash:"recharge"}}))})},i),n.resolve()},beforeopen:function(e,t){var n=e.pushData;u=n.backHash?n.backHash:"",t.resolve()},afteropen:function(i,o){var u=this,a=e(document);i.pushData.dontNeedReload||(a.trigger("spa:openloader"),r.getRechargeList(function(r){a.trigger("spa:closeloader");if(r.success){var o=t("recharge/index",{showNavBar:!s.isWX,recharges:r.data});e(".spa-page-body",u).html(o);var f=e(".btn-add-recharge").attr("data-index");for(var l=f;l<2;l++);setTimeout(function(){i.scroll=new n("#rechargeScroll")},500)}})),o.resolve()},beforeclose:function(e,t){t.resolve()}}});
+define(["$","template","IScroll","recharge","native","config","user"],function(e,t,n,r,i,s,o){function a(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:u,pushData:{dontNeedReload:!0}})}var u;return{title:"充值规则",body:"",init:function(t,n){var i=this,s=e(document);i.on("swipeRight",function(e){a.call(this,e)}),e.newTouch(".back-button",function(e){a.call(this,e)},i),i.on("tapBackButton",function(e){a.call(this,e)}),e.newTouch(".pay-agreement",function(e){e.preventDefault(),s.trigger("spa:navigate",{hash:"activity-text",pushData:{needReload:!0}})},i),e.newTouch(".pay-rule",function(e){e.preventDefault(),s.trigger("spa:navigate",{hash:"activity-rule",pushData:{needReload:!0}})},i),e.newTouch(".btn-add-recharge",function(t){t.preventDefault(),s.trigger("spa:openloader");var n=e(this).attr("data-value");r.addRechargeorder({user_id:o.id,value:"1",recharge_id:e(this).attr("data-id")},function(e){s.trigger("spa:closeloader"),e.success&&(o.orders[1].data.push({id:e.data._id.$id,products:[{product:{name:"充值"+n+"元"}}],final_price:e.data.price}),s.trigger("spa:navigate",{hash:"pay",pushData:{isRecharge:!0,orderID:e.data._id.$id,backHash:"recharge"}}))})},i),n.resolve()},beforeopen:function(e,t){var n=e.pushData;u=n.backHash?n.backHash:"",t.resolve()},afteropen:function(i,o){var u=this,a=e(document);i.pushData.dontNeedReload||(a.trigger("spa:openloader"),r.getRechargeList(function(r){a.trigger("spa:closeloader");if(r.success){var o=t("recharge/index",{showNavBar:!s.isWX,recharges:r.data});e(".spa-page-body",u).html(o);var f=e(".btn-add-recharge").attr("data-index");for(var l=f;l<2;l++);setTimeout(function(){i.scroll=new n("#rechargeScroll")},500)}})),o.resolve()},beforeclose:function(e,t){t.resolve()}}});

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);
@@ -149,6 +150,20 @@ function time(view,pageData){
         time($view,pageData);
       },$view);
 
+      // 扩展显示
+      $.newTouch('.recharge-details',function (event) {
+        event.preventDefault();
+        $(this).children('div.arrow').toggleClass('active');
+        if($(this).children('div.extended').css('display')=='none'){
+          $(this).children('div.extended').css('height','4rem').css('display','block');
+          $(this).siblings().children('div.extended').css('height','0').css('display','none');
+          $(this).siblings().children('div.arrow').removeClass('active');
+
+        }else {
+          $(this).children('div.extended').css('height','0').css('display','none');
+          $(this).children('div.arrow-block').addClass('arrow')
+        }
+      },$view);
       // 去评价
       $.newTouch('.order-btn-review', function (event) {
           var obj = $(this);
@@ -180,7 +195,7 @@ function time(view,pageData){
           var balanceLog = res.message;
           if (!cachePageData.massage) {
             if(month<11){
-              month=(parseInt(month)+1);
+              month=(parseInt(month));
             }
             var startTime = year+'-'+month+'-01';
             var endTime = year+'-'+month+'-30';

www/webapp/o2o/js/page/rechargee.js

@@ -65,7 +65,7 @@ define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'user'], fun
 				var value = $(this).attr('data-value');
 				recharge.addRechargeorder({
 					user_id: user.id,
-					value:'200',
+					value:'1',
 					recharge_id: $(this).attr('data-id')
 				}, function (res) {
 					$doc.trigger('spa:closeloader');

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

@@ -11,22 +11,17 @@
     <div class="box-container box box-vertical">
       <div id="balanceLogScroll" class="scroll-container box-flex-1">
         <div class="new-time">
-          <div class="width-percent-33 time-year">
+          <div class="width-percent-100">
+            <div>余额:<span class="user-balance">{{userBalance}}</span>元</div>
+          </div>
+          <div class="width-percent-100 time-year">
             <div class="year">
               <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="width-percent-33 expenditure">
-            <div>支出</div>
-            <div><span class="total">{{total}}</span>元</div>
-          </div>
-          <div class="width-percent-33 remaining">
-            <div>余额</div>
-            <div>{{userBalance}}元</div>
-          </div>
           <div class="segmented-control order-type-control">
             <a class="control-item active" data-order-type="1">充值</a>
             <a class="control-item" data-order-type="2">消费</a>
@@ -40,14 +35,20 @@
             <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}}
-                  <div class="balance-log">
-                    <div class="time-str">{{Log.time}}</div>
-                    <div class="memo"><span class="left">支付用途:</span>{{Log.memo}}</div>
-                    <div class="type-str"><span class="left">交易类型:</span>{{Log.type_str}}</div>
-                    <div class="type-str"><span class="left">交易数额:</span>{{if Log.amount<0}}<span class="red">扣除{{-(Log.amount)}}</span>{{else if Log.type_str=='下订单'}}<span class="red">扣除{{Log.amount}}</span>{{else if Log.type_str=='后台充值' || Log.type_str=='赠送'|| Log.type_str=='充值'}}<span class="green">充值{{Log.amount}}</span>{{/if}}元</div>
-                  </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="arrow">
+                          <span class="green">充值{{Log.amount}}</span>元
+                        </div>
+                        <div class="extended">
+                          <div class="memo"><span class="left">支付用途:</span>{{Log.memo}}</div>
+                          <div class="type-str"><span class="left">交易类型:</span>{{Log.type_str}}</div>
+                        </div>
+                      </div>
+                      {{/if}}
+                    {{/each}}
                 </div>
               </div>
             </div>
@@ -57,8 +58,21 @@
             <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="arrow">
+                          <span class="red">消费{{Log.amount}}</span>元
+                        </div>
+                        <div class="extended">
+                          <div class="memo"><span class="left">交易说明:</span>{{Log.memo}}</div>
+                          <div class="type-str"><span class="left">交易类型:</span>{{Log.type_str}}</div>
+                        </div>
+                      </div>
+                      {{/if}}
+                    {{/each}}
                   </ul>
                 </div>
               </div>