Merge branch 'sit-Leung' into sit-Carl

# Conflicts:
#	rc-busness/components/header.vue
#	rc-busness/pages/index.vue
This commit is contained in:
Vion
2022-01-17 17:56:37 +08:00
17 changed files with 305 additions and 29132 deletions

View File

@@ -16,12 +16,10 @@
},
"dependencies": {
"@nuxtjs/axios": "^5.13.6",
"@vant/touch-emulator": "^1.3.2",
"amfe-flexible": "^2.2.1",
"core-js": "^3.15.1",
"element-ui": "^2.15.6",
"ip": "^1.1.5",
"jquery": "^3.6.0",
"less": "^4.1.2",
"less-loader": "^6.0.0",
"nuxt": "^2.15.7",
@@ -29,7 +27,8 @@
"qrcodejs2": "^0.0.2",
"vant": "^2.12.22",
"vue-awesome-swiper": "^4.1.1",
"vuex-persistedstate": "^4.1.0"
"vuex-persistedstate": "^4.1.0",
"swiper":"^5.4.5"
},
"devDependencies": {
"@vant/area-data": "^1.1.5",