diff --git a/fuintAdmin/src/assets/images/box-left.png b/fuintAdmin/src/assets/images/box-left.png new file mode 100644 index 000000000..6b825dc84 Binary files /dev/null and b/fuintAdmin/src/assets/images/box-left.png differ diff --git a/fuintAdmin/src/assets/images/loginback.png b/fuintAdmin/src/assets/images/loginback.png new file mode 100644 index 000000000..e11545860 Binary files /dev/null and b/fuintAdmin/src/assets/images/loginback.png differ diff --git a/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue b/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue index 0830416e1..eb8c792fd 100644 --- a/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue +++ b/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue @@ -173,7 +173,7 @@ - + @@ -657,7 +657,7 @@ activeStatus:'1', paymentValue:'1', amountCommission:'', - membershipLevel:'', + membershipLevel:[], percentageCommissions:'', fringeBenefit:'', cardValueChildList:[], @@ -823,7 +823,7 @@ chongzhi(){ this.form = { sort:1, - membershipLevel:'', + membershipLevel:[], groupOriented: '1', rechargeBalance:'', giftBalance:'', diff --git a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue index 79391359f..e67eb4c9b 100644 --- a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue +++ b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue @@ -340,9 +340,6 @@ - - - @@ -765,12 +762,13 @@ export default { this.$message.error("该商品已存在") return } - this.pdswidlist.push( this.shopdata.goodsId.id) + this.pdswidlist.push( this.shopdata.goodsId.id,) let data = { activeGift: 4, goodsIds : this.shopdata.goodsId.id, goodsName: this.shopdata.goodsId.name, - goodsTotal:1 + + goodsTotal:this.shopdata.count } this.form.shiwudata.push(data) diff --git a/fuintAdmin/src/views/integral/gift/index.vue b/fuintAdmin/src/views/integral/gift/index.vue index 47b5da926..371a96014 100644 --- a/fuintAdmin/src/views/integral/gift/index.vue +++ b/fuintAdmin/src/views/integral/gift/index.vue @@ -322,7 +322,7 @@ - + @@ -423,9 +423,7 @@ - - - + @@ -438,7 +436,7 @@ placeholder="全部" clearable > - + @@ -747,11 +745,12 @@ export default { isRecovery:0, }, - // 商品分类列表 + cvsGoodList:[], // 供应商列表 supplierList:[], + } }, @@ -865,27 +864,26 @@ export default { this.cardFavorableApi(); this.cardExchangeApi(); + this.selectGiftCategory(); - + // 处理图片 let fileList = JSON.parse(data.giftImages); this.giftImages = [], - this.giftImages = fileList; - - console.log( this.giftImages); - this.giftImages.forEach(image=>{ let sp = image.url.split('//') image.url = this.imagePath + '/'+sp[2] }) - console.log("data",data.deliveryMethod); - // data.deliveryMethod = JSON.parse(data.deliveryMethod); - - // 查询兑换卷和优惠券列表 - this.dataForm = data; + this.changeGiftType(this.dataForm.giftType) + this.changeExchange(this.dataForm.exchangeMethod) + this.changeExpressEDIT() + + + console.log(" this.dataForm", this.dataForm) + this.open = true; this.getList(); }, @@ -1001,6 +999,7 @@ export default { }, // 选择礼品类型 changeGiftType(newVal) { + console.log("") let this_ = this if (newVal == '优惠券') { this_.showList.coupon = true @@ -1041,30 +1040,46 @@ export default { this_.showList.jfjq = true } }, - // 快递 + // 快递(处理选择) changeExpress(data,flag){ let this_ = this // express: false, - console.log("data",data) // shippingFee: false + console.log("flag",flag) + console.log("this.dataForm.deliveryMethod",this.dataForm.deliveryMethod) if(flag === 1) { if (!this.dataForm.deliveryMethod) { this.dataForm.deliveryMethod = []; this.showList.express= false } + if (!Array.isArray(this.dataForm.deliveryMethod)) { + this.dataForm.deliveryMethod = JSON.parse(this.dataForm.deliveryMethod); + + } + // const jsonArray = JSON.parse(this.dataForm.deliveryMethod); + // const index = jsonArray.indexOf(data); const index = this.dataForm.deliveryMethod.indexOf(data); if (index === -1) { this.dataForm.deliveryMethod.push(data); + // const jsonArray = JSON.parse(this.dataForm.deliveryMethod); + // jsonArray.push(data) + // this.dataForm.deliveryMethod = jsonArray + console.log("data1",data) + if(data == '物流配送') { this.showList.express= true } } else { - this.dataForm.deliveryMethod.splice(index, 1); + console.log("data2",data) + this.dataForm.deliveryMethod.splice(index, 1) + // const jsonArray = JSON.parse(this.dataForm.deliveryMethod); + // jsonArray.splice(index, 1); + // this.dataForm.deliveryMethod = JSON.stringify(jsonArray) + if(data == '物流配送') { this.showList.express= false } } - console.log("data",this.dataForm.deliveryMethod) } else { if (data == '包邮') { this.showList.shippingFee= false @@ -1073,6 +1088,31 @@ export default { } } }, + + // 快递 修改时处理 + changeExpressEDIT(){ + if (!this.dataForm.deliveryMethod) { + this.dataForm.deliveryMethod = []; + this.showList.express= false + } + if(!this.dataForm.expressShippingFee) { + this.dataForm.expressShippingFee= '' + this.showList.shippingFee= false + } + let this_ = this + if (!Array.isArray(this_.dataForm.deliveryMethod)) { + this_.dataForm.deliveryMethod = JSON.parse(this_.dataForm.deliveryMethod); + } + if (this_.dataForm.deliveryMethod.includes("物流配送")) { + this.showList.express= true + + } + if (this_.dataForm.expressShippingFee == "统一运费") { + this.showList.shippingFee= true + } + + }, + // 点击按钮处理 handleIsopenSelect() { diff --git a/fuintAdmin/src/views/login.vue b/fuintAdmin/src/views/login.vue index fcaf0713b..0817846ec 100644 --- a/fuintAdmin/src/views/login.vue +++ b/fuintAdmin/src/views/login.vue @@ -1,17 +1,25 @@