潘超林 1 dag geleden
bovenliggende
commit
42ade40229
4 gewijzigde bestanden met toevoegingen van 18 en 18 verwijderingen
  1. 1 1
      api/index.js
  2. 15 15
      app.config.js
  3. 1 1
      manifest.json
  4. 1 1
      unpackage/dist/build/web/index.html

+ 1 - 1
api/index.js

@@ -19,7 +19,7 @@ export default {
 
     weChatH5Login(data) {
         return request({
-            url: `/oauth2/oauth/token?grant_type=${data.grant_type}&code=${data.code}&password=${data.password}&phone=${data.phone}`,
+            url: `/oauth2/oauth/token?grant_type=${data.grant_type}&code=${data.code}${data.password ? `&password=${data.password}` : ''}&${data.phone ? `&phone=${data.phone}` : ''}`,
             method: "post",
             header: {
                 'Authorization': 'Basic cWhiaHV2MWg0djJ1bWp0ZXYwcWg2a3NlZm1maXV3dnk6JDJhJDEwJHdGRE51cndXQ0loMTdYdXNQZUdCa2Vvc2MxcXpRbEFqM2Jlekw5emdFWUV1RzlWNUkvUDh1',

+ 15 - 15
app.config.js

@@ -3,37 +3,37 @@
  */
 export const requestConfig = {
 	/**接口请求地址 */
-	BaseUrl: '/api',
-	// BaseUrl: 'https://pay.ai-tianshucloud.com/api',
+	// BaseUrl: 'https://cd35-117-39-43-38.ngrok-free.app',
+	BaseUrl: 'https://pay.ai-tianshucloud.com/api',
+	// BaseUrl: 'http://47.108.204.221:6109',
 	/**微信信息*/
 	/**授权回调地址 */
 	// 授权后重定向的回调链接地址, 请使用 urlEncode 对链接进行处理
-	// wx_redirect_uri: "https://pay.ai-tianshucloud.com/#/pages/index/pay",
-	wx_redirect_uri: "http://192.168.124.7:80/#/pages/index/pay",
+	wx_redirect_uri: "https://pay.ai-tianshucloud.com/#/pages/index/pay",
+	// wx_redirect_uri: "http://192.168.124.7:80/#/pages/index/pay",
 	/**公众号信息 */
-	// wx_appid: "wx1ce30480f3faf5e8",
-	// wx_appsecret: "23d3a0c870cd46f08e8cdf6bd2dd1b02",
+	wx_appid: "wx1ce30480f3faf5e8",
+	wx_appsecret: "23d3a0c870cd46f08e8cdf6bd2dd1b02",
 	/**测试公众号*/
-	wx_appid: "wx0fbc26e298b0d9b9",
-	wx_appsecret: "b24e3b109d6de1f019c4141d34a56781",
+	// wx_appid: "wx0fbc26e298b0d9b9",
+	// wx_appsecret: "b24e3b109d6de1f019c4141d34a56781",
 
 	//正式
-	// zfb_appid: "2021005135650380",
+	zfb_appid: "2021006145682404",
 	//测试
-	zfb_appid: "2021000147679530",
+	// zfb_appid: "2021000147679530",
 
 	//获取授权类型
 	zfb_scope: "auth_user",
 
 	//正式
-	// zfb_request_url: "https://openauth.alipay.com/oauth2/publicAppAuthorize.htm",
-
+	zfb_request_url: "https://openauth.alipay.com/oauth2/publicAppAuthorize.htm",
 	//测试
-	zfb_request_url: "https://openauth-sandbox.dl.alipaydev.com/oauth2/publicAppAuthorize.htm",
+	// zfb_request_url: "https://openauth-sandbox.dl.alipaydev.com/oauth2/publicAppAuthorize.htm",
 
 	//支付宝回调地址
-	zfb_redirect_uri: "http://192.168.124.7:80/#/pages/index/pay-zfb",
-	// zfb_redirect_uri: "https://pay.ai-tianshucloud.com/#/pages/index/pay-zfb",
+	// zfb_redirect_uri: "http://192.168.124.7:80/#/pages/index/pay-zfb",
+	zfb_redirect_uri: "https://pay.ai-tianshucloud.com/#/pages/index/pay-zfb",
 
 	// farming-ne
 

+ 1 - 1
manifest.json

@@ -75,7 +75,7 @@
             "disableHostCheck": true,
             "proxy": {
                 "/api": {
-                    "target": "http://192.168.124.38:30000",
+                    "target": "https://db41-61-185-175-44.ngrok-free.app",
                     "changeOrigin": true,
                     "secure": false,
                     "pathRewrite": {

File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/build/web/index.html