-
核验订单号
+
核验码
@@ -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 05/48] =?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 06/48] =?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 07/48] =?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 08/48] =?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 09/48] =?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 10/48] =?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 @@