2

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

@@ -110,14 +110,23 @@
 }
 
 /*模态框*/
+.spa-page-balanceLog .o2o-modal{
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  width: 100%;
+  display: none;
+  position: fixed;
+  background: rgba(51, 51, 51, 0.2);
+}
+
 .spa-page-balanceLog .modal-box{
-  top: 35%;
+  top: 30%;
   left: 7.5%;
   width: 85%;
   position: fixed;
-  padding-top: 10px;
-  display: none;
-  background-color: white;
+  background-color: #fcfafa;
   border-top: 1px solid rgba(0, 0, 0, 0.43);
   border-left: 1px solid rgba(0, 0, 0, 0.43);
   border-right: 1px solid rgba(0, 0, 0, 0.43);
@@ -129,34 +138,42 @@
 }
 
 .spa-page-balanceLog .modal-box .width-percent-50>div:nth-child(1),.width-percent-50>div:nth-child(3){
-  width: 20px;
-  height: 20px;
+  width: 40px;
+  height: 30px;
   margin: 0 auto;
-  line-height: 17px;
+  cursor: pointer;
+  line-height: 26px;
   text-align: center;
   border-radius: 3px;
-  cursor: pointer;
   background-color: white;
-  border: 1px solid rgba(0, 0, 0, 0.14);
+  border: 1px solid rgba(0, 0, 0, 0.1);
 }
 
 .spa-page-balanceLog .modal-box .width-percent-50>div:nth-child(2){
-  text-align: center;
   margin: 3px;
   font-size: 15px;
+  text-align: center;
 }
 
 /*选择*/
 .spa-page-balanceLog .modal-box .select{
   clear: both;
   width: 100%;
-  margin-top: 80px;
+  margin-top: 5rem;
 }
 
 .spa-page-balanceLog .modal-box .select>div{
   width: 50%;
   float: left;
-  text-align: center;
   line-height: 30px;
+  text-align: center;
   border: 1px solid rgba(0, 0, 0, 0.14);
+  background: transparent;
+}
+.spa-page-balanceLog .select-the-month{
+  color: #212121;
+  line-height: 1.8rem;
+  padding-left: 0.9rem;
+  border-bottom: 2px solid #000000;
+  margin-bottom: 0.3rem;
 }

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

@@ -61,7 +61,7 @@ function time(view,pageData){
       setTimeout(function () {
         pageData.scroll = new IScroll('#orderContainer');
       }, 100);
-      
+
     } else {
       $doc.trigger('spa:openpanel', ['simpleAlert', {
         message: '暂无订单数据！'
@@ -113,8 +113,8 @@ function time(view,pageData){
       // 切换时间
       $.newTouch('.time-year', function (event) {
         event.preventDefault();
-        if($('.modal-box').css('display')=='none'){
-          $('.modal-box').css('display','block')
+        if($('.o2o-modal').css('display')=='none'){
+          $('.o2o-modal').css('display','block')
         }
         $('.modal-box-year').text($('.year-span').text());
         $('.modal-box-month').text($('.month-span').text());
@@ -140,13 +140,13 @@ function time(view,pageData){
       // 取消
       $.newTouch('.cancel',function(event){
         event.preventDefault();
-        $('.modal-box').css('display','none')
+        $('.o2o-modal').css('display','none')
         console.log('测试');
       },$view);
       // 确定
       $.newTouch('.determine',function(event){
         event.preventDefault();
-        $('.modal-box').css('display','none')
+        $('.o2o-modal').css('display','none')
         $('.year-span').text($('.modal-box-year').text());
         $('.month-span').text($('.modal-box-month').text());
         time($view,pageData);

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

@@ -58,21 +58,24 @@
           </div>
 
           <!-- 模态框 -->
-          <div class="modal-box">
-              <div class="width-percent-50">
-                <div class="btn-year-add">+</div>
-                <div class="modal-box-year"></div>
-                <div class="btn-year-sub">-</div>
-              </div>
-              <div class="width-percent-50">
-                <div class="btn-month-add">+</div>
-                <div class="modal-box-month"></div>
-                <div class="btn-month-sub">-</div>
-              </div>
-              <div class="select">
-                <div class="btn cancel">取消</div>
-                <div class="btn determine">确定</div>
-              </div>
+          <div class="o2o-modal">
+            <div class="modal-box">
+              <div class="select-the-month">选择月份</div>
+                <div class="width-percent-50">
+                  <div class="btn-year-add">+</div>
+                  <div class="modal-box-year"></div>
+                  <div class="btn-year-sub">-</div>
+                </div>
+                <div class="width-percent-50">
+                  <div class="btn-month-add">+</div>
+                  <div class="modal-box-month"></div>
+                  <div class="btn-month-sub">-</div>
+                </div>
+                <div class="select">
+                  <div class="btn cancel">取消</div>
+                  <div class="btn determine">确定</div>
+                </div>
+            </div>
           </div>
 
         </div>