Merge branch 'dev' of 47.111.118.107:/srv/git/sdk into dev

Application/Callback/Controller/Notify2Controller.class.php

@@ -3,6 +3,7 @@
 namespace Callback\Controller;
 
 use Org\UcenterSDK\Ucservice;
+use Think\Log;
 
 
 /**
@@ -40,7 +41,6 @@ class Notify2Controller extends BaseController
         $aop = new \AopClient();
         $aop->alipayrsaPublicKey = file_get_contents("./Application/Sdk/SecretKey/alipay/alipay2_public_key.txt");
         $result = $aop->rsaCheckV1($notify,'','RSA2');
-
         if ($result) {
             //获取回调订单信息
             if (I('get.methodtype') == "notify") {

Application/Sdk/Controller/ChangyanController.class.php

@@ -48,8 +48,8 @@ class ChangyanController extends Controller {
         // $this->assign('game_id',"1"); 
         // $this->display("WapPay/wap_shortcut_pay");
 
-        $this->display("UserH/platform_pay");
+        // $this->display("UserH/platform_pay");
-        // $this->display("Spend/paycallback");
+        $this->display("UserH/platform_pay_show");
         
         # code...
     }

Application/Sdk/Controller/GameGiftController.class.php

@@ -14,6 +14,7 @@ class GameGiftController extends BaseController{
     	$gift = M("Giftbag","tab_");
         $map['game_id'] = $request['game_id'];
         $map['status']=1;
+        $map['giftbag_name'] = ['NEQ','超级签专属礼包'];
         $row = $request['row']?:10;
         $page = $request['p']?:1;
         switch ($request['sdk_version']) {

Application/Sdk/View/default/UserH/platform_pay_show.html

@@ -17,7 +17,7 @@
     <div class="js_dialog" id="iosDialog" style="display: none;">
         <div class="weui-mask"></div>
         <div class="weui-dialog" style="width: 4rem;height: 4rem;max-width: 4rem;">
-            <img src="__IMG__/payerroricon.png" style="width: 1.4rem;height: 1.4rem;margin-top: .59rem;">
+            <img src="__IMG__/erroricon2.png" style="width: 1.4rem;height: 1.4rem;margin-top: .59rem;">
             <p id="errormsg" style="font-size: .24rem;margin-top: .39rem;">输入错误，请重新输入</p>
             <div class="btnbox" style="margin-top: .28rem;">
                 <div id="hidedialog" class="ptbbtn" style="width: 1.5rem;height: .5rem;line-height: .5rem;">