Merge branch 'develop'

# Conflicts:
#	pages/my/my.vue

utils/IM.js

@@ -17,7 +17,7 @@ const imLogin = async ()=>{
 	let storage_accid='';
 	if (process.env.UNI_PLATFORM == "h5") {
 		if (window.location.href.indexOf('dev') > -1) {
-			storage_accid=uni.getetStorageSync('AUTH_YX_ACCID_App');
+			storage_accid=uni.getStorageSync('AUTH_YX_ACCID_App');
 			storage_token=uni.setStorageSync('AUTH_YX_TOKEN_App');	
 		} else {
 			storage_accid=uni.getStorageSync('DEV_AUTH_YX_ACCID_App');
@@ -28,7 +28,7 @@ const imLogin = async ()=>{
 			envVersion
 		} = uni.getAccountInfoSync().miniProgram;
 		if (envVersion == "release") {
-			storage_accid=uni.getetStorageSync('AUTH_YX_ACCID_App');
+			storage_accid=uni.getStorageSync('AUTH_YX_ACCID_App');
 			storage_token=uni.setStorageSync('AUTH_YX_TOKEN_App');	
 		} else {
 			storage_accid=uni.getStorageSync('DEV_AUTH_YX_ACCID_App');
@@ -40,7 +40,7 @@ const imLogin = async ()=>{
 			storage_token=uni.getStorageSync('DEV_AUTH_YX_TOKEN_App');
 			
 		} else {
-			storage_accid=uni.getetStorageSync('AUTH_YX_ACCID_App');
+			storage_accid=uni.getStorageSync('AUTH_YX_ACCID_App');
 			storage_token=uni.setStorageSync('AUTH_YX_TOKEN_App');	
 		}
 	}

utils/client_type.js

@@ -1,4 +1,4 @@
- let client_type=''
+ let client_type='A'
 
  // #ifdef MP-WEIXIN
     client_type="M"

utils/request.js

@@ -46,7 +46,7 @@ export const request = (url, data = {}, method = 'post', loading = false, conten
 	}
 	let defaultData={}
 	
-	let freeList=['/manager/getSystemTimeStamp','/expertAPI/smsLogin','/login/mobile','/expertAPI/login','/expertAPI/index']
+	let freeList=['/manager/getSystemTimeStamp','/expertAPI/smsLogin','/login/mobile','/expertAPI/login','/expertAPI/index','/expertAPI/wechatLogin']
 	 let postData={
 		 ...data
 	 }
@@ -119,6 +119,7 @@ export const request = (url, data = {}, method = 'post', loading = false, conten
 				}else if (res.data.code == 401 || res.data.code == 403 || res.data.code ==
 					405 || res.data.code == 406 || res.data.code == 37006) {
 					
+					uni.hideLoading();
 					uni.redirectTo({
 						url: '/pages_app/login/login'
 					});

utils/sign.js

@@ -0,0 +1,49 @@
+import api from '@/api/api.js'
+import sortObj from '@/utils/sort'
+import version from '@/utils/version.js'
+import client_type from '@/utils/client_type.js'
+import { Base64 } from 'js-base64'
+import { md5 } from 'js-md5'
+
+function formatString(obj) {
+	let concatenated = ''
+	for (const key in obj) {
+		if (concatenated) {
+			concatenated += key + obj[key]
+		} else {
+			concatenated = key + obj[key]
+		}
+	}
+	return concatenated
+}
+
+function toBase64Url(str) {
+	return str.replace(/\+/g, '-').replace(/\//g, '_').replace(/=/g, '')
+}
+
+export async function createSignedPostData(extraData = {}) {
+	try {
+		const res = await api.getTimeStamp()
+		const timestamp = res.data.timestamp.toString()
+		const basePayload = {
+			version: version,
+			user_uuid: '',
+			client_type: client_type,
+			timestamp: timestamp
+		}
+		const postData = { ...basePayload, ...extraData }
+		const sorted = sortObj(postData)
+		const str1 = formatString(sorted).replace(' ', '')
+		const str2 = str1 + md5(timestamp)
+		const str3 = md5(str2)
+		const sign = toBase64Url(Base64.encode(str3))
+		return { postData, sign }
+	} catch (err) {
+		console.log(err)
+		return { postData: {}, sign: '' }
+	}
+}
+
+export default { createSignedPostData }
+
+