Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-05-08 e53fcbe9fe844b7788b29c5106c1ac24d17c5535

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

@@ -87,13 +87,6 @@
                                </el-button>
                            </div>
                        </el-col>
                        <el-col>
                            <div style="padding:5px;font-size: 15px;text-align: right;">
                                <el-button type="primary" size="mini" round>
                                    <span>抽奖记录</span>
                                </el-button>
                            </div>
                        </el-col>
                    </el-row>

                    <el-row>
@@ -536,7 +529,7 @@
                                </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"
@@ -546,7 +539,7 @@
                                        <i v-else></i>
                                    </el-upload>
                                </el-form-item>
                            </div>
                            </div>-->
                        </el-tab-pane>

                        <el-tab-pane label="规则说明" name="fourth">
@@ -625,10 +618,10 @@
            activeName: 'first',
            formLabelWidth: '120px',
            //标题图片
            imageUrlTitle: '',
            imageLine: '',
            imageUrlHead: "../../../images/sign/signHead.png",
            imageUrlButton: "../../../images/sign/signButton.png",
            imageLine: "../../../images/luckyDraw/line.png",
            imageUrlTitle: "../../../images/luckyDraw/start.png",
            imageUrlButton: "",
            imageUrlHead: "../../../images/luckyDraw/zhuanpan.png",

            activeClickTab:0,