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

@@ -136,6 +136,7 @@
   right: 0;
   position: absolute;
 }
+
 /*模态框*/
 .spa-page-balanceLog .o2o-modal{
   top: 0;

www/webapp/o2o/css/recharge.css

@@ -13,7 +13,37 @@
   padding-bottom: 10px;
   padding-top: 11px;
 }
+.spa-page-recharge .recharge-activity{
+  padding-left: 15px;
+  font-size: 14px;
+  margin-top: 10px;
+}
+
+.spa-page-recharge .recharge-details{
+  margin: 0 15px;
+  width: 90%;
+  border-top: 0;
+  padding-left: 0;
+  border: 0;
+}
 
+.spa-page-recharge .recharge-details>div:nth-child(1){
+  border-bottom: 0;
+  padding: 0;
+}
+
+.spa-page-recharge .recharge-details .extended{
+  left: 0px;
+  right: 0px;
+  height: 0px;
+  display: none;
+  padding: 0 20px;
+  position: absolute;
+}
+.spa-page-recharge .recharge-details .extended>div{
+  font-size: 14px;
+  background-color: white;
+}
 .spa-page-recharge .list-content{
   align-content:flex-start;
 }

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

@@ -215,7 +215,6 @@ define(['$', 'template', 'IScroll', 'user', 'product', 'native', 'config', 'addr
       // IScroll
       $.newTouch('.arrow',function (event){
         event.preventDefault();
-        console.log('div名为arrow，可以点击');
         var type = $('.control-item.active').data('order-type');
         // fixScroll(pageData,type);
       },$view);
@@ -225,7 +224,7 @@ define(['$', 'template', 'IScroll', 'user', 'product', 'native', 'config', 'addr
         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).children('div.extended').css('display','block');
           $(this).siblings().children('div.extended').css('height','0').css('display','none');
           $(this).siblings().children('div.arrow').removeClass('active');
         }else {

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

@@ -71,6 +71,19 @@ define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'user'], fun
 				$('.rechange-input', $view).blur();
 			},$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('.btn-add-recharge', function (event) {
 				event.preventDefault();

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

@@ -12,6 +12,16 @@
             <div class="scroller">
                 <img class="ad-hide" src="http://odulvej8l.bkt.clouddn.com/%E5%85%85%E5%80%BC%E5%8D%A1.jpg" style="width: 100%;">
                      <div class="recharge-title">充值余额</div>
+                     <div class="recharge-details">
+                       <div class="arrow">充值有好礼</div>
+                       <div class="extended">
+                         <div>充值1000--赠送：一挂式空调清洗</div>
+                         <div>充值3000--赠送：一床一沙发除螨</div>
+                         <div>充值5000--赠送：二床一沙发除螨</div>
+                         <div>充值10000--赠送：一冰箱清洗一挂式空调清洗一洗衣机清洗二床一沙发除螨</div>
+                       </div>
+                     </div>
+
                 <ul class="ad-hide list-content list-recharge" style="padding-top: 5px;padding-bottom: 5px;padding-left: 10%;">
                   {{ each recharges as recharge i }}
                       <li class="media" data-id="{{ recharge.id }}" data-value="{{ recharge.denomination }}"  data-index="{{ i }}">