diff --git a/Application/Admin/Controller/PaymentMerchantController.class.php b/Application/Admin/Controller/PaymentMerchantController.class.php index 4d7996559..e55b1d99e 100644 --- a/Application/Admin/Controller/PaymentMerchantController.class.php +++ b/Application/Admin/Controller/PaymentMerchantController.class.php @@ -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(); diff --git a/Application/Admin/View/PaymentMerchant/ruleEditForm.html b/Application/Admin/View/PaymentMerchant/ruleEditForm.html index 3e2e21b84..eec8f5106 100644 --- a/Application/Admin/View/PaymentMerchant/ruleEditForm.html +++ b/Application/Admin/View/PaymentMerchant/ruleEditForm.html @@ -183,13 +183,13 @@ 生效时间(开始): - + 生效时间(结束): - + diff --git a/Application/Admin/View/PaymentMerchant/rules.html b/Application/Admin/View/PaymentMerchant/rules.html index ec786b695..7c1493f1c 100644 --- a/Application/Admin/View/PaymentMerchant/rules.html +++ b/Application/Admin/View/PaymentMerchant/rules.html @@ -175,7 +175,7 @@
编辑 - 删除 +