1

@@ -71,9 +71,18 @@ data(){
 },
 },
 methods:{
 methods:{
     toPubArticle(){
     toPubArticle(){
+		let token=uni.getStorageSync("token");
+		if(token==''{
+			uni.showToast({
+				title:'请登录后操作',
+				icon:'none'
+			})
+		}else{
 			wx.navigateTo({
 			wx.navigateTo({
 			    url:"./pubArticle"
 			    url:"./pubArticle"
 			})
 			})
+		}
+        
     },
     },
     getuserinfo(){
     getuserinfo(){
 				var that = this
 				var that = this

@@ -37,10 +37,14 @@
 			if(options.istoken!=undefined){
 			if(options.istoken!=undefined){
 				this.istoken=options.istoken
 				this.istoken=options.istoken
 			}
 			}
+			console.log(uni.getStorageSync('token'))
+			console.log(this.istoken)
 			if(uni.getStorageSync('token')!=''&&this.istoken==''){
 			if(uni.getStorageSync('token')!=''&&this.istoken==''){
+				
 				this.getusermsg()
 				this.getusermsg()
 			}else if (uni.getStorageSync('token')==''&&this.istoken==''){
 			}else if (uni.getStorageSync('token')==''&&this.istoken==''){
-				uni.navigateTo({
+				uni.setStorageSync("chosetype",1)
+				uni.switchTab({
 					url:'../school/school'
 					url:'../school/school'
 				})
 				})
 			}
 			}
@@ -76,8 +80,9 @@
 						token:uni.getStorageSync('token')
 						token:uni.getStorageSync('token')
 				}
 				}
 				app.post(url,params,"get").then((res)=>{
 				app.post(url,params,"get").then((res)=>{
-					uni.setStorageSync("chosetype",1)
+					
 					if(res.level==1){
 					if(res.level==1){
+						uni.setStorageSync("chosetype",1)
 						wx.switchTab({
 						wx.switchTab({
 							url:'../school/school'
 							url:'../school/school'
 						})
 						})
@@ -90,10 +95,10 @@
 				}).catch((err)=>{
 				}).catch((err)=>{
 					console.log(err)
 					console.log(err)
 					uni.setStorageSync("chosetype",1)
 					uni.setStorageSync("chosetype",1)
-					uni.clearStorageSync()
 					wx.switchTab({
 					wx.switchTab({
 						url:'../school/school'
 						url:'../school/school'
 					})
 					})
+					uni.clearStorageSync()
 				})
 				})
 			},
 			},
 
 
@@ -125,19 +130,14 @@
 				uni.login({
 				uni.login({
 					provider: "weixin",
 					provider: "weixin",
 					success(r) {
 					success(r) {
-						console.log(r)
+						
 						let url = "common/getSessionKey";
 						let url = "common/getSessionKey";
 						app.post(url, {
 						app.post(url, {
 							code: r.code
 							code: r.code
 						}, "post").then(r => {
 						}, "post").then(r => {
-							console.log(r)
+							
 							that.session_key = r.session_key;
 							that.session_key = r.session_key;
 							that.openid = r.openid;
 							that.openid = r.openid;
-							
-							console.log(that.session_key);
-							console.log(that.openid)
-							
-
 							// uni.setStorageSync('openid', r.openid);
 							// uni.setStorageSync('openid', r.openid);
 							// uni.setStorageSync('session_key', r.session_key);
 							// uni.setStorageSync('session_key', r.session_key);
 						}).catch(err => {})
 						}).catch(err => {})