diff --git a/src/api/operation/dynamic/topic.js b/src/api/operation/dynamic/topic.js
index 5abca96..4acae50 100644
--- a/src/api/operation/dynamic/topic.js
+++ b/src/api/operation/dynamic/topic.js
@@ -8,3 +8,35 @@ export function topicList(params) {
params: params,
})
}
+// 话题新增
+export function topicInsert(params) {
+ return httpService({
+ url: `/user/topic/insert`,
+ method: 'post',
+ data: params,
+ })
+}
+// 话题信息
+export function topicInfo(params) {
+ return httpService({
+ url: `/user/topic/findById`,
+ method: 'get',
+ params: params,
+ })
+}
+// 话题修改
+export function topicUpdate(params) {
+ return httpService({
+ url: `/user/topic/update`,
+ method: 'post',
+ data: params,
+ })
+}
+// 话题删除
+export function topicDelete(params) {
+ return httpService({
+ url: `/user/topic/delete`,
+ method: 'post',
+ data: params,
+ })
+}
diff --git a/src/api/operation/swiper/index.js b/src/api/operation/swiper/index.js
new file mode 100644
index 0000000..a13babd
--- /dev/null
+++ b/src/api/operation/swiper/index.js
@@ -0,0 +1,35 @@
+import httpService from "@/request"
+
+// 轮播图列表
+export function swiperList(params) {
+ return httpService({
+ url: `/user/homepageCarousel/list`,
+ method: 'get',
+ params: params,
+ })
+}
+// 删除
+export function swiperDel(params) {
+ return httpService({
+ url: `/user/homepageCarousel/delete`,
+ method: 'get',
+ params: params,
+ })
+}
+// 新增
+export function swiperInsert(params) {
+ return httpService({
+ url: `/user/homepageCarousel/insert`,
+ method: 'get',
+ params: params,
+ })
+}
+// 修改
+export function swiperUpdate(params) {
+ return httpService({
+ url: `/user/homepageCarousel/update`,
+ method: 'get',
+ params: params,
+ })
+}
+
diff --git a/src/api/shop/goods/index.js b/src/api/shop/goods/index.js
index 5c0f88e..9c287b4 100644
--- a/src/api/shop/goods/index.js
+++ b/src/api/shop/goods/index.js
@@ -2,9 +2,9 @@ import httpService from "@/request"
// 商品
// list
-export function goodsList(params) {
+export function shopPushList(params) {
return httpService({
- url: `/user/shop/jcookGoodsList`,
+ url: `/user/shop/shopPushList`,
method: 'get',
params: params,
})
diff --git a/src/components/searchForm/index.vue b/src/components/searchForm/index.vue
index 2ff30b0..a50b537 100644
--- a/src/components/searchForm/index.vue
+++ b/src/components/searchForm/index.vue
@@ -46,7 +46,7 @@ export default {
this.form = obj;
},
immediate: true
- }
+ },
},
data() {
return {
@@ -56,6 +56,7 @@ export default {
},
methods: {
getSearch() {
+ console.log(this.form);
this.$emit('getSearch', this.form)
},
resetForm() {
diff --git a/src/components/upload/index.vue b/src/components/upload/index.vue
index 7fa8a65..1990ca6 100644
--- a/src/components/upload/index.vue
+++ b/src/components/upload/index.vue
@@ -9,7 +9,7 @@
@preview="handlePreview"
@change="handleChange"
>
-
+
@@ -33,13 +33,19 @@ export default {
components:{
imgModal
},
+ props:{
+ fileList:Array,
+ limit:{
+ type:Number,
+ default:1
+ }
+ },
data() {
return{
previewVisible: false,
previewImage: '',
- fileList: [],
uploadHeaders: {
- "admin-login-token": store.getters.getToken
+ "manage-login-token": store.getters.getToken
}
}
},
@@ -55,10 +61,8 @@ export default {
this.previewVisible = false;
},
handleChange({ fileList }) {
- this.fileList = fileList
- if(fileList[0].status==='done'){
- this.$emit('handleChange',fileList)
- }
+ console.log(fileList);
+ this.$emit('handleChange',fileList)
},
}
};
diff --git a/src/router/basic.js b/src/router/basic.js
index d7148ce..4aaab23 100644
--- a/src/router/basic.js
+++ b/src/router/basic.js
@@ -1,14 +1,14 @@
export default [
- {
- path: '/Console',
- name: "Console",
- title: "控制台",
- hide: false,
- icon: 'container',
- component: resolve => require(['@/views/Basic/Console'], resolve),
- meta: {title: '控制台'}
- },
+ // {
+ // path: '/Console',
+ // name: "Console",
+ // title: "控制台",
+ // hide: false,
+ // icon: 'container',
+ // component: resolve => require(['@/views/Basic/Console'], resolve),
+ // meta: {title: '控制台'}
+ // },
{
path: '/Employee',
name: "Employee",
diff --git a/src/router/index.js b/src/router/index.js
index 6de256f..8881258 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -35,7 +35,7 @@ const router = [
name: "basic",
title: "基础",
component: Layout,
- redirect: '/Console',
+ redirect: '/Employee',
meta: {title: '首页'},
children: [
...basic,
@@ -68,7 +68,7 @@ const router = [
name: "operation",
title: "运营管理",
component: Layout,
- redirect: '/taskManage',
+ redirect: '/clientSet',
meta: {title: '运营管理'},
children: [
...operation,
diff --git a/src/router/operation.js b/src/router/operation.js
index 03a8a32..5010047 100644
--- a/src/router/operation.js
+++ b/src/router/operation.js
@@ -7,6 +7,15 @@
* @FilePath: /LittleBeeSaas/src/router/operation.js
*/
export default [
+ {
+ path: '/clientSet',
+ name: "clientSet",
+ title: "用户端设置",
+ icon: 'setting',
+ hide: false,
+ component: resolve => require(['@/views/Operation/clientSet'], resolve),
+ meta: {title: '用户端设置'},
+ },
{
path: '/TaskManage',
name: "TaskManage",
diff --git a/src/views/Operation/BBS/_dynamic/detail.vue b/src/views/Operation/BBS/_dynamic/detail.vue
index 4c7d4b8..7ff0796 100644
--- a/src/views/Operation/BBS/_dynamic/detail.vue
+++ b/src/views/Operation/BBS/_dynamic/detail.vue
@@ -7,16 +7,12 @@
{{ detailData.content }}
-
-
-
-
-
+ />
发布者
diff --git a/src/views/Operation/BBS/_topic/depend/config.js b/src/views/Operation/BBS/_topic/depend/config.js
index e3fce81..a329b6b 100644
--- a/src/views/Operation/BBS/_topic/depend/config.js
+++ b/src/views/Operation/BBS/_topic/depend/config.js
@@ -38,6 +38,12 @@ export const columns = [
dataIndex: "content",
width: "16%",
},
+ {
+ title: "图片",
+ dataIndex: "imgpic",
+ width: "16%",
+ scopedSlots: { customRender: "imgpic"}
+ },
{
title: "状态",
dataIndex: "status",
diff --git a/src/views/Operation/BBS/_topic/depend/form.js b/src/views/Operation/BBS/_topic/depend/form.js
new file mode 100644
index 0000000..9c28021
--- /dev/null
+++ b/src/views/Operation/BBS/_topic/depend/form.js
@@ -0,0 +1,26 @@
+export const form = {
+ id:null,
+ title:undefined,
+ content:undefined,
+ status:undefined,
+ isPublic:undefined,
+ isRating:undefined,
+ imgUrls:[]
+}
+export const rules = {
+ title:[{required:true,message:'请输入标题',trigger:'blur'}],
+ content:[{required:true,message:'请输入内容',trigger:'blur'}],
+ status:[{required:true,message:'请选择',trigger:'change'}],
+ isPublic:[{required:true,message:'请选择',trigger:'change'}],
+ isRating:[{required:true,message:'请选择',trigger:'change'}],
+}
+export const options = {
+ isTrue:[
+ { id:1, name:'是' },
+ { id:0, name:'否' },
+ ],
+ status: [
+ { id:1, name:'启用中' },
+ { id:2, name:'禁用中' },
+ ]
+}
\ No newline at end of file
diff --git a/src/views/Operation/BBS/_topic/depend/form.vue b/src/views/Operation/BBS/_topic/depend/form.vue
new file mode 100644
index 0000000..a1e45a0
--- /dev/null
+++ b/src/views/Operation/BBS/_topic/depend/form.vue
@@ -0,0 +1,188 @@
+
+
+
+
+ 基本信息
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+ {{ item.name }}
+
+
+
+
+ {{ item.name }}
+
+
+ 话题图片
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/Operation/BBS/_topic/index.vue b/src/views/Operation/BBS/_topic/index.vue
index c196f38..41e9d3b 100644
--- a/src/views/Operation/BBS/_topic/index.vue
+++ b/src/views/Operation/BBS/_topic/index.vue
@@ -1,7 +1,8 @@
社区话题
-
+
+
新增话题
+ 修改
删除
+
+
+ 无图片
+
- 批量删除
- 2nd item
+ 批量删除
批量操作
@@ -44,17 +49,31 @@
+
\ No newline at end of file
diff --git a/src/views/Operation/clientSet/depend/table.vue b/src/views/Operation/clientSet/depend/table.vue
new file mode 100644
index 0000000..902b0eb
--- /dev/null
+++ b/src/views/Operation/clientSet/depend/table.vue
@@ -0,0 +1,53 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/Operation/clientSet/depend/tableConfig.js b/src/views/Operation/clientSet/depend/tableConfig.js
new file mode 100644
index 0000000..f1233a1
--- /dev/null
+++ b/src/views/Operation/clientSet/depend/tableConfig.js
@@ -0,0 +1,78 @@
+export const columns = {
+ shop:[
+ {
+ title: "商品名称",
+ width: "12%",
+ dataIndex: "skuName",
+ },
+ {
+ title: "sku编码",
+ width: "12%",
+ dataIndex: "skuId",
+ },
+ {
+ title: "商品类型",
+ width: "7%",
+ dataIndex: "mallType",
+ customRender: function (mallType) {
+ switch (mallType) {
+ case 1:
+ return 'Jcook'
+ break;
+ default:
+ break;
+ }
+ }
+ },
+ {
+ title: "店铺名",
+ width: "8%",
+ dataIndex: "shopName",
+ },
+ {
+ title: "品牌名",
+ width: "8%",
+ dataIndex: "brandName",
+ },
+ {
+ title: "供应商名",
+ width: "8%",
+ dataIndex: "vendorName",
+ },
+ {
+ title: "一级分类名称",
+ width: "8%",
+ dataIndex: "categoryFirstName",
+ },
+ {
+ title: "二级分类名称",
+ width: "8%",
+ dataIndex: "categorySecondName",
+ },
+ {
+ title: "三级分类名称",
+ width: "8%",
+ dataIndex: "categoryThirdName",
+ },
+ {
+ title: "主图url",
+ width: "8%",
+ dataIndex: "mainPhoto",
+ },
+ {
+ title: "售卖价",
+ width: "8%",
+ dataIndex: "sellPrice",
+ },
+ {
+ title: "折扣价",
+ width: "8%",
+ dataIndex: "discountPrice",
+ },
+ {
+ title: "浏览量",
+ width: "8%",
+ dataIndex: "viewsNum",
+ },
+ ]
+}
\ No newline at end of file
diff --git a/src/views/Operation/clientSet/index.vue b/src/views/Operation/clientSet/index.vue
new file mode 100644
index 0000000..e7e82e4
--- /dev/null
+++ b/src/views/Operation/clientSet/index.vue
@@ -0,0 +1,140 @@
+
+
+
首页轮播图设置
+
+
添加轮播图
+
+
+
+ ×
+
+
+
+ 上传图片尺寸: 750*300
+
+
+
+
+
+
+
+
+ 自定义链接
+ 商城
+ 资讯
+ 公告
+ 活动
+
+
+ 请选择链接
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 保存设置
+
+
+
+
+
+
+
+
+
diff --git a/src/views/Shop/GoodsManage/_brand/index.vue b/src/views/Shop/GoodsManage/_brand/index.vue
index e69de29..3e72e23 100644
--- a/src/views/Shop/GoodsManage/_brand/index.vue
+++ b/src/views/Shop/GoodsManage/_brand/index.vue
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
diff --git a/src/views/Shop/GoodsManage/_goodsCate/index.vue b/src/views/Shop/GoodsManage/_goodsCate/index.vue
index e69de29..3e72e23 100644
--- a/src/views/Shop/GoodsManage/_goodsCate/index.vue
+++ b/src/views/Shop/GoodsManage/_goodsCate/index.vue
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
diff --git a/src/views/Shop/GoodsManage/_goodsList/depend/config.js b/src/views/Shop/GoodsManage/_goodsList/depend/config.js
new file mode 100644
index 0000000..4b08705
--- /dev/null
+++ b/src/views/Shop/GoodsManage/_goodsList/depend/config.js
@@ -0,0 +1,76 @@
+export const columns = [
+ {
+ title: "商品名称",
+ width: "12%",
+ dataIndex: "skuName",
+ },
+ {
+ title: "sku编码",
+ width: "12%",
+ dataIndex: "skuId",
+ },
+ {
+ title: "商品类型",
+ width: "7%",
+ dataIndex: "mallType",
+ customRender: function (mallType) {
+ switch (mallType) {
+ case 1:
+ return 'Jcook'
+ break;
+ default:
+ break;
+ }
+ }
+ },
+ {
+ title: "店铺名",
+ width: "8%",
+ dataIndex: "shopName",
+ },
+ {
+ title: "品牌名",
+ width: "8%",
+ dataIndex: "brandName",
+ },
+ {
+ title: "供应商名",
+ width: "8%",
+ dataIndex: "vendorName",
+ },
+ {
+ title: "一级分类名称",
+ width: "8%",
+ dataIndex: "categoryFirstName",
+ },
+ {
+ title: "二级分类名称",
+ width: "8%",
+ dataIndex: "categorySecondName",
+ },
+ {
+ title: "三级分类名称",
+ width: "8%",
+ dataIndex: "categoryThirdName",
+ },
+ {
+ title: "主图url",
+ width: "8%",
+ dataIndex: "mainPhoto",
+ },
+ {
+ title: "售卖价",
+ width: "8%",
+ dataIndex: "sellPrice",
+ },
+ {
+ title: "折扣价",
+ width: "8%",
+ dataIndex: "discountPrice",
+ },
+ {
+ title: "浏览量",
+ width: "8%",
+ dataIndex: "viewsNum",
+ },
+]
\ No newline at end of file
diff --git a/src/views/Shop/GoodsManage/_goodsList/index.vue b/src/views/Shop/GoodsManage/_goodsList/index.vue
index e69de29..3e72e23 100644
--- a/src/views/Shop/GoodsManage/_goodsList/index.vue
+++ b/src/views/Shop/GoodsManage/_goodsList/index.vue
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+