diff --git a/crmeb/crmeb/services/app/WechatService.php b/crmeb/crmeb/services/app/WechatService.php index 24fad4bbc..76a24c935 100644 --- a/crmeb/crmeb/services/app/WechatService.php +++ b/crmeb/crmeb/services/app/WechatService.php @@ -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 = [ diff --git a/template/admin/src/setting.js b/template/admin/src/setting.js index 84a509ef8..3b51eaa25 100644 --- a/template/admin/src/setting.js +++ b/template/admin/src/setting.js @@ -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 = { // 路由前缀