Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into sc...

xiaoyong931011

2021-04-13 9fb0b7d623078e90747ac4a64283f29d4b4d51d6

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

@@ -82,6 +82,14 @@
                        show-overflow-tooltip>
                </el-table-column>
                <el-table-column
                        label="状态"
                        show-overflow-tooltip>
                    <template slot-scope="scope">
                        <span v-if="scope.row.state == 1">待领取</span>
                        <span v-if="scope.row.state == 2">已领取</span>
                    </template>
                </el-table-column>
                <el-table-column
                        label="签到类型"
                        show-overflow-tooltip>
                    <template slot-scope="scope">