合并精品课

utils/config.js

@@ -1,9 +1,9 @@
 let BASE_URL=''
 if(process.env.UNI_PLATFORM =="h5"){
    if (window.location.href.indexOf('//casedata.igandan.com')>-1){
-      BASE_URL='https://wx.igandan.com/gdhome_api'
+      BASE_URL='https://dev-app.igandan.com/app'
    }else{
-      BASE_URL='https://dev-wx.igandan.com/gdhome_api'	
+      BASE_URL='https://dev-app.igandan.com/app'	
    }
 }else if(process.env.UNI_PLATFORM =="mp-weixin"){
      const { envVersion } = uni.getAccountInfoSync().miniProgram;

utils/request.js

@@ -38,10 +38,16 @@ export const request = (url, data = {}, method = 'post', loading = false, conten
 		'content-type': contentType,
 		'Authorization': 'Bearer ' + token
 	}
+
+	const defaultData = {
+		version: '4.0.0',
+		user_uuid: 'Rj3zuTY6zP6YTjHsYEz',
+		client_type: 'A', //client_type,
+	}
 	return new Promise(function(e, n) {
 		let timestamp = Date.now();
 		uni.request({
-			data,
+			data: {...data,...defaultData,timestamp:new Date().getTime()},
 			url: url.indexOf('http') != -1 ? url : encodeURI(BASE_URL + url),
 			method: method,
 			sslVerify: false,
@@ -63,9 +69,9 @@ 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){
-					e(res)
+					e(res.data)
 				}else if (res.data.code == 401 || res.data.code == 403 || res.data.code ==
-					405 || res.data.code == 406) {
+					405 || res.data.code == 406 || res.data.code == 37006) {
 					
 					uni.redirectTo({
 						url: '/pages_app/login/login'