Merge branch 'developer' into alpha

Helius

2022-03-14 b5960ac13f8d67c0baf8f23ffb2e24de1494cbf7

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

@@ -82,12 +82,33 @@
                        show-overflow-tooltip>
                </el-table-column>
                <el-table-column
                        prop="cumulativeDay"
                        label="连续签到天数"
                        label="状态"
                        show-overflow-tooltip>
                    <template slot-scope="scope">
                        <span v-if="scope.row.state == 1">待领取</span>
                        <span v-if="scope.row.state == 2">已领取</span>
                        <span v-if="scope.row.state == 3">待配送</span>
                        <span v-if="scope.row.state == 4">待收货</span>
                        <span v-if="scope.row.state == 5">已失效</span>
                    </template>
                </el-table-column>
                <el-table-column
                        label="奖励类型">
                        label="签到类型"
                        show-overflow-tooltip>
                    <template slot-scope="scope">
                        <span v-if="scope.row.awardRule == 1">日常奖励</span>
                        <span v-if="scope.row.awardRule == 2">累计签到奖励</span>
                    </template>
                </el-table-column>
                <el-table-column
                        label="连续签到天数"
                        show-overflow-tooltip>
                    <template slot-scope="scope">
                        <span v-if="scope.row.awardRule == 2">{{scope.row.cumulativeDay}}</span>
                    </template>
                </el-table-column>
                <el-table-column
                        label="奖品类型">
                    <template slot-scope="scope">
                        <span v-if="scope.row.awardType == 1">自定义礼品</span>
                        <span v-if="scope.row.awardType == 2">积分</span>
@@ -100,6 +121,16 @@
                        label="获得奖励"
                        show-overflow-tooltip>
                </el-table-column>

                <el-table-column
                        label="奖励名称"
                        show-overflow-tooltip>
                    <template slot-scope="scope">
                        {{scope.row.awardName}}
                        <span v-if="scope.row.awardType == 3">({{scope.row.couponName}})</span>
                        <span v-if="scope.row.awardType == 2">(*{{scope.row.scoreCnt}})</span>
                    </template>
                </el-table-column>
            </el-table>
        </el-row>
        <el-row class="paginationStyle"  >