From 56791cdd7d0f0e6b5334eb3d37af75c00fa1f5f6 Mon Sep 17 00:00:00 2001
From: gongfuxiang <2499232802@qq.com>
Date: Sat, 25 May 2019 20:42:38 +0800
Subject: [PATCH] wx pay

---
 .../admin/admin/index.html                    |  9 ++++
 .../index/pay/index.html                      | 47 ------------------
 .../weixinwebauthorization/config.json        |  4 +-
 .../weixinwebauthorization/index/Pay.php      | 49 -------------------
 4 files changed, 11 insertions(+), 98 deletions(-)
 delete mode 100644 application/plugins/view/weixinwebauthorization/index/pay/index.html
 delete mode 100644 application/plugins/weixinwebauthorization/index/Pay.php

diff --git a/application/plugins/view/weixinwebauthorization/admin/admin/index.html b/application/plugins/view/weixinwebauthorization/admin/admin/index.html
index 6fb0121ce..8e65b5d7a 100755
--- a/application/plugins/view/weixinwebauthorization/admin/admin/index.html
+++ b/application/plugins/view/weixinwebauthorization/admin/admin/index.html
@@ -68,6 +68,15 @@
                 </div>
             </div>
 
+            <div class="items">
+                <label>公众号/服务号支付目录</label>
+                <div>
+                    <a href="{{$Think.__MY_URL__}}" target="_blank">{{$Think.__MY_URL__}}</a><br />
+                    <a href="{{$Think.__MY_URL__}}index/order/" target="_blank">{{$Think.__MY_URL__}}index/order/</a><br />
+                    <a href="{{$Think.__MY_URL__}}index.php/index/order/" target="_blank">{{$Think.__MY_URL__}}index.php/index/order/</a>
+                </div>
+            </div>
+
             <a href="{{:PluginsAdminUrl('weixinwebauthorization', 'admin', 'saveinfo')}}" class="am-btn am-btn-secondary am-radius btn-loading-example am-btn-sm am-btn-block edit-submit">编辑</a>
         </div>
     </div>
diff --git a/application/plugins/view/weixinwebauthorization/index/pay/index.html b/application/plugins/view/weixinwebauthorization/index/pay/index.html
deleted file mode 100644
index 80e5b58c0..000000000
--- a/application/plugins/view/weixinwebauthorization/index/pay/index.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<script type="text/javascript">
-function onBridgeReady()
-{
-   WeixinJSBridge.invoke(
-      'getBrandWCPayRequest', {
-         "appId":"{{$pay_data.appId}}",
-         "timeStamp":"{{$pay_data.timeStamp}}",
-         "nonceStr":"{{$pay_data.nonceStr}}",
-         "package":"{{$pay_data.package}}",     
-         "signType":"{{$pay_data.signType}}",
-         "paySign":"{{$pay_data.paySign}}"
-      },
-      function(res) {
-      if(res.err_msg == "get_brand_wcpay_request:ok" )
-      {
-        Prompt(result.msg, 'success');
-        {{if !empty($redirect_url)}}
-            setTimeout(function()
-            {
-                window.location.href = '{{$redirect_url}}';
-            }, 1500);
-        {{/if}}
-      } else if(res.err_msg == 'get_brand_wcpay_request:cancel')
-      {
-        Prompt('用户取消');
-      } else if(res.err_msg == 'get_brand_wcpay_request:fail')
-      {
-        Prompt('支付失败');
-      } else {
-        Prompt('支付参数有误');
-      }
-   }); 
-}
-if(typeof WeixinJSBridge == "undefined")
-{
-   if( document.addEventListener )
-   {
-       document.addEventListener('WeixinJSBridgeReady', onBridgeReady, false);
-   } else if (document.attachEvent)
-   {
-       document.attachEvent('WeixinJSBridgeReady', onBridgeReady); 
-       document.attachEvent('onWeixinJSBridgeReady', onBridgeReady);
-   }
-} else {
-   onBridgeReady();
-}
-</script>
\ No newline at end of file
diff --git a/application/plugins/weixinwebauthorization/config.json b/application/plugins/weixinwebauthorization/config.json
index 9265c2592..f43014b4f 100644
--- a/application/plugins/weixinwebauthorization/config.json
+++ b/application/plugins/weixinwebauthorization/config.json
@@ -1,12 +1,12 @@
 {
     "base":{
         "plugins":"weixinwebauthorization",
-        "name":"微信登录",
+        "name":"微信网页授权",
         "logo":"\/static\/upload\/images\/plugins_weixinwebauthorization\/2019\/05\/24\/1558681549248354.jpg",
         "author":"Devil",
         "author_url":"https:\/\/shopxo.net\/",
         "version":"1.0.0",
-        "desc":"微信授权登录、注册",
+        "desc":"微信授权登录、注册、公众号支付",
         "apply_terminal":[
             "pc",
             "h5"
diff --git a/application/plugins/weixinwebauthorization/index/Pay.php b/application/plugins/weixinwebauthorization/index/Pay.php
deleted file mode 100644
index ce066ba5f..000000000
--- a/application/plugins/weixinwebauthorization/index/Pay.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-// +----------------------------------------------------------------------
-// | ShopXO 国内领先企业级B2C免费开源电商系统
-// +----------------------------------------------------------------------
-// | Copyright (c) 2011~2019 http://shopxo.net All rights reserved.
-// +----------------------------------------------------------------------
-// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
-// +----------------------------------------------------------------------
-// | Author: Devil
-// +----------------------------------------------------------------------
-namespace app\plugins\weixinwebauthorization\index;
-
-use think\Controller;
-
-/**
- * 微信登录 - 支付
- * @author   Devil
- * @blog     http://gong.gg/
- * @version  0.0.1
- * @datetime 2016-12-01T21:51:08+0800
- */
-class Pay extends Controller
-{
-    /**
-     * 授权
-     * @author   Devil
-     * @blog     http://gong.gg/
-     * @version  1.0.0
-     * @datetime 2019-02-07T08:21:54+0800
-     * @param    [array]          $params [输入参数]
-     */
-    public function Index($params = [])
-    {
-        $pay_data = session('weixin_pay_data');
-        $weixin_redirect_url = session('weixin_redirect_url');
-        if(!empty($pay_data))
-        {
-            $this->assign('pay_data', $pay_data);
-            $this->assign('redirect_url', $weixin_redirect_url);
-            return $this->fetch('../../../plugins/view/weixinwebauthorization/index/pay/index');
-        } else {
-            $this->assign('msg', '支付参数错误');
-            return $this->fetch('public/tips_error');
-        }
-    }
-
-
-}
-?>
\ No newline at end of file