Merge branch 'score_shop'

wzy

2022-10-12 4615437af0749766f519c10734e19360b0877ece

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

@@ -267,7 +267,7 @@
                                                        </el-col>
                                                    </el-row>
                                                </div>
                                                <div v-show="item.content.awardWay === 3">
                                                <div v-show="[1,3].includes(item.content.awardWay)">
                                                    <el-row >
                                                        <el-col>
                                                            <el-form-item label="客服电话">
@@ -525,11 +525,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>