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

Application/Sdk/Controller/PayH5Controller.class.php

@@ -464,6 +464,7 @@ class PayH5Controller extends BaseController{
 		        'game_id' => $game_id,
 		        'gopay' => 1,  // 立即支付
         		'tx_client' => 'tx_forbid_return', // android 返回键
+        		'user_token' => $this->userToken,
         	))]);
         exit; 
     }

Application/Sdk/Controller/SpendController.class.php

@@ -299,10 +299,7 @@ ADD COLUMN `pay_url`  varchar(255) NOT NULL DEFAULT '' AFTER `check_sign`;
 		} else {
 			$this->assign("sqzfb", 0);
 		}
-		$payway = 'wxpay';
-		if ($result['pay_way'] == 1 || get_zfb_type() == 2) {
-			$payway = 'alipay';
-		}
+		
 // 		pp($orderno);
 		$this->assign('payway', $payway);
 		$this->assign("orderno", $orderno);

Application/Sdk/View/default/Spend/paycallback.html

@@ -26,15 +26,15 @@
             </a>
         </div> -->
         <div class="wxicon">
-            <eq name="payway" value="wxpay">
-            <img src="__IMG__/pay/alipay2x.png">
+            <eq name="paytype" value="weixinpay">
+            <img src="__IMG__/wxpay2x.png">
             <else />
-            <img src="__IMG__/pay/wxpay2x.png">
+            <img src="__IMG__/alipay2x.png">
             </eq>
         </div>
         <div class="paydesc">
             <div>
-            <eq name="payway" value="wxpay">
+            <eq name="paytype" value="weixinpay">
                 <p>1、如果未打开微信客户端或者未完成付款，点击“继续付款”；<br/>2、如果您已完成，请点击“已完成付款”。</p>
             <else />
                 <p>1、如果未打开支付宝客户端或者未完成付款，点击“继续付款”；<br/>2、如果您已完成，请点击“已完成付款”。</p>

Application/Sdk/View/default/WapPay/wap_shortcut_pay.html

@@ -391,7 +391,7 @@ $(function() {
     <div class="js_dialog" id="Dialog" style="display: none">
         <div class="weui-mask"></div>
         <div class="weui-dialog" style="width: 4.2rem;max-width: 4.2rem;display: flex;">
-            <img src="__IMG__/load.gif" style="width: 4.2rem;height: auto;">
+            <img src="__IMG__/load.gif" style="width: 4.2rem;height: 3.2rem;">
         </div>
     </div>
     <!--提醒信息弹窗-->
@@ -509,7 +509,8 @@ $(function() {
             </div>
         </div>
     </div>
-     <input style="width: 100%;border: 0;" onclick="return sendform()" type="submit" id="wfsubmit" name="wfsubmit" value="立即提交订单" class="weui-footer_fixed-bottom bottombutton"/>
+     <!-- <input style="width: 100%;border: 0;" onclick="return sendform()" type="submit" id="wfsubmit" name="wfsubmit" value="立即提交订单" class="weui-footer_fixed-bottom bottombutton"/> -->
+     <div style="width: 100%;border: 0;" onclick="return sendform()" type="submit" id="wfsubmit" name="wfsubmit" class="weui-footer_fixed-bottom bottombutton">立即提交订单</div>
     </form>
 </body>