订单来源
- {{res.clientType}}
+ {{res.clientType | clientTypeWay}}
订单状态
diff --git a/seller/src/api/goods.js b/seller/src/api/goods.js
index 70ebe9cc..958e3770 100644
--- a/seller/src/api/goods.js
+++ b/seller/src/api/goods.js
@@ -209,11 +209,6 @@ 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);
@@ -318,7 +313,7 @@ export const getCategoryParamsListDataSeller = (id, params) => {
//保存获取关联规格
export const getGoodsSpecInfoSeller = (category_id, params) => {
- return getRequest(`/goods/category/spec/goods/${category_id}`, params);
+ return getRequest(`/goods/spec/${category_id}`, params);
};
//批量设置运费模板
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 2016930c..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",
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/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 df95601d..48bae50e 100644
--- a/seller/src/views/goods/goods-seller/goods.vue
+++ b/seller/src/views/goods/goods-seller/goods.vue
@@ -170,32 +170,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",},},"审核拒绝");
}
},
},
@@ -260,11 +239,11 @@ export default {
width: 130,
render: (h, params) => {
if (params.row.goodsType === 'PHYSICAL_GOODS') {
- return h("div", "实物商品");
+ return h("Tag", {props: {color: "geekblue"}},"实物商品");
} else if (params.row.goodsType === 'VIRTUAL_GOODS') {
- return h("div", "虚拟商品");
+ return h("Tag", {props: {color: "purple"}},"虚拟商品");
} else {
- return h("div", "电子卡券");
+ return h("Tag", {props: {color: "cyan"}},"电子卡券");
}
},
},
@@ -297,32 +276,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"}},"审核拒绝");
}
},
},
@@ -333,28 +291,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",
diff --git a/seller/src/views/goods/goods-seller/goodsOperation.vue b/seller/src/views/goods/goods-seller/goodsOperation.vue
index f6bd0ec1..d892cdf4 100644
--- a/seller/src/views/goods/goods-seller/goodsOperation.vue
+++ b/seller/src/views/goods/goods-seller/goodsOperation.vue
@@ -317,7 +317,7 @@
-
+
商品物流信息
@@ -325,24 +325,11 @@
kg
-
-
-
- 卖家承担运费
-
-
- 使用物流规则
-
-
-
+
-
+
其他信息
@@ -431,10 +418,11 @@
-
-
@@ -632,8 +620,6 @@ export default {
salesModel: "RETAIL",
/** 商品参数列表 */
goodsParamsList: [],
- /** 运费承担者 */
- // freightPayer: "STORE",
/** 商品重量 */
weight: "",
/** 商品相册列表 */
@@ -710,9 +696,6 @@ export default {
/** 当前百分比 */
currentPercent: 0,
- /** 物流模板是否展示 **/
- logisticsTemplateShow: false,
-
/** 运费模板 **/
logisticsTemplate: [],
@@ -779,6 +762,12 @@ export default {
this.accessToken = {
accessToken: this.getStore("accessToken"),
};
+ // 获取运费模板
+ API_Shop.getShipTemplate().then((res) => {
+ if (res.success) {
+ this.logisticsTemplate = res.result;
+ }
+ })
//编辑商品
if (this.$route.query.id) {
this.activestep = 1;
@@ -786,7 +775,7 @@ export default {
this.GET_GoodData();
this.selectGoodsType = false;
}
- //编辑模版/草稿
+ //编辑模版
else if (this.$route.query.draftId) {
this.draftId = this.$route.query.draftId;
this.activestep = 1;
@@ -806,7 +795,6 @@ export default {
this.baseInfoForm = {
salesModel: "RETAIL",
goodsParamsList: [],
- // freightPayer: "STORE",
weight: "",
goodsGalleryFiles: [],
release: "true",
@@ -984,20 +972,7 @@ export default {
});
}
},
- //选择运费模板则展示运费规则
- logisticsTemplateChange(v) {
- if (v == "BUYER") {
- // 如果买家承担运费 则需要查询运费规则
- API_Shop.getShipTemplate().then((res) => {
- if (res.success) {
- this.logisticsTemplate = res.result;
- }
- });
- this.logisticsTemplateShow = true;
- } else {
- this.logisticsTemplateShow = false;
- }
- },
+
gotoGoodsList() {
this.$router.push({ name: "goods" });
},
@@ -1053,15 +1028,8 @@ export default {
...this.baseInfoForm,
...response.result,
};
- console.warn(this.baseInfoForm);
- // if (this.baseInfoForm.freightPayer === "BUYER") {
- // API_Shop.getShipTemplate().then((res) => {
- // if (res.success) {
- // this.logisticsTemplate = res.result;
- // }
- // });
- // this.logisticsTemplateShow = true;
- // }
+ // console.warn(this.baseInfoForm);
+
this.baseInfoForm.release = "true";
this.baseInfoForm.recommend = this.baseInfoForm.recommend
? "true"
@@ -1555,7 +1523,6 @@ export default {
},
/** 下一步*/
next() {
- console.log(111);
window.scrollTo(0, 0);
if (this.activestep === 0 && this.draftId) {
this.activestep = 1;
@@ -1666,10 +1633,6 @@ export default {
this.submitLoading = false;
return;
}
- //如果选择的是卖家承担运费 则运费模板重置为0
- // if (this.baseInfoForm.freightPayer !== "BUYER") {
- // this.baseInfoForm.templateId = 0;
- // }
this.baseInfoForm.skuList = this.skuTableData.map((sku) => {
delete sku._index;
@@ -1762,7 +1725,7 @@ export default {
},
});
},
- SAVE_DRAFT_GOODS() {
+ SAVE_DRAFT_GOODS() { // 保存草稿商品
API_GOODS.saveDraftGoods(this.baseInfoForm).then((res) => {
if (res.success) {
this.$Message.info("保存成功！");
diff --git a/seller/src/views/logistics/index.vue b/seller/src/views/logistics/index.vue
index a8e7bc91..d773df85 100644
--- a/seller/src/views/logistics/index.vue
+++ b/seller/src/views/logistics/index.vue
@@ -134,21 +134,18 @@ export default {
key: "name",
minWidth: 120
},
-
{
title: "状态",
key: "disabled",
minWidth: 50,
render(h, params) {
- return h("Badge", {
- props: {
- status: params.row.disabled ? "success" : "error",
- text: params.row.disabled ? "开启" : "关闭",
- },
- });
+ if(params.row.disabled){
+ return h("div", [h("tag", {props: {color: "green"}}, "开启")]);
+ }else{
+ return h("div", [h("tag", {props: {color: "volcano"}}, "关闭")]);
+ }
},
},
-
{
title: "操作",
key: "action",
diff --git a/seller/src/views/member/memberComment.vue b/seller/src/views/member/memberComment.vue
index c4eb28ff..e0c1f486 100644
--- a/seller/src/views/member/memberComment.vue
+++ b/seller/src/views/member/memberComment.vue
@@ -210,11 +210,11 @@ export default {
width: 100,
render: (h, params) => {
if (params.row.grade == "GOOD") {
- return h("Badge", {props: {status: "success", text: "好评"}})
+ return h("Tag", {props: {color: "green",},}, "好评");
} else if (params.row.grade == "MODERATE") {
- return h("Badge", {props: {status: "success", text: "中评"}})
- } else if (params.row.grade == "WORSE") {
- return h("Badge", {props: {status: "error", text: "差评"}})
+ return h("Tag", {props: {color: "orange",},}, "中评");
+ } else {
+ return h("Tag", {props: {color: "red",},}, "差评");
}
}
},
@@ -224,9 +224,9 @@ export default {
width: 100,
render: (h, params) => {
if (params.row.status === "OPEN") {
- return h("Badge", {props: {status: "success", text: "展示"}})
+ return h("Tag", {props: {color: "green"}},"展示")
} else {
- return h("Badge", {props: {status: "error", text: "隐藏"}})
+ return h("Tag", {props: {color: "red"}},"隐藏")
}
},
},
@@ -236,9 +236,9 @@ export default {
width: 110,
render: (h, params) => {
if (params.row.replyStatus) {
- return h("Badge", {props: {status: "success", text: "已回复"}})
+ return h("Tag", {props: {color: "green"}},"已回复")
} else {
- return h("Badge", {props: {status: "error", text: "未回复"}})
+ return h("Tag", {props: {color: "blue"}},"未回复")
}
},
},
@@ -334,7 +334,7 @@ export default {
this.loading = false;
if (res.success) {
this.data = res.result.records;
- this.total = res.result.total;
+ this.total = res.result.total;
}
});
},
diff --git a/seller/src/views/my-components/lili/upload-pic-thumb.vue b/seller/src/views/my-components/lili/upload-pic-thumb.vue
index 4aa121b1..a3e7cc9c 100644
--- a/seller/src/views/my-components/lili/upload-pic-thumb.vue
+++ b/seller/src/views/my-components/lili/upload-pic-thumb.vue
@@ -1,49 +1,50 @@
-
-
-
-
![]()
-
-
-
+
+
+
+
+
![]()
+
+
+
+
+
+
-
-
-
-
-
-
+
+
![无效的图片链接]()
@@ -252,10 +253,12 @@ export default {
}
};
-
+