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

# Conflicts:
#	src/api/index.js

src/views/invest/components/left.vue

@@ -46,7 +46,6 @@
 <script>
 import baseButton from '@/components/base-button.vue'
 import { useStore } from '@/store/user.js'
-import config from '@/config/website.js'
 
 export default {
   name: 'left',