diff --git a/src/api/shop/goods/brand.js b/src/api/shop/goods/brand.js
new file mode 100644
index 0000000..43565d2
--- /dev/null
+++ b/src/api/shop/goods/brand.js
@@ -0,0 +1,32 @@
+import httpService from "@/request"
+
+// 商品
+// 品牌
+export function brandList(params) {
+ return httpService({
+ url: `/user/shopBrand/list`,
+ method: 'get',
+ params: params,
+ })
+}
+export function brandInsert(params) {
+ return httpService({
+ url: `/user/shopBrand/insert`,
+ method: 'post',
+ data: params,
+ })
+}
+export function brandDel(params) {
+ return httpService({
+ url: `/user/shopBrand/delete`,
+ method: 'post',
+ data: params,
+ })
+}
+export function brandUpdate(params) {
+ return httpService({
+ url: `/user/shopBrand/update`,
+ method: 'post',
+ data: params,
+ })
+}
diff --git a/src/api/shop/goods/cate.js b/src/api/shop/goods/cate.js
new file mode 100644
index 0000000..e69de29
diff --git a/src/api/shop/shop/index.js b/src/api/shop/shop/index.js
new file mode 100644
index 0000000..af300d3
--- /dev/null
+++ b/src/api/shop/shop/index.js
@@ -0,0 +1,32 @@
+import httpService from "@/request"
+
+// 商品
+// 店铺
+export function shopList(params) {
+ return httpService({
+ url: `/user/shopShop/list`,
+ method: 'get',
+ params: params,
+ })
+}
+export function shopInsert(params) {
+ return httpService({
+ url: `/user/shopShop/insert`,
+ method: 'post',
+ data: params,
+ })
+}
+export function shopDel(params) {
+ return httpService({
+ url: `/user/shopShop/delete`,
+ method: 'post',
+ data: params,
+ })
+}
+export function shopUpdate(params) {
+ return httpService({
+ url: `/user/shopShop/update`,
+ method: 'post',
+ data: params,
+ })
+}
diff --git a/src/api/shop/vendor/index.js b/src/api/shop/vendor/index.js
new file mode 100644
index 0000000..595442e
--- /dev/null
+++ b/src/api/shop/vendor/index.js
@@ -0,0 +1,32 @@
+import httpService from "@/request"
+
+// 商品
+// 供应商
+export function vendorList(params) {
+ return httpService({
+ url: `/user/shopVendor/list`,
+ method: 'get',
+ params: params,
+ })
+}
+export function vendorInsert(params) {
+ return httpService({
+ url: `/user/shopVendor/insert`,
+ method: 'post',
+ data: params,
+ })
+}
+export function vendorDel(params) {
+ return httpService({
+ url: `/user/shopVendor/delete`,
+ method: 'post',
+ data: params,
+ })
+}
+export function vendorUpdate(params) {
+ return httpService({
+ url: `/user/shopVendor/update`,
+ method: 'post',
+ data: params,
+ })
+}
diff --git a/src/router/shop.js b/src/router/shop.js
index b19821f..24761f9 100644
--- a/src/router/shop.js
+++ b/src/router/shop.js
@@ -77,24 +77,24 @@ export default [
component: resolve => require(['@/views/Shop/OrderManage/depend/detail'], resolve),
meta: {title: '订单详情'}
},
- // {
- // path: '/SupplierManage',
- // name: "SupplierManage",
- // title: "供应商管理",
- // hide: false,
- // icon: 'contacts',
- // component: resolve => require(['@/views/Shop/SupplierManage'], resolve),
- // meta: {title: '供应商管理'}
- // },
- // {
- // path: '/StoreManage',
- // name: "StoreManage",
- // title: "店铺管理",
- // hide: false,
- // icon: 'shop',
- // component: resolve => require(['@/views/Shop/StoreManage'], resolve),
- // meta: {title: '店铺管理'}
- // },
+ {
+ path: '/SupplierManage',
+ name: "SupplierManage",
+ title: "供应商管理",
+ hide: false,
+ icon: 'contacts',
+ component: resolve => require(['@/views/Shop/SupplierManage'], resolve),
+ meta: {title: '供应商管理'}
+ },
+ {
+ path: '/StoreManage',
+ name: "StoreManage",
+ title: "店铺管理",
+ hide: false,
+ icon: 'shop',
+ component: resolve => require(['@/views/Shop/StoreManage'], resolve),
+ meta: {title: '店铺管理'}
+ },
// {
// path: '/SwiperManage',
// name: "SwiperManage",
diff --git a/src/views/Shop/GoodsManage/_brand/depend/config.js b/src/views/Shop/GoodsManage/_brand/depend/config.js
new file mode 100644
index 0000000..c345c42
--- /dev/null
+++ b/src/views/Shop/GoodsManage/_brand/depend/config.js
@@ -0,0 +1,30 @@
+export const formItem = [
+ {
+ type: 'input',
+ label:'品牌名称',
+ prop:'brandName',
+ placeholder:'请输入'
+ },
+]
+export const columns = [
+ {
+ title: "品牌名称",
+ dataIndex: "brandName",
+ },
+ {
+ title: "操作",
+ dataIndex: "action",
+ key: "action",
+ width: "180",
+ fixed: "right",
+ scopedSlots: { customRender: "action" },
+ },
+]
+export const pagination = {
+ current: 1,
+ total: 0,
+ pageSize: 10,
+ showTotal: (total) => `共 ${total} 条`,
+ showSizeChanger: true,
+ showQuickJumper: true,
+}
\ No newline at end of file
diff --git a/src/views/Shop/GoodsManage/_brand/depend/form.js b/src/views/Shop/GoodsManage/_brand/depend/form.js
new file mode 100644
index 0000000..f3fd958
--- /dev/null
+++ b/src/views/Shop/GoodsManage/_brand/depend/form.js
@@ -0,0 +1,7 @@
+export const form = {
+ id:null,
+ brandName: undefined,
+}
+export const rules = {
+ brandName:[{required:true,message:'请输入品牌名',trigger:'blur'}],
+}
\ No newline at end of file
diff --git a/src/views/Shop/GoodsManage/_brand/index.vue b/src/views/Shop/GoodsManage/_brand/index.vue
index 3e72e23..2bc3a8a 100644
--- a/src/views/Shop/GoodsManage/_brand/index.vue
+++ b/src/views/Shop/GoodsManage/_brand/index.vue
@@ -1,14 +1,214 @@
-
+
+
品牌管理
+
+
新增品牌
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+ 批量删除
+
+ 批量操作
+
+
+
+ {{ `已选择 ${selectedRowKeys.length} 条` }}
+
+
+
+
+
+
+
+
-
-
+
diff --git a/src/views/Shop/StoreManage/depend/config.js b/src/views/Shop/StoreManage/depend/config.js
index 7b696e6..aa7cbb2 100644
--- a/src/views/Shop/StoreManage/depend/config.js
+++ b/src/views/Shop/StoreManage/depend/config.js
@@ -1,99 +1,15 @@
export const formItem = [
{
type: 'input',
- label:'标题',
- prop:'title',
+ label:'店铺名称',
+ prop:'shopName',
placeholder:'请输入'
},
- {
- type: 'select',
- label:'推送对象',
- prop:'object',
- option:[{ id:1,name:'全部'},{ id:2,name:'住户'},{ id:3,name:'业主'},{ id:4,name:'租户'},{ id:5,name:'管家'}],
- placeholder:'请选择'
- },
- {
- type: 'select',
- label:'发布状态',
- prop:'status',
- option:[{ id:1,name:'未发布'},{ id:2,name:'已发布'}],
- placeholder:'请选择'
- },
- {
- type: 'time',
- label:'更新时间',
- start: 'modifyStartTime',
- end:'modifyEndTime'
- },
]
export const columns = [
{
- title: "标题",
- dataIndex: "title",
- width: "16%",
- },
- {
- title: "推送对象",
- dataIndex: "object",
- width: "10%",
- customRender: function (object) {
- switch (object) {
- case 1:
- return '全部'
- break;
- case 2:
- return '住户'
- break;
- case 3:
- return '业主'
- break;
- case 4:
- return '租户'
- break;
- case 5:
- return '管家'
- break;
- default:
- break;
- }
- }
- },
- {
- title: "状态",
- dataIndex: "status",
- width: "10%",
- customRender: function (status) {
- switch (status) {
- case 1:
- return '未发布'
- break;
- case 2:
- return '已发布'
- break;
- default:
- break;
- }
- }
- },
- {
- title: "内容",
- dataIndex: "content",
- width: "13%",
- },
- {
- title: "阅读量",
- dataIndex: "readingVolume",
- width: "10%",
- },
- {
- title: "附件下载次数",
- dataIndex: "downloadNum",
- width: "10%",
- },
- {
- title: "更新时间",
- dataIndex: "modifyDate",
- width: "14%",
+ title: "店铺名称",
+ dataIndex: "shopName",
},
{
title: "操作",
diff --git a/src/views/Shop/StoreManage/depend/form.js b/src/views/Shop/StoreManage/depend/form.js
index 542821d..2a37f25 100644
--- a/src/views/Shop/StoreManage/depend/form.js
+++ b/src/views/Shop/StoreManage/depend/form.js
@@ -1,28 +1,7 @@
export const form = {
- id:undefined,
- title:undefined,
- object:undefined,
- status:undefined,
- content:undefined,
- coverImgUrls:[],
- annexUrls:[],
+ id:null,
+ shopName: undefined,
}
export const rules = {
- title:[{required:true,message:'请输入标题',trigger:'blur'}],
- object:[{required:true,message:'请选择',trigger:'change'}],
- status:[{required:true,message:'请选择',trigger:'change'}],
- content:[{required:true,message:'请输入标题',trigger:'blur'}],
-}
-export const options = {
- status:[
- { id:1, name:'未发布' },
- { id:2, name:'已发布' },
- ],
- object:[
- { id:1, name:'全部' },
- { id:2, name:'住户' },
- { id:3, name:'业主' },
- { id:4, name:'租户' },
- { id:5, name:'管家' },
- ],
+ shopName:[{required:true,message:'请输入店铺名',trigger:'blur'}],
}
\ No newline at end of file
diff --git a/src/views/Shop/StoreManage/depend/form.vue b/src/views/Shop/StoreManage/depend/form.vue
deleted file mode 100644
index 96d6379..0000000
--- a/src/views/Shop/StoreManage/depend/form.vue
+++ /dev/null
@@ -1,241 +0,0 @@
-
-
-
-
- 基本信息
-
-
-
-
-
-
-
- {{ item.name }}
-
-
-
-
- {{ item.name }}
-
-
-
-
-
- 封面图片
-
- 附件
-
- 上传附件
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/Shop/StoreManage/index.vue b/src/views/Shop/StoreManage/index.vue
index aeb3241..b48b288 100644
--- a/src/views/Shop/StoreManage/index.vue
+++ b/src/views/Shop/StoreManage/index.vue
@@ -1,15 +1,14 @@
-
公告
+
店铺管理
新增公告新增店铺
- 修改
+ 修改
删除
@@ -41,39 +40,65 @@
-
+
+
+
+
-
-
diff --git a/src/views/Shop/SupplierManage/index.vue b/src/views/Shop/SupplierManage/index.vue
index aeb3241..799a580 100644
--- a/src/views/Shop/SupplierManage/index.vue
+++ b/src/views/Shop/SupplierManage/index.vue
@@ -1,15 +1,14 @@
-
公告
+
供应商管理
新增公告新增供应商
- 修改
+ 修改
删除
@@ -41,39 +40,65 @@
-
+
+
+
+