diff --git a/src/api/marketing/marketing.js b/src/api/marketing/marketing.js
new file mode 100644
index 0000000..4044ad3
--- /dev/null
+++ b/src/api/marketing/marketing.js
@@ -0,0 +1,19 @@
+import request from '@/utils/request'
+
+// 查询商品属性列表
+export function listAttrimarketing(data) {
+ return request({
+ url: '/marketing/team/list',
+ method: 'post',
+ data:data
+ })
+}
+
+//添加拼团列表
+export function addInfoActivity(data) {
+ return request({
+ url: '/marketing/team/activityInfoAdd',
+ method: 'post',
+ data:data
+ })
+}
diff --git a/src/api/product/info.js b/src/api/product/info.js
index e15e6f7..b93bf51 100644
--- a/src/api/product/info.js
+++ b/src/api/product/info.js
@@ -36,9 +36,9 @@ export function addInfo(data) {
// 修改商品信息
export function updateInfo(data) {
return request({
- url: '/product/info/'+data.id,
+ url: '/product/info/'+data.projectAddModel.id,
method: 'put',
- data: data
+ data: data.projectAddModel
})
}
@@ -49,3 +49,10 @@ export function delInfo(id) {
method: 'delete'
})
}
+
+export function getCacheInfo(id) {
+ return request({
+ url: '/product/cache/' + id,
+ method: 'get'
+ })
+}
diff --git a/src/api/product/sku.js b/src/api/product/sku.js
new file mode 100644
index 0000000..ed774ac
--- /dev/null
+++ b/src/api/product/sku.js
@@ -0,0 +1,9 @@
+import request from "@/utils/request";
+
+export function getSkuList(projectId) {
+ return request({
+ url: '/product/sku/list/' + projectId,
+ method: 'get'
+
+ })
+}
diff --git a/src/router/index.js b/src/router/index.js
index ffd7807..b0f845d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -104,7 +104,7 @@ export const constantRoutes = [
path: '/user',
component: Layout,
hidden: true,
- redirect: 'noredirect',
+ redirect: 'redirects',
children: [
{
path: 'profile',
diff --git a/src/views/marketing/marketing/index.vue b/src/views/marketing/marketing/index.vue
new file mode 100644
index 0000000..06f02da
--- /dev/null
+++ b/src/views/marketing/marketing/index.vue
@@ -0,0 +1,353 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
添加商品
+
+
+
+
+
+
+
+
+
+
+ 选择商品
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 确 定
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -------------------------------------------------------------------------
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.id }}
+
+
+ {{ scope.row.name }}
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.productPrice }}
+
+
+ {{ scope.row.teamPrice }}
+
+
+ {{ scope.row.attendNumber }}
+
+
+ {{ scope.row.openTeamNumber }}
+
+
+ {{ scope.row.addTeamNumber }}
+
+
+ {{ scope.row.teamStock }}
+
+
+ {{ scope.row.remainStock }}
+
+
+ {{ scope.row.endTime }}
+
+
+ {{ scope.row.status }}
+
+
+
+
+
+
+
+
-
-
-
-
+
+ placeholder="请选择">
-
+
+ placeholder="请选择">
-
+
@@ -87,20 +79,20 @@
-
-
-
+
+
+
{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}
-
+
{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}
-
-
+
+
-
-
+
+
-
+
+ placeholder="请选择">
-
+
+ placeholder="请选择">
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+