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

@@ -47,11 +47,9 @@ function time(view,pageData){
     end_time: endTime,
   }, function (res) {
     if (res.success) {
-      console.log(res.message.result.length);
       if(res.message.result.length==0){
         ordersLength=true;
       }
-      console.log(ordersLength);
       $('.total').text(res.message.total);
       var tpl = template('myOrder/list', {
         orders: res.message.result,
@@ -141,7 +139,6 @@ function time(view,pageData){
       $.newTouch('.cancel',function(event){
         event.preventDefault();
         $('.o2o-modal').css('display','none')
-        console.log('测试');
       },$view);
       // 确定
       $.newTouch('.determine',function(event){
@@ -152,6 +149,20 @@ function time(view,pageData){
         time($view,pageData);
       },$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();
     },
@@ -168,7 +179,7 @@ function time(view,pageData){
         if (res.success) {
           var balanceLog = res.message;
           if (!cachePageData.massage) {
-            if(month<10){
+            if(month<11){
               month=(parseInt(month)+1);
             }
             var startTime = year+'-'+month+'-01';
@@ -180,15 +191,16 @@ function time(view,pageData){
             }, function (res) {
               if (res.success) {
                 var ordersLength=res.message.result.length;
-                console.log(ordersLength);
                 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 () {

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

@@ -1,3 +1,11 @@
+{{ if showNavBar }}
+<header class="bar bar-nav">
+  <a class="left-button back-button">
+    <div class="icon icon-left-nav"></div>
+  </a>
+  <h1 class="title">{{title}}</h1>
+</header>
+{{ /if }}
 <div class="content">
   <div class="box-container">
     <div class="box-container box box-vertical">