diff --git a/manager/src/config/index.js b/manager/src/config/index.js
index 8f1ce647..38f3e8e9 100644
--- a/manager/src/config/index.js
+++ b/manager/src/config/index.js
@@ -2,7 +2,7 @@ export default {
/**
* @description 配置显示在浏览器标签的title
*/
- title: 'Lili电商',
+ title: "Lili电商",
/**
* @description token在Cookie中存储的天数，默认1天
*/
@@ -17,29 +17,28 @@ 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.103:8890",
+ buyer: "http://192.168.0.103:8888",
+ seller: "http://192.168.0.103:8889",
+ manager: "http://192.168.0.103:8887"
},
api_prod: {
- 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: "https://common-api.pickmall.cn",
+ buyer: "https://buyer-api.pickmall.cn",
+ seller: "https://store-api.pickmall.cn",
+ manager: "https://admin-api.pickmall.cn"
},
/**
* @description api请求基础路径前缀
*/
- baseUrlPrefix: '/manager',
+ baseUrlPrefix: "/manager",
/**
* @description 需要加载的插件
*/
plugin: {
- 'error-store': {
+ "error-store": {
showInHeader: true, // 设为false后不会在顶部显示错误日志徽标
developmentOff: true // 设为true后在开发环境不会收集错误信息，方便开发中排查错误
}
}
-}
-
+};
diff --git a/seller/src/api/promotion.js b/seller/src/api/promotion.js
index aaa436a5..ebc8941c 100644
--- a/seller/src/api/promotion.js
+++ b/seller/src/api/promotion.js
@@ -1,5 +1,23 @@
// 统一请求路径前缀在libs/axios.js中修改
-import { getRequest, postRequest, putRequest, deleteRequest, importRequest, uploadFileRequest } from '@/libs/axios';
+import { getRequest, postRequest, postRequestWithNoForm, putRequest, deleteRequest, importRequest, uploadFileRequest } from '@/libs/axios';
+
+
+// 获取店铺直播间列表
+export const getLivesList = (params) => {
+ return getRequest('/broadcast/studio', params)
+}
+
+// 获取店铺直播商品
+export const getLiveGoods = (params) => {
+ return getRequest('/broadcast/commodity', params)
+}
+
+// 添加店铺直播商品
+export const addLiveGoods = (params) => {
+ return postRequestWithNoForm('/broadcast/commodity', params)
+}
+
+
// 获取拼团列表
export const getPintuanList = (params) => {
@@ -128,4 +146,4 @@ export const getFullDiscountById = (id) => {
// 删除满减活动
export const delFullDiscount = (id) => {
return deleteRequest(`/promotion/fullDiscount/${id}`)
-}
\ No newline at end of file
+}
diff --git a/seller/src/config/index.js b/seller/src/config/index.js
index 83dc43fd..d0a31bb8 100644
--- a/seller/src/config/index.js
+++ b/seller/src/config/index.js
@@ -18,14 +18,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.103:8890',
- // buyer: 'http://192.168.0.103:8888',
- // seller: 'http://192.168.0.103:8889',
- // manager: 'http://192.168.0.103: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.103:8890',
+ buyer: 'http://192.168.0.103:8888',
+ seller: 'http://192.168.0.103:8889',
+ manager: 'http://192.168.0.103:8887'
},
api_prod: {
common: 'https://common-api.pickmall.cn',
diff --git a/seller/src/libs/axios.js b/seller/src/libs/axios.js
index e22c1354..037a4c0f 100644
--- a/seller/src/libs/axios.js
+++ b/seller/src/libs/axios.js
@@ -216,19 +216,20 @@ export const postRequestWithNoForm = (url, params) => {
});
};
-// export const postRequestWithHeaders = (url, params) => {
-// let accessToken = getStore("accessToken");
-// return axios({
-// method: "post",
-// url: `${url}`,
-// data: params,
+export const postRequestWithHeaders = (url, params) => {
+ let accessToken = getStore("accessToken");
+ return axios({
+ method: "post",
+ url: `${url}`,
+ data: params,
+
+ headers: {
+ accessToken: accessToken,
+ "Content-Type": "application/x-www-form-urlencoded"
+ }
+ });
+};
-// headers: {
-// accessToken: accessToken,
-// "Content-Type": "application/x-www-form-urlencoded"
-// }
-// });
-// };
export const putRequest = (url, params,headers) => {
let accessToken = getStore("accessToken");
diff --git a/seller/src/libs/routerJson.js b/seller/src/libs/routerJson.js
index 781e35e4..aef6d9e4 100644
--- a/seller/src/libs/routerJson.js
+++ b/seller/src/libs/routerJson.js
@@ -425,6 +425,34 @@ export const result = [
url: "",
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/router/router.js b/seller/src/router/router.js
index eaf49412..1a1828a3 100644
--- a/seller/src/router/router.js
+++ b/seller/src/router/router.js
@@ -71,6 +71,12 @@ export const otherRouter = {
name: "add-coupon",
component: () => import("@/views/promotion/coupon/couponPublish.vue")
},
+ {
+ path: "add-live",
+ title: "创建直播",
+ name: "add-live",
+ component: () => import("@/views/promotion/live/addLive.vue")
+ },
{
path: "bill-detail",
title: "结算单详情",
diff --git a/seller/src/views/promotion/coupon/coupon.vue b/seller/src/views/promotion/coupon/coupon.vue
index 17de56cc..e54ee659 100644
--- a/seller/src/views/promotion/coupon/coupon.vue
+++ b/seller/src/views/promotion/coupon/coupon.vue
@@ -430,7 +430,7 @@ export default {
},
};
-
diff --git a/seller/src/views/promotion/live/live.vue b/seller/src/views/promotion/live/live.vue
new file mode 100644
index 00000000..8360e046
--- /dev/null
+++ b/seller/src/views/promotion/live/live.vue
@@ -0,0 +1,134 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 由于直播商品需经过小程序直播平台的审核，你需要在此先提审商品，为了不影响直播间选取商品，请提前1天提审商品；
+ 每次最多可提审20款商品，每个店铺最多可维护200款商品，每款SPU只需选择其中一款SKU即可；
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+