bug修改

operatingCompany/pages/entryReport/entryReport.vue

@@ -231,7 +231,7 @@
 				});
 			},
 			back() {
-				uni.navigateTo({
+				uni.reLaunch({
 					url: '../index/index'
 				})
 			},
@@ -248,43 +248,59 @@
 			goEntered(item) {
 	            console.log(item)
 				if(item.State){
-					if(item.maxTime<30){
-						var that=this;
-						console.log(item.maxTime)
-						if(item.maxTime == null||item.maxTime===''){
-							that.$store.commit('mutationsCategoryList', '');
-							that.$store.commit('mutationssuggestList', '')
-							uni.navigateTo({
-								url: 'entered?shopId=' + item.shopId + '&ShopName=' + item.ShopName + '&Contactor=' + item.Contactor
-							})
-						}else{
-						uni.showModal({
-						    title: '提示',
-						    content: '距上次提交报告：'+item.maxTime+'天，是否继续录入？',
-						    success: function (res) {
-						        if (res.confirm) {
-						          that.$store.commit('mutationsCategoryList', '');
-						          that.$store.commit('mutationssuggestList', '')
-						          uni.navigateTo({
-						          	url: 'entered?shopId=' + item.shopId + '&ShopName=' + item.ShopName + '&Contactor=' + item.Contactor
-						          })
-													 
-						        } else if (res.cancel) {
-						            console.log('用户点击取消');
-						        }
-						    }
-						});	
-						}
-						
-						
+					this.$http('accompany/SuperAccounts/queryManagerTodaySign', {
+						shopId:item.shopId,
 						
-					}else{
-						this.$store.commit('mutationsCategoryList', '');
-						this.$store.commit('mutationssuggestList', '')
-						uni.navigateTo({
-							url: 'entered?shopId=' + item.shopId + '&ShopName=' + item.ShopName + '&Contactor=' + item.Contactor
-						})
-					}
+					}, 'GET').then(res => {
+					   if(res.data.today){
+						   if(item.maxTime<30){
+						   	var that=this;
+						   	console.log(item.maxTime)
+						   	if(item.maxTime == null||item.maxTime===''){
+						   		that.$store.commit('mutationsCategoryList', '');
+						   		that.$store.commit('mutationssuggestList', '')
+						   		uni.navigateTo({
+						   			url: 'entered?shopId=' + item.shopId + '&ShopName=' + item.ShopName + '&Contactor=' + item.Contactor
+						   		})
+						   	}else{
+						   	uni.showModal({
+						   	    title: '提示',
+						   	    content: '距上次提交报告：'+item.maxTime+'天，是否继续录入？',
+						   	    success: function (res) {
+						   	        if (res.confirm) {
+						   	          that.$store.commit('mutationsCategoryList', '');
+						   	          that.$store.commit('mutationssuggestList', '')
+						   	          uni.navigateTo({
+						   	          	url: 'entered?shopId=' + item.shopId + '&ShopName=' + item.ShopName + '&Contactor=' + item.Contactor
+						   	          })
+						   								 
+						   	        } else if (res.cancel) {
+						   	            console.log('用户点击取消');
+						   	        }
+						   	    }
+						   	});	
+						   	}
+						   	
+						   	
+						   	
+						   }else{
+						   	this.$store.commit('mutationsCategoryList', '');
+						   	this.$store.commit('mutationssuggestList', '')
+						   	uni.navigateTo({
+						   		url: 'entered?shopId=' + item.shopId + '&ShopName=' + item.ShopName + '&Contactor=' + item.Contactor
+						   	})
+						   }
+					   }else{
+						   uni.showToast({
+						   	title: '请先签到',
+						   	icon: 'none',
+						   	duration: 2000,
+						   });
+					   }
+					})
+					return false;
+					
+				
 				}else{
 					uni.showToast({
 						title: '未查询到检测套餐信息',

operatingCompany/pages/entryReport/shopEvaStar.vue

@@ -122,7 +122,7 @@
 			   });
 		   },
 		   goHome(){
-			 uni.navigateTo({
+			 uni.reLaunch({
 			 	url:'../index/index'
 			 })  
 		   },

operatingCompany/pages/index/index.vue

@@ -107,8 +107,9 @@
 			},
 			//自己定义的方法函数
 			goRouter(url) {
+				console.log(url)
 				//uni.navigateTo  路由跳转 url 是地址 路由还分为uni.redirectTo switchTab navigateBackreLaunch
-				this.$common.isUserId()
+				//this.$common.isUserId()
 
 				uni.navigateTo({
 					url: url

operatingCompany/pages/reportManage/reportDetail.vue

@@ -355,7 +355,7 @@
 							   i.storeIndex=null;
 							
 							}else if(i.keyType==3){
-								i.imgArr=i.itemValue.split(",")
+								i.imgArr=i.itemValue//。split(",")
 							}
 						})
 					})

operatingCompany/pages/shop/shopIndex/editcomplete.vue

@@ -75,7 +75,7 @@
 			   })
 		   },
 		   goHome(){
-			 uni.navigateTo({
+			 uni.reLaunch({
 			 	url:'index'
 			 })  
 		   },