diff --git a/seller/.npmrc b/seller/.npmrc new file mode 100644 index 00000000..c0c80ba4 --- /dev/null +++ b/seller/.npmrc @@ -0,0 +1 @@ +engine-strict=false diff --git a/seller/.yarnrc b/seller/.yarnrc new file mode 100644 index 00000000..4f14322d --- /dev/null +++ b/seller/.yarnrc @@ -0,0 +1 @@ +--ignore-engines true diff --git a/seller/package.json b/seller/package.json index ed4f3e80..c217529d 100644 --- a/seller/package.json +++ b/seller/package.json @@ -4,6 +4,9 @@ "private": true, "description": "lilishop-ui", "author": "lili-platform", + "engines": { + "node": ">=14" + }, "scripts": { "serve": "vue-cli-service serve", "build": "vue-cli-service build", @@ -15,10 +18,10 @@ "axios": "^0.21.1", "dplayer": "^1.27.1", "js-cookie": "^2.2.1", - "node-sass": "^4.14.1", + "sass": "^1.63.6", "price-color": "^1.0.2", "s": "^1.0.0", - "sass-loader": "^8.0.2", + "sass-loader": "^10.4.1", "sockjs-client": "^1.4.0", "swiper": "^6.3.5", "uuid": "^8.3.2", @@ -51,6 +54,8 @@ "vue-template-compiler": "^2.6.10" }, "resolutions": { - "minimatch": "^3.1.2" + "minimatch": "^3.1.2", + "node-sass": "npm:sass@^1.63.6", + "@achrinza/node-ipc": "9.2.2" } } diff --git a/seller/src/views/goods/goods-manage/category.vue b/seller/src/views/goods/goods-manage/category.vue index 62c3699b..620a054e 100644 --- a/seller/src/views/goods/goods-manage/category.vue +++ b/seller/src/views/goods/goods-manage/category.vue @@ -256,7 +256,7 @@ export default { }; diff --git a/seller/src/views/home/home.scss b/seller/src/views/home/home.scss index 41218860..69d82189 100644 --- a/seller/src/views/home/home.scss +++ b/seller/src/views/home/home.scss @@ -11,7 +11,7 @@ h4 { margin: 20px 0; font-size: 18px; } -/deep/ .ivu-icon { +::v-deep .ivu-icon { margin-right: 10px; } .rate-box { @@ -82,7 +82,7 @@ h4 { font-weight: bold; width: 286px; display: flex; - /deep/ span { + ::v-deep span { color: $theme_color; font-size: 18px; } diff --git a/seller/src/views/home/home.vue b/seller/src/views/home/home.vue index ea41bbde..3a56961e 100644 --- a/seller/src/views/home/home.vue +++ b/seller/src/views/home/home.vue @@ -295,7 +295,7 @@ export default { diff --git a/seller/src/views/shop/bill/accountStatementBill.vue b/seller/src/views/shop/bill/accountStatementBill.vue index 073acd6f..5cc8fbd7 100644 --- a/seller/src/views/shop/bill/accountStatementBill.vue +++ b/seller/src/views/shop/bill/accountStatementBill.vue @@ -225,7 +225,7 @@ diff --git a/seller/src/views/shop/bill/billDetail.vue b/seller/src/views/shop/bill/billDetail.vue index bf439b8f..28a05e11 100644 --- a/seller/src/views/shop/bill/billDetail.vue +++ b/seller/src/views/shop/bill/billDetail.vue @@ -654,7 +654,7 @@ table { margin: 10px 0; padding: 10px; - /deep/ span { + ::v-deep span { font-size: 14px; text-align: center; width: 200px; diff --git a/seller/src/views/shop/hotzone/index.vue b/seller/src/views/shop/hotzone/index.vue index 90d75467..53c0c7e7 100644 --- a/seller/src/views/shop/hotzone/index.vue +++ b/seller/src/views/shop/hotzone/index.vue @@ -57,11 +57,11 @@ export default { };