张文飞 3 лет назад
Родитель
Сommit
ac3e71fec9
2 измененных файлов с 4 добавлено и 6 удалено
  1. 3 4
      components/subComponents/dmLogin.vue
  2. 1 2
      util/api.js

+ 3 - 4
components/subComponents/dmLogin.vue

@@ -40,7 +40,6 @@
 </template>
 </template>
 
 
 <script>
 <script>
-	let app = getApp();
 	import dmDialog from "./dmDialog.vue"
 	import dmDialog from "./dmDialog.vue"
 	export default{
 	export default{
 		
 		
@@ -154,15 +153,15 @@
 				});
 				});
 			    
 			    
 				if(ret.data.success){
 				if(ret.data.success){
-					uni.$emit('request');
-					this.knowAction();
 					uni.showToast({
 					uni.showToast({
 						icon:"none",
 						icon:"none",
 						title:"登录成功"
 						title:"登录成功"
 					});
 					});
 					let token = ret.data.single;
 					let token = ret.data.single;
+					getApp().globalData.token = token;
+					uni.$emit('request');
+					this.knowAction();
 					this.$cache.set('_token_owner_union', token);
 					this.$cache.set('_token_owner_union', token);
-					app.globalData.token = token;
 					
 					
 				}else{
 				}else{
 					uni.showToast({
 					uni.showToast({

+ 1 - 2
util/api.js

@@ -3,7 +3,6 @@ var requestTask = null
 var elabprojectname = ''
 var elabprojectname = ''
 var elabsystem = ''
 var elabsystem = ''
 var elabEnvironment = '';
 var elabEnvironment = '';
-import MinCache from '../static/cache.js'
 export const myRequest = (options) => {
 export const myRequest = (options) => {
 	if (!options.hasOwnProperty("showLoading")) {
 	if (!options.hasOwnProperty("showLoading")) {
 		var localDate = uni.getStorageSync('loadingStamp') || 0
 		var localDate = uni.getStorageSync('loadingStamp') || 0
@@ -16,7 +15,7 @@ export const myRequest = (options) => {
 			})
 			})
 		}
 		}
 	}
 	}
-	let token = (new MinCache()).get('_token_owner_union')
+	let token = getApp().globalData.token
 	if (token) {
 	if (token) {
 		options.token = token
 		options.token = token
 	} else {
 	} else {