From cf26fd59ffb33a899d15162af0b3e393109a5f71 Mon Sep 17 00:00:00 2001 From: xh-pan1 Date: Thu, 18 May 2023 20:48:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- .../components/toolBar/BasicsComp/assistDiv.vue | 1 + .../components/toolBar/BasicsComp/brandList.vue | 4 +- .../components/toolBar/BasicsComp/customTool.vue | 2 + .../components/toolBar/BasicsComp/imageText.vue | 2 +- .../toolBar/BasicsComp/imageTextList.vue | 7 +- .../components/toolBar/BasicsComp/imageTextNav.vue | 2 +- .../components/toolBar/BasicsComp/shopTop.vue | 2 +- .../components/toolBar/BasicsComp/textTool.vue | 5 +- .../components/toolBar/BasicsComp/videoTool.vue | 4 +- .../components/toolBar/goodsComp/categoryTool.vue | 2 +- .../toolBar/toolModule/coupon-select.vue | 2 +- .../toolBar/toolModule/custom-page-select.vue | 2 +- .../toolBar/toolModule/product-select.vue | 2 +- .../components/toolBar/toolModule/shop-select.vue | 2 +- package.json | 7 +- src/layout/components/Navbar.vue | 6 +- src/views/active/getActive.vue | 5 +- src/views/active/index.vue | 2 +- .../commodity/commodityList/commodityGroup.vue | 11 +- src/views/commodity/commodityList/index.vue | 2 +- .../commodity/commoditySystem/addCommodity.vue | 6 +- .../commodity/commoditySystem/addComponent.vue | 22 +-- src/views/commodity/commoditySystem/index.vue | 15 +- src/views/customer/addClustering.vue | 2 +- src/views/customer/addOperate.vue | 2 +- src/views/customer/clusteringList/index.vue | 6 +- src/views/customer/customerList/customerDetail.vue | 1 + src/views/customer/customerList/index.vue | 5 +- src/views/customer/operate/index.vue | 4 +- src/views/customer/tagList.vue | 7 +- src/views/customerService/service/index.vue | 2 +- src/views/customerService/setting/index.vue | 4 +- src/views/distributor/achievement/humens.vue | 4 +- src/views/distributor/achievement/order.vue | 6 +- src/views/distributor/achievement/programme.vue | 16 +-- src/views/distributor/customer/popSearch.vue | 8 +- src/views/distributor/customer/popSys.vue | 4 +- src/views/distributor/personnel/list.vue | 6 +- src/views/distributor/personnel/msg.vue | 4 +- src/views/distributor/personnel/sys.vue | 4 +- src/views/finance/account/index.vue | 4 +- src/views/finance/list/index.vue | 2 +- src/views/liveMenu/liveProduct/index.vue | 16 ++- src/views/liveMenu/liveRoom/index.vue | 5 + src/views/login/index.vue | 3 + src/views/marketing/channelActivity/form.vue | 6 +- .../channelActivity/selectChannelCoupons.vue | 1 + .../channelCoupons/components/couponSelect.vue | 2 +- .../channelCoupons/components/productSelect.vue | 2 +- src/views/marketing/channelCoupons/index.vue | 2 +- src/views/marketing/channelManage/add.vue | 152 +++++++++++---------- src/views/marketing/channelManage/index.vue | 10 +- src/views/marketing/compose/add.vue | 3 +- src/views/marketing/coupon/add.vue | 136 +++++++++++------- src/views/marketing/coupon/index.vue | 6 +- src/views/marketing/discount/add.vue | 46 ++++--- src/views/marketing/discount/index.vue | 8 +- src/views/marketing/group/add.vue | 42 ++++-- src/views/marketing/group/index.vue | 6 +- src/views/marketing/mixin/index.js | 13 +- src/views/marketing/price/add.vue | 3 +- src/views/marketing/scene/add.vue | 4 +- src/views/marketing/spike/add.vue | 38 ++++-- src/views/marketing/spike/index.vue | 6 +- src/views/order/aftersale/afterDetails.vue | 4 +- src/views/order/aftersale/index.vue | 2 +- src/views/order/pending/components/changePrice.vue | 1 + src/views/order/pending/index.vue | 2 +- src/views/order/pending/pendDetails.vue | 1 + src/views/setup/phone/index.vue | 2 + src/views/setup/privacy/index.vue | 1 + src/views/setup/role/index.vue | 6 +- src/views/setup/tabs/index.vue | 10 +- src/views/setup/user/index.vue | 13 +- src/views/system/logistics/Edit.vue | 37 ++--- src/views/system/logistics/index.vue | 2 +- src/views/system/shopCrossDetail/index.vue | 8 +- src/views/system/shopSys/edit.vue | 14 +- src/views/system/shopSys/index.vue | 14 +- src/views/tree/index.vue | 2 +- 81 files changed, 503 insertions(+), 334 deletions(-) diff --git a/README.md b/README.md index 8afc8a3..50f870a 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ npm install # 启动服务 localhost:8013 npm run dev -``` + #### 常见问题 diff --git a/canvas-container/components/toolBar/BasicsComp/assistDiv.vue b/canvas-container/components/toolBar/BasicsComp/assistDiv.vue index 44226be..352fc60 100644 --- a/canvas-container/components/toolBar/BasicsComp/assistDiv.vue +++ b/canvas-container/components/toolBar/BasicsComp/assistDiv.vue @@ -21,6 +21,7 @@ :show-input-controls=false input-size="mini" v-model="activeComponent.componentContent.height" + :max="1000" show-input> diff --git a/canvas-container/components/toolBar/BasicsComp/brandList.vue b/canvas-container/components/toolBar/BasicsComp/brandList.vue index dc9685d..3d5ba24 100644 --- a/canvas-container/components/toolBar/BasicsComp/brandList.vue +++ b/canvas-container/components/toolBar/BasicsComp/brandList.vue @@ -4,7 +4,7 @@
- +
@@ -39,7 +39,7 @@
- +
删除内容
diff --git a/canvas-container/components/toolBar/BasicsComp/customTool.vue b/canvas-container/components/toolBar/BasicsComp/customTool.vue index e63f657..d957a23 100644 --- a/canvas-container/components/toolBar/BasicsComp/customTool.vue +++ b/canvas-container/components/toolBar/BasicsComp/customTool.vue @@ -15,6 +15,7 @@ :show-input-controls=false input-size="mini" v-model="activeComponent.componentContent.imgClearance" + :max="1000" show-input>
@@ -26,6 +27,7 @@ :show-input-controls=false input-size="mini" v-model="activeComponent.componentContent.pageSpacing" + :max="1000" show-input> diff --git a/canvas-container/components/toolBar/BasicsComp/imageText.vue b/canvas-container/components/toolBar/BasicsComp/imageText.vue index e961dbd..46f0125 100644 --- a/canvas-container/components/toolBar/BasicsComp/imageText.vue +++ b/canvas-container/components/toolBar/BasicsComp/imageText.vue @@ -8,7 +8,7 @@
文本设置
- +
diff --git a/canvas-container/components/toolBar/BasicsComp/imageTextList.vue b/canvas-container/components/toolBar/BasicsComp/imageTextList.vue index e2a8286..d859a63 100644 --- a/canvas-container/components/toolBar/BasicsComp/imageTextList.vue +++ b/canvas-container/components/toolBar/BasicsComp/imageTextList.vue @@ -4,7 +4,7 @@
- +
@@ -46,7 +46,7 @@
- +
@@ -55,7 +55,8 @@ :rows="2" placeholder="请输入内容" resize="none" - v-model="item.describe"> + v-model="item.describe" + maxlength="200">
diff --git a/canvas-container/components/toolBar/BasicsComp/imageTextNav.vue b/canvas-container/components/toolBar/BasicsComp/imageTextNav.vue index fe35c21..62cf347 100644 --- a/canvas-container/components/toolBar/BasicsComp/imageTextNav.vue +++ b/canvas-container/components/toolBar/BasicsComp/imageTextNav.vue @@ -22,7 +22,7 @@
- +
diff --git a/canvas-container/components/toolBar/BasicsComp/shopTop.vue b/canvas-container/components/toolBar/BasicsComp/shopTop.vue index b6a5140..be996ac 100644 --- a/canvas-container/components/toolBar/BasicsComp/shopTop.vue +++ b/canvas-container/components/toolBar/BasicsComp/shopTop.vue @@ -71,7 +71,7 @@
- +
diff --git a/canvas-container/components/toolBar/BasicsComp/textTool.vue b/canvas-container/components/toolBar/BasicsComp/textTool.vue index 9f8b939..93f8b72 100644 --- a/canvas-container/components/toolBar/BasicsComp/textTool.vue +++ b/canvas-container/components/toolBar/BasicsComp/textTool.vue @@ -4,7 +4,7 @@
- +
@@ -13,7 +13,8 @@ :rows="2" placeholder="请输入内容" resize="none" - v-model="activeComponent.componentContent.describe"> + v-model="activeComponent.componentContent.describe" + maxlength="200">
diff --git a/canvas-container/components/toolBar/BasicsComp/videoTool.vue b/canvas-container/components/toolBar/BasicsComp/videoTool.vue index 34b7b21..b04c335 100644 --- a/canvas-container/components/toolBar/BasicsComp/videoTool.vue +++ b/canvas-container/components/toolBar/BasicsComp/videoTool.vue @@ -4,7 +4,7 @@
- +
@@ -18,7 +18,7 @@
- +
diff --git a/canvas-container/components/toolBar/goodsComp/categoryTool.vue b/canvas-container/components/toolBar/goodsComp/categoryTool.vue index 2284345..34002af 100644 --- a/canvas-container/components/toolBar/goodsComp/categoryTool.vue +++ b/canvas-container/components/toolBar/goodsComp/categoryTool.vue @@ -4,7 +4,7 @@
- +
添加类别
diff --git a/canvas-container/components/toolBar/toolModule/coupon-select.vue b/canvas-container/components/toolBar/toolModule/coupon-select.vue index 530edcc..3b4dc36 100644 --- a/canvas-container/components/toolBar/toolModule/coupon-select.vue +++ b/canvas-container/components/toolBar/toolModule/coupon-select.vue @@ -2,7 +2,7 @@
- + 查询 diff --git a/canvas-container/components/toolBar/toolModule/custom-page-select.vue b/canvas-container/components/toolBar/toolModule/custom-page-select.vue index 2edf89c..6a0f562 100644 --- a/canvas-container/components/toolBar/toolModule/custom-page-select.vue +++ b/canvas-container/components/toolBar/toolModule/custom-page-select.vue @@ -2,7 +2,7 @@
- + 查询 diff --git a/canvas-container/components/toolBar/toolModule/product-select.vue b/canvas-container/components/toolBar/toolModule/product-select.vue index d3a5bd8..60dcbb6 100644 --- a/canvas-container/components/toolBar/toolModule/product-select.vue +++ b/canvas-container/components/toolBar/toolModule/product-select.vue @@ -2,7 +2,7 @@
- + diff --git a/canvas-container/components/toolBar/toolModule/shop-select.vue b/canvas-container/components/toolBar/toolModule/shop-select.vue index 0744c74..1a875d9 100644 --- a/canvas-container/components/toolBar/toolModule/shop-select.vue +++ b/canvas-container/components/toolBar/toolModule/shop-select.vue @@ -2,7 +2,7 @@
- + 查询 diff --git a/package.json b/package.json index 84b633e..61a3d7f 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ }, "dependencies": { "axios": "0.18.1", - "core-js": "^3.28.0", + "core-js": "3.6.5", "echarts": "^4.8.0", "element-ui": "2.13.2", "es6-promise": "^4.2.8", @@ -24,17 +24,13 @@ "normalize.css": "7.0.0", "nprogress": "0.2.0", "path-to-regexp": "2.4.0", - "quill": "^1.3.7", - "regenerator-runtime": "^0.13.11", "screenfull": "^5.0.2", - "svg-baker-runtime": "^1.4.7", "swiper": "^5.4.5", "vue": "2.6.10", "vue-awesome-swiper": "^4.1.0", "vue-lang": "^0.2.5", "vue-quill-editor": "^3.0.6", "vue-router": "3.0.6", - "vue-style-loader": "^4.1.3", "vuedraggable": "^2.24.3", "vuex": "3.1.0" }, @@ -60,7 +56,6 @@ "serve-static": "1.13.2", "svg-sprite-loader": "4.1.3", "svgo": "1.2.2", - "vue-quill-editor": "^3.0.6", "vue-template-compiler": "2.6.10" }, "browserslist": [ diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 6eefb93..e568231 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -65,13 +65,13 @@ > - + - + - + diff --git a/src/views/active/getActive.vue b/src/views/active/getActive.vue index c953ee9..1649222 100644 --- a/src/views/active/getActive.vue +++ b/src/views/active/getActive.vue @@ -40,6 +40,7 @@