From 95f9ea7eb339c36cade6c67d0385c49ec2d81477 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Wed, 14 Apr 2021 19:39:45 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger
---
zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-update.html | 35 ++++++++++++++++++++++++++---------
1 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-update.html b/zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-update.html
index 5b1320e..8c6e40b 100644
--- a/zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-update.html
+++ b/zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-update.html
@@ -297,7 +297,7 @@
</el-form-item>
</el-col>
<el-col>
- <el-button type="primary">
+ <el-button type="primary" @click="chooseCoupon(item.content.couponName,item.name)">
选择优惠券
</el-button>
</el-col>
@@ -377,7 +377,7 @@
</el-form-item>
</el-col>
<el-col>
- <el-button type="primary">
+ <el-button type="primary" @click="chooseGoods(item.content.goodsName,item.name)">
选择品项
</el-button>
</el-col>
@@ -579,6 +579,8 @@
imageUrlButton: '',
imageUrlState: '',
+ activeClickTab:0,
+
//优惠券搜索弹出
drawerCoupon: false,
directionCoupon: 'rtl',
@@ -660,9 +662,10 @@
},
methods: {
//选择优惠券
- chooseCoupon(val){
+ chooseCoupon(val,name){
let _this = this;
_this.drawerCoupon = true;
+ _this.activeClickTab = parseInt(name);
_this.formCoupon.yhjmc = val;
_this.loadCouponList();
},
@@ -713,11 +716,19 @@
//选择
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,name){
+ let _this = this;
+ _this.drawerGoods = true;
+ _this.activeClickTab = parseInt(name);
+ _this.formGoods.cpmc = val;
+ _this.loadGoodsList();
+ },
//--品项
loadGoodsList() {
let _this = this;
@@ -763,8 +774,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;
},
@@ -881,9 +892,15 @@
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 = {
id: prize.id,
cumulativeDay: prize.cumulativeDay,
+ awardRule: awardRule,
awardType: prize.awardType,
awardName: prize.awardName,
introduceImg: prize.introduceImg,
@@ -993,11 +1010,11 @@
},
//奖品设置的图片介绍
introduceImgSuccess(res, file) {
- this.editableTabs[this.tabIndex-1].content.introduceImg = res.path;
+ this.editableTabs[this.activeClickTab-1].content.introduceImg = res.path;
},
//奖品设置的客服微信
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