mkm/nk-lihaink-cn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复入驻申核结果提示问题

Browse Source
This commit is contained in:
liuxiaoquan 2023-03-16 11:15:55 +08:00
parent 3e2a2915e4
commit 0d2527ff69
5 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/admin/controller/merchant/system/financial/Financial.php
View File

@ -27,7 +27,7 @@ class Financial extends BaseController
} }
/** /**
* 保证金退还记录 * 余额退还记录
*/ */
public function lst() public function lst()
{ {
@ -36,7 +36,7 @@ class Financial extends BaseController
// 查询条件 // 查询条件
$where = get_params(['date','status','financial_type','financial_status','keyword','is_trader','mer_id']); $where = get_params(['date','status','financial_type','financial_status','keyword','is_trader','mer_id']);
$where['type'] = 0; $where['type'] = 0;//余额
// 获取记录 // 获取记录
$data = $this->model->getAdminList($where,$page,$limit); $data = $this->model->getAdminList($where,$page,$limit);
@ -53,7 +53,7 @@ class Financial extends BaseController
$limit = (int)get_params('limit'); $limit = (int)get_params('limit');
$where = get_params(['date','status','financial_type','financial_status','keyword','is_trader','mer_id']); $where = get_params(['date','status','financial_type','financial_status','keyword','is_trader','mer_id']);
$where['type'] = 1; $where['type'] = 1;//保证金
// 获取记录 // 获取记录
$data = $this->model->getAdminList($where, $page, $limit); $data = $this->model->getAdminList($where, $page, $limit);

9
app/admin/controller/merchant/system/merchant/MerchantIntention.php
View File

@ -16,6 +16,7 @@ use app\common\model\merchant\system\merchant\MerchantIntention as MerchantInten
use think\facade\View; use think\facade\View;
use app\common\model\merchant\system\merchant\MerchantCategory; use app\common\model\merchant\system\merchant\MerchantCategory;
use app\common\model\merchant\system\merchant\MerchantType; use app\common\model\merchant\system\merchant\MerchantType;
use think\exception\ValidateException;
class MerchantIntention extends BaseController class MerchantIntention extends BaseController
{ {
@ -93,9 +94,13 @@ class MerchantIntention extends BaseController
//创建 //创建
if (!$this->intention->GetWhereCount(['mer_intention_id' => $id, 'is_del' => 0])) if (!$this->intention->GetWhereCount(['mer_intention_id' => $id, 'is_del' => 0]))
return to_assign(1,'数据不存在'); return to_assign(1,'数据不存在');
try {
$params['status'] = $params['status'] == 1 ? 1 : 2;
$this->intention->updateStatus($id, $params);
}catch(ValidateException $e){
return to_assign(1, $e->getError());
}
$params['status'] = $params['status'] == 1 ? 1 : 2;
$this->intention->updateStatus($id, $params);
return to_assign(0,'修改成功'); return to_assign(0,'修改成功');
} }

2
app/admin/route/merchant.php
View File

@ -181,7 +181,7 @@ Route::group(function(){
'_alias' => '审核', '_alias' => '审核',
]); ]);
// //备注 //备注
Route::get('refund/mark/:id/form', '/markMarginForm')->name('systemMarginRefundMarkForm')->option([ Route::get('refund/mark/:id/form', '/markMarginForm')->name('systemMarginRefundMarkForm')->option([
'_alias' => '备注表单', '_alias' => '备注表单',
'_auth' => false, '_auth' => false,

1
app/admin/view/merchant/system/merchant/intention/mark.html
View File

@ -35,7 +35,6 @@
//监听提交 //监听提交
form.on('submit(webform)', function (data) { form.on('submit(webform)', function (data) {
console.log(data);
if (data.field == '') { if (data.field == '') {
layer.msg('请先完善商品详情'); layer.msg('请先完善商品详情');
return false; return false;

1
app/admin/view/merchant/system/merchant/intention/status.html
View File

@ -50,7 +50,6 @@
return false; return false;
} }
let callback = function (e) { let callback = function (e) {
layer.msg(e.msg);
if (e.code == 0) { if (e.code == 0) {
setTimeout(function () { setTimeout(function () {
parent.location.reload(); parent.location.reload();