From b01ff154ea13cd184233d406eae828c1d41aba20 Mon Sep 17 00:00:00 2001
From: chenzhi <“chenzhi063@qq.com>
Date: Thu, 17 Oct 2019 15:27:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=A4=BC=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Sdk/Controller/Ipa365Controller.class.php |  9 +++-
 .../Sdk/View/default/Ipa365/install_show.html | 44 ++++++++-------
 .../View/default/Ipa365/install_show1.html    | 53 -------------------
 3 files changed, 32 insertions(+), 74 deletions(-)
 delete mode 100644 Application/Sdk/View/default/Ipa365/install_show1.html

diff --git a/Application/Sdk/Controller/Ipa365Controller.class.php b/Application/Sdk/Controller/Ipa365Controller.class.php
index 405851ef4..87e1a2360 100644
--- a/Application/Sdk/Controller/Ipa365Controller.class.php
+++ b/Application/Sdk/Controller/Ipa365Controller.class.php
@@ -274,7 +274,14 @@ class Ipa365Controller extends BaseController{
     		'order_id' => $orderId,
     		'user_id' => $userId,
     		'game_id' => $gameId
-    	))); 
+		))); 
+		//获取礼包码
+		$giftbag = M('giftbag', 'tab_')->field("*")->where(array("game_id"=>$gameId,"giftbag_version"=>3))->find();
+		if(empty($giftbag)){
+			$giftbag = false;
+		}
+
+		$this->assign('giftbag', $giftbag);
     	$this->display();
     }
     
diff --git a/Application/Sdk/View/default/Ipa365/install_show.html b/Application/Sdk/View/default/Ipa365/install_show.html
index a7efd34f7..97ddb4e05 100644
--- a/Application/Sdk/View/default/Ipa365/install_show.html
+++ b/Application/Sdk/View/default/Ipa365/install_show.html
@@ -125,29 +125,33 @@ p,input{
                 <div class="game-rule">不同设备需要分别付费安装哦，请使用常用设备下载</div>
                 <div class="download-button"><a href="{$url}">下载安装</a></div>
             </div>
-            <div style="padding:0 .3rem;">
-                <div class="game-gift shaddowbox">
-                    <div class="title-3">
-                        <h2>特权礼包</h2>
-                    </div>
-                    <div class="gift-list">
-                        <ul>
-                            <li >
-                                <div class="gift-title">
-                                    <h2>《天宫计》至尊礼包</h2>
-                                </div>
-                                <p class="gift-info">[ 高级宝图*2、财神银匙*1 ]</p>
-                                <p class="gift-code">
-                                    <label for="giftCode">兑换码：</label>
-                                    <input id="giftCode1455" type="text" value="GNM6BWJS" readonly="">
-                                    <a href="javascript:;" class="code-btn1455" data-clipboard-target="#giftCode1455">复制兑换码</a>
-                                </p>
-                            </li>
+            <if condition="$giftbag">
+               
+                <div style="padding:0 .3rem;">
+                    <div class="game-gift shaddowbox">
+                        <div class="title-3">
+                            <h2>特权礼包</h2>
+                        </div>
+                        <div class="gift-list">
+                            <ul>
+                                <li >
+                                    <div class="gift-title">
+                                        <h2>{$giftbag['giftbag_name']}</h2>
+                                    </div>
+                                    <p class="gift-info">{$giftbag['desribe']}</p>
+                                    <p class="gift-code">
+                                        <label for="giftCode">兑换码：</label>
+                                        <input id="giftCode1455" type="text" value="{$giftbag['novice']}" readonly="">
+                                        <a href="javascript:;" class="code-btn1455" data-clipboard-target="#giftCode1455">复制兑换码</a>
+                                    </p>
+                                </li>
 
-                        </ul>
+                            </ul>
+                        </div>
                     </div>
                 </div>
-            </div>
+
+            </if>
         </div>
     </div>
     <script src="__JS__/jquery-1.11.1.min.js" type="text/javascript"></script>
diff --git a/Application/Sdk/View/default/Ipa365/install_show1.html b/Application/Sdk/View/default/Ipa365/install_show1.html
deleted file mode 100644
index 7e88b4cc7..000000000
--- a/Application/Sdk/View/default/Ipa365/install_show1.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <meta name="apple-mobile-web-app-capable" content="yes">
-    <meta name="viewport"
-        content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
-    <title>订单详情</title>
-    <link href="__CSS__/ssg/common.css" rel="stylesheet" type="text/css">
-    <script src="/Public/Mobile/js/ssg/flexible.min.js" type="text/javascript"></script>
-</head>
-<body>
-    <div class="page-container ">
-        <div class="top">
-            <a href="javascript:history.go(-1);"></a>{$game['game_name']}
-        </div>
-        <div class="vip-download">
-            <div class="game-info">
-                <img src="__IMG__/ssg/detail/download-bg.png">
-                <div class="game-icon"><img src="{$game['icon']|get_cover='path'}"></div>
-                <div class="game-title">{$game['game_name']}-超级签</div>
-                <div class="game-rule">不同设备需要分别付费安装哦，请使用常用设备下载</div>
-                <div class="download-button"><a href="{$url}">下载安装</a></div>
-            </div>
-            <div class="game-gift">
-                <div class="title-3">
-                    <h2>特权礼包</h2>
-                </div>
-                <div class="gift-list">
-                    <ul>
-                        <li>
-                            <div class="gift-title">
-                                <h2>《天宫计》至尊礼包</h2>
-                            </div>
-                            <p class="gift-info">[ 高级宝图*2、财神银匙*1 ]</p>
-                            <p class="gift-code">
-                                <label for="giftCode">兑换码：</label>
-                                <input id="giftCode1455" type="text" value="GNM6BWJS" readonly="">
-                                <a href="javascript:;" class="code-btn1455" data-clipboard-target="#giftCode1455">复制</a>
-                            </p>
-                        </li>
-
-                    </ul>
-                </div>
-            </div>
-        </div>
-    </div>
-    <script src="__JS__/jquery-1.11.1.min.js" type="text/javascript"></script>
-    <!-- <script src="__JS__/ssg/common.js" type="text/javascript"></script> -->
-    <script src="__JS__/ssg/clipboard.min.js" type="text/javascript"></script>
-</body>
-</html>
\ No newline at end of file