节日价格

src/views/conference/award/awardSet.vue

@@ -247,8 +247,7 @@ export default {
 				{
 					serialNumber: '1',
 					name: '', //奖品名称
-					iconPath:
-						'https://xxtest.upyuns.com/image/admin/2019-12-05/37.jpg', //奖品图片
+					iconPath:'', //奖品图片
 					totalStock: '', //奖品数量
 					probability: '', //中奖概率
 					dayMaxUse: '', //最大次数
@@ -339,6 +338,7 @@ export default {
 		setOnline(val) {
 			this.or = val
 			this.dialogVisible = true
+			
 			infoPrize().then(data => {
 				if (val == 1) {
 					if (data.data.onlinePrize != ''){
@@ -369,8 +369,10 @@ export default {
 							// }
 						});
 					}	
+					if (data.data.localePrize != '') {
 						this.table = data.data.localePrize
 					}
+				}
 			})
 		},
 		//保存

src/views/vehicleType/mockSun.vue

@@ -180,7 +180,7 @@ export default {
 				d.getDate().toString().length == 1
 					? '0' + d.getDate()
 					: d.getDate()
-			return year + '-' + month + '-' + date + ' 00:00:00'
+			return year + '-' + month + '-' + date
 		},
 		closePop() {
 			// this.$refs.ruleForm.resetFields()
@@ -232,19 +232,19 @@ export default {
 						if (this.popTitle == '添加节假日') {
 							this.ruleForm.startDate = this.format(
 								this.ruleForm.date[0]
-							)
+							)+' 00:00:00'
 							this.ruleForm.endDate = this.format(
 								this.ruleForm.date[1]
-							)
+							)+' 23:59:59'
 							delete this.ruleForm.id
 							this.successApi()
 						} else {
 							this.ruleForm.startDate = this.format(
-								this.ruleForm.date[0]
-							)
+								new Date(this.ruleForm.date[0])
+							)+' 00:00:00'
 							this.ruleForm.endDate = this.format(
-								this.ruleForm.date[1]
-							)
+									new Date(this.ruleForm.date[1])
+							)+' 23:59:59'
 							!this.activeId
 								? ''
 								: (this.ruleForm.id = this.activeId)