elf
/
cf-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化

Browse Source
master
ELF 4 years ago
parent b65a62b6ab
commit 53bf6bca07
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File

6
Application/Admin/View/PaymentMerchant/ruleAddForm.html
Unescape Escape View File

@ -150,7 +150,7 @@
<tr> <tr>
<td class="l"><i class="mustmark">*</i>支付宝支付配置：</td> <td class="l"><i class="mustmark">*</i>支付宝支付配置：</td>
<td class="r"> <td class="r">
<select name="alipay_merchant_id" id="alipay-merchant-select" class="select_gallery"> <select name="alipay_merchant_id" id="alipay-merchant-select" class="select_gallery" style="width: 350px;">
<option value="0">跟随系统默认商户</option> <option value="0">跟随系统默认商户</option>
<?php foreach($aliMerchants as $merchant):?> <?php foreach($aliMerchants as $merchant):?>
<option value="<?=$merchant['id']?>"><?=$merchant['name']?>(<?=$merchant['account']?>)</option> <option value="<?=$merchant['id']?>"><?=$merchant['name']?>(<?=$merchant['account']?>)</option>
@ -161,7 +161,7 @@
<tr> <tr>
<td class="l"><i class="mustmark">*</i>微信支付配置：</td> <td class="l"><i class="mustmark">*</i>微信支付配置：</td>
<td class="r"> <td class="r">
<select name="weixin_merchant_id" id="weixin-merchant-select" class="select_gallery"> <select name="weixin_merchant_id" id="weixin-merchant-select" class="select_gallery" style="width: 350px;">
<option value="0">跟随系统默认商户</option> <option value="0">跟随系统默认商户</option>
<?php foreach($weixinMerchants as $merchant):?> <?php foreach($weixinMerchants as $merchant):?>
<option value="<?=$merchant['id']?>"><?=$merchant['name']?>(<?=$merchant['account']?>)</option> <option value="<?=$merchant['id']?>"><?=$merchant['name']?>(<?=$merchant['account']?>)</option>
@ -172,7 +172,7 @@
<tr> <tr>
<td class="l"><i class="mustmark">*</i>快捷支付配置：</td> <td class="l"><i class="mustmark">*</i>快捷支付配置：</td>
<td class="r"> <td class="r">
<select name="express_merchant_id" id="express-merchant-select" class="select_gallery"> <select name="express_merchant_id" id="express-merchant-select" class="select_gallery" style="width: 350px;">
<option value="0">跟随系统默认商户</option> <option value="0">跟随系统默认商户</option>
<?php foreach($expressMerchants as $merchant):?> <?php foreach($expressMerchants as $merchant):?>
<option value="<?=$merchant['id']?>"><?=$merchant['name']?>(<?=$merchant['account']?>)</option> <option value="<?=$merchant['id']?>"><?=$merchant['name']?>(<?=$merchant['account']?>)</option>

6
Application/Admin/View/PaymentMerchant/ruleEditForm.html
Unescape Escape View File

@ -150,7 +150,7 @@
<tr> <tr>
<td class="l"><i class="mustmark">*</i>支付宝支付配置：</td> <td class="l"><i class="mustmark">*</i>支付宝支付配置：</td>
<td class="r"> <td class="r">
<select name="alipay_merchant_id" id="alipay-merchant-select" class="select_gallery"> <select name="alipay_merchant_id" id="alipay-merchant-select" class="select_gallery" style="width: 350px;">
<option value="0">跟随系统默认商户</option> <option value="0">跟随系统默认商户</option>
<?php foreach($aliMerchants as $merchant):?> <?php foreach($aliMerchants as $merchant):?>
<option value="<?=$merchant['id']?>" <?php if($record['alipay_merchant_id']==$merchant['id']):?>selected<?php endif;?>><?=$merchant['name']?>(<?=$merchant['account']?>)</option> <option value="<?=$merchant['id']?>" <?php if($record['alipay_merchant_id']==$merchant['id']):?>selected<?php endif;?>><?=$merchant['name']?>(<?=$merchant['account']?>)</option>
@ -161,7 +161,7 @@
<tr> <tr>
<td class="l"><i class="mustmark">*</i>微信支付配置：</td> <td class="l"><i class="mustmark">*</i>微信支付配置：</td>
<td class="r"> <td class="r">
<select name="weixin_merchant_id" id="weixin-merchant-select" class="select_gallery"> <select name="weixin_merchant_id" id="weixin-merchant-select" class="select_gallery" style="width: 350px;">
<option value="0">跟随系统默认商户</option> <option value="0">跟随系统默认商户</option>
<?php foreach($weixinMerchants as $merchant):?> <?php foreach($weixinMerchants as $merchant):?>
<option value="<?=$merchant['id']?>" <?php if($record['weixin_merchant_id']==$merchant['id']):?>selected<?php endif;?>><?=$merchant['name']?>(<?=$merchant['account']?>)</option> <option value="<?=$merchant['id']?>" <?php if($record['weixin_merchant_id']==$merchant['id']):?>selected<?php endif;?>><?=$merchant['name']?>(<?=$merchant['account']?>)</option>
@ -172,7 +172,7 @@
<tr> <tr>
<td class="l"><i class="mustmark">*</i>快捷支付配置：</td> <td class="l"><i class="mustmark">*</i>快捷支付配置：</td>
<td class="r"> <td class="r">
<select name="express_merchant_id" id="express-merchant-select" class="select_gallery"> <select name="express_merchant_id" id="express-merchant-select" class="select_gallery" style="width: 350px;">
<option value="0">跟随系统默认商户</option> <option value="0">跟随系统默认商户</option>
<?php foreach($expressMerchants as $merchant):?> <?php foreach($expressMerchants as $merchant):?>
<option value="<?=$merchant['id']?>" <?php if($record['express_merchant_id']==$merchant['id']):?>selected<?php endif;?>><?=$merchant['name']?>(<?=$merchant['account']?>)</option> <option value="<?=$merchant['id']?>" <?php if($record['express_merchant_id']==$merchant['id']):?>selected<?php endif;?>><?=$merchant['name']?>(<?=$merchant['account']?>)</option>

4
Application/Home/Controller/PackageController.class.php
Unescape Escape View File

@ -114,9 +114,9 @@ class PackageController extends Controller
$downloadDomain = $applyService->getDownloadDomain(); $downloadDomain = $applyService->getDownloadDomain();
if ($game['sdk_version'] == 2) { if ($game['sdk_version'] == 2) {
if (!Request::getMobileDetect()->is('Safari')) { /* if (!Request::getMobileDetect()->is('Safari')) {
return $this->display('open_in_safari'); return $this->display('open_in_safari');
} } */
$packageDownloadLogService = new PackageDownloadLogService(); $packageDownloadLogService = new PackageDownloadLogService();
$packageDownloadLogService->add([ $packageDownloadLogService->add([
'user_id' => 0, 'user_id' => 0,

Write Preview
Loading…
Cancel
Save