elf
/
cf-sdk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
master
zhanglingsheng 5 years ago
parent 7c60bce623 8c445b21ec
commit bb352f9867
4 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File

1
Application/Sdk/Controller/PayH5Controller.class.php
Unescape Escape View File

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

5
Application/Sdk/Controller/SpendController.class.php
Unescape Escape View File

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

8
Application/Sdk/View/default/Spend/paycallback.html
Unescape Escape View File

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

5
Application/Sdk/View/default/WapPay/wap_shortcut_pay.html
Unescape Escape View File

@ -391,7 +391,7 @@ $(function() {
<div class="js_dialog" id="Dialog" style="display: none"> <div class="js_dialog" id="Dialog" style="display: none">
<div class="weui-mask"></div> <div class="weui-mask"></div>
<div class="weui-dialog" style="width: 4.2rem;max-width: 4.2rem;display: flex;"> <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>
</div> </div>
<!--提醒信息弹窗--> <!--提醒信息弹窗-->
@ -509,7 +509,8 @@ $(function() {
</div> </div>
</div> </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> </form>
</body> </body>

Write Preview
Loading…
Cancel
Save