测试用提交(登录固定id)

http/baseApi.js

@@ -1,6 +1,6 @@
-const BaseApi = 'https://transcend.ringzle.com/chuangheng-app/app' //线上
+// const BaseApi = 'https://transcend.ringzle.com/chuangheng-app/app' //线上
 // const BaseApi = 'https://wxapp.transcend-intl.cn/chuangheng-app/app' //生产
-// const BaseApi = 'http://192.168.2.19:9023/chuangheng-app/app' //李勇
+const BaseApi = 'http://192.168.2.19:9023/chuangheng-app/app' //李勇
 // const BaseApi = 'http://192.168.2.16:9023/chuangheng-app/app' //严总
 
 export {

pages/login.vue

@@ -97,7 +97,10 @@
 						that.$api.get('/wx/login',{
 							code:res.code,
 							phoneCode:code,
-							channelType:that.channelType
+							// channelType:that.channelType,
+							channelType:'Questionnaire',
+							teamQuestionnaireId:'1993157045939318785',
+							referrerId:'1986308756413480961',
 						},false).then(res=>{
 							if(res.data.code===0){
 								if(res.data.data.isRegister==1){

pagesHome/components/createList.vue

@@ -264,7 +264,9 @@ export default {
 				})
 			}
 			else if(item.text==='生成报告'){
-				if(this.dto.status==0) return this.$showToast('问卷未完成，全部团队人员作答后才能生成报告')
+				if(this.dto.status==0) return this.$showToast('问卷未完成，全部团队人员作答后才能生成报告')
+				this.createReport({teamQuestionnaireId:this.dto.teamQuestionnaireId})
+				this.show = false;
 
 			}
 			else if(item.text==='发送报告'){
@@ -285,7 +287,13 @@ export default {
 			})
 		},
 		createReport(item){
-
+			this.$api.get(`/core/team/questionnaire/genReport/${item.teamQuestionnaireId}`).then(({data:res})=>{
+				if(res.code !== 0) return this.$showToast(res.msg)
+				this.show = false;
+				uni.navigateTo({
+					url:'/pagesHome/reportResult'
+				})
+			})
 		},
 		sendReport(item){
 

pagesMy/teamUser.vue

@@ -150,11 +150,10 @@
 			handleConfirmAdd(){
 				let selectList = this.list.filter(l=>l.select);
 				if(selectList.length===0) return this.$showToast('请至少选择一位团队成员')
-				let sendList = selectList.map(l=>({realName:l.realName,id:l.id,category:l.category,categoryName:l.categoryName,email:l.email}))
 				let tempuser = selectList.find(s=>!s.category);
 				if(tempuser) return this.$showToast(`请为团队人员【${tempuser.realName}】选择身份类型`)
 				
-				this.getOpenerEventChannel().emit('selectUserConfirm',sendList)
+				this.getOpenerEventChannel().emit('selectUserConfirm',selectList)
 				uni.navigateBack()
 			}
 		}