From 2391f71d9aab33e1cdbe151d4693dfc36e29f59b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com> Date: Wed, 23 Jun 2021 18:08:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2ui=E4=BB=A5=E5=8F=8Abug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buyer/src/pages/forgetPassword.vue | 8 +- manager/src/config/index.js | 16 +- .../views/distribution/distributionGoods.vue | 4 +- manager/src/views/main-components/footer.vue | 2 +- .../views/page/article-manage/articleList.vue | 19 +- manager/src/views/promotion/coupon/coupon.vue | 2 +- .../promotion/pointsGoods/pointsGoods.vue | 135 ++--- seller/src/views/goods/goods-seller/goods.vue | 38 +- seller/src/views/login.vue | 2 +- seller/src/views/main-components/footer.vue | 8 +- seller/src/views/order/order/orderList.vue | 7 +- .../views/order/order/virtualOrderList.vue | 5 +- .../views/order/receiptManager/receipt.vue | 500 ++++++++---------- seller/src/views/promotion/live/addLive.vue | 4 +- .../src/views/promotion/pintuan/pintuan.scss | 34 +- .../src/views/promotion/pintuan/pintuan.vue | 2 + 16 files changed, 324 insertions(+), 462 deletions(-) diff --git a/buyer/src/pages/forgetPassword.vue b/buyer/src/pages/forgetPassword.vue index 511cffb3..322c6e50 100644 --- a/buyer/src/pages/forgetPassword.vue +++ b/buyer/src/pages/forgetPassword.vue @@ -93,13 +93,13 @@
- 帮助 - 隐私 - 条款 + 帮助 + 隐私 + 条款 Copyright © 2020 - Present - lili-shop 版权所有 diff --git a/manager/src/config/index.js b/manager/src/config/index.js index 8b6b162f..680fb1b1 100644 --- a/manager/src/config/index.js +++ b/manager/src/config/index.js @@ -17,14 +17,14 @@ export default { * @description api请求基础路径 */ api_dev: { - // common: "https://common-api.pickmall.cn", - // buyer: "https://buyer-api.pickmall.cn", - // seller: "https://store-api.pickmall.cn", - // manager: "https://admin-api.pickmall.cn" - common: 'http://192.168.0.109:8890', - buyer: 'http://192.168.0.109:8888', - seller: 'http://192.168.0.109:8889', - manager: 'http://192.168.0.109:8887' + common: "https://common-api.pickmall.cn", + buyer: "https://buyer-api.pickmall.cn", + seller: "https://store-api.pickmall.cn", + manager: "https://admin-api.pickmall.cn" + // common: 'http://192.168.0.109:8890', + // buyer: 'http://192.168.0.109:8888', + // seller: 'http://192.168.0.109:8889', + // manager: 'http://192.168.0.109:8887' }, api_prod: { common: "https://common-api.pickmall.cn", diff --git a/manager/src/views/distribution/distributionGoods.vue b/manager/src/views/distribution/distributionGoods.vue index a78c5830..05acecf5 100644 --- a/manager/src/views/distribution/distributionGoods.vue +++ b/manager/src/views/distribution/distributionGoods.vue @@ -67,10 +67,12 @@ export default { { type: "selection", width: 60, - align: "center" + align: "center", + fixed: "left", }, { title: "商品图片", + fixed: "left", key: "thumbnail", width: 120, align: "center", diff --git a/manager/src/views/main-components/footer.vue b/manager/src/views/main-components/footer.vue index 666ae443..e471877c 100644 --- a/manager/src/views/main-components/footer.vue +++ b/manager/src/views/main-components/footer.vue @@ -8,7 +8,7 @@ Copyright © 2020 - Present lili-shop {{ $t('rights') }} diff --git a/manager/src/views/page/article-manage/articleList.vue b/manager/src/views/page/article-manage/articleList.vue index 360492c8..cc66d389 100644 --- a/manager/src/views/page/article-manage/articleList.vue +++ b/manager/src/views/page/article-manage/articleList.vue @@ -57,7 +57,7 @@ - + @@ -435,28 +435,13 @@ export default { this.form.categoryId = res.result.categoryId; this.treeValue = data.articleCategoryName; this.form.id = data.id; - this.form.content = htmlEscape(res.result.content); + this.form.content =res.result.content; this.form.title = res.result.title; this.form.sort = res.result.sort; this.form.openStatus = res.result.openStatus; } }); }, - - htmlEscape(text) { - return text.replace(/[<>"&]/g, function (match, pos, originalText) { - switch (match) { - case "<": - return "<"; - case ">": - return ">"; - case "&": - return "&"; - case '"': - return """; - } - }); - }, remove(v) { this.$Modal.confirm({ title: "确认删除", diff --git a/manager/src/views/promotion/coupon/coupon.vue b/manager/src/views/promotion/coupon/coupon.vue index 306a25af..b39dd19d 100644 --- a/manager/src/views/promotion/coupon/coupon.vue +++ b/manager/src/views/promotion/coupon/coupon.vue @@ -161,7 +161,7 @@ export default { }, { title: "活动时间", - + width: 150, render: (h, params) => { if (params.row.getType === "ACTIVITY") { return h("div", "长期有效"); diff --git a/manager/src/views/promotion/pointsGoods/pointsGoods.vue b/manager/src/views/promotion/pointsGoods/pointsGoods.vue index dd209a87..fcb82b30 100644 --- a/manager/src/views/promotion/pointsGoods/pointsGoods.vue +++ b/manager/src/views/promotion/pointsGoods/pointsGoods.vue @@ -2,78 +2,37 @@
-
+ - + - + - - + - +
- + - +
- +
@@ -159,55 +85,62 @@ export default { pageSize: 10, // 页面大小 order: "desc", // 默认排序方式 }, - statusList: [ // 活动状态 + statusList: [ + // 活动状态 { label: "未开始", value: "NEW" }, { label: "已开始", value: "START" }, { label: "已结束", value: "END" }, { label: "已关闭", value: "CLOSE" }, ], - columns: [ // 表头 + columns: [ + // 表头 { title: "商品名称", slot: "goodsName", - minWidth: 120, + minWidth: 150, + fixed: "left", tooltip: true, }, { title: "市场价", slot: "price", + width: 100, }, { title: "结算价", slot: "settlementPrice", + width: 100, }, - { - title: "分类", - key: "pointsGoodsCategoryName", - }, + { title: "库存数量", slot: "quantity", + width: 100, }, { title: "活动剩余库存", key: "activeStock", + width: 150, }, { title: "兑换积分", key: "points", + width: 100, }, { title: "所属店铺", key: "storeName", + width: 100, }, { title: "活动开始时间", slot: "startTime", - minWidth:100 + minWidth: 150, }, { title: "状态", key: "promotionStatus", + width: 100, render: (h, params) => { let text = "未知", color = ""; @@ -227,10 +160,16 @@ export default { return h("div", [h("Tag", { props: { color: color } }, text)]); }, }, + { + title: "分类", + key: "pointsGoodsCategoryName", + width: 100, + }, { title: "操作", slot: "action", align: "center", + fixed: "right", width: 150, }, ], @@ -327,5 +266,5 @@ export default { }; diff --git a/seller/src/views/goods/goods-seller/goods.vue b/seller/src/views/goods/goods-seller/goods.vue index df95601d..5952cb47 100644 --- a/seller/src/views/goods/goods-seller/goods.vue +++ b/seller/src/views/goods/goods-seller/goods.vue @@ -4,7 +4,7 @@
- + - + @@ -55,8 +55,7 @@
- +
@@ -67,15 +66,21 @@ - + - -
+ + +
+ + + + + +
@@ -86,8 +91,7 @@ - + 卖家承担运费 @@ -259,9 +263,9 @@ export default { key: "goodsType", width: 130, render: (h, params) => { - if (params.row.goodsType === 'PHYSICAL_GOODS') { + if (params.row.goodsType === "PHYSICAL_GOODS") { return h("div", "实物商品"); - } else if (params.row.goodsType === 'VIRTUAL_GOODS') { + } else if (params.row.goodsType === "VIRTUAL_GOODS") { return h("div", "虚拟商品"); } else { return h("div", "电子卡券"); @@ -455,10 +459,10 @@ export default { this.getDataList(); }, addGoods() { - this.$router.push({name: "goods-operation"}); + this.$router.push({ name: "goods-operation" }); }, editGoods(v) { - this.$router.push({name: "goods-operation-edit", query: {id: v.id}}); + this.$router.push({ name: "goods-operation-edit", query: { id: v.id } }); }, //批量操作 @@ -481,7 +485,7 @@ export default { } }, getStockDetail(id) { - getGoodsSkuListDataSeller({goodsId: id, pageSize: 1000}).then((res) => { + getGoodsSkuListDataSeller({ goodsId: id, pageSize: 1000 }).then((res) => { if (res.success) { this.updateStockModalVisible = true; this.stockAllUpdate = undefined; @@ -491,7 +495,7 @@ export default { }, updateStock() { let updateStockList = this.stockList.map((i) => { - let j = {skuId: i.id, quantity: i.quantity}; + let j = { skuId: i.id, quantity: i.quantity }; if (this.stockAllUpdate) { j.quantity = this.stockAllUpdate; } diff --git a/seller/src/views/login.vue b/seller/src/views/login.vue index bb014b1a..a1bd088a 100644 --- a/seller/src/views/login.vue +++ b/seller/src/views/login.vue @@ -162,7 +162,7 @@ export default { } .login { height: 100%; - background: url("../assets/background.svg") no-repeat; + background: url("../assets/background.png") no-repeat; background-size: 100%; background-position-y: bottom; background-color: #edf0f3; diff --git a/seller/src/views/main-components/footer.vue b/seller/src/views/main-components/footer.vue index 4df03af6..c1fb9ba6 100644 --- a/seller/src/views/main-components/footer.vue +++ b/seller/src/views/main-components/footer.vue @@ -1,14 +1,14 @@ diff --git a/seller/src/views/promotion/live/addLive.vue b/seller/src/views/promotion/live/addLive.vue index 8f1ee673..5dcd9529 100644 --- a/seller/src/views/promotion/live/addLive.vue +++ b/seller/src/views/promotion/live/addLive.vue @@ -517,7 +517,7 @@ export default { if (res.success) { this.$Message.success("修改成功!"); - this.$router.push({ path: "/storePromotion/live" }); + this.$router.push({ path: "/promotion/live" }); } this.spinShow = false; }); @@ -528,7 +528,7 @@ export default { if (res.success) { this.$Message.success("添加成功!"); - this.$router.push({ path: "/storePromotion/live" }); + this.$router.push({ path: "/promotion/live" }); } this.spinShow = false; }); diff --git a/seller/src/views/promotion/pintuan/pintuan.scss b/seller/src/views/promotion/pintuan/pintuan.scss index a1f97b1f..c80994d4 100644 --- a/seller/src/views/promotion/pintuan/pintuan.scss +++ b/seller/src/views/promotion/pintuan/pintuan.scss @@ -1,41 +1,11 @@ - .search { .operation { margin-bottom: 2vh; } - - .select-count { - font-weight: 600; - color: #40a9ff; - } - - .select-clear { - margin-left: 10px; - } - .page { margin-top: 2vh; } - - .drop-down { - margin-left: 5px; - } } - -.newPromotionView { - width: 80%; - flex-direction: column; - align-items: center; - justify-content: center; - - - Input { - flex-direction: row; - } - - .slotSpan { - flex-direction: column; - align-items: center; - justify-content: center; - } +.row { + margin-bottom: 5px; } diff --git a/seller/src/views/promotion/pintuan/pintuan.vue b/seller/src/views/promotion/pintuan/pintuan.vue index 9270a0c6..e05ff24a 100644 --- a/seller/src/views/promotion/pintuan/pintuan.vue +++ b/seller/src/views/promotion/pintuan/pintuan.vue @@ -52,6 +52,7 @@ @on-selection-change="changeSelect" >