- 
+
diff --git a/buyer/src/pages/payment/thirdPay.vue b/buyer/src/pages/payment/thirdPay.vue
index e953892a..470d6afa 100644
--- a/buyer/src/pages/payment/thirdPay.vue
+++ b/buyer/src/pages/payment/thirdPay.vue
@@ -70,7 +70,7 @@ export default {
payCallback(params).then(res => {
if (res.result) {
clearInterval(this.interval);
- this.$router.push('/payDone');
+ this.$router.push({path: '/payDone', query: {orderType: this.$route.query.orderType}});
}
});
}
diff --git a/buyer/src/plugins/request.js b/buyer/src/plugins/request.js
index 727ab21f..3e5e1e9e 100644
--- a/buyer/src/plugins/request.js
+++ b/buyer/src/plugins/request.js
@@ -69,10 +69,10 @@ service.interceptors.request.use(
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()
+ refresh(config)
}
}
@@ -142,6 +142,8 @@ service.interceptors.response.use(
refresh(error)
isRefreshToken = 0;
}
+ } else if (errorResponse.status === 404) {
+ // 避免刷新token时也提示报错信息
} else {
if (error.message) {
let _message =
diff --git a/buyer/yarn.lock b/buyer/yarn.lock
index 6dbcc1c8..afd75933 100644
--- a/buyer/yarn.lock
+++ b/buyer/yarn.lock
@@ -2051,7 +2051,7 @@ copy-webpack-plugin@^4.0.1:
p-limit "^1.0.0"
serialize-javascript "^1.4.0"
-core-js@^2.4.0, core-js@^2.5.0:
+core-js@^2.4.0, core-js@^2.5.0, core-js@^2.6.5:
version "2.6.12"
resolved "https://registry.npm.taobao.org/core-js/download/core-js-2.6.12.tgz?cache=0&sync_timestamp=1607216048810&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcore-js%2Fdownload%2Fcore-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
integrity sha1-2TM9+nsGXjR8xWgiGdb2kIWcwuw=
@@ -5150,6 +5150,16 @@ mute-stream@0.0.7:
resolved "https://registry.npm.taobao.org/mute-stream/download/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
+mv-count-down@^0.1.15:
+ version "0.1.15"
+ resolved "https://registry.npmjs.org/mv-count-down/-/mv-count-down-0.1.15.tgz#a3f3c1677576e592c7710b441b2dda96acac2702"
+ integrity sha512-7poh86i27D/u4AvE9Ne8QHhy61p4MYAhSf4XAVyxzL0gXVCyccJ0NtJferEOxBP6C2q9jImknpKLGdwnEeJ7qQ==
+ dependencies:
+ core-js "^2.6.5"
+ vue "^2.6.10"
+ vue-router "^3.0.3"
+ vuex "^3.0.1"
+
nan@^2.12.1, nan@^2.13.2:
version "2.14.2"
resolved "https://registry.npm.taobao.org/nan/download/nan-2.14.2.tgz?cache=0&sync_timestamp=1602591700047&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnan%2Fdownload%2Fnan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19"
@@ -8315,6 +8325,11 @@ vue-router@^3.0.1:
resolved "https://registry.npm.taobao.org/vue-router/download/vue-router-3.4.9.tgz?cache=0&sync_timestamp=1607347231238&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-router%2Fdownload%2Fvue-router-3.4.9.tgz#c016f42030ae2932f14e4748b39a1d9a0e250e66"
integrity sha1-wBb0IDCuKTLxTkdIs5odmg4lDmY=
+vue-router@^3.0.3:
+ version "3.5.2"
+ resolved "https://registry.npmjs.org/vue-router/-/vue-router-3.5.2.tgz#5f55e3f251970e36c3e8d88a7cd2d67a350ade5c"
+ integrity sha512-807gn82hTnjCYGrnF3eNmIw/dk7/GE4B5h69BlyCK9KHASwSloD1Sjcn06zg9fVG4fYH2DrsNBZkpLtb25WtaQ==
+
vue-style-loader@^3.0.0, vue-style-loader@^3.0.1:
version "3.1.2"
resolved "https://registry.npm.taobao.org/vue-style-loader/download/vue-style-loader-3.1.2.tgz#6b66ad34998fc9520c2f1e4d5fa4091641c1597a"
diff --git a/manager/package.json b/manager/package.json
index 112223b4..427ac89e 100644
--- a/manager/package.json
+++ b/manager/package.json
@@ -31,6 +31,7 @@
"sockjs-client": "^1.4.0",
"stompjs": "^2.3.3",
"swiper": "^6.3.5",
+ "uuid": "^8.3.2",
"view-design": "^4.2.0",
"vue": "^2.6.10",
"vue-apexcharts": "^1.5.1",
@@ -48,8 +49,7 @@
"vuex": "^3.4.0",
"wangeditor": "^4.5.3",
"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/manager/src/api/goods.js b/manager/src/api/goods.js
index 4b02cd15..13a4a41a 100644
--- a/manager/src/api/goods.js
+++ b/manager/src/api/goods.js
@@ -76,15 +76,15 @@ export const disableCategory = (id, type) => {
// 获取商品规格分页列表
export const getSpecListData = (params) => {
- return getRequest('/goods/spec/page', params)
+ return getRequest('/goods/spec', params)
}
// 添加或修改规格设置
export const insertSpec = (params) => {
return postRequest('/goods/spec', params)
}
// 添加或修改规格设置
-export const updateSpec = (params) => {
- return putRequest('/goods/spec', params)
+export const updateSpec = (id,params) => {
+ return putRequest(`/goods/spec/${id}`, params)
}
//根据分类id获取关联规格
export const getCategorySpecListData = (category_id, params) => {
@@ -94,15 +94,6 @@ export const getCategorySpecListData = (category_id, params) => {
export const delSpec = (id, params) => {
return deleteRequest(`/goods/spec/${id}`, params)
}
-// 获取商品规格值列表
-export const getSpecValuesListData = (id, params) => {
- return getRequest(`/goods/specValues/values/${id}`, params)
-}
-// 添加商品规格值
-export const saveSpecValues = (id, params) => {
- return postRequest(`/goods/specValues/save/${id}`, params)
-}
-
// 查询某分类下的全部子分类列表
export const getGoodsCategory = (parent_id) => {
diff --git a/manager/src/api/promotion.js b/manager/src/api/promotion.js
index 42173562..0c7c6113 100644
--- a/manager/src/api/promotion.js
+++ b/manager/src/api/promotion.js
@@ -30,7 +30,7 @@ export const getLiveList = params => {
// 获取直播间详情
export const getLiveInfo = studioId => {
- return getRequest(`/broadcast/studio/studioInfo/${studioId}`);
+ return getRequest(`/broadcast/studio/${studioId}`);
};
// 获取当前进行中的促销活动商品
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/libs/axios.js b/manager/src/libs/axios.js
index 6bd6d6c1..5d8c68ec 100644
--- a/manager/src/libs/axios.js
+++ b/manager/src/libs/axios.js
@@ -64,14 +64,6 @@ service.interceptors.response.use(
}
return data;
break;
- case 403:
- // 权限不足
- if (data.message !== null) {
- Message.error(data.message);
- } else {
- Message.error("权限不足");
- }
- break;
case 500:
// 系统异常
if (data.message !== null) {
@@ -89,6 +81,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/manager/src/main.js b/manager/src/main.js
index 2bbf62ee..fa03abd2 100644
--- a/manager/src/main.js
+++ b/manager/src/main.js
@@ -6,7 +6,7 @@ import ViewUI from 'view-design'
import './styles/theme.less';
import "core-js/stable"
-import "regenerator-runtime/runtime"
+// import "regenerator-runtime/runtime"
import App from './App'
import { router } from './router/index'
import store from './store'
diff --git a/manager/src/utils/filters.js b/manager/src/utils/filters.js
index 71c092db..9124cbfe 100644
--- a/manager/src/utils/filters.js
+++ b/manager/src/utils/filters.js
@@ -16,6 +16,22 @@ export function unitPrice(val, unit, location) {
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;
+ }
+}
diff --git a/manager/src/views/distribution/distribution.vue b/manager/src/views/distribution/distribution.vue
index e76799ab..7a2d5147 100644
--- a/manager/src/views/distribution/distribution.vue
+++ b/manager/src/views/distribution/distribution.vue
@@ -147,21 +147,13 @@ export default {
sortable: false,
render: (h, params) => {
if (params.row.distributionStatus == "PASS") {
- return h("Badge", {
- props: { status: "success", text: "审核通过" },
- });
+ return h("Tag", {props: {color: "green",},},"通过");
} else if (params.row.distributionStatus == "APPLY") {
- return h("Badge", {
- props: { status: "processing", text: "申请中" },
- });
+ return h("Tag", {props: {color: "geekblue",},},"待审核");
} else if (params.row.distributionStatus == "RETREAT") {
- return h("Badge", {
- props: { status: "warning", text: "已清退" },
- });
+ return h("Tag", {props: {color: "volcano",},},"清退");
} else if (params.row.distributionStatus == "REFUSE") {
- return h("Badge", {
- props: { status: "error", text: "审核拒绝" },
- });
+ return h("Tag", {props: {color: "red",},},"拒绝");
}
},
},
diff --git a/manager/src/views/distribution/distributionGoods.vue b/manager/src/views/distribution/distributionGoods.vue
index a78c5830..05acecf5 100644
--- a/manager/src/views/distribution/distributionGoods.vue
+++ b/manager/src/views/distribution/distributionGoods.vue
@@ -67,10 +67,12 @@ export default {
{
type: "selection",
width: 60,
- align: "center"
+ align: "center",
+ fixed: "left",
},
{
title: "商品图片",
+ fixed: "left",
key: "thumbnail",
width: 120,
align: "center",
diff --git a/manager/src/views/goods/goods-info/goods.vue b/manager/src/views/goods/goods-info/goods.vue
index d46ce5e8..6d442b05 100644
--- a/manager/src/views/goods/goods-info/goods.vue
+++ b/manager/src/views/goods/goods-info/goods.vue
@@ -38,6 +38,12 @@
+
+
+
支付宝
-
支付宝
- 
+
+
微信
+
+
+
diff --git a/manager/src/views/statistics/order/orderDetail.vue b/manager/src/views/statistics/order/orderDetail.vue
index 48a55ed2..fb9720fa 100644
--- a/manager/src/views/statistics/order/orderDetail.vue
+++ b/manager/src/views/statistics/order/orderDetail.vue
@@ -6,7 +6,7 @@
订单来源
- {{res.clientType}}
+ {{res.clientType | clientTypeWay}}
订单状态
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/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/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/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 f6bd0ec1..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 }}
返回
-
- ![]()
+
已选商品模版:{{goodsTemplates.find(item=>{return item.id == draftId}).goodsName}}
-
+ 已选商品模版:{{checkedTemplate()}}
@@ -84,11 +86,11 @@
-
+
-
+
-
+
零售型
@@ -125,18 +128,18 @@
-
+
-
+
-
+
+
- ![]()
+ ![]()
@@ -185,46 +182,39 @@
-
+
-
@@ -238,34 +228,36 @@
}
" :span-method="handleSpan">
-
+
-
+
-
+
-
+
-
+
-
+
-
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 @@
-
+
-
-
+
+
-
+ ![]()
@@ -25,37 +27,38 @@
-
-
-
{{item.goodsName}}
-{{item.sellingPoint || ''}}
+{{ item.goodsName }}
+{{ item.sellingPoint || '' }}
-
-
-
-
-
- +
- {{ item.name }} >
-
-
- +
- {{ item.name }} >
-
-
- +
- {{ item.name }}
商品规格及图片
- ![]()
+ ![]()
-
@@ -145,17 +148,9 @@
+
-
+
-
-
+
- ![]()
+ ![]()
-
- ![]()
+ ![]()
+
商品详情描述
-
@@ -431,9 +417,8 @@
-
-