Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zmr

2020-08-18 21:03:39 +08:00
parent 9d8d54cf02 417ec2106e
commit 97c95c2024
33 changed files with 406 additions and 209 deletions
--- a/pageD/activity/activity.vue
+++ b/pageD/activity/activity.vue
@@ -55,7 +55,7 @@
 	};
 </script>

-<style lang="scss" scoped>
+<style lang="scss">
    page {
        background-color: #ECECEC;
    }