Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-04-15 bb5be7a8a6ac24fbf66f03f070751577b87c95ca

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

@@ -616,8 +616,8 @@

            //标题图片
            imageUrlTitle: '',
            imageUrlHead: '',
            imageUrlButton: '',
            imageUrlHead: basePath + "/image/signHead.png",
            imageUrlButton: basePath + "/image/signButton.png",
            imageUrlState: '',

            //字体颜色
@@ -867,6 +867,7 @@
                            message: data.info,
                            type: 'success',
                        });
                        parent.layer.close(parent.layer.getFrameIndex(window.name));
                    }
                });
            },