Merge pull request 'hotfix/remove_promote_package' (#375) from hotfix/remove_promote_package into master

Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/375

Application/Admin/View/PaymentMerchant/ruleAddForm.html

@@ -150,10 +150,10 @@
             <tr>
               <td class="l"><i class="mustmark">*</i>支付宝支付配置：</td>
               <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>
                   <?php foreach($aliMerchants as $merchant):?>
-                  <option value="<?=$merchant['id']?>"><?=$merchant['name']?></option>
+                  <option value="<?=$merchant['id']?>"><?=$merchant['name']?>(<?=$merchant['account']?>)</option>
                   <?php endforeach;?>
                 </select>
               </td>
@@ -161,10 +161,10 @@
             <tr>
               <td class="l"><i class="mustmark">*</i>微信支付配置：</td>
               <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>
                   <?php foreach($weixinMerchants as $merchant):?>
-                  <option value="<?=$merchant['id']?>"><?=$merchant['name']?></option>
+                  <option value="<?=$merchant['id']?>"><?=$merchant['name']?>(<?=$merchant['account']?>)</option>
                   <?php endforeach;?>
                 </select>
               </td>
@@ -172,10 +172,10 @@
             <tr>
               <td class="l"><i class="mustmark">*</i>快捷支付配置：</td>
               <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>
                   <?php foreach($expressMerchants as $merchant):?>
-                  <option value="<?=$merchant['id']?>"><?=$merchant['name']?></option>
+                  <option value="<?=$merchant['id']?>"><?=$merchant['name']?>(<?=$merchant['account']?>)</option>
                   <?php endforeach;?>
                 </select>
               </td>

Application/Admin/View/PaymentMerchant/ruleEditForm.html

@@ -150,10 +150,10 @@
             <tr>
               <td class="l"><i class="mustmark">*</i>支付宝支付配置：</td>
               <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>
                   <?php foreach($aliMerchants as $merchant):?>
-                  <option value="<?=$merchant['id']?>" <?php if($record['alipay_merchant_id']==$merchant['id']):?>selected<?php endif;?>><?=$merchant['name']?></option>
+                  <option value="<?=$merchant['id']?>" <?php if($record['alipay_merchant_id']==$merchant['id']):?>selected<?php endif;?>><?=$merchant['name']?>(<?=$merchant['account']?>)</option>
                   <?php endforeach;?>
                 </select>
               </td>
@@ -161,10 +161,10 @@
             <tr>
               <td class="l"><i class="mustmark">*</i>微信支付配置：</td>
               <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>
                   <?php foreach($weixinMerchants as $merchant):?>
-                  <option value="<?=$merchant['id']?>" <?php if($record['weixin_merchant_id']==$merchant['id']):?>selected<?php endif;?>><?=$merchant['name']?></option>
+                  <option value="<?=$merchant['id']?>" <?php if($record['weixin_merchant_id']==$merchant['id']):?>selected<?php endif;?>><?=$merchant['name']?>(<?=$merchant['account']?>)</option>
                   <?php endforeach;?>
                 </select>
               </td>
@@ -172,10 +172,10 @@
             <tr>
               <td class="l"><i class="mustmark">*</i>快捷支付配置：</td>
               <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>
                   <?php foreach($expressMerchants as $merchant):?>
-                  <option value="<?=$merchant['id']?>" <?php if($record['express_merchant_id']==$merchant['id']):?>selected<?php endif;?>><?=$merchant['name']?></option>
+                  <option value="<?=$merchant['id']?>" <?php if($record['express_merchant_id']==$merchant['id']):?>selected<?php endif;?>><?=$merchant['name']?>(<?=$merchant['account']?>)</option>
                   <?php endforeach;?>
                 </select>
               </td>

Application/Home/Controller/PackageController.class.php

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

Application/Home/View/default/Package/open_in_safari.html

@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta itemprop="name" content="请在Safari浏览器中打开"/>
+  <meta name="description" itemprop="description" content="请在Safari浏览器中打开"/>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1"/>
+  <meta content="initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no, width=device-width" name="viewport">
+  <meta http-equiv="X-UA-Compatible" content="ie=edge">
+  <link href="{:get_cover(C('CH_SET_ICO'),'path')}" type="image/x-icon" rel="shortcut icon">
+  <script src="__JS__/jquery-1.11.3.min.js"></script>
+  <script type="text/javascript" src="https://res2.wx.qq.com/open/js/jweixin-1.4.0.js"></script>
+  <script type="text/javascript" src="__JS__/getRem.js"></script>
+  <script type="text/javascript" src="__JS__/swiper.min.js"></script>
+  <link rel="stylesheet" type="text/css" href="__CSS__/swiper.min.css">
+  <link rel="stylesheet" type="text/css" href="__CSS__/reset.css">
+  <link rel="stylesheet" type="text/css" href="__CSS__/index2.css">
+  <link rel="stylesheet" type="text/css" href="__CSS__/giftbag.css">
+  <script src="__STATIC__/bg4_4.js"></script>
+  <title>请在Safari浏览器中打开</title>
+</head>
+<body>
+  <div class="safari" style="z-index: 1000">
+      <div class="safari-heard">
+      <div>请选择在“Safari”中打开</div>
+      <img src="__IMG__/arror.png" alt="">
+      </div>
+      <div class="safari-info">
+      <img src="__IMG__/safari.png" alt="">
+      <div>
+          <div>该链接只支持<a href="#">Safari</a>，</div>
+          <div>请在<a href="#">Safari</a>中打开</div>
+      </div>
+      </div>
+  </div>
+</body>
+</html>