去除商户规则配置删除功能

master
ELF 4 years ago
parent 3a4fb51222
commit 62d2eaef72

@ -609,7 +609,7 @@ class PaymentMerchantController extends ThinkController
]);
}
$startTime = $params['start_time'] == '' ? 0 : strtotime($params['start_time'] . ' 00:00:00');
/* $startTime = $params['start_time'] == '' ? 0 : strtotime($params['start_time'] . ' 00:00:00');
$endTime = $params['end_time'] == '' ? PaymentRuleService::FOREVER_TIME : strtotime($params['end_time'] . ' 23:59:59');
if (date('Ymd', $rule['start_time']) <= date('Ymd') && $startTime != $rule['start_time']) {
@ -637,14 +637,14 @@ class PaymentMerchantController extends ThinkController
'status' => 0,
'message' => '最后生效时间在今日之前,不可修改'
]);
}
} */
$item = [
'alipay_merchant_id' => $params['alipay_merchant_id'],
'weixin_merchant_id' => $params['weixin_merchant_id'],
'express_merchant_id' => $params['express_merchant_id'],
'start_time' => $startTime,
'end_time' => $endTime,
// 'start_time' => $startTime,
// 'end_time' => $endTime,
'update_time' => time()
];
@ -667,6 +667,11 @@ class PaymentMerchantController extends ThinkController
public function deleteRule()
{
$this->ajaxReturn([
'status' => 0,
'message' => '暂不支持删除'
]);
$id = I('id', 0);
$rule = M('payment_rule', 'tab_')->where(['id' => $id])->find();

@ -183,13 +183,13 @@
<tr>
<td class="l">生效时间(开始):</td>
<td class="r">
<input type="text" id="start_time" name="start_time" class="time" value="<?=$record['start_time']?>" autocomplete="off" placeholder="请选择生效时间(开始)" style="width: 200px"/>
<input type="text" id="start_time" name="start_time" disabled class="time" value="<?=$record['start_time']?>" autocomplete="off" placeholder="请选择生效时间(开始)" style="width: 200px"/>
</td>
</tr>
<tr>
<td class="l">生效时间(结束):</td>
<td class="r">
<input type="text" id="end_time" name="end_time" class="time" value="<?=$record['end_time']?>" autocomplete="off" placeholder="请选择生效时间(开始)" style="width: 200px"/>
<input type="text" id="end_time" name="end_time" disabled class="time" value="<?=$record['end_time']?>" autocomplete="off" placeholder="请选择生效时间(开始)" style="width: 200px"/>
</td>
</tr>
</tbody>

@ -175,7 +175,7 @@
<td>
<div class="partakebtn">
<a href="<?=U('editRule', ['id' => $data['id']])?>">编辑</a>
<a class="delete-btn">删除</a>
<!-- <a class="delete-btn">删除</a> -->
</div>
</td>
</tr>

Loading…
Cancel
Save