From 011bcae11aa03a36fc7d31e3ef5e89b46582f11b Mon Sep 17 00:00:00 2001 From: Chopper Date: Thu, 3 Jun 2021 16:42:13 +0800 Subject: [PATCH 01/35] =?UTF-8?q?=E5=BA=97=E9=93=BA=E5=AF=B9=E8=B4=A6?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E9=BB=98=E8=AE=A4=E5=80=BC=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manager/src/views/seller/bill/accountStatementBill.vue | 2 +- seller/src/views/shop/bill/accountStatementBill.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/manager/src/views/seller/bill/accountStatementBill.vue b/manager/src/views/seller/bill/accountStatementBill.vue index 8ef67236..bf494d0f 100644 --- a/manager/src/views/seller/bill/accountStatementBill.vue +++ b/manager/src/views/seller/bill/accountStatementBill.vue @@ -189,7 +189,7 @@ export default { (this.searchForm.endTime = this.$options.filters.unixToDate( this.searchForm.endTime / 1000 )); - this.searchForm.billStatus = "OUT"; + this.searchForm.billStatus = "CHECK"; API_Shop.getBuyBillPage(this.searchForm).then((res) => { this.loading = false; if (res.success) { diff --git a/seller/src/views/shop/bill/accountStatementBill.vue b/seller/src/views/shop/bill/accountStatementBill.vue index 6e62f342..e944f432 100644 --- a/seller/src/views/shop/bill/accountStatementBill.vue +++ b/seller/src/views/shop/bill/accountStatementBill.vue @@ -225,7 +225,7 @@ }, getDataList() { this.loading = true; - this.searchForm.billStatus = "CHECK" + this.searchForm.billStatus = "OUT" API_Shop.getBillPage(this.searchForm).then((res) => { this.loading = false; if (res.success) { From 43b4c041e4d2e8e523dc1643a638141e54521094 Mon Sep 17 00:00:00 2001 From: mabo Date: Thu, 3 Jun 2021 17:37:36 +0800 Subject: [PATCH 02/35] =?UTF-8?q?=E5=8F=91=E5=B8=83=E5=95=86=E5=93=81?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E5=88=A0=E9=99=A4=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- seller/src/views/goods/goods-seller/goodsOperation.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seller/src/views/goods/goods-seller/goodsOperation.vue b/seller/src/views/goods/goods-seller/goodsOperation.vue index 1458178b..bb794f9b 100644 --- a/seller/src/views/goods/goods-seller/goodsOperation.vue +++ b/seller/src/views/goods/goods-seller/goodsOperation.vue @@ -61,7 +61,7 @@

@@ -21,18 +21,22 @@ export default { props: ["res"], mounted() { console.log(this.res); - } + }, }; \ No newline at end of file +.view-height-75 { + .image-mode { + height: 75px; + } +} + diff --git a/manager/src/views/login.vue b/manager/src/views/login.vue index d2ea2e2f..f428e847 100644 --- a/manager/src/views/login.vue +++ b/manager/src/views/login.vue @@ -23,12 +23,7 @@ - +
@@ -48,7 +43,7 @@ import LangSwitch from "@/views/main-components/lang-switch"; import RectLoading from "@/views/my-components/lili/rect-loading"; import CountDownButton from "@/views/my-components/lili/count-down-button"; import util from "@/libs/util.js"; -import verify from '@/views/my-components/verify'; +import verify from "@/views/my-components/verify"; export default { components: { @@ -57,18 +52,20 @@ export default { LangSwitch, Header, Footer, - verify + verify, }, data() { return { loading: false, // 加载状态 - form: { // 表单数据 + form: { + // 表单数据 username: "", password: "", mobile: "", code: "", }, - rules: { // 验证规则 + rules: { + // 验证规则 username: [ { required: true, @@ -88,7 +85,8 @@ export default { }, methods: { mounted() {}, - afterLogin(res) { // 登录成功后处理 + afterLogin(res) { + // 登录成功后处理 let accessToken = res.result.accessToken; let refreshToken = res.result.refreshToken; this.setStore("accessToken", accessToken); @@ -109,28 +107,35 @@ export default { } }); }, - submitLogin() { // 登录操作 + submitLogin() { + // 登录操作 this.$refs.usernameLoginForm.validate((valid) => { if (valid) { this.$refs.verify.show = true; } }); }, - verifyChange (con) { // 拼图验证码回显 + verifyChange(con) { + // 拼图验证码回显 if (!con.status) return; - + this.loading = true; login({ username: this.form.username, password: this.md5(this.form.password), - }).then((res) => { - if (res && res.success) { - this.afterLogin(res); - } else { + }) + .then((res) => { + if (res && res.success) { + this.afterLogin(res); + } else { + this.loading = false; + } + }) + .catch(() => { this.loading = false; - } - }).catch(()=>{this.loading = false}); - } + }); + this.$refs.verify.show = false; + }, }, }; @@ -154,7 +159,7 @@ export default { position: relative; zoom: 1; } - .verify-con{ + .verify-con { position: absolute; top: 90px; z-index: 10; @@ -198,5 +203,4 @@ export default { .flex { justify-content: center; } - diff --git a/manager/src/views/main-components/header.vue b/manager/src/views/main-components/header.vue index dcfef0bd..1eeb107b 100644 --- a/manager/src/views/main-components/header.vue +++ b/manager/src/views/main-components/header.vue @@ -2,7 +2,6 @@
-
@@ -15,13 +14,13 @@ export default { diff --git a/manager/src/views/my-components/lili/editor.vue b/manager/src/views/my-components/lili/editor.vue index bc7811a2..697bc9ed 100644 --- a/manager/src/views/my-components/lili/editor.vue +++ b/manager/src/views/my-components/lili/editor.vue @@ -15,20 +15,8 @@ - - + +
@@ -56,21 +44,21 @@ export default { props: { id: { type: String, - default: "editor" + default: "editor", }, value: String, base64: { type: Boolean, - default: false + default: false, }, showExpand: { type: Boolean, - default: true + default: true, }, openXss: { type: Boolean, - default: false - } + default: false, + }, }, data() { return { @@ -79,16 +67,17 @@ export default { dataEdit: "", // 编辑数据 showHTMLModal: false, // 显示html full: false, // html全屏开关 - fullscreenModal: false // 显示全屏预览 + fullscreenModal: false, // 显示全屏预览 }; }, methods: { + initEditor() { let that = this; // 详见wangeditor3官网文档 https://www.kancloud.cn/wangfupeng/wangeditor3/332599 editor = new E(`#${this.id}`); // 编辑内容绑定数据 - editor.config.onchange = html => { + editor.config.onchange = (html) => { if (this.openXss) { this.data = xss(html); } else { @@ -108,30 +97,30 @@ export default { editor.config.uploadImgServer = uploadFile; // lili如要header中传入token鉴权 editor.config.uploadImgHeaders = { - accessToken: that.getStore("accessToken") + accessToken: that.getStore("accessToken"), }; editor.config.uploadFileName = "file"; editor.config.uploadImgHooks = { - before: function(xhr, editor, files) { + before: function (xhr, editor, files) { // 图片上传之前触发 }, - success: function(xhr, editor, result) { + success: function (xhr, editor, result) { // 图片上传并返回结果，图片插入成功之后触发 }, - fail: function(xhr, editor, result) { + fail: function (xhr, editor, result) { // 图片上传并返回结果，但图片插入错误时触发 that.$Message.error("上传图片失败"); }, - error: function(xhr, editor) { + error: function (xhr, editor) { // 图片上传出错时触发 that.$Message.error("上传图片出错"); }, - timeout: function(xhr, editor) { + timeout: function (xhr, editor) { // 图片上传超时时触发 that.$Message.error("上传图片超时"); }, // 如果服务器端返回的不是 {errno:0, data: [...]} 这种格式，可使用该配置 - customInsert: function(insertImg, result, editor) { + customInsert: function (insertImg, result, editor) { if (result.success == true) { let url = result.result; insertImg(url); @@ -139,10 +128,11 @@ export default { } else { that.$Message.error(result.message); } - } + }, }; } - editor.config.customAlert = function(info) { + + editor.config.customAlert = function (info) { // info 是需要提示的内容 // that.$Message.info(info); }; @@ -156,8 +146,8 @@ export default { // type -> 'emoji' / 'image' type: "image", // content -> 数组 - content: sina - } + content: sina, + }, ]; editor.create(); if (this.value) { @@ -187,7 +177,7 @@ export default { editor.txt.html(this.data); this.$emit("input", this.data); this.$emit("on-change", this.data); - } + }, }); }, setData(value) { @@ -200,22 +190,21 @@ export default { this.$emit("input", this.data); this.$emit("on-change", this.data); } - } + }, }, watch: { value(val) { this.setData(val); - } + }, }, mounted() { this.initEditor(); - } + }, }; diff --git a/seller/src/views/main-components/header.vue b/seller/src/views/main-components/header.vue index e3727242..5f3bac1a 100644 --- a/seller/src/views/main-components/header.vue +++ b/seller/src/views/main-components/header.vue @@ -1,7 +1,7 @@ @@ -14,13 +14,13 @@ export default { diff --git a/seller/src/views/order/order/exportOrderDeliver.vue b/seller/src/views/order/order/exportOrderDeliver.vue new file mode 100644 index 00000000..ab0d7c51 --- /dev/null +++ b/seller/src/views/order/order/exportOrderDeliver.vue @@ -0,0 +1,122 @@ + + + + + diff --git a/seller/src/views/order/order/orderDetail.vue b/seller/src/views/order/order/orderDetail.vue index cfda0899..740dfa33 100644 --- a/seller/src/views/order/order/orderDetail.vue +++ b/seller/src/views/order/order/orderDetail.vue @@ -527,7 +527,7 @@ export default { orderTakeSubmit() { this.$refs.orderTakeForm.validate((valid) => { if (valid) { - API_Order.orderTake(this.sn, this.orderTakeForm).then((res) => { + API_Order.orderTake(this.sn, this.orderTakeForm.qrCode).then((res) => { if (res.success) { this.$Message.success("订单核销成功"); this.orderTakeModal = false; diff --git a/seller/src/views/order/order/orderList.vue b/seller/src/views/order/order/orderList.vue index 7b53d2c3..9451e16f 100644 --- a/seller/src/views/order/order/orderList.vue +++ b/seller/src/views/order/order/orderList.vue @@ -4,22 +4,10 @@
- + - + - + -
-
+
+ + + +
+

核验订单号

+
+ + +
+
+ + +
+
- +
From eb2b3a66a06da41c20d7d7f3234306a81fa08d30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com> Date: Fri, 11 Jun 2021 09:52:47 +0800 Subject: [PATCH 08/35] =?UTF-8?q?=E5=90=88=E5=B9=B6Master?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manager/src/config/index.js | 16 ++++++++-------- manager/src/views/order/order/orderList.vue | 3 --- 2 files changed, 8 insertions(+), 11 deletions(-) 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/order/order/orderList.vue b/manager/src/views/order/order/orderList.vue index 144cbb69..e3112e29 100644 --- a/manager/src/views/order/order/orderList.vue +++ b/manager/src/views/order/order/orderList.vue @@ -56,10 +56,7 @@ export default { }, data() { return { - // 表格的表头以及内容 - - fields:{ "订单编号":"sn", "下单时间":"createTime", From 0837f5d9d9f986af28c00f80730689299c0acf37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com> Date: Fri, 11 Jun 2021 19:01:05 +0800 Subject: [PATCH 09/35] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buyer/src/plugins/request.js | 2 +- manager/src/views/order/order/orderList.vue | 206 +++++++++++------- manager/src/views/promotion/coupon/coupon.vue | 2 - .../goods/goods-seller/goodsOperation.vue | 1 + .../views/order/order/exportOrderDeliver.vue | 16 +- seller/src/views/order/order/orderList.vue | 16 +- 6 files changed, 149 insertions(+), 94 deletions(-) diff --git a/buyer/src/plugins/request.js b/buyer/src/plugins/request.js index d650d2a7..b937df34 100644 --- a/buyer/src/plugins/request.js +++ b/buyer/src/plugins/request.js @@ -71,7 +71,7 @@ service.interceptors.request.use( let jwtData = JSON.parse( decodeURIComponent(escape(window.atob(accessToken.split(".")[1]))) ); - if (jwtData.exp < new Date().getTime() / 1000) { + if (jwtData.exp < Math.round(new Date() / 1000)) { refresh() } } diff --git a/manager/src/views/order/order/orderList.vue b/manager/src/views/order/order/orderList.vue index e3112e29..19bb9905 100644 --- a/manager/src/views/order/order/orderList.vue +++ b/manager/src/views/order/order/orderList.vue @@ -1,47 +1,58 @@ @@ -57,49 +68,53 @@ export default { data() { return { // 表格的表头以及内容 - fields:{ - "订单编号":"sn", - "下单时间":"createTime", - "客户名称":"memberName", - "客户账号":"", - "收货人":"", - "收货人手机号":"", - "收货人地址":"", - "支付方式":{ + fields: { + 订单编号: "sn", + 下单时间: "createTime", + 客户名称: "memberName", + 客户账号: "", + 收货人: "", + 收货人手机号: "", + 收货人地址: "", + 支付方式: { field: "clientType", - callback:value=>{ + callback: (value) => { if (value == "H5") { - return "移动端" + return "移动端"; } else if (value == "PC") { - return "PC端" - } else if (value== "WECHAT_MP") { - return "小程序端" + return "PC端"; + } else if (value == "WECHAT_MP") { + return "小程序端"; } else if (value == "APP") { - return "移动应用端" + return "移动应用端"; } else { return value; } - } + }, }, - "配送方式":"", - "配送费用":"", - "订单商品金额":"", - "订单优惠金额":"", - "订单应付金额":"", - "商品SKU编号":"", - "商品数量":"groupNum", - "买家备注":"", - "订单状态":"", - "付款状态":{ - field:"payStatus", - callback:value=>{ - return value == "UNPAID" ? "未付款" : value == "PAID" ? "已付款" : "" - } + 配送方式: "", + 配送费用: "", + 订单商品金额: "", + 订单优惠金额: "", + 订单应付金额: "", + 商品SKU编号: "", + 商品数量: "groupNum", + 买家备注: "", + 订单状态: "", + 付款状态: { + field: "payStatus", + callback: (value) => { + return value == "UNPAID" + ? "未付款" + : value == "PAID" + ? "已付款" + : ""; + }, }, - "发货状态":"", - "发票类型":"", - "发票抬头":"", - "店铺":"storeName", + 发货状态: "", + 发票类型: "", + 发票抬头: "", + 店铺: "storeName", }, loading: true, // 表单加载状态 searchForm: { @@ -123,18 +138,14 @@ export default { { title: "订单号", key: "sn", - minWidth: 230, + minWidth: 240, tooltip: true, }, - { - title: "下单时间", - key: "createTime", - width: 200, - }, + { title: "订单来源", key: "clientType", - width: 95, + width: 120, render: (h, params) => { if (params.row.clientType == "H5") { return h("div", {}, "移动端"); @@ -149,15 +160,34 @@ export default { } }, }, + { + title: "订单类型", + key: "orderType", + width: 120, + render: (h, params) => { + if (params.row.orderType == "NORMAL") { + return h("div", [h("span", {}, "普通订单")]); + } else if (params.row.orderType == "PINTUAN") { + return h("div", [h("span", {}, "拼团订单")]); + } else if (params.row.orderType == "GIFT") { + return h("div", [h("span", {}, "赠品订单")]); + } else if (params.row.orderType == "VIRTUAL") { + return h("div", [h("tag", {}, "核验订单")]); + } + }, + }, { title: "买家名称", key: "memberName", - width: 130, + minWidth: 130, + tooltip: true, }, + { title: "订单金额", key: "flowPrice", - minWidth: 120, + minWidth: 100, + tooltip: true, render: (h, params) => { return h( "div", @@ -169,7 +199,7 @@ export default { { title: "订单状态", key: "orderStatus", - width: 95, + minWidth: 100, render: (h, params) => { if (params.row.orderStatus == "UNPAID") { return h("div", [h("span", {}, "未付款")]); @@ -188,12 +218,19 @@ export default { } }, }, + { + title: "下单时间", + key: "createTime", + width: 170, + sortable: true, + sortType: "desc", + }, { title: "操作", key: "action", align: "center", - width: 180, + width: 100, render: (h, params) => { return h("div", [ h( @@ -337,4 +374,11 @@ export default { diff --git a/manager/src/views/promotion/coupon/coupon.vue b/manager/src/views/promotion/coupon/coupon.vue index c49959e7..9e439e8b 100644 --- a/manager/src/views/promotion/coupon/coupon.vue +++ b/manager/src/views/promotion/coupon/coupon.vue @@ -232,9 +232,7 @@ export default { methods: { // 选中优惠券 父级传值 check(val,index) { - this.data[index].___selected = !this.data[index].___selected - this.$emit("selected", val); }, init() { diff --git a/seller/src/views/goods/goods-seller/goodsOperation.vue b/seller/src/views/goods/goods-seller/goodsOperation.vue index dfcac8cc..fc7417d4 100644 --- a/seller/src/views/goods/goods-seller/goodsOperation.vue +++ b/seller/src/views/goods/goods-seller/goodsOperation.vue @@ -381,6 +381,7 @@ +
diff --git a/seller/src/views/order/order/exportOrderDeliver.vue b/seller/src/views/order/order/exportOrderDeliver.vue index cac35602..2340a62b 100644 --- a/seller/src/views/order/order/exportOrderDeliver.vue +++ b/seller/src/views/order/order/exportOrderDeliver.vue @@ -17,8 +17,8 @@
- +

选择或拖拽文件上传

@@ -42,12 +42,15 @@ \ No newline at end of file +.show-content { + margin-left: 150px; + margin-top: 60px; +} +.ghost { + background: #fff; + height: 30px; + position: relative; + &::after { + content: "松开鼠标添加模块"; + position: absolute; + background: #fff; + border: 1px dashed #409eff; + color: #409eff; + top: 0; + left: 0; + width: 100%; + height: 50px; + text-align: center; + line-height: 50px; + } +} +.btn-bar { + position: fixed; + width: 100%; + background: #fff; + height: 50px; + padding: 10px; + box-shadow: 1px 1px 10px #999; + z-index: 99; + top: 100px; +} + diff --git a/manager/src/views/main-components/shrinkable-menu/shrinkable-menu.vue b/manager/src/views/main-components/shrinkable-menu/shrinkable-menu.vue index 68738da7..aabb380e 100644 --- a/manager/src/views/main-components/shrinkable-menu/shrinkable-menu.vue +++ b/manager/src/views/main-components/shrinkable-menu/shrinkable-menu.vue @@ -55,6 +55,7 @@ export default { }, methods: { changeMenu(name) { //二级路由点击 + console.log(name) this.$router.push({ name: name }); diff --git a/manager/src/views/member/list/index.vue b/manager/src/views/member/list/index.vue index fec0be21..fdffb632 100644 --- a/manager/src/views/member/list/index.vue +++ b/manager/src/views/member/list/index.vue @@ -312,6 +312,7 @@ export default { ], data: [], // 表单数据 total: 0, // 表单数据总数 + selectMember: [], //保存选中的用户 }; }, props: { @@ -320,18 +321,66 @@ export default { type: Boolean, default: false, }, + // 已选择用户数据 + selectedList: { + type: null, + default: "", + }, + }, + watch: { + selectedList: { + handler(val) { + this.$set(this, "selectMember", JSON.parse(JSON.stringify(val))); + this.init(this.data); + // 将父级数据与当前组件数据进行匹配 + + }, + deep: true, + immediate: true, + }, }, methods: { // 回调给父级 callback(val, index) { - val.___selected = !val.___selected; + this.$set(val, "___selected", !val.___selected); + console.log(val.___selected); + let findUser = this.selectMember.find((item) => { + return item.id == val.id; + }); + // 如果没有则添加 + if (!findUser) { + this.selectMember.push(val); + } else { + // 有重复数据就删除 + this.selectMember.map((item, index) => { + if (item.id == findUser.id) { + this.selectMember.splice(index, 1); + } + }); + } + this.$emit("callback", val); }, - init() { - this.getData(); + // 初始化信息 + init(data) { + data.forEach((item) => { + if (this.selectMember.length != 0) { + this.selectMember.forEach((member) => { + if (member.id == item.id) { + this.$set(item, "___selected", true); + } + }); + } else { + this.$set(item, "___selected", false); + } + }); + this.data = data; }, changePage(v) { this.searchForm.pageNumber = v; + // 此处如果是父子级传值的时候需要做一下处理 + //selectedMember + this.getData(); }, changePageSize(v) { @@ -387,15 +436,13 @@ export default { } }); }, + //查询会员列表 getData() { API_Member.getMemberListData(this.searchForm).then((res) => { if (res.result.records) { this.loading = false; - res.result.records.forEach((item) => { - item.___selected = false; - }); - this.data = res.result.records; + this.init(res.result.records); this.total = res.result.total; } }); @@ -484,7 +531,7 @@ export default { }, }, mounted() { - this.init(); + this.getData(); }, }; diff --git a/manager/src/views/promotion/coupon/coupon.vue b/manager/src/views/promotion/coupon/coupon.vue index 262d3588..7db021f4 100644 --- a/manager/src/views/promotion/coupon/coupon.vue +++ b/manager/src/views/promotion/coupon/coupon.vue @@ -4,7 +4,7 @@
- + - +
@@ -26,21 +25,17 @@ - +
- +
@@ -68,7 +63,7 @@ export default { pageSize: 10, // 页面大小 sort: "startTime", // 默认排序字段 order: "desc", // 默认排序方式 - getType: '', // 默认排序方式 + getType: "", // 默认排序方式 }, form: { // 添加或编辑表单对象初始化数据 @@ -77,7 +72,7 @@ export default { // 表单验证规则 formValidate: { promotionName: [ - {required: true, message: "不能为空", trigger: "blur"}, + { required: true, message: "不能为空", trigger: "blur" }, ], }, submitLoading: false, // 添加或编辑提交状态 @@ -94,15 +89,16 @@ export default { { title: "活动名称", key: "promotionName", - width: 120, + minWidth: 100, fixed: "left", }, { title: "优惠券名称", key: "couponName", - width: 120, - tooltip: true - }, { + minWidth: 100, + tooltip: true, + }, + { title: "面额/折扣", key: "price", width: 120, @@ -124,9 +120,11 @@ export default { width: 150, render: (h, params) => { return h( - "div", params.row.receivedNum + "/" + params.row.publishNum) + "div", + params.row.receivedNum + "/" + params.row.publishNum + ); }, - minWidth:130, + minWidth: 130, }, { title: "优惠券类型", @@ -162,20 +160,19 @@ export default { }, { title: "活动时间", - width: 120, - render: (h, params) => { + render: (h, params) => { if (params.row.getType === "ACTIVITY") { return h("div", "长期有效"); } else { return h("div", { domProps: { - innerHTML: params.row.startTime + "
" + params.row.endTime, + innerHTML: + params.row.startTime + "
" + params.row.endTime, }, }); } }, - minWidth:150, }, { title: "状态", @@ -210,14 +207,14 @@ export default { ), ]); }, - minWidth:70, + minWidth: 70, }, { title: "操作", slot: "action", align: "center", fixed: "right", - minWidth: 140 + maxWidth: 140, }, ], data: [], // 表单数据 @@ -233,13 +230,13 @@ export default { //优惠券类型 查询参数 getType: { type: String, - default: '' + default: "", }, //已选择优惠券 - selectList: { + selectedList: { type: Array, - default: [] - } + default: [], + }, }, watch: { $route(to, from) { @@ -255,16 +252,27 @@ export default { }, init() { this.getDataList(); + + // 判断是否是父级回调给自己已选择优惠券 + if (this.selectedList.length != 0) { + // console.log(this.selectedList); + this.selectedList.forEach((item) => { + item._checked = true; + item.___selected = true; + }); + this.$set(this, "data", this.selectedList); + console.log(this.data); + } }, add() { - this.$router.push({name: "add-platform-coupon"}); + this.$router.push({ name: "add-platform-coupon" }); }, /** 跳转至领取详情页面 */ receiveInfo(v) { - this.$router.push({name: "member-receive-coupon", query: {id: v.id}}); + this.$router.push({ name: "member-receive-coupon", query: { id: v.id } }); }, info(v) { - this.$router.push({name: "platform-coupon-info", query: {id: v.id}}); + this.$router.push({ name: "platform-coupon-info", query: { id: v.id } }); }, changePage(v) { this.searchForm.pageNumber = v - 1; @@ -294,7 +302,7 @@ export default { changeSelect(e) { this.selectList = e; this.selectCount = e.length; - this.checked ? this.check() : ''; + this.checked ? this.check() : ""; }, getDataList() { this.loading = true; @@ -309,9 +317,9 @@ export default { getPlatformCouponList(this.searchForm).then((res) => { this.loading = false; if (res.success) { - res.result.records.forEach(item => { - item.___selected = false - }) + res.result.records.forEach((item) => { + item.___selected = false; + }); this.data = res.result.records; this.total = res.result.total; } @@ -353,7 +361,7 @@ export default { }); }, edit(v) { - this.$router.push({name: "edit-platform-coupon", query: {id: v.id}}); + this.$router.push({ name: "edit-platform-coupon", query: { id: v.id } }); }, remove(v) { this.$Modal.confirm({ diff --git a/manager/src/views/promotion/couponActivity/couponPublish.vue b/manager/src/views/promotion/couponActivity/couponPublish.vue index 1e42bf67..61fbc7bc 100644 --- a/manager/src/views/promotion/couponActivity/couponPublish.vue +++ b/manager/src/views/promotion/couponActivity/couponPublish.vue @@ -6,12 +6,11 @@

活动信息

- + - + @@ -27,15 +26,16 @@ 指定会员 - + +
+ +
+
- {{ selectedMember }} - +

配置优惠券

@@ -47,8 +47,8 @@
@@ -61,12 +61,12 @@
- - + + - + @@ -76,10 +76,7 @@ import couponTemplate from "@/views/promotion/coupon/coupon"; import userList from "@/views/member/list/index"; -import { - saveActivityCoupon, - updateCouponActivity, -} from "@/api/promotion"; +import { saveActivityCoupon, updateCouponActivity } from "@/api/promotion"; export default { name: "addCouponActivity", @@ -89,30 +86,72 @@ export default { }, data() { return { - showCouponSelect: false,//显示优惠券选择框 + showCouponSelect: false, //显示优惠券选择框 modalType: 0, // 是否编辑 - rangeTime: '',//时间区间 - checkUserList: false,//会员选择器 - selectedMember: [],//选择的会员 + rangeTime: "", //时间区间 + checkUserList: false, //会员选择器 + selectedMember: [], //选择的会员 form: { - promotionName: '', //活动名称 - activityScope: 'ALL', //活动范围 - couponActivityType: 'REGISTERED', //触发活动方式 - activityScopeInfo: '', //活动描述 - startTime: '', //开始时间 - endTime: '', //结束时间 - couponActivityItems: [] - + promotionName: "", //活动名称 + activityScope: "ALL", //活动范围 + couponActivityType: "REGISTERED", //触发活动方式 + activityScopeInfo: "", //活动描述 + startTime: "", //开始时间 + endTime: "", //结束时间 + couponActivityItems: [], }, // 表单 id: this.$route.query.id, // 优惠券活动id submitLoading: false, // 添加或编辑提交状态 - selectCouponList: [],//选择的优惠券列表 + selectCouponList: [], //选择的优惠券列表 formRule: { - promotionName: [{required: true, message: "活动名称不能为空"}], - rangeTime: [{required: true, message: "请选择活动有效期"}], - description: [{required: true, message: "请输入范围描述"}], + promotionName: [{ required: true, message: "活动名称不能为空" }], + rangeTime: [{ required: true, message: "请选择活动有效期" }], + description: [{ required: true, message: "请输入范围描述" }], }, - //优惠券表哥 + // 用户表格 + userColumns: [ + { + title: "用户名称", + key: "nickName", + minWidth: 120, + }, + { + title: "手机号", + key: "mobile", + render: (h, params) => { + return h("div", params.row.mobile || "暂未填写"); + }, + }, + { + title: "最后登录时间", + key: "lastLoginDate", + }, + { + title: "操作", + key: "action", + minWidth: 50, + align: "center", + render: (h, params) => { + return h( + "Button", + { + props: { + size: "small", + type: "error", + ghost: true, + }, + on: { + click: () => { + this.delUser(params.index); + }, + }, + }, + "删除" + ); + }, + }, + ], + //优惠券表格 columns: [ { title: "优惠券名称", @@ -175,7 +214,7 @@ export default { }, on: { click: () => { - // this.delGoods(params.index); + this.delCoupon(params.index); }, }, }, @@ -194,14 +233,32 @@ export default { } }, methods: { + // 删除选择的优惠券 + delUser(index) { + this.selectedMember.splice(index, 1); + }, + // 删除选择的优惠券 + delCoupon(index) { + this.selectCouponList.splice(index, 1); + }, // 返回已选择的用户 callbackSelectUser(val) { - let index = this.selectedMember.indexOf(val) - if (index > 0) { - this.selectedMember.remove(val); + // 每次将返回的数据回调判断 + let findUser = this.selectedMember.find((item) => { + return item.id == val.id; + }); + // 如果没有则添加 + if (!findUser) { + this.selectedMember.push(val); + } else { + // 有重复数据就删除 + this.selectedMember.map((item, index) => { + if (item.id == findUser.id) { + this.selectedMember.splice(index, 1); + } + }); } - this.selectedMember.push(val); }, // 添加指定用户 @@ -218,17 +275,16 @@ export default { /** * 返回优惠券*/ selectedCoupon(val) { - this.selectCouponList = val + this.selectCouponList = val; //清空原有数据 this.form.couponActivityItems = []; val.forEach((item, index) => { - this.form.couponActivityItems.push({ num: 0, - couponId: item.id - }) - }) - console.log(val) + couponId: item.id, + }); + }); + console.log(val); }, getCoupon() { @@ -276,7 +332,6 @@ export default { }, /** 保存平台优惠券 */ handleSubmit() { - this.form.startTime = this.$options.filters.unixToDate( this.rangeTime[0] / 1000 ); @@ -287,7 +342,7 @@ export default { this.$refs.form.validate((valid) => { if (valid) { const params = JSON.parse(JSON.stringify(this.form)); - console.log(params) + console.log(params); this.submitLoading = true; if (this.modalType === 0) { // 添加 避免编辑后传入id等数据 记得删除 @@ -318,7 +373,7 @@ export default { this.$store.state.app.pageOpenedList ); this.$router.go(-1); - } + }, }, }; diff --git a/manager/src/views/live/live.vue b/manager/src/views/promotion/live/live.vue similarity index 92% rename from manager/src/views/live/live.vue rename to manager/src/views/promotion/live/live.vue index 25614680..b7d7498c 100644 --- a/manager/src/views/live/live.vue +++ b/manager/src/views/promotion/live/live.vue @@ -93,7 +93,7 @@ export default { }, on: { "on-change": () => { - this.star(params.row,params.index); + this.star(params.row, params.index); }, }, }, @@ -183,19 +183,19 @@ export default { /** * 是否推荐 */ - async star(val,index) { - let switched - if(this.liveData[index].recommend){ - this.$set(this.liveData[index],'recommend',false) - switched = false - } - else{ - - this.$set(this.liveData[index],'recommend',true) - switched = true + async star(val, index) { + let switched; + if (this.liveData[index].recommend) { + this.$set(this.liveData[index], "recommend", false); + switched = false; + } else { + this.$set(this.liveData[index], "recommend", true); + switched = true; } - await whetherStar({id:val.id,recommend:switched}); + await whetherStar({ id: val.id, recommend: switched }); + + this.getStoreLives(); }, /** diff --git a/manager/src/views/live/liveDetail.vue b/manager/src/views/promotion/live/liveDetail.vue similarity index 100% rename from manager/src/views/live/liveDetail.vue rename to manager/src/views/promotion/live/liveDetail.vue diff --git a/seller/src/config/index.js b/seller/src/config/index.js index 17f824e8..27da5927 100644 --- a/seller/src/config/index.js +++ b/seller/src/config/index.js @@ -22,10 +22,10 @@ export default { // buyer: 'https://buyer-api.pickmall.cn', // seller: 'https://store-api.pickmall.cn', // manager: 'https://admin-api.pickmall.cn', - common: 'http://192.168.0.100:8890', - buyer: 'http://192.168.0.100:8888', - seller: 'http://192.168.0.100:8889', - manager: 'http://192.168.0.100:8887' + 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/seller/src/views/goods/goods-seller/goodsOperation.vue b/seller/src/views/goods/goods-seller/goodsOperation.vue index fc7417d4..5c434575 100644 --- a/seller/src/views/goods/goods-seller/goodsOperation.vue +++ b/seller/src/views/goods/goods-seller/goodsOperation.vue @@ -25,6 +25,8 @@ + +
diff --git a/seller/src/views/promotion/live/addLive.vue b/seller/src/views/promotion/live/addLive.vue index cfa0c37e..f2d9327f 100644 --- a/seller/src/views/promotion/live/addLive.vue +++ b/seller/src/views/promotion/live/addLive.vue @@ -153,7 +153,6 @@ import { addLiveGoods, editLive, getLiveInfo, - delLiveGoods, delRoomLiveGoods, } from "@/api/promotion"; import liveGoods from "./liveGoods"; diff --git a/seller/src/views/promotion/live/liveGoods.vue b/seller/src/views/promotion/live/liveGoods.vue index 31fcf0e4..eb2def25 100644 --- a/seller/src/views/promotion/live/liveGoods.vue +++ b/seller/src/views/promotion/live/liveGoods.vue @@ -276,10 +276,10 @@ export default { async saveLiveGoods() { this.saveGoodsLoading = true; let submit = this.liveGoodsData.map((element) => { - console.log(element.priceType); + console.log(element); return { goodsId: element.goodsId, //商品id - goodsImage: element.small, //商品图片 + goodsImage: element.small, //商品图片 必须为 300 * 300 name: element.goodsName, //商品昵称 price: parseInt(element.price), //商品价格 quantity: element.quantity, //库存 From 44da0ec700bdda4b744d22028c3dd2bd43164919 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com> Date: Thu, 17 Jun 2021 09:09:19 +0800 Subject: [PATCH 13/35] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manager/src/router/router.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manager/src/router/router.js b/manager/src/router/router.js index bdc3d361..65cb5f1b 100644 --- a/manager/src/router/router.js +++ b/manager/src/router/router.js @@ -332,7 +332,7 @@ export const otherRouter = { path: "liveDetail", title: "查看直播", name: "liveDetail", - component: () => import("@/views/live/liveDetail.vue") + component: () => import("@/views/promotion/live/liveDetail.vue") } ] }; From 63e5808a6b0b2a4379afec1ed2c27eceefb4e23f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com> Date: Thu, 17 Jun 2021 10:42:10 +0800 Subject: [PATCH 14/35] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8A=B5=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E7=9A=84=E4=BC=98=E6=83=A0=E5=88=B8=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manager/src/config/index.js | 8 +- manager/src/views/promotion/coupon/coupon.vue | 75 ++++++++++++++----- .../couponActivity/couponPublish.vue | 2 +- 3 files changed, 61 insertions(+), 24 deletions(-) diff --git a/manager/src/config/index.js b/manager/src/config/index.js index 8b6b162f..1a28698c 100644 --- a/manager/src/config/index.js +++ b/manager/src/config/index.js @@ -21,10 +21,10 @@ export default { // 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: 'http://192.168.0.100:8890', + buyer: 'http://192.168.0.100:8888', + seller: 'http://192.168.0.100:8889', + manager: 'http://192.168.0.100:8887' }, api_prod: { common: "https://common-api.pickmall.cn", diff --git a/manager/src/views/promotion/coupon/coupon.vue b/manager/src/views/promotion/coupon/coupon.vue index 7db021f4..7f2ae93d 100644 --- a/manager/src/views/promotion/coupon/coupon.vue +++ b/manager/src/views/promotion/coupon/coupon.vue @@ -25,7 +25,7 @@ - +
- +
@@ -59,7 +59,7 @@ export default { modalTitle: "", // 添加或编辑标题 searchForm: { // 搜索框初始化对象 - pageNumber: 0, // 当前页数 + pageNumber: 1, // 当前页数 pageSize: 10, // 页面大小 sort: "startTime", // 默认排序字段 order: "desc", // 默认排序方式 @@ -219,6 +219,7 @@ export default { ], data: [], // 表单数据 total: 0, // 表单数据总数 + selectCoupon: [], //本级选中的优惠券 }; }, props: { @@ -247,22 +248,22 @@ export default { }, methods: { // 选中优惠券 父级传值 + selectedList: { + handler(val) { + // 判断是否是父级回调给自己已选择优惠券 + if (val.length != 0) { + this.selectCoupon = val; + } + }, + deep: true, + immediate: true, + }, check() { - this.$emit("selected", this.selectList); + // this.selectCoupon.push(this.selectList) + this.$emit("selected", this.selectCoupon); }, init() { this.getDataList(); - - // 判断是否是父级回调给自己已选择优惠券 - if (this.selectedList.length != 0) { - // console.log(this.selectedList); - this.selectedList.forEach((item) => { - item._checked = true; - item.___selected = true; - }); - this.$set(this, "data", this.selectedList); - console.log(this.data); - } }, add() { this.$router.push({ name: "add-platform-coupon" }); @@ -275,9 +276,9 @@ export default { this.$router.push({ name: "platform-coupon-info", query: { id: v.id } }); }, changePage(v) { - this.searchForm.pageNumber = v - 1; + this.searchForm.pageNumber = v; this.getDataList(); - this.clearSelectAll(); + // this.clearSelectAll(); }, changePageSize(v) { this.searchForm.pageSize = v; @@ -299,10 +300,37 @@ export default { clearSelectAll() { this.$refs.table.selectAll(false); }, + + /** + * 取消已选择的数据 + */ + cancelSelect(selection, row) { + console.log(row) + let findCoupon = this.selectCoupon.find((item) => { + return item.id == row.id; + }); + // 如果没有则添加 + if (!findCoupon) { + this.selectCoupon.push(row); + } else { + // 有重复数据就删除 + this.selectCoupon.map((item, index) => { + if (item.id == findCoupon.id) { + this.selectCoupon.splice(index, 1); + } + }); + } + }, + /** + * 选择优惠券 + */ changeSelect(e) { + if (this.checked && e.length != 0) { + this.selectCoupon.push(...e); + this.check(); + } this.selectList = e; this.selectCount = e.length; - this.checked ? this.check() : ""; }, getDataList() { this.loading = true; @@ -318,8 +346,17 @@ export default { this.loading = false; if (res.success) { res.result.records.forEach((item) => { + if (this.selectCoupon.length != 0) { + this.selectCoupon.forEach((child) => { + if (item.id == child.id) { + item.___selected = true; + item._checked = true; + } + }); + } item.___selected = false; }); + this.data = res.result.records; this.total = res.result.total; } diff --git a/manager/src/views/promotion/couponActivity/couponPublish.vue b/manager/src/views/promotion/couponActivity/couponPublish.vue index 61fbc7bc..1f7077e5 100644 --- a/manager/src/views/promotion/couponActivity/couponPublish.vue +++ b/manager/src/views/promotion/couponActivity/couponPublish.vue @@ -62,7 +62,7 @@ - + From 0cbcb4d37a22508ada9e70ecf8b4606f02aabea0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com> Date: Thu, 17 Jun 2021 11:40:27 +0800 Subject: [PATCH 15/35] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E5=AE=B6?= =?UTF-8?q?=E7=AB=AF=E5=95=86=E5=93=81=E5=8F=91=E5=B8=83=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=A5=BC=E5=B1=82?= =?UTF-8?q?=E8=A3=85=E4=BF=AEpc=E7=AB=AF=E5=87=BA=E7=8E=B0=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=93=81=E7=89=8C?= =?UTF-8?q?=E4=B8=AD=E5=87=BA=E7=8E=B0=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manager/src/api/goods.js | 6 +- .../src/views/goods/goods-manage/brand.vue | 4 +- .../src/views/goods/goods-manage/category.vue | 1 + .../lili-floor-renovation/renovation.vue | 324 +++++++++--------- .../src/views/promotion/seckill/seckill.vue | 11 +- .../views/goods/goods-seller/addGoods.scss | 6 + .../goods/goods-seller/goodsOperation.vue | 3 +- 7 files changed, 189 insertions(+), 166 deletions(-) diff --git a/manager/src/api/goods.js b/manager/src/api/goods.js index a33eff91..935d1e1e 100644 --- a/manager/src/api/goods.js +++ b/manager/src/api/goods.js @@ -5,10 +5,14 @@ import { getRequest, postRequest, putRequest, deleteRequest} from '@/libs/axios' export const getManagerBrandPage = (params) => { return getRequest('/goods/brand/getByPage', params) } -// 添加或修改品牌设置 +// 添加 export const addBrand = (params) => { return postRequest('/goods/brand', params) } +// 修改品牌设置 +export const updateBrand = (params) => { + return putRequest(`/goods/brand/${params.id}`, params) +} // 禁用品牌 export const disableBrand = (id, params) => { return putRequest(`/goods/brand/disable/${id}`, params) diff --git a/manager/src/views/goods/goods-manage/brand.vue b/manager/src/views/goods/goods-manage/brand.vue index 1e502c93..e11e1f19 100644 --- a/manager/src/views/goods/goods-manage/brand.vue +++ b/manager/src/views/goods/goods-manage/brand.vue @@ -82,7 +82,7 @@ \ No newline at end of file +.show-content { + margin-left: 150px; + margin-top: 60px; +} +.ghost { + background: #fff; + height: 30px; + position: relative; + &::after { + content: "松开鼠标添加模块"; + position: absolute; + background: #fff; + border: 1px dashed #409eff; + color: #409eff; + top: 0; + left: 0; + width: 100%; + height: 50px; + text-align: center; + line-height: 50px; + } +} +.btn-bar { + position: fixed; + width: 100%; + background: #fff; + height: 50px; + padding: 10px; + box-shadow: 1px 1px 10px #999; + z-index: 99; + top: 100px; +} + diff --git a/manager/src/views/promotion/seckill/seckill.vue b/manager/src/views/promotion/seckill/seckill.vue index 16ef3934..47ae392a 100644 --- a/manager/src/views/promotion/seckill/seckill.vue +++ b/manager/src/views/promotion/seckill/seckill.vue @@ -70,7 +70,7 @@ @click="edit(row)" >编辑 -   + -   + -   + -   +

商品详情描述

-
+
Date: Thu, 17 Jun 2021 11:58:56 +0800 Subject: [PATCH 16/35] =?UTF-8?q?=E8=A7=A3=E5=86=B3buyer=E7=AB=AF=E5=95=86?= =?UTF-8?q?=E5=93=81=E8=AF=A6=E6=83=85=E6=B2=A1=E6=9C=89=E5=8F=91=E9=80=81?= =?UTF-8?q?token?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buyer/src/api/goods.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buyer/src/api/goods.js b/buyer/src/api/goods.js index b0117058..fb7d8e0f 100644 --- a/buyer/src/api/goods.js +++ b/buyer/src/api/goods.js @@ -36,7 +36,7 @@ export function goodsSkuDetail (params) { return request({ url: `/buyer/goods/sku/${params.goodsId}/${params.skuId}`, method: Method.GET, - needToken: false, + needToken: true, params }); } From 57ff6c8d70d6dba474f1f395d6610a750cd83dfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com> Date: Thu, 17 Jun 2021 14:11:13 +0800 Subject: [PATCH 17/35] =?UTF-8?q?=E5=8F=96=E6=B6=88pc=E6=A5=BC=E5=B1=82?= =?UTF-8?q?=E8=A3=85=E4=BF=AE=E6=8F=90=E7=A4=BA=E6=A1=86=EF=BC=8C=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E6=97=A0=E7=97=95=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manager/src/views/lili-floor-renovation/floorList.vue | 6 +++--- manager/src/views/lili-floor-renovation/renovation.vue | 10 +--------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/manager/src/views/lili-floor-renovation/floorList.vue b/manager/src/views/lili-floor-renovation/floorList.vue index e47f4239..29d8fd47 100644 --- a/manager/src/views/lili-floor-renovation/floorList.vue +++ b/manager/src/views/lili-floor-renovation/floorList.vue @@ -25,7 +25,7 @@ 关 - + @@ -139,9 +139,9 @@ export default { this.showModal = true; }, - decorate(id) { + decorate(val) { // 装修 - this.$router.push({ name: "renovation", query: { id: id } }); + this.$router.push({ name: "renovation", query: { id: val.id,pageShow:val.pageShow } }); }, getTemplateList() { diff --git a/manager/src/views/lili-floor-renovation/renovation.vue b/manager/src/views/lili-floor-renovation/renovation.vue index 11faa20b..48ff7743 100644 --- a/manager/src/views/lili-floor-renovation/renovation.vue +++ b/manager/src/views/lili-floor-renovation/renovation.vue @@ -40,15 +40,7 @@ export default { methods: { saveTemplate() { // 保存模板 - this.$Modal.confirm({ - title: "是否立即发布？", - onOk: () => { - this.submitTemplate("OPEN"); - }, - onCancel: () => { - this.submitTemplate("CLOSE"); - }, - }); + this.submitTemplate(this.$route.query.pageShow ? 'OPEN' : 'CLOSE') }, // 提交模板 submitTemplate(pageShow) { From 76d09c05595a71ec87957bccdc612ff2b42796a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com> Date: Thu, 17 Jun 2021 14:45:14 +0800 Subject: [PATCH 18/35] =?UTF-8?q?=E5=8A=B5=E6=B4=BB=E5=8A=A8=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=B4=BB=E5=8A=A8=E8=8C=83=E5=9B=B4=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manager/src/config/index.js | 8 ++++---- .../src/views/promotion/couponActivity/couponPublish.vue | 7 ++++++- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/manager/src/config/index.js b/manager/src/config/index.js index 1a28698c..8b6b162f 100644 --- a/manager/src/config/index.js +++ b/manager/src/config/index.js @@ -21,10 +21,10 @@ export default { // buyer: "https://buyer-api.pickmall.cn", // seller: "https://store-api.pickmall.cn", // manager: "https://admin-api.pickmall.cn" - common: 'http://192.168.0.100:8890', - buyer: 'http://192.168.0.100:8888', - seller: 'http://192.168.0.100:8889', - manager: 'http://192.168.0.100:8887' + 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/promotion/couponActivity/couponPublish.vue b/manager/src/views/promotion/couponActivity/couponPublish.vue index 1f7077e5..677ee392 100644 --- a/manager/src/views/promotion/couponActivity/couponPublish.vue +++ b/manager/src/views/promotion/couponActivity/couponPublish.vue @@ -10,7 +10,7 @@ - + @@ -86,6 +86,11 @@ export default { }, data() { return { + options: { + disabledDate(date) { + return date && date.valueOf() < Date.now() - 86400000; + }, + }, showCouponSelect: false, //显示优惠券选择框 modalType: 0, // 是否编辑 rangeTime: "", //时间区间 From 99ae8981393c8d2020f2177aa786e62027f3a581 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com> Date: Thu, 17 Jun 2021 15:24:34 +0800 Subject: [PATCH 19/35] =?UTF-8?q?=E8=A7=A3=E5=86=B3pc=E7=AB=AF=E4=B8=AA?= =?UTF-8?q?=E4=BA=BA=E4=B8=AD=E5=BF=83=E8=B7=B3=E8=BD=AC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buyer/src/components/header/Header.vue | 171 ++++++++++--------------- buyer/src/pages/Cart.vue | 165 +++++++++++++----------- 2 files changed, 159 insertions(+), 177 deletions(-) diff --git a/buyer/src/components/header/Header.vue b/buyer/src/components/header/Header.vue index 0c621781..efc10cba 100644 --- a/buyer/src/components/header/Header.vue +++ b/buyer/src/components/header/Header.vue @@ -2,26 +2,10 @@
    @@ -53,19 +37,15 @@
  • 我的订单
  • 我的足迹
    • -
  • +
  • {{cartNum < 100 ? cartNum : '99'}} - + - + 购物车 - + @@ -75,12 +55,7 @@ 赶快去添加商品吧~
-
+
@@ -117,112 +92,107 @@ @@ -263,7 +233,8 @@ export default { margin-right: 15px; font-weight: bold; } -.nav a,.nav-item { +.nav a, +.nav-item { text-decoration: none; padding-left: 15px; border-left: 1px solid #ccc; @@ -406,7 +377,7 @@ export default { .sign-out p { font-size: 12px; } -.cart-icon{ +.cart-icon { padding: 0 6px; } .goods-title:hover { diff --git a/buyer/src/pages/Cart.vue b/buyer/src/pages/Cart.vue index fc7c3f0c..3f860097 100644 --- a/buyer/src/pages/Cart.vue +++ b/buyer/src/pages/Cart.vue @@ -59,7 +59,7 @@
{{shop.promotionNotice}}
@@ -544,7 +547,7 @@ export default { width: 70px; height: 70px; } - >div>p { + > div > p { @include content_color($light_content_color); font-size: 13px; text-align: left; @@ -567,12 +570,12 @@ export default { } } } - .error-goods{ + .error-goods { position: absolute; width: 100%; height: 100%; margin-left: -20px; - background-color: rgba($color: #999, $alpha: .5); + background-color: rgba($color: #999, $alpha: 0.5); z-index: 10; display: flex; align-items: center; @@ -603,7 +606,7 @@ export default { .save-price span { color: #000; } - .total-price span { + .total-price div { color: $theme_color; font-size: 20px; } @@ -651,23 +654,31 @@ export default { display: flex; margin-top: 5px; margin-left: 5px; - >span{ + > span { border: 1px solid $theme_color; color: $theme_color; font-size: 12px; border-radius: 2px; padding: 0 2px; } - >p{ + > p { font-size: 12px; margin-left: 10px; color: #999; } } - +.cart-goods-footer > div{ + display: flex; + align-items: center; + overflow: hidden; +} +.total-price{ + display: flex; + align-items: center; +} From 336643419e79d4908b47239f8239ee4c86339f69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com> Date: Fri, 18 Jun 2021 14:52:40 +0800 Subject: [PATCH 20/35] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=95=86=E5=93=81?= =?UTF-8?q?=E5=88=86=E7=B1=BB=E4=B8=8D=E5=90=8C=E6=AD=A5=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E8=A7=A3=E5=86=B3pc=E7=AB=AF?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8F=91=E7=A5=A8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buyer/src/components/invoiceModal/index.vue | 195 ++- buyer/src/pages/payment/Pay.vue | 1266 +++++++++-------- manager/src/api/goods.js | 7 + manager/src/config/index.js | 13 +- .../src/views/goods/goods-manage/brand.vue | 697 +++++---- .../src/views/goods/goods-manage/category.vue | 83 +- 6 files changed, 1130 insertions(+), 1131 deletions(-) diff --git a/buyer/src/components/invoiceModal/index.vue b/buyer/src/components/invoiceModal/index.vue index e332635b..a746f5e7 100644 --- a/buyer/src/components/invoiceModal/index.vue +++ b/buyer/src/components/invoiceModal/index.vue @@ -11,42 +11,37 @@
-->
-
+ - + + 电子普通发票 + 增值税专用发票 + + + + 个人 单位 - + - + + + + - 不开发票 商品明细 + 商品类别
- +
@@ -54,100 +49,104 @@
diff --git a/manager/src/views/goods/goods-manage/category.vue b/manager/src/views/goods/goods-manage/category.vue index b4183fe8..f2b70e07 100644 --- a/manager/src/views/goods/goods-manage/category.vue +++ b/manager/src/views/goods/goods-manage/category.vue @@ -11,7 +11,7 @@ - - - diff --git a/manager/src/views/promotion/couponActivity/memberReceiveCoupon.vue b/manager/src/views/promotion/couponActivity/memberReceiveCoupon.vue deleted file mode 100644 index 4291c1e3..00000000 --- a/manager/src/views/promotion/couponActivity/memberReceiveCoupon.vue +++ /dev/null @@ -1,250 +0,0 @@ - - - - From c4cc07868023e086eecf40198974cf1651274cfd Mon Sep 17 00:00:00 2001 From: Chopper Date: Fri, 18 Jun 2021 17:06:25 +0800 Subject: [PATCH 22/35] =?UTF-8?q?=E5=88=86=E7=B1=BB=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E7=BC=93=E5=AD=98=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4=E8=AE=BE?= =?UTF-8?q?=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buyer/src/components/nav/cateNav.vue | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/buyer/src/components/nav/cateNav.vue b/buyer/src/components/nav/cateNav.vue index e4fd092c..07a6b4eb 100644 --- a/buyer/src/components/nav/cateNav.vue +++ b/buyer/src/components/nav/cateNav.vue @@ -93,6 +93,11 @@ export default { getCategory(0).then(res => { if (res.success) { this.cateList = res.result; + // 过期时间 + var expirationTime = new Date().setHours(new Date().getHours() + 1); + // 存放过期时间 + localStorage.setItem('category_expiration_time', expirationTime); + // 存放分类信息 localStorage.setItem('category', JSON.stringify(res.result)) } }); @@ -117,7 +122,12 @@ export default { } }, mounted () { - if (localStorage.getItem('category')) { + if (localStorage.getItem('category') && localStorage.getItem('category_expiration_time')) { + // 如果缓存过期，则获取最新的信息 + if (new Date() > localStorage.getItem('category_expiration_time')) { + this.getCate(); + return; + } this.cateList = JSON.parse(localStorage.getItem('category')) } else { this.getCate() From d9368b75143dec95125cdeb20f83013656461bb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com> Date: Fri, 18 Jun 2021 17:11:18 +0800 Subject: [PATCH 23/35] =?UTF-8?q?=E5=95=86=E5=93=81=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=91=E5=AE=9A=E8=A7=84=E6=A0=BC=E5=85=AB?= =?UTF-8?q?=E9=98=BF=E5=93=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buyer/src/api/shopentry.js | 2 +- buyer/src/pages/shopEntry/shop-entry.vue | 122 +++++++----------- manager/src/config/index.js | 8 +- .../src/views/goods/goods-manage/category.vue | 26 +--- 4 files changed, 61 insertions(+), 97 deletions(-) diff --git a/buyer/src/api/shopentry.js b/buyer/src/api/shopentry.js index 82020595..ae8e6309 100644 --- a/buyer/src/api/shopentry.js +++ b/buyer/src/api/shopentry.js @@ -61,7 +61,7 @@ export function getCateById (id) { // 店铺入驻协议 export function agreement () { return request({ - url: `/buyer/article/get/1349291301250293760`, + url: `/buyer/article/type/STORE_REGISTER`, needToken: true, method: Method.GET }) diff --git a/buyer/src/pages/shopEntry/shop-entry.vue b/buyer/src/pages/shopEntry/shop-entry.vue index f522377f..fb112e49 100644 --- a/buyer/src/pages/shopEntry/shop-entry.vue +++ b/buyer/src/pages/shopEntry/shop-entry.vue @@ -9,23 +9,11 @@ - + - + - +
入驻申请提交成功，等待平台审核 @@ -37,62 +25,51 @@
- +
-

我已同意以上协议

- +

+ 我已同意以上协议 +

+
From be42bfcf4018c1f24d5ad6df47d047f1d9c3e107 Mon Sep 17 00:00:00 2001 From: pikachu <1321288662@qq.com> Date: Sat, 19 Jun 2021 16:10:55 +0800 Subject: [PATCH 24/35] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=92=8C=E5=95=86=E5=93=81=E8=AE=A2=E5=8D=95=E5=8C=BA=E5=88=86?= =?UTF-8?q?=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- seller/src/libs/routerJson.js | 14 + seller/src/views/order/order/orderList.vue | 46 +-- .../views/order/order/virtualOrderList.vue | 300 ++++++++++++++++++ 3 files changed, 316 insertions(+), 44 deletions(-) create mode 100644 seller/src/views/order/order/virtualOrderList.vue diff --git a/seller/src/libs/routerJson.js b/seller/src/libs/routerJson.js index 994f24e6..b020ba62 100644 --- a/seller/src/libs/routerJson.js +++ b/seller/src/libs/routerJson.js @@ -143,6 +143,20 @@ export const result = [ url: "", children: null, permTypes: [] + }, + { + name: "virtualOrderList", + showAlways: true, + level: 2, + type: 0, + title: "虚拟订单", + path: "virtualOrderList", + component: "order/order/virtualOrderList", + icon: "md-person", + isMenu: true, + url: "", + children: null, + permTypes: [] } ] }, diff --git a/seller/src/views/order/order/orderList.vue b/seller/src/views/order/order/orderList.vue index bbda4d7d..ec8987a5 100644 --- a/seller/src/views/order/order/orderList.vue +++ b/seller/src/views/order/order/orderList.vue @@ -8,14 +8,6 @@ - - - - -
-
- - -
-
+
@@ -83,6 +56,7 @@ export default { orderSn: "", buyerName: "", orderStatus: "", + orderType:"NORMAL" }, selectDate: null, form: { @@ -123,22 +97,6 @@ export default { } }, }, - { - title: "订单类型", - key: "orderType", - width: 120, - render: (h, params) => { - if (params.row.orderType == "NORMAL") { - return h("div", [h("span", {}, "普通订单")]); - } else if (params.row.orderType == "PINTUAN") { - return h("div", [h("span", {}, "拼团订单")]); - } else if (params.row.orderType == "GIFT") { - return h("div", [h("span", {}, "赠品订单")]); - } else if (params.row.orderType == "VIRTUAL") { - return h("div", [h("tag", {}, "核验订单")]); - } - }, - }, { title: "买家名称", key: "memberName", diff --git a/seller/src/views/order/order/virtualOrderList.vue b/seller/src/views/order/order/virtualOrderList.vue new file mode 100644 index 00000000..2eb671c3 --- /dev/null +++ b/seller/src/views/order/order/virtualOrderList.vue @@ -0,0 +1,300 @@ + + + + From 861c7f905a3b333960598a92b3677421a601c02b Mon Sep 17 00:00:00 2001 From: pikachu <1321288662@qq.com> Date: Sat, 19 Jun 2021 16:25:17 +0800 Subject: [PATCH 25/35] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=8C=BA=E5=88=86?= =?UTF-8?q?=E5=95=86=E5=93=81=E8=AE=A2=E5=8D=95=E5=92=8C=E8=99=9A=E6=8B=9F?= =?UTF-8?q?=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- seller/src/views/order/order/orderDetail.vue | 3 ++- seller/src/views/order/order/orderList.vue | 8 ++++++-- .../src/views/order/order/virtualOrderList.vue | 16 +--------------- 3 files changed, 9 insertions(+), 18 deletions(-) diff --git a/seller/src/views/order/order/orderDetail.vue b/seller/src/views/order/order/orderDetail.vue index 740dfa33..e758ffd2 100644 --- a/seller/src/views/order/order/orderDetail.vue +++ b/seller/src/views/order/order/orderDetail.vue @@ -94,7 +94,7 @@
{{ orderInfo.order.remark }}
-
+
配送方式：
{{ @@ -521,6 +521,7 @@ export default { }, //弹出订单核销框 orderTake() { + this.orderTakeForm.qrCode = this.orderInfo.order.verificationCode this.orderTakeModal = true; }, //订单核销提交 diff --git a/seller/src/views/order/order/orderList.vue b/seller/src/views/order/order/orderList.vue index ec8987a5..b6458775 100644 --- a/seller/src/views/order/order/orderList.vue +++ b/seller/src/views/order/order/orderList.vue @@ -16,7 +16,6 @@ - @@ -27,7 +26,12 @@ -
+
+ +
+
diff --git a/seller/src/views/order/order/virtualOrderList.vue b/seller/src/views/order/order/virtualOrderList.vue index 2eb671c3..a95e5875 100644 --- a/seller/src/views/order/order/virtualOrderList.vue +++ b/seller/src/views/order/order/virtualOrderList.vue @@ -13,8 +13,6 @@ @@ -214,14 +208,6 @@ export default { }); } }, - /** - * 批量发货 - */ - expressOrderDeliver() { - this.$router.push({ - path: "/export-order-deliver", - }); - }, init() { this.getDataList(); }, From 85bfb48c0cb21204a100546f26e4397dada0b223 Mon Sep 17 00:00:00 2001 From: pikachu <1321288662@qq.com> Date: Sun, 20 Jun 2021 10:32:35 +0800 Subject: [PATCH 26/35] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E9=83=A8=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E4=B8=8D=E8=83=BD=E6=89=8B=E5=8A=A8=E7=82=B9=E5=87=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/order/order/exportOrderDeliver.vue | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/seller/src/views/order/order/exportOrderDeliver.vue b/seller/src/views/order/order/exportOrderDeliver.vue index e22e8777..b2c4b69d 100644 --- a/seller/src/views/order/order/exportOrderDeliver.vue +++ b/seller/src/views/order/order/exportOrderDeliver.vue @@ -44,7 +44,7 @@ import JsonExcel from "vue-json-excel"; import { downLoadDeliverExcel, uploadDeliverExcel } from "@/api/order.js"; import { baseUrl } from "@/libs/axios.js"; export default { - components: { + components: { "download-excel": JsonExcel, }, data() { @@ -79,10 +79,14 @@ export default { methods: { // 点击选择步骤 handleCheckStep(val) { - this.stepList.map((item) => { - item.checked = false; - }); - val.checked = true; + if(val.title.search('3') == -1){ + console.warn(val) + this.stepList.map((item) => { + item.checked = false; + }); + val.checked = true; + } + }, From c3be931218922dc257c660f42bada20a135babdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com> Date: Mon, 21 Jun 2021 14:15:52 +0800 Subject: [PATCH 27/35] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E5=8F=91=E8=B4=A7=E6=B2=A1=E6=9C=89=E8=B7=B3=E8=BD=AC=E7=9A=84?= =?UTF-8?q?Bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- seller/src/libs/routerJson.js | 72 ++++++++++------- .../views/order/order/exportOrderDeliver.vue | 53 ++++++++++--- seller/src/views/order/order/orderList.vue | 7 +- seller/src/views/promotion/live/addLive.vue | 79 +++++++++++++++---- 4 files changed, 154 insertions(+), 57 deletions(-) diff --git a/seller/src/libs/routerJson.js b/seller/src/libs/routerJson.js index b020ba62..2016930c 100644 --- a/seller/src/libs/routerJson.js +++ b/seller/src/libs/routerJson.js @@ -395,6 +395,49 @@ export const result = [ } ] }, + { + name: "lives", + showAlways: true, + level: 1, + type: 0, + title: "直播活动", + path: "/promotion", + component: "Main", + icon: "md-person", + isMenu: true, + url: "", + permTypes: [], + children: [ + { + name: "live", + showAlways: true, + level: 2, + type: 0, + title: "直播管理", + path: "live", + component: "promotion/live/live", + icon: "md-person", + isMenu: true, + url: "", + permTypes: [], + children: null + }, + { + name: "liveGoods", + showAlways: true, + level: 2, + type: 0, + title: "直播商品", + path: "liveGoods", + component: "promotion/live/liveGoods", + icon: "md-person", + isMenu: true, + url: "", + permTypes: [], + children: null + } + ] + }, { name: "storePromotion", showAlways: true, @@ -436,34 +479,7 @@ export const result = [ permTypes: [], children: null }, - { - name: "live", - showAlways: true, - level: 2, - type: 0, - title: "直播管理", - path: "live", - component: "promotion/live/live", - icon: "md-person", - isMenu: true, - url: "", - permTypes: [], - children: null - }, - { - name: "liveGoods", - showAlways: true, - level: 2, - type: 0, - title: "直播商品", - path: "liveGoods", - component: "promotion/live/liveGoods", - icon: "md-person", - isMenu: true, - url: "", - permTypes: [], - children: null - } + ] }, { diff --git a/seller/src/views/order/order/exportOrderDeliver.vue b/seller/src/views/order/order/exportOrderDeliver.vue index b2c4b69d..cc2ba500 100644 --- a/seller/src/views/order/order/exportOrderDeliver.vue +++ b/seller/src/views/order/order/exportOrderDeliver.vue @@ -17,8 +17,8 @@
- +

选择或拖拽文件上传

@@ -26,11 +26,13 @@
-
+
+

发货完成

- + +
@@ -44,7 +46,7 @@ import JsonExcel from "vue-json-excel"; import { downLoadDeliverExcel, uploadDeliverExcel } from "@/api/order.js"; import { baseUrl } from "@/libs/axios.js"; export default { - components: { + components: { "download-excel": JsonExcel, }, data() { @@ -79,32 +81,50 @@ export default { methods: { // 点击选择步骤 handleCheckStep(val) { - if(val.title.search('3') == -1){ - console.warn(val) + if (val.title.search("3") == -1) { + console.warn(val); this.stepList.map((item) => { item.checked = false; }); val.checked = true; } - }, - handleUpload(file) { this.file = file; this.upload(); return false; }, + navigationToGoodsOrder() { + this.$router.push({ + path: "/order/orderList", + }); + }, + + close() { + this.$store.commit("removeTag", "export-order-deliver"); + localStorage.storeOpenedList = JSON.stringify( + this.$store.state.app.storeOpenedList + ); + this.$router.go(-1); + }, + /** * 上传文件 */ async upload() { let fd = new FormData(); fd.append("files", this.file); - await uploadDeliverExcel(fd); - }, + let res = await uploadDeliverExcel(fd); + if (res.success) { + this.stepList.map((item) => { + item.checked = false; + }); + this.stepList[2].checked = true; + } + }, /** * 下载excel @@ -176,4 +196,15 @@ img { width: 100px; height: 100px; } +.success { + align-items: center; + flex-direction: column; + > h1 { + font-size: 28px; + margin: 10px; + } + /deep/ .btn { + margin: 10px; + } +} diff --git a/seller/src/views/order/order/orderList.vue b/seller/src/views/order/order/orderList.vue index b6458775..4bc99a0b 100644 --- a/seller/src/views/order/order/orderList.vue +++ b/seller/src/views/order/order/orderList.vue @@ -60,7 +60,7 @@ export default { orderSn: "", buyerName: "", orderStatus: "", - orderType:"NORMAL" + orderType: "NORMAL", }, selectDate: null, form: { @@ -191,8 +191,6 @@ export default { let result = await verificationCode(this.orderCode); if (result.success) { - - this.$router.push({ name: "order-detail", query: { sn: result.result.sn || this.orderCode }, @@ -271,6 +269,9 @@ export default { }); }, }, + mounted() { + this.init(); + }, activated() { this.init(); }, diff --git a/seller/src/views/promotion/live/addLive.vue b/seller/src/views/promotion/live/addLive.vue index f2d9327f..5b5d0090 100644 --- a/seller/src/views/promotion/live/addLive.vue +++ b/seller/src/views/promotion/live/addLive.vue @@ -172,6 +172,7 @@ export default { // 不能选择今天以前的时间 optionsTime: { disabledDate(date) { + // console.log(data) return date && date.valueOf() < Date.now() - 86400000; }, }, @@ -191,7 +192,7 @@ export default { startTime: [ { required: true, - message: "请输入开始时间以及结束时间", + message: "请正确输入开始时间以及结束时间", }, ], feedsImg: [ @@ -331,8 +332,9 @@ export default { * dialog点击确定时判断 */ addGoods() { - this.liveData.forEach((item) => { - this.commodityList.forEach((oldVal) => { + this.liveData.forEach((item, index) => { + this.commodityList.forEach((oldVal, i) => { + // 如果商品里面没有商品，以及添加商品为第一次的话 if (oldVal.liveGoodsId != item.liveGoodsId) { addLiveGoods({ roomId: this.$route.query.roomId, @@ -389,21 +391,66 @@ export default { this.liveForm.coverImg = res.result; }, + tipsDateError() { + this.$Message.error({ + content: + "直播开播时间需要在当前时间的10分钟后并且,开始时间不能在6个月后,直播计划结束时间（开播时间和结束时间间隔不得短于30分钟，不得超过24小时）", + duration: 5, + }); + }, + /** * 选择时间后的回调 */ handleChangeTime(daterange) { - this.times = daterange; - this.$set( - this.liveForm, - "startTime", - new Date(daterange[0]).getTime() / 1000 - ); - this.$set( - this.liveForm, - "endTime", - new Date(daterange[1]).getTime() / 1000 - ); + /** + * 直播开播时间需要在当前时间的10分钟后 + * 此处设置默认为15分钟方便调整 + */ + let siteTime = new Date().getTime() / 1000; + let selectTime = new Date(daterange[0]).getTime() / 1000; + let currentTime = this.$options.filters.unixToDate(siteTime); + /** + * 开播时间和结束时间间隔不得短于30分钟，不得超过24小时 + * 判断用户设置的结束时间 + */ + let endTime = new Date(daterange[1]).getTime() / 1000; + if (selectTime <= siteTime + 15 * 60) { + this.tipsDateError(); + return false; + } else if (selectTime + 30 * 60 >= endTime) { + // 不能小于30分钟 + + this.tipsDateError(); + return false; + } else if (selectTime + 24 * 60 * 60 <= endTime) { + // 不能超过24小时 + + this.tipsDateError(); + return false; + } else if ( + // 不能超过6个月 + siteTime >= + new Date().getTime() + 6 * 31 * 24 * 3600 * 1000 + 86400000 + ) { + this.tipsDateError(); + return false; + } else { + this.$set(this.times, [0], currentTime); + this.times[1] = daterange[1]; + + // this.times = daterange; + this.$set( + this.liveForm, + "startTime", + new Date(daterange[0]).getTime() / 1000 + ); + this.$set( + this.liveForm, + "endTime", + new Date(daterange[1]).getTime() / 1000 + ); + } }, /** @@ -448,7 +495,9 @@ export default { // 需判断当前是否是添加商品 if (this.$route.query.id && this.liveData.length != 0) { this.spinShow = true; - this.liveForm.commodityList = JSON.stringify(this.liveForm.commodityList); + this.liveForm.commodityList = JSON.stringify( + this.liveForm.commodityList + ); // 将当前直播间修改 editLive(this.liveForm).then((res) => { if (res.success) { From 597af1a2100a52e7a9aa0968726df29fa2cdbfdc Mon Sep 17 00:00:00 2001 From: Chopper Date: Mon, 21 Jun 2021 14:35:33 +0800 Subject: [PATCH 28/35] =?UTF-8?q?=E4=BF=9D=E5=AD=98json=20excel=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- seller/package.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/seller/package.json b/seller/package.json index dee8c0ed..8ee9e65b 100644 --- a/seller/package.json +++ b/seller/package.json @@ -29,7 +29,7 @@ "sockjs-client": "^1.4.0", "stompjs": "^2.3.3", "swiper": "^6.3.5", - "vue-qr": "^2.3.0", + "uuid": "^8.3.2", "view-design": "^4.2.0", "vue": "^2.6.10", "vue-awesome": "^4.0.2", @@ -37,15 +37,16 @@ "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.6.13", "xlsx": "^0.16.2", - "xss": "^1.0.7", - "uuid": "^8.3.2" + "xss": "^1.0.7" }, "devDependencies": { "@vue/cli-plugin-babel": "^4.4.4", From 4a6fd431bc6eb7610cb5af684e6050011830a997 Mon Sep 17 00:00:00 2001 From: Chopper Date: Mon, 21 Jun 2021 16:03:23 +0800 Subject: [PATCH 29/35] =?UTF-8?q?=E7=89=B9=E6=AE=8A=E6=83=85=E5=86=B5?= =?UTF-8?q?=E4=B8=8B=E4=BC=9A=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- seller/src/views/goods/goods-seller/goodsOperation.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/seller/src/views/goods/goods-seller/goodsOperation.vue b/seller/src/views/goods/goods-seller/goodsOperation.vue index 34434bfe..f6bd0ec1 100644 --- a/seller/src/views/goods/goods-seller/goodsOperation.vue +++ b/seller/src/views/goods/goods-seller/goodsOperation.vue @@ -1203,6 +1203,9 @@ export default { ); }, async GET_SkuSpec() { + if(!this.specSelected){ + return; + } let specResult = await API_GOODS.getSpecListSellerData({ pageNumber: 1, pageSize: 10, From d89b984344ed468f02c7496b66a4d02ad4e27d05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com> Date: Mon, 21 Jun 2021 18:11:46 +0800 Subject: [PATCH 30/35] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=B4=E6=92=AD?= =?UTF-8?q?=E9=97=B4=E6=97=B6=E9=97=B4=E6=B2=A1=E6=9C=89=E5=88=A4=E6=96=AD?= =?UTF-8?q?bug,=E5=BA=97=E9=93=BA=E5=90=8E=E5=8F=B0=EF=BC=8C=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E5=8F=91=E8=B4=A7=E6=B2=A1=E6=9C=89=E8=B7=B3=E8=BD=AC?= =?UTF-8?q?bug,=E7=9B=B4=E6=92=AD=E5=90=8E=E5=8F=B0=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=9B=B4=E6=92=AD=EF=BC=8C=E5=89=8D?= =?UTF-8?q?=E5=8F=B0=E6=98=BE=E7=A4=BA=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=9B=B4?= =?UTF-8?q?=E6=92=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manager/src/config/index.js | 8 ++--- .../src/views/lili-dialog/template/other.vue | 9 ++++-- manager/src/views/order/order/orderList.vue | 2 +- seller/src/config/index.js | 8 ++--- seller/src/views/promotion/live/addLive.vue | 32 +++++++++++++------ 5 files changed, 39 insertions(+), 20 deletions(-) diff --git a/manager/src/config/index.js b/manager/src/config/index.js index 8b6b162f..1a28698c 100644 --- a/manager/src/config/index.js +++ b/manager/src/config/index.js @@ -21,10 +21,10 @@ export default { // 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: 'http://192.168.0.100:8890', + buyer: 'http://192.168.0.100:8888', + seller: 'http://192.168.0.100:8889', + manager: 'http://192.168.0.100:8887' }, api_prod: { common: "https://common-api.pickmall.cn", diff --git a/manager/src/views/lili-dialog/template/other.vue b/manager/src/views/lili-dialog/template/other.vue index 2e44016b..709e28d6 100644 --- a/manager/src/views/lili-dialog/template/other.vue +++ b/manager/src/views/lili-dialog/template/other.vue @@ -18,7 +18,7 @@
- +
@@ -74,7 +74,12 @@ export default { icon: "md-happy", ___type: "sign", }, - + { + title: "小程序直播", + icon: "ios-videocam", + ___type: "live", + }, + ], linkItem: { title: "外部链接", diff --git a/manager/src/views/order/order/orderList.vue b/manager/src/views/order/order/orderList.vue index 19bb9905..03b982b8 100644 --- a/manager/src/views/order/order/orderList.vue +++ b/manager/src/views/order/order/orderList.vue @@ -230,7 +230,7 @@ export default { title: "操作", key: "action", align: "center", - width: 100, + width: 150, render: (h, params) => { return h("div", [ h( diff --git a/seller/src/config/index.js b/seller/src/config/index.js index 27da5927..17f824e8 100644 --- a/seller/src/config/index.js +++ b/seller/src/config/index.js @@ -22,10 +22,10 @@ export default { // 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: 'http://192.168.0.100:8890', + buyer: 'http://192.168.0.100:8888', + seller: 'http://192.168.0.100:8889', + manager: 'http://192.168.0.100:8887' }, api_prod: { common: 'https://common-api.pickmall.cn', diff --git a/seller/src/views/promotion/live/addLive.vue b/seller/src/views/promotion/live/addLive.vue index 5b5d0090..8f1ee673 100644 --- a/seller/src/views/promotion/live/addLive.vue +++ b/seller/src/views/promotion/live/addLive.vue @@ -328,20 +328,34 @@ export default { this.$set(this, "liveData", way); }, + /** + * 提交直播间商品 + */ + addGoods() { + addLiveGoods({ + roomId: this.$route.query.roomId, + liveGoodsId: item.liveGoodsId, + }); + }, + /** * dialog点击确定时判断 */ addGoods() { + console.log(this.commodityList); this.liveData.forEach((item, index) => { - this.commodityList.forEach((oldVal, i) => { - // 如果商品里面没有商品，以及添加商品为第一次的话 - if (oldVal.liveGoodsId != item.liveGoodsId) { - addLiveGoods({ - roomId: this.$route.query.roomId, - liveGoodsId: item.liveGoodsId, - }); - } - }); + if (this.commodityList.length == 1 && this.liveData.length == 1) { + addLiveGoods({ + roomId: this.$route.query.roomId, + liveGoodsId: item.liveGoodsId, + }); + } else { + this.commodityList.forEach((oldVal, i) => { + // 如果商品里面没有商品，以及添加商品为第一次的话 + if (oldVal.liveGoodsId != item.liveGoodsId) { + } + }); + } }); }, From 3b922839a1583e01dc038b9f61bf22db285dfea2 Mon Sep 17 00:00:00 2001 From: Chopper Date: Tue, 22 Jun 2021 14:59:20 +0800 Subject: [PATCH 31/35] =?UTF-8?q?=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=B1=95=E7=A4=BA=E6=90=9C=E7=B4=A2=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=EF=BC=8C=E5=B1=95=E7=A4=BA=E5=95=86=E5=93=81=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manager/src/views/goods/goods-info/goods.vue | 21 ++++++ seller/src/views/goods/goods-seller/goods.vue | 69 ++++++++++++------- 2 files changed, 67 insertions(+), 23 deletions(-) diff --git a/manager/src/views/goods/goods-info/goods.vue b/manager/src/views/goods/goods-info/goods.vue index d46ce5e8..21271b7e 100644 --- a/manager/src/views/goods/goods-info/goods.vue +++ b/manager/src/views/goods/goods-info/goods.vue @@ -38,6 +38,12 @@ + + + @@ -132,6 +138,7 @@ export default { pageSize: 10, // 页面大小 sort: "create_time", // 默认排序字段 order: "desc", // 默认排序方式 + goodsType: "", // 商品类型 }, underForm: { // 下架原因 reason: "", @@ -174,6 +181,20 @@ export default { ); }, }, + { + title: "商品类型", + key: "goodsType", + width: 130, + render: (h, params) => { + if (params.row.goodsType === 'PHYSICAL_GOODS') { + return h("div", "实物商品"); + } else if (params.row.goodsType === 'VIRTUAL_GOODS') { + return h("div", "虚拟商品"); + } else { + return h("div", "电子卡券"); + } + }, + }, { title: "状态", key: "marketEnable", diff --git a/seller/src/views/goods/goods-seller/goods.vue b/seller/src/views/goods/goods-seller/goods.vue index c20f5c3e..df95601d 100644 --- a/seller/src/views/goods/goods-seller/goods.vue +++ b/seller/src/views/goods/goods-seller/goods.vue @@ -4,7 +4,7 @@
- + + + + - + @@ -45,11 +51,12 @@
- {{row.goodsName}} + {{ row.goodsName }}
- +
@@ -60,13 +67,14 @@ - + - +
@@ -78,7 +86,8 @@ - + 卖家承担运费 @@ -245,6 +254,20 @@ export default { ); }, }, + { + title: "商品类型", + key: "goodsType", + width: 130, + render: (h, params) => { + if (params.row.goodsType === 'PHYSICAL_GOODS') { + return h("div", "实物商品"); + } else if (params.row.goodsType === 'VIRTUAL_GOODS') { + return h("div", "虚拟商品"); + } else { + return h("div", "电子卡券"); + } + }, + }, { title: "商品价格", key: "price", @@ -432,10 +455,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}}); }, //批量操作 @@ -458,7 +481,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; @@ -468,7 +491,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; } @@ -481,28 +504,28 @@ export default { } }); }, - changePage (v) { + changePage(v) { this.searchForm.pageNumber = v; this.getDataList(); this.clearSelectAll(); }, - changePageSize (v) { + changePageSize(v) { this.searchForm.pageSize = v; this.getDataList(); }, - handleSearch () { + handleSearch() { this.searchForm.pageNumber = 1; this.searchForm.pageSize = 10; this.getDataList(); }, - handleReset () { + handleReset() { this.searchForm = {}; this.searchForm.pageNumber = 1; this.searchForm.pageSize = 10; // 重新加载数据 this.getDataList(); }, - changeSort (e) { + changeSort(e) { this.searchForm.sort = e.key; this.searchForm.order = e.order; if (e.order === "normal") { @@ -510,15 +533,15 @@ export default { } this.getDataList(); }, - clearSelectAll () { + clearSelectAll() { this.$refs.table.selectAll(false); }, - changeSelect (e) { + changeSelect(e) { this.selectList = e; this.selectCount = e.length; }, //保存运费模板信息 - saveShipTemplate () { + saveShipTemplate() { if (this.shipTemplateForm.freightPayer == "STORE") { { this.shipTemplateForm.templateId = 0; @@ -716,10 +739,10 @@ export default { }); }, }, - mounted () { - this.init(); + mounted() { + this.init(); }, - activated () { + activated() { this.init(); }, }; From d3576b691cc388ce1c8335096a970b3c5035633b Mon Sep 17 00:00:00 2001 From: Chopper Date: Tue, 22 Jun 2021 15:16:02 +0800 Subject: [PATCH 32/35] =?UTF-8?q?=E5=95=86=E5=93=81=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=88=9D=E5=A7=8B=E5=8C=96=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manager/src/views/goods/goods-info/goods.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/manager/src/views/goods/goods-info/goods.vue b/manager/src/views/goods/goods-info/goods.vue index 21271b7e..a63543e9 100644 --- a/manager/src/views/goods/goods-info/goods.vue +++ b/manager/src/views/goods/goods-info/goods.vue @@ -138,7 +138,6 @@ export default { pageSize: 10, // 页面大小 sort: "create_time", // 默认排序字段 order: "desc", // 默认排序方式 - goodsType: "", // 商品类型 }, underForm: { // 下架原因 reason: "", From 8e239a5bbfab4d4b63d2784488f53a16e37e027f Mon Sep 17 00:00:00 2001 From: Chopper Date: Tue, 22 Jun 2021 17:36:07 +0800 Subject: [PATCH 33/35] =?UTF-8?q?token=20=E8=A7=A3=E6=9E=90=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buyer/src/plugins/request.js | 104 +++++++++++++++++------------------ 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/buyer/src/plugins/request.js b/buyer/src/plugins/request.js index b937df34..7d3233d5 100644 --- a/buyer/src/plugins/request.js +++ b/buyer/src/plugins/request.js @@ -1,27 +1,27 @@ // import Vue from 'vue'; -import axios from "axios"; -import https from "https"; -import { Message, Spin, Modal } from "view-design"; -import Storage from "./storage"; -import config from "@/config"; -import router from "../router/index.js"; -import store from "../vuex/store"; -import { handleRefreshToken } from "@/api/index"; -const qs = require("qs"); +import axios from 'axios'; +import https from 'https'; +import { Message, Spin, Modal } from 'view-design'; +import Storage from './storage'; +import config from '@/config'; +import router from '../router/index.js'; +import store from '../vuex/store'; +import { handleRefreshToken } from '@/api/index'; +const qs = require('qs'); export const buyerUrl = - process.env.NODE_ENV === "development" + process.env.NODE_ENV === 'development' ? config.api_dev.buyer : config.api_prod.buyer; export const commonUrl = - process.env.NODE_ENV === "development" + process.env.NODE_ENV === 'development' ? config.api_dev.common : config.api_prod.common; export const managerUrl = - process.env.NODE_ENV === "development" + process.env.NODE_ENV === 'development' ? config.api_dev.manager : config.api_prod.manager; export const sellerUrl = - process.env.NODE_ENV === "development" + process.env.NODE_ENV === 'development' ? config.api_dev.seller : config.api_prod.seller; // 创建axios实例 @@ -35,7 +35,7 @@ const service = axios.create({ }), paramsSerializer: params => qs.stringify(params, { - arrayFormat: "repeat" + arrayFormat: 'repeat' }) }); @@ -44,15 +44,15 @@ service.interceptors.request.use( config => { const { loading } = config; // 如果是put/post请求，用qs.stringify序列化参数 - const isPutPost = config.method === "put" || config.method === "post"; - const isJson = config.headers["Content-Type"] === "application/json"; - const isFile = config.headers["Content-Type"] === "multipart/form-data"; + const isPutPost = config.method === 'put' || config.method === 'post'; + const isJson = config.headers['Content-Type'] === 'application/json'; + const isFile = config.headers['Content-Type'] === 'multipart/form-data'; if (isPutPost && isJson) { config.data = JSON.stringify(config.data); } if (isPutPost && !isFile && !isJson) { config.data = qs.stringify(config.data, { - arrayFormat: "repeat" + arrayFormat: 'repeat' }); } /** 配置全屏加载 */ @@ -60,16 +60,16 @@ service.interceptors.request.use( config.loading = Spin.show(); } - const uuid = Storage.getItem("uuid"); - config.headers["uuid"] = uuid; + const uuid = Storage.getItem('uuid'); + config.headers['uuid'] = uuid; // 获取访问Token - let accessToken = Storage.getItem("accessToken"); + let accessToken = Storage.getItem('accessToken'); if (accessToken && config.needToken) { - config.headers["accessToken"] = accessToken; + config.headers['accessToken'] = accessToken; // 解析当前token时间 let jwtData = JSON.parse( - decodeURIComponent(escape(window.atob(accessToken.split(".")[1]))) + decodeURIComponent(escape(window.atob(accessToken.split('.')[1].replace(/-/g, '+').replace(/_/g, '/')))) ); if (jwtData.exp < Math.round(new Date() / 1000)) { refresh() @@ -83,33 +83,33 @@ service.interceptors.request.use( } ); -async function refresh() { +async function refresh () { const getTokenRes = await refreshToken(); - if (getTokenRes === "success") { + if (getTokenRes === 'success') { // 刷新token if (isRefreshToken === 1) { error.response.config.headers.accessToken = Storage.getItem( - "accessToken" + 'accessToken' ); return service(error.response.config); } else { router.go(0); } } else { - Storage.removeItem("accessToken"); - Storage.removeItem("refreshToken"); - Storage.removeItem("userInfo"); - Storage.setItem("cartNum", 0); - store.commit("SET_CARTNUM", 0); - console.log("1111"); + Storage.removeItem('accessToken'); + Storage.removeItem('refreshToken'); + Storage.removeItem('userInfo'); + Storage.setItem('cartNum', 0); + store.commit('SET_CARTNUM', 0); + console.log('1111'); Modal.confirm({ - title: "请登录", - content: "

请登录后执行此操作

", - okText: "立即登录", - cancelText: "继续浏览", + title: '请登录', + content: '

请登录后执行此操作

', + okText: '立即登录', + cancelText: '继续浏览', onOk: () => { router.push({ - path: "/login", + path: '/login', query: { rePath: router.history.current.path, query: JSON.stringify(router.history.current.query) @@ -146,9 +146,9 @@ service.interceptors.response.use( } else { if (error.message) { let _message = - error.code === "ECONNABORTED" - ? "连接超时，请稍候再试！" - : "网络错误，请稍后再试！"; + error.code === 'ECONNABORTED' + ? '连接超时，请稍候再试！' + : '网络错误，请稍后再试！'; Message.error(errorData.message || _message); } } @@ -171,13 +171,13 @@ const closeLoading = target => { }; export const Method = { - GET: "get", - POST: "post", - PUT: "put", - DELETE: "delete" + GET: 'get', + POST: 'post', + PUT: 'put', + DELETE: 'delete' }; -export default function request(options) { +export default function request (options) { // 如果是服务端或者是请求的刷新token，不需要检查token直接请求。 // if (process.server || options.url.indexOf('passport/token') !== -1) { return service(options); @@ -186,19 +186,19 @@ export default function request(options) { } // 防抖闭包来一波 -function getTokenDebounce() { +function getTokenDebounce () { let lock = false; let success = false; - return function() { + return function () { if (!lock) { lock = true; - let oldRefreshToken = Storage.getItem("refreshToken"); + let oldRefreshToken = Storage.getItem('refreshToken'); handleRefreshToken(oldRefreshToken) .then(res => { if (res.success) { let { accessToken, refreshToken } = res.result; - Storage.setItem("accessToken", accessToken); - Storage.setItem("refreshToken", refreshToken); + Storage.setItem('accessToken', accessToken); + Storage.setItem('refreshToken', refreshToken); success = true; lock = false; @@ -220,9 +220,9 @@ function getTokenDebounce() { if (!lock) { clearInterval(timer); if (success) { - resolve("success"); + resolve('success'); } else { - resolve("fail"); + resolve('fail'); } } }, 500); // 轮询时间间隔 From bce709a57a1b4b2449f53768075c319832c0e1b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com> Date: Tue, 22 Jun 2021 18:11:23 +0800 Subject: [PATCH 34/35] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=BF=90=E8=90=A5?= =?UTF-8?q?=E5=90=8E=E5=8F=B0=E5=87=BA=E7=8E=B0=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manager/src/config/index.js | 8 +- .../views/order/order/fictitiousOrderList.vue | 6 +- manager/src/views/order/order/orderDetail.vue | 2 +- manager/src/views/promotion/coupon/coupon.vue | 6 +- .../src/views/promotion/seckill/seckill.vue | 97 ++++--------- .../views/promotion/seckill/setupSeckill.vue | 4 +- .../views/statistics/order/orderDetail.vue | 2 +- seller/src/config/index.js | 16 +- seller/src/utils/filters.js | 137 +++++++++++------- seller/src/views/order/order/orderDetail.vue | 2 +- seller/src/views/promotion/coupon/coupon.vue | 132 +++++------------ 11 files changed, 172 insertions(+), 240 deletions(-) diff --git a/manager/src/config/index.js b/manager/src/config/index.js index 1a28698c..8b6b162f 100644 --- a/manager/src/config/index.js +++ b/manager/src/config/index.js @@ -21,10 +21,10 @@ export default { // buyer: "https://buyer-api.pickmall.cn", // seller: "https://store-api.pickmall.cn", // manager: "https://admin-api.pickmall.cn" - common: 'http://192.168.0.100:8890', - buyer: 'http://192.168.0.100:8888', - seller: 'http://192.168.0.100:8889', - manager: 'http://192.168.0.100:8887' + 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/order/order/fictitiousOrderList.vue b/manager/src/views/order/order/fictitiousOrderList.vue index 2d4c9ac3..da5d7bb9 100644 --- a/manager/src/views/order/order/fictitiousOrderList.vue +++ b/manager/src/views/order/order/fictitiousOrderList.vue @@ -94,8 +94,8 @@ // 搜索框初始化对象 pageNumber: 1, // 当前页数 pageSize: 10, // 页面大小 - sort: "createTime", // 默认排序字段 - order: "desc", // 默认排序方式 + sort: "", // 默认排序字段 + order: "", // 默认排序方式 startDate: "", // 起始时间 endDate: "", // 终止时间 orderType: "FICTITIOUS", @@ -118,8 +118,6 @@ title: "下单时间", key: "createTime", width: 200, - sortable: true, - sortType: "desc", }, { title: "订单来源", diff --git a/manager/src/views/order/order/orderDetail.vue b/manager/src/views/order/order/orderDetail.vue index 2005fe73..ddf1d3a0 100644 --- a/manager/src/views/order/order/orderDetail.vue +++ b/manager/src/views/order/order/orderDetail.vue @@ -37,7 +37,7 @@
订单来源：
- {{ orderInfo.order.clientType }} + {{ orderInfo.order.clientType | clientTypeWay}}
diff --git a/manager/src/views/promotion/coupon/coupon.vue b/manager/src/views/promotion/coupon/coupon.vue index 7f2ae93d..c34bb812 100644 --- a/manager/src/views/promotion/coupon/coupon.vue +++ b/manager/src/views/promotion/coupon/coupon.vue @@ -101,7 +101,7 @@ export default { { title: "面额/折扣", key: "price", - width: 120, + width: 100, render: (h, params) => { if (params.row.price) { return h( @@ -117,14 +117,14 @@ export default { { title: "领取数量/总数量", key: "publishNum", - width: 150, + width: 130, render: (h, params) => { return h( "div", params.row.receivedNum + "/" + params.row.publishNum ); }, - minWidth: 130, + }, { title: "优惠券类型", diff --git a/manager/src/views/promotion/seckill/seckill.vue b/manager/src/views/promotion/seckill/seckill.vue index 00e634dd..3b2531ab 100644 --- a/manager/src/views/promotion/seckill/seckill.vue +++ b/manager/src/views/promotion/seckill/seckill.vue @@ -24,78 +24,35 @@ - - -
- - -
@@ -302,7 +259,7 @@ export default { diff --git a/manager/src/views/promotion/seckill/setupSeckill.vue b/manager/src/views/promotion/seckill/setupSeckill.vue index 9ad7c77b..0ab8ce68 100644 --- a/manager/src/views/promotion/seckill/setupSeckill.vue +++ b/manager/src/views/promotion/seckill/setupSeckill.vue @@ -1,5 +1,5 @@