no message

UI/src/views/main/questionnaireManagement/fillOut.vue

@@ -1,4 +1,6 @@
-<template>
+<template> 
+ 	<el-empty :image-size="100" image="/public/wenJuan.svg" description="该问卷暂不可用..." v-if="!rqDis" />
+
 	<div class="rqCss" v-if="rqDis">
 		<div class="app">
 			<div class="title">
@@ -183,9 +185,13 @@
 
 				for (const val of data.questionlist) {
 					if(val.type === '单选' || val.type === '问答'){
-						val['_content'] = val.answerdetail 
-					}else{
-						val['_content'] = val.answerdetail.split(',')
+						val['_content'] = val.answerdetail || ''
+					}else{  
+						if(val.answerdetail){
+							val['_content'] = val.answerdetail?.split(',')
+						} else {
+							val['_content'] = []
+						}
 					}
 				}
 
@@ -202,31 +208,53 @@
 						pageId.value = murmur; 
 						
 						getPageListData(`/survey/survey/getdetail?id=${query.id}&user=${murmur}`).then(({data})=>{ 
-
+							
 							if(data.existanswer === 1){
 								for (const val of data.questionlist) {
 									if(val.type === '单选' || val.type === '问答'){
-										val['_content'] = val.answerdetail 
+										val['_content'] = val.answerdetail || ''
 									}else{
-										val['_content'] = val.answerdetail.split(',')
+										if(val.answerdetail){
+											val['_content'] = val.answerdetail?.split(',')
+										} else {
+											val['_content'] = []
+										}
 									}
 								} 
 							}
-							formData.value = data;   
+							
+							formData.value = data;    
+							
+							// 不是进行中的问卷 全部隐藏
+							if(isEnd(formData.value) !== '进行中' && query.user !== '-1'){
+								return;
+							}
 
+							// 判断 只能微信填写 没有进行微信授权 该用户没有填写
 							if(formData.value.setting === 1 && query.code === undefined && formData.value.existanswer !== 1){
 								const appid = 'wxe8b06998505853d2';
-								// const url = encodeURI(`${getoRigin()}/fillOut?id=${v.surveyId}`);
-								const url = encodeURI(`http://67b12c3.r20.cpolar.top/fillOut?id=${query.id}`); //测试数据   
+								const url = encodeURI(`${getoRigin()}/fillOut?id=${query.id}`);  
 							 
 								location.replace(`https://open.weixin.qq.com/connect/oauth2/authorize?appid=${appid}&redirect_uri=${url}&response_type=code&scope=snsapi_userinfo&state=111#wechat_redirect`) 
 							
-							}else{
+							}else{ 
+								
+								// 判断 在微信环境 没有进行微信授权 该用户没有填写
+								if( navigator.userAgent.toLowerCase().indexOf('micromessenger') !== -1 && query.code === undefined && formData.value.existanswer !== 1 ){
+									const appid = 'wxe8b06998505853d2';
+									const url = encodeURI(`${getoRigin()}/fillOut?id=${query.id}`); 
+								
+									location.replace(`https://open.weixin.qq.com/connect/oauth2/authorize?appid=${appid}&redirect_uri=${url}&response_type=code&scope=snsapi_userinfo&state=111#wechat_redirect`) 
+								
+								}
+
+								// 显示页面
 								rqDis.value = true;
 								
+								// 判断 该用户没有填写   显示提交按钮
 								if(formData.value.existanswer !== 1){
 									buttDis.value = true;
-								}else{
+								}else{ //已填写 隐藏按钮
 									buttDis.value = false;
 								}
 							}
@@ -348,16 +376,18 @@
 				}) 
 			} else if (v.type === '排序'){
 				if(! Array.isArray(v._content)){
-					v._content = v._content.split(',');
+					v._content = v._content?.split(',');
 				}
 
-				params.answerlist.push({
-					answeruser :  pageId.value,    
-					answer : v._content.join(),    
-					optionid : 0,
-					questionid : v.questionId,
-					surveyid : v.surveyid
-				})
+				if(v._content){
+					params.answerlist.push({
+						answeruser :  pageId.value,    
+						answer : v._content?.join(),    
+						optionid : 0,
+						questionid : v.questionId,
+						surveyid : v.surveyid
+					})
+				}
 			} else {
 				if(! Array.isArray(v._content)){ 
 					v._content = v._content?.split(',') || [];
@@ -415,6 +445,31 @@
 		}
 	}
 
+	// 判断状态
+	function isEnd (data){
+		let oldTime = new Date(data.starttime).getTime();
+		let newTime = new Date(data.endtime).getTime();
+		let time = new Date().getTime();
+		
+
+		if(!data.endtime || !data.starttime){
+			return '未发布';
+		}
+
+		if(time < oldTime){
+			return '未开始';
+		}else if(time > newTime){
+			return '已结束';
+		}else if(time > oldTime && time < newTime){
+			return '进行中';
+		} 
+	}
+
+	// 获取域名
+	function getoRigin (){
+		return location.origin
+	}
+
 </script>
 
 

UI/src/views/main/questionnaireManagement/surveyAdd.vue

@@ -177,7 +177,7 @@
 	const getData = function _f (){
 		if(id){ 
 			getPageListData(`/survey/survey/${id}`).then(({data})=>{
-				contentDatas.value['title'] = data['title'];
+				contentDatas.value['title'] = type === 'copy' ? `${data['title']}（复制）` : data['title'];
 				contentDatas.value['remark'] = data['remark']; 
 				contentDatas.value['surveyId'] = type === 'copy' ? 0 : Number(id); 
 				contentDatas.value['questionlist'] = [];