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=2017051203">
+    <link rel="stylesheet" href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/o2o/dist/css/main.css?v=2017051206">
     <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=2017051203';
+    var main = '<?php echo Yii::app()->request->baseUrl;?>/webapp/o2o/dist/js/main.js?v=2017051206';
     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

@@ -58,13 +58,23 @@
 }
 
 .spa-page-balanceLog .new-time>div:nth-child(1){
-  border-right: 1px dashed white;
+  /*border-right: 1px dashed white;*/
 }
 .spa-page-balanceLog .new-time>div:nth-child(1)>div{
   padding-left: 15px;
 }
 .spa-page-balanceLog .new-time>div:nth-child(2),.new-time>div:nth-child(3){
 
+}
+.spa-page-balanceLog .new-time .btn-recharge{
+  position: absolute;
+  right: 15px;
+  top: 15px;
+  padding: 5px;
+  border: 1px solid rgba(255, 255, 255, 0.52);
+  border-radius: 5px;
+  background-color: #927603;
+  font-size: 13px;
 }
 /*第一行字体*/
 .spa-page-balanceLog .width-percent-33>div:nth-child(1){

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

@@ -3,7 +3,6 @@ define(['$', 'template', 'IScroll', 'user', 'product', 'native', 'config', 'addr
   var myDate = new Date();
   var year = myDate.getFullYear();
   var month = myDate.getMonth();
-  var ordersLength=false;
 
   function back (event) {
     event.preventDefault();
@@ -34,40 +33,54 @@ define(['$', 'template', 'IScroll', 'user', 'product', 'native', 'config', 'addr
     $(a).text(c)
   }
 
+  function select(pageData,view){
 
-// 刷新样式
-function time(view,pageData){
-  year=$('.year-span').text();
-  month=$('.month-span').text();
-  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) {
-      if(res.message.result.length==0){
-        ordersLength=true;
-      }
-      $('.total').text(res.message.total);
-      // 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);
-
-    } else {
-      $doc.trigger('spa:openpanel', ['simpleAlert', {
-        message: '暂无订单数据！'
-      }])
+    var type = $('.control-item.active').data('order-type');
+    var startTime = $('.year-span').text()+'-'+$('.month-span').text()+'-01';
+    var endTime = $('.year-span').text()+'-'+$('.month-span').text()+'-30';
+    $('.type-container', view).hide();
+    switch (type) {
+      case 1:
+      $('#descContainer').show();
+      api.getBalanceLog({
+        id: user.id,
+        start_time:startTime,
+        end_time:endTime
+      },function(res){
+        var balanceLog = res.message;
+        if (!cachePageData.massage) {
+          var tpl = template('balanceLog/productDescScroll', {
+            balanceLog: balanceLog
+          });
+          $('.pad-b-1', view).html(tpl);
+          setTimeout(function () {
+            pageData.scroll = new IScroll('#productDescScroll');
+          }, 100);
+        }
+      });
+      break;
+      case 2:
+      $('#reviewContainer').show();
+      api.getBalanceLog({
+        id: user.id,
+        start_time:startTime,
+        end_time:endTime
+      },function(res){
+        var balanceLog = res.message;
+        if (!cachePageData.massage) {
+          var tpl = template('balanceLog/orderContainer', {
+            balanceLog: balanceLog
+          });
+          $('.list-content', view).html(tpl);
+          setTimeout(function () {
+            pageData.scroll = new IScroll('#orderContainer');
+          }, 100);
+        }
+      });
+      break;
     }
-  })
-}
+  }
+
   var cachePageData = {}; //page内部的数据传递
 
   return {
@@ -91,23 +104,53 @@ function time(view,pageData){
       //tab切换
       $.newTouch('.order-type-control .control-item', function (event) {
         event.preventDefault();
-        var type = $(this).data('order-type');
-        $('.type-container', $view).hide();
-        switch (type) {
-          case 1:
-          $('#descContainer').show();
-          setTimeout(function () {
-            pageData.scroll = new IScroll('#productDescScroll');
-          }, 100);
-          break;
-          case 2:
-          $('#reviewContainer').show();
-          time($view,pageData);
-          break;
-        }
-      }, $view);
+        // var type = $(this).data('order-type');
+        // $('.type-container', $view).hide();
+        // switch (type) {
+        //   case 1:
+        //   $('#descContainer').show();
+        //   api.getBalanceLog({
+        //     id: user.id,
+        //     start_time:startTime,
+        //     end_time:endTime
+        //   },function(res){
+        //     var balanceLog = res.message;
+        //     if (!cachePageData.massage) {
+        //       var tpl = template('balanceLog/productDescScroll', {
+        //         balanceLog: balanceLog,
+        //       });
+        //       $('.pad-b-1', view).html(tpl);
+        //       setTimeout(function () {
+        //         pageData.scroll = new IScroll('#productDescScroll');
+        //       }, 100);
+        //     }
+        //   });
+        //   break;
+        //   case 2:
+        //   $('#reviewContainer').show();
+        //
+        //   api.getBalanceLog({
+        //     id: user.id,
+        //     start_time:startTime,
+        //     end_time:endTime
+        //   },function(res){
+        //     var balanceLog = res.message;
+        //     if (!cachePageData.massage) {
+        //       var tpl = template('balanceLog/orderContainer', {
+        //         balanceLog: balanceLog,
+        //       });
+        //       $('.list-content', view).html(tpl);
+        //       setTimeout(function () {
+        //         pageData.scroll = new IScroll('#orderContainer');
+        //       }, 100);
+        //     }
+        //   });
+        //   break;
+        // }
 
+        select(pageData,$view);
 
+      }, $view);
 
       // 切换时间
       $.newTouch('.time-year', function (event) {
@@ -147,7 +190,20 @@ function time(view,pageData){
         $('.o2o-modal').css('display','none')
         $('.year-span').text($('.modal-box-year').text());
         $('.month-span').text($('.modal-box-month').text());
-        time($view,pageData);
+        select(pageData,$view);
+      },$view);
+
+
+      // 充值
+      $.newTouch('.btn-recharge',function (event) {
+        event.preventDefault();
+				$doc.trigger('spa:navigate', {
+					hash: 'recharge',
+					pushData: {
+						needReload: true,
+						backHash: 'balanceLog'
+					}
+				});
       },$view);
 
       // 扩展显示
@@ -164,20 +220,7 @@ function time(view,pageData){
           $(this).children('div.arrow-block').addClass('arrow')
         }
       },$view);
-      // 去评价
-      $.newTouch('.order-btn-review', function (event) {
-          var obj = $(this);
-          if (obj.hasClass('disable')) {
-              return false;
-          }
-          var orderID = obj.data('order-id');
-          $doc.trigger('spa:openpanel', ['postReview', {
-              orderID: orderID,
-              didPostReview: function () {
-                  obj.addClass('disable').text('已评价');
-              }
-          }]);
-      }, $view);
+
 
       dtd.resolve();
     },
@@ -188,45 +231,31 @@ function time(view,pageData){
 
       var $view = this;
       var $doc = $(document);
+
+      var startTime = year+'-'+(month+1)+'-01';
+      var endTime = year+'-'+(month+1)+'-30';
+
+      // 获取余额明细
       api.getBalanceLog({
-        id: user.id
+        id: user.id,
+        start_time:startTime,
+        end_time:endTime
       }, function (res) {
         if (res.success) {
           var balanceLog = res.message;
           if (!cachePageData.massage) {
-            if(month<11){
-              month=(parseInt(month));
-            }
-            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) {
-                var ordersLength=res.message.result.length;
-                var tpl = template('balanceLog/index', {
-                  balanceLog: balanceLog,
-                  year: year,
-                  month: month,
-                  title:'余额明细',
-                  userBalance: user.balance,
-                  total: res.message.total,
-                  orders: res.message.result,
-                  ordersLength:ordersLength,
-                  showNavBar: !config.isWX && !config.isChubao,
-                });
-                $('.spa-page-body', $view).html(tpl);
-                setTimeout(function () {
-                  pageData.scroll = new IScroll('#productDescScroll');
-                }, 100);
-              } else {
-                $doc.trigger('spa:openpanel', ['simpleAlert', {
-                  message: '暂无订单数据！'
-                }])
-              }
-            })
+            var tpl = template('balanceLog/index', {
+              balanceLog: balanceLog,
+              year: year,
+              month: month,
+              title:'余额明细',
+              userBalance: user.balance,
+              showNavBar: !config.isWX && !config.isChubao,
+            });
+            $('.spa-page-body', $view).html(tpl);
+            setTimeout(function () {
+              pageData.scroll = new IScroll('#productDescScroll');
+            }, 100);
           }
         } else if (res.error) {
           console.log('失败！');

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

@@ -70,6 +70,7 @@ define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'user'], fun
 				// 使input失去焦点
 				$('.rechange-input', $view).blur();
 			},$view);
+
 			// 点击充值
 			$.newTouch('.btn-add-recharge', function (event) {
 				event.preventDefault();
@@ -84,7 +85,21 @@ define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'user'], fun
 						message: '请选择金额'
 					}]);
 					return;
-				}else if (parseInt(inputVal)===NaN || inputVal==="") {
+				}
+				// 判断是否为数字
+				console.log(inputVal);
+				if(inputVal !==undefined){
+					if (isNaN(inputVal)) {
+						// 弹出提示框
+						$doc.trigger('spa:openpanel', ['simpleAlert', {
+							message: '请输入数字'
+						}]);
+						return;
+					}
+				}
+
+				//  是否为空
+				if (inputVal==="") {
 					// 弹出提示框
 					$doc.trigger('spa:openpanel', ['simpleAlert', {
 						message: '请输入金额'
@@ -120,6 +135,15 @@ define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'user'], fun
 				});
 			}, $view);
 
+			// 清空input 输入的值与 获得 类名 为 on 的单位
+			$.newTouch('.btn-alert.btn-primary',function(event){
+				evnet.preventDefault();
+				// 使input失去焦点
+				$('.rechange-input', $view).blur();
+				$('.media.on .recharge-input').val('');
+				$('.media.on').removeClass('on');
+			},$view);
+
 			dtd.resolve();
 		},
 		beforeopen: function (pageData, dtd) {
@@ -152,7 +176,6 @@ define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'user'], fun
 					}
 				});
 			}
-
 			dtd.resolve();
 		},
 		beforeclose: function (pageData, dtd) {

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

@@ -26,6 +26,7 @@
             <a class="control-item active" data-order-type="1">充值</a>
             <a class="control-item" data-order-type="2">消费</a>
           </div>
+          <div class="btn-recharge">续费</div>
         </div>
 
 
@@ -35,20 +36,7 @@
             <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 && 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}}
+                    {{include './productDescScroll'}}
                 </div>
               </div>
             </div>
@@ -59,20 +47,7 @@
               <div id="orderContainer" class="scroll-container box-flex-1">
                 <div class="scroller">
                   <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}}
+                    {{include './orderContainer'}}
                   </ul>
                 </div>
               </div>

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

@@ -0,0 +1,14 @@
+{{ 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 }}

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

@@ -0,0 +1,14 @@
+{{ 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 }}

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

@@ -20,7 +20,7 @@
                             <input type="text" maxlength='8' name="" value="" class="rechange-input">
                           {{ else }}
                             <div>充值{{ recharge.denomination }}元</div>
-                            <div class="rechange-desc">{{ recharge.desc }}</div>
+                            <div class="recharge-desc">{{ recharge.desc }}</div>
                           {{ /if }}
                       </li>
                   {{ /each }}