Merge branch 'merge-master'

README.md

@@ -327,4 +327,13 @@ update
 `2023.4.3`
 update
 - packageHome
-    - 增加 进入首页判断是否存在redUrl的逻辑
+    - 增加 进入首页判断是否存在redUrl的逻辑
+
+
+## v1.0.39
+`2023.4.6`
+update
+- appId
+    - 修改 正式环境的appid
+- packageList
+    - 修改正式环境 代理商用户的userId

src/config/appId.js

@@ -1,13 +1,13 @@
 /*
  * @Date: 2022-03-19 19:57:20
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-04-03 14:25:02
+ * @LastEditTime: 2023-04-06 09:17:15
  * @FilePath: \TelpoH5FrontendWeb\src\config\appId.js
  * @description:
  */
 const AppId = process.env.NODE_ENV === 'production' ?
-    'wx23f697736154110b' :
+    'wxd78b83bdb0b4df55' :
     process.env.VUE_APP_BASE_API.indexOf('ai.ssjlai.com') > -1 ?
-        'wx23f697736154110b':
+        'wxd78b83bdb0b4df55':
         /* 'wx785c95a3e7f46f72' */'wxd78b83bdb0b4df55'; //wx5e26f0813859e5f6 2022.10.12 更改测试公众号
 export default AppId;

src/config/models.js

@@ -1,11 +1,11 @@
 /*
  * @Date: 2021-11-20 10:26:39
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-04-03 14:12:32
+ * @LastEditTime: 2023-04-06 09:13:27
  * @FilePath: \TelpoH5FrontendWeb\src\config\models.js
  * @description:
  */
-export const VERSION_MODEL = '1.0.38F'; //版本号
+export const VERSION_MODEL = '1.0.39F'; //版本号
 export const IMAGE_URL = {
     production: 'http://zfb.ssjlai.com/web/',
     test: 'http://zfb.ssjlai.com/web/',

src/views/package-list/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2022-03-29 16:57:58
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-04-03 14:13:02
+ * @LastEditTime: 2023-04-06 09:14:39
  * @FilePath: \TelpoH5FrontendWeb\src\views\package-list\index.vue
  * @description: TODO 小台风充值h5
 -->
@@ -500,7 +500,7 @@ export default {
                     that.outTradeNo = alipayData.outTradeNo;
                     let alipayForm = decodeURI(alipayData.payXmlStr);
                     that.$store.commit("isFromWx", true);
-                    let alipayUserId = process.env.NODE_ENV === "production" ? 42 : 18;
+                    let alipayUserId = process.env.NODE_ENV === "production" ? 69 : 18;
                     this.$router.replace({
                         name: "payResult",
                         query: {