mkm/shop-php
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新调试静态资源

Browse Source
This commit is contained in:
yaooo 2023-09-18 13:28:00 +08:00
commit 09f7b71ee0
49 changed files with 68 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/controller/api/store/merchant/MerchantIntention.php
View File

@ -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('修改成功');
}

4
public/index.html
View File

@ -2,4 +2,8 @@
document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')
if(window.location.protocol == 'https:'){
document.write('<meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">')
<<<<<<< HEAD
}</script><link rel=stylesheet href=/static/index.97465e7b.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.958c16a8.js></script><script src=/static/js/index.cd02d553.js></script></body></html>
=======
}</script><link rel=stylesheet href=/static/index.97465e7b.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.c21fc11a.js></script><script src=/static/js/index.8cc6210a.js></script></body></html>
>>>>>>> feature_business_apply

6
public/index.prod.html
View File

@ -2,4 +2,8 @@
document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')
if(window.location.protocol == 'https:'){
document.write('<meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">')
}</script><link rel=stylesheet href=/static/index.97465e7b.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.958c16a8.js></script><script src=/static/js/index.bcecaf67.js></script></body></html>
<<<<<<< HEAD
}</script><link rel=stylesheet href=/static/index.97465e7b.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.958c16a8.js></script><script src=/static/js/index.bcecaf67.js></script></body></html>
=======
}</script><link rel=stylesheet href=/static/index.97465e7b.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.958c16a8.js></script><script src=/static/js/index.cd02d553.js></script></body></html>
>>>>>>> feature_business_apply

0
public/static/js/index.cd02d553.js → public/static.prod/js/index.cd02d553.js
View File

0
public/static/js/pages-store-settled-index.f6d3fde9.js → public/static.prod/js/pages-store-settled-index.f6d3fde9.js
View File

1
public/static.prod/js/pages-users-user_info-index.11ccc99a.js Normal file
View File

File diff suppressed because one or more lines are too long

1
public/static/js/index.787cc3f5.js Normal file
View File

File diff suppressed because one or more lines are too long

1
public/static/js/index.8cc6210a.js Normal file
View File

File diff suppressed because one or more lines are too long

1
public/static/js/pages-admin-financial_management-index.438355b2.js Normal file
View File

File diff suppressed because one or more lines are too long

1
public/static/js/pages-annex-vip_center-index~pages-annex-vip_paid-index~pages-nongKe-supply_chain-purchase_control~p~16682195.75e1e5e3.js Normal file
View File

File diff suppressed because one or more lines are too long

1
public/static/js/pages-columnGoods-goods_search-index.8bd64bfe.js Normal file
View File

File diff suppressed because one or more lines are too long

1
public/static/js/pages-columnGoods-goods_search_con-index.1f126eaf.js Normal file
View File

File diff suppressed because one or more lines are too long

1
public/static/js/pages-commissionedSales-addDelegation-index.ff50a630.js Normal file
View File

File diff suppressed because one or more lines are too long

1
public/static/js/pages-commissionedSales-initiateDelegation-index.4d74f88f.js Normal file
View File

File diff suppressed because one or more lines are too long

1
public/static/js/pages-commissionedSales-receivedCommission-index.eea47ece.js Normal file
View File

File diff suppressed because one or more lines are too long

1
public/static/js/pages-gather-gather.19340ff7.js Normal file
View File

File diff suppressed because one or more lines are too long

8
public/static/js/pages-index-index.1bbb8c12.js Normal file
View File

File diff suppressed because one or more lines are too long

8
public/static/js/pages-index-index.7004e817.js
View File

File diff suppressed because one or more lines are too long

1
public/static/js/pages-moreProject-moreProject.fd34b1cc.js Normal file
View File

File diff suppressed because one or more lines are too long

2
public/static/js/pages-nongKe-cloud_entrepot-index.84f98bc6.js → public/static/js/pages-nongKe-cloud_entrepot-index.b974cfb5.js
View File

File diff suppressed because one or more lines are too long

1
public/static/js/pages-nongKe-cloud_entrepot-indexa.e5d4d20b.js Normal file
View File

File diff suppressed because one or more lines are too long

1
public/static/js/pages-nongKe-food-indexa.84d89445.js Normal file
View File

File diff suppressed because one or more lines are too long

1
public/static/js/pages-nongKe-goods_list-index.2943b9cd.js Normal file
View File

File diff suppressed because one or more lines are too long

1
public/static/js/pages-nongKe-specialty-indexa.cba09423.js Normal file
View File

File diff suppressed because one or more lines are too long

1
public/static/js/pages-nongKe-supply_chain-merchant.fa4ae655.js Normal file
View File

File diff suppressed because one or more lines are too long

1
public/static/js/pages-nongKe-supply_chain-supplier.741ef281.js
View File

File diff suppressed because one or more lines are too long

1
public/static/js/pages-nongKe-supply_chain-supplier.ddae4722.js Normal file
View File

File diff suppressed because one or more lines are too long

1
public/static/js/pages-nongKe-tourism-indexa.fda593ba.js Normal file
View File

File diff suppressed because one or more lines are too long

1
public/static/js/pages-order_addcart-order_addcart.ab484594.js Normal file
View File

File diff suppressed because one or more lines are too long

1
public/static/js/pages-order_details-index.e6a03c97.js Normal file
View File

File diff suppressed because one or more lines are too long

1
public/static/js/pages-plantGrass-plant_release-index.190f27aa.js Normal file
View File

File diff suppressed because one or more lines are too long

1
public/static/js/pages-plant_release-index.9b00a2f3.js Normal file
View File

File diff suppressed because one or more lines are too long

1
public/static/js/pages-product-addGoods-index.97b5e7b9.js Normal file
View File

File diff suppressed because one or more lines are too long

1
public/static/js/pages-product-addGoods-secound.ff23ae87.js Normal file
View File

File diff suppressed because one or more lines are too long

1
public/static/js/pages-product-basicSet.c2f322ed.js Normal file
View File

File diff suppressed because one or more lines are too long

1
public/static/js/pages-store-applicationRecord-index.9cf3ccab.js Normal file
View File

File diff suppressed because one or more lines are too long

1
public/static/js/pages-store-settled-index.5be4a636.js Normal file
View File

File diff suppressed because one or more lines are too long

1
public/static/js/pages-supply_chains-supply_chains.024e5cc0.js Normal file
View File

File diff suppressed because one or more lines are too long

1
public/static/js/pages-supply_chains-supply_chains.6ed757e6.js
View File

File diff suppressed because one or more lines are too long

1
public/static/js/pages-trading_hall-adddiscounts-index.22ade408.js Normal file
View File

File diff suppressed because one or more lines are too long

1
public/static/js/pages-trading_hall-transfer_goods-index.0be8b5a9.js Normal file
View File

File diff suppressed because one or more lines are too long

1
public/static/js/pages-user-index.e0090ec8.js Normal file
View File

File diff suppressed because one or more lines are too long

1
public/static/js/pages-users-embody-embody.d5224a18.js Normal file
View File

File diff suppressed because one or more lines are too long

1
public/static/js/pages-users-online_warehousing-index.02ac0884.js Normal file
View File

File diff suppressed because one or more lines are too long

1
public/static/js/pages-users-order_list-indexCopy.90cdb3dd.js Normal file
View File

File diff suppressed because one or more lines are too long

1
public/static/js/pages-users-order_list-relase.b581f2d1.js Normal file
View File

File diff suppressed because one or more lines are too long

1
public/static/js/pages-users-trading_hall-index.b46afcf6.js Normal file
View File

File diff suppressed because one or more lines are too long

1
public/static/js/pages-users-user_address-index.9ea6ad69.js Normal file
View File

File diff suppressed because one or more lines are too long

1
public/static/js/uni_modules-guyue-updater-pages-updater.c9407872.js Normal file
View File

File diff suppressed because one or more lines are too long