Merge branch 'score_shop' into api_score_meger

Helius

2021-04-21 4cab5d1219c7ea01e60a0629bf0e9e062be029d1

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

@@ -56,7 +56,7 @@
    <el-row>
        <el-col :span="4">
            <el-card class="box-card" :body-style="{ padding: '10px 10px'}">
                <img src="https://shadow.elemecdn.com/app/element/hamburger.9cf7b091-55e9-11e9-a976-7f4d0b07eef6.png" class="image">
                <img src="../../../images/sign/meiriqiandao.png" class="image">
                <div style="padding: 5px;">
                    <span style="padding:5px;font-size: 30px;">每日签到</span>
                    <div class="bottom clearfix">
@@ -67,7 +67,7 @@
        </el-col>
        <el-col :span="4">
            <el-card class="box-card" :body-style="{ padding: '10px 10px'}">
                <img src="https://shadow.elemecdn.com/app/element/hamburger.9cf7b091-55e9-11e9-a976-7f4d0b07eef6.png" class="image">
                <img src="../../../images/sign/tiantianpingtuan.png" class="image">
                <div style="padding: 5px;">
                    <span style="padding:5px;font-size: 30px;">拼团</span>
                    <div class="bottom clearfix">
@@ -78,7 +78,7 @@
        </el-col>
        <el-col :span="4">
            <el-card class="box-card" :body-style="{ padding: '10px 10px'}">
                <img src="https://shadow.elemecdn.com/app/element/hamburger.9cf7b091-55e9-11e9-a976-7f4d0b07eef6.png" class="image">
                <img src="../../../images/sign/jisumiaosha.png" class="image">
                <div style="padding: 5px;">
                    <span style="padding:5px;font-size: 30px;">秒杀</span>
                    <div class="bottom clearfix">
@@ -89,7 +89,7 @@
        </el-col>
        <el-col :span="4">
            <el-card class="box-card" :body-style="{ padding: '10px 10px'}">
                <img src="https://shadow.elemecdn.com/app/element/hamburger.9cf7b091-55e9-11e9-a976-7f4d0b07eef6.png" class="image">
                <img src="../../../images/sign/shalonghuodong.png" class="image">
                <div style="padding: 5px;">
                    <span style="padding:5px;font-size: 30px;">沙龙</span>
                    <div class="bottom clearfix">
@@ -115,7 +115,12 @@
<script>
    var app = new Vue({
        el: '#app',
        data: {},
        data: {
            imageUrlqd: "../../images/sign/meiriqiandao.png",
            imageUrlms: "../../images/sign/jisumiaosha.png",
            imageUrlpt: "../../images/sign/tiantianpingtuan.png",
            imageUrlsl: "../../images/sign/shalonghuodong.png",
        },
        created: function () {
        },
        methods: {