diff --git a/app/controller/api/store/merchant/MerchantIntention.php b/app/controller/api/store/merchant/MerchantIntention.php
index 7dc1d59f..8caa88bb 100644
--- a/app/controller/api/store/merchant/MerchantIntention.php
+++ b/app/controller/api/store/merchant/MerchantIntention.php
@@ -88,15 +88,12 @@ class MerchantIntention extends BaseController
'address' => $data['address'] ?? '',
'mer_intention_id' => $intention->mer_intention_id
];
- $res = $this->sendMerIntentionApply($sendData);
- if (!$res) {
- Db::name('merchant_intention')->where('mer_intention_id', $intention->mer_intention_id)->delete();
- throw new ValidateException('申请商户入驻任务失败，请联系平台');
- }
- // $cdata['status'] = 1;
- // $cdata['create_mer'] = -1;
- // $cdata['fail_msg'] ='自动审核通过';
- // $this->repository->updateStatus($intention->mer_intention_id, $cdata);
+ // 新增交易申请流程取消合同签约
+ // $res = $this->sendMerIntentionApply($sendData);
+ // if (!$res) {
+ // Db::name('merchant_intention')->where('mer_intention_id', $intention->mer_intention_id)->delete();
+ // throw new ValidateException('申请商户入驻任务失败，请联系平台');
+ // }
return app('json')->success('提交成功');
}
@@ -176,10 +173,11 @@ class MerchantIntention extends BaseController
'address' => $data['address'] ?? '',
'mer_intention_id' => $id
];
- $res = $this->sendMerIntentionApply($sendData);
- if (!$res) {
- throw new ValidateException('申请商户入驻任务失败，请联系平台');
- }
+ // 新增交易申请流程取消合同签约
+ // $res = $this->sendMerIntentionApply($sendData);
+ // if (!$res) {
+ // throw new ValidateException('申请商户入驻任务失败，请联系平台');
+ // }
return app('json')->success('修改成功');
}
diff --git a/public/index.html b/public/index.html
index 1b842b3f..999704e4 100644
--- a/public/index.html
+++ b/public/index.html
@@ -2,4 +2,8 @@
document.write('')
if(window.location.protocol == 'https:'){
document.write('')
+<<<<<<< HEAD
}