e 8 years ago
parent
commit
d521d95dbd

+ 3 - 3
www/protected/controllers/RechargeController.php

@@ -123,7 +123,7 @@ class RechargeController extends AdminController {
         } else{
         } else{
             //返现
             //返现
             $cash_back = intval(Yii::app()->request->getParam('cash_back', ''));
             $cash_back = intval(Yii::app()->request->getParam('cash_back', ''));
-            if ($cash_back <= 0 ){
+            if ($cash_back < 0 ){
                 CommonFn::requestAjax(false, '返现金额不能为0');
                 CommonFn::requestAjax(false, '返现金额不能为0');
             }
             }
         }
         }
@@ -197,7 +197,7 @@ class RechargeController extends AdminController {
         } else{
         } else{
             //返现
             //返现
             $cash_back = intval(Yii::app()->request->getParam('cash_back', ''));
             $cash_back = intval(Yii::app()->request->getParam('cash_back', ''));
-            if ($cash_back <= 0 ){
+            if ($cash_back < 0 ){
                 CommonFn::requestAjax(false, '返现金额不能为0');
                 CommonFn::requestAjax(false, '返现金额不能为0');
             }
             }
         }
         }
@@ -216,4 +216,4 @@ class RechargeController extends AdminController {
         CommonFn::requestAjax($success, '', array());
         CommonFn::requestAjax($success, '', array());
 
 
     }
     }
-}
+}

+ 2 - 1
www/webapp/o2o/css/recharge.css

@@ -70,7 +70,8 @@
   border: 1px solid;
   border: 1px solid;
   text-align: center;
   text-align: center;
   background-color: rgba(146,118,3,1);
   background-color: rgba(146,118,3,1);
-  transition:all 2s ;
+  transition:all 2s;
+  margin-top: 10px;
 }
 }
 
 
 .spa-page-recharge .btn-add-recharge:active{
 .spa-page-recharge .btn-add-recharge:active{

File diff suppressed because it is too large
+ 0 - 0
www/webapp/o2o/dist/css/main.css


File diff suppressed because it is too large
+ 1 - 1
www/webapp/o2o/js/build/template.js


+ 1 - 1
www/webapp/o2o/tpl/recharge/index.html

@@ -24,7 +24,7 @@
                       </li>
                       </li>
                   {{ /each }}
                   {{ /each }}
                 </ul>
                 </ul>
-                <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>
+                <div class="ad-hide" style="text-align: center;clear: both;margin-top: 9rem;"><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
                     <!--<span style="display: inline-block;font-size: 0.6rem;font-weight: 600; " class="pay-rule"><span
                         style="text-decoration: underline;color: #0A246A">活动规则</span></span>-->
                         style="text-decoration: underline;color: #0A246A">活动规则</span></span>-->
                 </div>
                 </div>

Some files were not shown because too many files changed in this diff