Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into sc...

Helius

2021-04-15 63f4c14d15e6656bfd1833f3eb3804d00c4af051

 zq-erp/src/main/resources/templates/views/admin/activity/activity-sign.html

@@ -822,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,
@@ -861,6 +867,7 @@
                            message: data.info,
                            type: 'success',
                        });
                        parent.layer.close(parent.layer.getFrameIndex(window.name));
                    }
                });
            },