111

operatingCompany/common/common.js

@@ -3,7 +3,7 @@ const isUserId = function() {
 	// console.log("userId---" + userId)
 	if (!userId) {
 		uni.reLaunch({
-			url: '../logIn/logIn'
+			url: '../logIn/logIn?type=2'
 		})
 	}
 }

operatingCompany/common/request.js

@@ -48,7 +48,7 @@ const http = (url = '', date = {}, type = 'POST', header = {
 				 });
 				uni.clearStorageSync()
 				 uni.navigateTo({
-					url:'../logIn/logIn'
+					url:'../logIn/logIn?type=2'
 				 })
 			}else if(res.data.code==0){
 				// 正常

operatingCompany/pages/entryReport/shopEvaStar.vue

@@ -25,7 +25,7 @@
 			</view>
 		</view>
 		
-		<view class="competeCont" v-if="sheetID&&pjShow">
+		<view class="competeCont" v-if="id&&pjShow">
 			<view class="competeContTitle">对该门店上次行动完成情况打分</view>
 			<view class="xxBox">
 				<uni-rate :max="5" v-model="xx" @change="onXXChange"/>
@@ -81,10 +81,12 @@
 				Contactor:'',
 				iStatusBarHeight:'',
 				pjShow:true,
+				id:'',
 			}
 		},
 		onLoad(opt) {
-		  this.sheetID=opt.id;
+		  this.id=opt.id;
+		  this.sheetID=opt.sheetID;
 		  console.log(this.sheetID)
 		  if(this.sheetID=='undefined'){
 			   this.sheetID=''
@@ -164,10 +166,10 @@
 			
 		},
 		onShareAppMessage(res) {
-		    console.log(res)
+		    console.log(this.sheetID)
 		    return {
 		      title: '报告详情',
-		      path: '/pages/reportManage/reportDetail?id='+this.id
+		      path: '/pages/reportManage/reportDetail?id='+this.sheetID
 		    }
 		 }
 	}

operatingCompany/pages/logIn/logIn.vue

@@ -63,10 +63,12 @@
 				code_time: 0, // 倒计时
 				iStatusBarHeight: '',
 				sendFlag:true,
+				type:'',
 			}
 		},
-		onLoad() {
+		onLoad(opt) {
 			this.iStatusBarHeight = uni.getSystemInfoSync().statusBarHeight;
+			this.type=opt.type;
 		},
 		methods: {
 			roleTypeFirst() {
@@ -144,15 +146,22 @@
 
 						}
 					})
-					if (this.roleType == 1) {
-						uni.navigateTo({
-							url: '../index/index'
-						})
-					} else {
-						uni.navigateTo({
-							url: '../shop/shopIndex/index'
+					if(this.type==2){
+						uni.navigateBack({
+							delta:1
 						})
+					}else{
+						if (this.roleType == 1) {
+							uni.reLaunch({
+								url: '../index/index'
+							})
+						} else {
+							uni.reLaunch({
+								url: '../shop/shopIndex/index'
+							})
+						}
 					}
+					
 
 				})
 			}

operatingCompany/pages/reportManage/reportDetail.vue

@@ -239,6 +239,8 @@
 			}
 		},
 		onLoad(opt) {
+			this.$common.isUserId()
+		    console.log(opt)
 			if(uni.getStorageSync("logInData").userInfo){
 				this.userInfoId=uni.getStorageSync("logInData").userInfo.id;
 				this.mEvaluateLook=uni.getStorageSync("logInData").mEvaluateLook;
@@ -249,6 +251,7 @@
 			console.log('this.loginType=='+this.loginType)
 		    this.iStatusBarHeight = uni.getSystemInfoSync().statusBarHeight;
 			this.id=opt.id;
+		    console.log("报告详情"+this.id)
 			if(opt.type){
 			  this.backType=opt.type
 			}
@@ -423,6 +426,7 @@
 				})
 			},
 			getSuperCheckSheetInfo(){
+				console.log("getSuperCheckSheetInfo"+this.id)
 				uni.showLoading({
 					title: '加载中'
 				})
@@ -433,7 +437,7 @@
 						lng:this.lng
 					}
 				this.$http(url, params, 'GET').then(res => {
-					
+					console.log(res)
 					for (const key in res.data.shopInfo) {
 						 res.data.shopInfo[key] = this.$praseStrEmpty(res.data.shopInfo[key])
 					}