diff --git a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue
index 6427edc77..8bfd7d8d0 100644
--- a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue
@@ -786,9 +786,9 @@
-
+
-
+
按
@@ -815,7 +815,7 @@
-
+
按
@@ -843,7 +843,7 @@
-
+
按
@@ -879,6 +879,8 @@
+
+
取消
保存
@@ -914,6 +916,8 @@ export default {
dicts: ['payment_type'],
data() {
return {
+ checkedCities:[],
+ cityOptions:['上海', '北京', '广州', '深圳'],
opendetails: false,
looklist: [],
statisticsyou: {},
@@ -1094,6 +1098,13 @@ export default {
this.getUserLabelList()
},
methods: {
+ handleCheckedCitiesChange(e){
+ console.log(e,this.checkedCities)
+
+ },
+ changes(e){
+ console.log('1098',e)
+ },
getUserLabelList(){
listUserLabel({page:1,pageSize:10000}).then(res => {
this.userLabelList = res.data.records
@@ -1103,12 +1114,30 @@ export default {
getInfoActivity().then(res => {
if (res.data) {
this.ruleForm = res.data
+ console.log(res.data,'1109')
if (res.data.activityTimeType) this.tindex1 = res.data.activityTimeType
if (res.data.suitTimeSlotType) this.tindex3 = res.data.suitTimeSlotType
if (res.data.paymentType) this.ruleForm.paymentType = res.data.paymentType.split(",")
if (res.data.dieselUserLevel) this.ruleForm.dieselUserLevel = res.data.dieselUserLevel.split(",")
if (res.data.userLabelIds) this.ruleForm.userLabelIds = res.data.userLabelIds.split(",")
- if (res.data.activeGift) this.ruleForm.activeGift = res.data.activeGift.split(",")
+ if( res.data.activeGift){
+ console.log( '198', this.ruleForm.activeGift)
+ this.ruleForm.activeGift = res.data.activeGift.split(",")
+
+ for (let i = 0; i < this.ruleForm.activeGift.length; i++) {
+ if(this.ruleForm.activeGift[i] == '0'){
+ this.ruleForm.activeGift[i] = '选项一'
+ }
+ if(this.ruleForm.activeGift[i] == '3' ){
+ this.ruleForm.activeGift[i] = '选项二'
+ }
+ if(this.ruleForm.activeGift[i] == '1'){
+ this.ruleForm.activeGift[i] = '选项三'
+ }
+ }
+ }else {
+ this.ruleForm.activeGift = []
+ }
if (res.data.suitDate){
if (res.data.suitTimeSlotType == 0){
this.weekDay = res.data.suitDate.split(",")
@@ -1135,7 +1164,9 @@ export default {
this.growthValueList = []
this.couponList = []
}
+ console.log( '1147', this.ruleForm.activeGift)
})
+
},
getCardCoupon() {
listCardCoupon({status: 1, putType: 1}).then(res => {
@@ -1187,6 +1218,17 @@ export default {
this.ruleForm.suitTimeSlotType = index
},
submitRuleForm(formName) {
+ for (let i = 0; i < this.ruleForm.activeGift.length; i++) {
+ if(this.ruleForm.activeGift[i] == '选项一'){
+ this.ruleForm.activeGift[i] = 0
+ }
+ if(this.ruleForm.activeGift[i] == '选项二'){
+ this.ruleForm.activeGift[i] = 3
+ }
+ if(this.ruleForm.activeGift[i] == '选项三'){
+ this.ruleForm.activeGift[i] = 1
+ }
+ }
if (this.tindex1 == 1){
if (!this.ruleForm.activeStartTime || !this.ruleForm.activeEndTime){
this.$message.error("请选择活动开始时间")