pengyh 1 rok temu
rodzic
commit
b48452054d

+ 4 - 4
src/views/mallManagement/activityOrder/detail.vue

@@ -264,12 +264,12 @@
 								}
 								if(items[index].type == 3){
 									item.inputValue = data[ind]?.option_value
-								}else if(item.type == 4){
+								}else if(item.type == 4 || item.type == 5){
 									item.inputValue = [{url: data[ind]?.option_value}]
 								}
 							})
 						}else{
-							if(item.type == 4){
+							if(item.type == 4 || item.type == 5){
 								item.inputValue = []
 							}else{
 								item.inputValue = '';
@@ -310,7 +310,7 @@
 									return this.$message.warning(`请输入${this.activeItems[i].question}`)
 							    }
 								// 图片视频
-								if(this.activeItems[i].type == 4 && this.activeItems[i].inputValue.length==0) {
+								if((this.activeItems[i].type == 4 || this.activeItems[i].type == 5) && this.activeItems[i].inputValue.length==0) {
 									return this.$message.warning(`请上传${this.activeItems[i].question}`)
 								}
 							  }
@@ -332,7 +332,7 @@
 							    items.push(activeItems[index]);
 							  }
 							  // 图片视频
-							  if (activeItems[index].type == 4) {
+							  if (activeItems[index].type == 4 || activeItems[index].type == 5) {
 							    activeItems[index].answer[0].option_value = activeItems[index].inputValue.length>0?activeItems[index].inputValue[0].url:'';
 							    activeItems[index].answer = JSON.stringify(activeItems[index].answer);
 							    items.push(activeItems[index]);

+ 3 - 3
src/views/mallManagement/activityOrder/index.vue

@@ -110,8 +110,8 @@ export default {
 		formItems() { },
 	},
 	created(){
-		if(this.$route.query.type == 'detail'){
-			this.activeId = this.$route.query.id
+		if(this.pageType == 'detail'){
+			this.activeId = this.pageCode
 			this.formDialog = true
 		}
 	},
@@ -129,7 +129,7 @@ export default {
 		getList(p, cb) {
 			try {
 				var pam = JSON.parse(JSON.stringify(p))
-				pam.params.push({ "param": "a.status", "compare": "=", "value": this.status },{ "param": "a.promotion_questionnaire_id", "compare": "=", "value": this.$route.query.id?this.$route.query.id:'' })
+				pam.params.push({ "param": "a.status", "compare": "=", "value": this.status },{ "param": "a.promotion_questionnaire_id", "compare": "=", "value": this.pageCode?this.pageCode:'' })
 				cb && cb(pam)
 				return listPageV2(pam)
 			} catch (error) {