HARUHARU 4 роки тому
батько
коміт
8e9357d712

+ 1 - 9
admin/control/merchant.php

@@ -490,16 +490,8 @@ class merchantControl extends SystemControl
                 $admin_act = "sys_del_money";
                 $log_msg = "管理员【" . $admininfo['admin_name'] . "】操作会员【" . $member_info['member_name'] . "】预存款【减少】,金额为" . $money . ",编号为" . $order_sn;
                 break;
-            case 3:
-                $admin_act = "sys_freeze_money";
-                $log_msg = "管理员【" . $admininfo['admin_name'] . "】操作会员【" . $member_info['member_name'] . "】预存款【冻结】,金额为" . $money . ",编号为" . $order_sn;
-                break;
-            case 4:
-                $admin_act = "sys_unfreeze_money";
-                $log_msg = "管理员【" . $admininfo['admin_name'] . "】操作会员【" . $member_info['member_name'] . "】预存款【解冻】,金额为" . $money . ",编号为" . $order_sn;
-                break;
             default:
-                showMessage('操作失败', 'index.php?act=predeposit&op=pd_log_list');
+                showMessage('操作失败', 'index.php?act=merchant&op=refill_evidence');
                 break;
         }
         try {

+ 19 - 12
admin/templates/default/recharge.add.php

@@ -20,7 +20,9 @@
           <td colspan="2" class="required"><label class="validation">申请编号:</label></td>
         </tr>
         <tr class="noborder">
-          <td class="vatop rowform"><input type="text" name="apply_id" id="apply_id" class="txt" value="<?php echo $output['apply_id'];?>" onchange="javascript:checkevidence();">
+          <td class="vatop rowform">
+            <input type="text" name="apply_id" id="apply_id" class="txt" value="<?php echo $output['apply_id'];?>" readonly="readonly">
+<!--            <input type="text" name="apply_id" id="apply_id" class="txt" value="--><?php //echo $output['apply_id'];?><!--" onchange="javascript:checkevidence();">-->
             <input type="hidden" name="apply_id" id="apply_id" value="<?php echo $output['apply_id'];?>"/></td>
           <td class="vatop tips"></td>
         </tr>
@@ -28,20 +30,27 @@
           <td colspan="2" class="required">增减类型:</label></td>
         </tr>
         <tr class="noborder">
-          <td class="vatop rowform"><select id="operatetype" name="operatetype">
-              <option value="1">增加</option>
-              <option value="2">减少</option>
-               <option value="3">冻结</option>
-               <option value="4">解冻</option>
-               
-            </select></td>
+          <td class="vatop rowform">
+              <!--<select id="operatetype" name="operatetype" disabled>
+              <option value="1" <?php if($output['amount'] > 0){ echo 'selected'; }?>>增加</option>
+              <option value="2" <?php if($output['amount'] < 0){ echo 'selected'; }?>>减少</option>
+            </select>-->
+              <?php if($output['amount'] > 0) {?>
+                    <input type="text" class="txt" value="增加" readonly="readonly">
+                    <input type="hidden" name="operatetype" value="1"/></td>
+              <?php }?>
+              <?php if($output['amount'] < 0) {?>
+                    <input type="text" class="txt" value="减少" readonly="readonly">
+                    <input type="hidden" name="operatetype" value="2"/></td>
+              <?php }?>
+          </td>
           <td class="vatop tips"></td>
         </tr>
         <tr>
           <td colspan="2" class="required"><label class="validation">金额:</label></td>
         </tr>
         <tr class="noborder">
-          <td class="vatop rowform"><input type="text" id="pointsnum" name="pointsnum" value="<?php echo $output['amount'];?>" class="txt"></td>
+          <td class="vatop rowform"><input type="text" id="pointsnum" name="pointsnum" value="<?php echo abs($output['amount']);?>" class="txt" readonly="readonly"></td>
           <td class="vatop tips"></td>
         </tr>
         <tr>
@@ -84,7 +93,6 @@ $(function(){
 			},
             pointsnum   : {
                 required : true,
-                min : 1
             }
         },
         messages : {
@@ -92,8 +100,7 @@ $(function(){
 				required : '请输入申请编号'
 			},
             pointsnum  : {
-                required : '请添加预存款',
-                min : '预存款必须大于0'
+                required : '请添加预存款'
             }
         }
     });

+ 3 - 3
data/model/predeposit.model.php

@@ -240,10 +240,10 @@ class predepositModel extends Model {
 
     /**
      * 变更预存款
-     * @param unknown $change_type
-     * @param unknown $data
+     * @param string $change_type
+     * @param array $data
      * @throws Exception
-     * @return unknown
+     * @return int
      */
     public function changePd($change_type,$data = array()) {
         $data_log = array();