一些优化

utils/navTo.js

@@ -1,4 +1,5 @@
 import pageUrl from './pageUrl'
+import BASE_URL from './config.js';
 
 function navTo(obj) {
 	let token = '';
@@ -8,13 +9,19 @@ function navTo(obj) {
 		}else{
 			token = uni.getStorageSync('DEV_AUTH_TOKEN_App');
 		}
+	}else if(process.env.UNI_PLATFORM == "mp-weixin") {
+		const { envVersion } = uni.getAccountInfoSync().miniProgram;
+		if (envVersion == "release") {
+		  token = uni.getStorageSync('AUTH_TOKEN_App');
+		}else{
+		  token = uni.getStorageSync('DEV_AUTH_TOKEN_App');
+		}
 	}else{
-		  const { envVersion } = uni.getAccountInfoSync().miniProgram;
-          if (envVersion == "release") {
+		if (BASE_URL.indexOf('dev') == -1) {
 			token = uni.getStorageSync('AUTH_TOKEN_App');
-		  }else{
+		} else {
 			token = uni.getStorageSync('DEV_AUTH_TOKEN_App');
-		  }
+		}
 	}
 	if (!token) {
 		// let page_url = pageUrl();

utils/payment.js

@@ -63,12 +63,7 @@ export function requestPayment(orderInfo, successCallback, failCallback) {
 
   uni.requestPayment({
     provider: provider, // 可选值：wxpay、alipay、appleiap 等
-    orderInfo: orderInfo.orderInfo, // 支付宝传 orderInfo；微信可能传其它参数
-    timeStamp: orderInfo.timestamp,
-    nonceStr: orderInfo.noncestr,
-    package: orderInfo.package_str,
-    signType: orderInfo.signType || 'RSA',
-    paySign: orderInfo.sign,
+    orderInfo: orderInfo,
     success: (res) => {
       console.log(`${provider} 支付成功`, res);
       successCallback && successCallback(res);

utils/request.js

@@ -33,6 +33,13 @@ export const request = (url, data = {}, method = 'post', loading = false, conten
 		} else {
 			token = uni.getStorageSync('DEV_AUTH_TOKEN_App');
 		}
+	}else{
+		if (BASE_URL.indexOf('dev') == -1) {
+			token = uni.getStorageSync('AUTH_TOKEN_App');
+			
+		} else {
+			token = uni.getStorageSync('DEV_AUTH_TOKEN_App');
+		}
 	}
 	let header = {
 		'content-type': contentType,
@@ -66,6 +73,7 @@ export const request = (url, data = {}, method = 'post', loading = false, conten
 			if(token){
 				 header['Authorization']='Bearer ' +token;
 				 let userInfo= uni.getStorageSync('userInfo')
+				 console.log(userInfo)
 				   defaultData = {
 				 			version: '4.0.0',
 				 			user_uuid:userInfo.uuid,
@@ -106,7 +114,7 @@ export const request = (url, data = {}, method = 'post', loading = false, conten
 				};
 				if(url.indexOf('manager/getSystemTimeStamp')!=-1){
 					e(res)
-				}else if (res.data.code == 200 || res.data.code ==1){
+				}else if (res.data.code == 200 || res.data.code == 1 || res.data.code == "1" || res.data.code == "200"){
 					e(res.data)
 				}else if (res.data.code == 401 || res.data.code == 403 || res.data.code ==
 					405 || res.data.code == 406 || res.data.code == 37006) {