6

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

@@ -51,7 +51,7 @@ define(['$', 'template', 'IScroll', 'user', 'product', 'native', 'config', 'addr
       var placeOrderScroll;
       setTimeout(function () {
           pageData.scroll = new IScroll(id);
-      }, 700);
+      }, 100);
   }
 
   function select(pageData,view){

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

@@ -38,7 +38,6 @@
               <div id="productDescScroll" class="box-flex-1">
                 <div class="pad-b-1" style="background-color:#d2d2d2;">
                     {{include './productDescScroll'}}
-                    <div style="width:100%;padding-bottom:15%;"></div>
                 </div>
               </div>
             </div>
@@ -50,7 +49,6 @@
                 <div class="scroller">
                   <ul class="table-view list-content" style="background-color: rgb(210, 210, 210);">
                     {{include './orderContainer'}}
-                    <div style="width:100%;padding-bottom:15%;"></div>
                   </ul>
                 </div>
               </div>

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

@@ -12,3 +12,4 @@
   </div>
   {{ /if }}
 {{ /each }}
+<div style="width:100%;padding-bottom:15%;background-color: white;"></div>

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

@@ -12,3 +12,4 @@
   </div>
   {{ /if }}
 {{ /each }}
+<div style="width:100%;padding-bottom:15%;background-color: white;"></div>