From b8de66255613560c70a65bc125b0e1c64fd5cc2d Mon Sep 17 00:00:00 2001
From: ELF <360197197@qq.com>
Date: Wed, 2 Jun 2021 15:03:17 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../View/PaymentMerchant/ruleAddForm.html     |  6 +--
 .../View/PaymentMerchant/ruleEditForm.html    |  6 +--
 .../Controller/PackageController.class.php    |  3 ++
 .../View/default/Package/open_in_safari.html  | 38 +++++++++++++++++++
 4 files changed, 47 insertions(+), 6 deletions(-)
 create mode 100644 Application/Home/View/default/Package/open_in_safari.html

diff --git a/Application/Admin/View/PaymentMerchant/ruleAddForm.html b/Application/Admin/View/PaymentMerchant/ruleAddForm.html
index 410c50af0..a66ce8fc8 100644
--- a/Application/Admin/View/PaymentMerchant/ruleAddForm.html
+++ b/Application/Admin/View/PaymentMerchant/ruleAddForm.html
@@ -153,7 +153,7 @@
                 <select name="alipay_merchant_id" id="alipay-merchant-select" class="select_gallery">
                   <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>
@@ -164,7 +164,7 @@
                 <select name="weixin_merchant_id" id="weixin-merchant-select" class="select_gallery">
                   <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>
@@ -175,7 +175,7 @@
                 <select name="express_merchant_id" id="express-merchant-select" class="select_gallery">
                   <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>
diff --git a/Application/Admin/View/PaymentMerchant/ruleEditForm.html b/Application/Admin/View/PaymentMerchant/ruleEditForm.html
index 6d1c81c66..f60b05d97 100644
--- a/Application/Admin/View/PaymentMerchant/ruleEditForm.html
+++ b/Application/Admin/View/PaymentMerchant/ruleEditForm.html
@@ -153,7 +153,7 @@
                 <select name="alipay_merchant_id" id="alipay-merchant-select" class="select_gallery">
                   <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>
@@ -164,7 +164,7 @@
                 <select name="weixin_merchant_id" id="weixin-merchant-select" class="select_gallery">
                   <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>
@@ -175,7 +175,7 @@
                 <select name="express_merchant_id" id="express-merchant-select" class="select_gallery">
                   <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>
diff --git a/Application/Home/Controller/PackageController.class.php b/Application/Home/Controller/PackageController.class.php
index f24766b9a..7208043cf 100644
--- a/Application/Home/Controller/PackageController.class.php
+++ b/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,
diff --git a/Application/Home/View/default/Package/open_in_safari.html b/Application/Home/View/default/Package/open_in_safari.html
new file mode 100644
index 000000000..6abd2ff4a
--- /dev/null
+++ b/Application/Home/View/default/Package/open_in_safari.html
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta itemprop="name" content="{$game['relation_game_name']}"/>
+  <meta itemprop="image" content="{$game['icon']}"/>
+  <meta name="description" itemprop="description" content="{$game['features']}"/>
+  <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>{$game['relation_game_name']}</title>
+</head>
+<body onclick="checkSafari()">
+  <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>
\ No newline at end of file

From b65a62b6ab8606a5151275c6d5cc2bd1abbb0d6b Mon Sep 17 00:00:00 2001
From: ELF <360197197@qq.com>
Date: Wed, 2 Jun 2021 15:06:25 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Home/View/default/Package/open_in_safari.html        | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/Application/Home/View/default/Package/open_in_safari.html b/Application/Home/View/default/Package/open_in_safari.html
index 6abd2ff4a..60cc99b2a 100644
--- a/Application/Home/View/default/Package/open_in_safari.html
+++ b/Application/Home/View/default/Package/open_in_safari.html
@@ -1,9 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-  <meta itemprop="name" content="{$game['relation_game_name']}"/>
-  <meta itemprop="image" content="{$game['icon']}"/>
-  <meta name="description" itemprop="description" content="{$game['features']}"/>
+  <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">
@@ -18,9 +17,9 @@
   <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>{$game['relation_game_name']}</title>
+  <title>请在Safari浏览器中打开</title>
 </head>
-<body onclick="checkSafari()">
+<body>
   <div class="safari" style="z-index: 1000">
       <div class="safari-heard">
       <div>请选择在“Safari”中打开</div>

From 53bf6bca07151ef6db1317142a372b7f53282e9d Mon Sep 17 00:00:00 2001
From: ELF <360197197@qq.com>
Date: Wed, 2 Jun 2021 15:17:33 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/View/PaymentMerchant/ruleAddForm.html  | 6 +++---
 Application/Admin/View/PaymentMerchant/ruleEditForm.html | 6 +++---
 Application/Home/Controller/PackageController.class.php  | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Application/Admin/View/PaymentMerchant/ruleAddForm.html b/Application/Admin/View/PaymentMerchant/ruleAddForm.html
index a66ce8fc8..6db6e10b9 100644
--- a/Application/Admin/View/PaymentMerchant/ruleAddForm.html
+++ b/Application/Admin/View/PaymentMerchant/ruleAddForm.html
@@ -150,7 +150,7 @@
             <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']?>(<?=$merchant['account']?>)</option>
@@ -161,7 +161,7 @@
             <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']?>(<?=$merchant['account']?>)</option>
@@ -172,7 +172,7 @@
             <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']?>(<?=$merchant['account']?>)</option>
diff --git a/Application/Admin/View/PaymentMerchant/ruleEditForm.html b/Application/Admin/View/PaymentMerchant/ruleEditForm.html
index f60b05d97..cbd0903a7 100644
--- a/Application/Admin/View/PaymentMerchant/ruleEditForm.html
+++ b/Application/Admin/View/PaymentMerchant/ruleEditForm.html
@@ -150,7 +150,7 @@
             <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']?>(<?=$merchant['account']?>)</option>
@@ -161,7 +161,7 @@
             <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']?>(<?=$merchant['account']?>)</option>
@@ -172,7 +172,7 @@
             <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']?>(<?=$merchant['account']?>)</option>
diff --git a/Application/Home/Controller/PackageController.class.php b/Application/Home/Controller/PackageController.class.php
index 7208043cf..187bdb9c3 100644
--- a/Application/Home/Controller/PackageController.class.php
+++ b/Application/Home/Controller/PackageController.class.php
@@ -114,9 +114,9 @@ class PackageController extends Controller
 
         $downloadDomain = $applyService->getDownloadDomain();
         if ($game['sdk_version'] == 2) {
-            if (!Request::getMobileDetect()->is('Safari')) {
+            /* if (!Request::getMobileDetect()->is('Safari')) {
                 return $this->display('open_in_safari');
-            }
+            } */
             $packageDownloadLogService = new PackageDownloadLogService();
             $packageDownloadLogService->add([
                 'user_id' => 0,