小数

application/admin/view/product/pledges/add.html

@@ -62,11 +62,11 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Token')}:</label>
         <div class="col-xs-12 col-sm-3">
-            <input id="c-token" data-rule="required;range(0.01~)" class="form-control" name="row[token]" type="number" value="0">
+            <input id="c-token"  class="form-control" name="row[token]" type="number" value="0">
         </div>
         <label class="control-label col-xs-12 col-sm-2">{:__('Teac')}:</label>
         <div class="col-xs-12 col-sm-3">
-            <input id="c-teac" data-rule="required;range(0.01~)" min="0" class="form-control" step="0.01" name="row[teac]" type="number" value="0.00">
+            <input id="c-teac"  class="form-control" name="row[teac]" type="number" value="0">
         </div>
     </div>
     

application/admin/view/product/pledges/edit.html

@@ -63,11 +63,11 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Token')}:</label>
         <div class="col-xs-12 col-sm-3">
-            <input id="c-token" data-rule="required;range(0.01~)" class="form-control" name="row[token]" type="number" value="{$row.token|htmlentities}">
+            <input id="c-token" class="form-control" name="row[token]" type="number" value="{$row.token|htmlentities}">
         </div>
         <label class="control-label col-xs-12 col-sm-2">{:__('Teac')}:</label>
         <div class="col-xs-12 col-sm-3">
-            <input id="c-teac" data-rule="required;range(0.01~)" min="0" class="form-control" step="0.01" name="row[teac]" type="number" value="{$row.teac|htmlentities}">
+            <input id="c-teac" class="form-control" name="row[teac]" type="number" value="{$row.teac|htmlentities}">
         </div>
     </div>
     <div class="form-group">

application/api/controller/Pledge.php

@@ -91,7 +91,7 @@ class Pledge extends Api
 
         //余额判断
         $user = $ledgerWalletModel::getWallet($this->auth->id);
-        if($user[$this->pay[$pay_type]] < $pledge[$this->pay[$pay_type]]) $this->error(__("余额不足"));
+        if($pledge[$this->pay[$pay_type]] >0 && $user[$this->pay[$pay_type]] < $pledge[$this->pay[$pay_type]]) $this->error(__("余额不足"));
         Db::startTrans();
         try {
 
@@ -184,7 +184,7 @@ class Pledge extends Api
             if ($pledge->status != $userPledge::Ongoing || empty($pledge->is_renew) || empty($pledge->p_status))$this->error(__("质抵活动已结束"));
             //余额判断
             $user = $ledgerWalletModel::getWallet($this->auth->id);
-            if($user[$this->pay[$pay_type]] < $pledge[$this->pay[$pay_type]]) $this->error(__("余额不足"));
+            if($pledge[$this->pay[$pay_type]] >0 && $user[$this->pay[$pay_type]] < $pledge[$this->pay[$pay_type]]) $this->error(__("余额不足"));
             
             Db::startTrans();
             try {

application/api/logic/PledgeLogic.php

@@ -55,11 +55,10 @@ class PledgeLogic
 
         //扣除支付金额
         $action = ($pay_type == Asset::TEAC)? LedgerTeacChangeModel::PledgeFee: LedgerTokenChangeModel::Pledge; //类型
-        (new LedgerWalletModel())->changeWalletAccount($user_id, $pay_type, -$price, $action, 0);
+        if($price >0) Loader::model('LedgerWalletModel')->changeWalletAccount($user_id, $pay_type, -$price, $action, 0);
   
         //修改状态
-        $model  = Loader::model('ProductOrder');
-        return $model->whereIn('order_no', $order_no)->setField('status', $model::Freeze);
+        return Loader::model('ProductOrder')->whereIn('order_no', $order_no)->setField('status', ProductOrder::Freeze);
     }
 
 
@@ -181,7 +180,7 @@ class PledgeLogic
     {   
         //扣除支付金额
         $action = ($pay_type == Asset::TEAC)? LedgerTeacChangeModel::PledgeFee: LedgerTokenChangeModel::Pledge; //类型
-        (new LedgerWalletModel())->changeWalletAccount($user_id, $pay_type, -$pledge[$pay_type], $action, 0);
+        if($pledge[$pay_type] > 0) Loader::model('LedgerWalletModel')->changeWalletAccount($user_id, $pay_type, -$pledge[$pay_type], $action, 0);
   
         $pledge->end_time = $pledge->end_time + config('pledge_end_time');
         return $pledge->save();