diff --git a/buyer/config/index.js b/buyer/config/index.js
index 2189ed6d..a7463abb 100644
--- a/buyer/config/index.js
+++ b/buyer/config/index.js
@@ -21,7 +21,7 @@ module.exports = {
},
// Various Dev Server settings
- host: '0.0.0.0', // can be overwritten by process.env.HOST
+ host: 'localhost', // can be overwritten by process.env.HOST
port: 10000, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
autoOpenBrowser: false,
errorOverlay: true,
diff --git a/buyer/src/pages/GoodsList.vue b/buyer/src/pages/GoodsList.vue
index 31f2b9c3..55fbb20c 100644
--- a/buyer/src/pages/GoodsList.vue
+++ b/buyer/src/pages/GoodsList.vue
@@ -49,27 +49,27 @@
class="goods-show-info"
v-for="(item, index) in goodsList"
:key="index"
- @click="goGoodsDetail(item.id, item.goodsId)"
+ @click="goGoodsDetail(item.id, item.content.goodsId)"
>
-
+
{{
- item.price | unitPrice("¥")
+ item.content.price | unitPrice("¥")
}}
- {{ item.goodsName }}
+ {{ item.content.goodsName }}
- 已有{{ item.commentNum || 0 }} {{ item.content.commentNum || 0 }}人评价
- 自营 {{ item.storeName }}
+ 自营 {{ item.content.storeName }}
diff --git a/buyer/vue.config.js b/buyer/vue.config.js
index 078d9a0b..4a80058b 100644
--- a/buyer/vue.config.js
+++ b/buyer/vue.config.js
@@ -1,9 +1,3 @@
-/*
- * @Author: LMR
- * @Date: 2020-08-11 10:53:53
- * @Last Modified by: LMR
- * @Last Modified time: 2020-08-11 11:26:19
- */
// 关闭eslint
module.exports = {
diff --git a/manager/package.json b/manager/package.json
index 41910b3f..282a442f 100644
--- a/manager/package.json
+++ b/manager/package.json
@@ -12,42 +12,25 @@
"dependencies": {
"@amap/amap-jsapi-loader": "0.0.7",
"@antv/g2": "^4.1.12",
- "apexcharts": "^3.26.0",
"axios": "^0.21.1",
"core-js": "^3.6.5",
- "countup.js": "^2.0.4",
- "date-fns": "^1.30.1",
"dplayer": "^1.26.0",
- "gitalk": "^1.6.2",
- "html2canvas": "^1.0.0-rc.5",
- "iview-area": "^1.6.0",
"js-cookie": "^2.2.1",
"node-sass": "^4.14.1",
- "pinyin": "^2.9.0",
- "print-js": "^1.0.63",
- "qrcodejs2": "0.0.2",
"sass-loader": "^8.0.2",
"sockjs-client": "^1.4.0",
- "stompjs": "^2.3.3",
"swiper": "^6.3.5",
"uuid": "^8.3.2",
"view-design": "^4.2.0",
"vue": "^2.6.10",
- "vue-apexcharts": "^1.5.1",
- "vue-awesome": "^4.0.2",
"vue-awesome-swiper": "^4.1.1",
- "vue-clipboard2": "^0.3.0",
- "vue-cropper": "^0.4.9",
"vue-i18n": "^8.15.1",
"vue-json-excel": "^0.3.0",
- "vue-json-pretty": "^1.4.1",
- "vue-lazyload": "^1.3.3",
"vue-qr": "^2.3.0",
"vue-router": "^3.1.3",
"vuedraggable": "^2.23.2",
"vuex": "^3.4.0",
"wangeditor": "^4.7.5",
- "xlsx": "^0.16.2",
"xss": "^1.0.7"
},
"devDependencies": {
@@ -61,6 +44,7 @@
"less-loader": "^6.2.0",
"style-loader": "^2.0.0",
"style-resources-loader": "^1.3.2",
+ "uglifyjs-webpack-plugin": "^2.2.0",
"vue-cli-plugin-style-resources-loader": "^0.1.4",
"vue-template-compiler": "^2.6.10"
}
diff --git a/manager/public/index.html b/manager/public/index.html
index 076d2228..0644d4d7 100644
--- a/manager/public/index.html
+++ b/manager/public/index.html
@@ -1,107 +1,86 @@
-
-
-
-
-
-
- lili admin
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- We're sorry but lili-admin doesn't work properly without JavaScript enabled. Please enable it to
- continue.
-
-
-
-
-
-
+ .half-circle-spinner {
+ width: 35px;
+ height: 35px;
+ border-radius: 100%;
+ position: relative;
+ }
+
+ .half-circle-spinner .circle {
+ content: "";
+ position: absolute;
+ width: 100%;
+ height: 100%;
+ border-radius: 100%;
+ border: calc(35px / 10) solid transparent;
+ }
+
+ .half-circle-spinner .circle.circle-1 {
+ border-top-color: #5cadff;
+ animation: half-circle-spinner-animation 1s infinite;
+ }
+
+ .half-circle-spinner .circle.circle-2 {
+ border-bottom-color: #5cadff;
+ animation: half-circle-spinner-animation 1s infinite alternate;
+ }
+
+ @keyframes half-circle-spinner-animation {
+ 0% {
+ transform: rotate(0deg);
+ }
+
+ 100% {
+ transform: rotate(360deg);
+ }
+ }
+
+
+
+
+ <% for(var js of htmlWebpackPlugin.options.cdn.js) { %>
+
+ <% } %>
+
+ We're sorry but lili-admin doesn't work properly without JavaScript
+ enabled. Please enable it to continue.
+
+
-
-
-
-
+