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-sign.html

@@ -274,6 +274,15 @@
                                                            </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>
                                                    </div>
                                                    <div v-show="item.content.awardWay !== '2'">
                                                        <el-row >
                                                            <el-col>
@@ -522,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>
@@ -576,6 +585,7 @@
        couponId:'',
        goodsId:'',
        couponName:'',
        customerPhone:'',
        goodsName:'',
    }
    var app = new Vue({
@@ -845,6 +855,7 @@
                        operationTip: prize.operationTip,
                        prizeAddress: prize.prizeAddress,
                        wechatImg: prize.wechatImg,
                        customerPhone: prize.customerPhone,
                        scoreCnt: prize.scoreCnt,
                        couponId: prize.couponId,
                        goodsId: prize.goodsId,