Merge branch 'score_shop'

wzy

2022-10-12 4615437af0749766f519c10734e19360b0877ece

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

@@ -56,13 +56,12 @@
        }
        .imageTwo {
            display: block;
            height: 50px;
            height: 280px;
            padding: 5px 5px;
            text-align: center;
        }
        .imageThree {
            display: block;
            height: 50px;
            padding: 5px 5px;
            text-align: center;
        }
@@ -81,14 +80,16 @@
    <el-container>
        <el-aside width="30%">
            <el-card class="box-card" :body-style="{ padding: '10px 10px'}">
                <div @click="uploadImg()" class="imageOne">
                <!--<div @click="uploadImg()" class="imageOne">
                    <img v-if="imageUrlTitle" :src="imageUrlTitle" style="width: 100%;">
                    <el-button type="primary" v-show="imageUrlTitle == ''" round><span style="font-size: 20px;">标题</span><span style="padding:5px;font-size: 15px;color: red;">(上传图片)</span></span></el-button>
                </div>
                <div @click="uploadImg()" class="imageTwo" >
                    <img v-if="imageUrlHead" :src="imageUrlHead" style="width: 100%;">
                    <el-button type="primary" v-show="imageUrlHead == ''" round><span style="font-size: 20px;">头部</span><span style="padding:5px;font-size: 15px;color: red;">(上传图片)</span></span></el-button>
                </div>
                </div>-->
                <el-row>
                    <div @click="uploadImg()" class="imageTwo" >
                        <img v-if="imageUrlHead" :src="imageUrlHead" style="width: 100%;height: 100%">
                        <el-button type="primary" v-show="imageUrlHead == ''" round><span style="font-size: 20px;">头部</span><span style="padding:5px;font-size: 15px;color: red;">(上传图片)</span></span></el-button>
                    </div>
                </el-row>
                <el-row style="display:flex;">
                    <el-col>
                        <div style="padding:5px;font-size: 15px;text-align: left;"><span>您已累计签到<span style="color: red;">3</span>天</span></div>
@@ -97,16 +98,24 @@
                        <div style="padding:5px;font-size: 15px;text-align: right;"><span>签到提醒</span></div>
                    </el-col>
                </el-row>

                <el-row>
                <div @click="uploadImg()">
                    <el-calendar :range="['2019-03-04', '2019-03-24']"></el-calendar>
                    <img v-if="imageUrlState" :src="imageUrlState" style="width: 100%;">
                    <el-button type="primary" v-show="imageUrlState == ''" round><span style="font-size: 20px;">日历签到背景</span><span style="padding:5px;font-size: 15px;color: red;">(上传图片)</span></span></el-button>
                    <!--<el-button type="primary" v-show="imageUrlState == ''" round><span style="font-size: 20px;">日历签到背景</span><span style="padding:5px;font-size: 15px;color: red;">(上传图片)</span></span></el-button>-->
                </div>
                </el-row>

                <el-row>
                <div @click="uploadImg()" class="imageThree" >
                    <el-button type="primary" v-show="imageUrlButton == ''" round><span style="font-size: 20px;">签到按钮</span><span style="padding:5px;font-size: 15px;color: red;">(上传图片)</span></span></el-button>
                    <img v-if="imageUrlButton" :src="imageUrlButton" style="width: 100%;">
                </div>
                </el-row>


                <el-row>
                <div style="text-align: center;padding: 5px;" @click="gzsmSet()">
                    <div class="col-sm-8 col-sm-offset-2" style="text-align: left;">
                        <span style="padding:5px;font-size: 30px;">-- 规则说明--</span>
@@ -124,12 +133,13 @@
                        <span style="padding:5px;font-size: 15px;">3、每7天重新开始计算</span>
                    </div>
                </div>
                </el-row>
            </el-card>
        </el-aside>

        <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">
@@ -138,7 +148,7 @@
                                </div>
                                <div class="col-sm-8 col-sm-offset-1" style="padding: 10px">
                                    <el-form-item label="活动编码" prop="actCode">
                                        <el-input v-model.number="ruleForm.actCode" placeholder="请输入最大开团数量"></el-input>
                                        <el-input v-model.number="ruleForm.actCode" placeholder="请输入活动编码"></el-input>
                                    </el-form-item>
                                </div>
                                <div class="col-sm-4 col-sm-offset-1" style="padding: 10px">
@@ -159,7 +169,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="签到累计天数">
@@ -260,6 +270,15 @@
                                                                            :on-success="wechatImgSuccess">
                                                                        <img v-if="item.content.wechatImg" :src="item.content.wechatImg" style="max-width: 200px;">
                                                                    </el-upload>
                                                                </el-form-item>
                                                            </el-col>
                                                        </el-row>
                                                    </div>
                                                    <div v-show="[1,3].includes(item.content.awardWay)">
                                                        <el-row >
                                                            <el-col>
                                                                <el-form-item label="客服电话">
                                                                    <el-input v-model="item.content.customerPhone"></el-input>
                                                                </el-form-item>
                                                            </el-col>
                                                        </el-row>
@@ -413,13 +432,8 @@
                                                                              stripe:true
                                                                              style="width: 100%">
                                                                        <el-table-column
                                                                                prop="cname"
                                                                                label="优惠券名称"
                                                                                show-overflow-tooltip>
                                                                        </el-table-column>
                                                                        <el-table-column
                                                                                prop="endTime"
                                                                                label="截止日期"
                                                                                prop="name"
                                                                                label="名称"
                                                                                show-overflow-tooltip>
                                                                        </el-table-column>
                                                                        <el-table-column
@@ -462,7 +476,7 @@
                            </el-tab-pane>

                            <el-tab-pane label="背景图片上传" name="third">
                                <div class="col-sm-8 col-sm-offset-1" style="padding: 10px">
                                <!--<div class="col-sm-8 col-sm-offset-1" style="padding: 10px">
                                    <el-form-item label="标题">
                                        <el-upload
                                                action="/admin/multipleUploadFile/doUpload"
@@ -471,7 +485,7 @@
                                            <img v-if="imageUrlTitle" :src="imageUrlTitle" style="max-width: 300px;">
                                        </el-upload>
                                    </el-form-item>
                                </div>
                                </div>-->
                                <div class="col-sm-8 col-sm-offset-1" style="padding: 10px">
                                    <el-form-item label="头部">
                                        <el-upload
@@ -482,7 +496,7 @@
                                        </el-upload>
                                    </el-form-item>
                                </div>
                                <div class="col-sm-8 col-sm-offset-1" style="padding: 10px">
                                <!--<div class="col-sm-8 col-sm-offset-1" style="padding: 10px">
                                    <el-form-item label="日历签到背景">
                                        <el-upload
                                                action="/admin/multipleUploadFile/doUpload"
@@ -491,7 +505,7 @@
                                            <img v-if="imageUrlState" :src="imageUrlState" style="max-width: 300px;">
                                        </el-upload>
                                    </el-form-item>
                                </div>
                                </div>-->
                                <div class="col-sm-8 col-sm-offset-1" style="padding: 10px">
                                    <el-form-item label="签到按钮">
                                        <el-upload
@@ -517,11 +531,11 @@
                                        <el-color-picker v-model="typographyColor"></el-color-picker>
                                    </el-form-item>
                                    <el-form-item label="字体大小" style="padding: 10px">
                                        <el-input-number v-model="typographyNum" :min="10" :max="20" label="描述文字"></el-input-number>
                                        <el-input-number v-model="typographyNum" :min="10" :max="50" label="描述文字"></el-input-number>
                                    </el-form-item>
                                    <el-form-item label="字体透明度" style="padding: 10px">
                                    <!--<el-form-item label="字体透明度" style="padding: 10px">
                                        <el-input-number v-model="typographyLight" :min="1" :max="100" label="描述文字">%</el-input-number>
                                    </el-form-item>
                                    </el-form-item>-->
                                </div>
                           </el-tab-pane>
                        </el-tabs>
@@ -571,6 +585,7 @@
        couponId:'',
        goodsId:'',
        couponName:'',
        customerPhone:'',
        goodsName:'',
    }
    var app = new Vue({
@@ -616,8 +631,8 @@

            //标题图片
            imageUrlTitle: '',
            imageUrlHead: '',
            imageUrlButton: '',
            imageUrlHead: "../../../images/sign/signHead.png",
            imageUrlButton: "../../../images/sign/signButton.png",
            imageUrlState: '',

            //字体颜色
@@ -840,6 +855,7 @@
                        operationTip: prize.operationTip,
                        prizeAddress: prize.prizeAddress,
                        wechatImg: prize.wechatImg,
                        customerPhone: prize.customerPhone,
                        scoreCnt: prize.scoreCnt,
                        couponId: prize.couponId,
                        goodsId: prize.goodsId,
@@ -867,6 +883,7 @@
                            message: data.info,
                            type: 'success',
                        });
                        parent.layer.close(parent.layer.getFrameIndex(window.name));
                    }
                });
            },
@@ -879,6 +896,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;
@@ -939,7 +964,6 @@
            //奖品设置的图片介绍
            introduceImgSuccess(res, file) {
                this.editableTabs[this.activeClickTab-1].content.introduceImg = res.path;
                // this.prize.introduceImg = URL.createObjectURL(file.raw);
            },
            //奖品设置的客服微信
            wechatImgSuccess(res, file) {