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

@@ -6,34 +6,56 @@
 
 }
 
+.spa-page-recharge .recharge-title{
+  padding-left: 15px;
+  font-size: 20px;
+  border-bottom: 1px solid rgba(0, 0, 0, 0.4);
+  padding-bottom: 10px;
+  padding-top: 11px;
+}
+
 .spa-page-recharge .list-content{
   align-content:flex-start;
 }
 
 .spa-page-recharge .media{
-  margin: 3%;
+  margin: 2%;
   float: left;
-  height: 6rem;
-  padding: 15px;
-  width: 27.33%;
+  height: 2.5rem;
+  padding: 10px 0;
+  width: 25.33%;
   cursor: pointer;
   font-size: 13px;
   border: 1px solid;
   text-align: center;
 }
+
 .spa-page-recharge .media.on{
   border: 2px solid rgba(146,118,3,1);
+  font-size: 12px;
 }
+
+.spa-page-recharge .media div{
+  line-height:1.5rem;
+}
+
 .spa-page-recharge .media input{
   margin: 0;
   padding: 0;
-  width: 100%;
-  height: 45px;
-  margin-top: 10%;
+  width: 40%;
+  height: 25px;
+  margin-top: 2%;
   text-align: center;
 }
 .spa-page-recharge .media .input-title{
-
+  line-height: 1.5rem;
+  font-size: 12px;
+  width: 35%;
+  float: left;
+}
+.spa-page-recharge .media .input-rmb {
+  float: left;
+  width: 12%;
 }
 .spa-page-recharge .media .rechange-desc{
   margin-top: 1rem;
@@ -54,3 +76,16 @@
 .spa-page-recharge .btn-add-recharge:active{
 
 }
+
+.spa-page-recharge .media:nth-child(4){
+  padding: 15px;
+  width: 84%;
+  padding-top: 0.4rem;
+}
+
+/*媒体查询-文档宽度小于320px*/
+@media screen and (max-width:320px) {
+  .spa-page-recharge .media div{
+    line-height: 2rem;
+  }
+}

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

@@ -26,7 +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 class="btn-recharge">充值</div>
         </div>
 
 

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

@@ -10,30 +10,25 @@
     <div class="box-container box box-vertical">
         <div id="rechargeScroll" class="scroll-container box-flex-1">
             <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%;">
-                <ul class="ad-hide list-content list-recharge" style="padding-top: 5px;padding-bottom: 5px">
+                <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>
+                <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 }}">
                           {{ if recharge.denomination === 1 }}
                             <div class="input-title">其他数额</div>
-                            <input type="text" maxlength='8' name="" value="" class="rechange-input">
+                            <div class="input-rmb">RMB:</div><input type="text" maxlength='8' name="" value="" class="rechange-input">
                           {{ else }}
-                            <div>充值{{ recharge.denomination }}元</div>
-                            <div class="recharge-desc">{{ recharge.desc }}</div>
+                            <div>RMB:{{ recharge.denomination }}</div>
                           {{ /if }}
                       </li>
                   {{ /each }}
                 </ul>
-                <div class="btn-add-recharge">立即去充值</div>
-                <div class="ad-hide" style="text-align: center;"><span
-                        style="font-size: 0.6rem">点击立即充值，即表示您已经同意壹管家</span><span
-                        style="font-size: 0.6rem;font-weight: 600;display: block;"></span>
-                    <span style="font-size: 0.6rem;">《<span class="pay-agreement"
-                                                            style="text-decoration: underline;color: #0A246A">充返活动协议</span>》</span>
+                <div class="ad-hide" style="text-align: center;clear: both;margin-top: 10rem;"><span style="font-size: 0.6rem">点击立即充值，即表示您已经同意壹管家</span><span style="font-size: 0.6rem;font-weight: 600;display: block;"></span><span style="font-size: 0.6rem;">《<span class="pay-agreement" style="text-decoration: underline;color: #0A246A">充返活动协议</span>》</span>
                     <!--<span style="display: inline-block;font-size: 0.6rem;font-weight: 600; " class="pay-rule"><span
                         style="text-decoration: underline;color: #0A246A">活动规则</span></span>-->
                 </div>
+                <div class="btn-add-recharge">立即去充值</div>
                 <div style="width: 100%;padding-bottom: 13%;"></div>
             </div>
         </div>