Merge branch 'master' of http://132.232.91.252:9999/ice/quxiu

admin/themes/simplebootx/Admin/Configprivate/index.html

@@ -512,12 +512,14 @@ input{
 								<input type="text" name="post[cash_rate]" value="{$config['cash_rate']}"> 提现一元人民币需要的积分
 								<input type="text" name="post[cash_rate]" value="{$config['cash_rate']}"> 提现一元人民币需要的积分
 							</div>
 							</div>
 						</div>
 						</div>
+						<!--
 						<div class="control-group">
 						<div class="control-group">
 							<label class="control-label">提现最低额度（元）</label>
 							<label class="control-label">提现最低额度（元）</label>
 							<div class="controls">
 							<div class="controls">
 								<input type="text" name="post[cash_min]" value="{$config['cash_min']}"> 可提现的最小额度，低于该额度无法提现
 								<input type="text" name="post[cash_min]" value="{$config['cash_min']}"> 可提现的最小额度，低于该额度无法提现
 							</div>
 							</div>
 						</div>
 						</div>
+						-->
                         <div class="control-group">
                         <div class="control-group">
 							<label class="control-label">每月提现期</label>
 							<label class="control-label">每月提现期</label>
 							<div class="controls">
 							<div class="controls">

api/Appapi/Api/User.php

@@ -988,7 +988,8 @@ class Api_User extends PhalApi_Api {
             return $rs;
             return $rs;
         }else if($info==1004){
         }else if($info==1004){
             $rs['code'] = 1004;
             $rs['code'] = 1004;
-            $rs['msg'] = '提现最低额度为'.$config['cash_min'].'元';
+//            $rs['msg'] = '提现最低额度为'.$config['cash_min'].'元';
+            $rs['msg'] = '提现必须大于100并且是100的倍数';
             return $rs;
             return $rs;
         }else if($info==1005){
         }else if($info==1005){
             $rs['code'] = 1005;
             $rs['code'] = 1005;

api/Appapi/Model/User.php

@@ -212,6 +212,7 @@ class Model_User extends PhalApi_Model_NotORM
         $cash_rate = $config['cash_rate'];
         $cash_rate = $config['cash_rate'];
         /* 最低额度 */
         /* 最低额度 */
         $cash_min = $config['cash_min'];
         $cash_min = $config['cash_min'];
+        $cash_min = 100;
 
 
         //提现钱数
         //提现钱数
 //        $money = floor($cashvote / $cash_rate);
 //        $money = floor($cashvote / $cash_rate);
@@ -220,6 +221,10 @@ class Model_User extends PhalApi_Model_NotORM
             return 1004;
             return 1004;
         }
         }
 
 
+        if ($money % $cash_min > 0) {
+            return 1004;
+        }
+
         $cashvotes = $money * $cash_rate;
         $cashvotes = $money * $cash_rate;
 
 
         $ifok = false;
         $ifok = false;