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

Helius

2021-04-19 6922917abd80d12a5d87cc2f8d0390c55694a95a

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

@@ -132,7 +132,7 @@

            <el-main width="70%">
                <div>
                    <el-tabs v-model="activeName" >
                    <el-tabs v-model="activeName"  @tab-click="clickSecondTab">
                        <el-tab-pane label="活动设置" name="first">
                            <div class="col-sm-8 col-sm-offset-1" style="padding: 10px">
                                <el-form-item label="活动名称" prop="actName">
@@ -162,7 +162,7 @@
                        <el-tab-pane label="奖品设置" name="second">
                            <el-row style="display:flex;">
                                <el-col :span="20">
                                    <el-tabs v-model="editableTabsValue" type="card" closable @tab-remove="removeTab">
                                    <el-tabs v-model="editableTabsValue" type="card" closable @tab-click="clickTab" @tab-remove="removeTab">
                                        <el-tab-pane v-for="(item, index) in editableTabs" :key="item.name" :label="item.title" :name="item.name">
                                            <el-row v-show="editableTabsValue !== '1'">
                                                <el-form-item label="签到累计天数">
@@ -676,6 +676,8 @@
                let _this = this;
                _this.drawerCoupon = true;
                _this.activeClickTab = parseInt(name);

                console.log(_this.activeClickTab);
                _this.formCoupon.yhjmc = val;
                _this.loadCouponList();
            },
@@ -711,8 +713,6 @@
            },
            //重置
            resetFormCoupon(formName) {
                // this.formCoupon.yhjmc = ''
                // console.log(this.$refs[formName].resetFields)
                (this.$refs[formName])[0].resetFields();
            },
            changePageSizeCoupon(val) {
@@ -961,6 +961,14 @@
                    content: JSON.parse(JSON.stringify(prize)),
                });
                this.editableTabsValue = newTabName;
                this.activeClickTab = parseInt(newTabName);
            },
            clickSecondTab(targetName) {
                this.activeClickTab = 1;
            },
            clickTab(targetName) {
                console.log(targetName.name);
                this.activeClickTab = parseInt(targetName.name);
            },
            removeTab(targetName) {
                let tabs = this.editableTabs;