diff --git a/app/wechat/controller/Config.php b/app/wechat/controller/Config.php index ac5ce80e9..a5b88fa9b 100644 --- a/app/wechat/controller/Config.php +++ b/app/wechat/controller/Config.php @@ -37,10 +37,10 @@ class Config extends Controller public function options() { $this->_applyFormToken(); - $this->thrNotify = url('@wechat/api.push', [], false, true)->build(); + $this->thrNotify = sysuri('wechat/api.push/index', [], false, true); if ($this->request->isGet()) { try { - $source = enbase64url(url('@admin', [], false, true) . '#' . $this->request->url()); + $source = enbase64url(sysuri('admin/index/index', [], false, true) . '#' . $this->request->url()); $this->authurl = "http://open.cuci.cc/service/api.push/auth?source={$source}"; if (input('?appid') && input('?appkey')) { sysconf('wechat.type', 'thr'); @@ -70,8 +70,8 @@ class Config extends Controller } } sysoplog('微信管理', '修改微信授权配置成功'); - $location = url('@wechat/config/options') . '?uniqid=' . uniqid(); - $this->success('微信参数修改成功！', url('@admin') . "#{$location}"); + $location = url('wechat/config/options') . '?uniqid=' . uniqid(); + $this->success('微信参数修改成功！', sysuri('admin/index/index') . "#{$location}"); } } diff --git a/app/wechat/controller/Keys.php b/app/wechat/controller/Keys.php index 17f2a7b59..5cad75c61 100644 --- a/app/wechat/controller/Keys.php +++ b/app/wechat/controller/Keys.php @@ -76,7 +76,7 @@ class Keys extends Controller protected function _index_page_filter(&$data) { foreach ($data as &$vo) { - $vo['qrc'] = url('@wechat/keys/index') . "?action=qrc&keys={$vo['keys']}"; + $vo['qrc'] = url('wechat/keys/index') . "?action=qrc&keys={$vo['keys']}"; $vo['type'] = isset($this->types[$vo['type']]) ? $this->types[$vo['type']] : $vo['type']; } } diff --git a/app/wechat/controller/api/Login.php b/app/wechat/controller/api/Login.php index 5cb9a6862..0491023b0 100644 --- a/app/wechat/controller/api/Login.php +++ b/app/wechat/controller/api/Login.php @@ -48,7 +48,7 @@ class Login extends Controller { $mode = intval(input('mode', '0')); $code = $this->prefix . md5(uniqid('t', true) . rand(10000, 99999)); - $text = url('@wechat/api.login/oauth', [], false, true) . "?code={$code}&mode={$mode}"; + $text = url('wechat/api.login/oauth', [], false, true) . "?code={$code}&mode={$mode}"; // 生成二维码并返回结果 $qrcode = new \Endroid\QrCode\QrCode(); $qrcode->setText($text)->setSize(300)->setPadding(20); diff --git a/app/wechat/controller/api/Test.php b/app/wechat/controller/api/Test.php index 58d81191b..d1eeb8326 100644 --- a/app/wechat/controller/api/Test.php +++ b/app/wechat/controller/api/Test.php @@ -36,7 +36,7 @@ class Test extends Controller */ public function jsapi_qrc() { - $this->url = url('@wechat/api.test/jsapi', [], false, true); + $this->url = url('wechat/api.test/jsapi', [], false, true); return $this->showQrc($this->url); } @@ -49,7 +49,7 @@ class Test extends Controller */ public function oauth_qrc() { - $this->url = url('@wechat/api.test/oauth', [], false, true); + $this->url = url('wechat/api.test/oauth', [], false, true); return $this->showQrc($this->url); } @@ -62,7 +62,7 @@ class Test extends Controller */ public function jssdk_qrc() { - $this->url = url('@wechat/api.test/jssdk', [], false, true); + $this->url = url('wechat/api.test/jssdk', [], false, true); return $this->showQrc($this->url); } @@ -96,7 +96,7 @@ class Test extends Controller 'body' => '测试商品', 'total_fee' => '1', 'trade_type' => 'NATIVE', - 'notify_url' => url('@wechat/api.test/notify', [], false, true)->build(), + 'notify_url' => url('wechat/api.test/notify', [], false, true)->build(), 'out_trade_no' => CodeExtend::uniqidNumber(18), 'spbill_create_ip' => $this->request->ip(), ]); @@ -154,7 +154,7 @@ class Test extends Controller 'body' => "测试商品，产品ID：{$notify['product_id']}", 'total_fee' => '1', 'trade_type' => 'NATIVE', - 'notify_url' => url('@wechat/api.test/notify', [], false, true)->build(), + 'notify_url' => url('wechat/api.test/notify', [], false, true)->build(), 'out_trade_no' => CodeExtend::uniqidDate(18), 'spbill_create_ip' => $this->request->ip(), ]; @@ -199,7 +199,7 @@ class Test extends Controller 'openid' => $user['openid'], 'total_fee' => '1', 'trade_type' => 'JSAPI', - 'notify_url' => url('@wechat/api.test/notify', [], false, true), + 'notify_url' => url('wechat/api.test/notify', [], false, true), 'out_trade_no' => CodeExtend::uniqidDate(18), 'spbill_create_ip' => $this->request->ip(), ]); diff --git a/app/wechat/view/api/review/news.html b/app/wechat/view/api/review/news.html index 09a08a6b7..2a25d3108 100644 --- a/app/wechat/view/api/review/news.html +++ b/app/wechat/view/api/review/news.html @@ -6,12 +6,12 @@ {notempty name='news.articles'} {foreach $news.articles as $k => $v} {if $k < 1} - + {if $v.title}{$v.title}{/if}
{else} - + {$v.title} diff --git a/app/wechat/view/config/options_tst.html b/app/wechat/view/config/options_tst.html index e93868eb5..8b545a002 100644 --- a/app/wechat/view/config/options_tst.html +++ b/app/wechat/view/config/options_tst.html @@ -16,29 +16,29 @@

支付测试配置

- JSAPI 支付测试需要在微信商户平台配置支付目录：{:url('@wechat/api.test/',[],'',true)}
- 扫码支付①需要在微信商户平台配置支付通知地址：{:url('@wechat/api.test/scan_one_notify',[],'',true)} + JSAPI 支付测试需要在微信商户平台配置支付目录：{:sysuri('wechat/api.test/index',[],'',true)}
+ 扫码支付①需要在微信商户平台配置支付通知地址：{:url('wechat/api.test/scan_one_notify',[],'',true)}
- +

网页授权

- img + img

JSSDK签名

- img + img

JSAPI支付

- img + img

扫码支付①

- img + img

扫码支付②

diff --git a/app/wechat/view/news/index.html b/app/wechat/view/news/index.html index 7cfdfc3dd..c59cd8fe2 100644 --- a/app/wechat/view/news/index.html +++ b/app/wechat/view/news/index.html @@ -14,7 +14,7 @@ {foreach $list as $vo}
- 预览 + 预览 编辑 删除
diff --git a/composer.lock b/composer.lock index 9d0465d66..6416652cf 100644 --- a/composer.lock +++ b/composer.lock @@ -909,12 +909,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "2858d5d77526e064d7dd89f793ae9269310a6cba" + "reference": "ecc7e82523daebbd8e57d7e19b216e795d3d229e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/2858d5d77526e064d7dd89f793ae9269310a6cba", - "reference": "2858d5d77526e064d7dd89f793ae9269310a6cba", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/ecc7e82523daebbd8e57d7e19b216e795d3d229e", + "reference": "ecc7e82523daebbd8e57d7e19b216e795d3d229e", "shasum": "", "mirrors": [ { @@ -958,7 +958,7 @@ ], "description": "ThinkPHP v6.0 Development Library", "homepage": "http://framework.thinkadmin.top", - "time": "2020-04-23T09:13:17+00:00" + "time": "2020-04-23T09:32:46+00:00" }, { "name": "zoujingli/wechat-developer", diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index fb7135408..4519b85f6 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -935,12 +935,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "2858d5d77526e064d7dd89f793ae9269310a6cba" + "reference": "ecc7e82523daebbd8e57d7e19b216e795d3d229e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/2858d5d77526e064d7dd89f793ae9269310a6cba", - "reference": "2858d5d77526e064d7dd89f793ae9269310a6cba", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/ecc7e82523daebbd8e57d7e19b216e795d3d229e", + "reference": "ecc7e82523daebbd8e57d7e19b216e795d3d229e", "shasum": "", "mirrors": [ { @@ -956,7 +956,7 @@ "ext-json": "*", "topthink/framework": "^6.0" }, - "time": "2020-04-23T09:13:17+00:00", + "time": "2020-04-23T09:32:46+00:00", "type": "library", "extra": { "think": { diff --git a/vendor/services.php b/vendor/services.php index f9e2902a9..defcf89c2 100644 --- a/vendor/services.php +++ b/vendor/services.php @@ -1,5 +1,5 @@ 'think\\app\\Service', diff --git a/vendor/zoujingli/think-library/src/helper/PageHelper.php b/vendor/zoujingli/think-library/src/helper/PageHelper.php index 5673ff80b..93977ebec 100644 --- a/vendor/zoujingli/think-library/src/helper/PageHelper.php +++ b/vendor/zoujingli/think-library/src/helper/PageHelper.php @@ -90,7 +90,7 @@ class PageHelper extends Helper foreach ([10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 110, 120, 130, 140, 150, 160, 170, 180, 190, 200] as $num) { [$query['limit'], $query['page'], $selects] = [$num, 1, $limit === $num ? 'selected' : '']; if (stripos($this->app->request->get('spm', '-'), 'm-') === 0) { - $url = url('@admin') . '#' . $this->app->request->baseUrl() . '?' . urldecode(http_build_query($query)); + $url = sysuri('admin/index/index') . '#' . $this->app->request->baseUrl() . '?' . urldecode(http_build_query($query)); } else { $url = $this->app->request->baseUrl() . '?' . urldecode(http_build_query($query)); }