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

@@ -267,6 +267,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>
@@ -516,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>
@@ -569,6 +578,7 @@
        wechatImg:'',
        scoreCnt:'',
        couponId:'',
        customerPhone:'',
        goodsId:'',
        couponName:'',
        goodsName:'',
@@ -829,6 +839,7 @@
                                awardType: parseInt(prizeVo.awardType),
                                awardName: prizeVo.awardName,
                                introduceImg: prizeVo.introduceImg,
                                customerPhone: prizeVo.customerPhone,
                                introduceTip: prizeVo.introduceTip,
                                awardInventoryCnt: prizeVo.awardInventoryCnt,
                                awardDistributeCnt: prizeVo.awardDistributeCnt,
@@ -914,6 +925,7 @@
                        awardDistributeCnt: prize.awardDistributeCnt,
                        awardWay: prize.awardWay,
                        operationTip: prize.operationTip,
                        customerPhone: prize.customerPhone,
                        prizeAddress: prize.prizeAddress,
                        wechatImg: prize.wechatImg,
                        scoreCnt: prize.scoreCnt,