订单状态
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",
diff --git a/seller/src/api/goods.js b/seller/src/api/goods.js
index 70ebe9cc..dd8e4264 100644
--- a/seller/src/api/goods.js
+++ b/seller/src/api/goods.js
@@ -132,13 +132,13 @@ export const delSpec = (id, params) => {
return deleteRequest(`/goods/spec/del/${id}`, params);
};
// 获取商品规格值列表
-export const getSpecValuesListData = (id, params) => {
- return getRequest(`/goods/spec-values/values/${id}`, params);
-};
+// export const getSpecValuesListData = (id, params) => {
+// return getRequest(`/goods/spec-values/values/${id}`, params);
+// };
// 添加商品规格值
-export const saveSpecValues = (id, params) => {
- return postRequest(`/goods/spec-values/save/${id}`, params);
-};
+// export const saveSpecValues = (id, params) => {
+// return postRequest(`/goods/spec-values/save/${id}`, params);
+// };
// 查询某分类下的全部子分类列表
export const getGoodsCategory = parent_id => {
@@ -209,24 +209,19 @@ export const deleteParamsGroup = (id, params) => {
return deleteRequest(`/goods/category/parameters/${id}`, params);
};
-//保存获取关联规格
-export const getGoodsSpecInfo = (category_id, params) => {
- return getRequest(`/goods/category/spec/goods/${category_id}`, params);
-};
-
//获取sku列表
export const getSkuPage = params => {
return getRequest(`/goodsSku/getByPage`, params);
};
// 获取商品规格值列表
-export const getSpecValuesListSellerData = (id, params) => {
- return getRequest(`/goods/spec-values/values/${id}`, params);
-};
+// export const getSpecValuesListSellerData = (id, params) => {
+// return getRequest(`/goods/spec-values/values/${id}`, params);
+// };
// 添加商品规格值
-export const saveSpecValuesSeller = (id, params) => {
- return postRequest(`/goods/spec-values/save/${id}`, params);
-};
+// export const saveSpecValuesSeller = (id, params) => {
+// return postRequest(`/goods/spec-values/save/${id}`, params);
+// };
// 获取商品规格分页列表
export const getSpecListSellerData = params => {
@@ -317,8 +312,8 @@ export const getCategoryParamsListDataSeller = (id, params) => {
};
//保存获取关联规格
-export const getGoodsSpecInfoSeller = (category_id, params) => {
- return getRequest(`/goods/category/spec/goods/${category_id}`, params);
+export const getGoodsSpecInfoSeller = (category_id) => {
+ return getRequest(`/goods/spec/${category_id}`);
};
//批量设置运费模板
diff --git a/seller/src/libs/axios.js b/seller/src/libs/axios.js
index 0004efb5..3cc1ccd4 100644
--- a/seller/src/libs/axios.js
+++ b/seller/src/libs/axios.js
@@ -69,14 +69,6 @@ service.interceptors.response.use(
router.push("/login");
}
break;
- case 403:
- // 权限不足
- if (data.message !== null) {
- Message.error(data.message);
- } else {
- Message.error("权限不足");
- }
- break;
case 500:
// 系统异常
if (data.message !== null) {
@@ -94,6 +86,8 @@ service.interceptors.response.use(
if (error.response) {
if (error.response.status === 401) {
// 这种情况一般调到登录页
+ } else if (error.response.status === 404) {
+ // 避免刷新token报错
} else if (error.response.status === 403) {
isRefreshToken++;
if (isRefreshToken === 1) {
diff --git a/seller/src/libs/routerJson.js b/seller/src/libs/routerJson.js
index 994f24e6..a551330c 100644
--- a/seller/src/libs/routerJson.js
+++ b/seller/src/libs/routerJson.js
@@ -54,20 +54,20 @@ export const result = [
children: null,
permTypes: []
},
- {
- name: "daft-goods",
- showAlways: true,
- level: 2,
- type: 0,
- title: "草稿商品",
- path: "daft-goods",
- component: "goods/goods-seller/draftGoods",
- icon: "md-person",
- isMenu: true,
- url: "",
- children: null,
- permTypes: []
- },
+ // {
+ // name: "daft-goods",
+ // showAlways: true,
+ // level: 2,
+ // type: 0,
+ // title: "草稿商品",
+ // path: "daft-goods",
+ // component: "goods/goods-seller/draftGoods",
+ // icon: "md-person",
+ // isMenu: true,
+ // url: "",
+ // children: null,
+ // permTypes: []
+ // },
{
path: "template-goods",
@@ -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: []
}
]
},
@@ -381,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,
@@ -422,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/main.js b/seller/src/main.js
index 094434c9..c73b4bbc 100644
--- a/seller/src/main.js
+++ b/seller/src/main.js
@@ -5,7 +5,7 @@ import ViewUI from "view-design";
import "./styles/theme.less";
import "core-js/stable";
-import "regenerator-runtime/runtime";
+// import "regenerator-runtime/runtime";
import vueQr from 'vue-qr'
import App from "./App";
diff --git a/seller/src/router/router.js b/seller/src/router/router.js
index 04b15601..78d0d2b7 100644
--- a/seller/src/router/router.js
+++ b/seller/src/router/router.js
@@ -5,7 +5,7 @@ export const loginRouter = {
path: "/login",
name: "login",
meta: {
- title: "登录 - lili商家后台 "
+ title: "登录 - lili商家后台"
},
component: () => import("@/views/login.vue")
};
diff --git a/seller/src/store/modules/app.js b/seller/src/store/modules/app.js
index 8e896575..6d1d4525 100644
--- a/seller/src/store/modules/app.js
+++ b/seller/src/store/modules/app.js
@@ -7,6 +7,7 @@ import Vue from 'vue';
const app = {
state: {
shipTemplates:"",
+ regions:[], //此处是在地区选择器时赋值一次
styleStore:"", //移动端楼层装修中选择风格存储
loading: false, // 全局加载动画
added: false, // 加载路由标识
diff --git a/seller/src/utils/filters.js b/seller/src/utils/filters.js
index f5b6f8a4..c0b03cf1 100644
--- a/seller/src/utils/filters.js
+++ b/seller/src/utils/filters.js
@@ -6,17 +6,32 @@
* @returns {*}
*/
export function unitPrice(val, unit, location) {
- let price = formatPrice(val)
- if (location === 'before') {
- return price.substr(0, price.length - 3)
+ let price = formatPrice(val);
+ if (location === "before") {
+ return price.substr(0, price.length - 3);
}
- if (location === 'after') {
- return price.substr(-2)
+ if (location === "after") {
+ return price.substr(-2);
}
- return (unit || '') + price
+ return (unit || "") + price;
}
-
+/**
+ * 订单来源
+ */
+export function clientTypeWay(val) {
+ if (val == "H5") {
+ return "移动端";
+ } else if (val == "PC") {
+ return "PC端";
+ } else if (val == "WECHAT_MP") {
+ return "小程序端";
+ } else if (val == "APP") {
+ return "移动应用端";
+ } else {
+ return val;
+ }
+}
/**
* 货币格式化
@@ -24,8 +39,8 @@ export function unitPrice(val, unit, location) {
* @returns {string}
*/
export function formatPrice(price) {
- if (typeof price !== 'number') return price
- return String(Number(price).toFixed(2)).replace(/\B(?=(\d{3})+(?!\d))/g, ',')
+ if (typeof price !== "number") return price;
+ return String(Number(price).toFixed(2)).replace(/\B(?=(\d{3})+(?!\d))/g, ",");
}
/**
@@ -35,51 +50,60 @@ export function formatPrice(price) {
* @returns {*|string}
*/
export function unixToDate(unix, format) {
- let _format = format || 'yyyy-MM-dd hh:mm:ss'
- const d = new Date(unix * 1000)
+ let _format = format || "yyyy-MM-dd hh:mm:ss";
+ const d = new Date(unix * 1000);
const o = {
- 'M+': d.getMonth() + 1,
- 'd+': d.getDate(),
- 'h+': d.getHours(),
- 'm+': d.getMinutes(),
- 's+': d.getSeconds(),
- 'q+': Math.floor((d.getMonth() + 3) / 3),
+ "M+": d.getMonth() + 1,
+ "d+": d.getDate(),
+ "h+": d.getHours(),
+ "m+": d.getMinutes(),
+ "s+": d.getSeconds(),
+ "q+": Math.floor((d.getMonth() + 3) / 3),
S: d.getMilliseconds()
- }
- if (/(y+)/.test(_format)) _format = _format.replace(RegExp.$1, (d.getFullYear() + '').substr(4 - RegExp.$1.length))
- for (const k in o) if (new RegExp('(' + k + ')').test(_format)) _format = _format.replace(RegExp.$1, (RegExp.$1.length === 1) ? (o[k]) : (('00' + o[k]).substr(('' + o[k]).length)))
- return _format
+ };
+ if (/(y+)/.test(_format))
+ _format = _format.replace(
+ RegExp.$1,
+ (d.getFullYear() + "").substr(4 - RegExp.$1.length)
+ );
+ for (const k in o)
+ if (new RegExp("(" + k + ")").test(_format))
+ _format = _format.replace(
+ RegExp.$1,
+ RegExp.$1.length === 1 ? o[k] : ("00" + o[k]).substr(("" + o[k]).length)
+ );
+ return _format;
}
//是否格式化
export function unixWhether(status) {
switch (status) {
- case 'YES':
- return "是"
- case 'NO':
- return "否"
+ case "YES":
+ return "是";
+ case "NO":
+ return "否";
}
}
export function unixSellerBillStatus(status_code) {
switch (status_code) {
- case 'OUT':
- return '已出账'
- case 'CHECK':
- return '已对账'
- case 'EXAMINE':
- return '已审核'
- case 'PAY':
- return '已结算'
- case 'COMPLETE':
- return '已完成'
+ case "OUT":
+ return "已出账";
+ case "CHECK":
+ return "已对账";
+ case "EXAMINE":
+ return "已审核";
+ case "PAY":
+ return "已结算";
+ case "COMPLETE":
+ return "已完成";
}
}
export function unixSwitchStatus(status_code) {
switch (status_code) {
- case 'OPEN':
- return '开启'
- case 'CLOSE':
- return '关闭'
+ case "OPEN":
+ return "开启";
+ case "CLOSE":
+ return "关闭";
}
}
@@ -89,30 +113,35 @@ export function unixSwitchStatus(status_code) {
* @returns {*}
*/
export function secrecyMobile(mobile) {
- mobile = String(mobile)
+ mobile = String(mobile);
if (!/\d{11}/.test(mobile)) {
- return mobile
+ return mobile;
}
- return mobile.replace(/(\d{3})(\d{4})(\d{4})/, '$1****$3')
+ return mobile.replace(/(\d{3})(\d{4})(\d{4})/, "$1****$3");
}
-
export function formatDate(date, fmt) {
if (/(y+)/.test(fmt)) {
- fmt = fmt.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length));
+ fmt = fmt.replace(
+ RegExp.$1,
+ (date.getFullYear() + "").substr(4 - RegExp.$1.length)
+ );
}
let o = {
- 'M+': date.getMonth() + 1,
- 'd+': date.getDate(),
- 'h+': date.getHours(),
- 'm+': date.getMinutes(),
- 's+': date.getSeconds()
+ "M+": date.getMonth() + 1,
+ "d+": date.getDate(),
+ "h+": date.getHours(),
+ "m+": date.getMinutes(),
+ "s+": date.getSeconds()
};
for (let k in o) {
- if (new RegExp(`(${k})`).test(fmt)) {
- let str = o[k] + '';
- fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? str : padLeftZero(str));
- }
+ if (new RegExp(`(${k})`).test(fmt)) {
+ let str = o[k] + "";
+ fmt = fmt.replace(
+ RegExp.$1,
+ RegExp.$1.length === 1 ? str : padLeftZero(str)
+ );
+ }
}
return fmt;
-};
+}
diff --git a/seller/src/views/goods/goods-seller/addGoods.scss b/seller/src/views/goods/goods-seller/addGoods.scss
index d7407073..40daebd9 100644
--- a/seller/src/views/goods/goods-seller/addGoods.scss
+++ b/seller/src/views/goods/goods-seller/addGoods.scss
@@ -395,11 +395,11 @@ div.base-info-item {
text-align: center;
border: 1px solid transparent;
border-radius: 4px;
- display: inline-flex;
- flex-direction: column;
+ display: inline-block;
background: #fff;
position: relative;
margin-right: 4px;
+ vertical-align: bottom;
}
.demo-upload-list img {
width: 100%;
diff --git a/seller/src/views/goods/goods-seller/goods.vue b/seller/src/views/goods/goods-seller/goods.vue
index c20f5c3e..d0d7a00e 100644
--- a/seller/src/views/goods/goods-seller/goods.vue
+++ b/seller/src/views/goods/goods-seller/goods.vue
@@ -12,6 +12,12 @@
+
+
+
@@ -45,11 +51,11 @@
-
+
@@ -66,8 +72,15 @@
-
-
+
+
+
+
+
+
+
+
+
@@ -161,32 +174,11 @@ export default {
width: 130,
render: (h, params) => {
if (params.row.isAuth == "TOBEAUDITED") {
- return h("div", [
- h("Badge", {
- props: {
- status: "error",
- text: "待审核",
- },
- }),
- ]);
+ return h("Tag", {props: {color: "blue",},},"待审核");
} else if (params.row.isAuth == "PASS") {
- return h("div", [
- h("Badge", {
- props: {
- status: "success",
- text: "审核通过",
- },
- }),
- ]);
+ return h("Tag", {props: {color: "green",},},"通过");
} else if (params.row.isAuth == "REFUSE") {
- return h("div", [
- h("Badge", {
- props: {
- status: "error",
- text: "审核拒绝",
- },
- }),
- ]);
+ return h("Tag", {props: {color: "red",},},"审核拒绝");
}
},
},
@@ -245,6 +237,20 @@ export default {
);
},
},
+ {
+ title: "商品类型",
+ key: "goodsType",
+ width: 130,
+ render: (h, params) => {
+ if (params.row.goodsType === 'PHYSICAL_GOODS') {
+ return h("Tag", {props: {color: "geekblue"}},"实物商品");
+ } else if (params.row.goodsType === 'VIRTUAL_GOODS') {
+ return h("Tag", {props: {color: "purple"}},"虚拟商品");
+ } else {
+ return h("Tag", {props: {color: "cyan"}},"电子卡券");
+ }
+ },
+ },
{
title: "商品价格",
key: "price",
@@ -274,32 +280,11 @@ export default {
width: 120,
render: (h, params) => {
if (params.row.isAuth == "PASS") {
- return h("div", [
- h("Badge", {
- props: {
- status: "success",
- text: "审核通过",
- },
- }),
- ]);
+ return h("Tag", {props: {color: "green"}},"通过");
} else if (params.row.isAuth == "TOBEAUDITED") {
- return h("div", [
- h("Badge", {
- props: {
- status: "error",
- text: "待审核",
- },
- }),
- ]);
+ return h("Tag", {props: {color: "volcano"}},"待审核");
} else if (params.row.isAuth == "REFUSE") {
- return h("div", [
- h("Badge", {
- props: {
- status: "error",
- text: "审核拒绝",
- },
- }),
- ]);
+ return h("Tag", {props: {color: "red"}},"审核拒绝");
}
},
},
@@ -310,28 +295,12 @@ export default {
sortable: false,
render: (h, params) => {
if (params.row.marketEnable == "DOWN") {
- return h("div", [
- h("Badge", {
- props: {
- status: "error",
- text: "下架",
- },
- }),
- ]);
+ return h("Tag", {props: {color: "red"}},"下架");
} else if (params.row.marketEnable == "UPPER") {
- return h("div", [
- h("Badge", {
- props: {
- status: "success",
- text: "上架",
- },
- }),
- ]);
- } else {
+ return h("Tag", {props: {color: "green"}},"上架");
}
},
},
-
{
title: "操作",
key: "action",
@@ -481,28 +450,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 +479,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 +685,10 @@ export default {
});
},
},
- mounted () {
- this.init();
+ mounted() {
+ this.init();
},
- activated () {
+ activated() {
this.init();
},
};
diff --git a/seller/src/views/goods/goods-seller/goodsOperation.vue b/seller/src/views/goods/goods-seller/goodsOperation.vue
index 34434bfe..84e9351a 100644
--- a/seller/src/views/goods/goods-seller/goodsOperation.vue
+++ b/seller/src/views/goods/goods-seller/goodsOperation.vue
@@ -3,21 +3,23 @@
-
-
![]()
+
+
![]()
-
{{item.title}}
-
{{item.desc}}
+
{{ item.title }}
+
{{ item.desc }}
返回
-
-
![]()
+
+
![]()
-
{{item.goodsName}}
-
{{item.sellingPoint || ''}}
+
{{ item.goodsName }}
+
{{ item.sellingPoint || '' }}
@@ -25,37 +27,38 @@
-
-
@@ -67,8 +70,7 @@
> {{ activeCategoryName3 }}
- 已选商品模版:{{goodsTemplates.find(item=>{return item.id == draftId}).goodsName}}
-
+ 已选商品模版:{{checkedTemplate()}}
@@ -84,11 +86,11 @@
-
+
-
+
-
+
零售型
@@ -125,18 +128,18 @@
商品规格及图片
@@ -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 bbda4d7d..c577c26c 100644
--- a/seller/src/views/order/order/orderList.vue
+++ b/seller/src/views/order/order/orderList.vue
@@ -8,14 +8,6 @@
-
-
-
@@ -38,21 +29,7 @@
-
-
-
-
-
@@ -76,13 +53,14 @@ export default {
// 搜索框初始化对象
pageNumber: 1, // 当前页数
pageSize: 10, // 页面大小
- sort: "createTime", // 默认排序字段
- order: "desc", // 默认排序方式
+ sort: "", // 默认排序字段
+ order: "", // 默认排序方式
startDate: "", // 起始时间
endDate: "", // 终止时间
orderSn: "",
buyerName: "",
orderStatus: "",
+ orderType: "NORMAL",
},
selectDate: null,
form: {
@@ -102,7 +80,7 @@ export default {
{
title: "订单号",
key: "sn",
- minWidth: 240,
+ minWidth: 200,
tooltip: true,
},
{
@@ -117,28 +95,12 @@ export default {
} else if (params.row.clientType == "WECHAT_MP") {
return h("div", {}, "小程序端");
} else if (params.row.clientType == "APP") {
- return h("div", {}, "移动应用端");
+ return h("div", {}, "APP端");
} else {
return h("div", {}, params.row.clientType);
}
},
},
- {
- 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",
@@ -164,30 +126,27 @@ export default {
minWidth: 100,
render: (h, params) => {
if (params.row.orderStatus == "UNPAID") {
- return h("div", [h("span", {}, "未付款")]);
+ return h("div", [h("tag", {props: {color: "magenta"}}, "未付款")]);
} else if (params.row.orderStatus == "PAID") {
- return h("div", [h("span", {}, "已付款")]);
+ return h("div", [h("tag", {props: {color: "blue"}}, "已付款")]);
} else if (params.row.orderStatus == "UNDELIVERED") {
- return h("div", [h("span", {}, "待发货")]);
+ return h("div", [h("tag", {props: {color: "geekblue"}}, "待发货")]);
} else if (params.row.orderStatus == "DELIVERED") {
- return h("div", [h("span", {}, "已发货")]);
+ return h("div", [h("tag", {props: {color: "cyan"}}, "已发货")]);
} else if (params.row.orderStatus == "COMPLETED") {
- return h("div", [h("span", {}, "已完成")]);
+ return h("div", [h("tag", {props: {color: "green"}}, "已完成")]);
} else if (params.row.orderStatus == "TAKE") {
- return h("div", [h("span", {}, "待核验")]);
+ return h("div", [h("tag", {props: {color: "volcano"}}, "待核验")]);
} else if (params.row.orderStatus == "CANCELLED") {
- return h("div", [h("span", {}, "已取消")]);
+ return h("div", [h("tag", {props: {color: "red"}}, "已取消")]);
}
},
},
{
title: "下单时间",
key: "createTime",
- width: 170,
- sortable: true,
- sortType: "desc",
+ width: 170
},
-
{
title: "操作",
key: "action",
@@ -229,8 +188,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 },
@@ -309,6 +266,9 @@ export default {
});
},
},
+ mounted() {
+ this.init();
+ },
activated() {
this.init();
},
diff --git a/seller/src/views/order/order/virtualOrderList.vue b/seller/src/views/order/order/virtualOrderList.vue
new file mode 100644
index 00000000..9c910dd2
--- /dev/null
+++ b/seller/src/views/order/order/virtualOrderList.vue
@@ -0,0 +1,285 @@
+
+
+
+
+
+
diff --git a/seller/src/views/order/receiptManager/receipt.vue b/seller/src/views/order/receiptManager/receipt.vue
index d03ff3eb..e354ee54 100644
--- a/seller/src/views/order/receiptManager/receipt.vue
+++ b/seller/src/views/order/receiptManager/receipt.vue
@@ -2,39 +2,15 @@
-
-
+
-
+
diff --git a/seller/src/views/promotion/coupon/coupon.vue b/seller/src/views/promotion/coupon/coupon.vue
index 9cd259de..5fae1965 100644
--- a/seller/src/views/promotion/coupon/coupon.vue
+++ b/seller/src/views/promotion/coupon/coupon.vue
@@ -2,29 +2,12 @@
-
@@ -55,57 +26,22 @@
-
-
-