diff --git a/app/admin/controller/merchant/system/financial/Financial.php b/app/admin/controller/merchant/system/financial/Financial.php
index bdd575b..03daf84 100644
--- a/app/admin/controller/merchant/system/financial/Financial.php
+++ b/app/admin/controller/merchant/system/financial/Financial.php
@@ -27,7 +27,7 @@ class Financial extends BaseController
     }
 
     /**
-     * 保证金退还记录
+     * 余额退还记录
      */
     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['type'] = 0;
+        $where['type'] = 0;//余额
 
         // 获取记录
         $data = $this->model->getAdminList($where,$page,$limit);
@@ -53,7 +53,7 @@ class Financial extends BaseController
         $limit = (int)get_params('limit');
 
         $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);
diff --git a/app/admin/controller/merchant/system/merchant/MerchantIntention.php b/app/admin/controller/merchant/system/merchant/MerchantIntention.php
index e6e7b4f..7b28b42 100644
--- a/app/admin/controller/merchant/system/merchant/MerchantIntention.php
+++ b/app/admin/controller/merchant/system/merchant/MerchantIntention.php
@@ -16,6 +16,7 @@ use app\common\model\merchant\system\merchant\MerchantIntention as MerchantInten
 use think\facade\View;
 use app\common\model\merchant\system\merchant\MerchantCategory;
 use app\common\model\merchant\system\merchant\MerchantType;
+use think\exception\ValidateException;
 
 class MerchantIntention extends BaseController
 {
@@ -93,9 +94,13 @@ class MerchantIntention extends BaseController
         //创建
         if (!$this->intention->GetWhereCount(['mer_intention_id' => $id, 'is_del' => 0]))
             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,'修改成功');
     }
diff --git a/app/admin/route/merchant.php b/app/admin/route/merchant.php
index 4322691..9b92a47 100644
--- a/app/admin/route/merchant.php
+++ b/app/admin/route/merchant.php
@@ -181,7 +181,7 @@ Route::group(function(){
                 '_alias' => '审核',
             ]);
 
-        // //备注
+        //备注
         Route::get('refund/mark/:id/form', '/markMarginForm')->name('systemMarginRefundMarkForm')->option([
             '_alias' => '备注表单',
             '_auth' => false,
diff --git a/app/admin/view/merchant/system/merchant/intention/mark.html b/app/admin/view/merchant/system/merchant/intention/mark.html
index 960b7dc..62f2b0b 100644
--- a/app/admin/view/merchant/system/merchant/intention/mark.html
+++ b/app/admin/view/merchant/system/merchant/intention/mark.html
@@ -35,7 +35,6 @@
        
         //监听提交
         form.on('submit(webform)', function (data) {
-            console.log(data);
             if (data.field == '') {
                 layer.msg('请先完善商品详情');
                 return false;
diff --git a/app/admin/view/merchant/system/merchant/intention/status.html b/app/admin/view/merchant/system/merchant/intention/status.html
index 0a8a71b..99d3488 100644
--- a/app/admin/view/merchant/system/merchant/intention/status.html
+++ b/app/admin/view/merchant/system/merchant/intention/status.html
@@ -50,7 +50,6 @@
 				return false;
 			}
 			let callback = function (e) {
-				layer.msg(e.msg);
 				if (e.code == 0) {
 					setTimeout(function () {
 						parent.location.reload();