-

pages/index/index.vue

@@ -181,7 +181,7 @@
 			
 			
 			// 首页数据渲染
-			if(uni.getStorageSync('token')){
+			// if(uni.getStorageSync('token')){
 				this.getSearchList();
 				this.getHomeData({
 					'company_code': uni.getStorageSync('selectedCode') ? uni.getStorageSync('selectedCode') : this
@@ -209,11 +209,9 @@
 					this.hackReset = true;
 				})
 				this.status = true
-			}else{
-				uni.navigateTo({
-					url: '/pages/login/login'
-				})
-			}
+			// }else{
+			
+			// }
 			this.status = true
 			
 			

pages/setting/funReport/funReport.vue

@@ -176,8 +176,7 @@
 					this.isLoadMore = true
 					this.loadStatus = 'nomore'
 				}
-				
-	
+				
 			},
 			
 			//编辑

pages/setting/funReport/funcAdd/funcAdd.vue

@@ -234,10 +234,7 @@
 			
 			if(option.id){
 				this.getDetailsData({'id':option.id})
-				
 			}
-			
-			
 
 		},
 		watch: {
@@ -245,10 +242,11 @@
 				// alert(this.start_time)
 			},
 			report_type:function(newVal){
+				alert(this.device_type)
 				if(newVal){
 					var array123=['','1','2','3','4','5','6','7','16','128','131','130','129','17']
 					if(array123.indexOf(this.device_type)==-1){
-						this.device_type=''
+						// this.device_type=''
 					}
 				}
 			},
@@ -277,7 +275,7 @@
 				this.remarks=this.detailsData.remarks;
 				this.port_type=parseInt(this.detailsData.port_type);
 				this.device_port=this.detailsData.device_port;
-				this.device_code=parseInt(this.detailsData.device_code);
+				this.device_code=this.detailsData.device_code;
 
 			},
 
@@ -445,7 +443,7 @@
 					arr.push(item.owner_code)
 				})
 				if(arr.indexOf(this.device_code)==-1){
-					this.device_code=''
+					// this.device_code=''
 				}
 				
 			},

util/api.js

@@ -33,14 +33,13 @@ function myRequest(options) {
                         title: res.data.msg ? res.data.msg : "获取数据失败",
                         icon: "none"
                     })	
-					if(res.data.msg=='登录时效已过期！'){
+					if(res.data.msg=='登录时效已过期！'||res.data.msg=='token不存在！'){
 						setTimeout(()=>{
 							uni.navigateTo({
 								url: '/pages/login/login'
 							})
 						},2500)
 					}
-					
                 }
                 resolve(res)
             },