github/CRMEB
1
0
Fork 0
mirror of https://github.com/crmeb/CRMEB.git synced 2026-10-29 22:10:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

pc模版使用微信支付问题处理

Browse Source
This commit is contained in:
evoxwht 2023-04-20 16:24:08 +08:00
parent 81f08194b1
commit a0fca119e6
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
crmeb/crmeb/services/app/WechatService.php
View File

@ -57,13 +57,7 @@ class WechatService
$appId = isset($wechat['wechat_app_appid']) ? trim($wechat['wechat_app_appid']) : '';
$appsecret = isset($wechat['wechat_app_appsecret']) ? trim($wechat['wechat_app_appsecret']) : '';
} else {
$appId = null;
if (request()->isPc()) {
$appId = sys_config('wechat_open_app_id');
}
if (!$appId) {
$appId = isset($wechat['wechat_appid']) ? trim($wechat['wechat_appid']) : '';
}
$appId = isset($wechat['wechat_appid']) ? trim($wechat['wechat_appid']) : '';
$appsecret = isset($wechat['wechat_appsecret']) ? trim($wechat['wechat_appsecret']) : '';
}
$config = [

2
template/admin/src/setting.js
View File

@ -1,5 +1,5 @@
// 请求接口地址 如果没有配置自动获取当前网址路径
const VUE_APP_API_URL = process.env.VUE_APP_API_URL || `${location.origin}/adminapi`;
const VUE_APP_API_URL = `https://v5.wuht.net/adminapi`||process.env.VUE_APP_API_URL || `${location.origin}/adminapi`;
const Setting = {
// 路由前缀