解决冲突

pages.json

@@ -66,6 +66,14 @@
 				"enablePullDownRefresh": false
 			}
 		},
+		{
+			"path": "pages/recharge/select-car",
+			"style": {
+				"navigationBarTitleText": "选择车辆",
+				"enablePullDownRefresh": false
+			}
+		},
+
 		{
 			"path": "pages/recharge/result",
 			"style": {

utils/network/api.js

@@ -2,8 +2,8 @@
 export const appId = "52030131"; //应用appid 综合业务支撑平台使用
 export const loginTime = 86400; //登录有效时间（单位s） 1天
 export const wechatPayConfigId = "6a9a54bc01f6443faea7ffe132b19f6"; //支付配置编号 微信小程序支付
-export const wechatAppID = "wx214b4f8de36a0181"; //小程序APPid
-export const wechatSecret = "125a44b60b00d7e8a3820cc4cbdbdae8"; //小程序AppSecret
+export const wechatAppID = "wx008c60533388527a"; //小程序APPid
+export const wechatSecret = "95197718b43b497f02732bd9f8011080"; //小程序AppSecret
 
 /*统一 会员平台*/
 export const sendCode = "2"; //统一会员平台发送验证码接口