Merge branch 'develop' into merge-master

README.md

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2022-08-17 16:19:13
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-04-03 14:12:11
+ * @LastEditTime: 2023-04-06 10:12:37
  * @FilePath: \TelpoH5FrontendWeb\README.md
  * @description: 项目说明
 -->
@@ -336,4 +336,7 @@ update
 - appId
     - 修改 正式环境的appid
 - packageList
-    - 修改正式环境 代理商用户的userId
+    - 修改 正式环境 代理商用户的userId
+
+- packageHome
+    - 修改 appId获取的方式，本地配置文件固定配置，不再从url路由获取

src/views/package-home/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2023-02-24 14:18:25
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-04-03 14:12:51
+ * @LastEditTime: 2023-04-06 10:11:00
  * @FilePath: \TelpoH5FrontendWeb\src\views\package-home\index.vue
  * @description:
 -->
@@ -16,6 +16,7 @@ import { APIPay } from "@/api/pay";
 import APICore from "@/api/core";
 import APIWx from "@/api/wx";
 import { isNotNull } from "@/utils/index";
+import AppId from "@/config/appId";
 export default {
     name: "",
     data() {
@@ -108,9 +109,6 @@ export default {
         getWxCode() {
             let params = this.params;
             let commonUrl = process.env.VUE_APP_BASE_API;
-            /* let redUrl = encodeURIComponent(`${commonUrl}/h5-frontendweb/#/${params.routerName}?imei=${params.imei}&appId=${params.appId}&iccid=${params.iccid}`);
-            let url = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${params.appId}&redirect_uri=${redUrl}&response_type=code&scope=snsapi_base&state=STATE#wechat_redirect`;
-            window.location.href = url; */
             // todo 暂时去掉
             if(this.isRecharge) {
                 // 如果是已经支付，但未激活，跳转激活界面
@@ -122,8 +120,8 @@ export default {
                     }
                 })
             } else {
-                let redUrl = encodeURIComponent(`${commonUrl}/h5-frontendweb/#/${params.routerName}?imei=${params.imei}&appId=${params.appId}&iccid=${params.iccid}`);
-                let url = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${params.appId}&redirect_uri=${redUrl}&response_type=code&scope=snsapi_base&state=STATE#wechat_redirect`;
+                let redUrl = encodeURIComponent(`${commonUrl}/h5-frontendweb/#/${params.routerName}?imei=${params.imei}&appId=${AppId}&iccid=${params.iccid}`);
+                let url = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${AppId}&redirect_uri=${redUrl}&response_type=code&scope=snsapi_base&state=STATE#wechat_redirect`;
                 window.location.href = url;
             }
 
@@ -134,7 +132,7 @@ export default {
             if (params) {
                 console.log("params", params);
                 this.params = {...params};
-                this.$store.commit("appId", params.appId);
+                this.$store.commit("appId", AppId);
                 if(params.reqUrl) {
                     const reqUrl = encodeURI(params.reqUrl);
                     console.log("reqUrl", params.reqUrl, reqUrl);