Merge remote-tracking branch 'origin/main'

XinAoDTS/fuintUniapp/config.js

@@ -1,8 +1,9 @@
 module.exports = {
-   // 系统名称
-   name: "fuint会员系统",
-   // 必填: 后端api地址, 斜杠/结尾
-   apiUrl: "https://yanghaodong.51vip.biz/",
-   // 必填: 默认商户号，从后台商户列表获取
-   merchantNo: "10001"
+  // 系统名称
+  name: 'fuint会员系统',
+  // 必填: 后端api地址, 斜杠/结尾
+  // apiUrl: "https://yanghaodong.51vip.biz/",
+  apiUrl: 'https://boot.ennenergy.cn/',
+  // 必填: 默认商户号，从后台商户列表获取
+  merchantNo: '10001',
 }

XinAoDTS/fuintUniapp/manifest.json

@@ -64,7 +64,7 @@
                 "payment" : {
                     "weixin" : {
                         "__platform__" : [ "ios", "android" ],
-                        "appid" : "wx53b5ac263b9cdb5b",
+                        "appid" : "wx7b3cd05eaf5225b9",
                         "UniversalLinks" : "https://static-5ada423c-7a73-43cd-a106-dea1d6af22d2.bspapp.com/uni-universallinks/__UNI__601AA10"
                     }
                 }
@@ -78,7 +78,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wx53b5ac263b9cdb5b",
+        "appid" : "wx7b3cd05eaf5225b9",
         "setting" : {
             "urlCheck" : false,
             "es6" : true,