From a13a93a493e7e94e28b2225c26e7e13b52d3288c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 12 Apr 2021 19:48:45 +0800
Subject: [PATCH] 20210412 tqq环境
---
zq-erp/src/main/resources/templates/views/admin/activity/activity-sign.html | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/activity/activity-sign.html b/zq-erp/src/main/resources/templates/views/admin/activity/activity-sign.html
index 44d8841..a134b2f 100644
--- a/zq-erp/src/main/resources/templates/views/admin/activity/activity-sign.html
+++ b/zq-erp/src/main/resources/templates/views/admin/activity/activity-sign.html
@@ -304,7 +304,7 @@
</el-form-item>
</el-col>
<el-col>
- <el-button type="primary" @click="chooseCoupon(item.content.couponName)">
+ <el-button type="primary" @click="chooseCoupon(item.content.couponName,item.name)">
选择优惠券
</el-button>
</el-col>
@@ -383,7 +383,7 @@
</el-form-item>
</el-col>
<el-col>
- <el-button type="primary" @click="chooseGoods(item.content.goodsName)">
+ <el-button type="primary" @click="chooseGoods(item.content.goodsName,item.name)">
选择品项
</el-button>
</el-col>
@@ -578,6 +578,8 @@
data: {
activeName: 'first',
formLabelWidth: '120px',
+
+ activeClickTab:0,
//优惠券搜索弹出
drawerCoupon: false,
directionCoupon: 'rtl',
@@ -664,9 +666,10 @@
},
methods: {
//选择优惠券
- chooseCoupon(val){
+ chooseCoupon(val,name){
let _this = this;
_this.drawerCoupon = true;
+ _this.activeClickTab = parseInt(name);
_this.formCoupon.yhjmc = val;
_this.loadCouponList();
},
@@ -717,15 +720,16 @@
//选择
chooseOneCoupon(row) {
let _this = this;
- _this.editableTabs[_this.tabIndex-1].content.couponId = row.id;
- _this.editableTabs[_this.tabIndex-1].content.couponName = row.cname;
+ _this.editableTabs[_this.activeClickTab-1].content.couponId = row.id;
+ _this.editableTabs[_this.activeClickTab-1].content.couponName = row.cname;
_this.drawerCoupon = false;
},
//选择品项
- chooseGoods(val){
+ chooseGoods(val,name){
let _this = this;
_this.drawerGoods = true;
+ _this.activeClickTab = parseInt(name);
_this.formGoods.cpmc = val;
_this.loadGoodsList();
},
@@ -774,8 +778,8 @@
//选择
chooseOneGoods(row) {
let _this = this;
- _this.editableTabs[_this.tabIndex-1].content.goodsId = row.id;
- _this.editableTabs[_this.tabIndex-1].content.goodsName = row.name;
+ _this.editableTabs[_this.activeClickTab-1].content.goodsId = row.id;
+ _this.editableTabs[_this.activeClickTab-1].content.goodsName = row.name;
_this.drawerGoods = false;
},
@@ -818,8 +822,14 @@
let activitySignAwardSets = [];
for (let i = 0; i < _this.editableTabs.length; i++) {
let prize = _this.editableTabs[i].content;
+ let name = _this.editableTabs[i].title;
+ let awardRule = 2;
+ if(name == "签到日常奖励"){
+ awardRule = 1;
+ }
let activitySignAwardSet = {
cumulativeDay: prize.cumulativeDay,
+ awardRule: awardRule,
awardType: prize.awardType,
awardName: prize.awardName,
introduceImg: prize.introduceImg,
@@ -928,12 +938,12 @@
},
//奖品设置的图片介绍
introduceImgSuccess(res, file) {
- this.editableTabs[this.tabIndex-1].content.introduceImg = res.path;
+ this.editableTabs[this.activeClickTab-1].content.introduceImg = res.path;
// this.prize.introduceImg = URL.createObjectURL(file.raw);
},
//奖品设置的客服微信
wechatImgSuccess(res, file) {
- this.editableTabs[this.tabIndex-1].content.wechatImg = res.path;
+ this.editableTabs[this.activeClickTab-1].content.wechatImg = res.path;
},
cancelSubmit() {
this.closeFrame();
--
Gitblit v1.9.1