Merge branch 'score_shop'

wzy

2022-10-12 4615437af0749766f519c10734e19360b0877ece

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

@@ -148,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">
@@ -531,7 +531,7 @@
                                        <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-input-number v-model="typographyLight" :min="1" :max="100" label="描述文字">%</el-input-number>