From 84cfb265121917e4ec95d0b4f794a99ddc92a3c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Tue, 31 Aug 2021 09:46:18 +0800
Subject: [PATCH 1/7] =?UTF-8?q?i18n=E9=97=AE=E9=A2=98=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
seller/src/main.js | 3 ---
seller/src/views/Main.vue | 2 +-
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/seller/src/main.js b/seller/src/main.js
index 99dc25c8..f7ec69e2 100644
--- a/seller/src/main.js
+++ b/seller/src/main.js
@@ -1,11 +1,8 @@
-// The Vue build version to load with the `import` command
-// (runtime-only or standalone) has been set in webpack.base.conf with an alias.
import Vue from "vue";
import ViewUI from "view-design";
import "./styles/theme.less";
import "core-js/stable";
-// import "regenerator-runtime/runtime";
import vueQr from "vue-qr";
import App from "./App";
diff --git a/seller/src/views/Main.vue b/seller/src/views/Main.vue
index eeb0744c..d114954d 100644
--- a/seller/src/views/Main.vue
+++ b/seller/src/views/Main.vue
@@ -24,7 +24,7 @@
- 切换
+ 修改密码
退出
From 71e4c49c3e6a3c63efc5f7831aef55f4524d1e93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Wed, 1 Sep 2021 10:11:12 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E4=BC=98=E5=8C=96cdn=E5=8A=A8=E6=80=81?=
=?UTF-8?q?=E5=8A=A0=E8=BD=BD=E7=AE=A1=E7=90=86=E7=AB=AF=EF=BC=8C=E4=BF=AE?=
=?UTF-8?q?=E5=A4=8D=E7=A0=8D=E4=BB=B7=E9=87=91=E9=A2=9Dbug=EF=BC=8C?=
=?UTF-8?q?=E5=88=A0=E9=99=A4=E9=83=A8=E5=88=86=E4=B8=8D=E8=A7=84=E8=8C=83?=
=?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
manager/package.json | 18 +-
manager/public/index.html | 175 +++--
manager/src/libs/excel.js | 102 ---
manager/src/main.js | 6 +-
manager/src/router/router.js | 2 +-
manager/src/views/customWords/index.vue | 1 -
.../views/distribution/distributionCash.vue | 2 +-
.../views/distribution/distributionGoods.vue | 126 ++--
.../views/distribution/distributionOrder.vue | 5 +-
.../distribution/distributionSetting.vue | 5 +-
manager/src/views/goods-unit/index.vue | 1 -
manager/src/views/goods/goods-info/goods.vue | 4 +
.../src/views/goods/goods-manage/category.vue | 9 +-
manager/src/views/home/home.vue | 3 +-
.../views/lili-floor-renovation/floorList.vue | 4 +-
.../lili-floor-renovation/wap/navbar.vue | 17 +-
.../wap/template/tpl_banner.vue | 2 +-
.../lili-floor-renovation/wap/wapList.vue | 4 +-
manager/src/views/logistics/index.vue | 9 +-
manager/src/views/main-components/footer.vue | 2 +-
manager/src/views/main-components/header.vue | 2 +-
manager/src/views/member/list/index.vue | 22 +-
.../src/views/member/list/memberDetail.vue | 21 +-
.../src/views/member/list/memberRecycle.vue | 535 +++++++-------
.../my-components/lili/department-choose.vue | 1 -
manager/src/views/my-components/map/index.vue | 1 -
.../order/after-order/afterSaleOrder.vue | 5 +-
.../order/after-order/orderComplaint.vue | 7 +-
manager/src/views/order/flow/paymentLog.vue | 4 +-
manager/src/views/order/order/orderDetail.vue | 14 +-
manager/src/views/order/order/orderList.vue | 2 +-
.../page/article-manage/ArticleCategory.vue | 1 +
.../views/page/article-manage/articleList.vue | 4 +-
.../views/page/article-manage/hotWords.vue | 24 +-
manager/src/views/promotion/coupon/coupon.vue | 6 +-
.../promotion/couponActivity/couponInfo.vue | 3 +-
.../src/views/promotion/fullCut/full-cut.vue | 89 +--
.../views/promotion/fullCut/fullCutDetail.vue | 5 +-
.../kanjia/kanjiaActivityAddGoods.vue | 653 +++++++++---------
.../kanjia/kanjiaActivityEditGoods.vue | 11 +-
.../promotion/kanjia/kanjiaActivityGoods.vue | 495 +++++++------
manager/src/views/promotion/live/live.vue | 2 +-
.../src/views/promotion/pintuan/pintuan.vue | 1 +
.../views/promotion/pintuan/pintuanGoods.vue | 2 -
.../promotion/pointsGoods/pointsGoods.vue | 4 +
.../pointsGoodsCategory.vue | 1 +
.../src/views/promotion/seckill/seckill.vue | 29 +-
manager/src/views/seller/bill/bill-detail.vue | 1 +
manager/src/views/seller/shop/shopDetail.vue | 2 +-
manager/src/views/statistics/order.vue | 2 +-
.../src/views/sys/app-version/appVersion.vue | 2 +-
manager/src/views/sys/message/sms.vue | 1 +
.../src/views/sys/oss-manage/ossManage.vue | 2 +-
.../src/views/sys/role-manage/roleManage.vue | 32 +-
.../src/views/sys/user-manage/userManage.vue | 1 -
manager/vue.config.js | 98 ++-
seller/package.json | 1 +
seller/src/libs/excel.js | 102 ---
seller/vue.config.js | 23 +-
59 files changed, 1181 insertions(+), 1527 deletions(-)
delete mode 100644 manager/src/libs/excel.js
delete mode 100644 seller/src/libs/excel.js
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
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ .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) { %>
+
+ <% } %>
+
+
-
-
-
-
+