From a0fca119e61dad3f1055a339c827d13f40da320b Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Thu, 20 Apr 2023 16:24:08 +0800
Subject: [PATCH] =?UTF-8?q?pc=E6=A8=A1=E7=89=88=E4=BD=BF=E7=94=A8=E5=BE=AE?=
 =?UTF-8?q?=E4=BF=A1=E6=94=AF=E4=BB=98=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/crmeb/services/app/WechatService.php | 8 +-------
 template/admin/src/setting.js              | 2 +-
 2 files changed, 2 insertions(+), 8 deletions(-)

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 = {
   // 路由前缀