diff --git a/.env.demo1024 b/.env.demo1024
index 7d8a0aa..7e2f68a 100644
--- a/.env.demo1024
+++ b/.env.demo1024
@@ -4,7 +4,7 @@ NODE_ENV = development
 ENV = 'staging'
 
 # 页面标题
-VUE_APP_TITLE = 农场管理系统
+VUE_APP_TITLE = 眼界甄选
 
 # 农场管理系统/测试环境
 VUE_APP_BASE_API = 'http://127.0.0.1:48080'
diff --git a/.env.dev b/.env.dev
index d841a31..0d1ae3f 100644
--- a/.env.dev
+++ b/.env.dev
@@ -2,11 +2,11 @@
 ENV = 'development'
 
 # 页面标题
-VUE_APP_TITLE = 农场管理系统
+VUE_APP_TITLE = 眼界甄选
 
 # 农场管理系统/开发环境
-VUE_APP_BASE_API = 'http://192.168.225.2'
-
+#VUE_APP_BASE_API = 'http://192.168.225.2'
+VUE_APP_BASE_API = 'http://192.168.10.113:48080'
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
 
diff --git a/.env.prod b/.env.prod
index f268179..6aed717 100644
--- a/.env.prod
+++ b/.env.prod
@@ -2,7 +2,7 @@
 ENV = 'production'
 
 # 页面标题
-VUE_APP_TITLE = 农场管理系统
+VUE_APP_TITLE = 眼界甄选
 
 # 农场管理系统/生产环境
 VUE_APP_BASE_API = '/prod-api'
diff --git a/.env.stage b/.env.stage
index 34d6716..ddaba73 100644
--- a/.env.stage
+++ b/.env.stage
@@ -1,7 +1,7 @@
 NODE_ENV = production
 
 # 页面标题
-VUE_APP_TITLE = 农场管理系统
+VUE_APP_TITLE = 眼界甄选
 
 # 测试环境配置
 ENV = 'staging'
diff --git a/package.json b/package.json
index 967cd1c..43b1a7f 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "yudao-ui-admin",
   "version": "1.6.2-snapshot",
-  "description": "农场管理系统",
+  "description": "眼界甄选",
   "author": "芋道",
   "license": "MIT",
   "scripts": {
diff --git a/src/api/YxUserBillByUid.js b/src/api/YxUserBillByUid.js
new file mode 100644
index 0000000..04d2c9a
--- /dev/null
+++ b/src/api/YxUserBillByUid.js
@@ -0,0 +1,11 @@
+import request from '@/utils/request'
+
+export function getCYj(params) {
+  return request({
+    url: 'api/yxUser/YxUserBillByUid',
+    method: 'get',
+    params
+  })
+}
+
+export default { getCYj }
diff --git a/src/api/YxWechatMenu.js b/src/api/YxWechatMenu.js
new file mode 100644
index 0000000..1c190c0
--- /dev/null
+++ b/src/api/YxWechatMenu.js
@@ -0,0 +1,31 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/YxWechatMenu',
+    method: 'post',
+    data
+  })
+}
+
+export function del(key) {
+  return request({
+    url: 'api/YxWechatMenu/' + key,
+    method: 'delete'
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/YxWechatMenu',
+    method: 'put',
+    data
+  })
+}
+
+export function get() {
+  return request({
+    url: 'api/YxWechatMenu',
+    method: 'get'
+  })
+}
diff --git a/src/api/data.js b/src/api/data.js
new file mode 100644
index 0000000..d975d75
--- /dev/null
+++ b/src/api/data.js
@@ -0,0 +1,17 @@
+import request from '@/utils/request'
+import qs from 'qs'
+
+export function initData(url, params) {
+  return request({
+    url: url + '?' + qs.stringify(params, { indices: false }),
+    method: 'get'
+  })
+}
+
+export function download(url, params) {
+  return request({
+    url: url + '?' + qs.stringify(params, { indices: false }),
+    method: 'get',
+    responseType: 'blob'
+  })
+}
diff --git a/src/api/generator/genConfig.js b/src/api/generator/genConfig.js
new file mode 100644
index 0000000..e15b200
--- /dev/null
+++ b/src/api/generator/genConfig.js
@@ -0,0 +1,16 @@
+import request from '@/utils/request'
+
+export function get(tableName) {
+  return request({
+    url: 'api/genConfig/' + tableName,
+    method: 'get'
+  })
+}
+
+export function update(data) {
+  return request({
+    url: 'api/genConfig',
+    data,
+    method: 'put'
+  })
+}
diff --git a/src/api/generator/generator.js b/src/api/generator/generator.js
new file mode 100644
index 0000000..0c49718
--- /dev/null
+++ b/src/api/generator/generator.js
@@ -0,0 +1,33 @@
+import request from '@/utils/request'
+
+export function getAllTable() {
+  return request({
+    url: 'api/generator/tables/all',
+    method: 'get'
+  })
+}
+
+export function generator(tableName, type) {
+  return request({
+    url: 'api/generator/' + tableName + '/' + type,
+    method: 'post',
+    responseType: type === 2 ? 'blob' : ''
+  })
+}
+
+export function save(data) {
+  return request({
+    url: 'api/generator',
+    data,
+    method: 'put'
+  })
+}
+
+export function sync(tables) {
+  return request({
+    url: 'api/generator/sync',
+    method: 'post',
+    data: tables
+  })
+}
+
diff --git a/src/api/getRaisePaidRecordList.js b/src/api/getRaisePaidRecordList.js
new file mode 100644
index 0000000..05afc07
--- /dev/null
+++ b/src/api/getRaisePaidRecordList.js
@@ -0,0 +1,34 @@
+import request from '@/utils/request'
+
+export function getCates(params) {
+  return request({
+    url: 'api/yxRaiseOrder/getRaisePaidRecordList',
+    method: 'get',
+    params
+  })
+}
+
+export function add(data) {
+  return request({
+    url: 'api/yxRaiseOrder/getRaisePaidRecordList',
+    method: 'post',
+    data
+  })
+}
+
+export function del(id) {
+  return request({
+    url: 'api/yxRaiseOrder/getRaisePaidRecordList' + id,
+    method: 'delete'
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/yxRaiseOrder/getRaisePaidRecordList',
+    method: 'put',
+    data
+  })
+}
+
+export default { add, edit, del, getCates }
diff --git a/src/api/monitor/log.js b/src/api/monitor/log.js
new file mode 100644
index 0000000..13f0d39
--- /dev/null
+++ b/src/api/monitor/log.js
@@ -0,0 +1,22 @@
+import request from '@/utils/request'
+
+export function getErrDetail(id) {
+  return request({
+    url: 'api/logs/error/' + id,
+    method: 'get'
+  })
+}
+
+export function delAllError() {
+  return request({
+    url: 'api/logs/del/error',
+    method: 'delete'
+  })
+}
+
+export function delAllInfo() {
+  return request({
+    url: 'api/logs/del/info',
+    method: 'delete'
+  })
+}
diff --git a/src/api/monitor/online.js b/src/api/monitor/online.js
new file mode 100644
index 0000000..b39ee7f
--- /dev/null
+++ b/src/api/monitor/online.js
@@ -0,0 +1,18 @@
+import request from '@/utils/request'
+
+export function del(keys) {
+  return request({
+    url: 'auth/online',
+    method: 'delete',
+    data: keys
+  })
+}
+
+export function delT(keys) {
+  return request({
+    url: 'auth/online/delete',
+    method: 'post',
+    data: keys
+  })
+}
+
diff --git a/src/api/monitor/server.js b/src/api/monitor/server.js
new file mode 100644
index 0000000..2ade356
--- /dev/null
+++ b/src/api/monitor/server.js
@@ -0,0 +1,27 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/server',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/server',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/server',
+    method: 'put',
+    data
+  })
+}
+
+export default { add, edit, del }
diff --git a/src/api/monitor/visits.js b/src/api/monitor/visits.js
new file mode 100644
index 0000000..d35f6b0
--- /dev/null
+++ b/src/api/monitor/visits.js
@@ -0,0 +1,24 @@
+import request from '@/utils/request'
+
+export function count() {
+  return request({
+    url: 'api/visits',
+    method: 'post'
+  })
+}
+
+export function get() {
+  return request({
+    url: 'api/visits',
+    method: 'get'
+  })
+}
+
+export function getChartData() {
+  return request({
+    url: 'api/visits/chartData',
+    method: 'get'
+  })
+}
+
+
diff --git a/src/api/orderByUid.js b/src/api/orderByUid.js
new file mode 100644
index 0000000..160eaeb
--- /dev/null
+++ b/src/api/orderByUid.js
@@ -0,0 +1,11 @@
+import request from '@/utils/request'
+
+export function getCuid(params) {
+  return request({
+    url: 'api/yxUser/orderByUid',
+    method: 'get',
+    params
+  })
+}
+
+export default { getCuid }
diff --git a/src/api/pvManager.js b/src/api/pvManager.js
new file mode 100644
index 0000000..967b464
--- /dev/null
+++ b/src/api/pvManager.js
@@ -0,0 +1,27 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/pvManager',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/pvManager/',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/pvManager',
+    method: 'put',
+    data
+  })
+}
+
+export default { add, edit, del }
diff --git a/src/api/refund.js b/src/api/refund.js
new file mode 100644
index 0000000..e69de29
diff --git a/src/api/spreadCount.js b/src/api/spreadCount.js
new file mode 100644
index 0000000..f6f235a
--- /dev/null
+++ b/src/api/spreadCount.js
@@ -0,0 +1,11 @@
+import request from '@/utils/request'
+
+export function gets(data) {
+  return request({
+    url: 'api/yxUser/spreadCount',
+    method: 'post',
+    data
+  })
+}
+
+export default { gets }
diff --git a/src/api/storeProductRule.js b/src/api/storeProductRule.js
new file mode 100644
index 0000000..9a1642b
--- /dev/null
+++ b/src/api/storeProductRule.js
@@ -0,0 +1,34 @@
+import request from '@/utils/request'
+
+export function add(data, id) {
+  return request({
+    url: `api/yxStoreProductRule/save/${id}`,
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/yxStoreProductRule/',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/yxStoreProductRule',
+    method: 'put',
+    data
+  })
+}
+
+export function info (id) {
+  return request({
+    url: `api/yxStoreProductRule/rule/${id}`,
+    method: 'get'
+  });
+}
+
+export default { add, edit, del, info }
diff --git a/src/api/toRefundStatus.js b/src/api/toRefundStatus.js
new file mode 100644
index 0000000..0b7ca5c
--- /dev/null
+++ b/src/api/toRefundStatus.js
@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+
+export function addss(data) {
+  return request({
+    url: 'api/yxStoreOrder/toRefundStatus',
+    method: 'post',
+    data
+  })
+}
+
diff --git a/src/api/tools/alipay.js b/src/api/tools/alipay.js
new file mode 100644
index 0000000..54090f5
--- /dev/null
+++ b/src/api/tools/alipay.js
@@ -0,0 +1,25 @@
+import request from '@/utils/request'
+
+export function get() {
+  return request({
+    url: 'api/aliPay',
+    method: 'get'
+  })
+}
+
+export function update(data) {
+  return request({
+    url: 'api/aliPay',
+    data,
+    method: 'put'
+  })
+}
+
+// 支付
+export function toAliPay(url, data) {
+  return request({
+    url: 'api/' + url,
+    data,
+    method: 'post'
+  })
+}
diff --git a/src/api/tools/email.js b/src/api/tools/email.js
new file mode 100644
index 0000000..af030cb
--- /dev/null
+++ b/src/api/tools/email.js
@@ -0,0 +1,24 @@
+import request from '@/utils/request'
+
+export function get() {
+  return request({
+    url: 'api/email',
+    method: 'get'
+  })
+}
+
+export function update(data) {
+  return request({
+    url: 'api/email',
+    data,
+    method: 'put'
+  })
+}
+
+export function send(data) {
+  return request({
+    url: 'api/email',
+    data,
+    method: 'post'
+  })
+}
diff --git a/src/api/tools/localStorage.js b/src/api/tools/localStorage.js
new file mode 100644
index 0000000..63ebe2b
--- /dev/null
+++ b/src/api/tools/localStorage.js
@@ -0,0 +1,27 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/localStorage',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/localStorage/',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/localStorage',
+    method: 'put',
+    data
+  })
+}
+
+export default { add, edit, del }
diff --git a/src/api/tools/material.js b/src/api/tools/material.js
new file mode 100644
index 0000000..ff6b276
--- /dev/null
+++ b/src/api/tools/material.js
@@ -0,0 +1,39 @@
+import request from '@/utils/request'
+
+export function getPage(query) {
+  return request({
+    url: 'api/material/page',
+    method: 'get',
+    params: query
+  })
+}
+
+export function addObj(obj) {
+  return request({
+    url: 'api/material',
+    method: 'post',
+    data: obj
+  })
+}
+
+export function getObj(id) {
+  return request({
+    url: 'api/material/' + id,
+    method: 'get'
+  })
+}
+
+export function delObj(id) {
+  return request({
+    url: 'api/material/' + id,
+    method: 'delete'
+  })
+}
+
+export function putObj(obj) {
+  return request({
+    url: 'api/material',
+    method: 'put',
+    data: obj
+  })
+}
diff --git a/src/api/tools/materialgroup.js b/src/api/tools/materialgroup.js
new file mode 100644
index 0000000..baf2505
--- /dev/null
+++ b/src/api/tools/materialgroup.js
@@ -0,0 +1,39 @@
+import request from '@/utils/request'
+
+export function getPage(query) {
+  return request({
+    url: 'api/materialgroup/page',
+    method: 'get',
+    params: query
+  })
+}
+
+export function addObj(obj) {
+  return request({
+    url: 'api/materialgroup',
+    method: 'post',
+    data: obj
+  })
+}
+
+export function getObj(id) {
+  return request({
+    url: 'api/materialgroup/' + id,
+    method: 'get'
+  })
+}
+
+export function delObj(id) {
+  return request({
+    url: 'api/materialgroup/' + id,
+    method: 'delete'
+  })
+}
+
+export function putObj(obj) {
+  return request({
+    url: 'api/materialgroup',
+    method: 'put',
+    data: obj
+  })
+}
diff --git a/src/api/tools/picture.js b/src/api/tools/picture.js
new file mode 100644
index 0000000..237d5f5
--- /dev/null
+++ b/src/api/tools/picture.js
@@ -0,0 +1,18 @@
+import request from '@/utils/request'
+
+export function del(ids) {
+  return request({
+    url: 'api/pictures',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function sync() {
+  return request({
+    url: 'api/pictures/synchronize',
+    method: 'post'
+  })
+}
+
+export default { del, sync }
diff --git a/src/api/tools/qiniu.js b/src/api/tools/qiniu.js
new file mode 100644
index 0000000..6d56771
--- /dev/null
+++ b/src/api/tools/qiniu.js
@@ -0,0 +1,40 @@
+import request from '@/utils/request'
+
+export function get() {
+  return request({
+    url: 'api/qiNiuContent/config',
+    method: 'get'
+  })
+}
+
+export function update(data) {
+  return request({
+    url: 'api/qiNiuContent/config',
+    data,
+    method: 'put'
+  })
+}
+
+export function download(id) {
+  return request({
+    url: 'api/qiNiuContent/download/' + id,
+    method: 'get'
+  })
+}
+
+export function sync() {
+  return request({
+    url: 'api/qiNiuContent/synchronize',
+    method: 'post'
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/qiNiuContent',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export default { del, download, sync }
diff --git a/src/api/visits.js b/src/api/visits.js
new file mode 100644
index 0000000..d8a7d15
--- /dev/null
+++ b/src/api/visits.js
@@ -0,0 +1,43 @@
+import request from '@/utils/request'
+
+export function count() {
+  return request({
+    url: 'api/visits',
+    method: 'post'
+  })
+}
+
+export function get() {
+  return request({
+    url: 'api/visits',
+    method: 'get'
+  })
+}
+
+export function getChartData() {
+  return request({
+    url: 'api/visits/chartData',
+    method: 'get'
+  })
+}
+
+export function gett() {
+  return request({
+    url: 'api/data/count',
+    method: 'get'
+  })
+}
+
+export function chart() {
+  return request({
+    url: 'api/data/chart',
+    method: 'get'
+  })
+}
+
+export function getOrderCount() {
+  return request({
+    url: 'api/yxStoreOrder/orderCount',
+    method: 'get'
+  })
+}
diff --git a/src/api/writeOff.js b/src/api/writeOff.js
new file mode 100644
index 0000000..13e9b8a
--- /dev/null
+++ b/src/api/writeOff.js
@@ -0,0 +1,34 @@
+import request from '@/utils/request'
+
+export function getCat(params) {
+  return request({
+    url: 'api/yxRaiseOrder/writeOff',
+    method: 'get',
+    params
+  })
+}
+
+export function addp(data) {
+  return request({
+    url: 'api/yxRaiseOrder/writeOff',
+    method: 'post',
+    data
+  })
+}
+
+export function delp(id) {
+  return request({
+    url: 'api/yxRaiseOrder/writeOff' + id,
+    method: 'delete'
+  })
+}
+
+export function editp(data) {
+  return request({
+    url: 'api/yxRaiseOrder/writeOff',
+    method: 'put',
+    data
+  })
+}
+
+export default { addp, editp, delp, getCat }
diff --git a/src/api/yxArticle.js b/src/api/yxArticle.js
new file mode 100644
index 0000000..b09adf9
--- /dev/null
+++ b/src/api/yxArticle.js
@@ -0,0 +1,39 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/yxArticle',
+    method: 'post',
+    data
+  })
+}
+
+export function del(id) {
+  return request({
+    url: 'api/yxArticle/' + id,
+    method: 'delete'
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/yxArticle',
+    method: 'put',
+    data
+  })
+}
+
+export function publish(id) {
+  return request({
+    url: 'api/yxArticle/publish/' + id,
+    method: 'get'
+  })
+}
+
+
+export function get(id) {
+  return request({
+    url: 'api/yxArticle/info/' + id,
+    method: 'get'
+  })
+}
diff --git a/src/api/yxExpress.js b/src/api/yxExpress.js
new file mode 100644
index 0000000..5e7635e
--- /dev/null
+++ b/src/api/yxExpress.js
@@ -0,0 +1,25 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/yxExpress',
+    method: 'post',
+    data
+  })
+}
+
+export function del(id) {
+  return request({
+    url: 'api/yxExpress/' + id,
+    method: 'delete'
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/yxExpress',
+    method: 'put',
+    data
+  })
+}
+
diff --git a/src/api/yxLive.js b/src/api/yxLive.js
new file mode 100644
index 0000000..6565ba9
--- /dev/null
+++ b/src/api/yxLive.js
@@ -0,0 +1,27 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/yxLive',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/yxLive/',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/yxLive',
+    method: 'put',
+    data
+  })
+}
+
+export default { add, edit, del }
diff --git a/src/api/yxRaise.js b/src/api/yxRaise.js
new file mode 100644
index 0000000..46ae430
--- /dev/null
+++ b/src/api/yxRaise.js
@@ -0,0 +1,34 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/yxRaise',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/yxRaise/',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/yxRaise',
+    method: 'put',
+    data
+  })
+}
+export function gett(datae) {
+  return request({
+    url: 'api/yxRaise',
+    method: 'get',
+    data: datae
+  })
+}
+
+export default { add, edit, del, gett }
diff --git a/src/api/yxRaiseOrder.js b/src/api/yxRaiseOrder.js
new file mode 100644
index 0000000..0a789cf
--- /dev/null
+++ b/src/api/yxRaiseOrder.js
@@ -0,0 +1,27 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/yxRaiseOrder',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/yxRaiseOrder/',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/yxRaiseOrder',
+    method: 'put',
+    data
+  })
+}
+
+export default { add, edit, del }
diff --git a/src/api/yxRaiseOrderDownload.js b/src/api/yxRaiseOrderDownload.js
new file mode 100644
index 0000000..eca794f
--- /dev/null
+++ b/src/api/yxRaiseOrderDownload.js
@@ -0,0 +1,12 @@
+
+import request from '@/utils/request'
+
+export function down(data) {
+  return request({
+    url: '/api/yxRaiseOrder/download',
+    method: 'post',
+    data
+  })
+}
+
+export default { down }
diff --git a/src/api/yxRaiseProject.js b/src/api/yxRaiseProject.js
new file mode 100644
index 0000000..a164bcf
--- /dev/null
+++ b/src/api/yxRaiseProject.js
@@ -0,0 +1,27 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/yxRaiseProject',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/yxRaiseProject/',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/yxRaiseProject',
+    method: 'put',
+    data
+  })
+}
+
+export default { add, edit, del }
diff --git a/src/api/yxShippingTemplates.js b/src/api/yxShippingTemplates.js
new file mode 100644
index 0000000..1aa6ca2
--- /dev/null
+++ b/src/api/yxShippingTemplates.js
@@ -0,0 +1,34 @@
+import request from '@/utils/request'
+
+export function add(data,id) {
+  return request({
+    url: `api/yxShippingTemplates/save/${id}`,
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/yxShippingTemplates/',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/yxShippingTemplates',
+    method: 'put',
+    data
+  })
+}
+
+export function getCity() {
+  return request({
+    url: 'api/yxShippingTemplates/citys',
+    method: 'get'
+  });
+}
+
+export default { add, edit, del,getCity }
diff --git a/src/api/yxStoreActivity.js b/src/api/yxStoreActivity.js
new file mode 100644
index 0000000..057427e
--- /dev/null
+++ b/src/api/yxStoreActivity.js
@@ -0,0 +1,74 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/yxStoreActivity',
+    method: 'post',
+    data
+  })
+}
+export function gets(data) {
+  return request({
+    url: 'api/yxStoreActivity' + '?' + 'page=' + data.page + '&' + 'limit=' + data.limit,
+    method: 'get',
+    data
+  })
+}
+
+export function getses(data) {
+  return request({
+    url: 'api/yxStoreCategoryShop',
+    method: 'get',
+    data
+  })
+}
+
+export function getList(data) {
+  return request({
+    url: 'api/yxStoreActivity/getList?' + 'aid=' + data.aid,
+    method: 'get',
+    data
+  })
+}
+
+export function getsesInput(data) {
+  return request({
+    url: 'api/yxStoreCategoryShop/SearchProduct?' + 'value=' + data.value,
+    method: 'get',
+    data
+  })
+}
+
+export function gePtses(data) {
+  return request({
+    url: 'api/yxStoreCategoryShop/ProductList',
+    method: 'post',
+    data
+  })
+}
+
+export function gePtsesForm(data) {
+  return request({
+    url: 'api/yxStoreCategoryShop/PitchProductList ',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/yxStoreActivity',
+    method: 'Delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/yxStoreActivity',
+    method: 'put',
+    data
+  })
+}
+
+export default { add, edit, del, gets, getses, gePtses, gePtsesForm, getsesInput, getList }
diff --git a/src/api/yxStoreBargain.js b/src/api/yxStoreBargain.js
new file mode 100644
index 0000000..24118a6
--- /dev/null
+++ b/src/api/yxStoreBargain.js
@@ -0,0 +1,39 @@
+import request from '@/utils/request'
+
+export function List(data) {
+  return request({
+    url: 'api/yxStoreBargainConfigList',
+    method: 'get',
+    data
+  })
+}
+export function Config(data) {
+  return request({
+    url: 'api/yxStoreBargainConfig',
+    method: 'post',
+    data
+  })
+}
+
+export function add(data) {
+  return request({
+    url: 'api/yxStoreBargain',
+    method: 'post',
+    data
+  })
+}
+
+export function del(id) {
+  return request({
+    url: 'api/yxStoreBargain/' + id,
+    method: 'delete'
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/yxStoreBargain',
+    method: 'put',
+    data
+  })
+}
diff --git a/src/api/yxStoreBargainUser.js b/src/api/yxStoreBargainUser.js
new file mode 100644
index 0000000..85c2a03
--- /dev/null
+++ b/src/api/yxStoreBargainUser.js
@@ -0,0 +1,24 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/yxStoreBargainUser',
+    method: 'post',
+    data
+  })
+}
+
+export function del(id) {
+  return request({
+    url: 'api/yxStoreBargainUser/' + id,
+    method: 'delete'
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/yxStoreBargainUser',
+    method: 'put',
+    data
+  })
+}
diff --git a/src/api/yxStoreCategory.js b/src/api/yxStoreCategory.js
new file mode 100644
index 0000000..60588fb
--- /dev/null
+++ b/src/api/yxStoreCategory.js
@@ -0,0 +1,34 @@
+import request from '@/utils/request'
+
+export function getCates(params) {
+  return request({
+    url: 'api/yxStoreCategory',
+    method: 'get',
+    params
+  })
+}
+
+export function add(data) {
+  return request({
+    url: 'api/yxStoreCategory',
+    method: 'post',
+    data
+  })
+}
+
+export function del(id) {
+  return request({
+    url: 'api/yxStoreCategory/' + id,
+    method: 'delete'
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/yxStoreCategory',
+    method: 'put',
+    data
+  })
+}
+
+export default { add, edit, del, getCates }
diff --git a/src/api/yxStoreCategoryShop.js b/src/api/yxStoreCategoryShop.js
new file mode 100644
index 0000000..7656e2d
--- /dev/null
+++ b/src/api/yxStoreCategoryShop.js
@@ -0,0 +1,64 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/yxStoreCategoryShop',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/yxStoreCategoryShop/',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/yxStoreCategoryShop',
+    method: 'put',
+    data
+  })
+}
+
+export function getTempList(data) {
+  return request({
+    url: 'api/yxStoreActivity/getTempList',
+    method: 'get',
+    data: data
+  })
+}
+
+export function get(data) {
+  return request({
+    url: 'api/yxStoreCategoryShop/Product?' + 'shopId=' + data.shopId,
+    method: 'get',
+    data: data
+  })
+}
+export function dels(data) {
+  return request({
+    url: 'api/yxStoreCategoryShop/ProductRelieve?' + 'id=' + data.id,
+    method: 'get',
+    data: data
+  })
+}
+export function delse(data) {
+  return request({
+    url: 'api/yxStoreCategoryShop/ProductDel?' + 'id=' + data.id,
+    method: 'get',
+    data: data
+  })
+}
+export function putse(data) {
+  return request({
+    url: 'api/yxStoreCategoryShop',
+    method: 'put',
+    data: data
+  })
+}
+
+export default { add, edit, del, get, dels, delse, putse, getTempList }
diff --git a/src/api/yxStoreCityWide.js b/src/api/yxStoreCityWide.js
new file mode 100644
index 0000000..efffd8a
--- /dev/null
+++ b/src/api/yxStoreCityWide.js
@@ -0,0 +1,31 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/yxStoreCityWide' + '?' + 'size=' + data.size + '&' + 'limit=' + data.limit,
+    method: 'get',
+    data
+  })
+}
+export function get(data) {
+  return request({
+    url: 'api/yxStoreCityWide/getCityList',
+    method: 'get',
+    data
+  })
+}
+export function put(data) {
+  return request({
+    url: 'api/yxStoreCityWide',
+    method: 'post',
+    data
+  })
+}
+export function dele(data) {
+  return request({
+    url: 'api/yxStoreCityWide/del' + '?' + 'id=' + data.id,
+    method: 'get',
+    data
+  })
+}
+
diff --git a/src/api/yxStoreCombination.js b/src/api/yxStoreCombination.js
new file mode 100644
index 0000000..48b9d89
--- /dev/null
+++ b/src/api/yxStoreCombination.js
@@ -0,0 +1,46 @@
+import request from '@/utils/request'
+
+export function List(data) {
+  return request({
+    url: 'api/yxStorePinkConfigList',
+    method: 'get',
+    data
+  })
+}
+export function Config(data) {
+  return request({
+    url: 'api/yxStorePinkConfig',
+    method: 'post',
+    data
+  })
+}
+export function add(data) {
+  return request({
+    url: 'api/yxStoreCombination',
+    method: 'post',
+    data
+  })
+}
+
+export function del(id) {
+  return request({
+    url: 'api/yxStoreCombination/' + id,
+    method: 'delete'
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/yxStoreCombination',
+    method: 'put',
+    data
+  })
+}
+
+export function onsale(id, data) {
+  return request({
+    url: 'api/yxStoreCombination/onsale/' + id,
+    method: 'post',
+    data
+  })
+}
diff --git a/src/api/yxStoreCoupon.js b/src/api/yxStoreCoupon.js
new file mode 100644
index 0000000..3f0e1ae
--- /dev/null
+++ b/src/api/yxStoreCoupon.js
@@ -0,0 +1,39 @@
+import request from '@/utils/request'
+
+export function show(data) {
+  return request({
+    url: 'api/yxStoreCoupon/addCouponSlideshow',
+    method: 'post',
+    data
+  })
+}
+
+export function showList(data) {
+  return request({
+    url: 'api/CouponSlideshowList',
+    method: 'get',
+    data
+  })
+}
+export function add(data) {
+  return request({
+    url: 'api/yxStoreCoupon',
+    method: 'post',
+    data
+  })
+}
+
+export function del(id) {
+  return request({
+    url: 'api/yxStoreCoupon/' + id,
+    method: 'delete'
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/yxStoreCoupon',
+    method: 'put',
+    data
+  })
+}
diff --git a/src/api/yxStoreCouponIssue.js b/src/api/yxStoreCouponIssue.js
new file mode 100644
index 0000000..271c795
--- /dev/null
+++ b/src/api/yxStoreCouponIssue.js
@@ -0,0 +1,24 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/yxStoreCouponIssue',
+    method: 'post',
+    data
+  })
+}
+
+export function del(id) {
+  return request({
+    url: 'api/yxStoreCouponIssue/' + id,
+    method: 'delete'
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/yxStoreCouponIssue',
+    method: 'put',
+    data
+  })
+}
diff --git a/src/api/yxStoreCouponIssueUser.js b/src/api/yxStoreCouponIssueUser.js
new file mode 100644
index 0000000..7239da2
--- /dev/null
+++ b/src/api/yxStoreCouponIssueUser.js
@@ -0,0 +1,24 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/yxStoreCouponIssueUser',
+    method: 'post',
+    data
+  })
+}
+
+export function del(id) {
+  return request({
+    url: 'api/yxStoreCouponIssueUser/' + id,
+    method: 'delete'
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/yxStoreCouponIssueUser',
+    method: 'put',
+    data
+  })
+}
diff --git a/src/api/yxStoreCouponUser.js b/src/api/yxStoreCouponUser.js
new file mode 100644
index 0000000..5cb7bbb
--- /dev/null
+++ b/src/api/yxStoreCouponUser.js
@@ -0,0 +1,24 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/yxStoreCouponUser',
+    method: 'post',
+    data
+  })
+}
+
+export function del(id) {
+  return request({
+    url: 'api/yxStoreCouponUser/' + id,
+    method: 'delete'
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/yxStoreCouponUser',
+    method: 'put',
+    data
+  })
+}
diff --git a/src/api/yxStoreElephant.js b/src/api/yxStoreElephant.js
new file mode 100644
index 0000000..848f370
--- /dev/null
+++ b/src/api/yxStoreElephant.js
@@ -0,0 +1,17 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/yxStoreElephant?' + 'page=' + data.page + '&' + 'limit=' + data.limit,
+    method: 'get',
+    data
+  })
+}
+export function del(data) {
+  return request({
+    url: 'api/yxStoreElephant/del?' + 'id=' + data.id,
+    method: 'get',
+    data
+  })
+}
+
diff --git a/src/api/yxStoreOrder.js b/src/api/yxStoreOrder.js
new file mode 100644
index 0000000..7c7a0e1
--- /dev/null
+++ b/src/api/yxStoreOrder.js
@@ -0,0 +1,108 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/yxStoreOrder',
+    method: 'post',
+    data
+  })
+}
+
+export function CodeList(data) {
+  return request({
+    url: 'api/getVerifyCodeList?' + 'val=' + data.val,
+    method: 'get'
+  })
+}
+
+export function getCount(data) {
+  return request({
+    url: 'api/yxStoreOrderCount?' + 'shippingType=' + data.shippingType,
+    method: 'get'
+  })
+}
+
+export function getss(data) {
+  return request({
+    url: 'api/yxStoreOrder' + '?' + 'page=' + data.page + '&' + 'uid=' + data.uid + '&' + 'size=' + data.size + '&' + 'sort=' + data.sort + '&' + 'orderStatus=' + -9 + '&' + 'orderType=' + 0,
+    method: 'get',
+    data: data
+  })
+}
+export function getes(data) {
+  return request({
+    url: 'api/yxStoreOrder' + '?' + 'page=' + data.page + '&' + 'uid=' + data.uid + '&' + 'size=' + data.size + '&' + 'sort=' + data.sort + '&' + 'orderStatus=' + -9 + '&' + 'orderType=' + 5,
+    method: 'get',
+    data: data
+  })
+}
+
+export function del(id) {
+  return request({
+    url: 'api/yxStoreOrder/' + id,
+    method: 'delete'
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/yxStoreOrder',
+    method: 'put',
+    data
+  })
+}
+
+export function editT(data) {
+  return request({
+    url: 'api/yxStoreOrder/check',
+    method: 'put',
+    data
+  })
+}
+
+export function refund(data) {
+  return request({
+    url: 'api/yxStoreOrder/refund',
+    method: 'post',
+    data
+  })
+}
+export function refuse(data) {
+  return request({
+    url: 'api/yxStoreOrder/refundNo',
+    method: 'post',
+    data
+  })
+}
+
+export function editOrder(data) {
+  return request({
+    url: 'api/yxStoreOrder/edit',
+    method: 'post',
+    data
+  })
+}
+
+export function remark(data) {
+  return request({
+    url: 'api/yxStoreOrder/remark',
+    method: 'post',
+    data
+  })
+}
+
+export function get() {
+  return request({
+    url: 'api/yxExpress',
+    method: 'get'
+  })
+}
+
+export function express(data) {
+  return request({
+    url: 'api/yxStoreOrder/express',
+    method: 'post',
+    data
+  })
+}
+
diff --git a/src/api/yxStoreOrderStatus.js b/src/api/yxStoreOrderStatus.js
new file mode 100644
index 0000000..eaa732d
--- /dev/null
+++ b/src/api/yxStoreOrderStatus.js
@@ -0,0 +1,24 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/yxStoreOrderStatus',
+    method: 'post',
+    data
+  })
+}
+
+export function del(id) {
+  return request({
+    url: 'api/yxStoreOrderStatus/' + id,
+    method: 'delete'
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/yxStoreOrderStatus',
+    method: 'put',
+    data
+  })
+}
diff --git a/src/api/yxStorePink.js b/src/api/yxStorePink.js
new file mode 100644
index 0000000..85b5eea
--- /dev/null
+++ b/src/api/yxStorePink.js
@@ -0,0 +1,24 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/yxStorePink',
+    method: 'post',
+    data
+  })
+}
+
+export function del(id) {
+  return request({
+    url: 'api/yxStorePink/' + id,
+    method: 'delete'
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/yxStorePink',
+    method: 'put',
+    data
+  })
+}
diff --git a/src/api/yxStoreProduct.js b/src/api/yxStoreProduct.js
new file mode 100644
index 0000000..63c464d
--- /dev/null
+++ b/src/api/yxStoreProduct.js
@@ -0,0 +1,113 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/yxStoreProduct/addOrSave',
+    method: 'post',
+    data
+  })
+}
+export function yxClass(data) {
+  return request({
+    url: 'api/yxClassifyId ',
+    method: 'get',
+    data
+  })
+}
+
+export function del(id) {
+  return request({
+    url: 'api/yxStoreProduct/' + id,
+    method: 'delete'
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/yxStoreProduct',
+    method: 'put',
+    data
+  })
+}
+
+export function onsale(id, data) {
+  return request({
+    url: 'api/yxStoreProduct/onsale/' + id,
+    method: 'post',
+    data
+  })
+}
+
+export function recovery(id) {
+  return request({
+    url: 'api/yxStoreProduct/recovery/' + id,
+    method: 'delete'
+  })
+}
+
+export function isFormatAttr(id, data) {
+  return request({
+    url: 'api/yxStoreProduct/isFormatAttr/' + id,
+    method: 'post',
+    data
+  })
+}
+
+export function setAttr(id, data) {
+  return request({
+    url: 'api/yxStoreProduct/setAttr/' + id,
+    method: 'post',
+    data
+  })
+}
+
+export function clearAttr(id) {
+  return request({
+    url: 'api/yxStoreProduct/clearAttr/' + id,
+    method: 'post'
+  })
+}
+
+export function getAttr(id) {
+  return request({
+    url: 'api/yxStoreProduct/attr/' + id,
+    method: 'get'
+  })
+}
+
+export function getInfo(id) {
+  return request({
+    url: 'api/yxStoreProduct/info/' + id,
+    method: 'get'
+  })
+}
+
+export function addpa(data) {
+  return request({
+    url: 'api/yxStoreSource' + '?' + 'page=' + data.page + '&' + 'size=' + data.size,
+    method: 'get',
+    data
+  })
+}
+export function gets(data) {
+  return request({
+    url: 'api/yxStoreCategoryShop',
+    method: 'get',
+    data
+  })
+}
+export function pospa(data) {
+  return request({
+    url: 'api/yxStoreSource',
+    method: 'post',
+    data
+  })
+}
+
+export function Content(data) {
+  return request({
+    url: 'api/qiNiuContent',
+    method: 'post',
+    data
+  })
+}
diff --git a/src/api/yxStoreProductReply.js b/src/api/yxStoreProductReply.js
new file mode 100644
index 0000000..23ac560
--- /dev/null
+++ b/src/api/yxStoreProductReply.js
@@ -0,0 +1,24 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/yxStoreProductReply',
+    method: 'post',
+    data
+  })
+}
+
+export function del(id) {
+  return request({
+    url: 'api/yxStoreProductReply/' + id,
+    method: 'delete'
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/yxStoreProductReply',
+    method: 'put',
+    data
+  })
+}
diff --git a/src/api/yxStoreSeckill.js b/src/api/yxStoreSeckill.js
new file mode 100644
index 0000000..d5037da
--- /dev/null
+++ b/src/api/yxStoreSeckill.js
@@ -0,0 +1,51 @@
+import request from '@/utils/request'
+
+export function List(data) {
+  return request({
+    url: 'api/yxStoreSeckillConfigList',
+    method: 'get',
+    data
+  })
+}
+export function Config(data) {
+  return request({
+    url: 'api/yxStoreSeckillConfig',
+    method: 'post',
+    data
+  })
+}
+export function add(data) {
+  return request({
+    url: 'api/yxStoreSeckill',
+    method: 'post',
+    data
+  })
+}
+
+export function del(id) {
+  return request({
+    url: 'api/yxStoreSeckill/' + id,
+    method: 'delete'
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/yxStoreSeckill',
+    method: 'put',
+    data
+  })
+}
+export function isFormatAttr(id, data) {
+  return request({
+    url: 'api/yxStoreProduct/isFormatAttr/' + id,
+    method: 'post',
+    data
+  })
+}
+export function getInfo(id) {
+  return request({
+    url: 'api/yxStoreProduct/info/' + id,
+    method: 'get'
+  })
+}
diff --git a/src/api/yxStoreVisit.js b/src/api/yxStoreVisit.js
new file mode 100644
index 0000000..50a7469
--- /dev/null
+++ b/src/api/yxStoreVisit.js
@@ -0,0 +1,24 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/yxStoreVisit',
+    method: 'post',
+    data
+  })
+}
+
+export function del(id) {
+  return request({
+    url: 'api/yxStoreVisit/' + id,
+    method: 'delete'
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/yxStoreVisit',
+    method: 'put',
+    data
+  })
+}
diff --git a/src/api/yxSystemConfig.js b/src/api/yxSystemConfig.js
new file mode 100644
index 0000000..0d06a85
--- /dev/null
+++ b/src/api/yxSystemConfig.js
@@ -0,0 +1,32 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/yxSystemConfig',
+    method: 'post',
+    data
+  })
+}
+
+export function del(id) {
+  return request({
+    url: 'api/yxSystemConfig/' + id,
+    method: 'delete'
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/yxSystemConfig',
+    method: 'put',
+    data
+  })
+}
+
+export function get() {
+  return request({
+    url: 'api/yxSystemConfig?size=50',
+    method: 'get'
+  })
+}
+
diff --git a/src/api/yxSystemGroupData.js b/src/api/yxSystemGroupData.js
new file mode 100644
index 0000000..7f5a8b6
--- /dev/null
+++ b/src/api/yxSystemGroupData.js
@@ -0,0 +1,31 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/yxSystemGroupData',
+    method: 'post',
+    data
+  })
+}
+
+export function del(id) {
+  return request({
+    url: 'api/yxSystemGroupData/' + id,
+    method: 'delete'
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/yxSystemGroupData',
+    method: 'put',
+    data
+  })
+}
+
+export function get() {
+  return request({
+    url: 'api/yxSystemGroupData',
+    method: 'get'
+  })
+}
diff --git a/src/api/yxSystemStore.js b/src/api/yxSystemStore.js
new file mode 100644
index 0000000..507a46b
--- /dev/null
+++ b/src/api/yxSystemStore.js
@@ -0,0 +1,56 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/yxSystemStore',
+    method: 'post',
+    data
+  })
+}
+
+export function get() {
+  return request({
+    url: 'api/yxSystemStore',
+    method: 'get'
+  })
+}
+
+export function getAll() {
+  return request({
+    url: 'api/yxSystemStore/all',
+    method: 'get'
+  })
+}
+
+export function getL(data) {
+  return request({
+    url: 'api/yxSystemStore/getL',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/yxSystemStore/',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/yxSystemStore',
+    method: 'put',
+    data
+  })
+}
+// export function xaiz(data) {
+//   return request({
+//     url: 'api/yxStoreOrder/download' + '?' + 'page=' + 0 + '&' +  'size=' + 10000 + '&' + 'sort=' + data.sort + '&' + 'orderStatus=' + -9 + '&' + 'orderType=' + 5+'&'+'createTime='+'&'+'listContent='+data.listContent,
+//     method: 'get',
+//     data
+//   })
+// }
+
+export default { getL, add, edit, del, get, getAll }
diff --git a/src/api/yxSystemStoreStaff.js b/src/api/yxSystemStoreStaff.js
new file mode 100644
index 0000000..f95a59e
--- /dev/null
+++ b/src/api/yxSystemStoreStaff.js
@@ -0,0 +1,27 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/yxSystemStoreStaff',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/yxSystemStoreStaff/',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/yxSystemStoreStaff',
+    method: 'put',
+    data
+  })
+}
+
+export default { add, edit, del }
diff --git a/src/api/yxSystemUserLevel.js b/src/api/yxSystemUserLevel.js
new file mode 100644
index 0000000..a91c032
--- /dev/null
+++ b/src/api/yxSystemUserLevel.js
@@ -0,0 +1,24 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/yxSystemUserLevel',
+    method: 'post',
+    data
+  })
+}
+
+export function del(id) {
+  return request({
+    url: 'api/yxSystemUserLevel/' + id,
+    method: 'delete'
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/yxSystemUserLevel',
+    method: 'put',
+    data
+  })
+}
diff --git a/src/api/yxSystemUserTask.js b/src/api/yxSystemUserTask.js
new file mode 100644
index 0000000..995f945
--- /dev/null
+++ b/src/api/yxSystemUserTask.js
@@ -0,0 +1,24 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/yxSystemUserTask',
+    method: 'post',
+    data
+  })
+}
+
+export function del(id) {
+  return request({
+    url: 'api/yxSystemUserTask/' + id,
+    method: 'delete'
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/yxSystemUserTask',
+    method: 'put',
+    data
+  })
+}
diff --git a/src/api/yxUser.js b/src/api/yxUser.js
new file mode 100644
index 0000000..eaad64a
--- /dev/null
+++ b/src/api/yxUser.js
@@ -0,0 +1,55 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/yxUser',
+    method: 'post',
+    data
+  })
+}
+
+export function del(uid) {
+  return request({
+    url: 'api/yxUser/' + uid,
+    method: 'delete'
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/yxUser',
+    method: 'put',
+    data
+  })
+}
+
+export function onStatus(id, data) {
+  return request({
+    url: 'api/yxUser/onStatus/' + id,
+    method: 'post',
+    data
+  })
+}
+
+export function editp(data) {
+  return request({
+    url: 'api/yxUser/money',
+    method: 'post',
+    data
+  })
+}
+export function switchs(data) {
+  return request({
+    url: 'api/noSpreadUid?' + 'uid=' + data.uid,
+    method: 'get',
+    data
+  })
+}
+
+export function getSpread(data) {
+  return request({
+    url: 'api/yxUser/spread',
+    method: 'post',
+    data
+  })
+}
diff --git a/src/api/yxUserBill.js b/src/api/yxUserBill.js
new file mode 100644
index 0000000..b6f17e5
--- /dev/null
+++ b/src/api/yxUserBill.js
@@ -0,0 +1,32 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/yxUserBill',
+    method: 'post',
+    data
+  })
+}
+
+export function del(id) {
+  return request({
+    url: 'api/yxUserBill/' + id,
+    method: 'delete'
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/yxUserBill',
+    method: 'put',
+    data
+  })
+}
+export function gett(datas) {
+  return request({
+    url: 'api/yxUserBill' + '?' + 'page=' + datas.page + '&' + 'uid=' + datas.uid + '&' + 'size=' + datas.size + '&' + 'linkId=' + '' + '&' + 'nickname=' + '',
+    method: 'get',
+    data: datas
+  })
+}
+export default { gett, add, edit, del }
diff --git a/src/api/yxUserExtract.js b/src/api/yxUserExtract.js
new file mode 100644
index 0000000..b5af184
--- /dev/null
+++ b/src/api/yxUserExtract.js
@@ -0,0 +1,24 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/yxUserExtract',
+    method: 'post',
+    data
+  })
+}
+
+export function del(id) {
+  return request({
+    url: 'api/yxUserExtract/' + id,
+    method: 'delete'
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/yxUserExtract',
+    method: 'put',
+    data
+  })
+}
diff --git a/src/api/yxUserRecharge.js b/src/api/yxUserRecharge.js
new file mode 100644
index 0000000..38d1180
--- /dev/null
+++ b/src/api/yxUserRecharge.js
@@ -0,0 +1,27 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/yxUserRecharge',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/yxUserRecharge/',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/yxUserRecharge',
+    method: 'put',
+    data
+  })
+}
+
+export default { add, edit, del }
diff --git a/src/api/yxUserRecommend.js b/src/api/yxUserRecommend.js
new file mode 100644
index 0000000..a08b416
--- /dev/null
+++ b/src/api/yxUserRecommend.js
@@ -0,0 +1,36 @@
+import request from '@/utils/request'
+
+export function gets(params) {
+  return request({
+    url: 'api/yxUserRecommend',
+    method: 'get',
+    params
+  })
+}
+
+export function add(data) {
+  return request({
+    url: 'api/yxUserRecommend',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/yxUserRecommend',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/yxUserRecommend',
+    method: 'put',
+    data
+  })
+}
+
+export default { add, edit, del, gets }
+
diff --git a/src/api/yxUserTeamByUid.js b/src/api/yxUserTeamByUid.js
new file mode 100644
index 0000000..fe8ad9f
--- /dev/null
+++ b/src/api/yxUserTeamByUid.js
@@ -0,0 +1,11 @@
+import request from '@/utils/request'
+
+export function getYB(params) {
+  return request({
+    url: 'api/yxUser/yxUserTeamByUid',
+    method: 'get',
+    params
+  })
+}
+
+export default { getYB }
diff --git a/src/api/yxWechatReply.js b/src/api/yxWechatReply.js
new file mode 100644
index 0000000..e6db3e9
--- /dev/null
+++ b/src/api/yxWechatReply.js
@@ -0,0 +1,32 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/yxWechatReply',
+    method: 'post',
+    data
+  })
+}
+
+export function del(id) {
+  return request({
+    url: 'api/yxWechatReply/' + id,
+    method: 'delete'
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/yxWechatReply',
+    method: 'put',
+    data
+  })
+}
+
+export function get() {
+  return request({
+    url: 'api/yxWechatReply',
+    method: 'get'
+  })
+}
+
diff --git a/src/api/yxWechatTemplate.js b/src/api/yxWechatTemplate.js
new file mode 100644
index 0000000..4935309
--- /dev/null
+++ b/src/api/yxWechatTemplate.js
@@ -0,0 +1,32 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/yxWechatTemplate',
+    method: 'post',
+    data
+  })
+}
+
+export function del(id) {
+  return request({
+    url: 'api/yxWechatTemplate/' + id,
+    method: 'delete'
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/yxWechatTemplate',
+    method: 'put',
+    data
+  })
+}
+
+export function get() {
+  return request({
+    url: 'api/yxWechatTemplate',
+    method: 'get'
+  })
+}
+
diff --git a/src/api/yxWechatUser.js b/src/api/yxWechatUser.js
new file mode 100644
index 0000000..adb1e03
--- /dev/null
+++ b/src/api/yxWechatUser.js
@@ -0,0 +1,24 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/yxWechatUser',
+    method: 'post',
+    data
+  })
+}
+
+export function del(uid) {
+  return request({
+    url: 'api/yxWechatUser/' + uid,
+    method: 'delete'
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/yxWechatUser',
+    method: 'put',
+    data
+  })
+}
diff --git a/src/assets/styles/description.scss b/src/assets/styles/description.scss
new file mode 100644
index 0000000..76b0992
--- /dev/null
+++ b/src/assets/styles/description.scss
@@ -0,0 +1,17 @@
+.my-blockquote{
+  margin: 0px 0px 10px;
+  padding: 15px;
+  line-height: 22px;
+  border-left: 5px solid #00437B;
+  border-radius: 0 2px 2px 0;
+  background-color: #f2f2f2;
+}
+.my-code{
+  position: relative;
+  padding: 15px;
+  line-height: 20px;
+  border-left: 5px solid #ddd;
+  color: #333;
+  font-family: Courier New;
+  font-size: 12px
+}
diff --git a/src/components/material/index.vue b/src/components/material/index.vue
new file mode 100644
index 0000000..35f9bd6
--- /dev/null
+++ b/src/components/material/index.vue
@@ -0,0 +1,530 @@
+<template>
+  <div v-if="type == 'image'">
+    <ul
+      v-for="(item,index) in value"
+      :key="index"
+      class="el-upload-list el-upload-list--picture-card"
+    >
+      <li
+        tabindex="0"
+        class="el-upload-list__item is-ready"
+        :style="'width: '+width+'px;height: '+height+'px'"
+      >
+        <div>
+          <img :src="item" alt class="el-upload-list__item-thumbnail">
+          <span class="el-upload-list__item-actions">
+            <span
+              v-if="index != 0"
+              class="el-upload-list__item-preview"
+              @click="moveMaterial(index,'up')"
+            >
+              <i class="el-icon-back" />
+            </span>
+            <span class="el-upload-list__item-preview" @click="zoomMaterial(index)">
+              <i class="el-icon-view" />
+            </span>
+            <span class="el-upload-list__item-delete" @click="deleteMaterial(index)">
+              <i class="el-icon-delete" />
+            </span>
+            <span
+              v-if="index != value.length-1"
+              class="el-upload-list__item-preview"
+              @click="moveMaterial(index,'down')"
+            >
+              <i class="el-icon-right" />
+            </span>
+          </span>
+        </div>
+      </li>
+    </ul>
+    <!-- v-if="num > value.length"判断它显示的照片数量 -->
+    <div
+      v-if="num > value.length"
+      tabindex="0"
+      class="el-upload el-upload--picture-card"
+      :style="'width: '+width+'px;height: '+height+'px;'+'line-height:'+height+'px;'"
+      @click="toSeleteMaterial"
+    >
+      <i class="el-icon-plus" />
+    </div>
+
+    <el-dialog append-to-body :visible.sync="dialogVisible" width="35%">
+      <img :src="url" alt style="width: 100%">
+    </el-dialog>
+
+    <el-dialog title="图片素材库" append-to-body :visible.sync="listDialogVisible" width="70%">
+      <el-container>
+        <el-aside width="unset">
+          <div style="margin-bottom: 10px">
+            <el-button class="el-icon-plus" size="small" @click="materialgroupAdd()">添加分组</el-button>
+          </div>
+          <el-tabs
+            v-model="materialgroupObjId"
+            v-loading="materialgroupLoading"
+            tab-position="left"
+            @tab-click="tabClick"
+          >
+            <el-tab-pane v-for=" item in materialgroupList" :key="item.id" :name="item.id">
+              <span slot="label">{{ item.name }}</span>
+            </el-tab-pane>
+          </el-tabs>
+        </el-aside>
+        <el-main>
+          <el-card>
+            <div slot="header">
+              <el-row>
+                <el-col :span="12">
+                  <span>{{ materialgroupObj.name }}</span>
+                  <span v-if="materialgroupObj.id != '-1'">
+                    <el-button
+                      size="small"
+                      type="text"
+                      class="el-icon-edit"
+                      style="margin-left: 10px;"
+                      @click="materialgroupEdit(materialgroupObj)"
+                    >重命名</el-button>
+                    <el-button
+                      size="small"
+                      type="text"
+                      class="el-icon-delete"
+                      style="margin-left: 10px;color: red"
+                      @click="materialgroupDelete(materialgroupObj)"
+                    >删除</el-button>
+                  </span>
+                </el-col>
+                <el-col :span="12" style="text-align: right;">
+                  <el-upload
+                    :action="uploadApi"
+                    :headers="headers"
+                    :file-list="[]"
+                    :on-progress="handleProgress"
+                    :before-upload="beforeUpload"
+                    :on-success="handleSuccess"
+                    :data="{type: 1}"
+                    multiple
+                  >
+                    <el-button size="small" type="primary">批量上传</el-button>
+                  </el-upload>
+                </el-col>
+              </el-row>
+            </div>
+            <div v-loading="tableLoading">
+              <el-alert
+                v-if="tableData.length <= 0"
+                title="暂无数据"
+                type="info"
+                :closable="false"
+                center
+                show-icon
+              />
+              <el-row :gutter="5">
+                <el-checkbox-group v-model="urls" :max="num - value.length">
+                  <el-col v-for="(item,index) in tableData" :key="index" :span="4">
+                    <el-card :body-style="{ padding: '5px' }">
+                      <el-image
+                        style="width: 100%;height: 100px"
+                        :src="item.url"
+                        fit="contain"
+                        :preview-src-list="[item.url]"
+                        :z-index="999"
+                      />
+                      <div>
+                        <el-row>
+                          <el-col :span="24" class="col-do">
+                            <div class="pic-name">{{ item.name }}</div>
+                          </el-col>
+                        </el-row>
+                        <el-checkbox class="material-name" :label="item.url">选择</el-checkbox>
+                        <el-row>
+                          <el-col :span="24" class="col-do">
+                            <el-button type="text" size="medium" @click="materialDel(item)">删除</el-button>
+                          </el-col>
+                        </el-row>
+                      </div>
+                    </el-card>
+                  </el-col>
+                </el-checkbox-group>
+              </el-row>
+              <el-pagination
+                :current-page.sync="page.currentPage"
+                :page-sizes="[12, 24]"
+                :page-size="page.pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="page.total"
+                class="pagination"
+                @size-change="sizeChange"
+                @current-change="pageChange"
+              />
+            </div>
+          </el-card>
+        </el-main>
+      </el-container>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="listDialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="sureUrls">确 定</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  getPage as materialgroupPage,
+  addObj as materialgroupAdd,
+  delObj as materialgroupDel,
+  putObj as materialgroupEdit
+} from '@/api/tools/materialgroup'
+import { getPage, addObj, delObj, putObj } from '@/api/tools/material'
+import { getToken } from '@/utils/auth'
+import { mapGetters } from 'vuex'
+
+export default {
+  name: 'MaterialList',
+  props: {
+    // 素材数据
+    value: {
+      type: Array,
+      default() {
+        return []
+      }
+    },
+    // 素材类型
+    type: {
+      type: String,
+      default() {
+        return ''
+      }
+    },
+    // 素材限制数量，默认5个
+    // num: {
+    //   type: Number,
+    //   default() {
+    //     return 5
+    //   }
+    // },
+    // 宽度
+    width: {
+      type: Number,
+      default() {
+        return 150
+      }
+    },
+    // 宽度
+    height: {
+      type: Number,
+      default() {
+        return 150
+      }
+    }
+  },
+  data() {
+    return {
+      num: 9,
+      headers: {
+        Authorization: getToken()
+      },
+      dialogVisible: false,
+      url: '',
+      listDialogVisible: false,
+      materialgroupList: [],
+      materialgroupObjId: '',
+      materialgroupObj: {},
+      materialgroupLoading: false,
+      tableData: [],
+      resultNumber: 0,
+      page: {
+        total: 0, // 总页数
+        currentPage: 1, // 当前页数
+        pageSize: 12, // 每页显示多少条
+        ascs: [], // 升序字段
+        descs: 'create_time' // 降序字段
+      },
+      tableLoading: false,
+      groupId: null,
+      urls: []
+    }
+  },
+  computed: {
+    ...mapGetters(['uploadApi'])
+  },
+  methods: {
+    moveMaterial(index, type) {
+      if (type === 'up') {
+        const tempOption = this.value[index - 1]
+        this.$set(this.value, index - 1, this.value[index])
+        this.$set(this.value, index, tempOption)
+      }
+      if (type === 'down') {
+        const tempOption = this.value[index + 1]
+        this.$set(this.value, index + 1, this.value[index])
+        this.$set(this.value, index, tempOption)
+      }
+    },
+    zoomMaterial(index) {
+      this.dialogVisible = true
+      this.url = this.value[index]
+    },
+    deleteMaterial(index) {
+      const that = this
+      this.$confirm('是否确认删除？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(function() {
+        that.value.splice(index, 1)
+        that.urls = []
+      })
+    },
+    toSeleteMaterial() {
+      this.listDialogVisible = true
+      if (this.tableData.length <= 0) {
+        this.materialgroupPage()
+      }
+    },
+    materialgroupPage() {
+      this.materialgroupLoading = true
+      materialgroupPage({
+        total: 0, // 总页数
+        currentPage: 1, // 当前页数
+        pageSize: 100, // 每页显示多少条
+        ascs: [], // 升序字段
+        descs: 'create_time' // 降序字段
+      }).then((response) => {
+        this.materialgroupLoading = false
+        const materialgroupList = response.content
+        materialgroupList.unshift({
+          id: '-1',
+          name: '全部分组'
+        })
+        this.materialgroupList = materialgroupList
+        this.tabClick({
+          index: 0
+        })
+      })
+    },
+    materialgroupDelete(materialgroupObj) {
+      const that = this
+      this.$confirm('是否确认删除该分组？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(function() {
+        materialgroupDel(materialgroupObj.id).then(function() {
+          that.$delete(that.materialgroupList, materialgroupObj.index)
+        })
+      })
+    },
+    materialgroupEdit(materialgroupObj) {
+      const that = this
+      this.$prompt('请输入分组名', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        inputValue: materialgroupObj.name
+      })
+        .then(({ value }) => {
+          materialgroupEdit({
+            id: materialgroupObj.id,
+            name: value
+          }).then(function() {
+            materialgroupObj.name = value
+            that.$set(
+              that.materialgroupList,
+              materialgroupObj.index,
+              materialgroupObj
+            )
+          })
+        })
+        .catch(() => {})
+    },
+    materialgroupAdd() {
+      const that = this
+      this.$prompt('请输入分组名', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消'
+      })
+        .then(({ value }) => {
+          materialgroupAdd({
+            name: value
+          }).then(function() {
+            that.materialgroupPage()
+          })
+        })
+        .catch(() => {})
+    },
+    tabClick(tab, event) {
+      this.urls = []
+      const index = Number(tab.index)
+      const materialgroupObj = this.materialgroupList[index]
+      materialgroupObj.index = index
+      this.materialgroupObj = materialgroupObj
+      this.materialgroupObjId = materialgroupObj.id
+      this.page.currentPage = 1
+      this.page.total = 0
+      if (materialgroupObj.id !== '-1') {
+        this.groupId = materialgroupObj.id
+      } else {
+        this.groupId = null
+      }
+      this.getPage(this.page)
+    },
+    getPage(page, params) {
+      this.tableLoading = true
+      getPage(
+        Object.assign(
+          {
+            page: page.currentPage - 1,
+            size: page.pageSize,
+            descs: this.page.descs,
+            ascs: this.page.ascs,
+            sort: 'create_time,desc'
+          },
+          {
+            groupId: this.groupId
+          }
+        )
+      )
+        .then((response) => {
+          const tableData = response.content
+          this.page.total = response.totalElements
+          this.page.currentPage = page.currentPage
+          this.page.pageSize = page.pageSize
+          this.tableData = tableData
+          this.tableLoading = false
+        })
+        .catch(() => {
+          this.tableLoading = false
+        })
+    },
+    sizeChange(val) {
+      console.log(val)
+      this.page.currentPage = 1
+      this.page.pageSize = val
+      this.getPage(this.page)
+    },
+    pageChange(val) {
+      console.log(val)
+      this.page.currentPage = val
+      // this.page.pageSize = val
+      this.getPage(this.page)
+    },
+    materialRename(item) {
+      const that = this
+      this.$prompt('请输入素材名', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        inputValue: item.name
+      })
+        .then(({ value }) => {
+          putObj({
+            id: item.id,
+            name: value
+          }).then(function() {
+            that.getPage(that.page)
+          })
+        })
+        .catch(() => {})
+    },
+    materialUrl(item) {
+      // const that = this
+      this.$prompt('素材链接', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        inputValue: item.url
+      })
+        .then(({ value }) => {})
+        .catch(() => {})
+    },
+    materialDel(item) {
+      const that = this
+      this.$confirm('是否确认删除该素材？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(function() {
+        delObj(item.id).then(function() {
+          that.getPage(that.page)
+        })
+      })
+    },
+    handleCommand(command) {
+      const that = this
+      const s = command.split('-')
+      putObj({
+        id: s[0],
+        groupId: s[1]
+      }).then(function() {
+        that.getPage(that.page)
+      })
+    },
+    handleProgress(event, file, fileList) {
+      console.log(event)
+      // let uploadProgress = file.percentage.toFixed(0)
+      // this.uploadProgress = uploadProgress
+    },
+    handleSuccess(response, file, fileList) {
+      const that = this
+      this.uploadProgress = 0
+      addObj({
+        type: '1',
+        groupId: this.groupId !== '-1' ? this.groupId : null,
+        name: file.name,
+        url: response.link
+      }).then(() => {
+        this.resultNumber++
+        if (fileList.length === this.resultNumber) {
+          that.getPage(that.page)
+          this.resultNumber = 0
+        }
+      })
+    },
+    beforeUpload(file) {
+      const isPic =
+        file.type === 'image/jpeg' ||
+        file.type === 'image/png' ||
+        file.type === 'image/gif' ||
+        file.type === 'image/jpg'
+      const isLt2M = file.size / 1024 / 1024 < 2
+      if (!isPic) {
+        this.$message.error('上传图片只能是 JPG、JPEG、PNG、GIF 格式!')
+        return false
+      }
+      if (!isLt2M) {
+        this.$message.error('上传头像图片大小不能超过 2MB!')
+      }
+      return isPic && isLt2M
+    },
+    sureUrls() {
+      console.log(this.value)
+      console.log(this.num)
+      console.log(this.urls)
+      this.urls.forEach((item) => {
+        this.$set(this.value, this.value.length, item)
+      })
+      this.listDialogVisible = false
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+::v-deep .el-icon-circle-close {
+  color: red;
+}
+.material-name {
+  padding: 8px 0px;
+}
+.col-do {
+  text-align: center;
+  .pic-name {
+    overflow: hidden;
+    padding-top: 7px;
+    height: 36px;
+    font-size: 13px;
+  }
+}
+.button-do {
+  padding: unset !important;
+  font-size: 12px;
+}
+</style>
+
diff --git a/src/components/mul-pic-upload/index.vue b/src/components/mul-pic-upload/index.vue
new file mode 100644
index 0000000..359a4ad
--- /dev/null
+++ b/src/components/mul-pic-upload/index.vue
@@ -0,0 +1,95 @@
+<template>
+  <div>
+    <el-upload
+      :action="qiNiuUploadApi"
+      :headers="headers"
+      list-type="picture-card"
+      :on-preview="handlePictureCardPreview"
+      :on-remove="handleRemove"
+      :on-success="handleUploadSuccess"
+      :file-list="imageList"
+      :before-upload="beforeAvatarUpload"
+    >
+      <i class="el-icon-plus" />
+    </el-upload>
+    <el-dialog :visible.sync="dialogVisible">
+      <img width="100%" :src="dialogImageUrl" alt="">
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { getToken } from '@/utils/auth'
+import { mapGetters } from 'vuex'
+export default {
+  props: {
+    value: {
+      default: '',
+      type: String
+    }
+  },
+  data() {
+    return {
+      dialogImageUrl: '',
+      dialogVisible: false,
+      resourcesUrl: '',
+      headers: {
+        'Authorization': getToken()
+      }
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'qiNiuUploadApi'
+    ]),
+    imageList() {
+      const res = []
+      if (this.value) {
+        const imageArray = this.value.split(',')
+        for (let i = 0; i < imageArray.length; i++) {
+          res.push({ url: this.resourcesUrl + imageArray[i], response: imageArray[i] })
+        }
+      }
+      this.$emit('input', this.value)
+      return res
+    }
+  },
+  methods: {
+    // 图片上传
+    handleUploadSuccess(response, file, fileList) {
+      console.log(file)
+      console.log(fileList)
+      const pics = fileList.map(file => {
+        if ((typeof file.response) === 'object') {
+          return file.response.data[0]
+        } else {
+          return file.response
+        }
+      }).join(',')
+      console.log(pics)
+      this.$emit('input', pics)
+    },
+    // 限制图片上传大小
+    beforeAvatarUpload(file) {
+      const isLt2M = file.size / 1024 / 1024 < 2
+      if (!isLt2M) {
+        this.$message.error('上传头像图片大小不能超过 2MB!')
+      }
+      return isLt2M
+    },
+    handleRemove(file, fileList) {
+      const pics = fileList.map(file => {
+        return file.response
+      }).join(',')
+      this.$emit('input', pics)
+    },
+    handlePictureCardPreview(file) {
+      this.dialogImageUrl = file.url
+      this.dialogVisible = true
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+</style>
diff --git a/src/components/pic-upload-two/index.vue b/src/components/pic-upload-two/index.vue
new file mode 100644
index 0000000..f294cac
--- /dev/null
+++ b/src/components/pic-upload-two/index.vue
@@ -0,0 +1,83 @@
+<template>
+  <div>
+    <el-upload
+      class="pic-uploader-component"
+      :action="uploadApi"
+      :headers="headers"
+      :show-file-list="false"
+      :on-success="handleUploadSuccess"
+      :before-upload="beforeAvatarUpload"
+    >
+      <img v-if="value" :src="resourcesUrl + value" class="pic">
+      <i v-else class="el-icon-plus pic-uploader-icon" />
+    </el-upload>
+  </div>
+</template>
+
+<script>
+import { getToken } from '@/utils/auth'
+import { mapGetters } from 'vuex'
+export default {
+  props: {
+    value: {
+      default: '',
+      type: String
+    }
+  },
+  data() {
+    return {
+      resourcesUrl: '',
+      headers: {
+        'Authorization': getToken()
+      }
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'uploadApi'
+    ])
+  },
+  methods: {
+    // 图片上传
+    handleUploadSuccess(response, file, fileList) {
+      console.log(file)
+      this.$emit('input', file.response.link)
+    },
+    // 限制图片上传大小
+    beforeAvatarUpload(file) {
+      const isLt2M = file.size / 1024 / 1024 < 2
+      if (!isLt2M) {
+        this.$message.error('上传头像图片大小不能超过 2MB!')
+      }
+      return isLt2M
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .pic-uploader-component .el-upload {
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+    .pic-uploader-icon {
+      font-size: 28px;
+      color: #8c939d;
+      width: 100%;
+      height: 40px;
+      //line-height: 178px;
+      text-align: center;
+    }
+    .pic {
+      width: 100%;
+      height: 40px;
+      display: block;
+    }
+  }
+  .pic-uploader-component .el-upload:hover {
+    border-color: #409EFF;
+  }
+
+</style>
diff --git a/src/components/pic-upload/index.vue b/src/components/pic-upload/index.vue
new file mode 100644
index 0000000..dd9fd6f
--- /dev/null
+++ b/src/components/pic-upload/index.vue
@@ -0,0 +1,83 @@
+<template>
+  <div>
+    <el-upload
+      class="pic-uploader-component"
+      :action="qiNiuUploadApi"
+      :headers="headers"
+      :show-file-list="false"
+      :on-success="handleUploadSuccess"
+      :before-upload="beforeAvatarUpload"
+    >
+      <img v-if="value" :src="resourcesUrl + value" class="pic">
+      <i v-else class="el-icon-plus pic-uploader-icon" />
+    </el-upload>
+  </div>
+</template>
+
+<script>
+import { getToken } from '@/utils/auth'
+import { mapGetters } from 'vuex'
+export default {
+  props: {
+    value: {
+      default: '',
+      type: String
+    }
+  },
+  data() {
+    return {
+      resourcesUrl: '',
+      headers: {
+        'Authorization': getToken()
+      }
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'qiNiuUploadApi'
+    ])
+  },
+  methods: {
+    // 图片上传
+    handleUploadSuccess(response, file, fileList) {
+      console.log(file)
+      this.$emit('input', file.response.data[0])
+    },
+    // 限制图片上传大小
+    beforeAvatarUpload(file) {
+      const isLt2M = file.size / 1024 / 1024 < 2
+      if (!isLt2M) {
+        this.$message.error('上传头像图片大小不能超过 2MB!')
+      }
+      return isLt2M
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+  .pic-uploader-component .el-upload {
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+    .pic-uploader-icon {
+      font-size: 28px;
+      color: #8c939d;
+      width: 178px;
+      height: 178px;
+      line-height: 178px;
+      text-align: center;
+    }
+    .pic {
+      width: 178px;
+      height: 178px;
+      display: block;
+    }
+  }
+  .pic-uploader-component .el-upload:hover {
+    border-color: #409EFF;
+  }
+
+</style>
diff --git a/src/components/singlematerial/index.vue b/src/components/singlematerial/index.vue
new file mode 100644
index 0000000..17a374d
--- /dev/null
+++ b/src/components/singlematerial/index.vue
@@ -0,0 +1,499 @@
+<template>
+  <div v-if="type == 'image'">
+    <div v-if="myValue != ''">
+      <ul class="el-upload-list el-upload-list--picture-card">
+        <li tabindex="0" class="el-upload-list__item is-ready" :style="'width: '+width+'px;height: '+height+'px'">
+          <div>
+            <img :src="myValue" alt="" class="el-upload-list__item-thumbnail">
+            <span class="el-upload-list__item-actions">
+              <span class="el-upload-list__item-delete" @click="deleteMaterial">
+                <i class="el-icon-delete" />
+              </span>
+            </span>
+          </div>
+        </li>
+      </ul>
+    </div>
+    <div v-else tabindex="0" class="el-upload el-upload--picture-card" :style="'width: '+width+'px;height: '+height+'px;'+'line-height:'+height+'px;'" @click="toSeleteMaterial">
+      <i class="el-icon-plus" />
+    </div>
+
+    <el-dialog
+      append-to-body
+      :visible.sync="dialogVisible"
+      width="35%"
+    >
+      <img :src="url" alt="" style="width: 100%">
+    </el-dialog>
+
+    <el-dialog
+      title="图片素材库"
+      append-to-body
+      :visible.sync="listDialogVisible"
+      width="70%"
+    >
+      <el-container>
+        <el-aside width="unset">
+          <div style="margin-bottom: 10px">
+            <el-button
+              class="el-icon-plus"
+              size="small"
+              @click="materialgroupAdd()"
+            >
+              添加分组
+            </el-button>
+          </div>
+          <el-tabs v-model="materialgroupObjId" v-loading="materialgroupLoading" tab-position="left" @tab-click="tabClick">
+            <el-tab-pane
+              v-for=" item in materialgroupList"
+              :key="item.id"
+              :name="item.id"
+            >
+              <span slot="label"> {{ item.name }}</span>
+            </el-tab-pane>
+          </el-tabs>
+        </el-aside>
+        <el-main>
+          <el-card>
+            <div slot="header">
+              <el-row>
+                <el-col :span="12">
+                  <span>{{ materialgroupObj.name }}</span>
+                  <span v-if="materialgroupObj.id != '-1'">
+                    <el-button size="small" type="text" class="el-icon-edit" style="margin-left: 10px;" @click="materialgroupEdit(materialgroupObj)">重命名</el-button>
+                    <el-button size="small" type="text" class="el-icon-delete" style="margin-left: 10px;color: red" @click="materialgroupDelete(materialgroupObj)">删除</el-button>
+                  </span>
+                </el-col>
+                <el-col :span="12" style="text-align: right;">
+                  <el-upload
+                    :action="uploadApi"
+                    :headers="headers"
+                    :file-list="[]"
+                    :on-progress="handleProgress"
+                    :before-upload="beforeUpload"
+                    :on-success="handleSuccess"
+                    :data="{type: 1}"
+                    multiple
+                  >
+                    <el-button size="small" type="primary">批量上传</el-button>
+                  </el-upload>
+                </el-col>
+              </el-row>
+            </div>
+            <div v-loading="tableLoading">
+              <el-alert
+                v-if="tableData.length <= 0"
+                title="暂无数据"
+                type="info"
+                :closable="false"
+                center
+                show-icon
+              />
+              <el-row :gutter="5">
+                <el-checkbox-group v-model="urls" :max="num - myValue.length">
+                  <el-col v-for="(item,index) in tableData" :key="index" :span="4">
+                    <el-card :body-style="{ padding: '5px' }">
+                      <el-image
+                        style="width: 100%;height: 100px"
+                        :src="item.url"
+                        fit="contain"
+                        :preview-src-list="[item.url]"
+                        :z-index="999"
+                      />
+                      <div>
+                        <el-row>
+                          <el-col :span="24" class="col-do">
+                            <div class="pic-name">{{ item.name }}</div>
+                          </el-col>
+                        </el-row>
+                        <el-checkbox class="material-name" :label="item.url">
+                          选择
+                        </el-checkbox>
+                        <el-row>
+                          <el-col :span="24" class="col-do">
+                            <el-button type="text" size="medium" @click="materialDel(item)">删除</el-button>
+                          </el-col>
+                        </el-row>
+
+                      </div>
+                    </el-card>
+                  </el-col>
+                </el-checkbox-group>
+              </el-row>
+              <el-pagination
+                :current-page.sync="page.currentPage"
+                :page-sizes="[12, 24]"
+                :page-size="page.pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="page.total"
+                class="pagination"
+                @size-change="sizeChange"
+                @current-change="pageChange"
+              />
+            </div>
+          </el-card>
+        </el-main>
+      </el-container>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="listDialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="sureUrls">确 定</el-button>
+      </span>
+    </el-dialog>
+  </div>
+
+</template>
+
+<script>
+import { getPage as materialgroupPage, addObj as materialgroupAdd, delObj as materialgroupDel, putObj as materialgroupEdit } from '@/api/tools/materialgroup'
+import { getPage, addObj, delObj, putObj } from '@/api/tools/material'
+import { getToken } from '@/utils/auth'
+import { mapGetters } from 'vuex'
+
+export default {
+  name: 'MaterialList',
+  props: {
+    // 素材数据
+    value: {
+      type: String,
+      default() {
+        return ''
+      }
+    },
+    // 素材类型
+    type: {
+      type: String,
+      default() {
+        return ''
+      }
+    },
+    // 素材限制数量，默认5个
+    num: {
+      type: Number,
+      default() {
+        return 5
+      }
+    },
+    // 宽度
+    width: {
+      type: Number,
+      default() {
+        return 150
+      }
+    },
+    // 宽度
+    height: {
+      type: Number,
+      default() {
+        return 150
+      }
+    }
+  },
+  data() {
+    return {
+      headers: {
+        Authorization: getToken()
+      },
+      dialogVisible: false,
+      myValue: this.value,
+      url: '',
+      listDialogVisible: false,
+      materialgroupList: [],
+      materialgroupObjId: '',
+      materialgroupObj: {},
+      materialgroupLoading: false,
+      tableData: [],
+      resultNumber: 0,
+      page: {
+        total: 0, // 总页数
+        currentPage: 1, // 当前页数
+        pageSize: 12, // 每页显示多少条
+        ascs: [], // 升序字段
+        descs: 'create_time'// 降序字段
+      },
+      tableLoading: false,
+      groupId: null,
+      urls: []
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'uploadApi'
+    ])
+  },
+  watch: {
+    value: function(val) {
+      this.myValue = val
+    }
+  },
+  methods: {
+    moveMaterial(index, type) {
+      if (type === 'up') {
+        const tempOption = this.value[index - 1]
+        this.$set(this.value, index - 1, this.value[index])
+        this.$set(this.value, index, tempOption)
+      }
+      if (type === 'down') {
+        const tempOption = this.value[index + 1]
+        this.$set(this.value, index + 1, this.value[index])
+        this.$set(this.value, index, tempOption)
+      }
+    },
+    zoomMaterial(index) {
+      this.dialogVisible = true
+      this.url = this.value[index]
+    },
+    deleteMaterial() {
+      const that = this
+      this.$confirm('是否确认删除？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(function() {
+        that.myValue = ''
+        that.urls = []
+        that.$emit('transferUser', that.myValue)
+      })
+    },
+    toSeleteMaterial() {
+      this.listDialogVisible = true
+      if (this.tableData.length <= 0) {
+        this.materialgroupPage()
+      }
+    },
+    materialgroupPage() {
+      this.materialgroupLoading = true
+      materialgroupPage({
+        total: 0, // 总页数
+        currentPage: 1, // 当前页数
+        pageSize: 100, // 每页显示多少条
+        ascs: [], // 升序字段
+        descs: 'create_time'// 降序字段
+      }).then(response => {
+        this.materialgroupLoading = false
+        const materialgroupList = response.content
+        materialgroupList.unshift({
+          id: '-1',
+          name: '全部分组'
+        })
+        this.materialgroupList = materialgroupList
+        this.tabClick({
+          index: 0
+        })
+      })
+    },
+    materialgroupDelete(materialgroupObj) {
+      const that = this
+      this.$confirm('是否确认删除该分组？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(function() {
+        materialgroupDel(materialgroupObj.id)
+          .then(function() {
+            that.$delete(that.materialgroupList, materialgroupObj.index)
+          })
+      })
+    },
+    materialgroupEdit(materialgroupObj) {
+      const that = this
+      this.$prompt('请输入分组名', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        inputValue: materialgroupObj.name
+      }).then(({ value }) => {
+        materialgroupEdit({
+          id: materialgroupObj.id,
+          name: value
+        }).then(function() {
+          materialgroupObj.name = value
+          that.$set(that.materialgroupList, materialgroupObj.index, materialgroupObj)
+        })
+      }).catch(() => {
+
+      })
+    },
+    materialgroupAdd() {
+      const that = this
+      this.$prompt('请输入分组名', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消'
+      }).then(({ value }) => {
+        materialgroupAdd({
+          name: value
+        }).then(function() {
+          that.materialgroupPage()
+        })
+      }).catch(() => {
+
+      })
+    },
+    tabClick(tab, event) {
+      this.urls = []
+      const index = Number(tab.index)
+      const materialgroupObj = this.materialgroupList[index]
+      materialgroupObj.index = index
+      this.materialgroupObj = materialgroupObj
+      this.materialgroupObjId = materialgroupObj.id
+      this.page.currentPage = 1
+      this.page.total = 0
+      if (materialgroupObj.id !== '-1') {
+        this.groupId = materialgroupObj.id
+      } else {
+        this.groupId = null
+      }
+      this.getPage(this.page)
+    },
+    getPage(page, params) {
+      this.tableLoading = true
+      getPage(Object.assign({
+        page: page.currentPage - 1,
+        size: page.pageSize,
+        descs: this.page.descs,
+        ascs: this.page.ascs,
+        sort: 'create_time,desc'
+      }, {
+        groupId: this.groupId
+      })).then(response => {
+        const tableData = response.content
+        this.page.total = response.totalElements
+        this.page.currentPage = page.currentPage
+        this.page.pageSize = page.pageSize
+        this.tableData = tableData
+        this.tableLoading = false
+      }).catch(() => {
+        this.tableLoading = false
+      })
+    },
+    sizeChange(val) {
+      console.log(val)
+      this.page.currentPage = 1
+      this.page.pageSize = val
+      this.getPage(this.page)
+    },
+    pageChange(val) {
+      console.log(val)
+      this.page.currentPage = val
+      // this.page.pageSize = val
+      this.getPage(this.page)
+    },
+    materialRename(item) {
+      const that = this
+      this.$prompt('请输入素材名', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        inputValue: item.name
+      }).then(({ value }) => {
+        putObj({
+          id: item.id,
+          name: value
+        }).then(function() {
+          that.getPage(that.page)
+        })
+      }).catch(() => {
+
+      })
+    },
+    materialUrl(item) {
+      // const that = this
+      this.$prompt('素材链接', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        inputValue: item.url
+      }).then(({ value }) => {
+
+      }).catch(() => {
+
+      })
+    },
+    materialDel(item) {
+      const that = this
+      this.$confirm('是否确认删除该素材？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(function() {
+        delObj(item.id)
+          .then(function() {
+            that.getPage(that.page)
+          })
+      })
+    },
+    handleCommand(command) {
+      const that = this
+      const s = command.split('-')
+      putObj({
+        id: s[0],
+        groupId: s[1]
+      }).then(function() {
+        that.getPage(that.page)
+      })
+    },
+    handleProgress(event, file, fileList) {
+      console.log(event)
+      // let uploadProgress = file.percentage.toFixed(0)
+      // this.uploadProgress = uploadProgress
+    },
+    handleSuccess(response, file, fileList) {
+      const that = this
+      this.uploadProgress = 0
+      addObj({
+        type: '1',
+        groupId: this.groupId !== '-1' ? this.groupId : null,
+        name: file.name,
+        url: response.link
+      }).then(() => {
+        this.resultNumber++
+        if (fileList.length === this.resultNumber) {
+          that.getPage(that.page)
+          this.resultNumber = 0
+        }
+      })
+    },
+    beforeUpload(file) {
+      const isPic =
+        file.type === 'image/jpeg' ||
+        file.type === 'image/png' ||
+        file.type === 'image/gif' ||
+        file.type === 'image/jpg'
+      const isLt2M = file.size / 1024 / 1024 < 2
+      if (!isPic) {
+        this.$message.error('上传图片只能是 JPG、JPEG、PNG、GIF 格式!')
+        return false
+      }
+      if (!isLt2M) {
+        this.$message.error('上传头像图片大小不能超过 2MB!')
+      }
+      return isPic && isLt2M
+    },
+    sureUrls() {
+      console.log('this.urls:' + this.urls)
+      this.myValue = this.urls[0]
+      this.$emit('input', this.urls[0])
+      this.listDialogVisible = false
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+::v-deep .el-icon-circle-close{
+    color: red;
+  }
+  .material-name{
+    padding: 8px 0px;
+  }
+  .col-do{
+    text-align: center;
+    .pic-name {
+      overflow: hidden;
+      padding-top: 7px;
+      height: 36px;
+      font-size: 13px;
+    }
+  }
+  .button-do{
+    padding: unset!important;
+    font-size: 12px;
+  }
+</style>
+
diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue
index e9af5d2..b55c785 100644
--- a/src/layout/components/Sidebar/Logo.vue
+++ b/src/layout/components/Sidebar/Logo.vue
@@ -35,7 +35,7 @@ export default {
   },
   data() {
     return {
-      title: '农场管理系统',
+      title: '眼界甄选',
       logo: logoImg
     }
   }
diff --git a/src/mixins/crud.js b/src/mixins/crud.js
new file mode 100644
index 0000000..84915da
--- /dev/null
+++ b/src/mixins/crud.js
@@ -0,0 +1,344 @@
+import {
+  initData,
+  download
+} from '@/api/data'
+import {
+  parseTime,
+  downloadFile
+} from '@/utils/index'
+import checkPermission from '@/utils/permission'
+
+export default {
+  data() {
+    return {
+      // 表格数据
+      data: [],
+      // 排序规则，默认 id 降序， 支持多字段排序 ['id,desc', 'createTime,asc']
+      sort: ['id,desc'],
+      // 页码
+      page: 0,
+      // 每页数据条数
+      size: 10,
+      // 总数据条数
+      total: 0,
+      // 请求数据的url
+      url: '',
+      // 查询数据的参数
+      params: {},
+      // 待查询的对象
+      query: {},
+      // 等待时间
+      time: 50,
+      // 是否为新增类型的表单
+      isAdd: false,
+      // 导出的 Loading
+      downloadLoading: false,
+      // 表格 Loading 属性
+      loading: true,
+      // 删除 Loading 属性
+      delLoading: false,
+      delAllLoading: false,
+      // 弹窗属性
+      dialog: false,
+      // Form 表单
+      form: {},
+      // 重置表单
+      resetForm: {},
+      // 标题
+      title: ''
+    }
+  },
+  methods: {
+    parseTime,
+    downloadFile,
+    checkPermission,
+    async init() {
+      if (!await this.beforeInit()) {
+        return
+      }
+      return new Promise((resolve, reject) => {
+        this.loading = true
+        // 请求数据
+        initData(this.url, this.getQueryParame()).then(data => {
+          // console.log(data,'ddeeeeee')
+          this.total = data.totalElements
+          if (this.url === 'api/yxStoreProduct') {
+            data.content.map(val => {
+              val.qrcode = 'http://myshop.api.gznl.top/product/?productId=' + val.id + '&pageType=good&codeType=routine'
+            })
+          }
+          this.data = data.content
+          // this.classification = data.cateList
+          // time 毫秒后显示表格
+          setTimeout(() => {
+            this.loading = false
+          }, this.time)
+          resolve(data)
+        }).catch(err => {
+          this.loading = false
+          reject(err)
+        })
+      })
+    },
+    beforeInit() {
+      return true
+    },
+    getQueryParame: function() {
+      return {
+        page: this.page,
+        size: this.size,
+        sort: this.sort,
+        ...this.query,
+        ...this.params
+      }
+    },
+    // 改变页码
+    pageChange(e) {
+      this.page = e - 1
+      this.init()
+    },
+    // 改变每页显示数
+    sizeChange(e) {
+      this.page = 0
+      this.size = e
+      this.init()
+    },
+    // 预防删除第二页最后一条数据时，或者多选删除第二页的数据时，页码错误导致请求无数据
+    dleChangePage(size) {
+      if (size === undefined) {
+        size = 1
+      }
+      if (this.data.length === size && this.page !== 0) {
+        this.page = this.page - 1
+      }
+    },
+    // 查询方法
+    toQuery() {
+      this.page = 0
+      this.init()
+    },
+    /**
+     * 通用的提示封装
+     */
+    submitSuccessNotify() {
+      this.$notify({
+        title: '提交成功',
+        type: 'success',
+        duration: 2500
+      })
+    },
+    addSuccessNotify() {
+      this.$notify({
+        title: '新增成功',
+        type: 'success',
+        duration: 2500
+      })
+    },
+    editSuccessNotify() {
+      this.$notify({
+        title: '编辑成功',
+        type: 'success',
+        duration: 2500
+      })
+    },
+    delSuccessNotify() {
+      this.$notify({
+        title: '删除成功',
+        type: 'success',
+        duration: 2500
+      })
+    },
+    notify(title, type) {
+      this.$notify({
+        title: title,
+        type: type,
+        duration: 2500
+      })
+    },
+    /**
+     * 删除前可以调用 beforeDelMethod 做一些操作
+     */
+    beforeDelMethod() {
+      return true
+    },
+    /**
+     * 通用的删除
+     */
+    delMethod(id) {
+      if (!this.beforeDelMethod()) {
+        return
+      }
+      this.delLoading = true
+      this.crudMethod.del(id).then(() => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        this.dleChangePage()
+        this.delSuccessNotify()
+        this.afterDelMethod()
+        this.init()
+      }).catch(() => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+      })
+    },
+    afterDelMethod() {},
+    /**
+     * 多选删除提示
+     */
+    beforeDelAllMethod() {
+      this.$confirm('你确定删除选中的数据吗？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.delAllMethod()
+      })
+    },
+    /**
+     * 多选删除
+     */
+    delAllMethod() {
+      this.delAllLoading = true
+      const data = this.$refs.table.selection
+      const ids = []
+      for (let i = 0; i < data.length; i++) {
+        ids.push(data[i].id)
+      }
+      this.crudMethod.delAll(ids).then(() => {
+        this.delAllLoading = false
+        this.dleChangePage(ids.length)
+        this.init()
+        this.$notify({
+          title: '删除成功',
+          type: 'success',
+          duration: 2500
+        })
+      }).catch(() => {
+        this.delAllLoading = false
+      })
+    },
+    /**
+     * 显示新增弹窗前可以调用该方法
+     */
+    beforeShowAddForm() {},
+    /**
+     * 显示新增弹窗
+     */
+    showAddFormDialog() {
+      this.isAdd = true
+      this.resetForm = JSON.parse(JSON.stringify(this.form))
+      this.beforeShowAddForm()
+      this.dialog = true
+    },
+    /**
+     * 显示编辑弹窗前可以调用该方法
+     */
+    beforeShowEditForm(data) {},
+    /**
+     * 显示编辑弹窗
+     */
+    showEditFormDialog(data = '') {
+      this.isAdd = false
+      if (data) {
+        this.resetForm = JSON.parse(JSON.stringify(this.form))
+        this.form = JSON.parse(JSON.stringify(data))
+      }
+      this.beforeShowEditForm(data)
+      this.dialog = true
+    },
+    /**
+     * 新增方法
+     */
+    addMethod() {
+      this.crudMethod.add(this.form).then(() => {
+        this.addSuccessNotify()
+        this.loading = false
+        this.afterAddMethod()
+        this.cancel()
+        this.init()
+      }).catch(() => {
+        this.loading = false
+        this.afterAddErrorMethod()
+      })
+    },
+    /**
+     * 新增后可以调用该方法
+     */
+    afterAddMethod() {},
+    /**
+     * 新增失败后调用该方法
+     */
+    afterAddErrorMethod() {},
+    /**
+     * 通用的编辑方法
+     */
+    editMethod() {
+      this.crudMethod.edit(this.form).then(() => {
+        this.editSuccessNotify()
+        this.loading = false
+        this.afterEditMethod()
+        this.cancel()
+        this.init()
+      }).catch(() => {
+        this.loading = false
+      })
+    },
+    /**
+     * 编辑后可以调用该方法
+     */
+    afterEditMethod() {},
+    /**
+     * 提交前可以调用该方法
+     */
+    beforeSubmitMethod() {
+      return true
+    },
+    /**
+     * 提交
+     */
+    submitMethod() {
+      if (!this.beforeSubmitMethod()) {
+        return
+      }
+      if (this.$refs['form']) {
+        this.$refs['form'].validate((valid) => {
+          if (valid) {
+            this.loading = true
+            if (this.isAdd) {
+              this.addMethod()
+            } else this.editMethod()
+          }
+        })
+      }
+    },
+    /**
+     * 隐藏弹窗
+     */
+    cancel() {
+      this.dialog = false
+      if (this.$refs['form']) {
+        this.$refs['form'].clearValidate()
+        this.form = this.resetForm
+      }
+    },
+    /**
+     * 获取弹窗的标题
+     */
+    getFormTitle() {
+      return this.isAdd ? `新增${this.title}` : `编辑${this.title}`
+    },
+    /**
+     * 通用导出
+     */
+    downloadMethod() {
+      this.beforeInit()
+      this.downloadLoading = true
+      download(this.url + '/download', this.params).then(result => {
+        this.downloadFile(result, this.title + '数据', 'xlsx')
+        this.downloadLoading = false
+      }).catch(() => {
+        this.downloadLoading = false
+      })
+    }
+  }
+}
diff --git a/src/views/activity/Activitylist/form.vue b/src/views/activity/Activitylist/form.vue
new file mode 100644
index 0000000..f098c2e
--- /dev/null
+++ b/src/views/activity/Activitylist/form.vue
@@ -0,0 +1,561 @@
+<template>
+  <div class="bodys">
+    <h4
+      style="
+        margin-left: 15px;
+        font-size: 20px;
+        color: #323335;
+        margin-top: 10px;
+        margin-bottom: 20px;
+      "
+    >
+      新增活动
+    </h4>
+    <el-form
+      :model="ruleForm"
+      :rules="rules"
+      ref="ruleForm"
+      label-width="120px"
+      class="demo-ruleForm"
+    > 
+     <el-form-item label="活动ID" prop="indexId">
+        <el-input v-model="ruleForm.indexId" style="width: 500px" onkeyup="value=value.replace(/[^\d]/g,'')"></el-input>
+      </el-form-item>
+      <el-form-item label="活动名称" prop="name">
+        <el-input v-model="ruleForm.name" style="width: 500px"></el-input>
+      </el-form-item>
+      <el-form-item label="活动介绍" prop="intro">
+        <el-input
+          type="textarea"
+          v-model="ruleForm.intro"
+          style="width: 500px"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="活动时间" required>
+        <el-col :span="3.5">
+          <el-form-item prop="activityStartTime">
+            <el-date-picker
+              type="date"
+              placeholder="选择活动开始日期"
+              v-model="ruleForm.activityStartTime"
+              style="width: 100%"
+              
+            ></el-date-picker>
+          </el-form-item>
+        </el-col>
+
+        <el-col class="line" :span="1">-----至-----</el-col>
+        <el-col :span="3.5">
+          <el-form-item prop="activityEndTime">
+            <el-date-picker
+              type="date"
+              placeholder="选择活动结束日期"
+              v-model="ruleForm.activityEndTime"
+              style="width: 100%"
+              
+            ></el-date-picker>
+          </el-form-item>
+        </el-col>
+      </el-form-item>
+      <el-form-item label="活动首页图片:" prop="img">
+        <single-pic
+          v-model="ruleForm.img"
+          type="image"
+          :num="1"
+          :width="150"
+          :height="150"
+          style="float: left"
+        />
+      </el-form-item>
+      <el-form-item label="活动分享图:" prop="sharingImg">
+        <single-pic
+          v-model="ruleForm.sharingImg"
+          type="image"
+          :num="1"
+          :width="150"
+          :height="150"
+          style="float: left"
+        />
+      </el-form-item>
+      <el-form-item label="活动海报图:" prop="activityPoster">
+        <single-pic
+          v-model="ruleForm.activityPoster"
+          type="image"
+          :num="1"
+          :width="150"
+          :height="150"
+          style="float: left"
+        />
+      </el-form-item>
+      <el-form-item label="活动颜色选择" prop="color">
+        <colorPicker
+          v-model="ruleForm.color"
+          v-on:change="headleChangeColor"
+          class="colores"
+        ></colorPicker>
+        <el-input
+          v-model="ruleForm.color"
+          placeholder="请输入活动颜色"
+          style="width: 100px"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="活动店铺选择" prop="idList">
+        <el-button type="text" @click="ShopSelection">选择店铺</el-button>
+        <!-- <el-button v-for="(item,index) in optio" :key="index" type="text" @click="ShopSelection(index)">选择店铺</el-button> -->
+        <!-- <el-button type="primary" icon="el-icon-circle-plus" size="mini" @click="addTo"></el-button> -->
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="submitForm('ruleForm')"
+          >立即创建</el-button
+        >
+        <el-button @click="resetForm('ruleForm')">重置</el-button>
+      </el-form-item>
+    </el-form>
+    <h4
+      style="
+        margin-left: 15px;
+        font-size: 20px;
+        color: #323335;
+        margin-top: 10px;
+        margin-bottom: 20px;
+      "
+    >
+      已勾选商品
+    </h4>
+    <div style="margin-bottom:20px">
+      <el-button
+              type="danger"
+              size="mini"
+              icon="el-icon-delete-solid"
+              :disabled="disabl"
+              @click="BatchDelete"
+              style="margin-left:15px"
+            >
+              批量删除
+            </el-button>
+      <el-table :data="tableDataCheck" style="width: 100%"  max-height="500"  @selection-change="handleSChange">
+                    <el-table-column
+              type="selection"
+              width="55"
+            ></el-table-column>
+        <el-table-column prop="paiban" label="商品分类" align="center">
+        </el-table-column>
+        <el-table-column prop="id" label="商品ID" align="center">
+        </el-table-column>
+            <el-table-column label="商品图片" align="center">
+              <template slot-scope="scope">
+                <a
+                  :href="scope.row.image"
+                  style="color: #42b983"
+                  target="_blank"
+                >
+                  <img
+                    :src="scope.row.image"
+                    alt="点击打开"
+                    class="el-avatar"
+                  />
+                </a>
+              </template>
+            </el-table-column>
+            <el-table-column
+              property="store_name"
+              label="商品名称"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              property="price"
+              label="商品价格(元)"
+              align="center"
+            ></el-table-column>
+      </el-table>
+    </div>
+    <!-- 新增活动 -->
+    <el-dialog
+      title="新增活动"
+      :visible.sync="dialogFormVisible"
+      :before-close="handleClose"
+    >
+      <div style="margin-bottom: 10px">
+        <el-input
+          v-model="input"
+          placeholder="请输入要搜索的商品名称"
+          style="width: 200px"
+        ></el-input>
+        <el-button type="primary" icon="el-icon-zoom-in" @click="products">搜索</el-button>
+        <el-select v-model="paiban" @change="qihuan" placeholder="请选择商品分类" style="margin-left:20px">
+    <el-option
+      v-for="(item,index) in options"
+      :key="index"
+      :label="item"
+      :value="index">
+    </el-option>
+  </el-select>
+      </div>
+      <div class="dial">
+        <div style="flex: 2">
+          <el-table
+            :data="tableD"
+            style="width: 100%"
+            max-height="500"
+            @selection-change="handleSelec"
+            
+          >
+            <el-table-column
+              type="selection"
+              width="55"
+            ></el-table-column>
+            <el-table-column prop="shopName" label="店铺名称" align="center">
+            </el-table-column>
+          </el-table>
+        </div>
+        <div style="flex: 1"></div>
+        <div style="flex: 5">
+          <el-table
+            :data="tableData"
+            style="width: 100%"
+            max-height="395"
+            @selection-change="handleSelectionChange"
+            
+          >
+            <el-table-column
+              type="selection"
+              width="55"
+              
+            >
+            </el-table-column>
+            <el-table-column
+              property="id"
+              label="商品ID"
+              align="center"
+            ></el-table-column>
+            <el-table-column label="商品图片" align="center">
+              <template slot-scope="scope">
+                <a
+                  :href="scope.row.image"
+                  style="color: #42b983"
+                  target="_blank"
+                >
+                  <img
+                    :src="scope.row.image"
+                    alt="点击打开"
+                    class="el-avatar"
+                  />
+                </a>
+                <!-- <img :src="scope.row.img" alt="" style="width:50px;height:50px;border-radius: 50px"> -->
+              </template>
+            </el-table-column>
+            <el-table-column
+              property="store_name"
+              label="商品名称"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              property="price"
+              label="商品价格(元)"
+              align="center"
+            ></el-table-column>
+          </el-table>
+          <el-footer
+            style="height: 60px; width: 100%; background-color: #f6f6f6"
+          >
+            <div style="float: left"></div>
+            <el-pagination
+              :total="total"
+              :current-page="plamses.page"
+              style="margin-top: 15px; float: right"
+              layout="total, prev, pager, next, sizes"
+              @size-change="sizeChange"
+              @current-change="pageChange"
+            />
+          </el-footer>
+        </div>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormVisible = false">取 消</el-button>
+        <el-button type="primary" @click="dialogForm">确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import { getses, gePtses, add, gePtsesForm,getsesInput } from "@/api/yxStoreActivity";
+import singlePic from "@/components/singlematerial";
+export default {
+  inject: ["reload"],
+  components: {
+    singlePic,
+  },
+  data() {
+    return {
+       paiban:0, 
+      dialogFormVisible: false,
+      input: "",
+      ruleForm: {
+        indexId:null,
+        name: "",
+        intro: "",
+        color: "#ff0000",
+        idList: [],
+        img: "",
+        sharingImg:'',
+        activityPoster:'',
+        activityStartTime: "",
+        activityEndTime: "",
+        idInfo:[
+            {idList:'',ids:''}
+        ]
+      },
+      rules: {
+        indexId: [{ required: true, message: "请输入活动ID", trigger: "blur" }],
+        name: [{ required: true, message: "请输入活动名称", trigger: "blur" }],
+        idList: [
+          { required: true, message: "请选择活动店铺", trigger: "change" },
+        ],
+        intro: [{ required: true, message: "请填写活动介绍", trigger: "blur" }],
+        activityStartTime: [
+          { required: true, message: "请填写活动开始时间", trigger: "blur" },
+        ],
+        activityEndTime: [
+          { required: true, message: "请填写活动结束时间", trigger: "blur" },
+        ],
+        img: [{ required: true, message: "请填写活动图片", trigger: "blur" }],
+        sharingImg: [{ required: true, message: "请填写活动分享图片", trigger: "blur" }],
+        activityPoster: [{ required: true, message: "请填写活动海报图片", trigger: "blur" }],
+      },
+      tableD: [],
+      total: 0,
+      tableData: [],
+      tableDataCheck: [],
+      plamses: {
+        shopId: [],
+        page: 1,
+        limit: 10,
+      },
+      options:[],
+      optio:[],
+      disabl:true,
+      multipleSelection:[],
+      
+    };
+  },
+  methods: {
+      BatchDelete(){
+            console.log(this.multipleSelection)
+            let val = this.multipleSelection
+            val.forEach((val,index)=>{
+                this.tableDataCheck.forEach((v,i)=>{
+                    if(val.id === v.id){
+                        this.tableDataCheck.splice(i,1)
+                    }
+                })
+                this.ruleForm.idList.forEach((vs,is)=>{
+                    if(val.id === vs){
+                        this.ruleForm.idList.splice(is,1)
+                    }
+                })
+                // this.ruleForm.idInfo.forEach((ve,ise)=>{
+                //     console.log(ve,ise,'741852')
+                //     if(val.id ===ve.idList){
+                //         this.ruleForm.idInfo.splice(ise,1)
+                //     }
+                // })
+            })
+      },
+      handleSChange(val){
+          this.multipleSelection = val
+          console.log(val,'不知道')
+          if(val.length > 0){
+              this.disabl = false
+          }else{
+              this.disabl = true 
+          }
+      },
+      products(){
+         
+          let plams = {
+              value:this.input
+          }
+           console.log(plams)
+          getsesInput(plams).then(res=>{
+              console.log(res)
+              this.tableData = res
+          })
+      },
+    sizeChange(val) {
+      this.plamses.limit = val;
+      this.gerts();
+    },
+    pageChange(val) {
+      this.plamses.page = val;
+      this.gerts();
+    },
+    addTo(){
+        this.optio.push('admin')
+        console.log(this.optio)
+    },
+    ShopSelection(val) {
+        this.dialogFormVisible = true;
+        this.getses();
+    },
+    getses() {
+      console.log(this.plamses.shopId, "店铺的ID");
+      let plams = {
+        page: 0,
+        size: 100,
+      };
+      getses(plams).then((res) => {
+        console.log(res.content, "商铺");
+        this.tableD = res.content;
+        this.options = res.paiban
+        // this.tableD.forEach((item1) => {
+        //   this.plamses.shopId.forEach((item2) => {
+        //     if (item1.id === item2) {
+        //       this.$refs.multipleTable.toggleRowSelection(item2, true);
+        //     }
+        //   });
+        // });
+      });
+    },
+    handleSelec(val) {
+      console.log(val);
+      this.plamses.shopId = [];
+      val.forEach((item) => {
+        this.plamses.shopId.push(item.id);
+      });
+      this.gerts();
+    },
+    gerts() {
+      console.log(this.ruleForm.idList, "查看数据");
+      gePtses(this.plamses).then((res) => {
+        console.log(res);
+        this.total = Number(res.code);
+        this.tableData = res.list;
+        this.tableData.forEach((item1) => {
+          console.log(item1);
+        //   this.ruleForm.idList.forEach((item2) => {
+        //     console.log(item2, "循环");
+        //     if (item1.id === item2) {
+        //       this.$refs.multipleTable.toggleRowSelection(item2, true);
+        //     }
+        //   });
+        });
+      });
+    },
+    qihuan(val){
+        console.log(val)
+        this.ruleForm.idList = [];
+    },
+    handleSelectionChange(val) {
+    //   this.ruleForm.idList = [];
+      val.forEach((item) => {
+        this.ruleForm.idList.push(item.id);
+      });
+    },
+    dialogForm() {
+      this.dialogFormVisible = false;
+      let plams = {
+        productId: this.ruleForm.idList,
+      };
+      gePtsesForm(plams).then((res) => {
+        console.log(res);
+        res.map(item=>{
+            item.paiban=this.paiban
+        })
+        res.forEach(item=>{
+            this.tableDataCheck.push(item);
+        })
+        console.log(this.tableDataCheck,'数据')
+       
+        
+        
+        // this.plamses.shopId = [];
+        // this.ruleForm.idList = [];
+       console.log(this.ruleForm,'看看是什么玩意')
+        
+      });
+     
+      //   this.reload();
+    },
+
+    handleClose(done) {
+      this.$confirm("确认关闭？")
+        .then((_) => {
+          done();
+          this.reload();
+        })
+        .catch((_) => {});
+    },
+
+    headleChangeColor() {
+      console.log(this.form);
+    },
+    add() {
+      this.ruleForm.activityStartTime = String(Date.parse(
+        this.ruleForm.activityStartTime
+      ));
+      this.ruleForm.activityEndTime = String(Date.parse(this.ruleForm.activityEndTime));
+      this.ruleForm.indexId = Number(this.ruleForm.indexId)
+      this.ruleForm.idInfo.forEach(item=>{
+            this.tableDataCheck.forEach(item2=>{
+               let plamt = {
+                   idList : item2.id,
+                   ids : item2.paiban
+               }
+                this.ruleForm.idInfo.push(
+                plamt
+                )
+            })
+        })
+        this.ruleForm.idInfo.shift()
+
+        let pilamse = []
+        this.tableDataCheck.forEach(iter=>{
+            console.log(iter)
+            pilamse.push(iter.id)
+        })
+        this.ruleForm.idList = pilamse
+      console.log(this.ruleForm,'到底哪里出了问题')
+      add(this.ruleForm).then((res) => {
+        console.log(res);
+        if (res == true) {
+          this.$message({
+            showClose: true,
+            message: "新增成功",
+            type: "success",
+          });
+          this.$router.push({
+            path: "/activity/Activitylist/",
+          });
+        }
+      });
+    },
+    submitForm(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          console.log(this.ruleForm,777);
+          this.add();
+        } else {
+          console.log("error submit!!");
+          return false;
+        }
+      });
+    },
+    resetForm(formName) {
+      this.$refs[formName].resetFields();
+      this.reload()
+    },
+  },
+};
+</script>
+<style scoped>
+.bodys {
+  padding: 15px;
+}
+.colores {
+  cursor: pointer;
+}
+.dial {
+  display: flex;
+  width: 100%;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/activity/Activitylist/forms.vue b/src/views/activity/Activitylist/forms.vue
new file mode 100644
index 0000000..e69de29
diff --git a/src/views/activity/Activitylist/index.vue b/src/views/activity/Activitylist/index.vue
new file mode 100644
index 0000000..81bf8b4
--- /dev/null
+++ b/src/views/activity/Activitylist/index.vue
@@ -0,0 +1,246 @@
+<template>
+  <div class="body">
+    <div class="body-top">
+      <el-button type="primary" icon="el-icon-check" @click="NewActivities"
+        >新增</el-button
+      >
+    </div>
+    <div>
+      <el-table :data="tableData" style="width: 100%" v-loading="loading">
+        <el-table-column prop="id" label="活动ID" align="center">
+        </el-table-column>
+        <el-table-column  prop="img" label="活动图片"  align="center">
+        <template slot-scope="scope">
+          <a :href="scope.row.img" style="color: #42b983" target="_blank">
+            <img :src="scope.row.img" alt="点击打开" class="el-avatar">
+          </a>
+        </template>
+      </el-table-column>
+      <el-table-column  prop="sharingImg" label="活动分享图片"  align="center">
+        <template slot-scope="scope">
+          <a :href="scope.row.sharingImg" style="color: #42b983" target="_blank">
+            <img :src="scope.row.sharingImg" alt="点击打开" class="el-avatar">
+          </a>
+        </template>
+      </el-table-column>
+        <el-table-column prop="name" label="开始时间" align="center">
+          <template slot-scope="scope">
+            <span>{{formatTime(scope.row.startTime) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="name" label="结束时间" align="center">
+          <template slot-scope="scope">
+            <span>{{formatTime(scope.row.endTime) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="name" label="活动名称" align="center">
+        </el-table-column>
+        <el-table-column prop="intro" label="活动介绍" align="center">
+        </el-table-column>
+        <el-table-column label="操作" align="center">
+          <template slot-scope="scope">
+            <el-button slot="reference" type="text" @click="ViewProduct(scope.row)">查看商品</el-button>
+            <!-- <el-button type="text"  @click="handleEdit(scope.row)"
+              >修改</el-button
+            > -->
+            <!-- <el-button
+          size="mini"
+          type="danger"
+          @click="handleDelete(scope.row)">删除</el-button> -->
+            <el-popover
+              placement="top"
+              title="确定删除？"
+              width="200"
+              :ref="'popover-' + scope.row.id"
+              trigger="click"
+            >
+              <div style="text-align: right; margin: 0">
+                <el-button
+                  type="primary"
+                  size="mini"
+                  @click="deleteDeviceRow(scope.row)"
+                  >确定</el-button
+                >
+                <el-button size="mini" @click="pCancel(scope.row.id)"
+                  >取消</el-button
+                >
+              </div>
+              <el-button slot="reference" type="text">删除</el-button>
+            </el-popover>
+          </template>
+        </el-table-column>
+      </el-table>
+                <el-footer
+            style="height: 60px; width: 100%;"
+          >
+            <div style="float: left"></div>
+            <el-pagination
+              :total="total"
+              :current-page="plamses.page"
+              style="margin-top: 15px; float: right"
+              layout="total, prev, pager, next, sizes"
+              @size-change="sizeChange"
+              @current-change="pageChange"
+            />
+          </el-footer>
+    </div>
+    <el-dialog title="查看商品" :visible.sync="dialogTableVisible">
+      
+  <div v-for="(item,indexs) in gridData"  :key="indexs" style="margin-top:50px;margin-bottom:50px">
+    <h4
+      style="
+        margin-left: 15px;
+        font-size: 20px;
+        color: #323335;
+        margin-top: 10px;
+        margin-bottom: 20px;
+      "
+      v-if="indexs ==0"
+    >
+      {{'第一栏'}}
+    </h4>
+    <h4
+      style="
+        margin-left: 15px;
+        font-size: 20px;
+        color: #323335;
+        margin-top: 10px;
+        margin-bottom: 20px;
+      "
+      v-if="indexs ==1"
+    >
+      {{'第二栏'}}
+    </h4>
+    <h4
+      style="
+        margin-left: 15px;
+        font-size: 20px;
+        color: #323335;
+        margin-top: 10px;
+        margin-bottom: 20px;
+      "
+      v-if="indexs ==2"
+    >
+      {{'第三栏'}}
+    </h4>
+    <el-table  :data="item"  >
+    
+    <el-table-column property="id" label="ID" align="center" ></el-table-column>
+            <el-table-column  prop="image" label="商品图片"  align="center">
+        <template slot-scope="scope">
+          <a :href="scope.row.image" style="color: #42b983" target="_blank">
+            <img :src="scope.row.image" alt="点击打开" class="el-avatar">
+          </a>
+        </template>
+      </el-table-column>
+    <el-table-column property="store_name" label="商品名称" align="center"></el-table-column>
+    <el-table-column property="price" label="商品价格" align="center"></el-table-column>
+  </el-table>
+  </div>
+</el-dialog>
+   
+  </div>
+</template>
+<script>
+import { gets, del, getList } from '@/api/yxStoreActivity'
+import { formatTime } from "@/utils/index";
+export default {
+  inject: ["reload"],
+  data() {
+    return {
+      loading: false,
+      dialogTableVisible:false,
+      tableData: [],
+       gridData: [],
+      total:0,
+      plamses: {
+        page: 1,
+        limit: 10,
+      },
+      
+    };
+  },
+  created(){
+      this.gets()
+  },
+  methods: {
+    formatTime,
+    NewActivities() {
+        this.$router.push({
+            path:'/activity/Form/'
+        })
+    },
+    ViewProduct(row){ //查看商品
+    this.gridData = []
+      console.log(row)
+      this.dialogTableVisible = true
+      let plams = {
+        aid:row.id
+      }
+      
+      getList(plams).then(res=>{
+        for(let i in res ){
+          this.gridData.push(res[i])
+        }
+        
+        
+       
+      })
+    },
+    gets(){
+        gets(this.plamses).then(res=>{
+            console.log(res)
+            this.tableData = res.content
+            this.total = Number(res.totalElements)
+        })
+    },
+    deleteDeviceRow(row){
+      console.log(row,'删除')
+      let plams = {
+        ids:[]
+      }
+      plams.ids.push(Number(row.id))
+      del(plams).then(res =>{
+        console.log(res)
+      })
+      this.reload()
+    },
+    pCancel(row){
+      console.log(row,'取消删除')
+      this.reload()
+    },
+    handleEdit(row){
+      console.log(row,'修改')
+      localStorage.setItem('rows',JSON.stringify(row))
+      this.$router.push({
+            path:'/activity/Forms/' + row.id,
+           
+        })
+
+    },
+    sizeChange(val){
+      console.log(val,'条')
+      this.plamses.limit = val
+      this.gets()
+    },
+    pageChange(val){
+      console.log(val)
+      this.plamses.page = val
+      this.gets()
+    }
+   
+
+    
+      
+  },
+};
+</script>
+<style scoped>
+.body {
+  padding: 15px;
+}
+.body-top {
+  margin-bottom: 10px;
+}
+
+</style>
\ No newline at end of file
diff --git a/src/views/activity/activityZone/index.vue b/src/views/activity/activityZone/index.vue
new file mode 100644
index 0000000..675d4b7
--- /dev/null
+++ b/src/views/activity/activityZone/index.vue
@@ -0,0 +1,101 @@
+<template>
+  <div class="body">
+    <el-input
+      class="input"
+      v-model="input"
+      placeholder="请输入要修改的活动商品id"
+    ></el-input>
+    <el-button type="primary" @click="comma">修改活动商品ID</el-button>
+    <p class="comma">请输入需要修改的活动商品ID请以","分隔开来</p>
+    <div>
+      <el-table
+ v-loading="loading"
+ :default-sort="{prop: 'sortNum', order: 'ascending'}"
+ :data="list"
+ border
+ align="left"
+>
+ <el-table-column
+  show-overflow-tooltip
+  v-for="(item, index) in col"
+  :key="`col_${index}`"
+  :prop="col[index].prop"
+  :label="item.label"
+ >
+  <template slot-scope="scope">
+   <p>{{scope.row[item.prop]}}</p> 
+  </template>
+ </el-table-column>
+</el-table>
+    </div>
+  </div>
+</template>
+<script>
+import Sortable from "sortablejs";
+export default {
+  components: {
+ Sortable
+ },
+  data() {
+    return {
+      input: "",
+      col: [
+  {
+   label: '位置',
+   prop: 'location'
+  },
+  {
+   label: '序号',
+   prop: 'sortNum'
+  },
+  {
+   label: '经办人',
+   prop: 'operator'
+  },
+  {
+   label: '操作',
+   prop: 'isClick'
+  }
+  ]
+    };
+  },
+  mounted(){
+    this.rowDrop()
+  },
+  methods: {
+    comma() {
+      console.log(this.input);
+    },
+      rowDrop() {
+  const tbody = document.querySelector('.el-table__body-wrapper tbody')
+  const _this = this
+  Sortable.create(tbody, {
+   onEnd({ newIndex, oldIndex }) {
+    const currRow = _this.list.splice(oldIndex, 1)[0]
+    _this.list.splice(newIndex, 0, currRow)
+    _this.list = _this.list.filter(({ adId }) => adId !== 0)
+  
+    _this.list.forEach((item, index) => {
+     _this.sortString += item.adId + ':' + (index + 1) + ','
+    })
+    _this.sortString = _this.sortString.substr(0, _this.sortString.length - 1)
+   }
+  })
+ }
+  },
+};
+</script>
+<style scoped>
+.body {
+  padding: 15px;
+}
+.input {
+  width: 70%;
+  margin-right: 15px;
+}
+.comma {
+  font-weight: 700;
+  font-size: 14px;
+  color: red;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/activity/bargain/HowToPlay.vue b/src/views/activity/bargain/HowToPlay.vue
new file mode 100644
index 0000000..12088ff
--- /dev/null
+++ b/src/views/activity/bargain/HowToPlay.vue
@@ -0,0 +1,88 @@
+<template>
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" title="砍价玩法说明" width="900px">
+    <el-form ref="form" :model="form" :rules="rules" :inline="true" size="small" label-width="140px">
+      <el-form-item label="说明">
+        <editor v-model="form.bargainStatement" />
+      </el-form-item>
+      <el-form-item label="玩法">
+        <editor v-model="form.bargainRegulations" />
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="text" @click="cancel">取消</el-button>
+      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+// import { List,Config } from '@/api/yxStoreCombination'
+import { List , Config } from '@/api/yxStoreBargain'
+import editor from '../../components/Editor'
+import MaterialList from '@/components/material'
+import cgood from '@/views/components/goodss'
+export default {
+  components: { editor,  MaterialList ,cgood },
+  props: {
+    isAdd: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data() {
+    return {
+      loading: false, dialog: false,
+      form: {
+       
+        bargainStatement:'',
+        bargainRegulations:''
+      },
+      rules: {
+      }
+    }
+  },
+  created(){
+      this.List()
+  },
+  methods: {
+      cancel(){
+          this.dialog = false
+      },
+      
+    List(){
+        List().then(res=>{
+            console.log(res,'iopioipo')
+            this.form = res
+        })
+    },
+    doSubmit() {
+    //   this.loading = true
+
+      
+       this.Config()
+    },
+    Config() {  
+         console.log(this.form)
+      Config(this.form).then(res => {
+          console.log(res)
+        this.$notify({
+          title: '添加成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.dialog = false
+       
+      }).catch(err => {
+        this.dialog = false
+        console.log(err.response.data.message)
+      })
+    },
+    
+    
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/activity/bargain/form.vue b/src/views/activity/bargain/form.vue
new file mode 100644
index 0000000..fa6697e
--- /dev/null
+++ b/src/views/activity/bargain/form.vue
@@ -0,0 +1,283 @@
+<template>
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="handleClose" :visible.sync="dialog" title=" 开启砍价" width="900px">
+    <el-form ref="form" :model="form" :rules="rules" :inline="true" size="small" label-width="140px">
+      <el-form-item label="砍价名称">
+        <el-input v-model="form.title" style="width: 500px;" />
+      </el-form-item>
+      <!-- <el-form-item label="砍价简介">
+        <el-input v-model="form.info" style="width: 500px;" rows="5" type="textarea" />
+      </el-form-item> -->
+      <el-form-item label="单位">
+        <el-input v-model="form.unitName" style="width: 500px;" />
+      </el-form-item>
+
+      <el-form-item label="活动开始时间">
+        <template>
+          <el-date-picker
+            v-model="form.startTime"
+            type="datetime"
+            placeholder="选择日期时间"
+          />
+        </template>
+      </el-form-item>
+      <el-form-item label="活动结束时间">
+        <template>
+          <el-date-picker
+            v-model="form.stopTime"
+            type="datetime"
+            placeholder="选择日期时间"
+          />
+        </template>
+      </el-form-item>
+      <!-- <el-form-item label="砍价产品主图片">
+        <MaterialList v-model="form.imageArr" style="width: 500px" type="image" :num="1" :width="150" :height="150" />
+      </el-form-item> -->
+      <el-form-item label="产品主图片" style="display: block;">
+           <!-- <el-input v-model="forms.productId" autocomplete="off"></el-input> -->
+           <cgood  @selectGoods="getGoods" v-model="form.imageArr"></cgood>
+        </el-form-item>
+      <el-form-item label="砍价产品轮播图">
+        <MaterialList v-model="form.sliderImageArr" style="width: 500px" type="image" :num="4" :width="150" :height="150" />
+      </el-form-item>
+      <!-- <el-form-item label="库存">
+        <el-input-number v-model="form.stock" />
+      </el-form-item> -->
+      <el-form-item label="虚假销量">
+        <el-input style="width:120px" onkeyup="value=value.replace(/[^\d]/g,'')" v-model="form.sales" />
+      </el-form-item>
+      <el-form-item label="砍价起始额">
+        <el-input style="width:120px" onkeyup="value=value.replace(/[^\d]/g,'')" v-model="form.price" />
+      </el-form-item>
+      <el-form-item label="最终付款额">
+        <el-input style="width:120px" onkeyup="value=value.replace(/[^\d]/g,'')" v-model="form.minPrice" />
+      </el-form-item>
+      <!-- <el-form-item label="限购">
+        <el-input-number v-model="form.num" />
+      </el-form-item> -->
+      <!-- <el-form-item label="单次砍最高价">
+        <el-input style="width:120px" onkeyup="value=value.replace(/[^\d]/g,'')" v-model="form.bargainMaxPrice" />
+      </el-form-item>
+      <el-form-item label="单次砍最低价">
+        <el-input style="width:120px" onkeyup="value=value.replace(/[^\d]/g,'')" v-model="form.bargainMinPrice" />
+      </el-form-item> -->
+      <el-form-item label="砍价次数">
+        <el-input-number v-model="form.needNum" />
+      </el-form-item>
+      <!-- <el-form-item label="用户每次砍价的次数">
+        <el-input-number v-model="form.bargainNum" />
+      </el-form-item> -->
+      
+      <!-- <el-form-item label="成本价">
+        <el-input-number v-model="form.cost" />
+      </el-form-item> -->
+      <!-- <el-form-item label="排序">
+        <el-input-number v-model="form.sort" />
+      </el-form-item> -->
+      <el-form-item label="砍价状态">
+        <el-radio v-model="form.status" :label="1">开启</el-radio>
+        <el-radio v-model="form.status" :label="0" style="width: 110px;">关闭</el-radio>
+      </el-form-item>
+      <!-- <el-form-item label="是否包邮">
+        <el-radio v-model="form.isPostage" :label="1">是</el-radio>
+        <el-radio v-model="form.isPostage" :label="0" style="width: 110px;">否</el-radio>
+      </el-form-item> -->
+      <!-- <el-form-item v-if="form.isPostage ===0" label="邮费">
+        <el-input-number v-model="form.postage" />
+      </el-form-item> -->
+      <!-- <el-form-item label="砍价规则">
+        <editor v-model="form.rule" />
+      </el-form-item> -->
+      <!-- <el-form-item label="砍价详情">
+        <editor v-model="form.description" />
+      </el-form-item> -->
+      <el-form-item label="规则">
+        <editor v-model="form.info" />
+      </el-form-item>
+      <!-- <el-form-item label="玩法">
+        <editor v-model="form.regulations" />
+      </el-form-item> -->
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="text" @click="cancel">取消</el-button>
+      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { add, edit } from '@/api/yxStoreBargain'
+import editor from '../../components/Editor'
+import MaterialList from '@/components/material'
+import cgood from '@/views/components/goodss'
+export default {
+  components: { editor, MaterialList,cgood },
+  inject: ["reload"],
+  props: {
+    isAdd: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data() {
+    return {
+      loading: false, dialog: false,
+      form: {
+        id: '',
+        productId: '',
+        title: '',
+        image: '',
+        unitName: '',
+        stock: 1,
+        sales: '',
+        images: '',
+        imageArr: [],
+        sliderImageArr: [],
+        startTime: '',
+        stopTime: '',
+        storeName: '',
+        price: '',
+        minPrice: '',
+        num: 1,
+        bargainMaxPrice: 0,
+        bargainMinPrice: 0,
+        bargainNum: 1,
+        status: '',
+        // description: '<p>熊</p>',
+        giveIntegral: '',
+        info: '',
+        cost: 0,
+        sort: 0,
+        isHot: 0,
+        isDel: 0,
+        addTime: '',
+        isPostage: 1,
+        postage: '',
+        // rule: '',
+        look: '',
+        share: '',
+        startTimeDate: '',
+        endTimeDate: '',
+        info:'',
+        needNum:''
+        // regulations:''
+      },
+      rules: {
+      }
+    }
+  },
+  watch: {
+    // 'form.imageArr': function(val) {
+    //   if (val) {
+    //     this.form.image = val.join(',')
+    //   }
+    // },
+    'form.sliderImageArr': function(val) {
+      if (val) {
+        this.form.images = val.join(',')
+      }
+    }
+  },
+  methods: {
+    getGoods(val){
+      console.log(val[0].id,'商品id关联')
+      this.form.productId = val[0].id
+      this.form.image = val[0].image
+      this.form.imageArr = val
+      
+    },
+    handleClose(done) {
+        this.$confirm('确认关闭？')
+          .then(_ => {
+            done();
+            this.reload()
+          })
+          .catch(_ => {});
+      },
+    cancel() {
+      this.resetForm()
+    },
+    doSubmit() {
+      this.loading = true
+      
+       this.doEdit()
+    },
+    // doAdd() {
+    //   add(this.form).then(res => {
+    //     this.resetForm()
+    //     this.$notify({
+    //       title: '添加成功',
+    //       type: 'success',
+    //       duration: 2500
+    //     })
+    //     this.loading = false
+    //     this.$parent.init()
+    //   }).catch(err => {
+    //     this.loading = false
+    //     console.log(err.response.data.message)
+    //   })
+    // },
+    doEdit() {
+      edit(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '修改成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+        this.reload()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    resetForm() {
+      this.dialog = false
+      this.$refs['form'].resetFields()
+      this.form = {
+        id: '',
+        productId: '',
+        title: '',
+        image: '',
+        unitName: '',
+        stock: '',
+        sales: '',
+        images: '',
+        imageArr: [],
+        sliderImageArr: [],
+        startTime: '',
+        stopTime: '',
+        storeName: '',
+        price: '',
+        minPrice: '',
+        num: 1,
+        bargainMaxPrice: 0,
+        bargainMinPrice: 0,
+        bargainNum: 1,
+        status: '',
+        // description: '<p>熊</p>',
+        giveIntegral: '',
+        info: '',
+        cost: 0,
+        sort: '',
+        isHot: '',
+        isDel: '',
+        addTime: '',
+        isPostage: '',
+        postage: '',
+        // rule: '',
+        look: '',
+        share: '',
+        info:'',
+        needNum:''
+        // regulations:''
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/activity/bargain/formse.vue b/src/views/activity/bargain/formse.vue
new file mode 100644
index 0000000..b11fa0b
--- /dev/null
+++ b/src/views/activity/bargain/formse.vue
@@ -0,0 +1,286 @@
+<template>
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="handleClose" :visible.sync="dialog" title=" 新增砍价" width="900px">
+    <el-form ref="form" :model="form" :rules="rules" :inline="true" size="small" label-width="140px">
+      <el-form-item label="砍价名称">
+        <el-input v-model="form.title" style="width: 500px;" />
+      </el-form-item>
+      <!-- <el-form-item label="砍价简介">
+        <el-input v-model="form.info" style="width: 500px;" rows="5" type="textarea" />
+      </el-form-item> -->
+      <el-form-item label="单位">
+        <el-input v-model="form.unitName" style="width: 500px;" />
+      </el-form-item>
+
+      <el-form-item label="活动开始时间">
+        <template>
+          <el-date-picker
+            v-model="form.startTime"
+            type="datetime"
+            placeholder="选择日期时间"
+          />
+        </template>
+      </el-form-item>
+      <el-form-item label="活动结束时间">
+        <template>
+          <el-date-picker
+            v-model="form.stopTime"
+            type="datetime"
+            placeholder="选择日期时间"
+          />
+        </template>
+      </el-form-item>
+      <!-- <el-form-item label="砍价产品主图片">
+        <MaterialList v-model="form.imageArr" style="width: 500px" type="image" :num="1" :width="150" :height="150" />
+      </el-form-item> -->
+        <el-form-item label="产品主图片" style="display: block;">
+           <!-- <el-input v-model="forms.productId" autocomplete="off"></el-input> -->
+           <cgood  @selectGoods="getGoods" v-model="form.imageArr"></cgood>
+        </el-form-item>
+      <el-form-item label="砍价产品轮播图">
+        <MaterialList v-model="form.sliderImageArr" style="width: 500px" type="image" :num="4" :width="150" :height="150" />
+      </el-form-item>
+      <!-- <el-form-item label="库存">
+        <el-input-number v-model="form.stock" />
+      </el-form-item> -->
+      <el-form-item label="虚假销量">
+        <el-input style="width:120px" onkeyup="value=value.replace(/[^\d]/g,'')" v-model="form.sales" />
+      </el-form-item>
+      <el-form-item label="砍价起始额">
+        <el-input style="width:120px" onkeyup="value=value.replace(/[^\d]/g,'')" v-model="form.price" />
+      </el-form-item>
+      <el-form-item label="最终付款额">
+        <el-input style="width:120px" onkeyup="value=value.replace(/[^\d]/g,'')" v-model="form.minPrice" />
+      </el-form-item>
+      <!-- <el-form-item label="限购">
+        <el-input-number v-model="form.num" />
+      </el-form-item> -->
+      <!-- <el-form-item label="单次砍最高价">
+        <el-input style="width:120px" onkeyup="value=value.replace(/[^\d]/g,'')" v-model="form.bargainMaxPrice" />
+      </el-form-item>
+      <el-form-item label="单次砍最低价" >
+        <el-input style="width:120px" onkeyup="value=value.replace(/[^\d]/g,'')" v-model="form.bargainMinPrice" />
+      </el-form-item> -->
+      <el-form-item label="砍价次数">
+        <el-input-number v-model="form.needNum" />
+      </el-form-item>
+      <!-- <el-form-item label="砍价次数" >
+        <el-input style="width:120px" onkeyup="value=value.replace(/[^\d]/g,'')" v-model="form.needNum" />
+      </el-form-item> -->
+      <!-- <el-form-item label="用户每次砍价的次数">
+        <el-input-number v-model="form.bargainNum" />
+      </el-form-item> -->
+     
+      <!-- <el-form-item label="成本价">
+        <el-input-number v-model="form.cost" />
+      </el-form-item> -->
+      <!-- <el-form-item label="排序">
+        <el-input-number v-model="form.sort" />
+      </el-form-item> -->
+       <el-form-item label="砍价状态" >
+        <el-radio v-model="form.status" :label="1">开启</el-radio>
+        <el-radio v-model="form.status" :label="0" style="width: 110px;">关闭</el-radio>
+      </el-form-item>
+      <!-- <el-form-item label="是否包邮">
+        <el-radio v-model="form.isPostage" :label="1">是</el-radio>
+        <el-radio v-model="form.isPostage" :label="0" style="width: 110px;">否</el-radio>
+      </el-form-item> -->
+      <!-- <el-form-item v-if="form.isPostage ===0" label="邮费">
+        <el-input-number v-model="form.postage" />
+      </el-form-item> -->
+      <!-- <el-form-item label="砍价规则">
+        <editor v-model="form.rule" />
+      </el-form-item> -->
+      <!-- <el-form-item label="砍价详情">
+        <editor v-model="form.description" />
+      </el-form-item> -->
+      <el-form-item label="规则">
+        <editor v-model="form.info" />
+      </el-form-item>
+      <!-- <el-form-item label="玩法">
+        <editor v-model="form.regulations" />
+      </el-form-item> -->
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="text" @click="cancel">取消</el-button>
+      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { add, edit } from '@/api/yxStoreBargain'
+import editor from '../../components/Editor'
+import MaterialList from '@/components/material'
+import cgood from '@/views/components/goodss'
+export default {
+  inject: ["reload"],
+  components: { editor, MaterialList,cgood },
+  props: {
+    isAdd: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data() {
+    return {
+      loading: false, dialog: false,
+      form: {
+        id: '',
+        productId: '',
+        title: '',
+        image: '',
+        unitName: '',
+        stock: 1,
+        sales: '',
+        images: '',
+        imageArr: [],
+        sliderImageArr: [],
+        startTime: '',
+        stopTime: '',
+        storeName: '',
+        price: '',
+        minPrice: '',
+        num: 1,
+        bargainMaxPrice: 0,
+        bargainMinPrice: 0,
+        bargainNum: 1,
+        status: 0,
+        description: '<p>熊</p>',
+        giveIntegral: '',
+        info: '',
+        cost: 0,
+        sort: 0,
+        isHot: 0,
+        isDel: 0,
+        addTime: '',
+        isPostage: 1,
+        postage: '',
+        // rule: '',
+        look: '',
+        share: '',
+        startTimeDate: '',
+        endTimeDate: '',
+        info:'',
+        // regulations:'',
+        needNum:null
+      },
+      rules: {
+      }
+    }
+  },
+  watch: {
+    // 'form.imageArr': function(val) {
+    //   if (val) {
+    //     this.form.image = val.join(',')
+    //   }
+    // },
+    'form.sliderImageArr': function(val) {
+      if (val) {
+        this.form.images = val.join(',')
+      }
+    }
+  },
+  methods: {
+      getGoods(val){
+      console.log(val[0].id,'商品id关联')
+      this.form.productId = val[0].id
+      this.form.image = val[0].image
+      this.form.imageArr = val
+      
+    },
+    handleClose(done) {
+        this.$confirm('确认关闭？')
+          .then(_ => {
+            done();
+            this.reload()
+          })
+          .catch(_ => {});
+      },
+    cancel() {
+      this.resetForm()
+    },
+    doSubmit() {
+      this.loading = true
+      
+        this.doAdd()
+      
+    },
+    doAdd() {
+      add(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '添加成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+        this.reload()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    // doEdit() {
+    //   edit(this.form).then(res => {
+    //     this.resetForm()
+    //     this.$notify({
+    //       title: '修改成功',
+    //       type: 'success',
+    //       duration: 2500
+    //     })
+    //     this.loading = false
+    //     this.$parent.init()
+    //   }).catch(err => {
+    //     this.loading = false
+    //     console.log(err.response.data.message)
+    //   })
+    // },
+    resetForm() {
+      this.dialog = false
+      this.$refs['form'].resetFields()
+      this.form = {
+        id: '',
+        productId: '',
+        title: '',
+        image: '',
+        unitName: '',
+        stock: '',
+        sales: '',
+        images: '',
+        imageArr: [],
+        sliderImageArr: [],
+        startTime: '',
+        stopTime: '',
+        storeName: '',
+        price: '',
+        minPrice: '',
+        num: 1,
+        bargainMaxPrice: 0,
+        bargainMinPrice: 0,
+        bargainNum: 1,
+        status: '',
+        description: '<p>熊</p>',
+        giveIntegral: '',
+        info: '',
+        cost: 0,
+        sort: '',
+        isHot: '',
+        isDel: '',
+        addTime: '',
+        isPostage: '',
+        postage: '',
+        // rule: '',
+        look: '',
+        share: '',
+        info:'',
+        // regulations:''
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/activity/bargain/index.vue b/src/views/activity/bargain/index.vue
new file mode 100644
index 0000000..2c5e4cf
--- /dev/null
+++ b/src/views/activity/bargain/index.vue
@@ -0,0 +1,214 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container" >
+      <el-button
+        type="danger"
+        class="filter-item"
+        size="mini"
+        icon="el-icon-refresh"
+        @click="toQuery"
+      >刷新</el-button>
+      <el-button
+        type="primary"
+        class="filter-item"
+        size="mini"
+        icon="el-icon-check"
+        @click="add"
+       
+      >
+      新增
+      </el-button>
+      <!-- <el-button
+        type="primary"
+        class="filter-item"
+        size="mini"
+        icon="el-icon-info"
+        @click="addew"
+       
+      >
+      玩法说明
+      </el-button> -->
+    </div>
+    <!--表单组件-->
+    <eForm ref="form" :is-add="isAdd" />
+    <newl ref="form2" :is-add="isAdd" />
+    <how ref="form3" :is-add="isAdd" />
+    <!--表格渲染-->
+    <el-table v-loading="loading" :data="data" size="small" style="width: 100%;height:calc(100vh - 245px);overflow-y: scroll;">
+      <el-table-column prop="id" label="砍价产品ID"  align="center"/>
+      <el-table-column prop="title" label="砍价名称" align="center" />
+      <el-table-column prop="image" label="砍价图片" align="center">
+        <template slot-scope="scope">
+          <a :href="scope.row.image" style="color: #42b983" target="_blank"><img :src="scope.row.image" alt="点击打开" class="el-avatar"></a>
+        </template>
+      </el-table-column>
+      <el-table-column prop="price" label="砍价价格" align="center" />
+      <!-- <el-table-column prop="price" label="砍价区间" align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.row.bargainMinPrice }}~{{ scope.row.bargainMaxPrice }}</span>
+        </template>
+      </el-table-column> -->
+      <el-table-column prop="needNum" label="砍价次数" align="center" />
+      <el-table-column prop="minPrice" label="最低价" align="center" />
+      <el-table-column prop="stock" label="库存" align="center" />
+      <el-table-column prop="statusStr" label="砍价状态" align="center" />
+      <el-table-column prop="startTime" label="开始时间" align="center" width="150">
+        <template slot-scope="scope">
+          <span>{{ formatTimeTwo(scope.row.startTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="stopTime" label="结束时间" align="center" width="150">
+        <template slot-scope="scope">
+          <span>{{ formatTimeTwo(scope.row.stopTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="sales" label="销量" align="center" />
+      <el-table-column prop="look" label="浏览量"  align="center"/>
+      <el-table-column prop="share" label="分享量"  align="center"/>
+      <el-table-column v-if="checkPermission(['admin','YXSTOREBARGAIN_ALL','YXSTOREBARGAIN_EDIT','YXSTOREBARGAIN_DELETE'])" label="操作" width="150px" align="center" fixed="right">
+        <template slot-scope="scope">
+          <el-button v-permission="['admin','YXSTOREBARGAIN_ALL','YXSTOREBARGAIN_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)" />
+          <el-popover
+            :ref="scope.row.id"
+            v-permission="['admin','YXSTOREBARGAIN_ALL','YXSTOREBARGAIN_DELETE']"
+            placement="top"
+            width="180"
+          >
+            <p>确定删除本条数据吗？</p>
+            <div style="text-align: right; margin: 0">
+              <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
+              <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
+            </div>
+            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
+          </el-popover>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--分页组件-->
+   <el-footer style="height:60px;width:100%;background-color:#f6f6f6">
+     <div style="float:left"></div>
+     <el-pagination
+      :total="total"
+      :current-page="page + 1"
+      style="margin-top: 15px; float:right"
+      layout="total, prev, pager, next, sizes"
+      @size-change="sizeChange"
+      @current-change="pageChange"
+    />
+   </el-footer>
+  </div>
+</template>
+
+<script>
+import checkPermission from '@/utils/permission'
+import initData from '@/mixins/crud'
+import { del } from '@/api/yxStoreBargain'
+import eForm from './form'
+import { formatTimeTwo, parseTime } from '@/utils/index'
+import newl from './formse'
+import how from './HowToPlay'
+export default {
+  components: { eForm ,newl ,how},
+  mixins: [initData],
+  data() {
+    return {
+      delLoading: false
+    }
+  },
+  created() {
+    this.$nextTick(() => {
+      this.init()
+    })
+  },
+  methods: {
+    parseTime,
+    formatTimeTwo,
+    checkPermission,
+    beforeInit() {
+      this.url = 'api/yxStoreBargain'
+      const sort = 'id,desc'
+      this.params = { page: this.page, size: this.size, sort: sort }
+      return true
+    },
+    subDelete(id) {
+      this.delLoading = true
+      del(id).then(res => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        this.dleChangePage()
+        this.init()
+        this.$notify({
+          title: '删除成功',
+          type: 'success',
+          duration: 2500
+        })
+      }).catch(err => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        console.log(err.response.data.message)
+      })
+    },
+    add() {
+      this.isAdd = true
+      this.$refs.form2.dialog = true
+    },
+    addew(){
+      this.isAdd = true
+      this.$refs.form3.dialog = true
+    },
+    edit(data) {
+      console.log(data,'修改的数据')
+      this.isAdd = false
+      const _this = this.$refs.form
+      _this.form = {
+        id: data.id,
+        productId: data.productId,
+        title: data.title,
+        image: data.image,
+        unitName: data.unitName,
+        stock: data.stock,
+        sales: data.sales,
+        images: data.images,
+        imageArr: data.imageArr,
+        sliderImageArr: data.images.split(','),
+        startTime: data.startTime,
+        stopTime: data.stopTime,
+        storeName: data.storeName,
+        price: data.price,
+        minPrice: data.minPrice,
+        num: 1,
+        bargainMaxPrice: data.bargainMaxPrice,
+        bargainMinPrice: data.bargainMinPrice,
+        bargainNum: data.bargainNum,
+        status: data.status,
+        description: data.description,
+        giveIntegral: data.giveIntegral,
+        info: data.info,
+        cost: data.cost,
+        sort: data.sort,
+        isHot: data.isHot,
+        isDel: data.isDel,
+        addTime: data.addTime,
+        isPostage: data.isPostage,
+        postage: data.postage,
+        rule: data.rule,
+        look: data.look,
+        share: data.share,
+        startTimeDate: new Date(data.startTimeDate),
+        endTimeDate: new Date(data.endTimeDate),
+        info:data.info,
+        needNum:data.needNum
+        // regulations:data.regulations
+      }
+      _this.dialog = true
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .app-container{
+  padding-bottom: 0px;
+}
+</style>
diff --git a/src/views/activity/bargain_user/form.vue b/src/views/activity/bargain_user/form.vue
new file mode 100644
index 0000000..a60fef4
--- /dev/null
+++ b/src/views/activity/bargain_user/form.vue
@@ -0,0 +1,124 @@
+<template>
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增' : '编辑'" width="500px">
+    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
+      <el-form-item label="用户ID">
+        <el-input v-model="form.uid" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="砍价产品id">
+        <el-input v-model="form.bargainId" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="砍价的最低价">
+        <el-input v-model="form.bargainPriceMin" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="砍价金额">
+        <el-input v-model="form.bargainPrice" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="砍掉的价格">
+        <el-input v-model="form.price" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="状态 1参与中 2 活动结束参与失败 3活动结束参与成功">
+        <el-input v-model="form.status" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="参与时间">
+        <el-input v-model="form.addTime" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="是否取消">
+        <el-input v-model="form.isDel" style="width: 370px;" />
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="text" @click="cancel">取消</el-button>
+      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { add, edit } from '@/api/yxStoreBargainUser'
+export default {
+  props: {
+    isAdd: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data() {
+    return {
+      loading: false, dialog: false,
+      form: {
+        id: '',
+        uid: '',
+        bargainId: '',
+        bargainPriceMin: '',
+        bargainPrice: '',
+        price: '',
+        status: '',
+        addTime: '',
+        isDel: ''
+      },
+      rules: {
+      }
+    }
+  },
+  methods: {
+    cancel() {
+      this.resetForm()
+    },
+    doSubmit() {
+      this.loading = true
+      if (this.isAdd) {
+        this.doAdd()
+      } else this.doEdit()
+    },
+    doAdd() {
+      add(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '添加成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    doEdit() {
+      edit(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '修改成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    resetForm() {
+      this.dialog = false
+      this.$refs['form'].resetFields()
+      this.form = {
+        id: '',
+        uid: '',
+        bargainId: '',
+        bargainPriceMin: '',
+        bargainPrice: '',
+        price: '',
+        status: '',
+        addTime: '',
+        isDel: ''
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/activity/bargain_user/index.vue b/src/views/activity/bargain_user/index.vue
new file mode 100644
index 0000000..71c18ef
--- /dev/null
+++ b/src/views/activity/bargain_user/index.vue
@@ -0,0 +1,131 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <!-- 新增 -->
+      <div style="display: inline-block;margin: 0px 2px;">
+        <el-button
+          v-permission="['admin','YXSTOREBARGAINUSER_ALL','YXSTOREBARGAINUSER_CREATE']"
+          class="filter-item"
+          size="mini"
+          type="primary"
+          icon="el-icon-plus"
+          @click="add"
+        >新增</el-button>
+      </div>
+    </div>
+    <!--表单组件-->
+    <eForm ref="form" :is-add="isAdd" />
+    <!--表格渲染-->
+    <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
+      <el-table-column prop="id" label="用户参与砍价表ID" />
+      <el-table-column prop="uid" label="用户ID" />
+      <el-table-column prop="bargainId" label="砍价产品id" />
+      <el-table-column prop="bargainPriceMin" label="砍价的最低价" />
+      <el-table-column prop="bargainPrice" label="砍价金额" />
+      <el-table-column prop="price" label="砍掉的价格" />
+      <el-table-column prop="status" label="状态 1参与中 2 活动结束参与失败 3活动结束参与成功" />
+      <el-table-column prop="addTime" label="参与时间" />
+      <el-table-column prop="isDel" label="是否取消" />
+      <el-table-column v-if="checkPermission(['admin','YXSTOREBARGAINUSER_ALL','YXSTOREBARGAINUSER_EDIT','YXSTOREBARGAINUSER_DELETE'])" label="操作" width="150px" align="center">
+        <template slot-scope="scope">
+          <el-button v-permission="['admin','YXSTOREBARGAINUSER_ALL','YXSTOREBARGAINUSER_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)" />
+          <el-popover
+            :ref="scope.row.id"
+            v-permission="['admin','YXSTOREBARGAINUSER_ALL','YXSTOREBARGAINUSER_DELETE']"
+            placement="top"
+            width="180"
+          >
+            <p>确定删除本条数据吗？</p>
+            <div style="text-align: right; margin: 0">
+              <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
+              <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
+            </div>
+            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
+          </el-popover>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--分页组件-->
+    <el-pagination
+      :total="total"
+      :current-page="page + 1"
+      style="margin-top: 8px;"
+      layout="total, prev, pager, next, sizes"
+      @size-change="sizeChange"
+      @current-change="pageChange"
+    />
+  </div>
+</template>
+
+<script>
+import checkPermission from '@/utils/permission'
+import initData from '@/mixins/crud'
+import { del } from '@/api/yxStoreBargainUser'
+import eForm from './form'
+export default {
+  components: { eForm },
+  mixins: [initData],
+  data() {
+    return {
+      delLoading: false
+    }
+  },
+  created() {
+    this.$nextTick(() => {
+      this.init()
+    })
+  },
+  methods: {
+    checkPermission,
+    beforeInit() {
+      this.url = 'api/yxStoreBargainUser'
+      const sort = 'id,desc'
+      this.params = { page: this.page, size: this.size, sort: sort }
+      return true
+    },
+    subDelete(id) {
+      this.delLoading = true
+      del(id).then(res => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        this.dleChangePage()
+        this.init()
+        this.$notify({
+          title: '删除成功',
+          type: 'success',
+          duration: 2500
+        })
+      }).catch(err => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        console.log(err.response.data.message)
+      })
+    },
+    add() {
+      this.isAdd = true
+      this.$refs.form.dialog = true
+    },
+    edit(data) {
+      this.isAdd = false
+      const _this = this.$refs.form
+      _this.form = {
+        id: data.id,
+        uid: data.uid,
+        bargainId: data.bargainId,
+        bargainPriceMin: data.bargainPriceMin,
+        bargainPrice: data.bargainPrice,
+        price: data.price,
+        status: data.status,
+        addTime: data.addTime,
+        isDel: data.isDel
+      }
+      _this.dialog = true
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/activity/combination/HowToPlay.vue b/src/views/activity/combination/HowToPlay.vue
new file mode 100644
index 0000000..ac78f0e
--- /dev/null
+++ b/src/views/activity/combination/HowToPlay.vue
@@ -0,0 +1,87 @@
+<template>
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" title="拼团玩法说明" width="900px">
+    <el-form ref="form" :model="form" :rules="rules" :inline="true" size="small" label-width="140px">
+      <el-form-item label="说明">
+        <editor v-model="form.pinkStatement" />
+      </el-form-item>
+      <el-form-item label="玩法">
+        <editor v-model="form.pinkRegulations" />
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="text" @click="cancel">取消</el-button>
+      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { List,Config } from '@/api/yxStoreCombination'
+import editor from '../../components/Editor'
+import MaterialList from '@/components/material'
+import cgood from '@/views/components/goodss'
+export default {
+  components: { editor,  MaterialList ,cgood },
+  props: {
+    isAdd: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data() {
+    return {
+      loading: false, dialog: false,
+      form: {
+       
+        pinkStatement:'',
+        pinkRegulations:''
+      },
+      rules: {
+      }
+    }
+  },
+  created(){
+      this.List()
+  },
+  methods: {
+      cancel(){
+          this.dialog = false
+      },
+      
+    List(){
+        List().then(res=>{
+            console.log(res,'iopioipo')
+            this.form = res
+        })
+    },
+    doSubmit() {
+    //   this.loading = true
+
+      
+       this.Config()
+    },
+    Config() {  
+         console.log(this.form)
+      Config(this.form).then(res => {
+          console.log(res)
+        this.$notify({
+          title: '添加成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.dialog = false
+       
+      }).catch(err => {
+        this.dialog = false
+        console.log(err.response.data.message)
+      })
+    },
+    
+    
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/activity/combination/form.vue b/src/views/activity/combination/form.vue
new file mode 100644
index 0000000..3aff5a7
--- /dev/null
+++ b/src/views/activity/combination/form.vue
@@ -0,0 +1,258 @@
+<template>
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="handleClose" :visible.sync="dialog" title=" 开启拼团" width="900px">
+    <el-form ref="form" :model="form" :rules="rules" :inline="true" size="small" label-width="140px">
+      <el-form-item label="拼团名称">
+        <el-input v-model="form.title" style="width: 500px;" />
+      </el-form-item>
+      <!-- <el-form-item label="拼团简介">
+        <el-input v-model="form.info" style="width: 500px;" />
+      </el-form-item> -->
+      <el-form-item label="单位">
+        <el-input v-model="form.unitName" style="width: 500px;" />
+      </el-form-item>
+      <el-form-item label="拼团开始时间">
+        <template>
+          <el-date-picker
+            v-model="form.startTime"
+            type="datetime"
+            placeholder="选择日期时间"
+          />
+        </template>
+      </el-form-item>
+      <el-form-item label="拼团结束时间">
+        <template>
+          <el-date-picker
+            v-model="form.stopTime"
+            type="datetime"
+            placeholder="选择日期时间"
+          />
+        </template>
+      </el-form-item>
+      <!-- <el-form-item label="产品主图片">
+        <MaterialList v-model="form.imageArr" style="width: 500px" type="image" :num="1" :width="150" :height="150" />
+      </el-form-item> -->
+      <el-form-item label="产品主图片" style="display: block;">
+          <!-- <el-input v-model="forms.productId" autocomplete="off"></el-input> -->
+           <cgood  @selectGoods="getGoods" v-model="form.imageArr"></cgood>
+        </el-form-item>
+      <el-form-item label="产品轮播图">
+        <MaterialList v-model="form.sliderImageArr" style="width: 500px" type="image" :num="4" :width="150" :height="150" />
+      </el-form-item>
+      <el-form-item label="拼团时效(单位小时)">
+        <el-input-number v-model="form.effectiveTime" style="width: 500px;" />
+      </el-form-item>
+      <!-- <el-form-item label="拼团价">
+        <el-input-number v-model="form.price" />
+      </el-form-item> -->
+      <el-form-item label="拼团人数">
+        <el-input style="width:100px" onkeyup="value=value.replace(/[^\d]/g,'')" v-model="form.people" />
+      </el-form-item>
+      <el-form-item label="虚拟原价">
+        <el-input style="width:100px" onkeyup="value=value.replace(/[^\d]/g,'')" v-model="form.productPrice" />
+      </el-form-item>
+      <!-- <el-form-item label="库存">
+        <el-input-number v-model="form.stock" />
+      </el-form-item> -->
+      <el-form-item label="销量">
+        <el-input style="width:100px" onkeyup="value=value.replace(/[^\d]/g,'')" v-model="form.sales" />
+      </el-form-item>
+      <!-- <el-form-item label="排序">
+        <el-input-number v-model="form.sort" />
+      </el-form-item> -->
+      <!-- <el-form-item label="邮费">
+        <el-input-number v-model="form.postage" />
+      </el-form-item> -->
+      <!-- <el-form-item label="是否包邮">
+        <el-radio v-model="form.isPostage" :label="1">是</el-radio>
+        <el-radio v-model="form.isPostage" :label="0" style="width: 110px;">否</el-radio>
+      </el-form-item> -->
+      <el-form-item label="活动状态">
+        <el-radio v-model="form.isShow" :label="1">开启</el-radio>
+        <el-radio v-model="form.isShow" :label="0" style="width: 200px;">关闭</el-radio>
+      </el-form-item>
+      <!-- <el-form-item label="详情">
+        <editor v-model="form.description" />
+      </el-form-item> -->
+      <!-- <el-form-item label="说明">
+        <editor v-model="form.pinkStatement" />
+      </el-form-item>
+      <el-form-item label="玩法">
+        <editor v-model="form.pinkRegulations" />
+      </el-form-item> -->
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="text" @click="cancel">取消</el-button>
+      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { add, edit } from '@/api/yxStoreCombination'
+import editor from '../../components/Editor'
+import MaterialList from '@/components/material'
+import cgood from '@/views/components/goodss'
+export default {
+  components: { editor,  MaterialList,cgood },
+   inject: ["reload"],
+  props: {
+    isAdd: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data() {
+    return {
+      loading: false, dialog: false,
+      form: {
+        id: '',
+        productId: '',
+        merId: '',
+        image: '',
+        images: '',
+        imageArr: [],
+        sliderImageArr: [],
+        title: '',
+        attr: null,
+        people: '',
+        info: '',
+        price: 0,
+        sort: 0,
+        sales: '',
+        addTime: '',
+        isHost: '',
+        isShow: 1,
+        isDel: 0,
+        merUse: '',
+        isPostage: null,
+        postage: 0,
+        description: '<p>123</p>',
+        startTime: '',
+        stopTime: '',
+        effectiveTime: '',
+        cost: '',
+        browse: '',
+        unitName: '',
+        combination: 1,
+        browse: 0,
+        startTimeDate: '',
+        endTimeDate: '',
+        productPrice:'',
+        // pinkStatement:'',
+        // pinkRegulations:''
+      },
+      rules: {
+      }
+    }
+  },
+  watch: {
+    // 'form.imageArr': function(val) {
+    //   if (val) {
+    //     this.form.image = val.join(',')
+    //   }
+    // },
+    'form.sliderImageArr': function(val) {
+      if (val) {
+        this.form.images = val.join(',')
+      }
+    }
+  },
+  methods: {
+    handleClose(done) {
+        this.$confirm('确认关闭？')
+          .then(_ => {
+            done();
+            this.reload()
+          })
+          .catch(_ => {});
+      },
+    getGoods(val){
+      console.log(val[0].id,'商品id关联')
+      this.form.productId = val[0].id
+      this.form.image = val[0].image
+      this.form.imageArr = val
+    },
+    cancel() {
+      this.resetForm()
+    },
+    doSubmit() {
+      this.loading = true
+       this.doEdit()
+    },
+    // doAdd() {
+    //   add(this.form).then(res => {
+    //     this.resetForm()
+    //     this.$notify({
+    //       title: '添加成功',
+    //       type: 'success',
+    //       duration: 2500
+    //     })
+    //     this.loading = false
+    //     this.$parent.init()
+    //   }).catch(err => {
+    //     this.loading = false
+    //     console.log(err.response.data.message)
+    //   })
+    // },
+    doEdit() {
+      
+      edit(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '操作成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+        this.reload()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    resetForm() {
+      this.dialog = false
+      this.$refs['form'].resetFields()
+      this.form = {
+        id: '',
+        productId: '',
+        merId: '',
+        image: '',
+        images: '',
+        imageArr: [],
+        sliderImageArr: [],
+        title: '',
+        attr: null,
+        people: 0,
+        info: '',
+        price: 0,
+        sort: '',
+        sales: '',
+        addTime: '',
+        isHost: '',
+        isShow: '',
+        isDel: '',
+        combination: '',
+        merUse: '',
+        isPostage: '',
+        postage: '',
+        description: '<p>123</p>',
+        startTimeDate: '',
+        endTimeDate: '',
+        effectiveTime: 24,
+        cost: '',
+        browse: '',
+        unitName: '',
+        productPrice:'',
+        // pinkStatement:'',
+        // pinkRegulations:''
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/activity/combination/formt.vue b/src/views/activity/combination/formt.vue
new file mode 100644
index 0000000..66c00a5
--- /dev/null
+++ b/src/views/activity/combination/formt.vue
@@ -0,0 +1,264 @@
+<template>
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="handleClose" :visible.sync="dialog" title=" 新增拼团" width="900px">
+    <el-form ref="form" :model="form" :rules="rules" :inline="true" size="small" label-width="140px">
+      <el-form-item label="拼团名称">
+        <el-input v-model="form.title" style="width: 500px;" />
+      </el-form-item>
+      <!-- <el-form-item label="拼团简介">
+        <el-input v-model="form.info" style="width: 500px;" />
+      </el-form-item> -->
+      <el-form-item label="单位">
+        <el-input v-model="form.unitName" style="width: 500px;" />
+      </el-form-item>
+      <el-form-item label="拼团开始时间">
+        <template>
+          <el-date-picker
+            v-model="form.startTime"
+            type="datetime"
+            placeholder="选择日期时间"
+          />
+        </template>
+      </el-form-item>
+      <el-form-item label="拼团结束时间">
+        <template>
+          <el-date-picker
+            v-model="form.stopTime"
+            type="datetime"
+            placeholder="选择日期时间"
+          />
+        </template>
+      </el-form-item>
+      <!-- <el-form-item label="产品主图片">
+        <MaterialList v-model="form.imageArr" style="width: 500px" type="image" :num="1" :width="150" :height="150" />
+      </el-form-item> -->
+      <el-form-item label="产品主图片" style="display: block;">
+          <!-- <el-input v-model="forms.productId" autocomplete="off"></el-input> -->
+           <cgood  @selectGoods="getGoods" v-model="form.imageArr"></cgood>
+        </el-form-item>
+      <el-form-item label="产品轮播图">
+        <MaterialList v-model="form.sliderImageArr" style="width: 500px" type="image" :num="4" :width="150" :height="150" />
+      </el-form-item>
+      <el-form-item label="拼团时效(单位小时)">
+        <el-input-number v-model="form.effectiveTime" style="width: 500px;" />
+      </el-form-item>
+      <!-- <el-form-item label="拼团价">
+        <el-input-number v-model="form.price" />
+      </el-form-item> -->
+      <el-form-item label="拼团人数">
+        <el-input style="width:100px" onkeyup="value=value.replace(/[^\d]/g,'')" v-model="form.people" />
+      </el-form-item>
+      <el-form-item label="虚拟原价">
+        <el-input style="width:100px" onkeyup="value=value.replace(/[^\d]/g,'')" v-model="form.productPrice" />
+      </el-form-item>
+      <!-- <el-form-item label="库存">
+        <el-input-number v-model="form.stock" />
+      </el-form-item> -->
+      <el-form-item label="销量">
+        <el-input style="width:100px" onkeyup="value=value.replace(/[^\d]/g,'')" v-model="form.sales" />
+      </el-form-item>
+      <!-- <el-form-item label="排序">
+        <el-input-number v-model="form.sort" />
+      </el-form-item> -->
+      <!-- <el-form-item label="邮费">
+        <el-input-number v-model="form.postage" />
+      </el-form-item> -->
+      <!-- <el-form-item label="是否包邮">
+        <el-radio v-model="form.isPostage" :label="1">是</el-radio>
+        <el-radio v-model="form.isPostage" :label="0" style="width: 110px;">否</el-radio>
+      </el-form-item> -->
+      <el-form-item label="活动状态">
+        <el-radio v-model="form.isShow" :label="1">开启</el-radio>
+        <el-radio v-model="form.isShow" :label="0" style="width: 200px;">关闭</el-radio>
+      </el-form-item>
+      <!-- <el-form-item label="详情">
+        <editor v-model="form.description" />
+      </el-form-item> -->
+      
+      <!-- <el-form-item label="说明">
+        <editor v-model="form.pinkStatement" />
+      </el-form-item>
+      <el-form-item label="玩法">
+        <editor v-model="form.pinkRegulations" />
+      </el-form-item> -->
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="text" @click="cancel">取消</el-button>
+      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { add, edit } from '@/api/yxStoreCombination'
+import editor from '../../components/Editor'
+import MaterialList from '@/components/material'
+import cgood from '@/views/components/goodss'
+export default {
+  inject: ["reload"],
+  components: { editor,  MaterialList ,cgood },
+  props: {
+    isAdd: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data() {
+    return {
+      loading: false, dialog: false,
+      form: {
+        id: '',
+        productId: '',
+        merId: '',
+        image: '',
+        images: '',
+        imageArr: [],
+        sliderImageArr: [],
+        title: '',
+        attr: null,
+        people: '',
+        info: '',
+        price: 0,
+        sort: 0,
+        sales: '',
+        stock: 20,
+        addTime: '',
+        isHost: '',
+        isShow: 1,
+        isDel: 0,
+        merUse: '',
+        isPostage: null,
+        postage: 0,
+        description: '<p>123</p>',
+        startTime: '',
+        stopTime: '',
+        effectiveTime: '',
+        cost: '',
+        browse: '',
+        unitName: '',
+        combination: 1,
+        browse: 0,
+        startTimeDate: '',
+        endTimeDate: '',
+        productPrice:'',
+        // pinkStatement:'',
+        // pinkRegulations:''
+      },
+      rules: {
+      }
+    }
+  },
+  watch: {
+    // 'form.imageArr': function(val) {
+    //   if (val) {
+    //     this.form.image = val.join(',')
+    //   }
+    // },
+    'form.sliderImageArr': function(val) {
+      if (val) {
+        this.form.images = val.join(',')
+      }
+    }
+  },
+  methods: {
+    handleClose(done) {
+        this.$confirm('确认关闭？')
+          .then(_ => {
+            done();
+            this.reload()
+          })
+          .catch(_ => {});
+      },
+      getGoods(val){
+      console.log(val[0].id,'商品id关联')
+      this.form.productId = val[0].id
+      this.form.image = val[0].image
+      this.form.imageArr = val
+      
+    },
+    cancel() {
+      this.resetForm()
+    },
+    doSubmit() {
+      this.loading = true
+      
+       this.doAdd()
+    },
+    doAdd() {  //添加
+         console.log(this.form)
+      add(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '添加成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+        this.reload()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    // doEdit() {
+       
+    //   edit(this.form).then(res => {
+    //     this.resetForm()
+    //     this.$notify({
+    //       title: '操作成功',
+    //       type: 'success',
+    //       duration: 2500
+    //     })
+    //     this.loading = false
+    //     this.$parent.init()
+    //   }).catch(err => {
+    //     this.loading = false
+    //     console.log(err.response.data.message)
+    //   })
+    // },
+    resetForm() {
+      this.dialog = false
+      this.$refs['form'].resetFields()
+      this.form = {
+        id: '',
+        productId: '',
+        merId: '',
+        image: '',
+        images: '',
+        imageArr: [],
+        sliderImageArr: [],
+        title: '',
+        attr: null,
+        people: 0,
+        info: '',
+        price: 0,
+        sort: '',
+        sales: '',
+        stock: '',
+        addTime: '',
+        isHost: '',
+        isShow: '',
+        isDel: '',
+        combination: '',
+        merUse: '',
+        isPostage: '',
+        postage: '',
+        description: '<p>123</p>',
+        startTimeDate: '',
+        endTimeDate: '',
+        effectiveTime: 24,
+        cost: '',
+        browse: '',
+        unitName: '',
+        productPrice:'',
+        // pinkStatement:'',
+        // pinkRegulations:''
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/activity/combination/index.vue b/src/views/activity/combination/index.vue
new file mode 100644
index 0000000..fe6856e
--- /dev/null
+++ b/src/views/activity/combination/index.vue
@@ -0,0 +1,244 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <!-- 搜索 -->
+      <el-input v-model="query.value" clearable placeholder="输入搜索内容" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
+      <el-select v-model="query.type" clearable placeholder="类型" class="filter-item" style="width: 130px">
+        <el-option v-for="item in queryTypeOptions" :key="item.key" :label="item.display_name" :value="item.key" />
+      </el-select>
+      <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
+      <!-- 新增 -->
+      <el-button
+        type="danger"
+        class="filter-item"
+        size="mini"
+        icon="el-icon-refresh"
+        @click="toQuery"
+      >刷新</el-button>
+       <el-button
+        type="primary"
+        class="filter-item"
+        size="mini"
+        icon="el-icon-check"
+        @click="add"
+       
+      >
+      新增
+      </el-button>
+      <el-button
+        type="primary"
+        class="filter-item"
+        size="mini"
+        icon="el-icon-info"
+        @click="addew"
+       
+      >
+      玩法说明
+      </el-button>
+    </div>
+    <!--表单组件-->
+    <eForm ref="form" :is-add="isAdd" />
+    <newl ref="form2" :is-add="isAdd" />
+    <how ref="form3" :is-add="isAdd" />
+    <!--表格渲染-->
+    <el-table v-loading="loading" :data="data" size="small" style="width: 100%;height:calc(100vh - 245px);overflow-y: scroll;">
+      <el-table-column prop="id" label="id" align="center" />
+      <el-table-column prop="productId" label="商品id"  align="center" />
+      <el-table-column prop="image" label="产品主图" align="center">
+        <template slot-scope="scope">
+          <a :href="scope.row.image" style="color: #42b983" target="_blank"><img :src="scope.row.image" alt="点击打开" class="el-avatar"></a>
+        </template>
+      </el-table-column>
+      <el-table-column prop="title" label="拼团名称" align="center"  width="150"/>
+      <el-table-column prop="people" label="参团人数"  align="center"/>
+      <el-table-column prop="price" label="拼团价" align="center" />
+      <el-table-column prop="productPrice" label="原价" align="center" />
+      <el-table-column prop="stock" label="库存"  align="center"/>
+      <el-table-column prop="browse" label="浏览量" align="center" />
+      <el-table-column prop="countPeopleAll" label="参与人数" align="center" />
+      <el-table-column prop="countPeoplePink" label="成团数量"  align="center"/>
+      <el-table-column prop="countPeopleBrowse" label="访客人数"  align="center"/>
+      <el-table-column label="状态" align="center">
+        <template slot-scope="scope">
+          <div @click="onSale(scope.row.id,scope.row.isShow)">
+            <el-tag v-if="scope.row.isShow === 1" style="cursor: pointer" :type="''">已开启</el-tag>
+            <el-tag v-else style="cursor: pointer" :type=" 'info' ">已关闭</el-tag>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="stopTime" label="结束时间" align="center" width="200">
+        <template slot-scope="scope">
+          <span>{{ formatTimeTwo(scope.row.stopTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column v-if="checkPermission(['admin','YXSTORECOMBINATION_ALL','YXSTORECOMBINATION_EDIT','YXSTORECOMBINATION_DELETE'])" label="操作" width="150px" align="center" fixed="right">
+        <template slot-scope="scope">
+          <el-button v-permission="['admin','YXSTORECOMBINATION_ALL','YXSTORECOMBINATION_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)" />
+          <el-popover
+            :ref="scope.row.id"
+            v-permission="['admin','YXSTORECOMBINATION_ALL','YXSTORECOMBINATION_DELETE']"
+            placement="top"
+            width="180"
+          >
+            <p>确定删除本条数据吗？</p>
+            <div style="text-align: right; margin: 0">
+              <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
+              <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
+            </div>
+            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
+          </el-popover>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--分页组件-->
+   <el-footer style="height:60px;width:100%;background-color:#f6f6f6">
+     <div style="float:left"></div>
+      <el-pagination
+      :total="total"
+      :current-page="page + 1"
+      style="margin-top: 15px; float:right"
+      layout="total, prev, pager, next, sizes"
+      @size-change="sizeChange"
+      @current-change="pageChange"
+    />
+   </el-footer>
+  </div>
+</template>
+
+<script>
+import checkPermission from '@/utils/permission'
+import initData from '@/mixins/crud'
+import { del, onsale } from '@/api/yxStoreCombination'
+import eForm from './form'
+import { formatTimeTwo, parseTime } from '@/utils/index'
+import newl from './formt'
+import how from './HowToPlay'
+export default {
+  components: { eForm ,newl,how },
+  mixins: [initData],
+  data() {
+    return {
+      delLoading: false,
+      queryTypeOptions: [
+        { key: 'title', display_name: '活动标题' }
+      ]
+    }
+  },
+  created() {
+    this.$nextTick(() => {
+      this.init()
+    })
+    
+  },
+  methods: {
+    
+    parseTime,
+    formatTimeTwo,
+    checkPermission,
+    beforeInit() {
+      this.url = 'api/yxStoreCombination'
+      const sort = 'id,desc'
+      this.params = { page: this.page, size: this.size, sort: sort }
+      const query = this.query
+      const type = query.type
+      const value = query.value
+      if (type && value) { this.params[type] = value }
+      return true
+    },
+    subDelete(id) {
+      this.delLoading = true
+      del(id).then(res => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        this.dleChangePage()
+        this.init()
+        this.$notify({
+          title: '删除成功',
+          type: 'success',
+          duration: 2500
+        })
+      }).catch(err => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        console.log(err.response.data.message)
+      })
+    },
+    onSale(id, status) {
+      this.$confirm(`确定进行[${status ? '下架' : '上架'}]操作?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          onsale(id, { status: status }).then(({ data }) => {
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1000,
+              onClose: () => {
+                this.init()
+              }
+            })
+          })
+        })
+        .catch(() => { })
+    },
+    add() {
+      this.isAdd = true
+      this.$refs.form2.dialog = true
+    },
+    addew(){
+      this.isAdd = true
+      this.$refs.form3.dialog = true
+    },
+    edit(data) {
+      console.log(data,'pintuan')
+      this.isAdd = false
+      const _this = this.$refs.form
+      _this.form = {
+        id: data.id,
+        productId: data.productId,
+        merId: data.merId,
+        image: data.image,
+        images: data.images,
+        imageArr: data.imageArr,
+        sliderImageArr: data.images.split(','),
+        title: data.title,
+        attr: data.attr,
+        people: data.people,
+        info: data.info,
+        price: data.price,
+        sort: data.sort,
+        sales: data.sales,
+        addTime: data.addTime,
+        isHost: data.isHost,
+        isShow: data.isShow,
+        isDel: data.isDel,
+        combination: data.combination,
+        merUse: data.merUse,
+        isPostage: data.isPostage,
+        postage: data.postage,
+        description: data.description,
+        startTime: data.startTime,
+        stopTime: data.stopTime,
+        startTimeDate: new Date(data.startTimeDate),
+        endTimeDate: new Date(data.endTimeDate),
+        effectiveTime: data.effectiveTime,
+        productPrice: data.productPrice,
+        browse: data.browse,
+        unitName: data.unitName
+        // pinkStatement:data.pinkStatement,
+        // pinkRegulations:data.pinkRegulations
+      }
+      _this.dialog = true
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .app-container{
+  padding-bottom: 0px;
+}
+</style>
diff --git a/src/views/activity/combinlist/form.vue b/src/views/activity/combinlist/form.vue
new file mode 100644
index 0000000..56f0c5c
--- /dev/null
+++ b/src/views/activity/combinlist/form.vue
@@ -0,0 +1,159 @@
+<template>
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增' : '编辑'" width="500px">
+    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
+      <el-form-item label="用户id">
+        <el-input v-model="form.uid" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="订单id 生成">
+        <el-input v-model="form.orderId" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="订单id  数据库">
+        <el-input v-model="form.orderIdKey" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="购买商品个数">
+        <el-input v-model="form.totalNum" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="购买总金额">
+        <el-input v-model="form.totalPrice" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="拼团产品id">
+        <el-input v-model="form.cid" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="产品id">
+        <el-input v-model="form.pid" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="拼图总人数">
+        <el-input v-model="form.people" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="拼团产品单价">
+        <el-input v-model="form.price" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="开始时间">
+        <el-input v-model="form.addTime" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="stopTime">
+        <el-input v-model="form.stopTime" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="团长id 0为团长">
+        <el-input v-model="form.kId" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="是否发送模板消息0未发送1已发送">
+        <el-input v-model="form.isTpl" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="是否退款 0未退款 1已退款">
+        <el-input v-model="form.isRefund" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="状态1进行中2已完成3未完成">
+        <el-input v-model="form.status" style="width: 370px;" />
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="text" @click="cancel">取消</el-button>
+      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { add, edit } from '@/api/yxStorePink'
+export default {
+  props: {
+    isAdd: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data() {
+    return {
+      loading: false, dialog: false,
+      form: {
+        id: '',
+        uid: '',
+        orderId: '',
+        orderIdKey: '',
+        totalNum: '',
+        totalPrice: '',
+        cid: '',
+        pid: '',
+        people: '',
+        price: '',
+        addTime: '',
+        stopTime: '',
+        kId: '',
+        isTpl: '',
+        isRefund: '',
+        status: ''
+      },
+      rules: {
+      }
+    }
+  },
+  methods: {
+    cancel() {
+      this.resetForm()
+    },
+    doSubmit() {
+      this.loading = true
+      if (this.isAdd) {
+        this.doAdd()
+      } else this.doEdit()
+    },
+    doAdd() {
+      add(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '添加成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    doEdit() {
+      edit(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '修改成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    resetForm() {
+      this.dialog = false
+      this.$refs['form'].resetFields()
+      this.form = {
+        id: '',
+        uid: '',
+        orderId: '',
+        orderIdKey: '',
+        totalNum: '',
+        totalPrice: '',
+        cid: '',
+        pid: '',
+        people: '',
+        price: '',
+        addTime: '',
+        stopTime: '',
+        kId: '',
+        isTpl: '',
+        isRefund: '',
+        status: ''
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/activity/combinlist/index.vue b/src/views/activity/combinlist/index.vue
new file mode 100644
index 0000000..85fb578
--- /dev/null
+++ b/src/views/activity/combinlist/index.vue
@@ -0,0 +1,170 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <!-- 搜索 -->
+      <el-input v-model="query.value" clearable placeholder="输入搜索内容" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
+      <el-select v-model="query.type" clearable placeholder="类型" class="filter-item" style="width: 130px">
+        <el-option v-for="item in queryTypeOptions" :key="item.key" :label="item.display_name" :value="item.key" />
+      </el-select>
+      <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
+      <!-- 新增 -->
+      <el-button
+        type="danger"
+        class="filter-item"
+        size="mini"
+        icon="el-icon-refresh"
+        @click="toQuery"
+      >刷新</el-button>
+    </div>
+    <!--表单组件-->
+    <eForm ref="form" :is-add="isAdd" />
+    <!--表格渲染-->
+    <el-table v-loading="loading" :data="data" size="small" style="width: 100%;height:calc(100vh - 245px);overflow-y: scroll;">
+      <el-table-column
+        label="序号"
+        type="index"
+        width="50"
+        align="center">
+      </el-table-column>
+      <el-table-column prop="uid" label="参与人" width="150" align="center" >
+        <template slot-scope="scope">
+          头像：<a :href="scope.row.userImg" style="color: #42b983" target="_blank"><img :src="scope.row.userImg" alt="点击打开" class="el-avatar"></a><br>
+          昵称：{{ scope.row.nickname }}<br>
+          用户ID：{{ scope.row.uid }}<br>
+          手机号：{{ scope.row.phone }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="createTime" label="开团时间" align="center" />
+      <el-table-column label="拼团产品" width="200" align="center">
+        <template slot-scope="scope">
+          产品主图：<a :href="scope.row.image" style="color: #42b983" target="_blank"><img :src="scope.row.image" alt="点击打开" class="el-avatar"></a><br>
+          拼团名称：{{ scope.row.product }}<br>
+          拼团 ID：{{ scope.row.cid }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="orderId" label="订单号" width="150" align="center" />
+      <el-table-column prop="totalPrice" label="拼团价" align="center" />
+      <el-table-column prop="people" label="几人团"  align="center"/>
+      <el-table-column prop="countPeople" label="几人参加" align="center" />
+      <el-table-column label="结束时间" align="center">
+        <template slot-scope="scope">
+          <span>{{ formatTimeTwo(scope.row.stopTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="状态" align="center">
+        <template slot-scope="scope">
+          <span v-if="scope.row.status == 1">进行中</span>
+          <span v-else-if="scope.row.status == 2">已完成</span>
+          <span v-else>未完成</span>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--分页组件-->
+    <el-footer style="height:60px;width:100%;background-color:#f6f6f6">
+      <div style="float:left"></div>
+      <el-pagination
+      :total="total"
+      :current-page="page + 1"
+      style="margin-top: 15px; float:right"
+      layout="total, prev, pager, next, sizes"
+      @size-change="sizeChange"
+      @current-change="pageChange"
+    />
+    </el-footer>
+  </div>
+</template>
+
+<script>
+  import checkPermission from '@/utils/permission'
+  import initData from '@/mixins/crud'
+  import { del } from '@/api/yxStorePink'
+  import eForm from './form'
+  import { formatTimeTwo, parseTime } from '@/utils/index'
+  export default {
+    components: { eForm },
+    mixins: [initData],
+    data() {
+      return {
+        delLoading: false,
+        queryTypeOptions: [
+          { key: 'cid', display_name: '拼团id' }
+        ]
+      }
+    },
+    created() {
+      this.$nextTick(() => {
+        this.init()
+      })
+    },
+    methods: {
+      parseTime,
+      formatTimeTwo,
+      checkPermission,
+      beforeInit() {
+        this.url = 'api/yxStorePink'
+        const sort = 'id,desc'
+        this.params = { page: this.page, size: this.size, sort: sort }
+        const query = this.query
+        const type = query.type
+        const value = query.value
+        if (type && value) { this.params[type] = value }
+        return true
+      },
+      subDelete(id) {
+        this.delLoading = true
+        del(id).then(res => {
+          this.delLoading = false
+          this.$refs[id].doClose()
+          this.dleChangePage()
+          this.init()
+          this.$notify({
+            title: '删除成功',
+            type: 'success',
+            duration: 2500
+          })
+        }).catch(err => {
+          this.delLoading = false
+          this.$refs[id].doClose()
+          console.log(err.response.data.message)
+        })
+      },
+      add() {
+        this.isAdd = true
+        this.$refs.form.dialog = true
+      },
+      edit(data) {
+        this.isAdd = false
+        const _this = this.$refs.form
+        _this.form = {
+          id: data.id,
+          uid: data.uid,
+          orderId: data.orderId,
+          orderIdKey: data.orderIdKey,
+          totalNum: data.totalNum,
+          totalPrice: data.totalPrice,
+          cid: data.cid,
+          pid: data.pid,
+          people: data.people,
+          price: data.price,
+          addTime: data.addTime,
+          stopTime: data.stopTime,
+          kId: data.kId,
+          isTpl: data.isTpl,
+          isRefund: data.isRefund,
+          status: data.status
+        }
+        _this.dialog = true
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .app-container{
+  padding-bottom: 0px;
+}
+.el-table::before{
+  height: 0px;
+}
+</style>
diff --git a/src/views/activity/coupon/form.vue b/src/views/activity/coupon/form.vue
new file mode 100644
index 0000000..f421020
--- /dev/null
+++ b/src/views/activity/coupon/form.vue
@@ -0,0 +1,180 @@
+<template>
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增' : '编辑'" width="800px">
+    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="140px">
+      <el-form-item label="优惠券类型">
+        <el-radio-group v-model="form.type" @change="couponsType">
+          <el-radio :label=0>通用券</el-radio>
+          <el-radio :label=1>商品券</el-radio>
+          <el-radio :label=2>商铺券</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="选择商品" v-if="form.type == 1">
+        <cgood v-model="form.product" @selectGoods="getGoods"></cgood>
+      </el-form-item>
+      <el-form-item label="商铺选择" v-if="form.type == 2">
+            <el-select v-model="form.categoryShopId" style="width: 300px;" >
+                <el-option
+                  v-for="item in category"
+                  :value="item.id"
+                  :key="item.id"
+                  :label="item.shopName"
+                >
+                </el-option>
+                <!-- <el-option label="-------空-------" value="0"></el-option> -->
+              </el-select>
+      </el-form-item>
+      <el-form-item label="优惠券名称">
+        <el-input v-model="form.title" style="width: 300px;" />
+      </el-form-item>
+      <el-form-item label="优惠券面值">
+        <el-input v-model="form.couponPrice" style="width: 300px;" onkeyup="value=value.replace(/[^\d]/g,'')" />
+      </el-form-item>
+      <el-form-item label="优惠券最低消费">
+        <el-input v-model="form.useMinPrice" style="width: 300px;" onkeyup="value=value.replace(/[^\d]/g,'')" />
+      </el-form-item>
+      <el-form-item label="优惠券有效期限(天)">
+        <el-input v-model="form.couponTime" style="width: 300px;" onkeyup="value=value.replace(/[^\d]/g,'')" />
+      </el-form-item>
+      <el-form-item label="排序">
+        <el-input-number v-model="form.sort" style="width: 300px;" />
+      </el-form-item>
+      <el-form-item label="状态">
+        <el-radio v-model="form.status" :label="1">开启</el-radio>
+        <el-radio v-model="form.status" :label="0">关闭</el-radio>
+      </el-form-item>
+       <el-form-item label="新人卷">
+        <el-radio v-model="form.rookieRoll" :label="1">开启</el-radio>
+        <el-radio v-model="form.rookieRoll" :label="0">关闭</el-radio>
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="text" @click="cancel">取消</el-button>
+      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { add, edit } from '@/api/yxStoreCoupon'
+import { gets } from "@/api/yxStoreProduct";
+import cgood from '@/views/components/goods'
+export default {
+  components: { cgood },
+  props: {
+    isAdd: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data() {
+    return {
+      category:[],
+      loading: false, dialog: false,
+      form: {
+        id: '',
+        title: '',
+        integral: 0,
+        couponPrice: 0,
+        useMinPrice: 0,
+        couponTime: 1,
+        sort: 0,
+        status: 1,
+        rookieRoll:0,
+        type: 0,
+        productId: '',
+        product: [],
+        categoryShopId:''
+      },
+      rules: {
+      }
+    }
+  },
+  created(){
+    this.yxStoreCategoryShop()
+  },
+  methods: {
+    yxStoreCategoryShop(){
+      let plams = {
+        page:0,
+        size:10,
+        sort:'id,desc'
+      }
+      gets(plams).then(res=>{
+        this.category = res.content
+        console.log(this.category,'商户数据')
+      })
+    },
+    getGoods(p) {
+      var ids = []
+      p.forEach((item,index) => {
+        ids.push(item.id)
+      })
+      this.form.productId = ids.join(",")
+    },
+    couponsType() {
+      //alert(this.form.type)
+    },
+    cancel() {
+      this.resetForm()
+    },
+    doSubmit() {
+      this.loading = true
+      if (this.isAdd) {
+        this.doAdd()
+      } else this.doEdit()
+    },
+    doAdd() {
+      add(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '添加成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    doEdit() {
+      edit(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '修改成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    resetForm() {
+      this.dialog = false
+      this.$refs['form'].resetFields()
+      this.form = {
+        id: '',
+        title: '',
+        integral: 0,
+        couponPrice: 0,
+        useMinPrice: 0,
+        couponTime: 1,
+        sort: 0,
+        status: 1,
+        rookieRoll:0,
+        type: 0,
+        productId: '',
+        product: []
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/activity/coupon/formte.vue b/src/views/activity/coupon/formte.vue
new file mode 100644
index 0000000..a37e79e
--- /dev/null
+++ b/src/views/activity/coupon/formte.vue
@@ -0,0 +1,105 @@
+<template>
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" title="添加轮播图" width="800px">
+    <el-form ref="form" :model="form"  size="small" label-width="160px">
+      <el-form-item label="产品轮播图(266x355)" >
+          
+        <!-- <MaterialList
+          v-model="form.slideshow"
+          style="width: 500px"
+          type="image"
+          :num="4"
+          :width="150"
+          :height="150"
+        /> -->
+        <single-pic
+                v-model="form.slideshow"
+                type="image"
+                :num="1"
+                :width="150"
+                :height="150"
+              />
+        
+      </el-form-item>
+      
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="text" @click="cancel">取消</el-button>
+      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { add, edit, showList,show } from '@/api/yxStoreCoupon'
+import cgood from '@/views/components/goods'
+import MaterialList from "@/components/material";
+import singlePic from "@/components/singlematerial";
+export default {
+    inject: ["reload"],
+  components: { cgood ,MaterialList,singlePic },
+  props: {
+    isAdd: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data() {
+    return {
+      loading: false, dialog: false,
+      form: {
+      slideshow:''
+      },
+      
+    }
+  },
+  created(){
+      this.showList()
+  },
+  methods: {
+    
+    cancel(){
+        this.dialog = false
+    },
+    showList(){
+        showList().then(res=>{
+            console.log(res,'图片查询')
+            this.form.slideshow = res
+        })
+    },
+    doSubmit() {
+        console.log(this.form)
+      this.loading = true
+      this.doAdd()
+    //   console.log(this.form.slideshow)
+    //   show(this.form).then(res=>{
+    //       console.log(res)
+    //       this.dialog = false
+    //   })
+  
+    },
+    doAdd() {
+      show(this.form).then(res => {
+        // this.resetForm()
+        this.$notify({
+          title: '添加成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.dialog = false
+        this.reload()
+        // this.$parent.init()
+      }).catch(err => {
+        this.dialog = false
+        console.log(err.response.data.message)
+      })
+    },
+    
+    
+ 
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/activity/coupon/index.vue b/src/views/activity/coupon/index.vue
new file mode 100644
index 0000000..ae47d8d
--- /dev/null
+++ b/src/views/activity/coupon/index.vue
@@ -0,0 +1,220 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <!-- 新增 -->
+      <div style="display: inline-block;margin: 0px 2px;">
+        <el-button
+          v-permission="['admin','YXSTORECOUPON_ALL','YXSTORECOUPON_CREATE']"
+          class="filter-item"
+          size="mini"
+          type="primary"
+          icon="el-icon-plus"
+          @click="add"
+        >新增</el-button>
+        <el-button
+          v-permission="['admin','YXSTORECOUPON_ALL','YXSTORECOUPON_CREATE']"
+          class="filter-item"
+          size="mini"
+          type="primary"
+          icon="el-icon-plus"
+          @click="addr"
+        >添加轮播图</el-button>
+      </div>
+    </div>
+    <!--表单组件-->
+    <eForm ref="form" :is-add="isAdd" />
+    <eIForm ref="form2" :is-add="isAdd" />
+    <sForm ref="form3" :is-add='isAdd'></sForm>
+    <!--表格渲染-->
+    <el-table v-loading="loading" :data="data" size="small" style="width: 100%;height:calc(100vh - 245px);overflow-y: scroll;">
+      <!--<el-table-column prop="id" label="ID"/>-->
+      <el-table-column prop="title" label="优惠券名称" align="center" width="250" />
+      <el-table-column prop="type" label="优惠券类型 " align="center">
+        <template slot-scope="scope">
+          <div>
+            <el-tag v-if="scope.row.type === 1" style="cursor: pointer" :type="''">商品券</el-tag>
+            <el-tag v-if="scope.row.type === 2" style="cursor: pointer" :type="''">商铺卷</el-tag>
+            <el-tag v-if="scope.row.type === 0" :type=" 'info' ">普通券</el-tag>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="couponPrice" label="优惠券面值" align="center" />
+      <el-table-column prop="useMinPrice" label="优惠券最低消费" align="center"/>
+      <el-table-column label="优惠券有效期限" align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.row.couponTime }}天</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="sort" label="排序" width="100" align="center" />
+      <el-table-column label="状态" width="100" align="center">
+        <template slot-scope="scope">
+          <div>
+            <el-tag v-if="scope.row.status === 1" style="cursor: pointer" :type="''">开启</el-tag>
+            <el-tag v-else :type=" 'info' ">关闭</el-tag>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="createTime" label="创建时间" width="140">
+        <template slot-scope="scope">
+          <span>{{ scope.row.createTime }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column v-if="checkPermission(['admin','YXSTORECOUPON_ALL','YXSTORECOUPON_EDIT','YXSTORECOUPON_DELETE'])" width="200" label="操作" align="center">
+        <template slot-scope="scope">
+          <el-button
+            v-permission="['admin','YXSTORECOUPON_ALL','YXSTORECOUPON_EDIT']"
+            size="mini"
+            type="primary"
+            @click="edit2(scope.row)"
+          >
+            发布
+          </el-button>
+          <el-dropdown size="mini" split-button type="primary" trigger="click">
+            操作
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item>
+                <el-button
+                  v-permission="['admin','YXSTORECOUPON_ALL','YXSTORECOUPON_EDIT']"
+                  size="mini"
+                  type="primary"
+                  icon="el-icon-edit"
+                  @click="edit(scope.row)"
+                >编辑</el-button>
+              </el-dropdown-item>
+              <el-dropdown-item>
+                <el-popover
+                  :ref="scope.row.id"
+                  v-permission="['admin','YXSTORECOUPON_ALL','YXSTORECOUPON_DELETE']"
+                  placement="top"
+                  width="180"
+                >
+                  <p>确定删除本条数据吗？</p>
+                  <div style="text-align: right; margin: 0">
+                    <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
+                    <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
+                  </div>
+                  <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini">删除</el-button>
+                </el-popover>
+              </el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--分页组件-->
+   <el-footer style="height:60px;width:100%;background-color:#f6f6f6">
+     <div style="float:left"></div>
+      <el-pagination
+      :total="total"
+      :current-page="page + 1"
+      style="margin-top: 15px; float:right"
+      layout="total, prev, pager, next, sizes"
+      @size-change="sizeChange"
+      @current-change="pageChange"
+    />
+   </el-footer>
+  </div>
+</template>
+
+<script>
+import checkPermission from '@/utils/permission'
+import initData from '@/mixins/crud'
+import { del } from '@/api/yxStoreCoupon'
+import eForm from './form'
+import sForm from './formte'
+import eIForm from '../couponissue/form'
+import { formatTime } from '@/utils/index'
+export default {
+  components: { eForm, eIForm ,sForm},
+  mixins: [initData],
+  data() {
+    return {
+      delLoading: false
+    }
+  },
+  created() {
+    this.$nextTick(() => {
+      this.init()
+    })
+  },
+  methods: {
+    formatTime,
+    checkPermission,
+    beforeInit() {
+      this.url = 'api/yxStoreCoupon'
+      const sort = 'id,desc'
+      this.params = { page: this.page, size: this.size, sort: sort, isDel: 0 }
+      return true
+    },
+    subDelete(id) {
+      this.delLoading = true
+      del(id).then(res => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        this.dleChangePage()
+        this.init()
+        this.$notify({
+          title: '删除成功',
+          type: 'success',
+          duration: 2500
+        })
+      }).catch(err => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        console.log(err.response.data.message)
+      })
+    },
+    add() {
+      this.isAdd = true
+      this.$refs.form.dialog = true
+    },
+    addr(){
+      this.isAdd = true
+      this.$refs.form3.dialog = true
+    },
+    edit(data) {
+      console.log(data,'商铺卷')
+      this.isAdd = false
+      const _this = this.$refs.form
+      _this.form = {
+        id: data.id,
+        title: data.title,
+        integral: data.integral,
+        couponPrice: data.couponPrice,
+        useMinPrice: data.useMinPrice,
+        couponTime: data.couponTime,
+        sort: data.sort,
+        status: data.status,
+        type: data.type,
+        productId: data.productId,
+        product: data.product,
+        categoryShopId:data.categoryShopId,
+        rookieRoll:data.rookieRoll
+      }
+      _this.dialog = true
+    },
+    edit2(data) {
+      this.isAdd = true
+      const _this = this.$refs.form2
+      _this.form = {
+        cid: data.id,
+        cname: data.title,
+        ctype: data.type,
+        isPermanent: 0,
+        status: 1,
+        totalCount: 0,
+        remainCount: 0,
+        isDel: 0
+      }
+      _this.dialog = true
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .app-container{
+  padding-bottom: 0px;
+}
+</style>
diff --git a/src/views/activity/couponissue/form.vue b/src/views/activity/couponissue/form.vue
new file mode 100644
index 0000000..bed1c0a
--- /dev/null
+++ b/src/views/activity/couponissue/form.vue
@@ -0,0 +1,140 @@
+<template>
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增' : '发布优惠券'" width="500px">
+    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="100px">
+      <el-form-item label="优惠券ID">
+        <el-input v-model="form.cid" style="width: 300px;" :disabled="true" />
+        <el-input v-model="form.ctype" type="hidden" />
+      </el-form-item>
+      <el-form-item label="优惠券名称">
+        <el-input v-model="form.cname" style="width: 300px;" :disabled="true" />
+      </el-form-item>
+      <el-form-item label="领取开启时间">
+        <template>
+          <el-date-picker
+            v-model="form.startTime"
+            type="datetime"
+            placeholder="选择日期时间"
+          />
+        </template>
+      </el-form-item>
+      <el-form-item label="券领结束时间">
+        <template>
+          <el-date-picker
+            v-model="form.endTime"
+            type="datetime"
+            placeholder="选择日期时间"
+          />
+        </template>
+      </el-form-item>
+      <el-form-item label="发布数量">
+        <el-input v-model="form.totalCount" style="width: 300px;" />
+      </el-form-item>
+      <el-form-item label="是否不限量">
+        <el-radio v-model="form.isPermanent" :label="1">不限量</el-radio>
+        <el-radio v-model="form.isPermanent" :label="0">限量</el-radio>
+      </el-form-item>
+      <el-form-item label="状态">
+        <el-radio v-model="form.status" :label="1">开启</el-radio>
+        <el-radio v-model="form.status" :label="0">关闭</el-radio>
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="text" @click="cancel">取消</el-button>
+      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { add, edit } from '@/api/yxStoreCouponIssue'
+export default {
+  props: {
+    isAdd: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data() {
+    return {
+      loading: false, dialog: false,
+      form: {
+        id: '',
+        cid: '',
+        cname: '',
+        ctype: 0,
+        startTimeDate: '',
+        endTimeDate: '',
+        totalCount: 0,
+        remainCount: 0,
+        isPermanent: 0,
+        status: 1,
+        isDel: 0,
+        addTime: ''
+      },
+      rules: {
+      }
+    }
+  },
+  methods: {
+    cancel() {
+      this.resetForm()
+    },
+    doSubmit() {
+      this.loading = true
+      if (this.isAdd) {
+        this.doAdd()
+      } else this.doEdit()
+    },
+    doAdd() {
+      add(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '添加成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    doEdit() {
+      edit(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '修改成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    resetForm() {
+      this.dialog = false
+      this.$refs['form'].resetFields()
+      this.form = {
+        id: '',
+        cid: '',
+        startTime: '',
+        endTime: '',
+        totalCount: '',
+        remainCount: '',
+        isPermanent: '',
+        status: '',
+        isDel: '',
+        addTime: ''
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/activity/couponissue/formt.vue b/src/views/activity/couponissue/formt.vue
new file mode 100644
index 0000000..a707f6e
--- /dev/null
+++ b/src/views/activity/couponissue/formt.vue
@@ -0,0 +1,108 @@
+<template>
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增' : '修改状态'" width="500px">
+    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="100px">
+      <el-form-item label="状态">
+        <el-radio v-model="form.status" :label="1">开启</el-radio>
+        <el-radio v-model="form.status" :label="0">关闭</el-radio>
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="text" @click="cancel">取消</el-button>
+      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { add, edit } from '@/api/yxStoreCouponIssue'
+export default {
+  props: {
+    isAdd: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data() {
+    return {
+      loading: false, dialog: false,
+      form: {
+        id: '',
+        cid: '',
+        cname: '',
+        startTimeDate: '',
+        endTimeDate: '',
+        totalCount: 0,
+        remainCount: 0,
+        isPermanent: 0,
+        status: 1,
+        isDel: 0,
+        addTime: ''
+      },
+      rules: {
+      }
+    }
+  },
+  methods: {
+    cancel() {
+      this.resetForm()
+    },
+    doSubmit() {
+      this.loading = true
+      if (this.isAdd) {
+        this.doAdd()
+      } else this.doEdit()
+    },
+    doAdd() {
+      // console.log(this.form)
+      add(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '添加成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    doEdit() {
+      edit(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '修改成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    resetForm() {
+      this.dialog = false
+      this.$refs['form'].resetFields()
+      this.form = {
+        id: '',
+        cid: '',
+        startTime: '',
+        endTime: '',
+        totalCount: '',
+        remainCount: '',
+        isPermanent: '',
+        status: '',
+        isDel: '',
+        addTime: ''
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/activity/couponissue/index.vue b/src/views/activity/couponissue/index.vue
new file mode 100644
index 0000000..3172885
--- /dev/null
+++ b/src/views/activity/couponissue/index.vue
@@ -0,0 +1,162 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <!-- 新增 -->
+      <el-button
+        type="danger"
+        class="filter-item"
+        size="mini"
+        icon="el-icon-refresh"
+        @click="toQuery"
+      >刷新</el-button>
+    </div>
+    <!--表单组件-->
+    <eForm ref="form" :is-add="isAdd" />
+    <!--表格渲染-->
+    <el-table v-loading="loading" :data="data" size="small" style="width: 100%;height:calc(100vh - 245px);overflow-y: scroll;">
+      <el-table-column prop="id" label="id"  align="center"/>
+      <el-table-column prop="ctype" label="优惠券类型" align="center">
+        <template slot-scope="scope">
+          <div>
+            <el-tag v-if="scope.row.ctype === 1" style="cursor: pointer" :type="''">商品券</el-tag>
+            <el-tag v-else :type=" 'info' ">普通券</el-tag>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="cname" label="优惠券名称"  align="center"/>
+      <el-table-column label="领取日期" prop="startTime" width="300" align="center">
+        <template slot-scope="scope">
+          <span>{{ formatTimeTwo(scope.row.startTime) }}</span> - -
+           <span>{{ formatTimeTwo(scope.row.endTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="发布数量" prop="totalCount" align="center">
+        <template slot-scope="scope">
+          <p>发布:{{ scope.row.totalCount }}</p>
+          <p>剩余:{{ scope.row.remainCount }}</p>
+        </template>
+      </el-table-column>
+      <el-table-column label="状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <div>
+            <el-tag v-if="scope.row.status === 1" style="cursor: pointer" :type="''">开启</el-tag>
+            <el-tag v-else :type=" 'info' ">关闭</el-tag>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="兑换码" align="center" prop="cdKey">
+        
+      </el-table-column>
+      <el-table-column v-if="checkPermission(['admin','YXSTORECOUPONISSUE_ALL','YXSTORECOUPONISSUE_EDIT','YXSTORECOUPONISSUE_DELETE'])" label="操作" width="150px" align="center">
+        <template slot-scope="scope">
+          <el-button v-permission="['admin','YXSTORECOUPONISSUE_ALL','YXSTORECOUPONISSUE_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)" />
+          <el-popover
+            :ref="scope.row.id"
+            v-permission="['admin','YXSTORECOUPONISSUE_ALL','YXSTORECOUPONISSUE_DELETE']"
+            placement="top"
+            width="180"
+          >
+            <p>确定删除本条数据吗？</p>
+            <div style="text-align: right; margin: 0">
+              <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
+              <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
+            </div>
+            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
+          </el-popover>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--分页组件-->
+    <el-footer style="height:60px;width:100%;background-color:#f6f6f6">
+      <div style="float:left"></div>
+      <el-pagination
+      :total="total"
+      :current-page="page + 1"
+      style="margin-top: 15px; float:right"
+      layout="total, prev, pager, next, sizes"
+      @size-change="sizeChange"
+      @current-change="pageChange"
+    />
+    </el-footer>
+  </div>
+</template>
+
+<script>
+import checkPermission from '@/utils/permission'
+import initData from '@/mixins/crud'
+import { del } from '@/api/yxStoreCouponIssue'
+import eForm from './formt'
+import { formatTimeTwo } from '@/utils/index'
+export default {
+  components: { eForm },
+  mixins: [initData],
+  data() {
+    return {
+      delLoading: false
+    }
+  },
+  created() {
+    this.$nextTick(() => {
+      this.init()
+    })
+  },
+  methods: {
+    formatTimeTwo,
+    checkPermission,
+    beforeInit() {
+      this.url = 'api/yxStoreCouponIssue'
+      const sort = 'id,desc'
+      this.params = { page: this.page, size: this.size, sort: sort }
+      return true
+    },
+    subDelete(id) {
+      this.delLoading = true
+      del(id).then(res => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        this.dleChangePage()
+        this.init()
+        this.$notify({
+          title: '删除成功',
+          type: 'success',
+          duration: 2500
+        })
+      }).catch(err => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        console.log(err.response.data.message)
+      })
+    },
+    add() {
+      this.isAdd = true
+      this.$refs.form.dialog = true
+    },
+    edit(data) {
+      this.isAdd = false
+      const _this = this.$refs.form
+      _this.form = {
+        id: data.id,
+        cid: data.cid,
+        startTime: data.startTime,
+        endTime: data.endTime,
+        startTimeDate: data.startTimeDate,
+        endTimeDate: data.endTimeDate,
+        totalCount: data.totalCount,
+        remainCount: data.remainCount,
+        isPermanent: data.isPermanent,
+        status: data.status,
+        isDel: data.isDel,
+        addTime: data.addTime
+      }
+      _this.dialog = true
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .app-container{
+  padding-bottom: 0px;
+}
+</style>
diff --git a/src/views/activity/couponuser/form.vue b/src/views/activity/couponuser/form.vue
new file mode 100644
index 0000000..2b60977
--- /dev/null
+++ b/src/views/activity/couponuser/form.vue
@@ -0,0 +1,99 @@
+<template>
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增' : '编辑'" width="500px">
+    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
+      <el-form-item label="领取优惠券用户ID">
+        <el-input v-model="form.uid" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="优惠券前台领取ID">
+        <el-input v-model="form.issueCouponId" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="领取时间">
+        <el-input v-model="form.addTime" style="width: 370px;" />
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="text" @click="cancel">取消</el-button>
+      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { add, edit } from '@/api/yxStoreCouponIssueUser'
+export default {
+  props: {
+    isAdd: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data() {
+    return {
+      loading: false, dialog: false,
+      form: {
+        id: '',
+        uid: '',
+        issueCouponId: '',
+        addTime: ''
+      },
+      rules: {
+      }
+    }
+  },
+  methods: {
+    cancel() {
+      this.resetForm()
+    },
+    doSubmit() {
+      this.loading = true
+      if (this.isAdd) {
+        this.doAdd()
+      } else this.doEdit()
+    },
+    doAdd() {
+      add(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '添加成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    doEdit() {
+      edit(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '修改成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    resetForm() {
+      this.dialog = false
+      this.$refs['form'].resetFields()
+      this.form = {
+        id: '',
+        uid: '',
+        issueCouponId: '',
+        addTime: ''
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/activity/couponuser/index.vue b/src/views/activity/couponuser/index.vue
new file mode 100644
index 0000000..daa7cbb
--- /dev/null
+++ b/src/views/activity/couponuser/index.vue
@@ -0,0 +1,121 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <!-- 新增 -->
+      <div style="display: inline-block;margin: 0px 2px;">
+        <el-button
+          v-permission="['admin','YXSTORECOUPONISSUEUSER_ALL','YXSTORECOUPONISSUEUSER_CREATE']"
+          class="filter-item"
+          size="mini"
+          type="primary"
+          icon="el-icon-plus"
+          @click="add"
+        >新增</el-button>
+      </div>
+    </div>
+    <!--表单组件-->
+    <eForm ref="form" :is-add="isAdd" />
+    <!--表格渲染-->
+    <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
+      <el-table-column prop="id" label="id"  align="center" />
+      <el-table-column prop="uid" label="领取优惠券用户ID" align="center" />
+      <el-table-column prop="issueCouponId" label="优惠券前台领取ID" align="center" />
+      <el-table-column prop="addTime" label="领取时间" align="center" />
+      <el-table-column v-if="checkPermission(['admin','YXSTORECOUPONISSUEUSER_ALL','YXSTORECOUPONISSUEUSER_EDIT','YXSTORECOUPONISSUEUSER_DELETE'])" label="操作" width="150px" align="center">
+        <template slot-scope="scope">
+          <el-button v-permission="['admin','YXSTORECOUPONISSUEUSER_ALL','YXSTORECOUPONISSUEUSER_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)" />
+          <el-popover
+            :ref="scope.row.id"
+            v-permission="['admin','YXSTORECOUPONISSUEUSER_ALL','YXSTORECOUPONISSUEUSER_DELETE']"
+            placement="top"
+            width="180"
+          >
+            <p>确定删除本条数据吗？</p>
+            <div style="text-align: right; margin: 0">
+              <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
+              <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
+            </div>
+            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
+          </el-popover>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--分页组件-->
+    <el-pagination
+      :total="total"
+      :current-page="page + 1"
+      style="margin-top: 8px;"
+      layout="total, prev, pager, next, sizes"
+      @size-change="sizeChange"
+      @current-change="pageChange"
+    />
+  </div>
+</template>
+
+<script>
+import checkPermission from '@/utils/permission'
+import initData from '@/mixins/crud'
+import { del } from '@/api/yxStoreCouponIssueUser'
+import eForm from './form'
+export default {
+  components: { eForm },
+  mixins: [initData],
+  data() {
+    return {
+      delLoading: false
+    }
+  },
+  created() {
+    this.$nextTick(() => {
+      this.init()
+    })
+  },
+  methods: {
+    checkPermission,
+    beforeInit() {
+      this.url = 'api/yxStoreCouponIssueUser'
+      const sort = 'id,desc'
+      this.params = { page: this.page, size: this.size, sort: sort }
+      return true
+    },
+    subDelete(id) {
+      this.delLoading = true
+      del(id).then(res => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        this.dleChangePage()
+        this.init()
+        this.$notify({
+          title: '删除成功',
+          type: 'success',
+          duration: 2500
+        })
+      }).catch(err => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        console.log(err.response.data.message)
+      })
+    },
+    add() {
+      this.isAdd = true
+      this.$refs.form.dialog = true
+    },
+    edit(data) {
+      this.isAdd = false
+      const _this = this.$refs.form
+      _this.form = {
+        id: data.id,
+        uid: data.uid,
+        issueCouponId: data.issueCouponId,
+        addTime: data.addTime
+      }
+      _this.dialog = true
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/activity/extract/form.vue b/src/views/activity/extract/form.vue
new file mode 100644
index 0000000..6955b9b
--- /dev/null
+++ b/src/views/activity/extract/form.vue
@@ -0,0 +1,125 @@
+<template>
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增' : '编辑'" width="500px">
+    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
+      <el-form-item label="姓名">
+        <el-input v-model="form.realName" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="提现金额">
+        <el-input-number v-model="form.extractPrice" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="审核状态">
+        <el-radio v-model="form.status" :label="-1">无效</el-radio>
+        <el-radio v-model="form.status" :label="1">通过</el-radio>
+      </el-form-item>
+      <el-form-item label="无效原因">
+        <el-input v-model="form.failMsg" style="width: 300px;" rows="5" type="textarea" />
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="text" @click="cancel">取消</el-button>
+      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { add, edit } from '@/api/yxUserExtract'
+export default {
+  props: {
+    isAdd: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data() {
+    return {
+      loading: false, dialog: false,
+      form: {
+        id: '',
+        uid: '',
+        realName: '',
+        extractType: '',
+        bankCode: '',
+        bankAddress: '',
+        alipayCode: '',
+        extractPrice: '',
+        mark: '',
+        balance: '',
+        failMsg: '',
+        failTime: '',
+        addTime: '',
+        status: '',
+        wechat: ''
+      },
+      rules: {
+      }
+    }
+  },
+  methods: {
+    cancel() {
+      this.resetForm()
+    },
+    doSubmit() {
+      this.loading = true
+      if (this.isAdd) {
+        this.doAdd()
+      } else this.doEdit()
+    },
+    doAdd() {
+      add(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '添加成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    doEdit() {
+      edit(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '修改成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    resetForm() {
+      this.dialog = false
+      this.$refs['form'].resetFields()
+      this.form = {
+        id: '',
+        uid: '',
+        realName: '',
+        extractType: '',
+        bankCode: '',
+        bankAddress: '',
+        alipayCode: '',
+        extractPrice: '',
+        mark: '',
+        balance: '',
+        failMsg: '',
+        failTime: '',
+        addTime: '',
+        status: '',
+        wechat: ''
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/activity/extract/index.vue b/src/views/activity/extract/index.vue
new file mode 100644
index 0000000..a6723ab
--- /dev/null
+++ b/src/views/activity/extract/index.vue
@@ -0,0 +1,189 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <!-- 搜索 -->
+      <el-input v-model="query.value" clearable placeholder="输入搜索内容" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
+      <el-select v-model="query.type" clearable placeholder="类型" class="filter-item" style="width: 130px">
+        <el-option v-for="item in queryTypeOptions" :key="item.key" :label="item.display_name" :value="item.key" />
+      </el-select>
+      <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
+      <!-- 新增 -->
+      <el-button
+        type="danger"
+        class="filter-item"
+        size="mini"
+        icon="el-icon-refresh"
+        @click="toQuery"
+      >刷新</el-button>
+    </div>
+    <!--表单组件-->
+    <eForm ref="form" :is-add="isAdd" />
+    <!--表格渲染-->
+    <el-table v-loading="loading" :data="data" size="small" style="width: 100%;height:calc(100vh - 245px);overflow-y: scroll;">
+      <el-table-column prop="id" label="id" align="center" />
+      <el-table-column prop="extractPrice" label="提现金额"  align="center"/>
+      <el-table-column prop="wechat" label="用户名称" align="center" />
+      <el-table-column prop="extractType" label="提现信息" align="center">
+        <template slot-scope="scope">
+          <!-- <div v-if="scope.row.extractType='weixin'">
+            姓名:{{ scope.row.realName }}<br>
+            微信号:{{ scope.row.wechat }}
+          </div>
+          <div v-else>
+            姓名:{{ scope.row.realName }}<br>
+            支付宝号:{{ scope.row.alipayCode }}
+          </div> -->
+          <div>
+            支付宝用户名:{{ scope.row.realName }}<br>
+            支付宝账号:{{ scope.row.alipayCode }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="addTime" label="申请时间" align="center">
+        <template slot-scope="scope">
+          <span>{{ formatTimeTwo(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="status" label="审核状态" align="center">
+        <template slot-scope="scope">
+          <div v-if="scope.row.status==1">
+            提现通过
+          </div>
+          <div v-else-if="scope.row.status==-1">
+            提现未通过<br>
+            未通过原因：{{ scope.row.failMsg }}
+            <br>
+            未通过时间：{{ formatTimeTwo(scope.row.failTime) }}
+          </div>
+          <div v-else>
+            未提现
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column v-if="checkPermission(['admin','YXUSEREXTRACT_ALL','YXUSEREXTRACT_EDIT','YXUSEREXTRACT_DELETE'])" label="操作" width="150px" align="center">
+        <template slot-scope="scope">
+          <el-button
+            v-permission="['admin','YXUSEREXTRACT_ALL','YXUSEREXTRACT_EDIT']"
+            size="mini"
+            type="primary"
+            @click="edit(scope.row)"
+          >操作</el-button>
+          <!--<el-popover-->
+          <!--v-permission="['admin','YXUSEREXTRACT_ALL','YXUSEREXTRACT_DELETE']"-->
+          <!--:ref="scope.row.id"-->
+          <!--placement="top"-->
+          <!--width="180">-->
+          <!--<p>确定删除本条数据吗？</p>-->
+          <!--<div style="text-align: right; margin: 0">-->
+          <!--<el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>-->
+          <!--<el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>-->
+          <!--</div>-->
+          <!--<el-button slot="reference" type="danger" icon="el-icon-delete" size="mini"/>-->
+          <!--</el-popover>-->
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--分页组件-->
+   <el-footer style="height:60px;width:100%;background-color:#f6f6f6">
+     <div style="float:left"></div>
+      <el-pagination
+      :total="total"
+      :current-page="page + 1"
+      style="margin-top: 15px;float:right"
+      layout="total, prev, pager, next, sizes"
+      @size-change="sizeChange"
+      @current-change="pageChange"
+    />
+   </el-footer>
+  </div>
+</template>
+
+<script>
+import checkPermission from '@/utils/permission'
+import initData from '@/mixins/crud'
+import { del } from '@/api/yxUserExtract'
+import eForm from './form'
+import { formatTimeTwo } from '@/utils/index'
+export default {
+  components: { eForm },
+  mixins: [initData],
+  data() {
+    return {
+      delLoading: false,
+      queryTypeOptions: [
+        { key: 'realName', display_name: '用户姓名' }
+      ]
+    }
+  },
+  created() {
+    this.$nextTick(() => {
+      this.init()
+    })
+  },
+  methods: {
+    formatTimeTwo,
+    checkPermission,
+    beforeInit() {
+      this.url = 'api/yxUserExtract'
+      const sort = 'id,desc'
+      this.params = { page: this.page, size: this.size, sort: sort }
+      const query = this.query
+      const type = query.type
+      const value = query.value
+      if (type && value) { this.params[type] = value }
+      return true
+    },
+    subDelete(id) {
+      this.delLoading = true
+      del(id).then(res => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        this.dleChangePage()
+        this.init()
+        this.$notify({
+          title: '删除成功',
+          type: 'success',
+          duration: 2500
+        })
+      }).catch(err => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        console.log(err.response.data.message)
+      })
+    },
+    add() {
+      this.isAdd = true
+      this.$refs.form.dialog = true
+    },
+    edit(data) {
+      this.isAdd = false
+      const _this = this.$refs.form
+      _this.form = {
+        id: data.id,
+        uid: data.uid,
+        realName: data.realName,
+        extractType: data.extractType,
+        bankCode: data.bankCode,
+        bankAddress: data.bankAddress,
+        alipayCode: data.alipayCode,
+        extractPrice: data.extractPrice,
+        mark: data.mark,
+        balance: data.balance,
+        failMsg: data.failMsg,
+        failTime: data.failTime,
+        addTime: data.addTime,
+        status: data.status,
+        wechat: data.wechat
+      }
+      _this.dialog = true
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .app-container{
+  padding-bottom: 0px;
+}
+</style>
diff --git a/src/views/activity/seckill/HowToPlay.vue b/src/views/activity/seckill/HowToPlay.vue
new file mode 100644
index 0000000..0646330
--- /dev/null
+++ b/src/views/activity/seckill/HowToPlay.vue
@@ -0,0 +1,87 @@
+<template>
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" title=" 秒杀玩法说明" width="900px">
+    <el-form ref="form" :model="form" :rules="rules" :inline="true" size="small" label-width="140px">
+      <el-form-item label="说明">
+        <editor v-model="form.seckillStatement" />
+      </el-form-item>
+      <el-form-item label="玩法">
+        <editor v-model="form.seckillRegulations" />
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="text" @click="cancel">取消</el-button>
+      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { List,Config} from "@/api/yxStoreSeckill";
+import editor from '../../components/Editor'
+import MaterialList from '@/components/material'
+import cgood from '@/views/components/goodss'
+export default {
+  components: { editor,  MaterialList ,cgood },
+  props: {
+    isAdd: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data() {
+    return {
+      loading: false, dialog: false,
+      form: {
+       
+        seckillStatement:'',
+        seckillRegulations:''
+      },
+      rules: {
+      }
+    }
+  },
+  created(){
+      this.List()
+  },
+  methods: {
+      cancel(){
+          this.dialog = false
+      },
+      
+    List(){
+        List().then(res=>{
+            console.log(res,'iopioipo')
+            this.form = res
+        })
+    },
+    doSubmit() {
+    //   this.loading = true
+
+      
+       this.Config()
+    },
+    Config() {  
+         console.log(this.form)
+      Config(this.form).then(res => {
+          console.log(res)
+        this.$notify({
+          title: '添加成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.dialog = false
+       
+      }).catch(err => {
+        this.dialog = false
+        console.log(err.response.data.message)
+      })
+    },
+    
+    
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/activity/seckill/form.vue b/src/views/activity/seckill/form.vue
new file mode 100644
index 0000000..85add74
--- /dev/null
+++ b/src/views/activity/seckill/form.vue
@@ -0,0 +1,280 @@
+<template>
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="handleClose" :visible.sync="dialog" title= '开启秒杀' width="900px" >
+    <el-form ref="form" :model="form" :rules="rules" :inline="true" size="small" label-width="140px">
+      <el-form-item label="秒杀名称">
+        <el-input v-model="form.title" style="width: 500px;" />
+      </el-form-item>
+      <!-- <el-form-item label="秒杀简介">
+        <el-input v-model="form.info" style="width: 500px;" />
+      </el-form-item> -->
+      <el-form-item label="单位">
+        <el-input v-model="form.unitName" style="width: 500px;" />
+      </el-form-item>
+      <el-form-item label="秒杀开始时间">
+        <template>
+          <el-date-picker
+            v-model="form.startTime"
+            type="date"
+            placeholder="选择日期时间"
+          />
+        </template>
+      </el-form-item>
+      <el-form-item label="秒杀结束时间">
+        <template>
+          <el-date-picker
+            v-model="form.stopTime"
+            type="date"
+            placeholder="选择日期时间"
+          />
+        </template>
+      </el-form-item>
+      <el-form-item label="开始时间" prop="storeId">
+        <el-select v-model="form.timeId" style="width: 178px" placeholder="请先选择开始时间">
+          <el-option
+            v-for="(item, index) in myTimes"
+            :key="index"
+            :label="item.map.time + '点开始，持续' + item.map.continued + '小时'"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+      <!-- <el-form-item label="产品主图片">
+        <MaterialList v-model="form.imageArr" style="width: 500px" type="image" :num="1" :width="150" :height="150" />
+      </el-form-item> -->
+      <el-form-item label="产品主图片" style="display: block;">
+          <!-- <el-input v-model="form.imgWrap" autocomplete="off"></el-input> -->
+           <cgood  @selectGoods="getGoods" v-model="form.imageArr" ></cgood>
+        </el-form-item>
+      <el-form-item label="产品轮播图">
+        <MaterialList v-model="form.sliderImageArr" style="width: 500px" type="image" :num="4" :width="150" :height="150" />
+      </el-form-item>
+      <!-- <el-form-item label="秒杀价">
+        <el-input-number v-model="form.price" />
+      </el-form-item> -->
+      <!-- <el-form-item label="成本">
+        <el-input-number v-model="form.cost" />
+      </el-form-item> -->
+      <el-form-item label="虚拟原价">
+        <el-input style="width:100px" onkeyup="value=value.replace(/[^\d]/g,'')" v-model="form.otPrice"    />
+      </el-form-item>
+      <!-- <el-form-item label="库存">
+        <el-input-number v-model="form.stock" />
+      </el-form-item> -->
+      <el-form-item label="虚拟销量">
+        <el-input style="width:100px" v-model="form.sales"  onkeyup="value=value.replace(/[^\d]/g,'')" />
+      </el-form-item>
+      <el-form-item label="排序">
+        <el-input-number v-model="form.sort" />
+      </el-form-item>
+      <!-- <el-form-item label="限单">
+        <el-input-number v-model="form.num" />
+      </el-form-item> -->
+      <!-- <el-form-item label="邮费">
+        <el-input-number v-model="form.postage" />
+      </el-form-item> -->
+      <!-- <el-form-item label="是否包邮">
+        <el-radio v-model="form.isPostage" :label="1">是</el-radio>
+        <el-radio v-model="form.isPostage" :label="0" style="width: 110px;">否</el-radio>
+      </el-form-item> -->
+      <el-form-item label="活动状态">
+        <el-radio v-model="form.status" :label="1">开启</el-radio>
+        <el-radio v-model="form.status" :label="0" style="width: 200px;">关闭</el-radio>
+      </el-form-item>
+      <!-- <el-form-item label="详情">
+        <editor v-model="form.description" />
+      </el-form-item> -->
+      <!-- <el-form-item label="说明">
+        <editor v-model="form.seckillStatement" />
+      </el-form-item>
+      <el-form-item label="玩法">
+        <editor v-model="form.seckillRegulations" />
+      </el-form-item> -->
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="text" @click="cancel">取消</el-button>
+      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { add, edit } from '@/api/yxStoreSeckill'
+import { initData } from '@/api/data'
+import editor from '../../components/Editor'
+import MaterialList from '@/components/material'
+import cgood from '@/views/components/goodss'
+
+export default {
+  components: { editor, MaterialList,cgood },
+  inject: ["reload"],
+  props: {
+    isAdd: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data() {
+    return {
+      loading: false, dialog: false, myTimes: [],
+      form: {
+        id: '',
+        productId: '',
+        image: '',
+        images: '',
+        imageArr: [],
+        sliderImageArr: [],
+        title: '',
+        info: '',
+        price: '',
+        cost: '',
+        otPrice: '',
+        giveIntegral: '',
+        sort: '',
+        stock: '',
+        sales: '',
+        unitName: '',
+        postage: '',
+        description: '<p>123</p>',
+        startTime: '',
+        stopTime: '',
+        addTime: '',
+        status: 1,
+        isPostage: 1,
+        isHot: '',
+        isDel: 0,
+        num: '',
+        isShow: '',
+        startTimeDate: '',
+        endTimeDate: '',
+        timeId: '',
+        // seckillStatement:'',
+        // seckillRegulations:''
+      },
+      rules: {
+      }
+    }
+  },
+  watch: {
+    // 'form.imageArr': function(val) {
+    //   if (val) {
+    //     this.form.image = val.join(',')
+    //   }
+    // },
+    'form.sliderImageArr': function(val) {
+      if (val) {
+        this.form.images = val.join(',')
+      }
+    }
+  },
+  mounted() {
+    
+    initData('api/yxSystemGroupData',{ groupName: 'yshop_seckill_time' }).then(res => {
+      //console.log(res.content)
+      this.myTimes = res.content
+    })
+  },
+  created(){
+    
+  },
+  methods: {
+     handleClose(done) {
+        this.$confirm('确认关闭？')
+          .then(_ => {
+            done();
+            this.reload()
+          })
+          .catch(_ => {});
+      },
+    getGoods(val){
+      this.form.productId = val[0].id
+      this.form.image = val[0].image
+      // this.form.imageArr.push(val[0].image)
+      this.form.imageArr = val
+    },
+    cancel() {
+      this.resetForm()
+    },
+    doSubmit() {
+      console.log(this.form,'9999')
+      // alert('dsadas')
+       this.doEdit()
+    },
+    // doAdd() {
+    //   add(this.form).then(res => {
+    //     this.resetForm()
+    //     this.$notify({
+    //       title: '添加成功',
+    //       type: 'success',
+    //       duration: 2500
+    //     })
+    //     this.loading = false
+    //     this.$parent.init()
+        
+    //   }).catch(err => {
+    //     this.loading = false
+    //     console.log(err.response.data.message)
+    //   })
+    // },
+    doEdit() {
+       console.log(this.form,'修队')
+      console.log('xiugai')
+      edit(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '修改成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+        this.reload()
+        
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    resetForm() {
+      this.dialog = false
+      this.$refs['form'].resetFields()
+      this.form = {
+        id: '',
+        productId: '',
+        image: '',
+        images: '',
+        imageArr: [],
+        sliderImageArr: [],
+        title: '',
+        info: '',
+        price: '',
+        cost: '',
+        otPrice: '',
+        giveIntegral: '',
+        sort: '',
+        stock: '',
+        sales: '',
+        unitName: '',
+        postage: '',
+        description: '<p>123</p>',
+        startTime: '',
+        stopTime: '',
+        addTime: '',
+        status: '',
+        isPostage: '',
+        isHot: '',
+        isDel: '',
+        num: '',
+        isShow: '',
+        timeId:'',
+        // seckillStatement:'',
+        // seckillRegulations:''
+      }
+      // console.log(this.form,'测试测试')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/activity/seckill/index.vue b/src/views/activity/seckill/index.vue
new file mode 100644
index 0000000..4e0ea4a
--- /dev/null
+++ b/src/views/activity/seckill/index.vue
@@ -0,0 +1,219 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <!-- 搜索 -->
+      <el-input v-model="query.value" clearable placeholder="输入搜索内容" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
+      <el-select v-model="query.type" clearable placeholder="类型" class="filter-item" style="width: 130px">
+        <el-option v-for="item in queryTypeOptions" :key="item.key" :label="item.display_name" :value="item.key" />
+      </el-select>
+      <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
+      <!-- 新增 -->
+      <el-button
+        type="danger"
+        class="filter-item"
+        size="mini"
+        icon="el-icon-refresh"
+        @click="toQuery"
+      >刷新</el-button>
+      <el-button
+        type="primary"
+        class="filter-item"
+        size="mini"
+        icon="el-icon-check"
+        @click="add"
+       
+      >
+      新增
+      </el-button>
+      <el-button
+        type="primary"
+        class="filter-item"
+        size="mini"
+        icon="el-icon-info"
+        @click="addew"
+       
+      >
+      玩法说明
+      </el-button>
+    </div>
+    <!--表单组件-->
+    <eForm ref="form" :is-add="isAdd" />
+    <newl ref="form2" :is-add="isAdd" />
+    <how ref="form3" :is-add="isAdd" />
+    <!--表格渲染-->
+    <el-table v-loading="loading" :data="data" size="small" style="width: 100%;height:calc(100vh - 245px);overflow-y: scroll;">
+      <el-table-column prop="id" label="id" align="center" />
+      <el-table-column prop="image" label="产品主图" align="center">
+        <template slot-scope="scope">
+          <a :href="scope.row.image" style="color: #42b983" target="_blank"><img :src="scope.row.image" alt="点击打开" class="el-avatar"></a>
+        </template>
+      </el-table-column>
+      <el-table-column label="产品ID" align="center">
+        <template slot-scope="scope">
+          <span>{{scope.row.imageArr[0].id}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="title" label="产品标题" align="center" />
+      <el-table-column prop="price" label="秒杀价" align="center" />
+      <el-table-column prop="otPrice" label="原价" align="center" />
+      <el-table-column prop="stock" label="库存" align="center" />
+      <el-table-column prop="sales" label="销量" align="center" />
+      <!-- <el-table-column prop="num" label="限单" align="center" /> -->
+      <el-table-column prop="statusStr" label="秒杀状态" align="center" />
+      <el-table-column prop="stopTime" label="开始时间" align="center" width="200">
+        <template slot-scope="scope">
+          <span>{{ formatTimeTwo(scope.row.startTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="stopTime" label="结束时间" align="center" width="200">
+        <template slot-scope="scope">
+          <span>{{ formatTimeTwo(scope.row.stopTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column v-if="checkPermission(['admin','YXSTORESECKILL_ALL','YXSTORESECKILL_EDIT','YXSTORESECKILL_DELETE'])" label="操作" width="150px" align="center">
+        <template slot-scope="scope">
+          <el-button v-permission="['admin','YXSTORESECKILL_ALL','YXSTORESECKILL_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)" />
+          <el-popover
+            :ref="scope.row.id"
+            v-permission="['admin','YXSTORESECKILL_ALL','YXSTORESECKILL_DELETE']"
+            placement="top"
+            width="180"
+          >
+            <p>确定删除本条数据吗？</p>
+            <div style="text-align: right; margin: 0">
+              <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
+              <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
+            </div>
+            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
+          </el-popover>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--分页组件-->
+   <el-footer style="height:60px;width:100%;background-color:#f6f6f6">
+     <div style="float:left"></div>
+     <el-pagination
+      :total="total"
+      :current-page="page + 1"
+      style="margin-top: 15px; float:right"
+      layout="total, prev, pager, next, sizes"
+      @size-change="sizeChange"
+      @current-change="pageChange"
+    />
+   </el-footer>
+  </div>
+</template>
+
+<script>
+import checkPermission from '@/utils/permission'
+import initData from '@/mixins/crud'
+import { del } from '@/api/yxStoreSeckill'
+import eForm from './form'
+import newl from './newlyAdded'
+import { formatTimeTwo, parseTime } from '@/utils/index'
+import how from './HowToPlay'
+export default {
+  components: { eForm ,newl,how },
+  mixins: [initData],
+  data() {
+    return {
+      delLoading: false,
+      queryTypeOptions: [
+        { key: 'title', display_name: '产品标题' }
+      ]
+    }
+  },
+  created() {
+    this.$nextTick(() => {
+      this.init()
+    })
+  },
+  methods: {
+    parseTime,
+    formatTimeTwo,
+    checkPermission,
+    beforeInit() {
+      this.url = 'api/yxStoreSeckill'
+      const sort = 'id,desc'
+      this.params = { page: this.page, size: this.size, sort: sort }
+      const query = this.query
+      const type = query.type
+      const value = query.value
+      if (type && value) { this.params[type] = value }
+      return true
+    },
+    subDelete(id) {
+      this.delLoading = true
+      del(id).then(res => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        this.dleChangePage()
+        this.init()
+        this.$notify({
+          title: '删除成功',
+          type: 'success',
+          duration: 2500
+        })
+      }).catch(err => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        console.log(err.response.data.message)
+      })
+    },
+    add() {
+      this.isAdd = true
+      this.$refs.form2.dialog = true
+    },
+    addew(){
+      this.isAdd = true
+      this.$refs.form3.dialog = true
+    },
+    edit(data) {
+      console.log(data,'s设置')
+      this.isAdd = false
+      const _this = this.$refs.form
+      _this.form = {
+        id: data.id,
+        productId: data.productId,
+        image: data.image,
+        images: data.images,
+        imageArr: data.imageArr,
+        sliderImageArr: data.images.split(','),
+        title: data.title,
+        info: data.info,
+        price: data.price,
+        cost: data.cost,
+        otPrice: data.otPrice,
+        giveIntegral: data.giveIntegral,
+        sort: data.sort,
+        stock: data.stock,
+        sales: data.sales,
+        unitName: data.unitName,
+        postage: data.postage,
+        description: data.description,
+        startTime: data.startTime,
+        stopTime: data.stopTime,
+        addTime: data.addTime,
+        status: data.status,
+        isPostage: data.isPostage,
+        isHot: data.isHot,
+        isDel: data.isDel,
+        num: data.num,
+        isShow: data.isShow,
+        timeId: data.timeId
+        // seckillStatement:data.seckillStatement,
+        // seckillRegulations:data.seckillRegulations
+      }
+      _this.dialog = true
+    },
+  
+  }
+}
+</script>
+
+<style scoped>
+  .app-container{
+  padding-bottom: 0px;
+}
+</style>
diff --git a/src/views/activity/seckill/newlyAdded.vue b/src/views/activity/seckill/newlyAdded.vue
new file mode 100644
index 0000000..bf40c9e
--- /dev/null
+++ b/src/views/activity/seckill/newlyAdded.vue
@@ -0,0 +1,666 @@
+<template>
+  <el-dialog
+    :append-to-body="true"
+    :close-on-click-modal="false"
+    :before-close="handleClose"
+    :visible.sync="dialog"
+    title="新增秒杀"
+    width="900px"
+  >
+    <el-form
+      ref="form"
+      :model="form"
+      :rules="rules"
+      :inline="true"
+      size="small"
+      label-width="140px"
+    >
+      <el-form-item label="秒杀名称">
+        <el-input v-model="form.title" style="width: 500px" />
+      </el-form-item>
+      <!-- <el-form-item label="秒杀简介">
+        <el-input v-model="form.info" style="width: 500px" />
+      </el-form-item> -->
+      <el-form-item label="单位">
+        <el-input v-model="form.unitName" style="width: 500px" />
+      </el-form-item>
+      <el-form-item label="秒杀开始时间">
+        <template>
+          <el-date-picker
+            v-model="form.startTime"
+            type="date"
+            placeholder="选择日期时间"
+          />
+        </template>
+      </el-form-item>
+      <el-form-item label="秒杀结束时间">
+        <template>
+          <el-date-picker
+            v-model="form.stopTime"
+            type="date"
+            placeholder="选择日期时间"
+          />
+        </template>
+      </el-form-item>
+      <el-form-item label="开始时间" prop="storeId">
+        <el-select
+          v-model="form.timeId"
+          style="width: 178px"
+          placeholder="请先选择开始时间"
+        >
+          <el-option
+            v-for="(item, index) in myTimes"
+            :key="index"
+            :label="
+              item.map.time + '点开始，持续' + item.map.continued + '小时'
+            "
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="产品主图片" style="display: block;">
+          <!-- <el-input v-model="forms.productId" autocomplete="off"></el-input> -->
+           <cgood  v-model="form.imageArr" @selectGoods="getGoods"></cgood>
+        </el-form-item>
+      <!-- <el-form-item label="产品主图片">
+        <MaterialList
+          v-model="form.imageArr"
+          style="width: 500px"
+          type="image"
+          :num="1"
+          :width="150"
+          :height="150"
+        />
+      </el-form-item> -->
+      <el-form-item label="产品轮播图">
+        <MaterialList
+          v-model="form.sliderImageArr"
+          style="width: 500px"
+          type="image"
+          :num="4"
+          :width="150"
+          :height="150"
+        />
+      </el-form-item>
+
+    
+        <!-- <el-form-item label="运费模板：" prop="temp_id" style="display: block;">
+              <div class="acea-row">
+                <el-select v-model="form.temp_id" class="mr20">
+                  <el-option
+                    v-for="(item, index) in templateList"
+                    :value="item.id"
+                    :key="index"
+                    :label="item.name"
+                  ></el-option>
+                </el-select>
+              </div>
+            </el-form-item> -->
+      <!-- 秒杀规格设置 -->
+      
+      <!-- <div>
+        <el-form-item label="商品规格：" props="spec_type">
+          <el-radio-group v-model="form.spec_type" @change="changeSpec">
+            <el-radio :label="0" class="radio">单规格</el-radio>
+            <el-radio :label="1">多规格{{ form.spec_typ }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </div> -->
+      <!-- <div :span="24" style="margin-left: 60px" v-if="form.spec_type === 1">
+        <el-form-item v-if="attrs.length !== 0">
+          <div v-for="(item, index) in attrs" :key="index">
+            <div class="acea-row row-middle">
+              <span class="mr5">{{ item.value }}</span>
+              <i
+                class="el-icon-circle-close"
+                @click="handleRemoveRole(index)"
+              ></i>
+            </div>
+            <div class="rulesBox">
+              <el-tag
+                type="dot"
+                closable
+                color="primary"
+                v-for="(j, indexn) in item.detail"
+                :key="indexn"
+                :name="j"
+                class="mr20"
+                @close="handleRemove2(item.detail, indexn)"
+                >{{ j }}</el-tag
+              >
+              <el-input
+                placeholder="请输入属性值与属性单位"
+                v-model="item.detail.attrsVal"
+                style="width: 250px"
+              >
+                <el-button
+                  slot="append"
+                  type="primary"
+                  @click="createAttr(item.detail.attrsVal, index)"
+                  >添加</el-button
+                >
+              </el-input>
+            </div>
+          </div>
+        </el-form-item>
+      </div> -->
+      <!-- <div
+        :span="24"
+        v-if="createBnt"
+        style="margin-left: 140px;
+}"
+      >
+        <el-form-item>
+          <el-button type="primary" icon="md-add" @click="addBtn" class="mr15"
+            >添加新规格</el-button
+          >
+          <el-button type="success" @click="generate">立即生成</el-button>
+        </el-form-item>
+      </div> -->
+      <!-- <div :span="24" v-if="showIput">
+        <div :xl="6" :lg="9" :md="10" :sm="24" :xs="24">
+          <el-form-item label="规格：">
+            <el-input
+              placeholder="请输入规格"
+              v-model="formDynamic.attrsName"
+            />
+          </el-form-item>
+        </div>
+        <div :xl="6" :lg="9" :md="10" :sm="24" :xs="24">
+          <el-form-item label="规格值：">
+            <el-input
+              v-model="formDynamic.attrsVal"
+              placeholder="请输入规格值与规格单位"
+            />
+          </el-form-item>
+        </div>
+        <div
+          :xl="6"
+          :lg="5"
+          :md="10"
+          :sm="24"
+          :xs="24"
+          style="margin-left: 140px; margin-bottom: 20px"
+        >
+          <el-button type="primary" @click="createAttrName">确定</el-button>
+          <el-button type="danger" @click="offAttrName">取消</el-button>
+        </div>
+      </div> -->
+       <!-- 多规格设置-->
+
+            <!-- <div
+              :xl="24"
+              :lg="24"
+              :md="24"
+              :sm="24"
+              :xs="24"
+              v-if="
+                manyFormValidate.length &&
+                form.header.length !== 0 &&
+                attrs.length !== 0&&
+                form.spec_type === 1
+              "
+            >
+              
+              <div :span="24">
+                <el-form-item label="商品属性：" class="labeltop">
+                  <div style="margin-left:45px">
+                    <el-table :data="manyFormValidate" border>
+                    <el-table-column
+                      type="myindex"
+                      v-for="(item, index) in form.header"
+                      :key="index"
+                      :label="item.title"
+                      :property="item.slot"
+                      align="center"
+                     
+                    >
+                      <template slot-scope="scope">
+                        <div v-if="scope.column.property == 'pic'">
+                          <single-pic
+                            v-model="scope.row[scope.column.property]"
+                            type="image"
+                            :num="1"
+                            :width="60"
+                            :height="60"
+                          />
+                        </div>
+                        <div
+                          v-else-if="
+                            scope.column.property.indexOf('value') != -1
+                          "
+                        >
+                          {{ scope.row[scope.column.property] }}
+                        </div>
+                        <div v-else-if="scope.column.property == 'action'">
+                          <a @click="delAttrTable(scope.$index)">删除</a>
+                        </div>
+                        <div v-else>
+                          <el-input
+                            v-model="scope.row[scope.column.property]"
+                          />
+                        </div>
+                      </template>
+                    </el-table-column>
+                   </el-table>
+                  </div>
+                </el-form-item>
+              </div>
+            </div> -->
+          
+          <!-- 单规格表格-->
+          <!-- <div
+            
+            v-if="form.spec_type === 0"
+            style="margin-left:140px"
+          >
+            <el-form-item>
+              <el-table :data="oneFormValidate" border>
+                <el-table-column prop="pic" label="图片" align="center">
+                  <template slot-scope="scope">
+                    <single-pic
+                      v-model="scope.row.pic"
+                      type="image"
+                      :num="1"
+                      :width="60"
+                      :height="60"
+                    />
+                  </template>
+                </el-table-column>
+                <el-table-column prop="price" label="售价" align="center">
+                  <template slot-scope="scope">
+                    <el-input type="text" v-model="scope.row.price" />
+                  </template>
+                </el-table-column>
+                <el-table-column prop="cost" label="成本价" align="center">
+                  <template slot-scope="scope">
+                    <el-input type="text" v-model="scope.row.cost" />
+                  </template>
+                </el-table-column>
+                <el-table-column prop="ot_price" label="原价" align="center">
+                  <template slot-scope="scope">
+                    <el-input type="text" v-model="scope.row.ot_price" />
+                  </template>
+                </el-table-column>
+                <el-table-column prop="stock" label="库存" align="center">
+                  <template slot-scope="scope">
+                    <el-input type="text" v-model="scope.row.stock" />
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="bar_code"
+                  label="商品编号"
+                  align="center"
+                >
+                  <template slot-scope="scope">
+                    <el-input type="text" v-model="scope.row.bar_code" />
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="weight"
+                  label="重量（KG）"
+                  align="center"
+                  width="100"
+                >
+                  <template slot-scope="scope">
+                    <el-input type="text" v-model="scope.row.weight" />
+                  </template>
+                </el-table-column>
+                <el-table-column prop="volume" label="体积(m³" align="center">
+                  <template slot-scope="scope">
+                    <el-input type="text" v-model="scope.row.volume" />
+                  </template>
+                </el-table-column>
+              </el-table>
+            </el-form-item>
+          </div> -->
+      <!-- <el-form-item label="秒杀价">
+        <el-input-number v-model="form.price" />
+      </el-form-item> -->
+      <!-- <el-form-item label="成本">
+        <el-input-number v-model="form.cost" />
+      </el-form-item> -->
+      <el-form-item label="虚拟原价">
+        <el-input style="width:100px" onkeyup="value=value.replace(/[^\d]/g,'')" v-model="form.otPrice" />
+      </el-form-item>
+      <!-- <el-form-item label="库存">
+        <el-input-number v-model="form.stock" />
+      </el-form-item> -->
+      <el-form-item label="虚拟销量">
+        <el-input style="width:100px" onkeyup="value=value.replace(/[^\d]/g,'')" v-model="form.sales" />
+      </el-form-item>
+      <el-form-item label="排序">
+        <el-input-number v-model="form.sort" />
+      </el-form-item>
+      <!-- <el-form-item label="限单">
+        <el-input-number v-model="form.num" />
+      </el-form-item> -->
+      <!-- <el-form-item label="邮费">
+        <el-input-number v-model="form.postage" />
+      </el-form-item> -->
+      <!-- <el-form-item label="是否包邮">
+        <el-radio v-model="form.isPostage" :label="1">是</el-radio>
+        <el-radio v-model="form.isPostage" :label="0" style="width: 110px"
+          >否</el-radio
+        >
+      </el-form-item> -->
+      <el-form-item label="活动状态">
+        <el-radio v-model="form.status" :label="1">开启</el-radio>
+        <el-radio v-model="form.status" :label="0" style="width: 200px"
+          >关闭</el-radio
+        >
+      </el-form-item>
+      <!-- <el-form-item label="详情">
+        <editor v-model="form.description" />
+      </el-form-item> -->
+      <!-- <el-form-item label="说明">
+        <editor v-model="form.seckillStatement" />
+      </el-form-item>
+      <el-form-item label="玩法">
+        <editor v-model="form.seckillRegulations" />
+      </el-form-item> -->
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="text" @click="cancel">取消</el-button>
+      <el-button :loading="loading" type="primary" @click="doSubmit"
+        >确认</el-button
+      >
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { add, edit,isFormatAttr ,getInfo} from "@/api/yxStoreSeckill";
+import { initData } from "@/api/data";
+import editor from "../../components/Editor";
+import MaterialList from "@/components/material";
+import singlePic from "@/components/singlematerial";
+import cgood from '@/views/components/goodss'
+export default {
+  components: { editor, MaterialList,singlePic,cgood },
+  inject: ["reload"],
+  props: {
+    isAdd: {
+      type: Boolean,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      templateList:[],
+      // 单规格表格data
+      oneFormValidate: [
+        {
+          imageArr: [],
+          pic: "",
+          price: 0,
+          cost: 0,
+          ot_price: 0,
+          stock: 0,
+          bar_code: "",
+          weight: 0,
+          volume: 0,
+          brokerage: 0,
+          brokerage_two: 0,
+        },
+      ],
+      // 多规格表格data
+      manyFormValidate:[],
+      loading: false,
+      dialog: false,
+      myTimes: [],
+      createBnt: false,
+      showIput: false,
+      formDynamic: {
+        attrsName: "",
+        attrsVal: "",
+      },
+      attrs: [],
+      form: {
+        id: '',
+        productId: "",
+        image: "",
+        images: "",
+        imageArr: [],
+        sliderImageArr: [],
+        title: "",
+        info: "",
+        price: "",
+        cost: "",
+        otPrice: "",
+        giveIntegral: "",
+        sort: "",
+        stock: 0,
+        sales: "",
+        unitName: "",
+        postage: "",
+        description: '<p>123</p>',
+        // seckillStatement:'',
+        // seckillRegulations:'',
+        startTime: "",
+        stopTime: "",
+        addTime: "",
+        status: 1,
+        isPostage: 1,
+        isHot: "",
+        isDel: 0,
+        num: "",
+        isShow: "",
+        startTimeDate: "",
+        endTimeDate: "",
+        timeId: '',
+        spec_type: 0,
+        attrs: [],
+        header:[],
+        items:[],
+        temp_id:''
+      },
+      rules: {},
+    };
+  },
+  watch: {
+    // "form.imageArr": function (val) {
+    //   if (val) {
+    //     this.form.image = val.join(",");
+    //   }
+    // },
+    "form.sliderImageArr": function (val) {
+      if (val) {
+        this.form.images = val.join(",");
+      }
+    },
+  },
+  mounted() {
+    this.getInfos();
+    console.log("9999");
+    initData("api/yxSystemGroupData", { groupName: "yshop_seckill_time" }).then(
+      (res) => {
+        //console.log(res.content)
+        this.myTimes = res.content;
+      }
+    );
+  },
+  
+  methods: {
+    getInfos(){
+      let id  = 0
+      getInfo(id).then(res=>{
+        console.log(res,'运费模板')
+        this.templateList = res.tempList
+      })
+    },
+    getGoods(val){
+      console.log(val[0].id,'商品id关联')
+      this.form.productId = val[0].id
+      this.form.image = val[0].image
+      // this.form.imageArr.push(val[0].image)
+      this.form.imageArr = val
+      
+    },
+     handleClose(done) {
+        this.$confirm('确认关闭？')
+          .then(_ => {
+            done();
+            this.reload()
+          })
+          .catch(_ => {});
+      },
+    cancel() {
+      this.resetForm();
+    },
+    changeSpec(val) {
+      console.log(this.form)
+      console.log(val);
+      if (val == 1) {
+        // this.createBnt=true;
+        this.showIput = true;
+      }if(val == 0){
+        this.showIput = false;
+      }
+    },
+    handleRemove2(item, index) {
+      item.splice(index, 1);
+    },
+    createAttr(num, idx) {
+      if (num) {
+        this.attrs[idx].detail.push(num);
+        var hash = {};
+        this.attrs[idx].detail = this.attrs[idx].detail.reduce(function (
+          item,
+          next
+        ) {
+          hash[next] ? "" : (hash[next] = true && item.push(next));
+          return item;
+        },
+        []);
+      } else {
+        this.$message.warning("请添加属性！");
+      }
+    },
+    generate() {
+      
+      isFormatAttr(this.form.id, { attrs: this.attrs }).then(res=>{
+        this.manyFormValidate = res.value;
+        this.form.header = res.header;
+      })
+      console.log(this.attrs);
+      this.createBnt = false;
+    },
+    addBtn() {
+      this.createBnt = false;
+      this.showIput = true;
+      this.clearAttr();
+    },
+    clearAttr() {
+      this.formDynamic.attrsName = "";
+      this.formDynamic.attrsVal = "";
+    },
+    createAttrName() {
+      if (this.formDynamic.attrsName && this.formDynamic.attrsVal) {
+        let data = {
+          value: this.formDynamic.attrsName,
+          detail: [this.formDynamic.attrsVal],
+        };
+        this.attrs.push(data);
+        var hash = {};
+        this.attrs = this.attrs.reduce(function (item, next) {
+          hash[next.value] ? "" : (hash[next.value] = true && item.push(next));
+          return item;
+        }, []);
+        this.clearAttr();
+        this.showIput = false;
+        this.createBnt = true;
+      } else {
+        this.$message.warning("请添加完整的规格！");
+      }
+      console.log(this.attrs, "dsdsada");
+    },
+    offAttrName() {
+      this.showIput = false;
+      this.createBnt = true;
+    },
+    doSubmit() {
+      this.loading = true;
+     
+      // this.form.attrs = this.oneFormValidate
+      //  console.log(this.form,'oneFormValidateoneFormValidate')
+      this.doAdd();
+    },
+    doAdd() {
+      console.log(this.form,'修队')
+      add(this.form)
+        .then((res) => {
+          this.resetForm();
+          this.$notify({
+            title: "添加成功",
+            type: "success",
+            duration: 2500,
+          });
+          this.loading = false;
+          this.$parent.init();
+          this.reload()
+        })
+        .catch((err) => {
+          this.loading = false;
+          console.log(err.response.data.message);
+        });
+    },
+    doEdit() {
+      edit(this.form)
+        .then((res) => {
+          this.resetForm();
+          this.$notify({
+            title: "修改成功",
+            type: "success",
+            duration: 2500,
+          });
+          this.loading = false;
+          this.$parent.init();
+        })
+        .catch((err) => {
+          this.loading = false;
+          console.log(err.response.data.message);
+        });
+    },
+    resetForm() {
+      this.dialog = false;
+      this.$refs["form"].resetFields();
+      this.form = {
+        id: "",
+        productId: "",
+        image: "",
+        images: "",
+        imageArr: [],
+        sliderImageArr: [],
+        title: "",
+        info: "",
+        price: "",
+        cost: "",
+        otPrice: "",
+        giveIntegral: "",
+        sort: "",
+        stock: "",
+        sales: "",
+        unitName: "",
+        postage: "",
+        description: '<p>123</p>',
+        startTime: "",
+        stopTime: "",
+        addTime: "",
+        status: "",
+        isPostage: "",
+        isHot: "",
+        isDel: "",
+        num: "",
+        isShow: "",
+        timeId:''
+        // seckillStatement:'',
+        // seckillRegulations:''
+      };
+    },
+  },
+};
+</script>
+
+<style scoped>
+</style>
diff --git a/src/views/activity/storecouponuser/form.vue b/src/views/activity/storecouponuser/form.vue
new file mode 100644
index 0000000..c81c47e
--- /dev/null
+++ b/src/views/activity/storecouponuser/form.vue
@@ -0,0 +1,139 @@
+<template>
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增' : '编辑'" width="500px">
+    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
+      <el-form-item label="兑换的项目id">
+        <el-input v-model="form.cid" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="优惠券所属用户">
+        <el-input v-model="form.uid" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="优惠券名称">
+        <el-input v-model="form.couponTitle" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="优惠券的面值">
+        <el-input v-model="form.couponPrice" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="最低消费多少金额可用优惠券">
+        <el-input v-model="form.useMinPrice" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="优惠券创建时间">
+        <el-input v-model="form.addTime" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="优惠券结束时间">
+        <el-input v-model="form.endTime" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="使用时间">
+        <el-input v-model="form.useTime" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="获取方式">
+        <el-input v-model="form.type" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="状态（0：未使用，1：已使用, 2:已过期）">
+        <el-input v-model="form.status" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="是否有效">
+        <el-input v-model="form.isFail" style="width: 370px;" />
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="text" @click="cancel">取消</el-button>
+      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { add, edit } from '@/api/yxStoreCouponUser'
+export default {
+  props: {
+    isAdd: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data() {
+    return {
+      loading: false, dialog: false,
+      form: {
+        id: '',
+        cid: '',
+        uid: '',
+        couponTitle: '',
+        couponPrice: '',
+        useMinPrice: '',
+        addTime: '',
+        endTime: '',
+        useTime: '',
+        type: '',
+        status: '',
+        isFail: ''
+      },
+      rules: {
+      }
+    }
+  },
+  methods: {
+    cancel() {
+      this.resetForm()
+    },
+    doSubmit() {
+      this.loading = true
+      if (this.isAdd) {
+        this.doAdd()
+      } else this.doEdit()
+    },
+    doAdd() {
+      add(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '添加成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    doEdit() {
+      edit(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '修改成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    resetForm() {
+      this.dialog = false
+      this.$refs['form'].resetFields()
+      this.form = {
+        id: '',
+        cid: '',
+        uid: '',
+        couponTitle: '',
+        couponPrice: '',
+        useMinPrice: '',
+        addTime: '',
+        endTime: '',
+        useTime: '',
+        type: '',
+        status: '',
+        isFail: ''
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/activity/storecouponuser/index.vue b/src/views/activity/storecouponuser/index.vue
new file mode 100644
index 0000000..cd773de
--- /dev/null
+++ b/src/views/activity/storecouponuser/index.vue
@@ -0,0 +1,163 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <!-- 搜索 -->
+      <el-input v-model="query.value" clearable placeholder="输入搜索内容" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
+      <el-select v-model="query.type" clearable placeholder="类型" class="filter-item" style="width: 130px">
+        <el-option v-for="item in queryTypeOptions" :key="item.key" :label="item.display_name" :value="item.key" />
+      </el-select>
+      <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
+      <!-- 新增 -->
+      <el-button
+        type="danger"
+        class="filter-item"
+        size="mini"
+        icon="el-icon-refresh"
+        @click="toQuery"
+      >刷新</el-button>
+    </div>
+    <!--表单组件-->
+    <eForm ref="form" :is-add="isAdd" />
+    <!--表格渲染-->
+    <el-table v-loading="loading" :data="data" size="small" style="width: 100%;height:calc(100vh - 245px);overflow-y: scroll;">
+      <el-table-column prop="couponTitle" label="优惠券名称" />
+      <el-table-column prop="nickname" label="所属用户" />
+      <el-table-column prop="couponPrice" label="优惠券的面值" />
+      <el-table-column prop="useMinPrice" label="优惠券最低消费" />
+      <el-table-column label="优惠券开始时间">
+        <template slot-scope="scope">
+          {{ formatTimeTwo(scope.row.addTime) }}
+        </template>
+      </el-table-column>
+      <el-table-column label="优惠券结束时间">
+        <template slot-scope="scope">
+          {{ formatTimeTwo(scope.row.endTime) }}
+        </template>
+      </el-table-column>
+      <el-table-column label="获取方式">
+        <template slot-scope="scope">
+          <div>
+            <el-tag v-if="scope.row.type == 'get'" style="cursor: pointer" :type="''">手动领取</el-tag>
+            <el-tag v-else :type=" 'info' ">后台发放</el-tag>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="是否可用">
+        <template slot-scope="scope">
+          <div>
+            <el-tag v-if="scope.row.status == 0 && scope.row.isFail == 0" style="cursor: pointer" :type="''">可用</el-tag>
+            <el-tag v-else :type=" 'info' ">不可用</el-tag>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="状态">
+        <template slot-scope="scope">
+          <div>
+            <el-tag v-if="scope.row.status == 2">已过期</el-tag>
+            <el-tag v-if="scope.row.status == 1">已使用</el-tag>
+            <el-tag v-else>未使用</el-tag>
+          </div>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--分页组件-->
+   <el-footer style="height:60px;width:100%;background-color:#f6f6f6">
+     <div style="float:left"></div>
+      <el-pagination
+      :total="total"
+      :current-page="page + 1"
+      style="margin-top: 15px; float:right"
+      layout="total, prev, pager, next, sizes"
+      @size-change="sizeChange"
+      @current-change="pageChange"
+    />
+   </el-footer>
+  </div>
+</template>
+
+<script>
+import checkPermission from '@/utils/permission'
+import initData from '@/mixins/crud'
+import { del } from '@/api/yxStoreCouponUser'
+import eForm from './form'
+import { formatTimeTwo } from '@/utils/index'
+export default {
+  components: { eForm },
+  mixins: [initData],
+  data() {
+    return {
+      delLoading: false,
+      queryTypeOptions: [
+        { key: 'couponTitle', display_name: '优惠券名称' }
+      ]
+    }
+  },
+  created() {
+    this.$nextTick(() => {
+      this.init()
+    })
+  },
+  methods: {
+    formatTimeTwo,
+    checkPermission,
+    beforeInit() {
+      this.url = 'api/yxStoreCouponUser'
+      const sort = 'id,desc'
+      this.params = { page: this.page, size: this.size, sort: sort }
+      const query = this.query
+      const type = query.type
+      const value = query.value
+      if (type && value) { this.params[type] = value }
+      return true
+    },
+    subDelete(id) {
+      this.delLoading = true
+      del(id).then(res => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        this.dleChangePage()
+        this.init()
+        this.$notify({
+          title: '删除成功',
+          type: 'success',
+          duration: 2500
+        })
+      }).catch(err => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        console.log(err.response.data.message)
+      })
+    },
+    add() {
+      this.isAdd = true
+      this.$refs.form.dialog = true
+    },
+    edit(data) {
+      this.isAdd = false
+      const _this = this.$refs.form
+      _this.form = {
+        id: data.id,
+        cid: data.cid,
+        uid: data.uid,
+        couponTitle: data.couponTitle,
+        couponPrice: data.couponPrice,
+        useMinPrice: data.useMinPrice,
+        addTime: data.addTime,
+        endTime: data.endTime,
+        useTime: data.useTime,
+        type: data.type,
+        status: data.status,
+        isFail: data.isFail
+      }
+      _this.dialog = true
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .app-container{
+  padding-bottom: 0px;
+}
+</style>
diff --git a/src/views/bxg/shop/Distribution/index.vue b/src/views/bxg/shop/Distribution/index.vue
new file mode 100644
index 0000000..98baf16
--- /dev/null
+++ b/src/views/bxg/shop/Distribution/index.vue
@@ -0,0 +1,191 @@
+<template>
+  <div class="body">
+      <div class="body-hert">
+          <el-button type="primary" @click="newlyAdded"  icon="el-icon-plus">新增送达时间</el-button>
+      </div>
+    <div>
+      <el-table :data="tableData" style="width: 100%">
+          <el-table-column prop="id" label="id" align="center"></el-table-column>
+        <el-table-column prop="value" label="送达时间" align="center">
+            <template slot-scope="scope">
+                <span>{{scope.row.value}}{{'h'}}</span>
+            </template>
+        </el-table-column>
+        <el-table-column prop="city" label="送达地区" align="center">
+        </el-table-column>
+        <el-table-column  label="操作" align="center">
+            <template slot-scope="scope">
+                <el-popover
+              placement="top"
+              title="确定删除？"
+              width="200"
+              :ref="'popover-' + scope.row.id"
+              trigger="click"
+            >
+              <div style="text-align: right; margin: 0">
+                <el-button
+                  type="primary"
+                  size="mini"
+                  @click="deleteDeviceRow(scope.row)"
+                  >确定</el-button
+                >
+                <el-button size="mini" @click="pCancel(scope.row.id)"
+                  >取消</el-button
+                >
+              </div>
+              <el-button slot="reference" type="text">删除</el-button>
+            </el-popover>
+            </template>
+        </el-table-column>
+      </el-table>
+    </div>
+   <el-dialog title="新增送达时间" :visible.sync="dialogFormVisible" class="region" :before-close="handleClose"  >
+       <el-form>
+           <el-form-item label="送达地区" :label-width="formLabelWidth">
+      <el-cascader
+      style="width:50%"
+    :options="options"
+    :props="props"
+    clearable
+    @change='togin'
+    placeholder="请选择送达的地区"></el-cascader>
+  </el-form-item>
+   <el-form-item label="送达时间(小时)" :label-width="formLabelWidth">
+      <el-input v-model="date" autocomplete="off" style="width:50%" placeholder="请选择送达的时间" onkeyup="value=value.replace(/[^\d{1,}\.\d{1,}|\d{1,}]/g,'')"></el-input>
+    </el-form-item>
+       </el-form>
+       
+      
+  <div slot="footer" class="dialog-footer">
+    <el-button @click="dialogFormVisible = false">取 消</el-button>
+    <el-button type="primary" @click="dialognewlyAdded">确 定</el-button>
+  </div>
+</el-dialog>
+  </div>
+</template>
+<script>
+import { add, get,put,dele } from '@/api/yxStoreCityWide'
+export default {
+    inject: ['reload'],
+  data() {
+    return {
+        valus:[],
+        date:null,
+         props: { multiple: true },
+          options: [
+              {
+          value: 420825,
+          label: '武汉市',
+          children: []
+        }],
+        dialogFormVisible:false,
+         formLabelWidth: '120px',
+      tableData: [],
+    };
+  },
+  created(){
+      this.loads()
+  },
+  methods:{
+      deleteDeviceRow(row){
+          console.log(row)
+          let plams = {
+              id:row.id
+          }
+          dele(plams).then(res=>{
+               this.$message({
+          message: '删除成功',
+          type: 'success',
+        })
+             this.reload()
+          })
+      },
+      pCancel(row){
+          this.reload()
+      },    
+      loads(){
+          let plams = {
+              size:20,
+              limit:1
+          }
+          add(plams).then(res=>{ 
+              console.log(res,'列巴查询')
+              this.tableData = res.content
+          })
+      },
+      newlyAdded(){
+          this.dialogFormVisible = true
+          get().then(res=>{
+              console.log(res[0].c[0],'城市查询')
+              let children = res[0].c[0].c.map(item=>({
+                 value:item.v,
+                 label:item.n 
+              }))
+              console.log(children,'看看是什么数据')
+             this.options[0].children = children
+            //   this.options = res[0].c[0]
+            //   this.options = res[0].c
+          })
+      },
+      dialognewlyAdded(){
+          if(this.date == null){
+              this.$message.error('请选择送达时间');
+          }else if(this.date !==null){
+               this.dialogFormVisible = false
+          let plams = {
+           list:this.valus,
+            time:this.date
+          }
+          put(plams).then(res=>{
+              console.log(res,'pppp')
+              this.$message({
+          message: '新增成功',
+          type: 'success',
+        })
+              this.reload()
+          })
+          }
+         
+      },
+      handleClose(done) {
+        this.$confirm('确认关闭？')
+          .then(_ => {
+            done();
+            this.reload()
+          })
+          .catch(_ => {});
+      },
+      togin(val){
+          console.log(val)
+        
+         this.valus = val.map((item,index) =>({
+             label:item[1],
+             value:index
+         })
+         
+         )
+         console.log(this.valus)
+      }
+  }
+};
+</script>
+
+<style scoped>
+.body {
+  padding: 20px;
+}
+.body-hert{
+    width: 100%;
+    height: 60px;
+    line-height: 60px;
+    /* background-color: red; */
+    
+}
+.region{
+    font-size: 18px;
+    font-weight: 700;
+    width: 60%;
+    margin-left: 20%;
+    margin-top: 5%;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/bxg/shop/cate/index.vue b/src/views/bxg/shop/cate/index.vue
new file mode 100644
index 0000000..1443fda
--- /dev/null
+++ b/src/views/bxg/shop/cate/index.vue
@@ -0,0 +1,199 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <div v-if="crud.props.searchToggle">
+        <!-- 搜索 -->
+        <el-input v-model="query.cateName" clearable size="small" placeholder="输入分类名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
+        <rrOperation :crud="crud" />
+      </div>
+      <crudOperation :permission="permission" />
+      <!-- <el-button
+        v-if="crud.optShow.download"
+        :loading="crud.downloadLoading"
+        :disabled="!crud.data.length"
+        class="filter-item"
+        size="mini"
+        type="warning"
+        icon="el-icon-download"
+        @click="crud.doExport"
+      >导出</el-button> -->
+    </div>
+    <!--表单组件-->
+    <el-dialog append-to-body :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
+      <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
+        <el-form-item label="分类名称">
+          <el-input v-model="form.cateName" style="width: 370px;" />
+        </el-form-item>
+        <el-form-item label="分类图片">
+          <MaterialList v-model="picArr" type="image" :num="1" :width="150" :height="150" />
+        </el-form-item>
+        <el-form-item label="图标">
+          <MaterialList v-model="picA" type="image" :num="1" :width="150" :height="150" />
+        </el-form-item>
+        <el-form-item label="状态">
+          <el-radio-group v-model="form.isShow" style="width: 178px">
+            <el-radio :label="1">显示</el-radio>
+            <el-radio :label="0">隐藏</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="排序">
+          <el-input v-model="form.sort" style="width: 370px;" />
+        </el-form-item>
+        <el-form-item style="margin-bottom: 0;" label="上级分类" prop="pid">
+          <treeselect v-model="form.pid" :options="depts" style="width: 370px;" placeholder="选择上级分类" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="text" @click="crud.cancelCU">取消</el-button>
+        <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+      </div>
+    </el-dialog>
+    <!--表格渲染-->
+    <el-table ref="table" id="tablee" style="width: 100%;height:calc(100vh - 300px);overflow-y: scroll;" v-loading="crud.loading" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" :data="crud.data" row-key="id" @select="crud.selectChange" @select-all="crud.selectAllChange" @selection-change="crud.selectionChangeHandler">
+      <el-table-column :selectable="checkboxT" type="selection" width="55" />
+      <el-table-column v-if="columns.visible('cateName')" label="名称" prop="cateName" />
+      <el-table-column v-if="columns.visible('isShow')" label="状态" align="center" prop="isShow">
+        <template slot-scope="scope">
+          <div>
+            <el-tag v-if="scope.row.isShow === 1" :type="''">显示</el-tag>
+            <el-tag v-else :type=" 'info' ">隐藏</el-tag>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column v-if="columns.visible('sort')" label="排序" prop="sort" sortable/>
+      <el-table-column v-permission="['admin','YXSTORECATEGORY_EDIT','YXSTORECATEGORY_DELETE']" label="操作" width="130px" align="center" >
+        <template slot-scope="scope">
+          <udOperation
+            :data="scope.row"
+            :permission="permission"
+            :disabled-dle="scope.row.id === 1"
+            msg="确定删除吗,如果存在下级节点则一并删除，此操作不能撤销！"
+          />
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-footer style="height:60px;width:100%;background-color:#f6f6f6">
+       <div style="float:left">
+         <el-select v-model="batchExport" @change="handleExportOption" clearable placeholder="导出数据" class="filter-item" style="width: 130px;margin-left:15px;margin-top:15px">
+          <el-option
+            v-for="item in exportOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+       </div>
+        
+     </el-footer>
+  </div>
+</template>
+
+<script>
+import crudDept from '@/api/yxStoreCategory'
+import Treeselect from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import CRUD, { presenter, header, form, crud } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+import picUpload from '@/components/pic-upload'
+import MaterialList from '@/components/material'
+import FileSaver from "file-saver";
+import XLSX from "xlsx";
+// crud交由presenter持有
+const defaultCrud = CRUD({ title: '分类', url: 'api/yxStoreCategory', sort: 'sort,desc', crudMethod: { ...crudDept }})
+const defaultForm = { id: null, cateName: null, pid: 0, isShow: 1 , sort:  1}
+export default {
+  name: 'Dept',
+  components: { Treeselect, crudOperation, rrOperation, udOperation, picUpload, MaterialList },
+  mixins: [presenter(defaultCrud), header(), form(defaultForm), crud()],
+  data() {
+    return {
+        batchExport:'',
+      exportOptions: [
+          {value: '0', label: '导出本页数据'},
+        ],
+      picArr: [],
+      picA:[],
+      depts: [],
+      rules: {
+        cateName: [
+          { required: true, message: '请输入名称', trigger: 'blur' }
+        ]
+      },
+      permission: {
+        add: ['admin', 'YXSTORECATEGORY_CREATE'],
+        edit: ['admin', 'YXSTORECATEGORY_EDIT'],
+        del: ['admin', 'YXSTORECATEGORY_DELETE']
+      },
+      enabledTypeOptions: [
+        { key: 'true', display_name: '正常' },
+        { key: 'false', display_name: '禁用' }
+      ]
+    }
+  },
+  watch: {
+    picArr: function(val) {
+      console.log(val,'图片');
+      this.form.pic = val.join(',')
+    },
+    picA:function(vale){
+      console.log(vale,'图标icon')
+      this.form.icon = vale.join(',')
+      // this.form.icon = 'ppp'
+    }
+  },
+  methods: {
+    handleExportOption(val){
+      var table = XLSX.utils.table_to_book(document.querySelector("#tablee"));
+      var tb = XLSX.write(table, {
+        bookType: "xlsx",
+        bookSST: true,
+        type: "array",
+      });
+      try {
+        FileSaver.saveAs(
+          new Blob([tb], { type: "application/octet-stream" }),
+          "商品分类.xlsx"
+        );
+      } catch (e) {
+        if (typeof console !== "undefined") console.log(e, tb);
+      }
+    },
+    // 新增与编辑前做的操作
+    [CRUD.HOOK.afterToCU](crud, form) {
+      this.picArr = []
+      if (form.pic && form.id ) {
+        this.picArr = form.pic.split(',')
+        
+      }
+      if (form.icon && form.id ) {
+        this.picA = form.icon.split(',')
+      }
+
+      // 获取所有部门
+      crudDept.getCates({ isShow: true }).then(res => {
+        console.log(res+'52054')
+        this.depts = []
+        const dept = { id: 0, label: '顶级类目', children: [] }
+        dept.children = res.content
+        this.depts.push(dept)
+      })
+    },
+    // 提交前的验证
+    [CRUD.HOOK.afterValidateCU]() {
+      return true
+    },
+    checkboxT(row, rowIndex) {
+      return row.id !== 1
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .app-container{
+  padding-bottom: 0px;
+}
+</style>
diff --git a/src/views/bxg/shop/express/form.vue b/src/views/bxg/shop/express/form.vue
new file mode 100644
index 0000000..62be683
--- /dev/null
+++ b/src/views/bxg/shop/express/form.vue
@@ -0,0 +1,102 @@
+<template>
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增' : '编辑'" width="500px">
+    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="120px">
+      <el-form-item label="快递公司编号" prop="code">
+        <el-input v-model="form.code" style="width: 300px;" />
+      </el-form-item>
+      <el-form-item label="快递公司名称">
+        <el-input v-model="form.name" style="width: 300px;" />
+      </el-form-item>
+      <el-form-item label="排序">
+        <el-input v-model="form.sort" style="width: 300px;" />
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="text" @click="cancel">取消</el-button>
+      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { add, edit } from '@/api/yxExpress'
+export default {
+  props: {
+    isAdd: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data() {
+    return {
+      loading: false, dialog: false,
+      form: {
+        id: '',
+        code: '',
+        name: '',
+        sort: 0
+      },
+      rules: {
+        code: [
+          { required: true, message: 'please enter', trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    cancel() {
+      this.resetForm()
+    },
+    doSubmit() {
+      this.loading = true
+      if (this.isAdd) {
+        this.doAdd()
+      } else this.doEdit()
+    },
+    doAdd() {
+      add(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '添加成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    doEdit() {
+      edit(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '修改成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    resetForm() {
+      this.dialog = false
+      this.$refs['form'].resetFields()
+      this.form = {
+        id: '',
+        code: '',
+        name: '',
+        sort: 0
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/bxg/shop/express/index.vue b/src/views/bxg/shop/express/index.vue
new file mode 100644
index 0000000..0b9f4f9
--- /dev/null
+++ b/src/views/bxg/shop/express/index.vue
@@ -0,0 +1,126 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <!-- 新增 -->
+      <div style="display: inline-block;margin: 0px 2px;">
+        <el-button
+          v-permission="['admin','YXEXPRESS_ALL','YXEXPRESS_CREATE']"
+          class="filter-item"
+          size="mini"
+          type="primary"
+          icon="el-icon-plus"
+          @click="add"
+        >新增</el-button>
+      </div>
+    </div>
+    <!--表单组件-->
+    <eForm ref="form" :is-add="isAdd" />
+    <!--表格渲染-->
+    <el-table v-loading="loading" :data="data" size="small" style="width: 100%;height:calc(100vh - 245px);overflow-y: scroll;">
+      <el-table-column prop="code" label="快递公司编号" align="center" />
+      <el-table-column prop="name" label="快递公司名称"  align="center"/>
+      <el-table-column prop="sort" label="排序" align="center" />
+      <el-table-column v-if="checkPermission(['admin','YXEXPRESS_ALL','YXEXPRESS_EDIT','YXEXPRESS_DELETE'])" label="操作" width="150px" align="center">
+        <template slot-scope="scope">
+          <el-button v-permission="['admin','YXEXPRESS_ALL','YXEXPRESS_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)" />
+          <el-popover
+            :ref="scope.row.id"
+            v-permission="['admin','YXEXPRESS_ALL','YXEXPRESS_DELETE']"
+            placement="top"
+            width="180"
+          >
+            <p>确定删除本条数据吗？</p>
+            <div style="text-align: right; margin: 0">
+              <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
+              <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
+            </div>
+            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
+          </el-popover>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--分页组件-->
+   <el-footer style="height:60px;width:100%;background-color:#f6f6f6">
+     <div style="float:left"></div>
+      <el-pagination
+      :total="total"
+      :current-page="page + 1"
+      style="margin-top: 15px;float:right"
+      layout="total, prev, pager, next, sizes"
+      @size-change="sizeChange"
+      @current-change="pageChange"
+    />
+   </el-footer>
+  </div>
+</template>
+
+<script>
+import checkPermission from '@/utils/permission'
+import initData from '@/mixins/crud'
+import { del } from '@/api/yxExpress'
+import eForm from './form'
+export default {
+  components: { eForm },
+  mixins: [initData],
+  data() {
+    return {
+      delLoading: false
+    }
+  },
+  created() {
+    this.$nextTick(() => {
+      this.init()
+    })
+  },
+  methods: {
+    checkPermission,
+    beforeInit() {
+      this.url = 'api/yxExpress'
+      const sort = 'id,desc'
+      this.params = { page: this.page, size: this.size, sort: sort }
+      return true
+    },
+    subDelete(id) {
+      this.delLoading = true
+      del(id).then(res => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        this.dleChangePage()
+        this.init()
+        this.$notify({
+          title: '删除成功',
+          type: 'success',
+          duration: 2500
+        })
+      }).catch(err => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        console.log(err.response.data.message)
+      })
+    },
+    add() {
+      this.isAdd = true
+      this.$refs.form.dialog = true
+    },
+    edit(data) {
+      this.isAdd = false
+      const _this = this.$refs.form
+      _this.form = {
+        id: data.id,
+        code: data.code,
+        name: data.name,
+        sort: data.sort,
+        isShow: data.isShow
+      }
+      _this.dialog = true
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .app-container{
+  padding-bottom: 0px;
+}
+</style>
diff --git a/src/views/bxg/shop/goods/attr.vue b/src/views/bxg/shop/goods/attr.vue
new file mode 100644
index 0000000..cb8939f
--- /dev/null
+++ b/src/views/bxg/shop/goods/attr.vue
@@ -0,0 +1,450 @@
+<template>
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="title" width="900px">
+    <el-form v-show="hidden == false" ref="form" :model="form" :inline="true" :rules="rules" label-width="80px">
+      <el-form-item label="规则名称">
+        <el-row :gutter="10">
+          <el-col :span="10"><el-button type="primary" @click="hiddenBool">添加新规则</el-button></el-col>
+        </el-row>
+      </el-form-item>
+    </el-form>
+    <el-form v-show="hidden == true" ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form-item label="规则名称">
+        <el-row :gutter="10">
+          <el-col
+            v-for="(item, index) in items"
+            :key="index"
+            :span="5"
+            style="position: relative;margin-right: 6px"
+          >
+            <el-input v-model="item.value" style="width: 150px;" placeholder="设置名称" />
+            <el-button v-show="item.attrHidden == true" type="text" style="position: absolute;top:-6px;right:17px;margin-top:1px;border: none;font-size: 14px;font-weight:bold;line-height: 1.8" icon="el-icon-close" @click="handleRemove(index)" />
+            <el-button v-show="item.attrHidden == false" type="text" style="position: absolute;top:-6px;right:17px;margin-top:1px;border: none;font-size: 14px;font-weight:bold;line-height: 1.8" icon="el-icon-check" @click="attrHiddenBool(item)" />
+          </el-col>
+          <el-col :span="5"><el-button type="primary" @click="handleAdd">添加新规则</el-button></el-col>
+        </el-row>
+      </el-form-item>
+      <el-form-item
+        v-for="(item, index) in items"
+        v-show="item.attrHidden == true"
+        :key="index"
+        :label="''+item.value+':'"
+      >
+        <el-row :gutter="13">
+          <el-col
+            v-for="(attr,k) in item.detail"
+            :key="attr"
+            :span="3"
+            :name="attr"
+          >
+            <el-tag closable @close="attrRemove(item,k)">{{ attr }}</el-tag>
+          </el-col>
+          <el-col :span="5">
+            <el-input v-model="item.detailValue" style="width: 150px;" placeholder="设置属性" />
+          </el-col>
+          <el-col :span="5">
+            <el-button type="primary" @click="attrAdd(item)">添加</el-button>
+          </el-col>
+        </el-row>
+      </el-form-item>
+      <el-form-item v-show="hidden == true">
+        <el-row :gutter="24">
+          <el-col :span="24"><el-button :loading="loading" type="primary" @click="addGoods(true)">生成</el-button></el-col>
+        </el-row>
+      </el-form-item>
+
+      <template v-if="items[0].value!='' && items[0].detail.length>0 && attrs.length">
+        <template v-for="(attr,index) in attrs">
+          <el-form-item>
+            <el-row :gutter="24">
+              <template v-for="(item,index) in attr.detail">
+                <el-col :span="3" style="margin-right: 2px">
+                  {{ index }}:{{ item }}
+                </el-col>
+              </template>
+              <el-col :span="4">
+                <span :class="attr.check ? 'check':''">金额:</span>&nbsp;
+                <el-input v-model="attr.price" placeholder="金额" style="width: 60%" :number="true" />
+              </el-col>
+              <el-col :span="4">
+                <span :class="attr.check ? 'check':''">库存:</span>&nbsp;
+                <el-input v-model="attr.sales" placeholder="库存" style="width: 60%" :number="true" />
+              </el-col>
+              <el-col :span="5">
+                <span :class="attr.check ? 'check':''">成本价:</span>&nbsp;
+                <el-input v-model="attr.cost" placeholder="成本价" style="width: 60%" :number="true" />
+              </el-col>
+              <el-col :span="3" style="margin-right: 2px">
+                <div class="demo-upload">
+                  <!--<img :src="attr.pic">-->
+                  <pic-upload-two v-model="attr.pic" />
+                </div>
+              </el-col>
+              <el-col :span="2" style="margin-right: 3px">
+                <el-button type="primary" @click="removeGoods(index)">删除</el-button>
+              </el-col>
+            </el-row>
+          </el-form-item>
+        </template>
+        <el-form-item>
+          <el-row :gutter="24">
+            <el-col :span="2">
+              <el-button type="primary" :loading="loading" @click="submit">提交</el-button>
+            </el-col>
+            <el-col :span="2">
+              <el-button type="error" @click="clear">清空所有属性</el-button>
+            </el-col>
+          </el-row>
+        </el-form-item>
+      </template>
+
+    </el-form>
+  </el-dialog>
+
+</template>
+
+<script>
+import { getCates } from '@/api/yxStoreCategory'
+import { add, edit, isFormatAttr, setAttr, clearAttr, getAttr } from '@/api/yxStoreProduct'
+import editor from '../../../components/Editor'
+import picUploadTwo from '@/components/pic-upload-two'
+import mulpicUpload from '@/components/mul-pic-upload'
+import Treeselect from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import { Message } from 'element-ui'
+export default {
+  components: { editor, picUploadTwo, mulpicUpload, Treeselect },
+  props: {
+    isAttr: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data() {
+    return {
+      loading: false, dialog: false, cates: [], title: '规则属性',
+      form: {
+        id: '',
+        merId: '',
+        image: '',
+        sliderImage: '',
+        storeName: '',
+        storeInfo: '',
+        keyword: '',
+        barCode: '',
+        cateId: 1,
+        price: '',
+        vipPrice: '',
+        otPrice: '',
+        postage: '',
+        unitName: '',
+        sort: '',
+        sales: '',
+        stock: '',
+        isShow: '',
+        isHot: '',
+        isBenefit: '',
+        isBest: '',
+        isNew: '',
+        description: '',
+        addTime: '',
+        isPostage: '',
+        isDel: '',
+        merUse: '',
+        giveIntegral: '',
+        cost: '',
+        isSeckill: '',
+        isBargain: '',
+        isGood: '',
+        ficti: '',
+        browse: '',
+        codePath: '',
+        soureLink: ''
+      },
+      rules: {
+      },
+      items: [{
+        value: '',
+        detailValue: '',
+        attrHidden: false,
+        detail: []
+      }],
+      attrs: [],
+      hidden: false,
+      attrHidden: false,
+      submiting: false
+    }
+  },
+  mounted() {
+    // console.log('items'+this.items)
+    // console.log('attrs'+this.attrs)
+    // if(this.items && this.attrs) this.hidden = true;
+
+    // window.changeIMG = (index,pic)=>{
+    //   _vm.setAttrPic(index,pic);
+    // };
+  },
+  methods: {
+    getAttrs(id) {
+      getAttr(id).then(res => {
+        console.log('res' + res)
+        // this.items = JSON.parse(res.attr)
+        if (res) {
+          this.hidden = true
+          this.items = res.attr
+          this.attrs = res.value
+        } else {
+          this.hidden = false
+          this.items = [{
+            value: '',
+            detailValue: '',
+            attrHidden: false,
+            detail: []
+          }]
+          this.attrs = []
+        }
+      })
+    },
+    cancel() {
+      this.resetForm()
+    },
+    doSubmit() {
+      this.loading = true
+      if (this.isAttr) {
+        this.doAdd()
+      } else this.doEdit()
+    },
+    doAdd() {
+      add(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '添加成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    doEdit() {
+      edit(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '修改成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    resetForm() {
+      this.dialog = false
+      this.$refs['form'].resetFields()
+      this.form = {
+        id: '',
+        merId: '',
+        image: '',
+        sliderImage: '',
+        storeName: '',
+        storeInfo: '',
+        keyword: '',
+        barCode: '',
+        cateId: '',
+        price: '',
+        vipPrice: '',
+        otPrice: '',
+        postage: '',
+        unitName: '',
+        sort: '',
+        sales: '',
+        stock: '',
+        isShow: '',
+        isHot: '',
+        isBenefit: '',
+        isBest: '',
+        isNew: '',
+        description: '',
+        addTime: '',
+        isPostage: '',
+        isDel: '',
+        merUse: '',
+        giveIntegral: '',
+        cost: '',
+        isSeckill: '',
+        isBargain: '',
+        isGood: '',
+        ficti: '',
+        browse: '',
+        codePath: '',
+        soureLink: ''
+      }
+    },
+    setAttrPic(index, pic) {
+      this.$set(this.attrs[index], 'pic', pic)
+    },
+    attrHiddenBool(item) {
+      if (item.value == '') {
+        Message({ message: '请填写规则名称', type: 'error' })
+      } else {
+        item.attrHidden = true
+      }
+    },
+    hiddenBool() {
+      this.hidden = true
+    },
+    handleAdd() {
+      if (!this.checkAttr()) return
+      this.items.push({
+        value: '',
+        detailValue: '',
+        attrHidden: false,
+        detail: []
+      })
+    },
+    checkAttr() {
+      var bool = true
+      this.items.map(function(item) {
+        if (!bool) return
+        if (!item.value) {
+          Message({ message: '请填写规则名称', type: 'error' })
+          bool = false
+        } else if (!item.detail.length) {
+          Message({ message: '请设置规则属性', type: 'error' })
+          bool = false
+        }
+      })
+      return bool
+    },
+    attrAdd(item) {
+      if (!item.detailValue) return false
+      item.detail.push(item.detailValue)
+      item.detailValue = ''
+    },
+    handleRemove(index) {
+      if (this.items.length > 1) { this.items.splice(index, 1) } else { Message({ message: '请设置至少一个规则', type: 'error' }) }
+    },
+    attrRemove(item, k) {
+      console.log('item:')
+      if (item.detail.length == 1) {
+        Message({ message: '请设置至少一个属性', type: 'error' })
+        return false
+      }
+      item.detail.splice(k, 1)
+    },
+    removeGoods(index) {
+      this.attrs.splice(index, 1)
+    },
+    checkGoods() {
+      var bool = true
+      this.attrs.map(function(attr) {
+        if (!bool) return
+        if (!Object.keys(attr.detail).length) {
+          Message({ message: '请选择至少一个属性', type: 'error' })
+          bool = false
+        } else if (attr.price != parseFloat(attr.price) || attr.price < 0) {
+          Message({ message: '请输入正确的商品价格', type: 'error' })
+          bool = false
+        } else if (attr.sales != parseInt(attr.sales) || attr.sales < 0) {
+          Message({ message: '请输入正确的商品库存', type: 'error' })
+          bool = false
+        }
+      })
+      return bool
+    },
+    addGoods(type) {
+      if (this.attrs.length) {
+        if (!this.checkGoods()) return
+      }
+      var that = this
+      isFormatAttr(this.form.id, { items: this.items, attrs: this.attrs }).then(res => {
+        this.attrs = res
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    submit() {
+      var that = this
+      that.submiting = true
+      if (!this.checkAttr() || !this.checkGoods()) return
+      for (const attr in that.attrs) {
+        that.attrs[attr].check = false
+      }
+
+      // console.log({items:this.items,attrs:this.attrs})
+      this.loading = false
+      setAttr(this.form.id, { items: this.items, attrs: this.attrs }).then(res => {
+        this.attrs = res
+        Message({ message: '操作成功', type: 'success' })
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+      this.dialog = false
+    },
+    clear() {
+      this.$confirm(`确定要清空属性数据'}]操作?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          clearAttr(this.form.id).then(({ data }) => {
+            Message({ message: '操作成功', type: 'success' })
+            // this.dialog = false
+            this.getAttrs(this.form.id)
+          })
+        })
+        .catch(() => { })
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+  .demo-upload{
+    display: block;
+    /*//height: 50px;*/
+    text-align: center;
+    border: 1px solid transparent;
+    border-radius: 4px;
+    overflow: hidden;
+    background: #fff;
+    position: relative;
+    box-shadow: 0 1px 1px rgba(0,0,0,.2);
+    margin-right: 4px;
+  }
+  .demo-upload img{
+    width: 100%;
+    height: 100%;
+    display: block;
+  }
+
+  .demo-upload-cover{
+    display: block;
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    background: rgba(0,0,0,.6);
+  }
+  .demo-upload:hover .demo-upload-cover{
+    display: block;
+  }
+  .demo-upload-cover i{
+    color: #fff;
+    font-size: 20px;
+    cursor: pointer;
+    margin: 0 2px;
+  }
+
+</style>
diff --git a/src/views/bxg/shop/goods/form.vue b/src/views/bxg/shop/goods/form.vue
new file mode 100644
index 0000000..d32b0d1
--- /dev/null
+++ b/src/views/bxg/shop/goods/form.vue
@@ -0,0 +1,1509 @@
+<template>
+  <div class="app-container">
+    <el-card :bordered="false">
+      <el-form
+        ref="formValidate"
+        :rules="ruleValidate"
+        :model="formValidate"
+        label-width="130px"
+      >
+        <el-row :gutter="24">
+          <!-- 商品信息-->
+          <el-col :span="24">
+           <h4 style="    font-size: 20px;
+    font-weight: 700;">商品基础属性</h4>
+         </el-col>
+          <el-col v-bind="grid2">
+            <el-form-item label="商品名称：" prop="store_name">
+              <el-input
+                v-model="formValidate.store_name"
+                placeholder="请输入商品名称"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid2">
+            <el-form-item label="商品分类：" prop="cate_id" style="float: left">
+              <!-- <el-select v-model="formValidate.cate_id">
+                :disabled="item.disabled === 0"   商品分类
+                <el-option
+                  v-for="item in treeSelect"
+                  :value="item.value"
+                  :key="item.id"
+                  :label="item.label"
+                ></el-option>
+              </el-select> -->
+              <el-cascader
+                v-model="formValidate.cate_id"
+                :options="treeSelect"
+                :props="{ multiple: true }"
+                clearable
+              ></el-cascader>
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid2">
+            <el-form-item label="商品产地：">
+              <el-select v-model="formValidate.sourceId">
+                <el-option
+                  v-for="item in conte"
+                  :value="item.id"
+                  :key="item.id"
+                  :label="item.source"
+                >
+                  <!-- <img :src="item.pic" alt="" style="width:40px;height:40px;float:left">
+                <p style="margin-left: 50px;
+    margin-top: 1px;">{{item.source}}</p> -->
+                </el-option>
+              </el-select>
+              <!-- <el-button
+                  style="margin-top:5px；font-size:14px"
+                   @click="Place"
+                  >新增产地</el-button> -->
+            </el-form-item>
+          </el-col>
+
+          <el-dialog
+            title="商品产地"
+            :visible.sync="dialogFormVisible"
+            style="width: 100%"
+          >
+            <el-form>
+              <!-- <el-form-item label="照片：" >
+              <single-pic
+                v-model="formValidate.imagess"
+                type="image"
+                :num="1"
+                :width="150"
+                :height="150"
+              />
+            </el-form-item> -->
+              <el-form-item label="产地名称：" :label-width="formLabelWidth">
+                <el-input v-model="paname" autocomplete="off"></el-input>
+              </el-form-item>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+              <el-button @click="dialogFormVisible = false">取 消</el-button>
+              <el-button type="primary" @click="dialogForm">确 定</el-button>
+            </div>
+          </el-dialog>
+          <el-col v-bind="grid2">
+            <el-form-item label="商品关键字：" prop>
+              <el-input
+                v-model="formValidate.keyword"
+                placeholder="请输入商品关键字"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid2">
+            <el-form-item label="单位：" prop="unit_name">
+              <el-input
+                v-model="formValidate.unit_name"
+                placeholder="请输入单位"
+              />
+            </el-form-item>
+            <!-- <el-form-item label="是否参与年货节活动:" label-width="150px" >
+             <el-switch v-model="delivery" ></el-switch>
+            </el-form-item> -->
+            <el-form-item label="同城配送分类：">
+              <el-select v-model="formValidate.cityWideCategory"  @change='classification' >
+                <el-option
+                  v-for="item in commodity"
+                  :value="item.value"
+                  :key="item.value"
+                  :label="item.label"
+                >
+                </el-option>
+                 <el-option label="-------空-------" value="-1"  ></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="商铺选择：">
+              <el-select v-model="formValidate.categoryShopId">
+                <el-option
+                  v-for="item in category"
+                  :value="item.id"
+                  :key="item.id"
+                  :label="item.shopName"
+                >
+                </el-option>
+                <el-option label="-------空-------" :value='ui' :key="ui" ></el-option>
+              </el-select>
+
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid2">
+            <el-form-item label="商品简介：" prop>
+              <el-input
+                v-model="formValidate.store_info"
+                type="textarea"
+                :rows="3"
+                placeholder="请输入商品简介"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid2">
+            <el-form-item label="微信分享文本" >
+              <el-input
+                v-model="formValidate.shareInfo"
+                type="textarea"
+                :rows="3"
+                placeholder="请输入商品简介"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+           <h4 style="    font-size: 20px;
+    font-weight: 700;">商品介紹信息</h4>
+         </el-col>
+
+         <el-col :span="24">
+            <el-row :span='24'>
+              <el-col :span="12">
+                <el-form-item label="商品封面图：" prop="image">
+              <single-pic
+                v-model="formValidate.image"
+                type="image"
+                :num="1"
+                :width="150"
+                :height="150"
+              />
+            </el-form-item>
+              </el-col>
+              <el-col :span="12">
+              <el-form-item label="微信分享图：" prop="wechatImage">
+                   <single-pic
+                v-model="formValidate.wechatImage"
+                type="image"
+                :num="1"
+                :width="150"
+                :height="150"
+                style="float: left"
+              />
+              <div style="float: left;    width: 200px;margin-left:15px
+   ">
+                <span style="color: red; font-size: 18px; font-weight: 700;;margin-left;"
+                  >长宽比列5:4</span
+                >
+              </div>
+               </el-form-item>
+            </el-col>
+            </el-row>
+          </el-col>
+          <el-col :span="24">
+            <el-row :span='24'>
+              <el-col :span="12">
+                <el-form-item label="商品轮播图：" prop="slider_image">
+              <MaterialList
+                v-model="formValidate.slider_image"
+                type="image"
+                :num="4"
+                :width="150"
+                :height="150"
+              />
+            </el-form-item>
+              </el-col>
+              <el-col :span="12">
+              <el-form-item label="商品海报图：  " prop="share_image">
+              <single-pic
+                v-model="formValidate.share_image"
+                type="image"
+                :num="1"
+                :width="150"
+                :height="150"
+                style="float: left"
+              />
+              <div style="float: left; width:200px;margin-left:15px ;">
+                <span style="color: red; font-size: 18px; font-weight: 700;;margin-left;"
+                  >重要：仅可上传尺寸为750*1334的商品分享图，务必按照规则上传，请勿自行上传！！！</span
+                >
+              </div>
+
+            </el-form-item>
+            </el-col>
+            </el-row>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="视频介绍：" >
+              <el-upload
+          class="upload-demo"
+          :action="qiNiuUploadApi"
+          :on-preview="handlePreviewm"
+          :on-remove="handleRemovem"
+          :before-remove="beforeRemovem"
+          :on-success="handleImageSuccessm"
+          :on-error='handleImage'
+           multiple
+          :limit="1"
+          :headers="headers"
+          :file-list="fileListm"
+          :on-exceed="handleExceed"
+          style="width: 60%"
+        >
+          <el-button size="small" type="primary" icon="el-icon-upload"
+            >点击上传</el-button
+          >
+          <span style="font-size: 12px; color: ">请上传对应的商品视频(只能上传一个视频文件)</span>
+        </el-upload>
+
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="24">
+           <h4 style="    font-size: 20px;
+    font-weight: 700;">商品详细信息</h4>
+         </el-col>
+          <el-col :span="24">
+            <el-form-item label="商品规格：" props="spec_type">
+              <el-radio-group
+                v-model="formValidate.spec_type"
+                @change="changeSpec"
+              >
+                <el-radio :label="0" class="radio">单规格</el-radio>
+                <el-radio :label="1"
+                  >多规格{{ formValidate.spec_typ }}</el-radio
+                >
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <!-- 多规格添加-->
+          <el-col :span="24" v-if="formValidate.spec_type === 1" class="noForm">
+            <el-col :span="24">
+              <el-form-item label="选择规格：" prop>
+                <div class="acea-row row-middle">
+                  <el-select
+                    v-model="formValidate.selectRule"
+                    style="width: 23%"
+                  >
+                    <el-option
+                      v-for="(item, index) in ruleList"
+                      :value="item.ruleName"
+                      :key="index"
+                      >{{ item.ruleName }}</el-option
+                    >
+                  </el-select>
+                  <el-button type="primary" class="mr20" @click="confirm"
+                    >确认</el-button
+                  >
+                </div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item v-if="attrs.length !== 0">
+                <div v-for="(item, index) in attrs" :key="index">
+                  <div class="acea-row row-middle">
+                    <span class="mr5">{{ item.value }}</span>
+                    <i
+                      class="el-icon-circle-close"
+                      @click="handleRemoveRole(index)"
+                    ></i>
+                  </div>
+                  <div class="rulesBox">
+                    <el-tag
+                      type="dot"
+                      closable
+                      color="primary"
+                      v-for="(j, indexn) in item.detail"
+                      :key="indexn"
+                      :name="j"
+                      class="mr20"
+                      @close="handleRemove2(item.detail, indexn)"
+                      >{{ j }}</el-tag
+                    >
+                    <el-input
+                      placeholder="请输入属性值与属性单位"
+                      v-model="item.detail.attrsVal"
+                      style="width: 250px"
+                    >
+                      <el-button
+                        slot="append"
+                        type="primary"
+                        @click="createAttr(item.detail.attrsVal, index)"
+                        >添加</el-button
+                      >
+                    </el-input>
+                  </div>
+                </div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24" v-if="createBnt">
+              <el-form-item>
+                <el-button
+                  type="primary"
+                  icon="md-add"
+                  @click="addBtn"
+                  class="mr15"
+                  >添加新规格</el-button
+                >
+                <el-button type="success" @click="generate">立即生成</el-button>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24" v-if="showIput">
+              <el-col :xl="6" :lg="9" :md="10" :sm="24" :xs="24">
+                <el-form-item label="规格：">
+                  <el-input
+                    placeholder="请输入规格"
+                    v-model="formDynamic.attrsName"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :xl="6" :lg="9" :md="10" :sm="24" :xs="24">
+                <el-form-item label="规格值：">
+                  <el-input
+                    v-model="formDynamic.attrsVal"
+                    placeholder="请输入规格值与规格单位"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :xl="6" :lg="5" :md="10" :sm="24" :xs="24">
+                <el-button type="primary" @click="createAttrName"
+                  >确定</el-button
+                >
+                <el-button type="danger" @click="offAttrName">取消</el-button>
+              </el-col>
+            </el-col>
+            <!-- 多规格设置-->
+            <el-col
+              :xl="24"
+              :lg="24"
+              :md="24"
+              :sm="24"
+              :xs="24"
+              v-if="
+                manyFormValidate.length &&
+                formValidate.header.length !== 0 &&
+                attrs.length !== 0
+              "
+            >
+              <!-- 多规格表格-->
+              <el-col :span="24">
+                <el-form-item label="商品属性：" class="labeltop">
+                  <el-table :data="manyFormValidate" border>
+                    <el-table-column
+                      type="myindex"
+                      v-for="(item, index) in formValidate.header"
+                      :key="index"
+                      :label="item.title"
+                      :property="item.slot"
+                      align="center"
+                    >
+                      <template slot-scope="scope">
+                        <div v-if="scope.column.property == 'pic'">
+                          <single-pic
+                            v-model="scope.row[scope.column.property]"
+                            type="image"
+                            :num="1"
+                            :width="60"
+                            :height="60"
+                          />
+                        </div>
+                        <div
+                          v-else-if="
+                            scope.column.property.indexOf('value') != -1
+                          "
+                        >
+                          {{ scope.row[scope.column.property] }}
+                        </div>
+                        <div v-else-if="scope.column.property == 'action'">
+                          <a @click="delAttrTable(scope.$index)">删除</a>
+                        </div>
+                        <div v-else>
+                          <el-input
+                            v-model="scope.row[scope.column.property]"
+                             onkeyup="value=value.replace(/[^\d{1,}\.\d{1,}|\d{1,}]/g,'')"
+                          />
+                        </div>
+                      </template>
+                    </el-table-column>
+                  </el-table>
+                </el-form-item>
+              </el-col>
+            </el-col>
+          </el-col>
+          <!-- 单规格表格-->
+          <el-col
+            :xl="23"
+            :lg="24"
+            :md="24"
+            :sm="24"
+            :xs="24"
+            v-if="formValidate.spec_type === 0"
+          >
+            <el-form-item>
+              <el-table :data="oneFormValidate" border>
+                <el-table-column prop="pic" label="图片" align="center">
+                  <template slot-scope="scope">
+                    <single-pic
+                      v-model="scope.row.pic"
+                      type="image"
+                      :num="1"
+                      :width="60"
+                      :height="60"
+                    />
+                  </template>
+                </el-table-column>
+                <el-table-column prop="price" label="售价" align="center">
+                  <template slot-scope="scope">
+                    <el-input type="text" v-model="scope.row.price" onkeyup="value=value.replace(/[^\d{1,}\.\d{1,}|\d{1,}]/g,'')" />
+                  </template>
+                </el-table-column>
+                <el-table-column prop="cost" label="成本价" align="center">
+                  <template slot-scope="scope">
+                    <el-input type="text" v-model="scope.row.cost" onkeyup="value=value.replace(/[^\d{1,}\.\d{1,}|\d{1,}]/g,'')" />
+                  </template>
+                </el-table-column>
+                <el-table-column prop="ot_price" label="原价" align="center">
+                  <template slot-scope="scope">
+                    <el-input type="text" v-model="scope.row.ot_price" onkeyup="value=value.replace(/[^\d{1,}\.\d{1,}|\d{1,}]/g,'')" />
+                  </template>
+                </el-table-column>
+                <el-table-column prop="stock" label="库存" align="center">
+                  <template slot-scope="scope">
+                    <el-input type="text" v-model="scope.row.stock" onkeyup="value=value.replace(/[^\d{1,}\.\d{1,}|\d{1,}]/g,'')" />
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="bar_code"
+                  label="商品编号"
+                  align="center"
+                >
+                  <template slot-scope="scope">
+                    <el-input type="text" v-model="scope.row.bar_code" />
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="weight"
+                  label="重量（KG）"
+                  align="center"
+                >
+                  <template slot-scope="scope">
+                    <el-input type="text" v-model="scope.row.weight" onkeyup="value=value.replace(/[^\d{1,}\.\d{1,}|\d{1,}]/g,'')" />
+                  </template>
+                </el-table-column>
+                <el-table-column prop="volume" label="体积(m³" align="center">
+                  <template slot-scope="scope">
+                    <el-input type="text" v-model="scope.row.volume" onkeyup="value=value.replace(/[^\d{1,}\.\d{1,}|\d{1,}]/g,'')" />
+                  </template>
+                </el-table-column>
+
+                <el-table-column
+                  prop="pink_price"
+                  label="拼团价格"
+                  align="center"
+                >
+                  <template slot-scope="scope">
+                    <el-input type="text" v-model="scope.row.pink_price" onkeyup="value=value.replace(/[^\d{1,}\.\d{1,}|\d{1,}]/g,'')" />
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="pink_stock"
+                  label="拼团库存"
+                  align="center"
+                >
+                  <template slot-scope="scope">
+                    <el-input type="text" v-model="scope.row.pink_stock" onkeyup="value=value.replace(/[^\d{1,}\.\d{1,}|\d{1,}]/g,'')" />
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="seckill_price"
+                  label="秒杀价格"
+                  align="center"
+                >
+                  <template slot-scope="scope">
+                    <el-input type="text" v-model="scope.row.seckill_price" onkeyup="value=value.replace(/[^\d{1,}\.\d{1,}|\d{1,}]/g,'')" />
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="seckill_stock"
+                  label="秒杀库存"
+                  align="center"
+                >
+                  <template slot-scope="scope">
+                    <el-input type="text" v-model="scope.row.seckill_stock" onkeyup="value=value.replace(/[^\d{1,}\.\d{1,}|\d{1,}]/g,'')" />
+                  </template>
+                </el-table-column>
+              </el-table>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="运费模板：" prop="temp_id">
+              <div class="acea-row">
+                <el-select v-model="formValidate.temp_id" class="mr20">
+                  <el-option
+                    v-for="(item, index) in templateList"
+                    :value="item.id"
+                    :key="index"
+                    :label="item.name"
+                  ></el-option>
+                </el-select>
+              </div>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="商品详情：">
+              <ueditor-wrap
+                v-model="formValidate.description"
+                :config="myConfig"
+                @beforeInit="addCustomDialog"
+                style="width: 90%"
+              ></ueditor-wrap>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col v-bind="grid">
+            <el-form-item label="虚拟销量：">
+              <el-input-number
+                :min="0"
+                v-model="formValidate.ficti"
+                placeholder="请输入虚拟销量"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid">
+            <el-form-item label="积分：">
+              <el-input-number
+                v-model="formValidate.give_integral"
+                :min="0"
+                placeholder="请输入积分"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid">
+            <el-form-item label="排序：">
+              <el-input-number
+                :min="0"
+                v-model="formValidate.sort"
+                placeholder="请输入排序"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid">
+            <el-form-item label="佣金设置：">
+              <el-radio-group v-model="formValidate.is_sub">
+                <el-radio :label="1" class="radio">单独设置</el-radio>
+                <el-radio :label="0">默认设置</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid">
+            <el-form-item label="自提设置：">
+              <el-radio-group v-model="formValidate.isShowPick">
+                <el-radio :label="0" class="radio">开启</el-radio>
+                <el-radio :label="1">关闭</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" v-if="formValidate.is_sub === 1">
+            <!--单规格返佣-->
+            <el-form-item
+              label="商品属性："
+              v-if="formValidate.spec_type === 0"
+            >
+              <el-table :data="oneFormValidate" border>
+                <el-table-column prop="imageArr" label="图片" align="center">
+                  <template slot-scope="scope">
+                    <el-image :src="scope.row.pic" fit="contain">
+                      <div slot="error" class="image-slot">
+                        <i class="el-icon-picture-outline"></i>
+                      </div>
+                    </el-image>
+                  </template>
+                </el-table-column>
+                <el-table-column prop="price" label="售价" align="center" />
+                <el-table-column prop="cost" label="成本价" align="center" />
+                <el-table-column prop="ot_price" label="原价" align="center" />
+                <el-table-column prop="stock" label="库存" align="center" />
+                <el-table-column
+                  prop="bar_code"
+                  label="商品编号"
+                  align="center"
+                />
+                <el-table-column
+                  prop="weight"
+                  label="重量（KG）"
+                  align="center"
+                />
+                <el-table-column prop="volume" label="体积(m³" align="center" />
+                <el-table-column prop="volume" label="一级返佣" align="center">
+                  <template slot-scope="scope">
+                    <el-input type="text" v-model="scope.row.brokerage" />
+                  </template>
+                </el-table-column>
+                <el-table-column prop="volume" label="二级返佣" align="center">
+                  <template slot-scope="scope">
+                    <el-input type="text" v-model="scope.row.brokerage_two" />
+                  </template>
+                </el-table-column>
+              </el-table>
+            </el-form-item>
+            <el-form-item
+              label="商品属性："
+              v-if="formValidate.spec_type === 1 && manyFormValidate.length"
+            >
+              <el-table :data="manyFormValidate" border>
+                <el-table-column prop="imageArr" label="图片" align="center">
+                  <template slot-scope="scope">
+                    <el-image :src="scope.row.pic" fit="contain">
+                      <div slot="error" class="image-slot">
+                        <i class="el-icon-picture-outline"></i>
+                      </div>
+                    </el-image>
+                  </template>
+                </el-table-column>
+                <el-table-column prop="price" label="售价" align="center" />
+                <el-table-column prop="cost" label="成本价" align="center" />
+                <el-table-column prop="ot_price" label="原价" align="center" />
+                <el-table-column prop="stock" label="库存" align="center" />
+                <el-table-column
+                  prop="bar_code"
+                  label="商品编号"
+                  align="center"
+                />
+                <el-table-column
+                  prop="weight"
+                  label="重量（KG）"
+                  align="center"
+                />
+                <el-table-column prop="volume" label="体积(m³" align="center" />
+                <el-table-column prop="volume" label="一级返佣" align="center">
+                  <template slot-scope="scope">
+                    <el-input type="text" v-model="scope.row.brokerage" />
+                  </template>
+                </el-table-column>
+                <el-table-column prop="volume" label="二级返佣" align="center">
+                  <template slot-scope="scope">
+                    <el-input type="text" v-model="scope.row.brokerage_two" />
+                  </template>
+                </el-table-column>
+              </el-table>
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid">
+            <el-form-item label="商品状态：">
+              <el-radio-group v-model="formValidate.is_show">
+                <el-radio :label="1" class="radio">上架</el-radio>
+                <el-radio :label="0">下架</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid">
+            <el-form-item label="是否首页显示：">
+              <el-radio-group v-model="formValidate.is_hot">
+                <el-radio :label="0" class="radio">开启</el-radio>
+                <el-radio :label="1">关闭</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid">
+            <el-form-item label="宝象严选：">
+              <el-radio-group v-model="formValidate.isElephant">
+                <el-radio :label="1" class="radio">开启</el-radio>
+                <el-radio :label="0">关闭</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <!-- <el-col v-bind="grid">
+            <el-form-item label="猜你喜欢：">
+              <el-radio-group v-model="formValidate.is_benefit">
+                <el-radio :label="1" class="radio">开启</el-radio>
+                <el-radio :label="0">关闭</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col> -->
+          <!-- <el-col v-bind="grid">
+            <el-form-item label="精品推荐：">
+              <el-radio-group v-model="formValidate.is_best">
+                <el-radio :label="1" class="radio">开启</el-radio>
+                <el-radio :label="0">关闭</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col> -->
+          <!-- <el-col v-bind="grid">
+            <el-form-item label="首发新品：">
+              <el-radio-group v-model="formValidate.is_new">
+                <el-radio :label="1" class="radio">开启</el-radio>
+                <el-radio :label="0">关闭</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col> -->
+          <!-- <el-col v-bind="grid">
+            <el-form-item label="会员礼包：">
+              <el-radio-group v-model="formValidate.is_vip_gift">
+                <el-radio :label="1" class="radio">开启</el-radio>
+                <el-radio :label="0">关闭</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col> -->
+        </el-row>
+        <el-form-item>
+          <el-button
+            type="primary"
+            class="submission"
+            @click="handleSubmit('formValidate')"
+            >保存</el-button
+          >
+        </el-form-item>
+      </el-form>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import { getCates } from "@/api/yxStoreCategory";
+import {
+  add,
+  edit,
+  getInfo,
+  isFormatAttr,
+  addpa,
+  pospa,
+  gets,
+} from "@/api/yxStoreProduct";
+import editor from '../../../components/Editor'
+import picUpload from "@/components/pic-upload";
+import mulpicUpload from "@/components/mul-pic-upload";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import MaterialList from "@/components/material";
+import singlePic from "@/components/singlematerial";
+import UeditorWrap from "vue-ueditor-wrap";
+import { mapGetters } from 'vuex'
+import { getToken } from '@/utils/auth'
+export default {
+  components: {
+    editor,
+    picUpload,
+    mulpicUpload,
+    Treeselect,
+    MaterialList,
+    UeditorWrap,
+    singlePic,
+  },
+      computed: {
+    ...mapGetters([
+      'qiNiuUploadApi'
+    ])
+  },
+  inject: ["reload"],
+  data() {
+    return {
+      commodity:[],
+      categoryes:true,
+      fileListm: [],
+      videose:{
+        name:''
+      },
+      headers: {  'Authorization': getToken() },
+      category: [],
+      delivery: false,
+      paname: "",
+      dialogFormVisible: false,
+      formLabelWidth: "120px",
+      conte: [],
+      id: "",
+      spinShow: false,
+      grid2: {
+        xl: 10,
+        lg: 12,
+        md: 12,
+        sm: 24,
+        xs: 24,
+      },
+      grid3: {
+        xl: 18,
+        lg: 18,
+        md: 20,
+        sm: 24,
+        xs: 24,
+      },
+      // 批量设置表格data
+      oneFormBatch: [
+        {
+          pic: "",
+          price: 0,
+          cost: 0,
+          ot_price: 0,
+          stock: 0,
+          bar_code: "",
+          weight: 0,
+          volume: 0,
+        },
+      ],
+      // 规格数据
+      formDynamic: {
+        attrsName: "",
+        attrsVal: "",
+      },
+      formDynamicNameData: [],
+      isBtn: false,
+      myConfig: {
+        autoHeightEnabled: false, // 编辑器不自动被内容撑高
+        initialFrameHeight: 500, // 初始容器高度
+        initialFrameWidth: "100%", // 初始容器宽度
+        UEDITOR_HOME_URL: "/UEditor/",
+        serverUrl: "",
+      },
+      columns2: [
+        {
+          title: "图片",
+          slot: "pic",
+          align: "center",
+          minWidth: 80,
+        },
+        {
+          title: "售价",
+          slot: "price",
+          align: "center",
+          minWidth: 95,
+        },
+        {
+          title: "成本价",
+          slot: "cost",
+          align: "center",
+          minWidth: 95,
+        },
+        {
+          title: "原价",
+          slot: "ot_price",
+          align: "center",
+          minWidth: 95,
+        },
+        {
+          title: "库存",
+          slot: "stock",
+          align: "center",
+          minWidth: 95,
+        },
+        {
+          title: "商品编号",
+          slot: "bar_code",
+          align: "center",
+          minWidth: 120,
+        },
+        {
+          title: "重量（KG）",
+          slot: "weight",
+          align: "center",
+          minWidth: 95,
+        },
+        {
+          title: "体积(m³)",
+          slot: "volume",
+          align: "center",
+          minWidth: 95,
+        },
+        {
+          title: "操作",
+          slot: "action",
+          fixed: "right",
+          align: "center",
+          minWidth: 140,
+        },
+      ],
+      columns: [],
+      gridPic: {
+        xl: 6,
+        lg: 8,
+        md: 12,
+        sm: 12,
+        xs: 12,
+      },
+      gridBtn: {
+        xl: 4,
+        lg: 8,
+        md: 8,
+        sm: 8,
+        xs: 8,
+      },
+      ui:0,
+      pageses:null,
+      formValidate: {
+        wechatImage:'',
+        cityWideCategory:'',
+        videosProduct:null,
+        categoryShopId: "",
+        isCityWide: "",
+        imagess: "",
+        share_image: "",
+        imageArr: [],
+        sliderImageArr: [],
+        store_name: "",
+        cate_id: [],
+        sourceId: "",
+        keyword: "",
+        unit_name: "",
+        store_info: "",
+        image: "",
+        slider_image: [],
+        description: "",
+        ficti: 0,
+        give_integral: 0,
+        sort: 0,
+        is_show: 1,
+        is_hot: 0,
+        is_benefit: 0,
+        is_best: 0,
+        is_new: 0,
+        is_good: 0,
+        is_postage: 0,
+        is_sub: 0,
+        id: 0,
+        spec_type: 0,
+        temp_id: "",
+        attrs: [],
+        items: [
+          {
+            pic: "",
+            price: 0,
+            cost: 0,
+            ot_price: 0,
+            stock: 0,
+            bar_code: "",
+          },
+        ],
+        header: [],
+        selectRule: "",
+        isShowPick: 0,
+        isElephant: 0
+      },
+      ruleList: [],
+      templateList: [],
+      createBnt: false,
+      showIput: false,
+      manyFormValidate: [],
+      // 单规格表格data
+      oneFormValidate: [
+        {
+          imageArr: [],
+          pic: "",
+          price: 2,
+          cost: 0,
+          ot_price: 0,
+          stock: 0,
+          bar_code: "",
+          weight: 0,
+          volume: 0,
+          brokerage: 0,
+          brokerage_two: 0,
+          pink_price: 0,
+          pink_stock: 0,
+          seckill_price: 0,
+          seckill_stock: 0,
+        },
+      ],
+      images: [],
+      grid: {
+        xl: 8,
+        lg: 8,
+        md: 12,
+        sm: 24,
+        xs: 24,
+      },
+      loading: false,
+      treeSelect: [],
+      tableIndex: 0,
+      ruleValidate: {
+        store_name: [
+          { required: true, message: "请输入商品名称", trigger: "blur" },
+        ],
+        cate_id: [
+          { required: true, message: "请选择商品分类", trigger: "change" },
+        ],
+        sourceId: [
+          { required: true, message: "请选择商品产地", trigger: "change" },
+        ],
+        keyword: [
+          { required: true, message: "请输入商品关键字", trigger: "blur" },
+        ],
+        unit_name: [{ required: true, message: "请输入单位", trigger: "blur" }],
+        store_info: [
+          { required: true, message: "请输入商品简介", trigger: "blur" },
+        ],
+        spec_type: [
+          { required: true, message: "请选择商品规格", trigger: "change" },
+        ],
+        selectRule: [
+          { required: true, message: "请选择商品规格属性", trigger: "change" },
+        ],
+        temp_id: [
+          {
+            required: true,
+            message: "请选择运费模板",
+            trigger: "change",
+            type: "number",
+          },
+        ],
+      },
+      attrs: [],
+    };
+  },
+  watch: {
+    "form.imageArr": function (val) {
+      if (val) {
+        this.form.image = val.join(",");
+      }
+    },
+    "form.sliderImageArr": function (val) {
+      if (val) {
+        this.form.slider_image = val.join(",");
+      }
+    },
+  },
+  mounted() {
+    this.getInfo();
+  },
+  created() {
+    this.pla();
+    this.yxStoreCategoryShop();
+    this.pageses = this.$route.query.pagede
+    localStorage.setItem('pager',this.pageses)
+    console.log(this.pageses,'iiiiii')
+  },
+  methods: {
+    getuser(val){
+      console.log(val,'什么时候触发')
+      this.formValidate.wechatImage = ''
+      console.log(this.formValidate.wechatImage)
+    },
+    classification(val){
+      this.commodity.forEach(item=>{
+        if(item.value == val){
+          this.formValidate.cityWideCategory = item.label
+        }
+      })
+      console.log( this.formValidate.cityWideCategory)
+    },
+        deliv(val){ //开关触发事件
+
+    if(val == true){
+       this.categoryes = true
+    }else if(val == false){
+       this.categoryes = false
+    }
+
+    },
+    handleExceed(){
+       this.$message.warning(`当前限制选择1个文件个文件`);
+    },
+    handleImage(err, file, fileList){ //上传失败的钩子
+       this.$message({
+                message:'上传文件不要大于15mb',
+                type: 'error'
+              });
+    },
+    handleImageSuccessm(file) {
+      this.fileListm = []
+      // console.log(file, '视频数据')
+      this.videose.name = file.data[0]
+      this.fileListm.push(this.videose)
+      // console.log(this.fileListm,'视频地址')
+      this.formValidate.videosProduct = file.data[0]
+
+    },
+    handleRemovem(file, fileList) {
+
+      this.formValidate.videosProduct = null
+      //  console.log(this.formValidate, '这是什么视频数据')
+    },
+    handlePreviewm(file) {
+      // console.log(file, '这又是什么视频数据')
+    },
+    beforeRemovem(file, fileList) {
+      return this.$confirm(`确定移除 ${file.name}？`)
+    },
+    yxStoreCategoryShop() {
+      let plams = {
+        page: 0,
+        size: 10,
+        sort: "id,desc",
+      };
+      gets(plams).then((res) => {
+        this.category = res.content;
+        console.log(res, "商户数据");
+      });
+    },
+    pla() {
+      let plams = {
+        page: 1,
+        size: 20,
+      };
+      addpa(plams).then((res) => {
+        console.log(res);
+        this.conte = res.content;
+      });
+    },
+    Place() {
+      this.dialogFormVisible = true;
+      // addpa().then(res=>{
+      //   console.log(res)
+      // })
+    },
+    dialogForm() {
+      let plamd = {
+        source: this.paname,
+        page: 1,
+        size: 20,
+        pic: this.formValidate.imagess,
+      };
+      pospa(plamd).then((res) => {
+        console.log(res);
+        if (res == true) {
+          this.dialogFormVisible = false;
+          this.reload();
+        }
+      });
+    },
+    dan() {},
+    confirm() {
+      let that = this;
+      that.createBnt = true;
+      if (that.formValidate.selectRule.trim().length <= 0) {
+        return this.$message({
+          message: "请选择属性",
+          type: "error",
+        });
+      }
+      that.ruleList.forEach(function (item, index) {
+        if (item.ruleName === that.formValidate.selectRule) {
+          that.attrs = item.ruleValue;
+        }
+      });
+    },
+    // 删除表格中的属性
+    delAttrTable(index) {
+      this.manyFormValidate.splice(index, 1);
+    },
+
+    // 添加按钮
+    addBtn() {
+      this.clearAttr();
+      this.createBnt = false;
+      this.showIput = true;
+    },
+    // 立即生成
+    generate() {
+      isFormatAttr(this.formValidate.id, { attrs: this.attrs })
+        .then((res) => {
+          this.manyFormValidate = res.value;
+          let headerdel = {
+            title: "操作",
+            slot: "action",
+            fixed: "right",
+            width: 220,
+          };
+          res.header.push(headerdel);
+          this.formValidate.header = res.header;
+          //this.formValidate.attrs = res.attr;
+          let header = res.header;
+          header.pop();
+          if (!this.$route.params.id && this.formValidate.spec_type === 1) {
+            this.manyFormValidate.map((item) => {
+              item.pic = this.formValidate.image;
+            });
+            this.oneFormBatch[0].pic = this.formValidate.image;
+          }
+        })
+        .catch((res) => {
+          // this.$message({
+          //   message:res.msg,
+          //   type: 'error'
+          // });
+        });
+    },
+    // 取消
+    offAttrName() {
+      this.showIput = false;
+      this.createBnt = true;
+    },
+    clearAttr() {
+      this.formDynamic.attrsName = "";
+      this.formDynamic.attrsVal = "";
+    },
+    // 删除规格
+    handleRemoveRole(index) {
+      this.attrs.splice(index, 1);
+      this.manyFormValidate.splice(index, 1);
+    },
+    // 删除属性
+    handleRemove2(item, index) {
+      item.splice(index, 1);
+    },
+    // 添加规则名称
+    createAttrName() {
+      if (this.formDynamic.attrsName && this.formDynamic.attrsVal) {
+        let data = {
+          value: this.formDynamic.attrsName,
+          detail: [this.formDynamic.attrsVal],
+        };
+        this.attrs.push(data);
+        var hash = {};
+        this.attrs = this.attrs.reduce(function (item, next) {
+          hash[next.value] ? "" : (hash[next.value] = true && item.push(next));
+          return item;
+        }, []);
+        this.clearAttr();
+        this.showIput = false;
+        this.createBnt = true;
+      } else {
+        this.$message.warning("请添加完整的规格！");
+      }
+    },
+    // 添加属性
+    createAttr(num, idx) {
+      if (num) {
+        this.attrs[idx].detail.push(num);
+        var hash = {};
+        this.attrs[idx].detail = this.attrs[idx].detail.reduce(function (
+          item,
+          next
+        ) {
+          hash[next] ? "" : (hash[next] = true && item.push(next));
+          return item;
+        },
+        []);
+      } else {
+        this.$message.warning("请添加属性！");
+      }
+    },
+
+    // 改变规格
+    changeSpec() {},
+    // 详情
+    getInfo() {
+      let that = this;
+      console.log(that.$route,'看看是什么')
+      let id = that.$route.params.id || 0;
+      getInfo(id)
+        .then(async (res) => {
+          let data = res.productInfo;
+          if(data.videosProduct == ''){
+            data.videosProduct = null
+          }
+          console.log(data,'属性')
+          this.commodity = res.cityWideCategory.map((item,index)=>({
+            label:item,
+            value: index
+          }))
+          // console.log('data:'+data)
+
+          if (data) {
+            if (data.isCityWide == 0) {
+              this.delivery = false;
+              this.categoryes = false
+            } else if (data.isCityWide == 1) {
+              this.delivery = true;
+              this.categoryes = true
+            }
+            // console.log(data,'dsdsadas')
+            // let cate_id = parseInt(data.cate_id) || 0;
+            let cate_id = data.cateList || [];
+            // let sourceId = parseInt(data.sourceId) || 0;
+            this.attrs = data.items || [];
+            that.fileListm = []
+            that.formValidate = data;
+            if(that.formValidate.videosProduct !== null){
+              that.videose.name = that.formValidate.videosProduct
+            that.fileListm.push(that.videose)
+            }
+            that.formValidate.cate_id = cate_id;
+            that.formValidate.sourceId = data.sourceId;
+            that.oneFormValidate = [data.attr];
+            that.formValidate.header = [];
+            that.generate();
+            that.manyFormValidate = data.attrs;
+            if (data.spec_type === 0) {
+              that.manyFormValidate = [];
+            } else {
+              that.createBnt = true;
+              that.oneFormValidate = [
+                {
+                  pic: "",
+                  price: 0,
+                  cost: 0,
+                  ot_price: 0,
+                  stock: 0,
+                  bar_code: "",
+                  weight: 0,
+                  volume: 0,
+                  brokerage: 0,
+                  brokerage_two: 0,
+                  pinkPrice: 0,
+                  pinkStock: 0,
+                  seckillPrice: 0,
+                  seckillStock: 0,
+                },
+              ];
+            }
+          }
+
+          that.treeSelect = res.cateList;
+          that.ruleList = res.ruleList;
+          that.templateList = res.tempList;
+        })
+        .catch((res) => {
+          console.log(res);
+          console.log("err:" + res);
+          return this.$message({
+            message: res.msg,
+            type: "error",
+          });
+        });
+    },
+
+    // 提交
+    handleSubmit(name) {
+
+      console.log('传值显示')
+      console.log(name);
+      this.$refs[name].validate((valid) => {
+        if (valid) {
+          if (this.formValidate.spec_type === 0) {
+            this.formValidate.attrs = this.oneFormValidate;
+            this.formValidate.header = [];
+            this.formValidate.items = [];
+          } else {
+            this.formValidate.items = this.attrs;
+            this.formValidate.attrs = this.manyFormValidate;
+          }
+          if (
+            this.formValidate.spec_type === 1 &&
+            this.manyFormValidate.length === 0
+          ) {
+            return this.$message.warning("请点击生成规格！");
+          }
+          let str = "";
+          this.formValidate.cate_id.forEach((val) => {
+            if (str) {
+              str += "," + val[val.length - 1];
+            } else {
+              str += val[val.length - 1];
+            }
+          });
+          this.formValidate.cate_id = str;
+          if (this.delivery == false) {
+            this.formValidate.isCityWide = 0;
+          } else if (this.delivery == true) {
+            this.formValidate.isCityWide = 1;
+          }
+          add(this.formValidate)
+            .then(async (res) => {
+              this.$message({
+                message: "操作成功",
+                type: "success",
+              });
+              setTimeout(() => {
+                this.$router.push({ path: "/shop/goods",query:{
+                  pagr:this.pageses
+                } });
+              }, 500);
+            })
+            .catch((res) => {
+              // this.$message({
+              //   message:res.message,
+              //   type: 'error'
+              // });
+            });
+        } else {
+          if (
+            !this.formValidate.store_name ||
+            !this.formValidate.cate_id ||
+            !this.formValidate.keyword ||
+            !this.formValidate.unit_name ||
+            !this.formValidate.store_info ||
+            !this.formValidate.image ||
+            !this.formValidate.slider_image
+          ) {
+            this.$message.warning("请填写完整商品信息！");
+          }
+        }
+      });
+    },
+
+    // 表单验证
+    validate(prop, status, error) {
+      if (status === false) {
+        this.$message.warning(error);
+      }
+    },
+    addCustomDialog() {
+      window.UE.registerUI(
+        "yshop",
+        function (editor, uiName) {
+          let dialog = new window.UE.ui.Dialog({
+            iframeUrl: "#/yshop/materia/index",
+            editor: editor,
+            name: uiName,
+            title: "上传图片",
+            cssRules: "width:1200px;height:500px;padding:20px;",
+          });
+          this.dialog = dialog;
+
+          var btn = new window.UE.ui.Button({
+            name: "dialog-button",
+            title: "上传图片",
+            cssRules: `background-image: url(../../../assets/images/icons.png);background-position: -726px -77px;`,
+            onclick: function () {
+              dialog.render();
+              dialog.open();
+            },
+          });
+
+          return btn;
+        },
+        37
+      );
+    },
+
+    cancel() {
+      this.resetForm();
+    },
+  },
+};
+</script>
+
+<style scoped lang="stylus">
+.submission {
+  margin-left: 10px;
+}
+
+.color-list .tip {
+  color: #c9c9c9;
+}
+
+.color-list .color-item {
+  height: 30px;
+  line-height: 30px;
+  padding: 0 10px;
+  color: #fff;
+  margin-right: 10px;
+}
+
+.color-list .color-item.blue {
+  background-color: #1E9FFF;
+}
+
+.color-list .color-item.yellow {
+  background-color: rgb(254, 185, 0);
+}
+
+.color-list .color-item.green {
+  background-color: #009688;
+}
+
+.columnsBox {
+  margin-right: 10px;
+}
+
+.priceBox {
+  width: 100%;
+}
+
+.rulesBox {
+  display: flex;
+  flex-wrap: wrap;
+}
+
+.curs {
+  cursor: pointer;
+}
+</style>
diff --git a/src/views/bxg/shop/goods/formes.vue b/src/views/bxg/shop/goods/formes.vue
new file mode 100644
index 0000000..e54e0ea
--- /dev/null
+++ b/src/views/bxg/shop/goods/formes.vue
@@ -0,0 +1,1496 @@
+<template>
+  <div class="app-container">
+    <el-card :bordered="false">
+      <el-form
+        ref="formValidate"
+        :rules="ruleValidate"
+        :model="formValidate"
+        label-width="130px"
+      >
+        <el-row :gutter="24">
+          <!-- 商品信息-->
+          <el-col :span="24">
+           <h4 style="    font-size: 20px;
+    font-weight: 700;">商品基础属性</h4>
+         </el-col>
+          <el-col v-bind="grid2">
+            <el-form-item label="商品名称：" prop="store_name">
+              <el-input
+                v-model="formValidate.store_name"
+                placeholder="请输入商品名称"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid2">
+            <el-form-item label="商品分类：" prop="cate_id" style="float: left">
+              <el-cascader
+                v-model="formValidate.cate_id"
+                :options="treeSelect"
+                :props="{ multiple: true }"
+                clearable
+              ></el-cascader>
+            </el-form-item>
+
+          </el-col>
+          <el-col v-bind="grid2">
+              <el-form-item label="商品产地：" >
+              <el-select v-model="formValidate.sourceId">
+                <el-option
+                  v-for="item in conte"
+                  :value="item.id"
+                  :key="item.id"
+                  :label="item.source"
+
+                >
+                <!-- <img :src="item.pic" alt="" style="width:40px;height:40px;float:left">
+                <p style="margin-left: 50px;
+    margin-top: 1px;">{{item.source}}</p> -->
+    </el-option>
+
+
+              </el-select>
+              <el-button
+                  style="margin-top:5px；font-size:14px"
+                   @click="Place"
+                  >新增产地</el-button>
+            </el-form-item>
+
+          </el-col>
+
+          <el-dialog title="商品产地" :visible.sync="dialogFormVisible" style="width:100%">
+  <el-form >
+    <!-- <el-form-item label="照片：" style="margin-left:70px" >
+              <single-pic
+                v-model="formValidate.imagess"
+                type="image"
+                :num="1"
+                :width="150"
+                :height="150"
+              />
+            </el-form-item> -->
+    <el-form-item label="产地名称：" :label-width="formLabelWidth">
+      <el-input v-model="paname" autocomplete="off"></el-input>
+    </el-form-item>
+  </el-form>
+  <div slot="footer" class="dialog-footer">
+    <el-button @click="dialogFormVisible = false">取 消</el-button>
+    <el-button type="primary" @click="dialogForm">确 定</el-button>
+  </div>
+</el-dialog>
+          <el-col v-bind="grid2">
+            <el-form-item label="商品关键字：" prop>
+              <el-input
+                v-model="formValidate.keyword"
+                placeholder="请输入商品关键字"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid2">
+            <el-form-item label="单位：" prop="unit_name">
+              <el-input
+                v-model="formValidate.unit_name"
+                placeholder="请输入单位"
+              />
+            </el-form-item>
+             <!-- <el-form-item label="是否参与年货节活动:" label-width="150px" >
+             <el-switch v-model="delivery" ></el-switch>
+            </el-form-item> -->
+            <el-form-item label="同城配送分类：">
+              <el-select v-model="formValidate.cityWideCategory"  @change='classification' >
+                <el-option
+                  v-for="item in commodity"
+                  :value="item.value"
+                  :key="item.value"
+                  :label="item.label"
+                >
+                </el-option>
+                 <el-option label="-------空-------" value="-1"  ></el-option>
+              </el-select>
+            </el-form-item>
+             <el-form-item label="商铺选择：" >
+               <el-select v-model="formValidate.categoryShopId" >
+                <el-option
+                  v-for="item in category"
+                  :value="item.id"
+                  :key="item.id"
+                  :label="item.shopName"
+                >
+                </el-option>
+                <el-option label="-------空-------" value="0"></el-option>
+              </el-select>
+            </el-form-item>
+            <!-- <el-form-item label="上传视频">
+              <el-select v-model="formValidate.categoryShopId">
+                <el-option
+                  v-for="item in category"
+                  :value="item.id"
+                  :key="item.id"
+                  :label="item.shopName"
+                >
+    </el-option>
+              </el-select>
+            </el-form-item> -->
+          </el-col>
+          <el-col v-bind="grid2">
+            <el-form-item label="商品简介：" prop>
+              <el-input
+                v-model="formValidate.store_info"
+                type="textarea"
+                :rows="3"
+                placeholder="请输入商品简介"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid2">
+            <el-form-item label="微信分享文本：" >
+              <el-input
+                v-model="formValidate.shareInfo"
+                type="textarea"
+                :rows="3"
+                placeholder="请输入微信分享文本"
+              />
+            </el-form-item>
+          </el-col>
+         <el-col :span="24">
+           <h4 style="    font-size: 20px;
+    font-weight: 700;">商品介紹信息</h4>
+         </el-col>
+
+          <el-col :span="24">
+            <el-row :span='24'>
+              <el-col :span="12">
+                <el-form-item label="商品封面图：" prop="image">
+              <single-pic
+                v-model="formValidate.image"
+                type="image"
+                :num="1"
+                :width="150"
+                :height="150"
+              />
+            </el-form-item>
+              </el-col>
+              <el-col :span="12">
+              <el-form-item label="微信分享图：" prop="wechatImage">
+                   <single-pic
+                v-model="formValidate.wechatImage"
+                type="image"
+                :num="1"
+                :width="150"
+                :height="150"
+                style="float: left"
+              />
+              <div style="float: left;    width: 200px;margin-left:15px
+   ">
+                <span style="color: red; font-size: 18px; font-weight: 700;;margin-left;"
+                  >长宽比列5:4</span
+                >
+              </div>
+               </el-form-item>
+            </el-col>
+            </el-row>
+          </el-col>
+          <el-col :span="24">
+            <el-row :span='24'>
+              <el-col :span="12">
+                <el-form-item label="商品轮播图：" prop="slider_image">
+              <MaterialList
+                v-model="formValidate.slider_image"
+                type="image"
+                :num="4"
+                :width="150"
+                :height="150"
+              />
+            </el-form-item>
+              </el-col>
+              <el-col :span="12">
+              <el-form-item label="商品海报图：  " prop="share_image">
+              <single-pic
+                v-model="formValidate.share_image"
+                type="image"
+                :num="1"
+                :width="150"
+                :height="150"
+                style="float: left"
+              />
+              <div style="float: left; width:200px;margin-left:15px ;">
+                <span style="color: red; font-size: 18px; font-weight: 700;;margin-left;"
+                  >重要：仅可上传尺寸为750*1334的商品分享图，务必按照规则上传，请勿自行上传！！！</span
+                >
+              </div>
+
+            </el-form-item>
+            </el-col>
+            </el-row>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="视频介绍：" >
+              <el-upload
+          class="upload-demo"
+          :action="qiNiuUploadApi"
+          :on-preview="handlePreviewm"
+          :on-remove="handleRemovem"
+          :before-remove="beforeRemovem"
+          :on-success="handleImageSuccessm"
+          :on-error='handleImage'
+           multiple
+          :limit="1"
+          :headers="headers"
+          :file-list="fileListm"
+          :on-exceed="handleExceed"
+          style="width: 60%"
+        >
+          <el-button size="small" type="primary" icon="el-icon-upload"
+            >点击上传</el-button
+          >
+          <span style="font-size: 12px; color: ">请上传对应的商品视频(只能上传一个视频文件，上传文件大不要于15mb)</span>
+        </el-upload>
+              <!-- <single-pic
+                v-model="formValidate.image"
+                type="image"
+                :num="1"
+                :width="150"
+                :height="150"
+              /> -->
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+           <h4 style="    font-size: 20px;
+    font-weight: 700;">商品详细信息</h4>
+         </el-col>
+          <el-col :span="24">
+            <el-form-item label="商品规格：" props="spec_type">
+              <el-radio-group
+                v-model="formValidate.spec_type"
+                @change="changeSpec"
+              >
+                <el-radio :label="0" class="radio">单规格</el-radio>
+                <el-radio :label="1"
+                  >多规格{{ formValidate.spec_typ }}</el-radio
+                >
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <!-- 多规格添加-->
+          <el-col :span="24" v-if="formValidate.spec_type === 1" class="noForm">
+            <el-col :span="24">
+              <el-form-item label="选择规格：" prop>
+                <div class="acea-row row-middle">
+                  <el-select
+                    v-model="formValidate.selectRule"
+                    style="width: 23%"
+                  >
+                    <el-option
+                      v-for="(item, index) in ruleList"
+                      :value="item.ruleName"
+                      :key="index"
+                      >{{ item.ruleName }}</el-option
+                    >
+                  </el-select>
+                  <el-button type="primary" class="mr20" @click="confirm"
+                    >确认</el-button
+                  >
+                </div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item v-if="attrs.length !== 0">
+                <div v-for="(item, index) in attrs" :key="index">
+                  <div class="acea-row row-middle">
+                    <span class="mr5">{{ item.value }}</span>
+                    <i
+                      class="el-icon-circle-close"
+                      @click="handleRemoveRole(index)"
+                    ></i>
+                  </div>
+                  <div class="rulesBox">
+                    <el-tag
+                      type="dot"
+                      closable
+                      color="primary"
+                      v-for="(j, indexn) in item.detail"
+                      :key="indexn"
+                      :name="j"
+                      class="mr20"
+                      @close="handleRemove2(item.detail, indexn)"
+                      >{{ j }}</el-tag
+                    >
+                    <el-input
+                      placeholder="请输入属性值与属性单位"
+                      v-model="item.detail.attrsVal"
+                      style="width: 250px"
+                    >
+                      <el-button
+                        slot="append"
+                        type="primary"
+                        @click="createAttr(item.detail.attrsVal, index)"
+                        >添加</el-button
+                      >
+                    </el-input>
+                  </div>
+                </div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24" v-if="createBnt">
+              <el-form-item>
+                <el-button
+                  type="primary"
+                  icon="md-add"
+                  @click="addBtn"
+                  class="mr15"
+                  >添加新规格</el-button
+                >
+                <el-button type="success" @click="generate">立即生成</el-button>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24" v-if="showIput">
+              <el-col :xl="6" :lg="9" :md="10" :sm="24" :xs="24">
+                <el-form-item label="规格：">
+                  <el-input
+                    placeholder="请输入规格"
+                    v-model="formDynamic.attrsName"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :xl="6" :lg="9" :md="10" :sm="24" :xs="24">
+                <el-form-item label="规格值：">
+                  <el-input
+                    v-model="formDynamic.attrsVal"
+                    placeholder="请输入规格值与规格单位"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :xl="6" :lg="5" :md="10" :sm="24" :xs="24">
+                <el-button type="primary" @click="createAttrName"
+                  >确定</el-button
+                >
+                <el-button type="danger" @click="offAttrName">取消</el-button>
+              </el-col>
+            </el-col>
+            <!-- 多规格设置-->
+            <el-col
+              :xl="24"
+              :lg="24"
+              :md="24"
+              :sm="24"
+              :xs="24"
+              v-if="
+                manyFormValidate.length &&
+                formValidate.header.length !== 0 &&
+                attrs.length !== 0
+              "
+            >
+              <!-- 多规格表格-->
+              <el-col :span="24">
+                <el-form-item label="商品属性：" class="labeltop">
+                  <el-table :data="manyFormValidate" border>
+                    <el-table-column
+                      type="myindex"
+                      v-for="(item, index) in formValidate.header"
+                      :key="index"
+                      :label="item.title"
+                      :property="item.slot"
+                      align="center"
+                    >
+                      <template slot-scope="scope">
+                        <div v-if="scope.column.property == 'pic'">
+                          <single-pic
+                            v-model="scope.row[scope.column.property]"
+                            type="image"
+                            :num="1"
+                            :width="60"
+                            :height="60"
+                          />
+                        </div>
+                        <div
+                          v-else-if="
+                            scope.column.property.indexOf('value') != -1
+                          "
+                        >
+                          {{ scope.row[scope.column.property] }}
+                        </div>
+                        <div v-else-if="scope.column.property == 'action'">
+                          <a @click="delAttrTable(scope.$index)">删除</a>
+                        </div>
+                        <div v-else>
+                          <el-input
+                            v-model="scope.row[scope.column.property]"
+                            onkeyup="value=value.replace(/[^\d{1,}\.\d{1,}|\d{1,}]/g,'')"
+                          />
+                        </div>
+                      </template>
+                    </el-table-column>
+                  </el-table>
+                </el-form-item>
+              </el-col>
+            </el-col>
+          </el-col>
+          <!-- 单规格表格-->
+          <el-col
+            :xl="23"
+            :lg="24"
+            :md="24"
+            :sm="24"
+            :xs="24"
+            v-if="formValidate.spec_type === 0"
+          >
+            <el-form-item>
+              <el-table :data="oneFormValidate" border>
+                <el-table-column prop="pic" label="图片" align="center">
+                  <template slot-scope="scope">
+                    <single-pic
+                      v-model="scope.row.pic"
+                      type="image"
+                      :num="1"
+                      :width="60"
+                      :height="60"
+                    />
+                  </template>
+                </el-table-column>
+                <el-table-column prop="price" label="售价" align="center">
+                  <template slot-scope="scope">
+                    <el-input type="text" v-model="scope.row.price" onkeyup="value=value.replace(/[^\d{1,}\.\d{1,}|\d{1,}]/g,'')" />
+                  </template>
+                </el-table-column>
+                <el-table-column prop="cost" label="成本价" align="center">
+                  <template slot-scope="scope">
+                    <el-input type="text" v-model="scope.row.cost" onkeyup="value=value.replace(/[^\d{1,}\.\d{1,}|\d{1,}]/g,'')" />
+                  </template>
+                </el-table-column>
+                <el-table-column prop="ot_price" label="原价" align="center">
+                  <template slot-scope="scope">
+                    <el-input type="text" v-model="scope.row.ot_price" onkeyup="value=value.replace(/[^\d{1,}\.\d{1,}|\d{1,}]/g,'')" />
+                  </template>
+                </el-table-column>
+                <el-table-column prop="stock" label="库存" align="center">
+                  <template slot-scope="scope">
+                    <el-input type="text" v-model="scope.row.stock" onkeyup="value=value.replace(/[^\d{1,}\.\d{1,}|\d{1,}]/g,'')" />
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="bar_code"
+                  label="商品编号"
+                  align="center"
+                >
+                  <template slot-scope="scope">
+                    <el-input type="text" v-model="scope.row.bar_code" />
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="weight"
+                  label="重量（KG）"
+                  align="center"
+                >
+                  <template slot-scope="scope">
+                    <el-input type="text" v-model="scope.row.weight" onkeyup="value=value.replace(/[^\d{1,}\.\d{1,}|\d{1,}]/g,'')" />
+                  </template>
+                </el-table-column>
+                <el-table-column prop="volume" label="体积(m³" align="center">
+                  <template slot-scope="scope">
+                    <el-input type="text" v-model="scope.row.volume" onkeyup="value=value.replace(/[^\d{1,}\.\d{1,}|\d{1,}]/g,'')" />
+                  </template>
+                </el-table-column>
+
+                <el-table-column prop="pink_price" label="拼团价格" align="center">
+                  <template slot-scope="scope">
+                    <el-input type="text" v-model="scope.row.pink_price" onkeyup="value=value.replace(/[^\d{1,}\.\d{1,}|\d{1,}]/g,'')" />
+                  </template>
+                </el-table-column>
+                <el-table-column prop="pink_stock" label="拼团库存" align="center">
+                  <template slot-scope="scope">
+                    <el-input type="text" v-model="scope.row.pink_stock" onkeyup="value=value.replace(/[^\d{1,}\.\d{1,}|\d{1,}]/g,'')" />
+                  </template>
+                </el-table-column>
+                <el-table-column prop="seckill_price" label="秒杀价格" align="center">
+                  <template slot-scope="scope">
+                    <el-input type="text" v-model="scope.row.seckill_price" onkeyup="value=value.replace(/[^\d{1,}\.\d{1,}|\d{1,}]/g,'')" />
+                  </template>
+                </el-table-column>
+                <el-table-column prop="seckill_stock" label="秒杀库存" align="center">
+                  <template slot-scope="scope">
+                    <el-input type="text" v-model="scope.row.seckill_stock" onkeyup="value=value.replace(/[^\d{1,}\.\d{1,}|\d{1,}]/g,'')" />
+                  </template>
+                </el-table-column>
+              </el-table>
+            </el-form-item>
+          </el-col>
+
+
+          <el-col :span="24">
+            <el-form-item label="运费模板：" prop="temp_id">
+              <div class="acea-row">
+                <el-select v-model="formValidate.temp_id" class="mr20">
+                  <el-option
+                    v-for="(item, index) in templateList"
+                    :value="item.id"
+                    :key="index"
+                    :label="item.name"
+                  ></el-option>
+                </el-select>
+              </div>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="商品详情：">
+              <ueditor-wrap
+                v-model="formValidate.description"
+                :config="myConfig"
+                @beforeInit="addCustomDialog"
+                style="width: 90%"
+              ></ueditor-wrap>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col v-bind="grid">
+            <el-form-item label="虚拟销量：">
+              <el-input-number
+                :min="0"
+                v-model="formValidate.ficti"
+                placeholder="请输入虚拟销量"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid">
+            <el-form-item label="积分：">
+              <el-input-number
+                v-model="formValidate.give_integral"
+                :min="0"
+                placeholder="请输入积分"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid">
+            <el-form-item label="排序：">
+              <el-input-number
+                :min="0"
+                v-model="formValidate.sort"
+                placeholder="请输入排序"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid">
+            <el-form-item label="佣金设置：">
+              <el-radio-group v-model="formValidate.is_sub">
+                <el-radio :label="1" class="radio">单独设置</el-radio>
+                <el-radio :label="0">默认设置</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+           <el-col v-bind="grid">
+            <el-form-item label="自提设置：">
+              <el-radio-group v-model="formValidate.isShowPick">
+                <el-radio :label="0" class="radio">开启</el-radio>
+                <el-radio :label="1">关闭</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="24" v-if="formValidate.is_sub === 1">
+            <!--单规格返佣-->
+            <el-form-item
+              label="商品属性："
+              v-if="formValidate.spec_type === 0"
+            >
+              <el-table :data="oneFormValidate" border>
+                <el-table-column prop="imageArr" label="图片" align="center">
+                  <template slot-scope="scope">
+                    <el-image :src="scope.row.pic" fit="contain">
+                      <div slot="error" class="image-slot">
+                        <i class="el-icon-picture-outline"></i>
+                      </div>
+                    </el-image>
+                  </template>
+                </el-table-column>
+                <el-table-column prop="price" label="售价" align="center" />
+                <el-table-column prop="cost" label="成本价" align="center" />
+                <el-table-column prop="ot_price" label="原价" align="center" />
+                <el-table-column prop="stock" label="库存" align="center" />
+                <el-table-column
+                  prop="bar_code"
+                  label="商品编号"
+                  align="center"
+                />
+                <el-table-column
+                  prop="weight"
+                  label="重量（KG）"
+                  align="center"
+                />
+                <el-table-column prop="volume" label="体积(m³" align="center" />
+                <el-table-column prop="volume" label="一级返佣" align="center">
+                  <template slot-scope="scope">
+                    <el-input type="text" v-model="scope.row.brokerage" />
+                  </template>
+                </el-table-column>
+                <el-table-column prop="volume" label="二级返佣" align="center">
+                  <template slot-scope="scope">
+                    <el-input type="text" v-model="scope.row.brokerage_two" />
+                  </template>
+                </el-table-column>
+              </el-table>
+            </el-form-item>
+            <el-form-item
+              label="商品属性："
+              v-if="formValidate.spec_type === 1 && manyFormValidate.length"
+            >
+              <el-table :data="manyFormValidate" border>
+                <el-table-column prop="imageArr" label="图片" align="center">
+                  <template slot-scope="scope">
+                    <el-image :src="scope.row.pic" fit="contain">
+                      <div slot="error" class="image-slot">
+                        <i class="el-icon-picture-outline"></i>
+                      </div>
+                    </el-image>
+                  </template>
+                </el-table-column>
+                <el-table-column prop="price" label="售价" align="center" />
+                <el-table-column prop="cost" label="成本价" align="center" />
+                <el-table-column prop="ot_price" label="原价" align="center" />
+                <el-table-column prop="stock" label="库存" align="center" />
+                <el-table-column
+                  prop="bar_code"
+                  label="商品编号"
+                  align="center"
+                />
+                <el-table-column
+                  prop="weight"
+                  label="重量（KG）"
+                  align="center"
+                />
+                <el-table-column prop="volume" label="体积(m³" align="center" />
+                <el-table-column prop="volume" label="一级返佣" align="center">
+                  <template slot-scope="scope">
+                    <el-input type="text" v-model="scope.row.brokerage" />
+                  </template>
+                </el-table-column>
+                <el-table-column prop="volume" label="二级返佣" align="center">
+                  <template slot-scope="scope">
+                    <el-input type="text" v-model="scope.row.brokerage_two" />
+                  </template>
+                </el-table-column>
+              </el-table>
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid">
+            <el-form-item label="商品状态：">
+              <el-radio-group v-model="formValidate.is_show">
+                <el-radio :label="1" class="radio">上架</el-radio>
+                <el-radio :label="0">下架</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid">
+            <el-form-item label="是否首页显示：">
+              <el-radio-group v-model="formValidate.is_hot">
+                <el-radio :label="0" class="radio">开启</el-radio>
+                <el-radio :label="1">关闭</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid">
+            <el-form-item label="宝象严选：">
+              <el-radio-group v-model="formValidate.isElephant">
+                <el-radio :label="1" class="radio">开启</el-radio>
+                <el-radio :label="0">关闭</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <!-- <el-col v-bind="grid">
+            <el-form-item label="猜你喜欢：">
+              <el-radio-group v-model="formValidate.is_benefit">
+                <el-radio :label="1" class="radio">开启</el-radio>
+                <el-radio :label="0">关闭</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col> -->
+          <!-- <el-col v-bind="grid">
+            <el-form-item label="精品推荐：">
+              <el-radio-group v-model="formValidate.is_best">
+                <el-radio :label="1" class="radio">开启</el-radio>
+                <el-radio :label="0">关闭</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col> -->
+          <!-- <el-col v-bind="grid">
+            <el-form-item label="首发新品：">
+              <el-radio-group v-model="formValidate.is_new">
+                <el-radio :label="1" class="radio">开启</el-radio>
+                <el-radio :label="0">关闭</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col> -->
+          <!-- <el-col v-bind="grid">
+            <el-form-item label="会员礼包：">
+              <el-radio-group v-model="formValidate.is_vip_gift">
+                <el-radio :label="1" class="radio">开启</el-radio>
+                <el-radio :label="0">关闭</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col> -->
+        </el-row>
+        <el-form-item>
+          <el-button
+            type="primary"
+            class="submission"
+            @click="handleSubmit('formValidate')"
+            >保存</el-button
+          >
+        </el-form-item>
+      </el-form>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import { getCates } from "@/api/yxStoreCategory";
+import { add, edit, getInfo, isFormatAttr, addpa ,pospa,gets,Content } from "@/api/yxStoreProduct";
+import editor from '../../../components/Editor'
+import picUpload from "@/components/pic-upload";
+import mulpicUpload from "@/components/mul-pic-upload";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import MaterialList from "@/components/material";
+import singlePic from "@/components/singlematerial";
+import UeditorWrap from "vue-ueditor-wrap";
+import { mapGetters } from 'vuex'
+import { getToken } from '@/utils/auth'
+export default {
+  components: {
+    editor,
+    picUpload,
+    mulpicUpload,
+    Treeselect,
+    MaterialList,
+    UeditorWrap,
+    singlePic,
+  },
+    computed: {
+    ...mapGetters([
+      'qiNiuUploadApi'
+    ])
+  },
+  inject: ["reload"],
+  data() {
+    return {
+      commodity:[],
+      categoryes:false,
+      fileListm: [],
+      videose:{
+        name:''
+      },
+      headers: {  'Authorization': getToken() },
+      category:[],
+      delivery:false,
+      deliverys:false,
+      paname:'',
+        dialogFormVisible: false,
+        formLabelWidth: '120px',
+      conte:[],
+      id:'',
+      spinShow: false,
+      grid2: {
+        xl: 10,
+        lg: 12,
+        md: 12,
+        sm: 24,
+        xs: 24,
+      },
+      grid3: {
+        xl: 18,
+        lg: 18,
+        md: 20,
+        sm: 24,
+        xs: 24,
+      },
+      // 批量设置表格data
+      oneFormBatch: [
+        {
+          pic: "",
+          price: 0,
+          cost: 0,
+          ot_price: 0,
+          stock: 0,
+          bar_code: "",
+          weight: 0,
+          volume: 0,
+        },
+      ],
+      // 规格数据
+      formDynamic: {
+        attrsName: "",
+        attrsVal: "",
+      },
+      formDynamicNameData: [],
+      isBtn: false,
+      myConfig: {
+        autoHeightEnabled: false, // 编辑器不自动被内容撑高
+        initialFrameHeight: 500, // 初始容器高度
+        initialFrameWidth: "100%", // 初始容器宽度
+        UEDITOR_HOME_URL: "/UEditor/",
+        serverUrl: "",
+      },
+      columns2: [
+        {
+          title: "图片",
+          slot: "pic",
+          align: "center",
+          minWidth: 80,
+        },
+        {
+          title: "售价",
+          slot: "price",
+          align: "center",
+          minWidth: 95,
+        },
+        {
+          title: "成本价",
+          slot: "cost",
+          align: "center",
+          minWidth: 95,
+        },
+        {
+          title: "原价",
+          slot: "ot_price",
+          align: "center",
+          minWidth: 95,
+        },
+        {
+          title: "库存",
+          slot: "stock",
+          align: "center",
+          minWidth: 95,
+        },
+        {
+          title: "商品编号",
+          slot: "bar_code",
+          align: "center",
+          minWidth: 120,
+        },
+        {
+          title: "重量（KG）",
+          slot: "weight",
+          align: "center",
+          minWidth: 95,
+        },
+        {
+          title: "体积(m³)",
+          slot: "volume",
+          align: "center",
+          minWidth: 95,
+        },
+        {
+          title: "操作",
+          slot: "action",
+          fixed: "right",
+          align: "center",
+          minWidth: 140,
+        },
+      ],
+      columns: [],
+      gridPic: {
+        xl: 6,
+        lg: 8,
+        md: 12,
+        sm: 12,
+        xs: 12,
+      },
+      gridBtn: {
+        xl: 4,
+        lg: 8,
+        md: 8,
+        sm: 8,
+        xs: 8,
+      },
+
+      // 提交传递的数据
+      formValidate: {
+        shareInfo:'',
+        wechatImage:'',
+        cityWideCategory:'-1',
+        videosProduct:null,
+        categoryShopId:'0',
+        isCityWide:'',
+        imagess:'',
+        share_image: "",
+        imageArr: [],
+        sliderImageArr: [],
+        store_name: "",
+        cate_id: "",
+        sourceId:'',
+        keyword: "",
+        unit_name: "",
+        store_info: "",
+        image: "",
+        slider_image: [],
+        description: "",
+        ficti: 0,
+        give_integral: 0,
+        sort: 0,
+        is_show: 1,
+        is_hot: 0,
+        is_benefit: 0,
+        is_best: 0,
+        is_new: 0,
+        is_good: 0,
+        is_postage: 0,
+        is_sub: 0,
+        id: 0,
+        spec_type: 0,
+        temp_id: "",
+        attrs: [],
+        items: [
+          {
+            pic: "",
+            price: 0,
+            cost: 0,
+            ot_price: 0,
+            stock: 0,
+            bar_code: "",
+          },
+        ],
+        header: [],
+        selectRule: "",
+        isShowPick:0,
+        isElephant: 0
+      },
+
+      ruleList: [],
+      templateList: [],
+      createBnt: false,
+      showIput: false,
+      manyFormValidate: [],
+      // 单规格表格data
+      oneFormValidate: [
+        {
+          imageArr: [],
+          pic: "",
+          price: 2,
+          cost: 0,
+          ot_price: 0,
+          stock: 0,
+          bar_code: "",
+          weight: 0,
+          volume: 0,
+          brokerage: 0,
+          brokerage_two: 0,
+          pink_price : 0,
+
+pink_stock : 0,
+seckill_price : 0,
+
+seckill_stock : 0,
+        },
+      ],
+      images: [],
+      grid: {
+        xl: 8,
+        lg: 8,
+        md: 12,
+        sm: 24,
+        xs: 24,
+      },
+      loading: false,
+      treeSelect: [],
+      tableIndex: 0,
+      ruleValidate: {
+        store_name: [
+          { required: true, message: "请输入商品名称", trigger: "blur" },
+        ],
+        cate_id: [
+          { required: true, message: "请选择商品分类", trigger: "change" },
+        ],
+         sourceId: [
+          { required: true, message: "请选择商品产地", trigger: "change" },
+        ],
+        keyword: [
+          { required: true, message: "请输入商品关键字", trigger: "blur" },
+        ],
+        unit_name: [{ required: true, message: "请输入单位", trigger: "blur" }],
+        store_info: [
+          { required: true, message: "请输入商品简介", trigger: "blur" },
+        ],
+        spec_type: [
+          { required: true, message: "请选择商品规格", trigger: "change" },
+        ],
+        selectRule: [
+          { required: true, message: "请选择商品规格属性", trigger: "change" },
+        ],
+        temp_id: [
+          {
+            required: true,
+            message: "请选择运费模板",
+            trigger: "change",
+            type: "number",
+          },
+        ],
+      },
+      attrs: [],
+    };
+  },
+  watch: {
+    "form.imageArr": function (val) {
+      if (val) {
+        this.form.image = val.join(",");
+      }
+    },
+    "form.sliderImageArr": function (val) {
+      if (val) {
+        this.form.slider_image = val.join(",");
+      }
+    },
+  },
+  mounted() {
+    this.getInfo();
+  },
+  created(){
+      this.pla()
+      this.yxStoreCategoryShop()
+      // Content().then(res=>{
+      //   console.log(res,'哦哦')
+      // })
+  },
+  methods: {
+    classification(val){
+      if(val == '-1'){
+            this.formValidate.cityWideCategory = '-------空-------'
+          }
+      this.commodity.forEach(item=>{
+        if(item.value == val){
+
+          this.formValidate.cityWideCategory = item.label
+        }
+      })
+      // this.formValidate.cityWideCategory = commodity.file(item =>{
+      //     if(item.value == val){
+      //       return item.label
+      //     }
+      // })
+      console.log( this.formValidate.cityWideCategory)
+    },
+    // deliv(val){ //开关触发事件
+
+    // if(val == true){
+    //    this.categoryes = true
+    // }else if(val == false){
+    //    this.categoryes = false
+    // }
+
+    // },
+    handleExceed(){
+       this.$message.warning(`当前限制选择1个文件个文件`);
+    },
+    handleImage(err, file, fileList){ //上传失败的钩子
+       this.$message({
+                message:'上传文件不要大于15mb',
+                type: 'error'
+              });
+    },
+    handleImageSuccessm(file) { //上传成功的钩子
+      //  this.$message({
+      //           message:res.message,
+      //           type: 'error'
+      //         });
+      // if(file.errno){
+      //   console.log(789)
+      // }
+      this.fileListm = []
+      console.log(file, '视频数据')
+      this.videose.name = file.data[0]
+      this.fileListm.push(this.videose)
+
+      this.formValidate.videosProduct = file.data[0]
+
+    },
+    handleRemovem(file, fileList) {
+      console.log(file, fileList, '这是什么视频数据')
+       this.formValidate.videosProduct = null
+    },
+    handlePreviewm(file) {
+      console.log(file, '这又是什么视频数据')
+    },
+    beforeRemovem(file, fileList) {
+      return this.$confirm(`确定移除 ${file.name}？`)
+    },
+    yxStoreCategoryShop(){
+      let plams = {
+        page:0,
+        size:10,
+        sort:'id,desc'
+      }
+      gets(plams).then(res=>{
+        this.category = res.content
+        // console.log(res,'商户数据')
+      })
+    },
+    pla(){
+      let plams = {
+        page : 1,
+        size : 20,
+      }
+      addpa(plams).then(res=>{
+        console.log(res,'shenm')
+        this.conte = res.content
+
+      })
+    },
+    Place() {
+        this.dialogFormVisible = true
+      // addpa().then(res=>{
+      //   console.log(res)
+      // })
+    },
+    dialogForm(){
+      let plamd = {
+        source : this.paname,
+        page : 1,
+        size : 20,
+        pic:this.formValidate.imagess
+      }
+      pospa(plamd).then(res=>{
+        console.log(res)
+        if(res == true){
+          this.dialogFormVisible = false
+          this.reload()
+        }
+      })
+
+    },
+    dan() {},
+    confirm() {
+      let that = this;
+      that.createBnt = true;
+      if (that.formValidate.selectRule.trim().length <= 0) {
+        return this.$message({
+          message: "请选择属性",
+          type: "error",
+        });
+      }
+      that.ruleList.forEach(function (item, index) {
+        if (item.ruleName === that.formValidate.selectRule) {
+          that.attrs = item.ruleValue;
+        }
+      });
+    },
+    // 删除表格中的属性
+    delAttrTable(index) {
+      this.manyFormValidate.splice(index, 1);
+    },
+    // 添加按钮
+    addBtn() {
+      this.clearAttr();
+      this.createBnt = false;
+      this.showIput = true;
+    },
+    // 立即生成
+    generate() {
+      isFormatAttr(this.formValidate.id, { attrs: this.attrs })
+        .then((res) => {
+          this.manyFormValidate = res.value;
+          let headerdel = {
+            title: "操作",
+            slot: "action",
+            fixed: "right",
+            width: 220,
+          };
+          res.header.push(headerdel);
+          this.formValidate.header = res.header;
+          //this.formValidate.attrs = res.attr;
+          let header = res.header;
+          header.pop();
+          if (!this.$route.params.id && this.formValidate.spec_type === 1) {
+            this.manyFormValidate.map((item) => {
+              item.pic = this.formValidate.image;
+            });
+            this.oneFormBatch[0].pic = this.formValidate.image;
+          }
+        })
+        .catch((res) => {
+          // this.$message({
+          //   message:res.msg,
+          //   type: 'error'
+          // });
+        });
+    },
+    // 取消
+    offAttrName() {
+      this.showIput = false;
+      this.createBnt = true;
+    },
+    clearAttr() {
+      this.formDynamic.attrsName = "";
+      this.formDynamic.attrsVal = "";
+    },
+    // 删除规格
+    handleRemoveRole(index) {
+      this.attrs.splice(index, 1);
+      this.manyFormValidate.splice(index, 1);
+    },
+    // 删除属性
+    handleRemove2(item, index) {
+      item.splice(index, 1);
+    },
+    // 添加规则名称
+    createAttrName() {
+      if (this.formDynamic.attrsName && this.formDynamic.attrsVal) {
+        let data = {
+          value: this.formDynamic.attrsName,
+          detail: [this.formDynamic.attrsVal],
+        };
+        this.attrs.push(data);
+        var hash = {};
+        this.attrs = this.attrs.reduce(function (item, next) {
+          hash[next.value] ? "" : (hash[next.value] = true && item.push(next));
+          return item;
+        }, []);
+        this.clearAttr();
+        this.showIput = false;
+        this.createBnt = true;
+      } else {
+        this.$message.warning("请添加完整的规格！");
+      }
+    },
+    // 添加属性
+    createAttr(num, idx) {
+      if (num) {
+        this.attrs[idx].detail.push(num);
+        var hash = {};
+        this.attrs[idx].detail = this.attrs[idx].detail.reduce(function (
+          item,
+          next
+        ) {
+          hash[next] ? "" : (hash[next] = true && item.push(next));
+          return item;
+        },
+        []);
+      } else {
+        this.$message.warning("请添加属性！");
+      }
+    },
+
+    // 改变规格
+    changeSpec() {},
+    // 详情
+    getInfo() {
+      let that = this;
+      let id = that.$route.params.id || 0;
+      getInfo(id)
+        .then(async (res) => {
+          let data = res.productInfo;
+          console.log(res,'查看')
+          this.commodity = res.cityWideCategory.map((item,index)=>({
+            label:item,
+            value: index
+          }))
+          console.log(this.commodity)
+
+          if (data) {
+            // let cate_id = parseInt(data.cate_id) || 0;
+            let cate_id = data.cateList || [];
+            // let sourceId = parseInt(data.sourceId) || 0;
+            this.attrs = data.items || [];
+            that.formValidate = data;
+            that.formValidate.cate_id = cate_id;
+            that.formValidate.sourceId = data.sourceId;
+            that.oneFormValidate = [data.attr];
+            that.formValidate.header = [];
+            that.generate();
+            that.manyFormValidate = data.attrs;
+            if (data.spec_type === 0) {
+              that.manyFormValidate = [];
+            } else {
+              that.createBnt = true;
+              that.oneFormValidate = [
+                {
+                  pic: "",
+                  price: 0,
+                  cost: 0,
+                  ot_price: 0,
+                  stock: 0,
+                  bar_code: "",
+                  weight: 0,
+                  volume: 0,
+                  brokerage: 0,
+                  brokerage_two: 0,
+                },
+              ];
+            }
+          }
+
+          that.treeSelect = res.cateList;
+          that.ruleList = res.ruleList;
+          that.templateList = res.tempList;
+        })
+        .catch((res) => {
+          console.log("err:" + res);
+          return this.$message({
+            message: res.msg,
+            type: "error",
+          });
+        });
+    },
+
+    // 提交
+    handleSubmit(name) {
+      // console.log(name, '我我偶皮破')
+      if(this.formValidate.cityWideCategory == -1){
+        this.formValidate.cityWideCategory = '-------空-------'
+      }
+      // this.oneFormValidate.pinkPrice = Number(this.oneFormValidate.pinkPrice)
+      console.log(this.formValidate,'dsdsad')
+      this.$refs[name].validate((valid) => {
+        if (valid) {
+          if (this.formValidate.spec_type === 0) {
+            this.formValidate.attrs = this.oneFormValidate;
+            this.formValidate.header = [];
+            this.formValidate.items = [];
+          } else {
+            this.formValidate.items = this.attrs;
+            this.formValidate.attrs = this.manyFormValidate;
+          }
+          if (
+            this.formValidate.spec_type === 1 &&
+            this.manyFormValidate.length === 0
+          ) {
+            return this.$message.warning("请点击生成规格！");
+          }
+          //  console.log(this.this.formValidate)
+          let elepht = this.formValidate.cate_id.some(val => {
+            return val[0] == '宝象认证';
+          })
+          elepht? this.formValidate.isElephant = 1 : this.formValidate.isElephant = 0;
+          let str = '';
+          this.formValidate.cate_id.forEach(val => {
+            if (str) {
+              str += ',' + val[val.length-1]
+            } else {
+              str += val[val.length-1]
+            }
+          });
+          this.formValidate.cate_id = str;
+          if(this.delivery == false){
+            this.formValidate.isCityWide =0
+          }else if(this.delivery == true){
+            this.formValidate.isCityWide =1
+          }
+          console.log(this.formValidate,'判断数据')
+          add(this.formValidate)
+            .then(async (res) => {
+              this.$message({
+                message: "操作成功",
+                type: "success",
+              });
+              setTimeout(() => {
+                this.$router.push({ path: "/shop/goods" });
+              }, 500);
+            })
+            .catch((res) => {
+              // this.$message({
+              //   message:res.message,
+              //   type: 'error'
+              // });
+            });
+        } else {
+          if (
+            !this.formValidate.store_name ||
+            !this.formValidate.cate_id ||
+            !this.formValidate.keyword ||
+            !this.formValidate.unit_name ||
+            !this.formValidate.store_info ||
+            !this.formValidate.image ||
+            !this.formValidate.slider_image
+          ) {
+            this.$message.warning("请填写完整商品信息！");
+          }
+        }
+      });
+    },
+
+    // 表单验证
+    validate(prop, status, error) {
+      if (status === false) {
+        this.$message.warning(error);
+      }
+    },
+    addCustomDialog() {
+      window.UE.registerUI(
+        "yshop",
+        function (editor, uiName) {
+          let dialog = new window.UE.ui.Dialog({
+            iframeUrl: "#/yshop/materia/index",
+            editor: editor,
+            name: uiName,
+            title: "上传图片",
+            cssRules: "width:1200px;height:500px;padding:20px;",
+          });
+          this.dialog = dialog;
+
+          var btn = new window.UE.ui.Button({
+            name: "dialog-button",
+            title: "上传图片",
+            cssRules: `background-image: url(../../../assets/images/icons.png);background-position: -726px -77px;`,
+            onclick: function () {
+              dialog.render();
+              dialog.open();
+            },
+          });
+
+          return btn;
+        },
+        37
+      );
+    },
+
+    cancel() {
+      this.resetForm();
+    },
+  },
+};
+</script>
+
+<style scoped lang="stylus">
+.submission {
+  margin-left: 10px;
+}
+
+.color-list .tip {
+  color: #c9c9c9;
+}
+
+.color-list .color-item {
+  height: 30px;
+  line-height: 30px;
+  padding: 0 10px;
+  color: #fff;
+  margin-right: 10px;
+}
+
+.color-list .color-item.blue {
+  background-color: #1E9FFF;
+}
+
+.color-list .color-item.yellow {
+  background-color: rgb(254, 185, 0);
+}
+
+.color-list .color-item.green {
+  background-color: #009688;
+}
+
+.columnsBox {
+  margin-right: 10px;
+}
+
+.priceBox {
+  width: 100%;
+}
+
+.rulesBox {
+  display: flex;
+  flex-wrap: wrap;
+}
+
+.curs {
+  cursor: pointer;
+}
+</style>
diff --git a/src/views/bxg/shop/goods/index.vue b/src/views/bxg/shop/goods/index.vue
new file mode 100644
index 0000000..1eefa1e
--- /dev/null
+++ b/src/views/bxg/shop/goods/index.vue
@@ -0,0 +1,564 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <!-- 搜索 -->
+      <el-input v-model="query.value" clearable placeholder="输入搜索内容" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
+      <el-select v-model="query.type" clearable placeholder="类型" class="filter-item" style="width: 130px">
+        <el-option v-for="item in queryTypeOptions" :key="item.key" :label="item.display_name" :value="item.key" />
+      </el-select>
+      <el-select v-model="classifyId" clearable placeholder="商品分类" class="filter-item" style="width: 130px">
+        <el-option v-for="item in classification" :key="item.id" :label="item.cateName" :value="item.id" />
+      </el-select>
+      <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
+      <!-- 新增 -->
+      <div style="display: inline-block;margin: 0px 2px;">
+        <el-button
+          class="filter-item"
+          size="mini"
+          type="primary"
+          icon="el-icon-plus"
+          v-permission="['YXSTOREPRODUCT_EDIT']"  
+        >
+          <router-link :to="'/shop/goodsAdd'">
+            新增
+          </router-link>
+        </el-button>
+        <el-button
+          type="danger"
+          class="filter-item"
+          size="mini"
+          icon="el-icon-refresh"
+          @click="Refresh"
+        >重置</el-button>
+      </div>
+    </div>
+    <!--表单组件-->
+    <comForm ref="form3" :is-add="isAdd" />
+    <killForm ref="form4" :is-add="isAdd" />
+    <bargainForm ref="form5" :is-add="isAdd" />
+    <!--表格渲染-->
+    <el-table v-loading="loading" :data="data" size="small" style="width: 100%;height:calc(100vh - 300px);overflow-y: scroll;" id="tablee">
+      <el-table-column prop="id" label="商品id"  align="center" ></el-table-column>
+      <el-table-column ref="table" prop="image" label="商品图片"  align="center">
+        <template slot-scope="scope">
+          <a :href="scope.row.image" style="color: #42b983" target="_blank">
+            <img :src="scope.row.image" alt="点击打开" class="el-avatar">
+          </a>
+        </template>
+      </el-table-column>
+      <el-table-column prop="storeName" label="商品名称"  width="400" align="center" />
+      <el-table-column prop="cateName" label="分类名称"  align="center" /> 
+      <el-table-column prop="price" label="商品价格" align="center" />
+      <el-table-column prop="sales" label="销量"  align="center" />
+      <el-table-column prop="stock" label="库存"  align="center" />
+      <el-table-column prop="pinkStock" label="拼团库存"  align="center" />
+      <el-table-column prop="seckillStock" label="秒杀库存"  align="center" />
+      <el-table-column label="分享码" align="center">
+        <template slot-scope="scope">
+          <el-popover placement="right-start" width="300" trigger="hover">
+            <qrcode :value="scope.row.qrcode" :options="{ width: 280 }" ></qrcode>
+            <el-button slot="reference">
+              <qrcode :value="scope.row.qrcode" style="" :options="{ width: 50 }"
+              ></qrcode>
+            </el-button>
+          </el-popover>
+        </template>
+      </el-table-column>
+      <el-table-column label="状态"  align="center">
+        <template slot-scope="scope">
+          <div @click="onSale(scope.row.id,scope.row.isShow)">
+            <el-tag v-if="scope.row.isShow === 1" style="cursor: pointer" :type="''">已上架</el-tag>
+            <el-tag v-else style="cursor: pointer" :type=" 'info' ">已下架</el-tag>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" width="265px"  align="center" v-if="checkPermission(['YXSTOREPRODUCT_CZ'])">
+        <template slot-scope="scope">
+          
+          
+            <el-button
+            size="mini"
+            type="primary"
+            icon="el-icon-edit"
+            v-permission="['YXSTOREPRODUCT_CREATE']"
+            @click="edits(scope.row)"
+          >
+          
+            编辑
+            </el-button>
+        
+         
+          
+          <el-popover
+            :ref="scope.row.id"
+            placement="top"
+            width="180"
+          >
+            <p>确定删除本条数据吗？</p>
+            <div style="text-align: right; margin: 0">
+              <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
+              <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
+            </div>
+            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" v-permission="['YXSTOREPRODUCT_DELETE']"   >删除</el-button>
+          </el-popover>
+          <el-dropdown size="mini" split-button type="primary" trigger="click" v-permission="['YXSTOREPRODUCT_CZ']">
+            操作
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item>
+                <div
+                  style="text-align: center;width: 60px;height: 25px;"
+                  @click="editC(scope.row)"
+                >开启拼团</div>
+              </el-dropdown-item>
+              <el-dropdown-item>
+                <div
+                  style="text-align: center;width: 60px;height: 25px;"
+                  @click="editD(scope.row)"
+                >开启秒杀</div>
+              </el-dropdown-item>
+              <el-dropdown-item>
+                <div
+                  style="text-align: center;width: 60px;height: 25px;"
+                  @click="editE(scope.row)"
+                >开启砍价</div>
+              </el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--分页组件-->
+    <el-footer style="height:60px;width:100%;background-color:#f6f6f6">
+      <div style="float:left">
+        <el-select v-model="batchExport" @change="handleExportOption" clearable placeholder="批量导出" class="filter-item" style="width: 130px;margin-left:15px;margin-top:15px">
+          <el-option
+            v-for="item in exportOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </div>
+      <el-pagination
+      :total="total"
+      :current-page="Number(page)+1"
+      style="margin-top: 15px;float:right"
+      layout="total, prev, pager, next, sizes"
+      @size-change="sizeChange"
+      @current-change="pageChange"
+      
+    />
+    </el-footer>
+   
+  </div>
+</template>
+
+<script>
+import checkPermission from '@/utils/permission'
+import initData from '@/mixins/crud'
+import { del, onsale ,yxClass } from '@/api/yxStoreProduct'
+import eForm from './form'
+import comForm from '@/views/activity/combination/formt'
+import killForm from '@/views/activity/seckill/newlyAdded'
+import bargainForm from '@/views/activity/bargain/formse'
+import FileSaver from "file-saver";
+import XLSX from "xlsx";
+import VueQrcode from '@chenfengyuan/vue-qrcode';
+export default {
+  components: { eForm, comForm, killForm, bargainForm, qrcode: VueQrcode },
+  mixins: [initData],
+  inject: ['reload'],
+  data() {
+    return {
+      
+      page:0,
+      batchExport:'',
+      exportOptions: [
+          {value: '0', label: '导出本页数据'},
+        ],
+      delLoading: false,
+      visible: false,
+      queryTypeOptions: [
+        { key: 'storeName', display_name: '商品名称' }
+      ],
+      isAttr: false,
+      classifyId:'',
+     classification:[],
+     imagesres:[
+       {
+         image:'',
+         id:''
+       }
+     ]
+    }
+  },
+  created() {
+    
+    console.log('应该有了吧')
+    
+   
+      // this.page = this.$route.query.pagr 
+    
+    this.page  = localStorage.getItem('pager')
+    
+   
+    console.log(this.page,'为什么会是')
+    this.$nextTick(() => {
+      console.log(this.page,'.....')
+      this.init()
+    })
+
+    this.classifi()
+  },
+  destroyed(){
+  
+    localStorage.setItem('pager',0)
+  },
+  methods: {
+    pageChange(val){
+      console.log(val)
+      // this.page = val
+      localStorage.setItem('pager',val-1)
+      this.page = val-1
+      // this.page = val
+      this.init()
+      //  this.init()
+      // console.log(localStorage.getItem('pager'),'呜呜呜呜')
+    },
+    sizeChange(val){
+      console.log(val,'看是')
+      localStorage.setItem('pager',0)
+      this.page = localStorage.getItem('pager')
+      this.size = val
+      this.init()
+    },
+    edits(row){
+      console.log(row,'商品封面图') 
+      console.log(this.page,'不知道')
+      this.$router.push({
+        path: "/shop/goodsEdit/" + row.id,
+        query: { pagede: this.page },
+      });
+      // localStorage.setItem('page',this.page)
+      // sessionStorage.setItem('pages',this.page)
+       
+    },
+    handleExportOption(val){
+      var table = XLSX.utils.table_to_book(document.querySelector("#tablee"));
+      var tb = XLSX.write(table, {
+        bookType: "xlsx",
+        bookSST: true,
+        type: "array",
+      });
+      try {
+        FileSaver.saveAs(
+          new Blob([tb], { type: "application/octet-stream" }),
+          "PV值.xlsx"
+        );
+      } catch (e) {
+        if (typeof console !== "undefined") console.log(e, tb);
+      }
+      this.reload()
+    },
+    Refresh(){
+      this.reload()
+    },
+    checkPermission,
+    beforeInit() {
+      this.url = 'api/yxStoreProduct'
+      const sort = 'id,desc'
+      this.params = { page: this.page, size: this.size, sort: sort, isShow: 1, isDel: 0,cateId:this.classifyId}
+      const query = this.query
+      const type = query.type
+      const value = query.value
+      if (type && value) { this.params[type] = value }
+      // console.log(classification,'dashboard-editor-container')
+      return true
+    },
+classifi(){
+  yxClass().then(res=>{
+    console.log(res,'份额')
+    this.classification = res
+  })
+},
+    subDelete(id) {
+      this.delLoading = true
+      del(id).then(res => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        this.dleChangePage()
+        this.init()
+        this.$notify({
+          title: '删除成功',
+          type: 'success',
+          duration: 2500
+        })
+      }).catch(err => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        console.log(err.response.data.message)
+      })
+    },
+    onSale(id, status) {
+      this.$confirm(`确定进行[${status ? '下架' : '上架'}]操作?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          onsale(id, { status: status }).then(({ data }) => {
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1000,
+              onClose: () => {
+                this.init()
+              }
+            })
+          })
+        })
+        .catch(() => { })
+    },
+    add() {
+      this.isAdd = true
+      this.$refs.form.dialog = true
+      this.$refs.form.getCates()
+      // console.log(data,'修改修改')
+    },
+    edit(data) {
+      console.log('bushi')
+      this.isAdd = false
+      const _this = this.$refs.form
+      _this.getCates()
+      _this.form = {
+        id: data.id,
+        merId: data.merId,
+        image: data.image,
+        sliderImage: data.sliderImage,
+        imageArr: data.image.split(','),
+        sliderImageArr: data.sliderImage.split(','),
+        storeName: data.storeName,
+        storeInfo: data.storeInfo,
+        keyword: data.keyword,
+        barCode: data.barCode,
+        storeCategory: data.storeCategory || {id:null},
+        price: data.price,
+        vipPrice: data.vipPrice,
+        otPrice: data.otPrice,
+        postage: data.postage,
+        unitName: data.unitName,
+        sort: data.sort,
+        sales: data.sales,
+        stock: data.stock,
+        isShow: data.isShow,
+        isHot: data.isHot,
+        isBenefit: data.isBenefit,
+        isBest: data.isBest,
+        isNew: data.isNew,
+        description: data.description,
+        addTime: data.addTime,
+        isPostage: data.isPostage,
+        isDel: data.isDel,
+        merUse: data.merUse,
+        giveIntegral: data.giveIntegral,
+        cost: data.cost,
+        isSeckill: data.isSeckill,
+        isBargain: data.isBargain,
+        isGood: data.isGood,
+        ficti: data.ficti,
+        browse: data.browse,
+        codePath: data.codePath,
+        soureLink: data.soureLink,
+        pinkPrice :data.pinkPrice,
+pinkStock :data.pinkStock,
+seckillPrice :data.seckillPrice,
+
+seckillStock :data.seckillStock
+      }
+      _this.dialog = true
+    },
+    editC(data) {
+      this.imagesres[0].image = data.image
+      this.imagesres[0].id = data.id
+      this.isAdd = false
+      const _this = this.$refs.form3
+      _this.form = {
+        productId: data.id,
+        merId: data.merId,
+        image: data.image,
+        images: data.sliderImage,
+        imageArr: this.imagesres,
+        sliderImageArr: data.sliderImage.split(','),
+        title: data.storeName,
+        info: data.storeInfo,
+        postage: data.postage,
+        unitName: data.unitName,
+        sort: data.sort,
+        sales: 0,
+        stock: data.stock,
+        isShow: 0,
+        isHost: data.isHot,
+        description: data.description,
+        isPostage: data.isPostage,
+        people: 0,
+        price: 0,
+        effectiveTime: 0,
+        combination: 1,
+        cost: data.cost,
+        isDel: 0,
+        browse: 0,
+        pinkPrice :data.pinkPrice,
+pinkStock :data.pinkStock,
+seckillPrice :data.seckillPrice,
+
+seckillStock :data.seckillStock,
+productPrice:0
+      }
+      _this.dialog = true
+    },
+    editD(data) {
+      console.log(data,'秒杀')
+      this.imagesres[0].image = data.image
+      this.imagesres[0].id = data.id
+      this.isAdd = false
+      const _this = this.$refs.form4
+      _this.form = {
+        productId: data.id,
+        merId: data.merId,
+        image: data.image,
+        images: data.sliderImage,
+        imageArr: this.imagesres,
+        sliderImageArr: data.sliderImage.split(','),
+        title: data.storeName,
+        info: data.storeInfo,
+        postage: data.postage,
+        unitName: data.unitName,
+        sort: data.sort,
+        sales: 0,
+        stock: data.stock,
+        isShow: data.isShow,
+        status: 0,
+        isHot: data.isHot,
+        description: data.description,
+        isPostage: data.isPostage,
+        people: 0,
+        price: 0.01,
+        effectiveTime: 24,
+        otPrice: 0,
+        cost: data.cost,
+        num: 1,
+        giveIntegral: 0,
+        isDel: 0,
+        browse: 0,
+        pinkPrice :data.pinkPrice,
+pinkStock :data.pinkStock,
+seckillPrice :data.seckillPrice,
+
+seckillStock :data.seckillStock
+      }
+      _this.dialog = true
+    },
+    editE(data) {
+      console.log(data,'砍价')
+      this.imagesres[0].image = data.image
+      this.imagesres[0].id = data.id
+      this.isAdd = false
+      const _this = this.$refs.form5
+      _this.form = {
+        productId: data.id,
+        merId: data.merId,
+        image: data.image,
+        images: data.sliderImage,
+        imageArr: this.imagesres,
+        sliderImageArr: data.sliderImage.split(','),
+        title: data.storeName,
+        info: '',
+        postage: data.postage,
+        unitName: data.unitName,
+        sort: data.sort,
+        sales: 0,
+        stock: data.stock,
+        isShow: data.isShow,
+        status: 0,
+        isHot: data.isHot,
+        description: data.description,
+        isPostage: data.isPostage,
+        people: 0,
+        price: 0,
+        effectiveTime: 24,
+        otPrice: data.otPrice,
+        cost: data.cost,
+        num: 1,
+        giveIntegral: 0,
+        isDel: 0,
+        browse: 0,
+        pinkPrice :data.pinkPrice,
+pinkStock :data.pinkStock,
+seckillPrice :data.seckillPrice,
+
+seckillStock :data.seckillStock,
+needNum:0,
+minPrice:0
+      }
+      _this.dialog = true
+    },
+    attr(data) {
+      console.log(3333)
+      this.isAttr = false
+      const _this = this.$refs.form2
+      _this.form = {
+        id: data.id,
+        merId: data.merId,
+        image: data.image,
+        sliderImage: data.sliderImage,
+        storeName: data.storeName,
+        storeInfo: data.storeInfo,
+        keyword: data.keyword,
+        barCode: data.barCode,
+        storeCategory: data.storeCategory,
+        price: data.price,
+        vipPrice: data.vipPrice,
+        otPrice: data.otPrice,
+        postage: data.postage,
+        unitName: data.unitName,
+        sort: data.sort,
+        sales: data.sales,
+        stock: data.stock,
+        isShow: data.isShow,
+        isHot: data.isHot,
+        isBenefit: data.isBenefit,
+        isBest: data.isBest,
+        isNew: data.isNew,
+        description: data.description,
+        addTime: data.addTime,
+        isPostage: data.isPostage,
+        isDel: data.isDel,
+        merUse: data.merUse,
+        giveIntegral: data.giveIntegral,
+        cost: data.cost,
+        isSeckill: data.isSeckill,
+        isBargain: data.isBargain,
+        isGood: data.isGood,
+        ficti: data.ficti,
+        browse: data.browse,
+        codePath: data.codePath,
+        soureLink: data.soureLink,
+        pinkPrice :data.pinkPrice,
+pinkStock :data.pinkStock,
+seckillPrice :data.seckillPrice,
+
+seckillStock :data.seckillStock
+      }
+      _this.dialog = true
+      this.$refs.form2.getAttrs(data.id)
+    }
+  }
+}
+</script>
+
+<style scoped>
+.app-container{
+  padding-bottom: 0px;
+}
+</style>
diff --git a/src/views/bxg/shop/goods/index2.vue b/src/views/bxg/shop/goods/index2.vue
new file mode 100644
index 0000000..6b0caed
--- /dev/null
+++ b/src/views/bxg/shop/goods/index2.vue
@@ -0,0 +1,230 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <!-- 搜索 -->
+      <el-input v-model="query.value" clearable placeholder="输入搜索内容" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
+      <el-select v-model="query.type" clearable placeholder="类型" class="filter-item" style="width: 130px">
+        <el-option v-for="item in queryTypeOptions" :key="item.key" :label="item.display_name" :value="item.key" />
+      </el-select>
+      <el-select v-model="classifyId" clearable placeholder="商品分类" class="filter-item" style="width: 130px">
+        <el-option v-for="item in classification" :key="item.id" :label="item.cateName" :value="item.id" />
+      </el-select>
+      <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
+      <!-- 新增 -->
+      <el-button
+        type="danger"
+        class="filter-item"
+        size="mini"
+        icon="el-icon-refresh"
+        @click="Refresh"
+      >刷新</el-button>
+    </div>
+    <!--表单组件-->
+    <!--表格渲染-->
+    <el-table v-loading="loading" :data="data" size="small" style="width: 100%;height:calc(100vh - 300px);overflow-y: scroll;">
+      <el-table-column prop="id" label="商品id"  align="center" />
+      <el-table-column ref="table" prop="image" label="商品图片" align="center">
+        <template slot-scope="scope">
+          <a :href="scope.row.image" style="color: #42b983" target="_blank"><img :src="scope.row.image" alt="点击打开" class="el-avatar"></a>
+        </template>
+      </el-table-column>
+      <el-table-column prop="storeName" label="商品名称"  align="center" width="400"  />
+      <el-table-column prop="storeCategory.cateName" label="分类名称" align="center" />
+      <el-table-column prop="price" label="商品价格" align="center" />
+      <el-table-column prop="sales" label="销量"  align="center" />
+      <el-table-column prop="stock" label="库存" align="center" />
+      <el-table-column label="状态" align="center" >
+        <template slot-scope="scope">
+          <div @click="onSale(scope.row.id,scope.row.isShow)">
+            <el-tag v-if="scope.row.isShow === 1" style="cursor: pointer" :type="''">已上架</el-tag>
+            <el-tag v-else style="cursor: pointer" :type=" 'info' ">已下架</el-tag>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column v-if="checkPermission(['admin','YXSTOREPRODUCT_ALL','YXSTOREPRODUCT_EDIT','YXSTOREPRODUCT_DELETE'])" label="操作" width="150px" align="center">
+        <template slot-scope="scope">
+          <el-button v-permission="['admin','YXSTOREPRODUCT_ALL','YXSTOREPRODUCT_EDIT']" size="mini" type="primary" icon="el-icon-edit">
+            <router-link :to="'/shop/goodsEdit/'+scope.row.id">
+              编辑
+            </router-link>
+          </el-button>
+          <el-popover
+            :ref="scope.row.id"
+            v-permission="['admin','YXSTOREPRODUCT_ALL','YXSTOREPRODUCT_DELETE']"
+            placement="top"
+            width="180"
+          >
+            <p>确定删除本条数据吗？</p>
+            <div style="text-align: right; margin: 0">
+              <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
+              <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
+            </div>
+            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
+          </el-popover>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--分页组件-->
+    <el-footer style="height:60px;width:100%;background-color:#f6f6f6">
+      <div style="float:left">
+
+      </div>
+      <el-pagination
+      :total="total"
+      :current-page="page + 1"
+      style="margin-top: 15px;float:right"
+      layout="total, prev, pager, next, sizes"
+      @size-change="sizeChange"
+      @current-change="pageChange"
+    />
+    </el-footer>
+    
+  </div>
+</template>
+
+<script>
+import checkPermission from '@/utils/permission'
+import initData from '@/mixins/crud'
+import { del, onsale,yxClass } from '@/api/yxStoreProduct'
+import eForm from './form'
+export default {
+  components: { eForm },
+  mixins: [initData],
+    inject: ['reload'],
+  data() {
+    return {
+      delLoading: false,
+      visible: false,
+      queryTypeOptions: [
+        { key: 'storeName', display_name: '商品名称' }
+      ],
+       classifyId:'',
+     classification:[],
+    }
+  },
+  created() {
+    this.$nextTick(() => {
+      this.init()
+    })
+     this.classifi()
+  },
+  methods: {
+    Refresh(){
+      this.reload()
+    },
+    checkPermission,
+    beforeInit() {
+      this.url = 'api/yxStoreProduct'
+      const sort = 'id,desc'
+      this.params = { page: this.page, size: this.size, sort: sort, isShow: 0, isDel: 0,cateId:this.classifyId }
+      const query = this.query
+      const type = query.type
+      const value = query.value
+      if (type && value) { this.params[type] = value }
+      return true
+    },
+    classifi(){
+  yxClass().then(res=>{
+    console.log(res,'份额')
+    this.classification = res
+  })
+},
+    subDelete(id) {
+      this.delLoading = true
+      del(id).then(res => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        this.dleChangePage()
+        this.init()
+        this.$notify({
+          title: '删除成功',
+          type: 'success',
+          duration: 2500
+        })
+      }).catch(err => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        console.log(err.response.data.message)
+      })
+    },
+    onSale(id, status) {
+      this.$confirm(`确定进行[${status ? '下架' : '上架'}]操作?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          onsale(id, { status: status }).then(({ data }) => {
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1000,
+              onClose: () => {
+                this.init()
+              }
+            })
+          })
+        })
+        .catch(() => { })
+    },
+    add() {
+      this.isAdd = true
+      this.$refs.form.dialog = true
+      this.$refs.form.getCates()
+    },
+    edit(data) {
+      this.isAdd = false
+      const _this = this.$refs.form
+      _this.getCates()
+      _this.form = {
+        id: data.id,
+        merId: data.merId,
+        image: data.image,
+        sliderImage: data.sliderImage,
+        imageArr: data.image.split(','),
+        sliderImageArr: data.sliderImage.split(','),
+        storeName: data.storeName,
+        storeInfo: data.storeInfo,
+        keyword: data.keyword,
+        barCode: data.barCode,
+        storeCategory: data.storeCategory || {id:null},
+        price: data.price,
+        vipPrice: data.vipPrice,
+        otPrice: data.otPrice,
+        postage: data.postage,
+        unitName: data.unitName,
+        sort: data.sort,
+        sales: data.sales,
+        stock: data.stock,
+        isShow: data.isShow,
+        isHot: data.isHot,
+        isBenefit: data.isBenefit,
+        isBest: data.isBest,
+        isNew: data.isNew,
+        description: data.description,
+        addTime: data.addTime,
+        isPostage: data.isPostage,
+        isDel: data.isDel,
+        merUse: data.merUse,
+        giveIntegral: data.giveIntegral,
+        cost: data.cost,
+        isSeckill: data.isSeckill,
+        isBargain: data.isBargain,
+        isGood: data.isGood,
+        ficti: data.ficti,
+        browse: data.browse,
+        codePath: data.codePath,
+        soureLink: data.soureLink
+      }
+      _this.dialog = true
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .app-container{
+  padding-bottom: 0px;
+}
+</style>
diff --git a/src/views/bxg/shop/goods/index3.vue b/src/views/bxg/shop/goods/index3.vue
new file mode 100644
index 0000000..049488d
--- /dev/null
+++ b/src/views/bxg/shop/goods/index3.vue
@@ -0,0 +1,195 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <!-- 搜索 -->
+      <el-input v-model="query.value" clearable placeholder="输入搜索内容" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
+      <el-select v-model="query.type" clearable placeholder="类型" class="filter-item" style="width: 130px">
+        <el-option v-for="item in queryTypeOptions" :key="item.key" :label="item.display_name" :value="item.key" />
+      </el-select>
+      <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
+      <!-- 新增 -->
+      <el-button
+        type="danger"
+        class="filter-item"
+        size="mini"
+        icon="el-icon-refresh"
+        @click="toQuery"
+      >刷新</el-button>
+    </div>
+    <!--表单组件-->
+    <eForm ref="form" :is-add="isAdd" />
+    <!--表格渲染-->
+    <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
+      <el-table-column prop="id" label="商品id" />
+      <el-table-column ref="table" prop="image" label="商品图片">
+        <template slot-scope="scope">
+          <a :href="scope.row.image" style="color: #42b983" target="_blank"><img :src="scope.row.image" alt="点击打开" class="el-avatar"></a>
+        </template>
+      </el-table-column>
+      <el-table-column prop="storeName" label="商品名称" />
+      <el-table-column prop="storeCategory.cateName" label="分类名称" />
+      <el-table-column prop="price" label="商品价格" />
+      <el-table-column prop="sales" label="销量" />
+      <el-table-column prop="stock" label="库存" />
+      <el-table-column v-if="checkPermission(['admin','YXSTOREPRODUCT_ALL','YXSTOREPRODUCT_EDIT','YXSTOREPRODUCT_DELETE'])" label="操作" width="150px" align="center">
+        <template slot-scope="scope">
+          <el-button v-permission="['admin','YXSTOREPRODUCT_ALL','YXSTOREPRODUCT_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)" />
+          <el-popover
+            :ref="scope.row.id"
+            v-permission="['admin','YXSTOREPRODUCT_ALL','YXSTOREPRODUCT_DELETE']"
+            placement="top"
+            width="180"
+          >
+            <p>确定恢复本条数据吗？</p>
+            <div style="text-align: right; margin: 0">
+              <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
+              <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
+            </div>
+            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini">恢复</el-button>
+          </el-popover>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--分页组件-->
+    <el-pagination
+      :total="total"
+      :current-page="page + 1"
+      style="margin-top: 8px;"
+      layout="total, prev, pager, next, sizes"
+      @size-change="sizeChange"
+      @current-change="pageChange"
+    />
+  </div>
+</template>
+
+<script>
+import checkPermission from '@/utils/permission'
+import initData from '@/mixins/crud'
+import { recovery, onsale } from '@/api/yxStoreProduct'
+import eForm from './form'
+export default {
+  components: { eForm },
+  mixins: [initData],
+  data() {
+    return {
+      delLoading: false,
+      visible: false,
+      queryTypeOptions: [
+        { key: 'storeName', display_name: '商品名称' }
+      ]
+    }
+  },
+  created() {
+    this.$nextTick(() => {
+      this.init()
+    })
+  },
+  methods: {
+    checkPermission,
+    beforeInit() {
+      this.url = 'api/yxStoreProduct'
+      const sort = 'id,desc'
+      this.params = { page: this.page, size: this.size, sort: sort, isDel: 1 }
+      const query = this.query
+      const type = query.type
+      const value = query.value
+      if (type && value) { this.params[type] = value }
+      return true
+    },
+    subDelete(id) {
+      this.delLoading = true
+      recovery(id).then(res => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        this.dleChangePage()
+        this.init()
+        this.$notify({
+          title: '恢复成功',
+          type: 'success',
+          duration: 2500
+        })
+      }).catch(err => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        console.log(err.response.data.message)
+      })
+    },
+    onSale(id, status) {
+      this.$confirm(`确定进行[${status ? '下架' : '上架'}]操作?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          onsale(id, { status: status }).then(({ data }) => {
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1000,
+              onClose: () => {
+                this.init()
+              }
+            })
+          })
+        })
+        .catch(() => { })
+    },
+    add() {
+      this.isAdd = true
+      this.$refs.form.dialog = true
+      this.$refs.form.getCates()
+    },
+    edit(data) {
+      this.isAdd = false
+      const _this = this.$refs.form
+      _this.getCates()
+      _this.form = {
+        id: data.id,
+        merId: data.merId,
+        image: data.image,
+        sliderImage: data.sliderImage,
+        imageArr: data.image.split(','),
+        sliderImageArr: data.sliderImage.split(','),
+        storeName: data.storeName,
+        storeInfo: data.storeInfo,
+        keyword: data.keyword,
+        barCode: data.barCode,
+        storeCategory: data.storeCategory || {id:null},
+        price: data.price,
+        vipPrice: data.vipPrice,
+        otPrice: data.otPrice,
+        postage: data.postage,
+        unitName: data.unitName,
+        sort: data.sort,
+        sales: data.sales,
+        stock: data.stock,
+        isShow: data.isShow,
+        isHot: data.isHot,
+        isBenefit: data.isBenefit,
+        isBest: data.isBest,
+        isNew: data.isNew,
+        description: data.description,
+        addTime: data.addTime,
+        isPostage: data.isPostage,
+        isDel: data.isDel,
+        merUse: data.merUse,
+        giveIntegral: data.giveIntegral,
+        cost: data.cost,
+        isSeckill: data.isSeckill,
+        isBargain: data.isBargain,
+        isGood: data.isGood,
+        ficti: data.ficti,
+        browse: data.browse,
+        codePath: data.codePath,
+        soureLink: data.soureLink
+      }
+      _this.dialog = true
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/bxg/shop/goods/tab.vue b/src/views/bxg/shop/goods/tab.vue
new file mode 100644
index 0000000..8a0796c
--- /dev/null
+++ b/src/views/bxg/shop/goods/tab.vue
@@ -0,0 +1,37 @@
+<template>
+  <el-tabs v-model="activeName" style="padding-left: 8px;" @tab-click="tabClick">
+    <el-tab-pane label="出售中产品" name="first">
+      <onSale ref="onSale" />
+    </el-tab-pane>
+    <el-tab-pane label="待上架产品" name="second">
+      <unonSale ref="unonSale" />
+    </el-tab-pane>
+  </el-tabs>
+</template>
+
+<script>
+import onSale from '@/views/shop/goods/index'
+import unonSale from '@/views/shop/goods/index2'
+import '@/assets/styles/description.scss'
+export default {
+  name: 'Tab',
+  components: { onSale, unonSale },
+  data() {
+    return {
+      activeName: 'first'
+    }
+  },
+  methods: {
+    tabClick(name) {
+      if (this.activeName === 'first') {
+        this.$refs.onSale.init()
+      } else if (this.activeName === 'second') {
+        this.$refs.unonSale.init()
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>
diff --git a/src/views/bxg/shop/order/detail.vue b/src/views/bxg/shop/order/detail.vue
new file mode 100644
index 0000000..39d27e3
--- /dev/null
+++ b/src/views/bxg/shop/order/detail.vue
@@ -0,0 +1,313 @@
+<template>
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增' : '订单详情'" width="700px">
+    <el-card>
+      <div slot="header">
+        <span>收货信息</span>
+      </div>
+      <div class="text item">用户昵称:{{ form.nickname }}</div>
+      <div class="text item">收货人: {{ form.realName }}</div>
+      <div class="text item">联系电话: {{ form.userPhone }}</div>
+      <div class="text item">收货地址: {{ form.userAddress }}</div>
+    </el-card>
+    <el-card>
+      <div slot="header">
+        <span>订单信息</span>
+      </div>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <div class="text item">订单编号: {{ form.orderId }}</div> 
+          <div class="text item">商品总数: {{ form.totalNum }}</div>
+          <div class="text item">支付邮费: {{ form.totalPostage }}</div>
+          <div class="text item">余额扣款金额: 
+            <!-- <span v-if="form.payTypeName == '混合支付' || form.payType == 'mix'">
+              
+            </span> -->
+            <span >{{ form.yuePrice }}</span>
+          </div>
+          <div class="text item">实际支付: {{ form.payPrice }}</div>
+          <div class="text item">支付方式: {{ form.payTypeName }}</div>
+        </el-col>
+        <el-col :span="12">
+          <div class="text item">订单状态: <span v-html="form.statusName"></span></div>
+          <div class="text item">商品总价: {{ form.totalPrice }}</div>
+          <div class="text item">优惠券金额: {{ form.couponPrice }}</div>
+          <div class="text item">创建时间: {{ parseTime(form.createTime) }}</div>
+          <div class="text item">支付时间: {{ parseTime(form.payTime) }}</div>
+        </el-col>
+      </el-row>
+    </el-card>
+    <el-card v-if="form.storeId == 0">
+      <div slot="header">
+        <span>物流信息</span>
+      </div>
+     <el-tabs type="border-card" @tab-click="handleClick" >
+      <el-tab-pane v-for="(item,index) in form.expressList " :key="index+'a'" :label="item.deliveryName">
+         <div class="text item">快递公司:{{ item.deliveryName }}</div>
+      <div class="text item">快递单号:{{ item.deliveryId }}</div> 
+      </el-tab-pane>
+      <!-- <el-tab-pane label="配置管理">配置管理</el-tab-pane>
+      <el-tab-pane label="角色管理">角色管理</el-tab-pane>
+       <el-tab-pane label="定时任务补偿">定时任务补偿</el-tab-pane> -->
+</el-tabs>
+      <!-- <div class="text item">快递公司:{{ form.deliveryName }}</div>
+      <div class="text item">快递单号:{{ form.deliveryId }}</div> -->
+
+      <div style="margin-top:20px"><el-button :loading="loading" type="primary" @click="express">查看物流</el-button></div>
+      <div style="margin-top: 20px">
+      <el-timeline v-if="form.deliveryId && expressInfo.length > 0">
+        <el-timeline-item
+          v-for="(obj, index) in expressInfo"
+          :key="index"
+          :timestamp="obj.acceptTime"
+          >
+          {{obj.acceptStation}}
+        </el-timeline-item>
+      </el-timeline>
+      <el-timeline :reverse="false" v-else>
+        <el-timeline-item>
+          暂无物流信息
+        </el-timeline-item>
+      </el-timeline>
+      </div>
+    </el-card>
+    <el-card>
+      <div slot="header">
+        <span>备注信息</span>
+      </div>
+      <div class="text item">{{ form.mark || form.remark }}</div>
+    </el-card>
+  </el-dialog>
+</template>
+
+<script>
+import { add, edit, express } from '@/api/yxStoreOrder'
+
+import { parseTime } from '@/utils/index'
+export default {
+  props: {
+    isAdd: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data() {
+    return {
+      ine:0,
+      pan:0,
+      loading: false, dialog: false, expressInfo: [],
+      form: {
+        id: '',
+        orderId: '',
+        uid: '',
+        realName: '',
+        userPhone: '',
+        userAddress: '',
+        cartId: '',
+        freightPrice: '',
+        totalNum: '',
+        totalPrice: '',
+        totalPostage: '',
+        payPrice: '',
+        payPostage: '',
+        deductionPrice: '',
+        couponId: '',
+        couponPrice: '',
+        paid: '',
+        payTime: '',
+        payType: '',
+        addTime: '',
+        status: '',
+        refundStatus: '',
+        refundReasonWapImg: '',
+        refundReasonWapExplain: '',
+        refundReasonTime: '',
+        refundReasonWap: '',
+        refundReason: '',
+        refundPrice: '',
+        deliveryName: '',
+        deliverySn: '',
+        deliveryType: '',
+        deliveryId: '',
+        gainIntegral: '',
+        useIntegral: '',
+        backIntegral: '',
+        mark: '',
+        isDel: '',
+        unique: '',
+        remark: '',
+        merId: '',
+        isMerCheck: '',
+        combinationId: '',
+        pinkId: '',
+        cost: '',
+        seckillId: '',
+        bargainId: '',
+        verifyCode: '',
+        storeId: '',
+        shippingType: '',
+        isChannel: '',
+        isRemind: '',
+        isSystemDel: '',
+        yuePrice:'',
+        expressList:[]
+      },
+      rules: {
+        unique: [
+          { required: true, message: 'please enter', trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  created(){
+    
+  },
+  methods: {
+    parseTime,
+    cancel() {
+      this.dialog = false
+      if(this.dialog == false){
+         this.expressInfo=''
+      }
+      console.log(this.form,'cacaicaiciaci')
+    },
+    handleClick(val){
+      
+      this.ine = val.index
+      console.log(this.ine,';')
+      console.log(this.pan,'dsadsad')
+      if(this.pan == 1){
+        this.express()
+      }
+    },
+    
+    express() {
+      console.log(this.form.expressList)
+      console.log(this.ine,'ooooooooooooooooooooo')
+      this.pan = 1
+      // const inder = this.ine
+      // const that = this
+      // this.form.expressList.forEach(item=>{
+      //   console.log(item)
+       
+      // })
+       this.form.deliverySn = this.form.expressList[this.ine].deliverySn
+        this.form.deliveryId = this.form.expressList[this.ine].deliveryId
+      let params ={
+        "orderCode": this.form.id,   //订单ID
+        "shipperCode": this.form.deliverySn,  //快递公司简写
+        "logisticCode": this.form.deliveryId,    //快递单号
+        'customerName':this.form.userPhone    //联系人电话
+      }
+      express(params).then(res=>{
+        console.log(res)
+        this.expressInfo = res.Traces
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    doSubmit() {
+      this.loading = true
+      if (this.isAdd) {
+        this.doAdd()
+      } else this.doEdit()
+    },
+    doAdd() {
+      add(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '添加成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    doEdit() {
+      edit(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '修改成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    resetForm() {
+      this.dialog = false
+      this.$refs['form'].resetFields()
+      this.form = {
+        id: '',
+        orderId: '',
+        uid: '',
+        realName: '',
+        userPhone: '',
+        userAddress: '',
+        cartId: '',
+        freightPrice: '',
+        totalNum: '',
+        totalPrice: '',
+        totalPostage: '',
+        payPrice: '',
+        payPostage: '',
+        deductionPrice: '',
+        couponId: '',
+        couponPrice: '',
+        paid: '',
+        payTime: '',
+        payType: '',
+        addTime: '',
+        status: '',
+        refundStatus: '',
+        refundReasonWapImg: '',
+        refundReasonWapExplain: '',
+        refundReasonTime: '',
+        refundReasonWap: '',
+        refundReason: '',
+        refundPrice: '',
+        deliveryName: '',
+        deliveryType: '',
+        deliveryId: '',
+        gainIntegral: '',
+        useIntegral: '',
+        backIntegral: '',
+        mark: '',
+        isDel: '',
+        unique: '',
+        remark: '',
+        merId: '',
+        isMerCheck: '',
+        combinationId: '',
+        pinkId: '',
+        cost: '',
+        seckillId: '',
+        bargainId: '',
+        verifyCode: '',
+        storeId: '',
+        shippingType: '',
+        isChannel: '',
+        isRemind: '',
+        isSystemDel: '',
+        yuePrice:''
+      }
+    }
+  }
+}
+</script>
+<style scoped>
+  .text {
+    font-size: 12px;
+  }
+  .item {
+    padding: 6px 0;
+  }
+</style>
\ No newline at end of file
diff --git a/src/views/bxg/shop/order/edit.vue b/src/views/bxg/shop/order/edit.vue
new file mode 100644
index 0000000..2cec088
--- /dev/null
+++ b/src/views/bxg/shop/order/edit.vue
@@ -0,0 +1,196 @@
+<template>
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增' : '编辑'" width="500px">
+    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
+      <el-form-item label="订单号">
+        <el-input v-model="form.orderId" :disabled="true" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="原始邮费">
+        <el-input v-model="form.totalPostage" :disabled="true" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="实际支付">
+        <el-input v-model="form.payPrice" style="width: 370px;" />
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="text" @click="cancel">取消</el-button>
+      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { add, editOrder } from '@/api/yxStoreOrder'
+export default {
+  props: {
+    isAdd: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data() {
+    return {
+      loading: false, dialog: false,
+      form: {
+        id: '',
+        orderId: '',
+        uid: '',
+        realName: '',
+        userPhone: '',
+        userAddress: '',
+        cartId: '',
+        freightPrice: '',
+        totalNum: '',
+        totalPrice: '',
+        totalPostage: '',
+        payPrice: '',
+        payPostage: '',
+        deductionPrice: '',
+        couponId: '',
+        couponPrice: '',
+        paid: '',
+        payTime: '',
+        payType: '',
+        addTime: '',
+        status: '',
+        refundStatus: '',
+        refundReasonWapImg: '',
+        refundReasonWapExplain: '',
+        refundReasonTime: '',
+        refundReasonWap: '',
+        refundReason: '',
+        refundPrice: '',
+        deliveryName: '',
+        deliveryType: '',
+        deliveryId: '',
+        gainIntegral: '',
+        useIntegral: '',
+        backIntegral: '',
+        mark: '',
+        isDel: '',
+        unique: '',
+        remark: '',
+        merId: '',
+        isMerCheck: '',
+        combinationId: '',
+        pinkId: '',
+        cost: '',
+        seckillId: '',
+        bargainId: '',
+        verifyCode: '',
+        storeId: '',
+        shippingType: '',
+        isChannel: '',
+        isRemind: '',
+        isSystemDel: ''
+      },
+      rules: {
+        unique: [
+          { required: true, message: 'please enter', trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    cancel() {
+      this.resetForm()
+    },
+    doSubmit() {
+      this.loading = true
+      if (this.isAdd) {
+        this.doAdd()
+      } else this.doEdit()
+    },
+    doAdd() {
+      add(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '添加成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    doEdit() {
+      editOrder(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '修改成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    resetForm() {
+      this.dialog = false
+      this.$refs['form'].resetFields()
+      this.form = {
+        id: '',
+        orderId: '',
+        uid: '',
+        realName: '',
+        userPhone: '',
+        userAddress: '',
+        cartId: '',
+        freightPrice: '',
+        totalNum: '',
+        totalPrice: '',
+        totalPostage: '',
+        payPrice: '',
+        payPostage: '',
+        deductionPrice: '',
+        couponId: '',
+        couponPrice: '',
+        paid: '',
+        payTime: '',
+        payType: '',
+        addTime: '',
+        status: '',
+        refundStatus: '',
+        refundReasonWapImg: '',
+        refundReasonWapExplain: '',
+        refundReasonTime: '',
+        refundReasonWap: '',
+        refundReason: '',
+        refundPrice: '',
+        deliveryName: '',
+        deliveryType: '',
+        deliveryId: '',
+        gainIntegral: '',
+        useIntegral: '',
+        backIntegral: '',
+        mark: '',
+        isDel: '',
+        unique: '',
+        remark: '',
+        merId: '',
+        isMerCheck: '',
+        combinationId: '',
+        pinkId: '',
+        cost: '',
+        seckillId: '',
+        bargainId: '',
+        verifyCode: '',
+        storeId: '',
+        shippingType: '',
+        isChannel: '',
+        isRemind: '',
+        isSystemDel: ''
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/bxg/shop/order/form.vue b/src/views/bxg/shop/order/form.vue
new file mode 100644
index 0000000..8b07cd6
--- /dev/null
+++ b/src/views/bxg/shop/order/form.vue
@@ -0,0 +1,179 @@
+<template>
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增' : '去发货'" width="500px">
+    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
+      <el-form-item label="快递公司">
+        <!--<el-input v-model="form.deliveryName" style="width: 370px;"/>-->
+        <el-select v-model="form.deliveryName" filterable placeholder="请选择" style="width: 370px;">
+          <el-option
+            v-for="item in express"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="快递单号">
+        <el-input v-model="form.deliveryId" style="width: 370px;" maxlength="24" @input="accountInput"  />
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="text" @click="cancel">取消</el-button>
+      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+
+import { add, edit, get } from '@/api/yxStoreOrder'
+export default {
+  props: {
+    isAdd: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data() {
+    return {
+      loading: false, dialog: false, express: [],
+      form: {
+        id: '',
+        deliveryName: '',
+        deliveryType: 'express',
+        deliveryId: ''
+      },
+      rules: {
+        unique: [
+          { required: true, message: 'please enter', trigger: 'blur' }
+        ]
+      }
+    }
+  },
+
+  created() {
+    this.get()
+  },
+  methods: {
+    accountInput(val){//账号的实时输入
+    //console.log(val);
+    let codeReg = new RegExp("[A-Za-z0-9]+"), //正则 英文+数字；
+     len=val.length,
+     str='';
+    for(var i=0;i<len;i++){
+     if(codeReg.test(val[i])){
+      str+=val[i];
+     }
+    }
+    this.form.deliveryId=str;
+   },
+    cancel() {
+      this.resetForm()
+    },
+    doSubmit() {
+      this.loading = true
+      if (this.isAdd) {
+        this.doAdd()
+      } else this.doEdit()
+    },
+    doAdd() {
+      add(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '添加成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    doEdit() {
+      edit(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '操作成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    resetForm() {
+      this.dialog = false
+      this.$refs['form'].resetFields()
+      this.form = {
+        id: '',
+        orderId: '',
+        uid: '',
+        realName: '',
+        userPhone: '',
+        userAddress: '',
+        cartId: '',
+        freightPrice: '',
+        totalNum: '',
+        totalPrice: '',
+        totalPostage: '',
+        payPrice: '',
+        payPostage: '',
+        deductionPrice: '',
+        couponId: '',
+        couponPrice: '',
+        paid: '',
+        payTime: '',
+        payType: '',
+        addTime: '',
+        status: '',
+        refundStatus: '',
+        refundReasonWapImg: '',
+        refundReasonWapExplain: '',
+        refundReasonTime: '',
+        refundReasonWap: '',
+        refundReason: '',
+        refundPrice: '',
+        deliveryName: '',
+        deliveryType: '',
+        deliveryId: '',
+        gainIntegral: '',
+        useIntegral: '',
+        backIntegral: '',
+        mark: '',
+        isDel: '',
+        unique: '',
+        remark: '',
+        merId: '',
+        isMerCheck: '',
+        combinationId: '',
+        pinkId: '',
+        cost: '',
+        seckillId: '',
+        bargainId: '',
+        verifyCode: '',
+        storeId: '',
+        shippingType: '',
+        isChannel: '',
+        isRemind: '',
+        isSystemDel: ''
+      }
+    },
+    get() {
+      get().then(res => {
+        this.express = res.content
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/bxg/shop/order/formC.vue b/src/views/bxg/shop/order/formC.vue
new file mode 100644
index 0000000..e7de3bd
--- /dev/null
+++ b/src/views/bxg/shop/order/formC.vue
@@ -0,0 +1,158 @@
+<template>
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增' : '订单核销'" width="500px">
+    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
+      <el-form-item label="核销码">
+        <el-input v-model="form.verifyCode" style="width: 370px;" placeholder="请输入核销码" onkeyup="value=value.replace(/[^\d]/g,'')" />
+        <p style="color: red">注意:请务必核对核销码的与客户正确性</p>
+        <p style="color: red">注意:手机端也可以核销，去会员管理里把编辑相应会员开启商户管理即可</p>
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="text" @click="cancel">取消</el-button>
+      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+
+import { add, editT, get } from '@/api/yxStoreOrder'
+export default {
+  props: {
+    isAdd: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data() {
+    return {
+      loading: false, dialog: false, express: [],
+      form: {
+        id: '',
+        deliveryName: '',
+        deliveryType: 'express',
+        deliveryId: ''
+      },
+      rules: {
+        unique: [
+          { required: true, message: 'please enter', trigger: 'blur' }
+        ]
+      }
+    }
+  },
+
+  created() {
+    this.get()
+  },
+  methods: {
+    cancel() {
+      this.resetForm()
+    },
+    doSubmit() {
+      this.loading = true
+      if (this.isAdd) {
+        this.doAdd()
+      } else this.doEdit()
+    },
+    doAdd() {
+      add(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '添加成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    doEdit() {
+      editT(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '操作成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    resetForm() {
+      this.dialog = false
+      this.$refs['form'].resetFields()
+      this.form = {
+        id: '',
+        orderId: '',
+        uid: '',
+        realName: '',
+        userPhone: '',
+        userAddress: '',
+        cartId: '',
+        freightPrice: '',
+        totalNum: '',
+        totalPrice: '',
+        totalPostage: '',
+        payPrice: '',
+        payPostage: '',
+        deductionPrice: '',
+        couponId: '',
+        couponPrice: '',
+        paid: '',
+        payTime: '',
+        payType: '',
+        addTime: '',
+        status: '',
+        refundStatus: '',
+        refundReasonWapImg: '',
+        refundReasonWapExplain: '',
+        refundReasonTime: '',
+        refundReasonWap: '',
+        refundReason: '',
+        refundPrice: '',
+        deliveryName: '',
+        deliveryType: '',
+        deliveryId: '',
+        gainIntegral: '',
+        useIntegral: '',
+        backIntegral: '',
+        mark: '',
+        isDel: '',
+        unique: '',
+        remark: '',
+        merId: '',
+        isMerCheck: '',
+        combinationId: '',
+        pinkId: '',
+        cost: '',
+        seckillId: '',
+        bargainId: '',
+        verifyCode: '',
+        storeId: '',
+        shippingType: '',
+        isChannel: '',
+        isRemind: '',
+        isSystemDel: ''
+      }
+    },
+    get() {
+      get().then(res => {
+        this.express = res.content
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/bxg/shop/order/index.vue b/src/views/bxg/shop/order/index.vue
new file mode 100644
index 0000000..594a158
--- /dev/null
+++ b/src/views/bxg/shop/order/index.vue
@@ -0,0 +1,1281 @@
+<template>
+  <div
+    class="app-container"
+    style="position: relative; height: calc(100vh - 117px)"
+  >
+    <div class="container">
+      <el-tabs v-model="status" type="card" @tab-click="handleOrder">
+        <el-tab-pane name="-9">
+          <span slot="label"> <i class="el-icon-s-order"></i> 全部订单 </span>
+        </el-tab-pane>
+        <el-tab-pane name="0">
+          <span slot="label">
+            <i class="el-icon-bank-card"></i> 未支付
+            <span v-if="Unpaid !== 0" class="yuan">{{ Unpaid }}</span>
+          </span>
+        </el-tab-pane>
+        <!-- <el-tab-pane name="0">
+          <span slot="label"> <i class="el-icon-bank-card"></i> 未支付 
+            <span v-if="Unpaid !== 0" class="yuan">{{ Unpaid }}
+          </span>
+        </el-tab-pane> -->
+        <el-tab-pane name="1">
+          <span slot="label">
+            <i class="el-icon-refrigerator"></i> 未发货
+            <span v-if="Undelivered !== 0" class="yuan">{{ Undelivered }}</span>
+          </span>
+        </el-tab-pane>
+        <el-tab-pane name="2">
+          <span slot="label"> <i class="el-icon-truck"></i> 待收货 </span>
+        </el-tab-pane>
+        <el-tab-pane name="3">
+          <span slot="label"> <i class="el-icon-document"></i> 待评价 </span>
+        </el-tab-pane>
+        <el-tab-pane name="4">
+          <span slot="label">
+            <i class="el-icon-circle-check"></i> 交易完成
+          </span>
+        </el-tab-pane>
+        <el-tab-pane name="-1">
+          <span slot="label"> 
+            <i class="el-icon-back"></i> 退款中 
+            <span v-if="progress !== 0" class="yuan">{{ progress }}</span>
+          </span>
+        </el-tab-pane>
+        <el-tab-pane name="-2">
+          <span slot="label"> <i class="el-icon-finished"></i> 已退款 </span>
+        </el-tab-pane>
+      </el-tabs>
+      <!--工具栏-->
+      <div class="head-container">
+        <!-- 搜索 -->
+        <el-input
+          v-model="query.value"
+          clearable
+          placeholder="输入搜索内容"
+          style="width: 200px"
+          class="filter-item"
+          @keyup.enter.native="toQuery"
+        />
+        <el-select
+          v-model="query.type"
+          clearable
+          placeholder="类型"
+          class="filter-item"
+          style="width: 130px"
+        >
+          <el-option
+            v-for="item in queryTypeOptions"
+            :key="item.key"
+            :label="item.display_name"
+            :value="item.key"
+          />
+        </el-select>
+        <el-select
+          v-model="orderType"
+          clearable
+          placeholder="订单类型"
+          class="filter-item"
+          style="width: 130px"
+        >
+          <el-option
+            v-for="item in typeOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+        <el-date-picker
+          v-model="createTime"
+          :default-time="['00:00:00', '23:59:59']"
+          type="daterange"
+          range-separator=":"
+          size="small"
+          class="date-item"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        />
+        <el-button
+          class="filter-item"
+          size="mini"
+          type="success"
+          icon="el-icon-search"
+          @click="toQuery"
+          >搜索</el-button
+        >
+        <!-- 新增 -->
+        <el-button
+          type="danger"
+          class="filter-item"
+          size="mini"
+          icon="el-icon-refresh"
+          @click="toQuerysd"
+          >刷新</el-button
+        >
+      </div>
+      <!--表单组件-->
+      <eForm ref="form" :is-add="isAdd" />
+      <eDetail ref="form1" :is-add="isAdd" />
+      <eRefund ref="form2" :is-add="isAdd" />
+      <editOrder ref="form3" :is-add="isAdd" />
+      <eRemark ref="form4" :is-add="isAdd" />
+      <ePrint
+        ref="form5"
+        :is-add="isAdd"
+        :print-list="checkList"
+        :to-query="toQuery"
+      />
+
+      <!--订单数据统计-->
+      <div class="order-caculate">
+        <a class="caculate-title">
+          订单数 :
+          <span class="caculate-num">{{ caculateInfo.orderNum }}</span>
+        </a>
+        <a class="caculate-title">
+          商品数 :
+          <span class="caculate-num">{{ caculateInfo.storeNum }}</span>
+        </a>
+        <a class="caculate-title">
+          总金额(包运费) :
+          <span class="caculate-num">{{ caculateInfo.orderPrice }}</span>
+        </a>
+        <!-- <a class="caculate-title">客户数 : <span class="caculate-num">{{caculateInfo.userNum}}</span></a> -->
+      </div>
+
+      <!--表格渲染-->
+      <el-table
+        ref="multipleTable"
+        v-loading="loading"
+        :data="data"
+        size="small"
+        style="width: 100%"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column
+          :selectable="checkboxT"
+          type="selection"
+          width="50"
+          align="center"
+        />
+        <el-table-column
+          prop="orderId"
+          width="200"
+          label="订单号"
+          align="center"
+        >
+          <template slot-scope="scope">
+            <span>{{ scope.row.orderId }}</span>
+            <p>{{ scope.row.pinkName }}</p>
+          </template>
+        </el-table-column>
+        <el-table-column prop="realName" label="用户昵称" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.userDTO.nickname }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="cartInfoList"
+          width="500"
+          label="商品信息"
+          align="center"
+        >
+          <template slot-scope="scope">
+            <div
+              style="height: 62px"
+              v-for="(item, index) in scope.row.cartInfoList"
+              v-if="item.cartInfoMap.productInfo.attrInfo"
+            >
+              <div
+                style="
+                  float: left;
+                  height: 30px;
+                  margin-bottom: 5px;
+                  width: 30px;
+                "
+              >
+                <img
+                  style="width: 30px; height: 30px; margin: 0; cursor: pointer"
+                  v-if="item.cartInfoMap.productInfo.attrInfo.image == ''"
+                  :src="item.cartInfoMap.productInfo.image"
+                />
+                <img
+                  style="width: 30px; height: 30px; margin: 0; cursor: pointer"
+                  v-if="item.cartInfoMap.productInfo.attrInfo.image !== ''"
+                  :src="item.cartInfoMap.productInfo.attrInfo.image"
+                />
+              </div>
+              <div style="float: left; width: 70%; padding-left: 30px;text-align: left;">
+                <span>{{ item.cartInfoMap.productInfo.storeName }}</span>
+
+                <span style="display: block; margin-top: -8px; color: #9e9e9e">
+                  <span
+                    v-if="item.cartInfoMap.productInfo.attrInfo.sku !== '默认'"
+                    >规格：</span
+                  >
+                  <span>{{ item.cartInfoMap.productInfo.attrInfo.sku }}</span>
+                </span>
+              </div>
+
+              <div style="float: left; width: 100px; padding-left: 10px">
+                <span
+                  >| &nbsp; &nbsp; ￥{{ item.cartInfoMap.truePrice }}×{{
+                    item.cartInfoMap.cartNum
+                  }}</span
+                >
+              </div>
+            </div>
+            <div v-else>
+              <span>
+                <img
+                  style="width: 30px; height: 30px; margin: 0; cursor: pointer"
+                  :src="item.cartInfoMap.productInfo.image"
+                />
+              </span>
+              <span>{{ item.cartInfoMap.productInfo.storeName }}</span>
+              <span
+                >| ￥{{ item.cartInfoMap.truePrice }}×{{
+                  item.cartInfoMap.cartNum
+                }}</span
+              >
+            </div>
+          </template>
+        </el-table-column>
+         <el-table-column prop="cityWide" label="同城配送-商品" align="center" width="120" >
+           <template slot-scope="scope">
+             <span v-if="scope.row.cityWide !=='' ">
+               {{scope.row.cityWide}}
+             </span>
+             <span v-if="scope.row.cityWide =='' ">
+               {{'无'}}
+             </span>
+           </template>
+         </el-table-column>
+        <el-table-column prop="payPrice" label="微信支付" align="center" />
+        <el-table-column prop="yuePrice" label="余额支付" align="center" />
+        <el-table-column prop="payTypeName" label="支付状态" align="center" />
+        <el-table-column
+          prop="statusName"
+          label="订单状态"
+          align="center"
+          width="250"
+        >
+          <template slot-scope="scope">
+            <span v-html="scope.row.statusName"></span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          
+          width="160"
+          label="创建时间"
+          align="center"
+        >
+          <template slot-scope="scope">
+            <span>{{ formatTime(scope.row.createTime) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="refundReasonWap"
+          label="退款原因"
+          v-if="this.status == -1"
+          align="center"
+        />
+        <el-table-column label="操作" width="200" align="center" fixed="right">
+          <template slot-scope="scope">
+            <el-button size="mini" type="primary" @click="detail(scope.row)"
+              >订单详情</el-button
+            >
+            <el-dropdown
+              size="mini"
+              split-button
+              type="primary"
+              trigger="click"
+              v-permission="['admin', 'YXSTOREORDER_ALL', 'YXSTOREORDER_EDIT']"
+            >
+              操作
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item>
+                  <div
+                    @click="remark(scope.row)"
+                    v-permission="[
+                      'admin',
+                      'YXSTOREORDER_ALL',
+                      'YXSTOREORDER_EDIT',
+                    ]"
+                    style="text-align: center"
+                  >
+                    订单备注
+                  </div>
+                  <!-- <el-button
+                    v-permission="['admin','YXSTOREORDER_ALL','YXSTOREORDER_EDIT']"
+                    size="mini"
+                    style="border:none;"
+                    @click="remark(scope.row)"
+                  >
+                  订单备注</el-button>-->
+                </el-dropdown-item>
+                <el-dropdown-item>
+                
+                    <div
+                   v-if="status == 1  "
+                    v-permission="[
+                      'admin',
+                      'YXSTOREORDER_ALL',
+                      'YXSTOREORDER_EDIT',
+                    ]"
+                    style="text-align: center; width: 60px; height: 25px"
+                    @click="edit(scope.row)"
+                  >
+                 
+                    去发货
+                  </div>
+                  
+                </el-dropdown-item>
+                <el-dropdown-item>
+                
+                    <div
+                   v-if="status == 2  "
+                    v-permission="[
+                      'admin',
+                      'YXSTOREORDER_ALL',
+                      'YXSTOREORDER_EDIT',
+                    ]"
+                    style="text-align: center; width: 60px; height: 25px"
+                    @click="edit(scope.row)"
+                  >
+                 
+                    附加快递单
+                  </div>
+                  
+                </el-dropdown-item>
+                <el-dropdown-item>
+                 
+                    <div
+                      style="text-align: center; width: 60px; height: 25px"
+                     v-if="status == 1"
+                      v-permission="[
+                        'admin',
+                        'YXSTOREORDER_ALL',
+                        'YXSTOREORDER_EDIT',
+                      ]"
+                      @click="SubmitRefund(scope.row)"
+                    >
+                      提交退款
+                    </div>
+                  
+                </el-dropdown-item>
+                <el-dropdown-item>
+                  <div v-if="scope.row.isVipGift !== 1">
+                    <div
+                      v-if="scope.row._status == 3"
+                      v-permission="[
+                        'admin',
+                        'YXSTOREORDER_ALL',
+                        'YXSTOREORDER_EDIT',
+                      ]"
+                      style="text-align: center; width: 60px; height: 25px"
+                      @click="refund(scope.row)"
+                    >
+                      立刻退款
+                    </div>
+                  </div>
+                </el-dropdown-item>
+                <el-dropdown-item v-if="scope.row._status == 1">
+                  <div
+                    v-permission="[
+                      'admin',
+                      'YXSTOREORDER_ALL',
+                      'YXSTOREORDER_EDIT',
+                    ]"
+                    style="text-align: center; width: 60px; height: 25px"
+                    @click="editOrder(scope.row)"
+                  >
+                    修改订单
+                  </div>
+                </el-dropdown-item>
+                <el-dropdown-item v-if="scope.row._status == 1">
+                  <div
+                    v-permission="[
+                      'admin',
+                      'YXSTOREORDER_ALL',
+                      'YXSTOREORDER_DELETE',
+                    ]"
+                    style="text-align: center; width: 60px; height: 25px"
+                    @click="subDelete(scope.row.id)"
+                  >
+                    删除
+                  </div>
+                </el-dropdown-item>
+
+                <!-- <el-dropdown-item v-if="scope.row._status == 1">
+                  <el-popover
+                    :ref="scope.row.id"
+                    v-permission="['admin','YXSTOREORDER_ALL','YXSTOREORDER_DELETE']"
+                    placement="top"
+                    width="180"
+                  >
+                    <p>确定删除本条数据吗？</p>
+                    <div style="text-align: right; margin: 0">
+                      <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
+                      <el-button
+                        :loading="delLoading"
+                        type="primary"
+                        size="mini"
+                        @click="subDelete(scope.row.id)"
+                      >确定</el-button>
+                    </div>
+                    <div
+                      slot="reference"
+                      type="danger"
+                      icon="el-icon-delete"
+                      size="mini"
+                      style="text-align: center;width: 60px;height: 25px;"
+                    >删除</div>
+                  </el-popover>
+                </el-dropdown-item> -->
+              </el-dropdown-menu>
+            </el-dropdown>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--添加订单打印及订单导出功能 2020.04.13 changxh-->
+    <el-footer class="footer-contains">
+      <div class="footer-search">
+        <el-checkbox
+          v-model="printChecked"
+          @change="batchSelection"
+          style="margin-right: 20px"
+        ></el-checkbox>
+        <el-select
+          v-model="batchHandle"
+          @change="handlePrintOption"
+          clearable
+          placeholder="批量操作"
+          class="filter-item"
+          style="width: 130px; margin-right: 8px"
+        >
+          <el-option
+            v-for="item in handleOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+        <el-select
+          v-model="batchExport"
+          @change="handleExportOption"
+          clearable
+          placeholder="批量导出"
+          class="filter-item"
+          style="width: 130px"
+        >
+          <el-option
+            v-for="item in exportOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </div>
+      <!--分页组件-->
+      <el-pagination
+        :total="total"
+        :current-page="page + 1"
+        style="margin-top: 8px"
+        layout="total, prev, pager, next, sizes"
+        @size-change="sizeChange"
+        @current-change="pageChange"
+      />
+    </el-footer>
+    <el-dialog
+      title="退款说明"
+      :visible.sync="dialogFormVisible"
+      style="width: 1000px; margin: 0 auto"
+    >
+      <el-form :model="demos">
+        <el-form-item label="退款原因" :label-width="formLabelWidth">
+          <el-input v-model="demos.explain"></el-input>
+        </el-form-item>
+        <!-- <el-form-item label="备注" :label-width="formLabelWidth">
+    <el-input type="textarea"  v-model="demos.text" ></el-input>
+        </el-form-item>-->
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormVisible = false">取 消</el-button>
+        <el-button type="primary" @click="Submitss">确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import checkPermission from "@/utils/permission";
+import initData from "@/mixins/crud";
+import { del ,get, getCount } from "@/api/yxStoreOrder";
+import { addss } from "@/api/toRefundStatus";
+import eForm from "./form";
+import eDetail from "./detail";
+import eRefund from "./refund";
+import editOrder from "./edit";
+import eRemark from "./remark";
+import ePrint from "./print";
+import { formatTime } from "@/utils/index";
+import { gett } from "@/api/visits";
+
+export default {
+  components: { eForm, eDetail, eRefund, editOrder, eRemark, ePrint },
+  mixins: [initData],
+  inject: ["reload"],
+  data() {
+    return {
+      Unpaid: 0,
+      Undelivered: 0,
+      progress: 0,
+       expre:[],
+      demos: {
+        explain: "",
+        text: "",
+      },
+      ces: {},
+      form: {
+        name: "",
+        region: "",
+        date1: "",
+        date2: "",
+        delivery: false,
+        type: [],
+        resource: "",
+        desc: "",
+      },
+      formLabelWidth: "100px",
+      dialogFormVisible: false,
+
+      delLoading: false,
+      status: "-9",
+      orderType: "0",
+      createTime: "",
+      checkList: [],
+      printChecked: false,
+      batchHandle: "",
+      batchExport: "",
+      listContent: [],
+      queryTypeOptions: [
+        { key: "orderId", display_name: "订单号" },
+        { key: "nickName", display_name: "用户昵称" },
+        { key: "realName", display_name: "收件人姓名" },
+        { key: "userPhone", display_name: "收件人电话" },
+      ],
+      statusOptions: [
+        { value: "0", label: "未支付" },
+        { value: "1", label: "未发货" },
+        { value: "2", label: "待收货" },
+        { value: "3", label: "待评价" },
+        { value: "4", label: "交易完成" },
+        // { value: '5', label: '待核销' },
+        { value: "-1", label: "退款中" },
+        { value: "-2", label: "已退款" },
+        { value: "-4", label: "已删除" },
+      ],
+      typeOptions: [
+        { value: "0", label: "所有订单" },
+        { value: "1", label: "普通订单" },
+        { value: "2", label: "拼团订单" },
+        { value: "3", label: "秒杀订单" },
+        { value: "4", label: "砍价订单" },
+         { value: "6", label: "同城送订单" },
+      ],
+      handleOptions: [
+        { value: "", label: "批量操作" },
+        { value: "0", label: "批量打印" },
+      ],
+      exportOptions: [
+        { value: "", label: "批量导出" },
+        { value: "0", label: "导出全部" },
+        { value: "1", label: "导出选中" },
+      ],
+      caculateInfo: {
+        orderNum: 0,
+        storeNum: 0,
+        orderPrice: 0,
+        userNum: 0,
+      },
+    };
+  },
+  created() {
+    this.$nextTick(() => {
+      this.init();
+    });
+    this.getCounts();
+  },
+  methods: {
+    getCounts() {
+      console.log(123456)
+      let plams = {
+        shippingType: 1,
+      };
+      getCount(plams).then((res) => {
+        console.log(res, "是否存在请求");
+        this.Unpaid = res.Unpaid;
+        this.Undelivered = res.Undelivered;
+        this.progress = res.progress;
+      });
+    },
+    get() {
+      get().then(res => {
+        this.expre = res.content
+        console.log(this.expre,'oiiiiiiiiiiii')
+        
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    toQuerysd() {
+      this.reload();
+    },
+    Submitss() {
+      this.dialogFormVisible = false;
+      // this.demos.push(this.explain)
+      this.ces.refundReasonWapExplain = this.demos.explain;
+
+      this.demos.explain = this.demos.text = "";
+      console.log(this.ces);
+      let plam = {};
+      plam = this.ces;
+      console.log(plam);
+      addss(plam).then((res) => {
+        console.log(res);
+        this.init();
+        this.$notify({
+          title: "提交成功",
+          type: "success",
+          duration: 2500,
+        });
+      });
+    },
+    SubmitRefund(row) {
+      this.dialogFormVisible = true;
+
+      this.ces = row;
+    },
+    formatTime,
+    checkPermission,
+    handleOrder(tab, event) {
+      console.log(this.status)
+      this.status = tab.name;
+      this.toQuery();
+    },
+    beforeInit() {
+      this.url = "api/yxStoreOrder";
+      const sort = "id,desc";
+      this.params = {
+        page: this.page,
+        size: this.size,
+        sort: sort,
+        orderStatus: this.status,
+        orderType: this.orderType,
+        createTime: this.createTime,
+        listContent: this.listContent,
+      };
+      const query = this.query;
+      const type = query.type;
+      const value = query.value;
+      if (type && value) {
+        this.params[type] = value;
+      }
+      return true;
+    },
+    subDelete(id) {
+      this.delLoading = true;
+      del(id)
+        .then((res) => {
+          this.delLoading = false;
+          this.$refs[id].doClose();
+          this.dleChangePage();
+          this.init();
+          this.$notify({
+            title: "删除成功",
+            type: "success",
+            duration: 2500,
+          });
+        })
+        .catch((err) => {
+          this.delLoading = false;
+          this.$refs[id].doClose();
+          console.log(err.response.data.message);
+        });
+    },
+    add() {
+      this.isAdd = true;
+      this.$refs.form.dialog = true;
+    },
+    edit(data) {
+      console.log(this.status)
+      if(this.status == 1){
+         this.isAdd = false;
+      const _this = this.$refs.form;
+      _this.form = {
+        id: data.id,
+        orderId: data.orderId,
+        uid: data.uid,
+        realName: data.realName,
+        userPhone: data.userPhone,
+        userAddress: data.userAddress,
+        cartId: data.cartId,
+        freightPrice: data.freightPrice,
+        totalNum: data.totalNum,
+        totalPrice: data.totalPrice,
+        totalPostage: data.totalPostage,
+        payPrice: data.payPrice,
+        payPostage: data.payPostage,
+        deductionPrice: data.deductionPrice,
+        couponId: data.couponId,
+        couponPrice: data.couponPrice,
+        paid: data.paid,
+        payTime: data.payTime,
+        payType: data.payType,
+        addTime: data.addTime,
+        status: data.status,
+        refundStatus: data.refundStatus,
+        refundReasonWapImg: data.refundReasonWapImg,
+        refundReasonWapExplain: data.refundReasonWapExplain,
+        refundReasonTime: data.refundReasonTime,
+        refundReasonWap: data.refundReasonWap,
+        refundReason: data.refundReason,
+        refundPrice: data.refundPrice,
+        deliveryName: data.deliveryName,
+        deliverySn: data.deliverySn,
+        deliveryType: data.deliveryType,
+        deliveryId: data.deliveryId,
+        gainIntegral: data.gainIntegral,
+        useIntegral: data.useIntegral,
+        backIntegral: data.backIntegral,
+        mark: data.mark,
+        isDel: data.isDel,
+        unique: data.unique,
+        remark: data.remark,
+        merId: data.merId,
+        isMerCheck: data.isMerCheck,
+        combinationId: data.combinationId,
+        pinkId: data.pinkId,
+        cost: data.cost,
+        seckillId: data.seckillId,
+        bargainId: data.bargainId,
+        verifyCode: data.verifyCode,
+        storeId: data.storeId,
+        shippingType: data.shippingType,
+        isChannel: data.isChannel,
+        isRemind: data.isRemind,
+        isSystemDel: data.isSystemDel,
+      };
+      _this.dialog = true;
+      }if(this.status == 2){
+         this.isAdd = false;
+      const _this = this.$refs.form;
+      _this.form = {
+        id: data.id,
+        orderId: data.orderId,
+        uid: data.uid,
+        realName: data.realName,
+        userPhone: data.userPhone,
+        userAddress: data.userAddress,
+        cartId: data.cartId,
+        freightPrice: data.freightPrice,
+        totalNum: data.totalNum,
+        totalPrice: data.totalPrice,
+        totalPostage: data.totalPostage,
+        payPrice: data.payPrice,
+        payPostage: data.payPostage,
+        deductionPrice: data.deductionPrice,
+        couponId: data.couponId,
+        couponPrice: data.couponPrice,
+        paid: data.paid,
+        payTime: data.payTime,
+        payType: data.payType,
+        addTime: data.addTime,
+        status: data.status,
+        refundStatus: data.refundStatus,
+        refundReasonWapImg: data.refundReasonWapImg,
+        refundReasonWapExplain: data.refundReasonWapExplain,
+        refundReasonTime: data.refundReasonTime,
+        refundReasonWap: data.refundReasonWap,
+        refundReason: data.refundReason,
+        refundPrice: data.refundPrice,
+        deliveryName: '',
+        deliverySn: data.deliverySn,
+        deliveryType: data.deliveryType,
+        deliveryId: '',
+        gainIntegral: data.gainIntegral,
+        useIntegral: data.useIntegral,
+        backIntegral: data.backIntegral,
+        mark: data.mark,
+        isDel: data.isDel,
+        unique: data.unique,
+        remark: data.remark,
+        merId: data.merId,
+        isMerCheck: data.isMerCheck,
+        combinationId: data.combinationId,
+        pinkId: data.pinkId,
+        cost: data.cost,
+        seckillId: data.seckillId,
+        bargainId: data.bargainId,
+        verifyCode: data.verifyCode,
+        storeId: data.storeId,
+        shippingType: data.shippingType,
+        isChannel: data.isChannel,
+        isRemind: data.isRemind,
+        isSystemDel: data.isSystemDel,
+      };
+      _this.dialog = true;
+      }
+     
+    },
+    editOrder(data) {
+      this.isAdd = false;
+      const _this = this.$refs.form3;
+      _this.form = {
+        id: data.id,
+        orderId: data.orderId,
+        uid: data.uid,
+        realName: data.realName,
+        userPhone: data.userPhone,
+        userAddress: data.userAddress,
+        cartId: data.cartId,
+        freightPrice: data.freightPrice,
+        totalNum: data.totalNum,
+        totalPrice: data.totalPrice,
+        totalPostage: data.totalPostage,
+        payPrice: data.payPrice,
+        payPostage: data.payPostage,
+        deductionPrice: data.deductionPrice,
+        couponId: data.couponId,
+        couponPrice: data.couponPrice,
+        paid: data.paid,
+        payTime: data.payTime,
+        payType: data.payType,
+        addTime: data.addTime,
+        status: data.status,
+        refundStatus: data.refundStatus,
+        refundReasonWapImg: data.refundReasonWapImg,
+        refundReasonWapExplain: data.refundReasonWapExplain,
+        refundReasonTime: data.refundReasonTime,
+        refundReasonWap: data.refundReasonWap,
+        refundReason: data.refundReason,
+        refundPrice: data.refundPrice,
+        deliveryName: data.deliveryName,
+        deliveryType: data.deliveryType,
+        deliveryId: data.deliveryId,
+        gainIntegral: data.gainIntegral,
+        useIntegral: data.useIntegral,
+        backIntegral: data.backIntegral,
+        mark: data.mark,
+        isDel: data.isDel,
+        unique: data.unique,
+        remark: data.remark,
+        merId: data.merId,
+        isMerCheck: data.isMerCheck,
+        combinationId: data.combinationId,
+        pinkId: data.pinkId,
+        cost: data.cost,
+        seckillId: data.seckillId,
+        bargainId: data.bargainId,
+        verifyCode: data.verifyCode,
+        storeId: data.storeId,
+        shippingType: data.shippingType,
+        isChannel: data.isChannel,
+        isRemind: data.isRemind,
+        isSystemDel: data.isSystemDel,
+      };
+      _this.dialog = true;
+    },
+    remark(data) {
+      this.isAdd = false;
+      const _this = this.$refs.form4;
+      _this.form = {
+        id: data.id,
+        orderId: data.orderId,
+        uid: data.uid,
+        realName: data.realName,
+        userPhone: data.userPhone,
+        userAddress: data.userAddress,
+        cartId: data.cartId,
+        freightPrice: data.freightPrice,
+        totalNum: data.totalNum,
+        totalPrice: data.totalPrice,
+        totalPostage: data.totalPostage,
+        payPrice: data.payPrice,
+        payPostage: data.payPostage,
+        deductionPrice: data.deductionPrice,
+        couponId: data.couponId,
+        couponPrice: data.couponPrice,
+        paid: data.paid,
+        payTime: data.payTime,
+        payType: data.payType,
+        addTime: data.addTime,
+        status: data.status,
+        refundStatus: data.refundStatus,
+        refundReasonWapImg: data.refundReasonWapImg,
+        refundReasonWapExplain: data.refundReasonWapExplain,
+        refundReasonTime: data.refundReasonTime,
+        refundReasonWap: data.refundReasonWap,
+        refundReason: data.refundReason,
+        refundPrice: data.refundPrice,
+        deliveryName: data.deliveryName,
+        deliveryType: data.deliveryType,
+        deliveryId: data.deliveryId,
+        gainIntegral: data.gainIntegral,
+        useIntegral: data.useIntegral,
+        backIntegral: data.backIntegral,
+        mark: data.mark,
+        isDel: data.isDel,
+        unique: data.unique,
+        remark: data.remark,
+        merId: data.merId,
+        isMerCheck: data.isMerCheck,
+        combinationId: data.combinationId,
+        pinkId: data.pinkId,
+        cost: data.cost,
+        seckillId: data.seckillId,
+        bargainId: data.bargainId,
+        verifyCode: data.verifyCode,
+        storeId: data.storeId,
+        shippingType: data.shippingType,
+        isChannel: data.isChannel,
+        isRemind: data.isRemind,
+        isSystemDel: data.isSystemDel,
+      };
+      _this.dialog = true;
+    },
+    refund(data) {
+      console.log(data);
+      this.isAdd = false;
+      const _this = this.$refs.form2;
+      _this.form = {
+        id: data.id,
+        orderId: data.orderId,
+        uid: data.uid,
+        realName: data.realName,
+        userPhone: data.userPhone,
+        userAddress: data.userAddress,
+        cartId: data.cartId,
+        freightPrice: data.freightPrice,
+        totalNum: data.totalNum,
+        totalPrice: data.totalPrice,
+        totalPostage: data.totalPostage,
+        payPrice: data.payPrice,
+        yuePrice: data.yuePrice,
+        payPostage: data.payPostage,
+        deductionPrice: data.deductionPrice,
+        couponId: data.couponId,
+        couponPrice: data.couponPrice,
+        paid: data.paid,
+        payTime: data.payTime,
+        payType: data.payType,
+        addTime: data.addTime,
+        status: data.status,
+        refundStatus: data.refundStatus,
+        refundReasonWapImg: data.refundReasonWapImg,
+        refundReasonWapExplain: data.refundReasonWapExplain,
+        refundReasonTime: data.refundReasonTime,
+        refundReasonWap: data.refundReasonWap,
+        refundReason: data.refundReason,
+        refundPrice: data.refundPrice,
+        deliveryName: data.deliveryName,
+        deliveryType: data.deliveryType,
+        deliveryId: data.deliveryId,
+        gainIntegral: data.gainIntegral,
+        useIntegral: data.useIntegral,
+        backIntegral: data.backIntegral,
+        mark: data.mark,
+        isDel: data.isDel,
+        unique: data.unique,
+        remark: data.remark,
+        merId: data.merId,
+        isMerCheck: data.isMerCheck,
+        combinationId: data.combinationId,
+        pinkId: data.pinkId,
+        cost: data.cost,
+        seckillId: data.seckillId,
+        bargainId: data.bargainId,
+        verifyCode: data.verifyCode,
+        storeId: data.storeId,
+        shippingType: data.shippingType,
+        isChannel: data.isChannel,
+        isRemind: data.isRemind,
+        isSystemDel: data.isSystemDel,
+        isVipGift: data.isVipGift,
+      };
+      _this.dialog = true;
+    },
+    detail(data) {
+      this.get()
+      console.log(data,'查看详情');
+      this.isAdd = false;
+      const _this = this.$refs.form1;
+      _this.form = {
+        id: data.id,
+        orderId: data.orderId,
+        payTypeName: data.payTypeName,
+        statusName: data.statusName,
+        uid: data.uid,
+        realName: data.realName,
+        userPhone: data.userPhone,
+        userAddress: data.userAddress,
+        cartId: data.cartId,
+        freightPrice: data.freightPrice,
+        totalNum: data.totalNum,
+        totalPrice: data.totalPrice,
+        totalPostage: data.totalPostage,
+        payPrice: data.payPrice,
+        payPostage: data.payPostage,
+        deductionPrice: data.deductionPrice,
+        couponId: data.couponId,
+        couponPrice: data.couponPrice,
+        paid: data.paid,
+        payTime: data.payTime,
+        payType: data.payType,
+        createTime: data.createTime,
+        status: data.status,
+        refundStatus: data.refundStatus,
+        refundReasonWapImg: data.refundReasonWapImg,
+        refundReasonWapExplain: data.refundReasonWapExplain,
+        refundReasonTime: data.refundReasonTime,
+        refundReasonWap: data.refundReasonWap,
+        refundReason: data.refundReason,
+        refundPrice: data.refundPrice,
+        deliveryName: data.deliveryName,
+        deliverySn: data.deliverySn,
+        deliveryType: data.deliveryType,
+        deliveryId: data.deliveryId,
+        gainIntegral: data.gainIntegral,
+        useIntegral: data.useIntegral,
+        backIntegral: data.backIntegral,
+        mark: data.mark,
+        isDel: data.isDel,
+        unique: data.unique,
+        remark: data.remark,
+        merId: data.merId,
+        isMerCheck: data.isMerCheck,
+        combinationId: data.combinationId,
+        pinkId: data.pinkId,
+        cost: data.cost,
+        seckillId: data.seckillId,
+        bargainId: data.bargainId,
+        verifyCode: data.verifyCode,
+        storeId: data.storeId,
+        shippingType: data.shippingType,
+        isChannel: data.isChannel,
+        isRemind: data.isRemind,
+        isSystemDel: data.isSystemDel,
+        nickname: data.userDTO.nickname,
+        yuePrice: data.yuePrice,
+        expressList:data.expressList
+      };
+      _this.dialog = true;
+    },
+    getCaculateInfo() {
+      gett().then((res) => {
+        this.caculateInfo = {
+          orderPrice: res.priceCount,
+          orderNum: res.orderCount,
+          storeNum: res.goodsCount,
+          userNum: res.userCount,
+        };
+      });
+    },
+    clearCaculateInfo() {
+      this.caculateInfo = {
+        orderPrice: 0,
+        storeNum: 0,
+        orderNum: 0,
+        userNum: 0,
+      };
+    },
+    handleSelectionChange(val) {
+      console.log(val);
+      this.checkList = val;
+      let orderPrice = 0,
+        storeNum = 0,
+        orderNum = 0,
+        userNum = 0;
+      if (val.length != 0) {
+        this.printChecked = true;
+        let user = [];
+        val.forEach((item, index) => {
+          orderNum += 1;
+          orderPrice += item.payPrice;
+          storeNum += item.totalNum;
+          user.push(item.userDTO.account);
+        });
+        user = Array.from(new Set(user));
+        this.caculateInfo = {
+          orderPrice: orderPrice.toFixed(2),
+          storeNum: storeNum,
+          orderNum: orderNum,
+          userNum: user.length,
+        };
+      } else {
+        this.printChecked = false;
+        this.clearCaculateInfo();
+        // this.getCaculateInfo();
+      }
+    },
+    batchSelection(val) {
+      let rows = this.data;
+      console.log(val);
+      console.log(rows);
+      if (val) {
+        rows.forEach((row) => {
+          this.$refs.multipleTable.toggleRowSelection(row);
+        });
+      } else {
+        this.$refs.multipleTable.clearSelection();
+      }
+    },
+    handlePrintOption(val) {
+      switch (val) {
+        case "0":
+          this.getPrintList();
+          this.batchHandle = "";
+          break;
+        default:
+          break;
+      }
+    },
+    handleExportOption(val) {
+      let list = this.checkList;
+      this.page = 0;
+      this.size = 10000;
+      switch (val) {
+        case "0":
+          this.listContent = "";
+          this.beforeInit();
+          this.downloadMethod();
+          break;
+        case "1":
+          if (list.length == 0) {
+            this.$message({
+              message: "请选择订单",
+              type: "warning",
+            });
+          } else {
+            this.listContent = [];
+            list.forEach((item) => {
+              this.listContent.push(item.orderId);
+            });
+            this.listContent = JSON.stringify(this.listContent);
+            
+            console.log(this.listContent,'listContentlistContent');
+            this.beforeInit();
+            this.downloadMethod();
+          }
+          break;
+        default:
+          break;
+      }
+      this.batchExport = "";
+    },
+    getPrintList() {
+      let list = this.checkList;
+      if (list.length == 0) {
+        this.$message({
+          message: "请选择订单",
+          type: "warning",
+        });
+      } else {
+        const _this = this.$refs.form5;
+        _this.dialog = true;
+      }
+    },
+    checkboxT(row, rowIndex) {
+      return row.id !== 1;
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.yuan {
+  width: 15px;
+  height: 15px;
+  line-height: 15px;
+  text-align: center;
+  background: red;
+  position: absolute;
+  top: 2px;
+  right: 2px;
+  display: block;
+  color: #fff;
+  border-radius: 50px;
+}
+.container {
+  height: calc(100% - 80px);
+  position: absolute;
+  overflow: auto;
+  width: calc(100% - 20px);
+
+  .order-caculate {
+    font-size: 14px;
+    color: #909399;
+    border-top: 1px solid #f0f0f0;
+    padding: 20px 10px;
+    .caculate-title {
+      display: inline-block;
+      margin-right: 50px;
+    }
+    .caculate-num {
+      font-size: 20px;
+      color: #ff4949;
+    }
+  }
+
+  .el-table th {
+    background-color: #fafafa;
+  }
+}
+
+.footer-contains {
+  position: absolute;
+  display: -ms-flexbox;
+  display: flex;
+  background-color: #f6f6f6;
+  bottom: 0;
+  flex-align: center;
+  align-items: center;
+  justify-content: space-between;
+  width: 100%;
+  z-index: 999;
+  padding: 0 20px 0 13px;
+}
+
+/*打印单样式编辑*/
+.order-list {
+  /*  height: 297mm;*/
+  margin: 0 auto;
+  width: 210mm;
+
+  .order-title {
+    height: 16mm;
+    line-height: 16mm;
+    font-size: 8mm;
+    font-weight: bolder;
+    text-align: center;
+  }
+  .order-info {
+    span {
+      display: inline-block;
+      padding: 0 0 10px 0;
+      font-size: 3mm;
+    }
+    span.info {
+      width: 60mm;
+    }
+  }
+  .el-table--small th,
+  .el-table--small td {
+    padding: 4px 0;
+  }
+}
+</style>
diff --git a/src/views/bxg/shop/order/indext.vue b/src/views/bxg/shop/order/indext.vue
new file mode 100644
index 0000000..7d2cb0c
--- /dev/null
+++ b/src/views/bxg/shop/order/indext.vue
@@ -0,0 +1,781 @@
+<template>
+  <div class="app-container">
+
+    <div style="height:740px;overflow-y: scroll;">
+      <el-tabs v-model="status" type="card" @tab-click="handleOrder">
+      <el-tab-pane name="-9">
+        <span slot="label"><i class="el-icon-s-order"></i> 全部订单</span>
+      </el-tab-pane>
+      <el-tab-pane name="0">
+        <span slot="label"><i class="el-icon-bank-card"></i> 未支付
+          <span v-if="Unpaid !==0" class="yuan">{{Unpaid}}</span>
+        </span>
+      </el-tab-pane>
+      <el-tab-pane name="1">
+        <span slot="label"><i class="el-icon-refrigerator"></i> 待核销
+          <span v-if="Undelivered !==0" class="yuan">{{Undelivered}}</span>
+        </span>
+      </el-tab-pane>
+      <el-tab-pane name="3">
+        <span slot="label"><i class="el-icon-document"></i> 待评价</span>
+      </el-tab-pane>
+      <el-tab-pane name="4">
+        <span slot="label"><i class="el-icon-circle-check"></i> 交易完成</span>
+      </el-tab-pane>
+      <el-tab-pane name="-1">
+        <span slot="label"><i class="el-icon-back"></i> 退款中
+          <span v-if="progress !==0" class="yuan">{{progress}}</span>
+        </span>
+      </el-tab-pane>
+      <el-tab-pane name="-2">
+        <span slot="label"><i class="el-icon-finished"></i> 已退款</span>
+      </el-tab-pane>
+    </el-tabs>
+    <!--工具栏-->
+    <div class="head-container">
+      <!-- 搜索 -->
+      <el-input v-model="query.value" clearable placeholder="输入搜索内容" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
+      <el-select v-model="query.type" clearable placeholder="类型" class="filter-item" style="width: 130px">
+        <el-option v-for="item in queryTypeOptions" :key="item.key" :label="item.display_name" :value="item.key" />
+      </el-select>
+      <el-select v-model="storeId" clearable placeholder="选择门店" class="filter-item" style="width: 130px">
+        <el-option v-for="item in storeList" :key="item.key" :label="item.name" :value="item.id" />
+      </el-select>
+      <el-date-picker
+          v-model="createTime"
+          :default-time="['00:00:00', '23:59:59']"
+          type="daterange"
+          range-separator=":"
+          size="small"
+          class="date-item"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        />
+      <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
+      <el-button
+        type="danger"
+        class="filter-item"
+        size="mini"
+        icon="el-icon-refresh"
+        @click="toQueryrt"
+      >刷新</el-button>
+
+      <!-- 新增 -->
+    </div>
+    <!--表单组件-->
+    <eForm ref="form" :is-add="isAdd" />
+    <eDetail ref="form1" :is-add="isAdd" />
+    <eRefund ref="form2" :is-add="isAdd" />
+    <editOrder ref="form3" :is-add="isAdd" />
+    <eRemark ref="form4" :is-add="isAdd" />
+    <!--表格渲染-->
+    <el-table v-loading="loading" :data="data" size="small" style="width: 100%;"  @selection-change="handleSelect">
+      <el-table-column
+          
+          type="selection"
+          width="50"
+          align="center"
+        />
+      <el-table-column prop="storeName" label="所属门店" align="center" />
+      <el-table-column prop="orderId" width="150" label="订单号" align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.row.orderId }}</span>
+          <p>{{ scope.row.pinkName }}</p>
+        </template>
+      </el-table-column>
+      <el-table-column prop="realName" label="用户姓名"  align="center"/>
+      <el-table-column prop="cartInfoList" width="500" label="商品信息" align="center">
+        <template slot-scope="scope">
+          <div style="height:62px;" v-for="(item,index) in scope.row.cartInfoList" v-if="item.cartInfoMap.productInfo.attrInfo">
+            <div style="float:left;height:30px;margin-bottom:5px;width:30px" >
+              <img
+                style="width: 30px;height: 30px;margin:0;cursor: pointer;"
+                :src="item.cartInfoMap.productInfo.attrInfo.image"
+              >
+            </div>
+              <div style="float:left;width: 70%; padding-left: 30px;text-align: left;">
+                <span>{{ item.cartInfoMap.productInfo.storeName }}</span>
+                
+                <span style="display:block;margin-top:-8px;color:#9e9e9e"  >
+                <span v-if="item.cartInfoMap.productInfo.attrInfo.sku !== '默认'">规格：</span>
+                <span>{{item.cartInfoMap.productInfo.attrInfo.sku }}</span>
+                 
+              </span>
+              </div>
+             
+              <div style="float:left;width:100px;padding-left:10px">
+                
+                 <span> | &nbsp; &nbsp;    ￥{{ item.cartInfoMap.truePrice }}×{{ item.cartInfoMap.cartNum }}</span> 
+              </div>
+
+            </div>
+            <div v-else>
+            <span><img
+              style="width: 30px;height: 30px;margin:0;cursor: pointer;"
+              :src="item.cartInfoMap.productInfo.image"
+            ></span>
+              <span>{{ item.cartInfoMap.productInfo.storeName }}</span>
+              <span> | ￥{{ item.cartInfoMap.truePrice }}×{{ item.cartInfoMap.cartNum }}</span>
+            </div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="payPrice" label="微信支付" align="center" />
+      <el-table-column prop="yuePrice" label="余额支付" align="center" />
+      <el-table-column prop="payTypeName" label="支付状态" align="center" />
+      <el-table-column prop="statusName" label="订单状态" align="center" width="200">
+        <template slot-scope="scope">
+          <span v-html="scope.row.statusName">{{ scope.row.statusName }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="addTime" width="160" label="创建时间" align="center">
+        <template slot-scope="scope">
+          <span>{{ formatTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column  label="操作" width="200" align="center" fixed="right">
+        <template slot-scope="scope">
+          <el-button
+            
+            size="mini"
+            type="primary"
+            @click="detail(scope.row)"
+          >
+            订单详情</el-button>
+          <el-dropdown size="mini" split-button type="primary" trigger="click" v-permission="['admin','YXSTOREORDER_ALL','YXSTOREORDER_EDIT']">
+            操作
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item>
+                <div
+                  v-permission="['admin','YXSTOREORDER_ALL','YXSTOREORDER_EDIT']"
+                  style="text-align: center;width: 60px;height: 25px;"
+                  @click="remark(scope.row)"
+                >
+                  订单备注</div>
+              </el-dropdown-item>
+              <el-dropdown-item>
+                <div
+                  v-if="scope.row._status == 2"
+                  v-permission="['admin','YXSTOREORDER_ALL','YXSTOREORDER_EDIT']"
+                  style="text-align: center;width: 60px;height: 25px;"
+                  @click="edit(scope.row)"
+                >
+                  订单核销</div>
+              </el-dropdown-item>
+              <el-dropdown-item>
+                <div
+                  v-if="scope.row._status == 3"
+                  v-permission="['admin','YXSTOREORDER_ALL','YXSTOREORDER_EDIT']"
+                  style="text-align: center;width: 60px;height: 25px;"
+                  @click="refund(scope.row)"
+                >
+                  立刻退款</div>
+              </el-dropdown-item>
+              <el-dropdown-item v-if="scope.row._status == 1">
+                <div
+                  v-permission="['admin','YXSTOREORDER_ALL','YXSTOREORDER_EDIT']"
+                  style="text-align: center;width: 60px;height: 25px;"
+                  @click="editOrder(scope.row)"
+                >
+                  修改订单</div>
+              </el-dropdown-item>
+              <el-dropdown-item v-if="scope.row._status == 1">
+                <el-popover
+                  :ref="scope.row.id"
+                  v-permission="['admin','YXSTOREORDER_ALL','YXSTOREORDER_DELETE']"
+                  placement="top"
+                  width="180"
+                >
+                  <p>确定删除本条数据吗？</p>
+                  <div style="text-align: right; margin: 0">
+                    <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
+                    <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
+                  </div>
+                  <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini">删除</el-button>
+                </el-popover>
+              </el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
+
+        </template>
+      </el-table-column>
+    </el-table>
+    </div>
+    <!--分页组件-->
+   <el-footer style="height:60px;width:100%;background-color:#f6f6f6">
+     <div style="float:left;margin-top:15px">
+       <el-select
+          v-model="batchExport"
+          @change="handleExportOption"
+          clearable
+          placeholder="批量导出"
+          class="filter-item"
+          style="width: 130px"
+        >
+          <el-option
+            v-for="item in exportOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+     </div>
+      <el-pagination
+      :total="total"
+      :current-page="page + 1"
+      style="margin-top: 15px; float:right"
+      layout="total, prev, pager, next, sizes"
+      @size-change="sizeChange"
+      @current-change="pageChange"
+    />
+   </el-footer>
+  </div>
+</template>
+
+<script>
+import checkPermission from '@/utils/permission'
+import initData from '@/mixins/crud'
+import { del,getCount,CodeList } from '@/api/yxStoreOrder'
+import { getAll } from '@/api/yxSystemStore'
+import eForm from './formC'
+import eDetail from './detail'
+import eRefund from './refund'
+import editOrder from './edit'
+import eRemark from './remark'
+import { formatTime } from '@/utils/index'
+export default {
+  components: { eForm, eDetail, eRefund, editOrder, eRemark },
+  mixins: [initData],
+  inject:['reload'],
+  data() {
+    return {
+      Unpaid:0,
+      Undelivered:0,
+      progress:0,
+      delLoading: false, status: '-9', orderType: '0', storeList: [] , storeId: null,createTime:"",batchExport: "",exportOptions: [
+        { value: "", label: "批量导出" },
+        { value: "0", label: "导出全部" },
+        { value: "1", label: "导出选中" },
+      ],
+      liste:[],
+      listContent:[],
+      queryTypeOptions: [
+        { key: 'orderId', display_name: '订单号' },
+        { key: 'realName', display_name: '用户姓名' },
+        { key: 'userPhone', display_name: '用户电话' }
+      ],
+      statusOptions: [
+        { value: '0', label: '未支付' },
+        { value: '1', label: '未发货' },
+        { value: '2', label: '待收货' },
+        { value: '3', label: '待评价' },
+        { value: '4', label: '交易完成' },
+        // { value: '5', label: '待核销' },
+        { value: '-1', label: '退款中' },
+        { value: '-2', label: '已退款' },
+        { value: '-4', label: '已删除' }
+      ]
+    }
+  },
+  created() {
+    this.$nextTick(() => {
+      this.init()
+    })
+    this.getStoreAll()
+    this.getCounts()
+  },
+  
+  methods: {
+    // verificationCode(val){
+    //   this.options = []
+    //   console.log(val,'搜索内容')
+    //   this.verifyCode = this.verifyCode+val.data
+    //   console.log(this.verifyCode,'显示数据')
+    //   let plams = {
+    //     val:this.verifyCode 
+    //   }
+    //   CodeList(plams).then(res=>{
+    //     console.log(res,'核销码')
+    //     res.forEach((item,index)=>{
+    //       this.options.push({
+    //         value:item,
+    //         label:item
+    //       })
+    //       console.log(this.options,'数据显示')
+    //     })
+    //   })
+    // },
+    // codes(){
+    //   this.verifyCode = ''
+    // },
+    getCounts(){
+      let plams = {
+        shippingType:2,
+      }
+      getCount(plams).then(res=>{
+        console.log(res,'是否存在请求')
+        this.Unpaid = res.Unpaid
+        this.Undelivered = res.Undelivered
+        this.progress = res.progress
+      })
+    },
+    // Submitss() {
+    //   this.dialogFormVisible = false;
+    //   // this.demos.push(this.explain)
+    //   this.ces.refundReasonWapExplain = this.demos.explain;
+
+    //   this.demos.explain = this.demos.text = "";
+    //   console.log(this.ces);
+    //   let plam = {};
+    //   plam = this.ces;
+    //   console.log(plam);
+    //   addss(plam).then((res) => {
+    //     console.log(res);
+    //     this.init();
+    //     this.$notify({
+    //       title: "提交成功",
+    //       type: "success",
+    //       duration: 2500,
+    //     });
+    //   });
+    // },
+    // SubmitRefund(row) {
+    //   this.dialogFormVisible = true;
+
+    //   this.ces = row;
+    // },
+    toQueryrt(){
+this.reload()
+    },
+    getStoreAll() {
+      getAll().then(res => {
+          this.storeList = res
+      })
+    },
+    formatTime,
+    checkPermission,
+    handleOrder(tab, event) {
+      console.log(tab.name,'自提')
+      this.status = tab.name
+      this.toQuery()
+    },
+    beforeInit() {
+      this.url = 'api/yxStoreOrder'
+      const sort = 'id,desc'
+      this.params = { page: this.page, size: this.size, sort: sort, orderStatus: this.status, orderType: 5, storeId: this.storeId,createTime: this.createTime,listContent: this.listContent, }
+      const query = this.query
+      const type = query.type
+      const value = query.value
+      if (type && value) { this.params[type] = value }
+      return true
+    },
+    subDelete(id) {
+      this.delLoading = true
+      del(id).then(res => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        this.dleChangePage()
+        this.init()
+        this.$notify({
+          title: '删除成功',
+          type: 'success',
+          duration: 2500
+        })
+      }).catch(err => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        console.log(err.response.data.message)
+      })
+    },
+    add() {
+      this.isAdd = true
+      this.$refs.form.dialog = true
+    },
+    edit(data) {
+      this.isAdd = false
+      const _this = this.$refs.form
+      _this.form = {
+        id: data.id,
+        orderId: data.orderId,
+        uid: data.uid,
+        realName: data.realName,
+        userPhone: data.userPhone,
+        userAddress: data.userAddress,
+        cartId: data.cartId,
+        freightPrice: data.freightPrice,
+        totalNum: data.totalNum,
+        totalPrice: data.totalPrice,
+        totalPostage: data.totalPostage,
+        payPrice: data.payPrice,
+        payPostage: data.payPostage,
+        deductionPrice: data.deductionPrice,
+        couponId: data.couponId,
+        couponPrice: data.couponPrice,
+        paid: data.paid,
+        payTime: data.payTime,
+        payType: data.payType,
+        addTime: data.addTime,
+        status: data.status,
+        refundStatus: data.refundStatus,
+        refundReasonWapImg: data.refundReasonWapImg,
+        refundReasonWapExplain: data.refundReasonWapExplain,
+        refundReasonTime: data.refundReasonTime,
+        refundReasonWap: data.refundReasonWap,
+        refundReason: data.refundReason,
+        refundPrice: data.refundPrice,
+        deliveryName: data.deliveryName,
+        deliveryType: data.deliveryType,
+        deliveryId: data.deliveryId,
+        gainIntegral: data.gainIntegral,
+        useIntegral: data.useIntegral,
+        backIntegral: data.backIntegral,
+        mark: data.mark,
+        isDel: data.isDel,
+        unique: data.unique,
+        remark: data.remark,
+        merId: data.merId,
+        isMerCheck: data.isMerCheck,
+        combinationId: data.combinationId,
+        pinkId: data.pinkId,
+        cost: data.cost,
+        seckillId: data.seckillId,
+        bargainId: data.bargainId,
+        verifyCode: data.verifyCode,
+        storeId: data.storeId,
+        shippingType: data.shippingType,
+        isChannel: data.isChannel,
+        isRemind: data.isRemind,
+        isSystemDel: data.isSystemDel
+      }
+      _this.dialog = true
+    },
+    editOrder(data) {
+      this.isAdd = false
+      const _this = this.$refs.form3
+      _this.form = {
+        id: data.id,
+        orderId: data.orderId,
+        uid: data.uid,
+        realName: data.realName,
+        userPhone: data.userPhone,
+        userAddress: data.userAddress,
+        cartId: data.cartId,
+        freightPrice: data.freightPrice,
+        totalNum: data.totalNum,
+        totalPrice: data.totalPrice,
+        totalPostage: data.totalPostage,
+        payPrice: data.payPrice,
+        payPostage: data.payPostage,
+        deductionPrice: data.deductionPrice,
+        couponId: data.couponId,
+        couponPrice: data.couponPrice,
+        paid: data.paid,
+        payTime: data.payTime,
+        payType: data.payType,
+        addTime: data.addTime,
+        status: data.status,
+        refundStatus: data.refundStatus,
+        refundReasonWapImg: data.refundReasonWapImg,
+        refundReasonWapExplain: data.refundReasonWapExplain,
+        refundReasonTime: data.refundReasonTime,
+        refundReasonWap: data.refundReasonWap,
+        refundReason: data.refundReason,
+        refundPrice: data.refundPrice,
+        deliveryName: data.deliveryName,
+        deliveryType: data.deliveryType,
+        deliveryId: data.deliveryId,
+        gainIntegral: data.gainIntegral,
+        useIntegral: data.useIntegral,
+        backIntegral: data.backIntegral,
+        mark: data.mark,
+        isDel: data.isDel,
+        unique: data.unique,
+        remark: data.remark,
+        merId: data.merId,
+        isMerCheck: data.isMerCheck,
+        combinationId: data.combinationId,
+        pinkId: data.pinkId,
+        cost: data.cost,
+        seckillId: data.seckillId,
+        bargainId: data.bargainId,
+        verifyCode: data.verifyCode,
+        storeId: data.storeId,
+        shippingType: data.shippingType,
+        isChannel: data.isChannel,
+        isRemind: data.isRemind,
+        isSystemDel: data.isSystemDel
+      }
+      _this.dialog = true
+    },
+    remark(data) {
+      this.isAdd = false
+      const _this = this.$refs.form4
+      _this.form = {
+        id: data.id,
+        orderId: data.orderId,
+        uid: data.uid,
+        realName: data.realName,
+        userPhone: data.userPhone,
+        userAddress: data.userAddress,
+        cartId: data.cartId,
+        freightPrice: data.freightPrice,
+        totalNum: data.totalNum,
+        totalPrice: data.totalPrice,
+        totalPostage: data.totalPostage,
+        payPrice: data.payPrice,
+        payPostage: data.payPostage,
+        deductionPrice: data.deductionPrice,
+        couponId: data.couponId,
+        couponPrice: data.couponPrice,
+        paid: data.paid,
+        payTime: data.payTime,
+        payType: data.payType,
+        addTime: data.addTime,
+        status: data.status,
+        refundStatus: data.refundStatus,
+        refundReasonWapImg: data.refundReasonWapImg,
+        refundReasonWapExplain: data.refundReasonWapExplain,
+        refundReasonTime: data.refundReasonTime,
+        refundReasonWap: data.refundReasonWap,
+        refundReason: data.refundReason,
+        refundPrice: data.refundPrice,
+        deliveryName: data.deliveryName,
+        deliveryType: data.deliveryType,
+        deliveryId: data.deliveryId,
+        gainIntegral: data.gainIntegral,
+        useIntegral: data.useIntegral,
+        backIntegral: data.backIntegral,
+        mark: data.mark,
+        isDel: data.isDel,
+        unique: data.unique,
+        remark: data.remark,
+        merId: data.merId,
+        isMerCheck: data.isMerCheck,
+        combinationId: data.combinationId,
+        pinkId: data.pinkId,
+        cost: data.cost,
+        seckillId: data.seckillId,
+        bargainId: data.bargainId,
+        verifyCode: data.verifyCode,
+        storeId: data.storeId,
+        shippingType: data.shippingType,
+        isChannel: data.isChannel,
+        isRemind: data.isRemind,
+        isSystemDel: data.isSystemDel
+      }
+      _this.dialog = true
+    },
+    refund(data) {
+      console.log(data)
+      this.isAdd = false
+      const _this = this.$refs.form2
+      _this.form = {
+        id: data.id,
+        orderId: data.orderId,
+        uid: data.uid,
+        realName: data.realName,
+        userPhone: data.userPhone,
+        userAddress: data.userAddress,
+        cartId: data.cartId,
+        freightPrice: data.freightPrice,
+        totalNum: data.totalNum,
+        totalPrice: data.totalPrice,
+        totalPostage: data.totalPostage,
+        payPrice: data.payPrice,
+        yuePrice:data.yuePrice,
+        payPostage: data.payPostage,
+        deductionPrice: data.deductionPrice,
+        couponId: data.couponId,
+        couponPrice: data.couponPrice,
+        paid: data.paid,
+        payTime: data.payTime,
+        payType: data.payType,
+        addTime: data.addTime,
+        status: data.status,
+        refundStatus: data.refundStatus,
+        refundReasonWapImg: data.refundReasonWapImg,
+        refundReasonWapExplain: data.refundReasonWapExplain,
+        refundReasonTime: data.refundReasonTime,
+        refundReasonWap: data.refundReasonWap,
+        refundReason: data.refundReason,
+        refundPrice: data.refundPrice,
+        deliveryName: data.deliveryName,
+        deliveryType: data.deliveryType,
+        deliveryId: data.deliveryId,
+        gainIntegral: data.gainIntegral,
+        useIntegral: data.useIntegral,
+        backIntegral: data.backIntegral,
+        mark: data.mark,
+        isDel: data.isDel,
+        unique: data.unique,
+        remark: data.remark,
+        merId: data.merId,
+        isMerCheck: data.isMerCheck,
+        combinationId: data.combinationId,
+        pinkId: data.pinkId,
+        cost: data.cost,
+        seckillId: data.seckillId,
+        bargainId: data.bargainId,
+        verifyCode: data.verifyCode,
+        storeId: data.storeId,
+        shippingType: data.shippingType,
+        isChannel: data.isChannel,
+        isRemind: data.isRemind,
+        isSystemDel: data.isSystemDel
+      }
+      _this.dialog = true
+    },
+    detail(data) {
+      
+      this.isAdd = false
+      const _this = this.$refs.form1
+      _this.form = {
+        id: data.id,
+        orderId: data.orderId,
+        payTypeName: data.payTypeName,
+        statusName: data.statusName,
+        uid: data.uid,
+        realName: data.realName,
+        userPhone: data.userPhone,
+        userAddress: data.userAddress,
+        cartId: data.cartId,
+        freightPrice: data.freightPrice,
+        totalNum: data.totalNum,
+        totalPrice: data.totalPrice,
+        totalPostage: data.totalPostage,
+        payPrice: data.payPrice,
+        payPostage: data.payPostage,
+        deductionPrice: data.deductionPrice,
+        couponId: data.couponId,
+        couponPrice: data.couponPrice,
+        paid: data.paid,
+        payTime: data.payTime,
+        payType: data.payType,
+        addTime: data.addTime,
+        status: data.status,
+        refundStatus: data.refundStatus,
+        refundReasonWapImg: data.refundReasonWapImg,
+        refundReasonWapExplain: data.refundReasonWapExplain,
+        refundReasonTime: data.refundReasonTime,
+        refundReasonWap: data.refundReasonWap,
+        refundReason: data.refundReason,
+        refundPrice: data.refundPrice,
+        deliveryName: data.deliveryName,
+        deliveryType: data.deliveryType,
+        deliveryId: data.deliveryId,
+        gainIntegral: data.gainIntegral,
+        useIntegral: data.useIntegral,
+        backIntegral: data.backIntegral,
+        mark: data.mark,
+        isDel: data.isDel,
+        unique: data.unique,
+        remark: data.remark,
+        merId: data.merId,
+        isMerCheck: data.isMerCheck,
+        combinationId: data.combinationId,
+        pinkId: data.pinkId,
+        cost: data.cost,
+        seckillId: data.seckillId,
+        bargainId: data.bargainId,
+        verifyCode: data.verifyCode,
+        storeId: data.storeId,
+        shippingType: data.shippingType,
+        isChannel: data.isChannel,
+        isRemind: data.isRemind,
+        isSystemDel: data.isSystemDel,
+        nickname: data.userDTO.nickname,
+        yuePrice:data.yuePrice
+      }
+      _this.dialog = true
+    },
+      handleSelect(val){
+     console.log(val,'dddd')
+     this.liste = val
+   },
+    handleExportOption(val) {
+      let list = this.liste;
+      this.page = 0;
+      this.size = 10000;
+      switch (val) {
+        case "0":
+          this.listContent = "";
+          this.beforeInit();
+          this.downloadMethod();
+          break;
+        case "1":
+          if (list.length == 0) {
+            this.$message({
+              message: "请选择订单",
+              type: "warning",
+            });
+          } else {
+            this.listContent = [];
+            list.forEach((item) => {
+              this.listContent.push(item.orderId);
+            });
+            this.listContent = JSON.stringify(this.listContent);
+            
+            console.log(this.listContent,'listContentlistContent');
+            this.beforeInit();
+            this.downloadMethod();
+          }
+          break;
+        default:
+          break;
+      }
+      this.batchExport = "";
+    },
+  //   handleSelect(val){
+  //    console.log(val,'dddd')
+  //    this.liste = val
+  //  },
+  //   handleExportOption(val){
+      
+  //     console.log(val)
+  //     if(val == 1){
+  //       this.liste.forEach(item=>{
+  //       this.listContent.push(item.orderId)
+  //     })
+  //     console.log(this.listContent,'这是嘛呀')
+  //     let liuy = JSON.stringify(this.listContent)
+  //     let plams = {
+  //       listContent:liuy,
+  //       sort : 'id%2Cdesc'
+  //     }
+  //     xaiz(plams).then(res=>{
+  //       console.log(res,'选中')
+  //     })
+  //     }else if(val == 0){
+  //       let plamsw = {
+  //         listContent:'',
+  //         sort : 'id,desc'
+  //       }
+  //       xaiz(plamsw).then(res=>{
+  //         console.log(res,'全部')
+  //       })
+  //     }
+      
+  //     console.log(this.listContent,'zuihoude')
+  //   },
+  }
+}
+</script>
+
+<style scoped>
+.yuan{
+  width: 15px;
+    height: 15px;
+    line-height: 15px;
+    text-align: center;
+    background: red;
+    position: absolute;
+    top: 2px;
+    right: 2px;
+    display: block;
+    color: #fff;
+    border-radius: 50px;
+}
+  .app-container{
+  padding-bottom: 0px;
+}
+</style>
diff --git a/src/views/bxg/shop/order/print.vue b/src/views/bxg/shop/order/print.vue
new file mode 100644
index 0000000..3972ef3
--- /dev/null
+++ b/src/views/bxg/shop/order/print.vue
@@ -0,0 +1,189 @@
+<template>
+  <el-dialog id="printDialog" :append-to-body="false" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" title="订单打印" width="220mm">
+
+    <el-button
+      type="warning"
+      class="filter-item"
+      size="mini"
+      icon="el-icon-printer"
+      onclick="doPrint()"
+    >打印</el-button>
+
+    <div id="printList">
+      <div class="order-list" v-for="(list, index) in printList">
+      <el-header class="order-title">订货单</el-header>
+
+      <div class="order-info">
+        <span class="info">{{list.orderId}}</span>
+        <span class="info">下单日期 : {{formatTimeTwo(list.addTime)}}</span>
+        <span>客户名称 : {{list.realName}}</span>
+      </div>
+      <div class="order-info">
+        <span class="info">联系人 : {{list.userDTO.account}}</span>
+        <span class="info">联系电话 : {{list.userPhone}}</span>
+        <span>收货地址 : {{list.userAddress}}</span>
+      </div>
+
+      <el-table border show-summary :data="list.cartInfoList"  :summary-method="getSummaries" size="small" style="width: 100%;">
+        <el-table-column type="index" label="行号" :index="indexMethod" width="60mm"/>
+
+        <el-table-column prop="cartInfoMap.productInfo.productId" width="80mm" label="商品编号" />
+
+        <el-table-column prop="cartInfoMap.productInfo.storeName" width="172mm" label="商品名称" />
+
+        <el-table-column prop="cartInfoMap.productInfo.unitName" width="80mm" label="商品规格" />
+
+        <el-table-column prop="cartInfoMap.productInfo.unitName" width="80mm" label="单位" />
+
+        <el-table-column prop="cartInfoMap.productInfo.price" width="80mm" label="单价" />
+
+        <el-table-column prop="cartInfoMap.cartNum" width="80mm" label="数量" />
+
+        <el-table-column prop="cartInfoMap" width="80mm" label="小计(元)" >
+          <template slot-scope="scope">
+            <span>{{ scope.row.cartInfoMap.productInfo.price*scope.row.cartInfoMap.cartNum }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column prop="cartInfoMap.mark" width="80mm" label="备注" />
+
+      </el-table>
+    </div>
+    </div>
+
+  </el-dialog>
+</template>
+
+<script>
+import { formatTime, parseTime, formatTimeTwo } from '@/utils/index'
+export default {
+ props: {
+    printList: {
+      type: Array,
+      required: true
+    },
+    toQuery: {
+      type: Function,
+      required: true
+    }
+  },
+  data() {
+    return {
+      loading: false, dialog: false
+    }
+  },
+  mounted() {
+    window.doPrint = this.doPrint;
+  },
+  methods: {
+    formatTime,
+    parseTime,
+    formatTimeTwo,
+    cancel() {
+      this.dialog = false
+    },
+    indexMethod(index){
+      return index+1;
+    },
+    doPrint(){
+      let printbox = document.querySelector("#printList").innerHTML;
+      document.querySelector("body").innerHTML = printbox;
+      window.print();
+      this.cancel();
+      // this.toQuery();
+      window.location.reload();
+    },
+    getSummaries(param) {
+      const { columns, data } = param;
+      const sums = [];
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '合计';
+          return;
+        }else if(index === 7){
+          const values = data.map(item => Number(item.cartInfoMap.productInfo.price*item.cartInfoMap.cartNum));
+          sums[index] = values.reduce((prev, curr) => {
+            const value = Number(curr);
+            if (!isNaN(value)) {
+              return prev + curr;
+            } else {
+              return prev;
+            }
+          }, 0);
+          sums[index] += ' 元';
+        }
+      });
+      return sums;
+    }
+  }
+}
+</script>
+<style scoped lang="scss">
+  .container {
+    height: calc(100% - 80px);
+    position: absolute;
+    overflow: auto;
+    width: calc(100% - 20px);
+
+    .order-caculate {
+      font-size: 14px;
+      color: #909399;
+      border-top: 1px solid #f0f0f0;
+      padding: 20px 10px;
+      .caculate-title {
+        display: inline-block;
+        margin-right: 50px;
+      }
+      .caculate-num {
+        font-size: 20px;
+        color: #ff4949;
+      }
+    }
+
+    .el-table th {
+      background-color: #fafafa;
+    }
+  }
+
+  .footer-contains {
+    position: absolute;
+    display: -ms-flexbox;
+    display: flex;
+    background-color: #f6f6f6;
+    bottom: 0;
+    flex-align: center;
+    align-items: center;
+    justify-content: space-between;
+    width: 100%;
+    z-index: 999;
+    padding: 0 20px 0 13px;
+  }
+
+  /*打印单样式编辑*/
+  .order-list {
+    /*  height: 297mm;*/
+    margin: 0 auto;
+    width: 210mm;
+
+    .order-title {
+      height: 16mm;
+      line-height: 16mm;
+      font-size: 8mm;
+      font-weight: bolder;
+      text-align: center;
+    }
+    .order-info {
+      span {
+        display: inline-block;
+        padding: 0 0 10px 0;
+        font-size: 3mm;
+      }
+      span.info {
+        width: 60mm;
+      }
+    }
+    .el-table--small th, .el-table--small td {
+      padding: 4px 0;
+    }
+  }
+</style>
diff --git a/src/views/bxg/shop/order/refund.vue b/src/views/bxg/shop/order/refund.vue
new file mode 100644
index 0000000..26f68ae
--- /dev/null
+++ b/src/views/bxg/shop/order/refund.vue
@@ -0,0 +1,218 @@
+<template>
+  <el-dialog :append-to-body="true" :close-on-click-modal="false"  :visible.sync="dialog" :title="isAdd ? '新增' : '退款'" width="500px">
+    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
+      <el-form-item label="订单号">
+        <el-input v-model="form.orderId" :disabled="true" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="退款+金额">
+        <el-input v-model="form.payPrice" style="width: 370px;" :disabled="true"  />
+      </el-form-item>
+      <el-form-item label="余额金额">
+        <el-input v-model="form.yuePrice" style="width: 370px;" :disabled="true"  />
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="danger" @click="cancel">拒绝</el-button>
+      <el-button :loading="loading" type="primary" @click="doSubmit">同意</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { add, refund ,refuse} from '@/api/yxStoreOrder'
+export default {
+  inject:["reload"],
+  props: {
+    isAdd: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data() {
+    return {
+      loading: false, dialog: false,
+      form: {
+        id: '',
+        orderId: '',
+        uid: '',
+        realName: '',
+        userPhone: '',
+        userAddress: '',
+        cartId: '',
+        freightPrice: '',
+        totalNum: '',
+        totalPrice: '',
+        totalPostage: '',
+        payPrice: '',
+        yuePrice:'',
+        payPostage: '',
+        deductionPrice: '',
+        couponId: '',
+        couponPrice: '',
+        paid: '',
+        payTime: '',
+        payType: '',
+        addTime: '',
+        status: '',
+        refundStatus: '',
+        refundReasonWapImg: '',
+        refundReasonWapExplain: '',
+        refundReasonTime: '',
+        refundReasonWap: '',
+        refundReason: '',
+        refundPrice: '',
+        deliveryName: '',
+        deliveryType: '',
+        deliveryId: '',
+        gainIntegral: '',
+        useIntegral: '',
+        backIntegral: '',
+        mark: '',
+        isDel: '',
+        unique: '',
+        remark: '',
+        merId: '',
+        isMerCheck: '',
+        combinationId: '',
+        pinkId: '',
+        cost: '',
+        seckillId: '',
+        bargainId: '',
+        verifyCode: '',
+        storeId: '',
+        shippingType: '',
+        isChannel: '',
+        isRemind: '',
+        isSystemDel: '',
+        isVipGift:''
+      },
+      rules: {
+        unique: [
+          { required: true, message: 'please enter', trigger: 'blur' }
+        ]
+      }
+    }
+  },
+ 
+  methods: {
+    
+    doSubmit() {
+      this.loading = true
+      if (this.isAdd) {
+        this.doAdd()
+      } else this.doEdit()
+      this.reload()
+    },
+    doAdd() {
+      add(this.form).then(res => {
+        console.log(this.form)
+        this.resetForm()
+        this.$notify({
+          title: '添加成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    doEdit() {
+      console.log(this.form)
+      refund(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '操作成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    cancel() {
+      refuse(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '退款已拒绝',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    resetForm() {
+      this.dialog = false
+      this.$refs['form'].resetFields()
+      this.form = {
+        id: '',
+        orderId: '',
+        uid: '',
+        realName: '',
+        userPhone: '',
+        userAddress: '',
+        cartId: '',
+        freightPrice: '',
+        totalNum: '',
+        totalPrice: '',
+        totalPostage: '',
+        payPrice: '',
+        yuePrice:'',
+        payPostage: '',
+        deductionPrice: '',
+        couponId: '',
+        couponPrice: '',
+        paid: '',
+        payTime: '',
+        payType: '',
+        addTime: '',
+        status: '',
+        refundStatus: '',
+        refundReasonWapImg: '',
+        refundReasonWapExplain: '',
+        refundReasonTime: '',
+        refundReasonWap: '',
+        refundReason: '',
+        refundPrice: '',
+        deliveryName: '',
+        deliveryType: '',
+        deliveryId: '',
+        gainIntegral: '',
+        useIntegral: '',
+        backIntegral: '',
+        mark: '',
+        isDel: '',
+        unique: '',
+        remark: '',
+        merId: '',
+        isMerCheck: '',
+        combinationId: '',
+        pinkId: '',
+        cost: '',
+        seckillId: '',
+        bargainId: '',
+        verifyCode: '',
+        storeId: '',
+        shippingType: '',
+        isChannel: '',
+        isRemind: '',
+        isSystemDel: '',
+        isVipGift:''
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/bxg/shop/order/remark.vue b/src/views/bxg/shop/order/remark.vue
new file mode 100644
index 0000000..42037ba
--- /dev/null
+++ b/src/views/bxg/shop/order/remark.vue
@@ -0,0 +1,193 @@
+<template>
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增' : '编辑'" width="500px">
+    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
+      <el-form-item label="订单号">
+        <el-input v-model="form.orderId" :disabled="true" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="订单备注">
+        <el-input v-model="form.remark" style="width: 370px;" rows="5" type="textarea" />
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="text" @click="cancel">取消</el-button>
+      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { add, remark } from '@/api/yxStoreOrder'
+export default {
+  props: {
+    isAdd: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data() {
+    return {
+      loading: false, dialog: false,
+      form: {
+        id: '',
+        orderId: '',
+        uid: '',
+        realName: '',
+        userPhone: '',
+        userAddress: '',
+        cartId: '',
+        freightPrice: '',
+        totalNum: '',
+        totalPrice: '',
+        totalPostage: '',
+        payPrice: '',
+        payPostage: '',
+        deductionPrice: '',
+        couponId: '',
+        couponPrice: '',
+        paid: '',
+        payTime: '',
+        payType: '',
+        addTime: '',
+        status: '',
+        refundStatus: '',
+        refundReasonWapImg: '',
+        refundReasonWapExplain: '',
+        refundReasonTime: '',
+        refundReasonWap: '',
+        refundReason: '',
+        refundPrice: '',
+        deliveryName: '',
+        deliveryType: '',
+        deliveryId: '',
+        gainIntegral: '',
+        useIntegral: '',
+        backIntegral: '',
+        mark: '',
+        isDel: '',
+        unique: '',
+        remark: '',
+        merId: '',
+        isMerCheck: '',
+        combinationId: '',
+        pinkId: '',
+        cost: '',
+        seckillId: '',
+        bargainId: '',
+        verifyCode: '',
+        storeId: '',
+        shippingType: '',
+        isChannel: '',
+        isRemind: '',
+        isSystemDel: ''
+      },
+      rules: {
+        unique: [
+          { required: true, message: 'please enter', trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    cancel() {
+      this.resetForm()
+    },
+    doSubmit() {
+      this.loading = true
+      if (this.isAdd) {
+        this.doAdd()
+      } else this.doEdit()
+    },
+    doAdd() {
+      add(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '添加成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    doEdit() {
+      remark(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '修改成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    resetForm() {
+      this.dialog = false
+      this.$refs['form'].resetFields()
+      this.form = {
+        id: '',
+        orderId: '',
+        uid: '',
+        realName: '',
+        userPhone: '',
+        userAddress: '',
+        cartId: '',
+        freightPrice: '',
+        totalNum: '',
+        totalPrice: '',
+        totalPostage: '',
+        payPrice: '',
+        payPostage: '',
+        deductionPrice: '',
+        couponId: '',
+        couponPrice: '',
+        paid: '',
+        payTime: '',
+        payType: '',
+        addTime: '',
+        status: '',
+        refundStatus: '',
+        refundReasonWapImg: '',
+        refundReasonWapExplain: '',
+        refundReasonTime: '',
+        refundReasonWap: '',
+        refundReason: '',
+        refundPrice: '',
+        deliveryName: '',
+        deliveryType: '',
+        deliveryId: '',
+        gainIntegral: '',
+        useIntegral: '',
+        backIntegral: '',
+        mark: '',
+        isDel: '',
+        unique: '',
+        remark: '',
+        merId: '',
+        isMerCheck: '',
+        combinationId: '',
+        pinkId: '',
+        cost: '',
+        seckillId: '',
+        bargainId: '',
+        verifyCode: '',
+        storeId: '',
+        shippingType: '',
+        isChannel: '',
+        isRemind: '',
+        isSystemDel: ''
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/bxg/shop/recharge/index.vue b/src/views/bxg/shop/recharge/index.vue
new file mode 100644
index 0000000..648f7fd
--- /dev/null
+++ b/src/views/bxg/shop/recharge/index.vue
@@ -0,0 +1,106 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <div v-if="crud.props.searchToggle">
+        <!-- 搜索 -->
+        <el-input v-model="query.value" clearable placeholder="输入搜索内容" style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
+        <el-select v-model="query.type" clearable placeholder="类型" class="filter-item" style="width: 130px">
+          <el-option v-for="item in queryTypeOptions" :key="item.key" :label="item.display_name" :value="item.key" />
+        </el-select>
+        <rrOperation :crud="crud" />
+      </div>
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <crudOperation :permission="permission" />
+      <!--表单组件-->
+      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
+        <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="text" @click="crud.cancelCU">取消</el-button>
+          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+        </div>
+      </el-dialog>
+      <!--表格渲染-->
+      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;height:calc(100vh - 290px);overflow-y: scroll;" @selection-change="crud.selectionChangeHandler">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column v-if="columns.visible('id')" prop="id" label="id" width="75" align="center" />
+        <el-table-column v-if="columns.visible('nickname')" prop="nickname" label="昵称" width="100" align="center" />
+        <el-table-column v-if="columns.visible('orderId')" prop="orderId" label="订单号" align="center" />
+        <el-table-column v-if="columns.visible('price')" prop="price" label="充值金额" width="100" align="center" />
+        <el-table-column v-if="columns.visible('rechargeType')" prop="rechargeType" label="充值类型" width="100px" align="center" />
+        <el-table-column v-if="columns.visible('paid')" prop="paid" label="是否支付" width="100px" align="center">
+          <template slot-scope="scope">
+            <span v-if="scope.row.paid == 1">是</span>
+            <span v-else>否</span>
+          </template>
+        </el-table-column>
+        <el-table-column v-if="columns.visible('payTime')" prop="payTime" label="支付时间" align="center" >
+          <template slot-scope="scope">
+            <span>{{ formatTimeTwo(scope.row.payTime) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column v-if="columns.visible('createTime')" prop="createTime" label="充值时间" align="center" >
+          <template slot-scope="scope">
+            <span>{{ formatTimeTwo(scope.row.createTime) }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+      <!--分页组件-->
+      <el-footer style="height:60px;width:100%;background-color:#f6f6f6">
+        <div style="float:left"></div>
+        <pagination style="float:right;margin-top:15px" />
+      </el-footer>
+    </div>
+  </div>
+</template>
+
+<script>
+import crudYxUserRecharge from '@/api/yxUserRecharge'
+import CRUD, { presenter, header, form, crud } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+import pagination from '@crud/Pagination'
+import { formatTimeTwo } from '@/utils/index'
+
+// crud交由presenter持有
+const defaultCrud = CRUD({ title: '充值管理', url: 'api/yxUserRecharge', sort: 'id,desc', crudMethod: { ...crudYxUserRecharge }, optShow: { add: false, edit: false, del: true, download: true}})
+const defaultForm = { id: null, uid: null, orderId: null, price: null, rechargeType: null, paid: null, payTime: null, addTime: null, refundPrice: null, nickname: null }
+export default {
+  name: 'YxUserRecharge',
+  components: { pagination, crudOperation, rrOperation, udOperation },
+  mixins: [presenter(defaultCrud), header(), form(defaultForm), crud()],
+  data() {
+    return {
+      permission: {
+        add: ['admin', 'yxUserRecharge:add'],
+        edit: ['admin', 'yxUserRecharge:edit'],
+        del: ['admin', 'yxUserRecharge:del']
+      },
+      rules: {
+      },
+      queryTypeOptions: [
+        { key: 'nickname', display_name: '昵称' }
+      ]
+    }
+  },
+  methods: {
+    formatTimeTwo,
+    // 获取数据前设置好接口地址
+    [CRUD.HOOK.beforeRefresh]() {
+      const query = this.query
+      if (query.type && query.value) {
+        this.crud.params[query.type] = query.value
+      }
+      return true
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .app-container{
+  padding-bottom: 0px;
+}
+</style>
diff --git a/src/views/bxg/shop/reply/form.vue b/src/views/bxg/shop/reply/form.vue
new file mode 100644
index 0000000..fa7437c
--- /dev/null
+++ b/src/views/bxg/shop/reply/form.vue
@@ -0,0 +1,115 @@
+<template>
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增' : '编辑'" width="500px">
+    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
+      <el-form-item label="回复内容">
+        <el-input v-model="form.merchantReplyContent" style="width: 370px;" rows="5" type="textarea"/>
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="text" @click="cancel">取消</el-button>
+      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { add, edit } from '@/api/yxStoreProductReply'
+export default {
+  props: {
+    isAdd: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data() {
+    return {
+      loading: false, dialog: false,
+      form: {
+        id: '',
+        uid: '',
+        oid: '',
+        unique: '',
+        productId: '',
+        replyType: '',
+        productScore: '',
+        serviceScore: '',
+        comment: '',
+        pics: '',
+        addTime: '',
+        merchantReplyContent: '',
+        merchantReplyTime: '',
+        isDel: '',
+        isReply: ''
+      },
+      rules: {
+      }
+    }
+  },
+  methods: {
+    cancel() {
+      this.resetForm()
+    },
+    doSubmit() {
+      this.loading = true
+      if (this.isAdd) {
+        this.doAdd()
+      } else this.doEdit()
+    },
+    doAdd() {
+      add(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '添加成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    doEdit() {
+      edit(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '修改成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    resetForm() {
+      this.dialog = false
+      this.$refs['form'].resetFields()
+      this.form = {
+        id: '',
+        uid: '',
+        oid: '',
+        unique: '',
+        productId: '',
+        replyType: '',
+        productScore: '',
+        serviceScore: '',
+        comment: '',
+        pics: '',
+        addTime: '',
+        merchantReplyContent: '',
+        merchantReplyTime: '',
+        isDel: '',
+        isReply: ''
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/bxg/shop/reply/index.vue b/src/views/bxg/shop/reply/index.vue
new file mode 100644
index 0000000..e3a6d75
--- /dev/null
+++ b/src/views/bxg/shop/reply/index.vue
@@ -0,0 +1,169 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <!-- 新增 -->
+      <el-button
+        type="danger"
+        class="filter-item"
+        size="mini"
+        icon="el-icon-refresh"
+        @click="toQuery"
+      >刷新</el-button>
+
+    </div>
+    <!--表单组件-->
+    <eForm ref="form" :is-add="isAdd" />
+    <!--表格渲染-->
+    <el-table v-loading="loading" :data="data" size="small" style="width: 100%;height:calc(100vh - 245px);overflow-y: scroll;">
+      <el-table-column prop="id" label="ID"   align="center"/>
+      <el-table-column prop="user.nickname" label="用户"  align="center" />
+      <el-table-column prop="storeProduct.storeName" label="商品信息" width="300"  align="center" />
+      <el-table-column prop="productScore" label="商品分数"  align="center" />
+      <el-table-column prop="serviceScore" label="服务分数"  align="center" />
+      <el-table-column prop="comment" label="评论内容"  width="400" align="center" />
+      <el-table-column prop="" label="评论图片"  align="center">
+        <template slot-scope="scope">
+          <div v-if="scope.row.pics">
+            <a v-for="pic in handlePic(scope.row.pics)" :href="pic" style="color: #42b983" target="_blank">
+              <img :src="pic" alt="点击打开" class="el-avatar">
+            </a>
+          </div>
+          <div v-else>无图</div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="createTime" label="评论时间"  align="center">
+        <template slot-scope="scope">
+          <span>{{ formatTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="merchantReplyTime" label="回复时间"  align="center">
+        <template slot-scope="scope">
+          <span>{{ formatTime(scope.row.merchantReplyTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column v-if="checkPermission(['admin','YXSTOREPRODUCTREPLY_ALL','YXSTOREPRODUCTREPLY_EDIT','YXSTOREPRODUCTREPLY_DELETE'])" label="操作" width="150px" align="center">
+        <template slot-scope="scope">
+          <el-button
+            v-permission="['admin','YXSTOREPRODUCTREPLY_ALL','YXSTOREPRODUCTREPLY_EDIT','YXSTOREPRODUCTREPLY_reply']"
+            size="mini"
+            type="primary"
+            @click="edit(scope.row)"
+          >
+            回复</el-button>
+          <el-popover
+            :ref="scope.row.id"
+            v-permission="['admin','YXSTOREPRODUCTREPLY_ALL','YXSTOREPRODUCTREPLY_DELETE']"
+            placement="top"
+            width="180"
+          >
+            <p>确定删除本条数据吗？</p>
+            <div style="text-align: right; margin: 0">
+              <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
+              <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
+            </div>
+            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
+          </el-popover>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!--分页组件-->
+   <el-footer style="height:60px;width:100%;background-color:#f6f6f6">
+     <div style="float:left"></div>
+      <el-pagination
+      :total="total"
+      :current-page="page + 1"
+      style="margin-top: 15px;float:right"
+      layout="total, prev, pager, next, sizes"
+      @size-change="sizeChange"
+      @current-change="pageChange"
+    />
+   </el-footer>
+  </div>
+</template>
+
+<script>
+import checkPermission from '@/utils/permission'
+import initData from '@/mixins/crud'
+import { del } from '@/api/yxStoreProductReply'
+import eForm from './form'
+import { formatTime } from '@/utils/index'
+export default {
+  components: { eForm },
+  mixins: [initData],
+  data() {
+    return {
+      delLoading: false
+    }
+  },
+  created() {
+    this.$nextTick(() => {
+      this.init()
+    })
+  },
+  methods: {
+    handlePic(pics) {
+      return pics.split(',')
+    },
+    formatTime,
+    checkPermission,
+    beforeInit() {
+      this.url = 'api/yxStoreProductReply'
+      const sort = 'id,desc'
+      this.params = { page: this.page, size: this.size, sort: sort }
+      return true
+    },
+    subDelete(id) {
+      this.delLoading = true
+      del(id).then(res => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        this.dleChangePage()
+        this.init()
+        this.$notify({
+          title: '删除成功',
+          type: 'success',
+          duration: 2500
+        })
+      }).catch(err => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        console.log(err.response.data.message)
+      })
+    },
+    add() {
+      this.isAdd = true
+      this.$refs.form.dialog = true
+    },
+    edit(data) {
+      this.isAdd = false
+      const _this = this.$refs.form
+      _this.form = {
+        id: data.id,
+        uid: data.uid,
+        oid: data.oid,
+        unique: data.unique,
+        productId: data.productId,
+        replyType: data.replyType,
+        productScore: data.productScore,
+        serviceScore: data.serviceScore,
+        comment: data.comment,
+        pics: data.pics,
+        addTime: data.addTime,
+        merchantReplyContent: data.merchantReplyContent,
+        merchantReplyTime: data.merchantReplyTime,
+        isDel: data.isDel,
+        isReply: data.isReply
+      }
+      _this.dialog = true
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .app-container{
+  padding-bottom: 0px;
+}
+</style>
diff --git a/src/views/bxg/shop/set/act.vue b/src/views/bxg/shop/set/act.vue
new file mode 100644
index 0000000..12faa0a
--- /dev/null
+++ b/src/views/bxg/shop/set/act.vue
@@ -0,0 +1,129 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <!-- 新增 -->
+      <div style="display: inline-block;margin: 0px 2px;">
+        <el-button
+          v-permission="['admin','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_CREATE']"
+          class="filter-item"
+          size="mini"
+          type="primary"
+          icon="el-icon-plus"
+          @click="add"
+        >新增</el-button>
+      </div>
+    </div>
+    <!--表单组件-->
+    <eForm ref="form" :is-add="isAdd" />
+    <!--表格渲染-->
+    <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
+      <el-table-column prop="id" label="ID" />
+      <el-table-column prop="map.title" label="标题" />
+      <el-table-column prop="map.info" label="简介" />
+      <el-table-column prop="map.url" label="链接url" />
+      <el-table-column ref="table" label="图片">
+        <template slot-scope="scope">
+          <a :href="scope.row.map.pic" style="color: #42b983" target="_blank"><img :src="scope.row.map.pic" alt="点击打开" class="el-avatar"></a>
+        </template>
+      </el-table-column>
+      <el-table-column v-if="checkPermission(['admin','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_EDIT','YXSYSTEMGROUPDATA_DELETE'])" label="操作" width="150px" align="center">
+        <template slot-scope="scope">
+          <el-button v-permission="['admin','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)" />
+          <el-popover
+            :ref="scope.row.id"
+            v-permission="['admin','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_DELETE']"
+            placement="top"
+            width="180"
+          >
+            <p>确定删除本条数据吗？</p>
+            <div style="text-align: right; margin: 0">
+              <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
+              <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
+            </div>
+            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
+          </el-popover>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--分页组件-->
+    <el-pagination
+      :total="total"
+      :current-page="page + 1"
+      style="margin-top: 8px;"
+      layout="total, prev, pager, next, sizes"
+      @size-change="sizeChange"
+      @current-change="pageChange"
+    />
+  </div>
+</template>
+
+<script>
+import checkPermission from '@/utils/permission'
+import initData from '@/mixins/crud'
+import { del } from '@/api/yxSystemGroupData'
+import eForm from './actform'
+export default {
+  components: { eForm },
+  mixins: [initData],
+  data() {
+    return {
+      delLoading: false
+    }
+  },
+  created() {
+    this.$nextTick(() => {
+      this.init()
+    })
+  },
+  methods: {
+    checkPermission,
+    beforeInit() {
+      this.url = 'api/yxSystemGroupData'
+      const sort = 'id,desc'
+      this.params = { page: this.page, size: this.size, sort: sort, groupName: 'yshop_home_activity' }
+      return true
+    },
+    subDelete(id) {
+      this.delLoading = true
+      del(id).then(res => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        this.dleChangePage()
+        this.init()
+        this.$notify({
+          title: '删除成功',
+          type: 'success',
+          duration: 2500
+        })
+      }).catch(err => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        console.log(err.response.data.message)
+      })
+    },
+    add() {
+      this.isAdd = true
+      this.$refs.form.dialog = true
+    },
+    edit(data) {
+      this.isAdd = false
+      const _this = this.$refs.form
+      _this.form = {
+        id: data.id,
+        groupName: data.groupName,
+        title: data.map.title,
+        info: data.map.info,
+        url: data.map.url,
+        pic: data.map.pic,
+        imageArr: data.map.pic.split(',')
+      }
+      _this.dialog = true
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/bxg/shop/set/actform.vue b/src/views/bxg/shop/set/actform.vue
new file mode 100644
index 0000000..f6692aa
--- /dev/null
+++ b/src/views/bxg/shop/set/actform.vue
@@ -0,0 +1,121 @@
+<template>
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增' : '编辑'" width="500px">
+    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="100px">
+      <el-form-item label="标题">
+        <el-input v-model="form.title" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="简介">
+        <el-input v-model="form.info" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="跳转url">
+        <el-input v-model="form.url" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="图片(260*260/416*214)">
+        <pic-upload v-model="form.pic" style="width: 500px;" />
+        <MaterialList v-model="form.imageArr" style="width: 500px" type="image" :num="1" :width="150" :height="150" />
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <!--<el-input v-model="form.groupName" />-->
+      <el-button type="text" @click="cancel">取消</el-button>
+      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { add, edit } from '@/api/yxSystemGroupData'
+import picUpload from '@/components/pic-upload'
+import MaterialList from '@/components/material'
+export default {
+  components: { picUpload, MaterialList },
+  props: {
+    isAdd: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data() {
+    return {
+      loading: false, dialog: false,
+      form: {
+        id: '',
+        groupName: 'yshop_home_activity',
+        title: '',
+        info: '',
+        url: '',
+        pic: '',
+        imageArr: [],
+        sort: '',
+        status: ''
+      },
+      rules: {
+      }
+    }
+  },
+  watch: {
+    'form.imageArr': function(val) {
+      if (val) {
+        this.form.pic = val.join(',')
+      }
+    }
+  },
+  methods: {
+    cancel() {
+      this.resetForm()
+    },
+    doSubmit() {
+      this.loading = true
+      if (this.isAdd) {
+        this.doAdd()
+      } else this.doEdit()
+    },
+    doAdd() {
+      add(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '添加成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    doEdit() {
+      edit(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '修改成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    resetForm() {
+      this.dialog = false
+      this.$refs['form'].resetFields()
+      this.form = {
+        id: '',
+        groupName: 'yshop_home_activity',
+        value: '',
+        addTime: '',
+        sort: '',
+        status: ''
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/bxg/shop/set/form.vue b/src/views/bxg/shop/set/form.vue
new file mode 100644
index 0000000..2fdda1b
--- /dev/null
+++ b/src/views/bxg/shop/set/form.vue
@@ -0,0 +1,132 @@
+<template>
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增' : '编辑'" width="500px">
+    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="140px">
+      <el-form-item label="标题">
+        <el-input v-model="form.name" style="width: 300px;" />
+      </el-form-item>
+      <el-form-item label="H5跳转url">
+        <el-input v-model="form.url" style="width: 300px;" />
+      </el-form-item>
+      <el-form-item label="uniapp路由">
+        <el-input v-model="form.uniapp_url" style="width: 300px;" />
+      </el-form-item>
+      <el-form-item label="图片(1125*870)">
+        <MaterialList v-model="form.imageArr" style="width: 300px" type="image" :num="1" :width="150" :height="150" />
+      </el-form-item>
+      <el-form-item label="排序">
+        <el-input v-model="form.sort" style="width: 300px;" />
+      </el-form-item>
+      <el-form-item label="是否显示">
+        <el-radio v-model="form.status" :label="1">是</el-radio>
+        <el-radio v-model="form.status" :label="0" style="width: 200px;">否</el-radio>
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <!--<el-input v-model="form.groupName" />-->
+      <el-button type="text" @click="cancel">取消</el-button>
+      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { add, edit } from '@/api/yxSystemGroupData'
+import picUpload from '@/components/pic-upload'
+import MaterialList from '@/components/material'
+export default {
+  components: { picUpload, MaterialList },
+  props: {
+    isAdd: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data() {
+    return {
+      loading: false, dialog: false,
+      form: {
+        id: '',
+        groupName: 'yshop_home_banner',
+        name: '',
+        url: '',
+        wxapp_url: '',
+        uniapp_url: '',
+        pic: '',
+        imageArr: [],
+        sort: 0,
+        status: 1
+      },
+      rules: {
+      }
+    }
+  },
+  watch: {
+    'form.imageArr': function(val) {
+      if (val) {
+        this.form.pic = val.join(',')
+      }
+    }
+  },
+  methods: {
+    cancel() {
+      this.resetForm()
+    },
+    doSubmit() {
+      this.loading = true
+      if (this.isAdd) {
+        this.doAdd()
+      } else this.doEdit()
+    },
+    doAdd() {
+      add(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '添加成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    doEdit() {
+      edit(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '修改成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    resetForm() {
+      this.dialog = false
+      this.$refs['form'].resetFields()
+      this.form = {
+        id: '',
+        groupName: 'yshop_home_banner',
+        name: '',
+        url: '',
+        wxapp_url: '',
+        uniapp_url: '',
+        pic: '',
+        imageArr: [],
+        sort: 0,
+        status: 1
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/bxg/shop/set/hot.vue b/src/views/bxg/shop/set/hot.vue
new file mode 100644
index 0000000..1181010
--- /dev/null
+++ b/src/views/bxg/shop/set/hot.vue
@@ -0,0 +1,137 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <!-- 新增 -->
+      <div style="display: inline-block;margin: 0px 2px;">
+        <el-button
+          v-permission="['admin','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_CREATE']"
+          class="filter-item"
+          size="mini"
+          type="primary"
+          icon="el-icon-plus"
+          @click="add"
+        >新增</el-button>
+      </div>
+    </div>
+    <!--表单组件-->
+    <eForm ref="form" :is-add="isAdd" />
+    <!--表格渲染-->
+    <el-table v-loading="loading" :data="data" size="small" style="width: 100%;height:calc(100vh - 245px);overflow-y: scroll;">
+      <el-table-column prop="id" label="ID" />
+      <el-table-column prop="map.title" label="标签" />
+      <el-table-column prop="sort" label="排序" />
+      <el-table-column label="状态" align="center">
+        <template slot-scope="scope">
+          <div>
+            <el-tag v-if="scope.row.status === 1" style="cursor: pointer" :type="''">显示</el-tag>
+            <el-tag v-else style="cursor: pointer" :type=" 'info' ">不显示</el-tag>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column v-if="checkPermission(['admin','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_EDIT','YXSYSTEMGROUPDATA_DELETE'])" label="操作" width="150px" align="center">
+        <template slot-scope="scope">
+          <el-button v-permission="['admin','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)" />
+          <el-popover
+            :ref="scope.row.id"
+            v-permission="['admin','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_DELETE']"
+            placement="top"
+            width="180"
+          >
+            <p>确定删除本条数据吗？</p>
+            <div style="text-align: right; margin: 0">
+              <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
+              <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
+            </div>
+            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
+          </el-popover>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--分页组件-->
+  <el-footer style="height:60px;width:100%;background-color:#f6f6f6">
+    <div style="float:left"></div>
+      <el-pagination
+      :total="total"
+      :current-page="page + 1"
+      style="margin-top: 15px;float:right"
+      layout="total, prev, pager, next, sizes"
+      @size-change="sizeChange"
+      @current-change="pageChange"
+    />
+  </el-footer>
+  </div>
+</template>
+
+<script>
+import checkPermission from '@/utils/permission'
+import initData from '@/mixins/crud'
+import { del } from '@/api/yxSystemGroupData'
+import eForm from './hotform'
+export default {
+  components: { eForm },
+  mixins: [initData],
+  data() {
+    return {
+      delLoading: false
+    }
+  },
+  created() {
+    this.$nextTick(() => {
+      this.init()
+    })
+  },
+  methods: {
+    checkPermission,
+    beforeInit() {
+      this.url = 'api/yxSystemGroupData'
+      const sort = 'id,desc'
+      this.params = { page: this.page, size: this.size, sort: sort, groupName: 'yshop_hot_search' }
+      return true
+    },
+    subDelete(id) {
+      this.delLoading = true
+      del(id).then(res => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        this.dleChangePage()
+        this.init()
+        this.$notify({
+          title: '删除成功',
+          type: 'success',
+          duration: 2500
+        })
+      }).catch(err => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        console.log(err.response.data.message)
+      })
+    },
+    add() {
+      this.isAdd = true
+      this.$refs.form.dialog = true
+    },
+    edit(data) {
+      this.isAdd = false
+      const _this = this.$refs.form
+      _this.form = {
+        id: data.id,
+        groupName: data.groupName,
+        title: data.map.title,
+        info: data.map.info,
+        url: data.map.url,
+        pic: data.map.pic,
+        sort: data.sort,
+        status: data.status
+      }
+      _this.dialog = true
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .app-container{
+  padding-bottom: 0px;
+}
+</style>
diff --git a/src/views/bxg/shop/set/hotform.vue b/src/views/bxg/shop/set/hotform.vue
new file mode 100644
index 0000000..ceed5aa
--- /dev/null
+++ b/src/views/bxg/shop/set/hotform.vue
@@ -0,0 +1,105 @@
+<template>
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增' : '编辑'" width="500px">
+    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="100px">
+      <el-form-item label="标签">
+        <el-input v-model="form.title" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="排序">
+        <el-input v-model="form.sort" style="width: 300px;" />
+      </el-form-item>
+      <el-form-item label="是否显示">
+        <el-radio v-model="form.status" :label="1">是</el-radio>
+        <el-radio v-model="form.status" :label="0" style="width: 200px;">否</el-radio>
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <!--<el-input v-model="form.groupName" />-->
+      <el-button type="text" @click="cancel">取消</el-button>
+      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { add, edit } from '@/api/yxSystemGroupData'
+import picUpload from '@/components/pic-upload'
+export default {
+  components: { picUpload },
+  props: {
+    isAdd: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data() {
+    return {
+      loading: false, dialog: false,
+      form: {
+        id: '',
+        groupName: 'yshop_hot_search',
+        title: '',
+        sort: 0,
+        status: 1
+      },
+      rules: {
+      }
+    }
+  },
+  methods: {
+    cancel() {
+      this.resetForm()
+    },
+    doSubmit() {
+      this.loading = true
+      if (this.isAdd) {
+        this.doAdd()
+      } else this.doEdit()
+    },
+    doAdd() {
+      add(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '添加成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    doEdit() {
+      edit(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '修改成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    resetForm() {
+      this.dialog = false
+      this.$refs['form'].resetFields()
+      this.form = {
+        id: '',
+        groupName: 'yshop_hot_search',
+        title: '',
+        sort: 0,
+        status: 1
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/bxg/shop/set/index.vue b/src/views/bxg/shop/set/index.vue
new file mode 100644
index 0000000..b44fff5
--- /dev/null
+++ b/src/views/bxg/shop/set/index.vue
@@ -0,0 +1,146 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <!-- 新增 -->
+      <div style="display: inline-block;margin: 0px 2px;">
+        <el-button
+          v-permission="['admin','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_CREATE']"
+          class="filter-item"
+          size="mini"
+          type="primary"
+          icon="el-icon-plus"
+          @click="add"
+        >新增</el-button>
+      </div>
+    </div>
+    <!--表单组件-->
+    <eForm ref="form" :is-add="isAdd" />
+    <!--表格渲染-->
+    <el-table v-loading="loading" :data="data" size="small" style="width: 100%;height:calc(100vh - 245px);overflow-y: scroll;">
+      <el-table-column prop="id" label="ID" />
+      <el-table-column prop="map.name" label="标题" />
+      <el-table-column prop="map.url" label="链接url" />
+      <el-table-column prop="map.uniapp_url" label="uniapp路由" />
+      <el-table-column ref="table" label="图片">
+        <template slot-scope="scope">
+          <a :href="scope.row.map.pic" style="color: #42b983" target="_blank"><img :src="scope.row.map.pic" alt="点击打开" class="el-avatar"></a>
+        </template>
+      </el-table-column>
+      <el-table-column prop="sort" label="排序" />
+      <el-table-column label="状态" align="center">
+        <template slot-scope="scope">
+          <div>
+            <el-tag v-if="scope.row.status === 1" style="cursor: pointer" :type="''">显示</el-tag>
+            <el-tag v-else style="cursor: pointer" :type=" 'info' ">不显示</el-tag>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column v-if="checkPermission(['admin','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_EDIT','YXSYSTEMGROUPDATA_DELETE'])" label="操作" width="150px" align="center">
+        <template slot-scope="scope">
+          <el-button v-permission="['admin','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)" />
+          <el-popover
+            :ref="scope.row.id"
+            v-permission="['admin','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_DELETE']"
+            placement="top"
+            width="180"
+          >
+            <p>确定删除本条数据吗？</p>
+            <div style="text-align: right; margin: 0">
+              <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
+              <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
+            </div>
+            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
+          </el-popover>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--分页组件-->
+   <el-footer style="height:60px;width:100%;background-color:#f6f6f6">
+     <div style="float:left"></div>
+      <el-pagination
+      :total="total"
+      :current-page="page + 1"
+      style="margin-top: 15px; float:right"
+      layout="total, prev, pager, next, sizes"
+      @size-change="sizeChange"
+      @current-change="pageChange"
+    />
+   </el-footer>
+  </div>
+</template>
+
+<script>
+import checkPermission from '@/utils/permission'
+import initData from '@/mixins/crud'
+import { del } from '@/api/yxSystemGroupData'
+import eForm from './form'
+export default {
+  components: { eForm },
+  mixins: [initData],
+  data() {
+    return {
+      delLoading: false
+    }
+  },
+  created() {
+    this.$nextTick(() => {
+      this.init()
+    })
+  },
+  methods: {
+    checkPermission,
+    beforeInit() {
+      this.url = 'api/yxSystemGroupData'
+      const sort = 'id,desc'
+      this.params = { page: this.page, size: this.size, sort: sort, groupName: 'yshop_home_banner' }
+      return true
+    },
+    subDelete(id) {
+      this.delLoading = true
+      del(id).then(res => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        this.dleChangePage()
+        this.init()
+        this.$notify({
+          title: '删除成功',
+          type: 'success',
+          duration: 2500
+        })
+      }).catch(err => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        console.log(err.response.data.message)
+      })
+    },
+    add() {
+      this.isAdd = true
+      this.$refs.form.dialog = true
+    },
+    edit(data) {
+      this.isAdd = false
+      const _this = this.$refs.form
+      _this.form = {
+        id: data.id,
+        groupName: data.groupName,
+        name: data.map.name,
+        url: data.map.url,
+        wxapp_url: data.map.wxapp_url,
+        uniapp_url: data.map.uniapp_url,
+        pic: data.map.pic,
+        imageArr: data.map.pic ? data.map.pic.split(',') : [],
+        sort: data.sort,
+        status: data.status
+      }
+      _this.dialog = true
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .app-container{
+  padding-bottom: 0px;
+}
+</style>
diff --git a/src/views/bxg/shop/set/menu.vue b/src/views/bxg/shop/set/menu.vue
new file mode 100644
index 0000000..d537fd7
--- /dev/null
+++ b/src/views/bxg/shop/set/menu.vue
@@ -0,0 +1,146 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <!-- 新增 -->
+      <div style="display: inline-block;margin: 0px 2px;">
+        <el-button
+          v-permission="['admin','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_CREATE']"
+          class="filter-item"
+          size="mini"
+          type="primary"
+          icon="el-icon-plus"
+          @click="add"
+        >新增</el-button>
+      </div>
+    </div>
+    <!--表单组件-->
+    <eForm ref="form" :is-add="isAdd" />
+    <!--表格渲染-->
+    <el-table v-loading="loading" :data="data" size="small" style="width: 100%;height:calc(100vh - 245px);overflow-y: scroll;">
+      <el-table-column prop="id" label="ID" />
+      <el-table-column prop="map.name" label="分类名称" />
+      <el-table-column prop="map.url" label="链接url" />
+      <el-table-column prop="map.uniapp_url" label="uniapp路由" />
+      <el-table-column ref="table" label="分类图标">
+        <template slot-scope="scope">
+          <a :href="scope.row.map.pic" style="color: #42b983" target="_blank"><img :src="scope.row.map.pic" alt="点击打开" class="el-avatar"></a>
+        </template>
+      </el-table-column>
+      <el-table-column prop="sort" label="排序" />
+      <el-table-column label="状态" align="center">
+        <template slot-scope="scope">
+          <div>
+            <el-tag v-if="scope.row.status === 1" style="cursor: pointer" :type="''">显示</el-tag>
+            <el-tag v-else style="cursor: pointer" :type=" 'info' ">不显示</el-tag>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column v-if="checkPermission(['admin','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_EDIT','YXSYSTEMGROUPDATA_DELETE'])" label="操作" width="150px" align="center">
+        <template slot-scope="scope">
+          <el-button v-permission="['admin','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)" />
+          <el-popover
+            :ref="scope.row.id"
+            v-permission="['admin','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_DELETE']"
+            placement="top"
+            width="180"
+          >
+            <p>确定删除本条数据吗？</p>
+            <div style="text-align: right; margin: 0">
+              <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
+              <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
+            </div>
+            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
+          </el-popover>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--分页组件-->
+    <el-footer style="height:60px;width:100%;background-color:#f6f6f6">
+      <div style="float:left"></div>
+      <el-pagination
+      :total="total"
+      :current-page="page + 1"
+      style="margin-top: 15px; float:right"
+      layout="total, prev, pager, next, sizes"
+      @size-change="sizeChange"
+      @current-change="pageChange"
+    />
+    </el-footer>
+  </div>
+</template>
+
+<script>
+import checkPermission from '@/utils/permission'
+import initData from '@/mixins/crud'
+import { del } from '@/api/yxSystemGroupData'
+import eForm from './menuform'
+export default {
+  components: { eForm },
+  mixins: [initData],
+  data() {
+    return {
+      delLoading: false
+    }
+  },
+  created() {
+    this.$nextTick(() => {
+      this.init()
+    })
+  },
+  methods: {
+    checkPermission,
+    beforeInit() {
+      this.url = 'api/yxSystemGroupData'
+      const sort = 'id,desc'
+      this.params = { page: this.page, size: this.size, sort: sort, groupName: 'yshop_home_menus' }
+      return true
+    },
+    subDelete(id) {
+      this.delLoading = true
+      del(id).then(res => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        this.dleChangePage()
+        this.init()
+        this.$notify({
+          title: '删除成功',
+          type: 'success',
+          duration: 2500
+        })
+      }).catch(err => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        console.log(err.response.data.message)
+      })
+    },
+    add() {
+      this.isAdd = true
+      this.$refs.form.dialog = true
+    },
+    edit(data) {
+      this.isAdd = false
+      const _this = this.$refs.form
+      _this.form = {
+        id: data.id,
+        groupName: data.groupName,
+        name: data.map.name,
+        url: data.map.url,
+        wxapp_url: data.map.wxapp_url,
+        uniapp_url: data.map.uniapp_url,
+        pic: data.map.pic,
+        imageArr: data.map.pic ? data.map.pic.split(',') : [],
+        sort: data.sort,
+        status: data.status
+      }
+      _this.dialog = true
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .app-container{
+  padding-bottom: 0px;
+}
+</style>
diff --git a/src/views/bxg/shop/set/menuform.vue b/src/views/bxg/shop/set/menuform.vue
new file mode 100644
index 0000000..502e807
--- /dev/null
+++ b/src/views/bxg/shop/set/menuform.vue
@@ -0,0 +1,132 @@
+<template>
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增' : '编辑'" width="500px">
+    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="140px">
+      <el-form-item label="分类名称">
+        <el-input v-model="form.name" style="width: 300px;" />
+      </el-form-item>
+      <el-form-item label="跳转url">
+        <el-input v-model="form.url" style="width: 300px;" />
+      </el-form-item>
+      <el-form-item label="uniapp路由">
+        <el-input v-model="form.uniapp_url" style="width: 300px;" />
+      </el-form-item>
+      <el-form-item label="分类图标(90*90)">
+        <MaterialList v-model="form.imageArr" style="width: 300px" type="image" :num="1" :width="150" :height="150" />
+      </el-form-item>
+      <el-form-item label="排序">
+        <el-input v-model="form.sort" style="width: 300px;" />
+      </el-form-item>
+      <el-form-item label="是否显示">
+        <el-radio v-model="form.status" :label="1">是</el-radio>
+        <el-radio v-model="form.status" :label="0" style="width: 200px;">否</el-radio>
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <!--<el-input v-model="form.groupName" />-->
+      <el-button type="text" @click="cancel">取消</el-button>
+      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { add, edit } from '@/api/yxSystemGroupData'
+import picUpload from '@/components/pic-upload'
+import MaterialList from '@/components/material'
+export default {
+  components: { picUpload, MaterialList },
+  props: {
+    isAdd: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data() {
+    return {
+      loading: false, dialog: false,
+      form: {
+        id: '',
+        groupName: 'yshop_home_menus',
+        name: '',
+        url: '',
+        wxapp_url: '',
+        uniapp_url: '',
+        pic: '',
+        imageArr: [],
+        sort: 0,
+        status: 1
+      },
+      rules: {
+      }
+    }
+  },
+  watch: {
+    'form.imageArr': function(val) {
+      if (val) {
+        this.form.pic = val.join(',')
+      }
+    }
+  },
+  methods: {
+    cancel() {
+      this.resetForm()
+    },
+    doSubmit() {
+      this.loading = true
+      if (this.isAdd) {
+        this.doAdd()
+      } else this.doEdit()
+    },
+    doAdd() {
+      add(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '添加成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    doEdit() {
+      edit(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '修改成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    resetForm() {
+      this.dialog = false
+      this.$refs['form'].resetFields()
+      this.form = {
+        id: '',
+        groupName: 'yshop_home_menus',
+        name: '',
+        url: '',
+        wxapp_url: '',
+        uniapp_url: '',
+        pic: '',
+        imageArr: [],
+        sort: 0,
+        status: 1
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/bxg/shop/set/recharge.vue b/src/views/bxg/shop/set/recharge.vue
new file mode 100644
index 0000000..49c9d7f
--- /dev/null
+++ b/src/views/bxg/shop/set/recharge.vue
@@ -0,0 +1,136 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <!-- 新增 -->
+      <div style="display: inline-block;margin: 0px 2px;">
+        <el-button
+          v-permission="['admin','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_CREATE']"
+          class="filter-item"
+          size="mini"
+          type="primary"
+          icon="el-icon-plus"
+          @click="add"
+        >新增</el-button>
+      </div>
+    </div>
+    <!--表单组件-->
+    <eForm ref="form" :is-add="isAdd" />
+    <!--表格渲染-->
+    <el-table v-loading="loading" :data="data" size="small" style="width: 100%;height:calc(100vh - 245px);overflow-y: scroll;">
+      <el-table-column prop="id" label="ID" align="center" />
+      <el-table-column prop="map.price" label="额度" align="center" />
+      <el-table-column prop="map.give_price" label="赠送"  align="center"/>
+      <el-table-column prop="sort" label="排序" align="center" />
+      <el-table-column label="状态" align="center">
+        <template slot-scope="scope">
+          <div>
+            <el-tag v-if="scope.row.status === 1" style="cursor: pointer" :type="''">显示</el-tag>
+            <el-tag v-else style="cursor: pointer" :type=" 'info' ">不显示</el-tag>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column v-if="checkPermission(['admin','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_EDIT','YXSYSTEMGROUPDATA_DELETE'])" label="操作" width="150px" align="center">
+        <template slot-scope="scope">
+          <el-button v-permission="['admin','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)" />
+          <el-popover
+            :ref="scope.row.id"
+            v-permission="['admin','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_DELETE']"
+            placement="top"
+            width="180"
+          >
+            <p>确定删除本条数据吗？</p>
+            <div style="text-align: right; margin: 0">
+              <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
+              <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
+            </div>
+            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
+          </el-popover>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--分页组件-->
+    <el-footer style="height:60px;width:100%;background-color:#f6f6f6">
+      <div style="float:left"></div>
+      <el-pagination
+      :total="total"
+      :current-page="page + 1"
+      style="margin-top: 15px; float:right"
+      layout="total, prev, pager, next, sizes"
+      @size-change="sizeChange"
+      @current-change="pageChange"
+    />
+    </el-footer>
+  </div>
+</template>
+
+<script>
+import checkPermission from '@/utils/permission'
+import initData from '@/mixins/crud'
+import { del } from '@/api/yxSystemGroupData'
+import eForm from './rechargeform'
+export default {
+  components: { eForm },
+  mixins: [initData],
+  data() {
+    return {
+      delLoading: false
+    }
+  },
+  created() {
+    this.$nextTick(() => {
+      this.init()
+    })
+  },
+  methods: {
+    checkPermission,
+    beforeInit() {
+      this.url = 'api/yxSystemGroupData'
+      const sort = 'id,desc'
+      this.params = { page: this.page, size: this.size, sort: sort, groupName: 'yshop_recharge_price_ways' }
+      return true
+    },
+    subDelete(id) {
+      this.delLoading = true
+      del(id).then(res => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        this.dleChangePage()
+        this.init()
+        this.$notify({
+          title: '删除成功',
+          type: 'success',
+          duration: 2500
+        })
+      }).catch(err => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        console.log(err.response.data.message)
+      })
+    },
+    add() {
+      this.isAdd = true
+      this.$refs.form.dialog = true
+    },
+    edit(data) {
+      this.isAdd = false
+      const _this = this.$refs.form
+      _this.form = {
+        id: data.id,
+        groupName: data.groupName,
+        give_price: data.map.give_price,
+        price: data.map.price,
+        sort: data.sort,
+        status: data.status
+      }
+      _this.dialog = true
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .app-container{
+  padding-bottom: 0px;
+}
+</style>
diff --git a/src/views/bxg/shop/set/rechargeform.vue b/src/views/bxg/shop/set/rechargeform.vue
new file mode 100644
index 0000000..73f9b65
--- /dev/null
+++ b/src/views/bxg/shop/set/rechargeform.vue
@@ -0,0 +1,110 @@
+<template>
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增' : '编辑'" width="500px">
+    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="100px">
+      <el-form-item label="额度">
+        <el-input v-model="form.price" style="width: 300px;" />
+      </el-form-item>
+      <el-form-item label="赠送">
+        <el-input v-model="form.give_price" style="width: 300px;" />
+      </el-form-item>
+      <el-form-item label="排序">
+        <el-input v-model="form.sort" style="width: 300px;" />
+      </el-form-item>
+      <el-form-item label="是否显示">
+        <el-radio v-model="form.status" :label="1">是</el-radio>
+        <el-radio v-model="form.status" :label="0" style="width: 200px;">否</el-radio>
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <!--<el-input v-model="form.groupName" />-->
+      <el-button type="text" @click="cancel">取消</el-button>
+      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { add, edit } from '@/api/yxSystemGroupData'
+import picUpload from '@/components/pic-upload'
+export default {
+  components: { picUpload },
+  props: {
+    isAdd: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data() {
+    return {
+      loading: false, dialog: false,
+      form: {
+        id: '',
+        groupName: 'yshop_recharge_price_ways',
+        price: 1,
+        give_price: 0,
+        sort: 0,
+        status: 1
+      },
+      rules: {
+      }
+    }
+  },
+  methods: {
+    cancel() {
+      this.resetForm()
+    },
+    doSubmit() {
+      this.loading = true
+      if (this.isAdd) {
+        this.doAdd()
+      } else this.doEdit()
+    },
+    doAdd() {
+      add(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '添加成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    doEdit() {
+      edit(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '修改成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    resetForm() {
+      this.dialog = false
+      this.$refs['form'].resetFields()
+      this.form = {
+        id: '',
+        groupName: 'yshop_recharge_price_ways',
+        price: 1,
+        give_price: 0,
+        sort: 0,
+        status: 1
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/bxg/shop/set/roll.vue b/src/views/bxg/shop/set/roll.vue
new file mode 100644
index 0000000..ad8732a
--- /dev/null
+++ b/src/views/bxg/shop/set/roll.vue
@@ -0,0 +1,141 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <!-- 新增 -->
+      <div style="display: inline-block;margin: 0px 2px;">
+        <el-button
+          v-permission="['admin','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_CREATE']"
+          class="filter-item"
+          size="mini"
+          type="primary"
+          icon="el-icon-plus"
+          @click="add"
+        >新增</el-button>
+      </div>
+    </div>
+    <!--表单组件-->
+    <eForm ref="form" :is-add="isAdd" />
+    <!--表格渲染-->
+    <el-table v-loading="loading" :data="data" size="small" style="width: 100%;height:calc(100vh - 245px);overflow-y: scroll;">
+      <el-table-column prop="id" label="ID" />
+      <el-table-column prop="map.info" label="滚动文字" />
+      <el-table-column prop="map.url" label="链接url" />
+      <el-table-column prop="map.uniapp_url" label="uniapp路由" />
+      <el-table-column prop="sort" label="排序" />
+      <el-table-column label="状态" align="center">
+        <template slot-scope="scope">
+          <div>
+            <el-tag v-if="scope.row.status === 1" style="cursor: pointer" :type="''">显示</el-tag>
+            <el-tag v-else style="cursor: pointer" :type=" 'info' ">不显示</el-tag>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column v-if="checkPermission(['admin','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_EDIT','YXSYSTEMGROUPDATA_DELETE'])" label="操作" width="150px" align="center">
+        <template slot-scope="scope">
+          <el-button v-permission="['admin','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)" />
+          <el-popover
+            :ref="scope.row.id"
+            v-permission="['admin','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_DELETE']"
+            placement="top"
+            width="180"
+          >
+            <p>确定删除本条数据吗？</p>
+            <div style="text-align: right; margin: 0">
+              <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
+              <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
+            </div>
+            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
+          </el-popover>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--分页组件-->
+   <el-footer style="height:60px;width:100%;background-color:#f6f6f6">
+     <div style="float:left"></div>
+      <el-pagination
+      :total="total"
+      :current-page="page + 1"
+      style="margin-top: 15px;float:right"
+      layout="total, prev, pager, next, sizes"
+      @size-change="sizeChange"
+      @current-change="pageChange"
+    />
+   </el-footer>
+  </div>
+</template>
+
+<script>
+import checkPermission from '@/utils/permission'
+import initData from '@/mixins/crud'
+import { del } from '@/api/yxSystemGroupData'
+import eForm from './rollform'
+export default {
+  components: { eForm },
+  mixins: [initData],
+  data() {
+    return {
+      delLoading: false
+    }
+  },
+  created() {
+    this.$nextTick(() => {
+      this.init()
+    })
+  },
+  methods: {
+    checkPermission,
+    beforeInit() {
+      this.url = 'api/yxSystemGroupData'
+      const sort = 'id,desc'
+      this.params = { page: this.page, size: this.size, sort: sort, groupName: 'yshop_home_roll_news' }
+      return true
+    },
+    subDelete(id) {
+      this.delLoading = true
+      del(id).then(res => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        this.dleChangePage()
+        this.init()
+        this.$notify({
+          title: '删除成功',
+          type: 'success',
+          duration: 2500
+        })
+      }).catch(err => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        console.log(err.response.data.message)
+      })
+    },
+    add() {
+      this.isAdd = true
+      this.$refs.form.dialog = true
+    },
+    edit(data) {
+      this.isAdd = false
+      const _this = this.$refs.form
+      _this.form = {
+        id: data.id,
+        groupName: data.groupName,
+        title: data.map.title,
+        info: data.map.info,
+        url: data.map.url,
+        wxapp_url: data.map.wxapp_url,
+        uniapp_url: data.map.uniapp_url,
+        pic: data.map.pic,
+        sort: data.sort,
+        status: data.status
+      }
+      _this.dialog = true
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .app-container{
+  padding-bottom: 0px;
+}
+</style>
diff --git a/src/views/bxg/shop/set/rollform.vue b/src/views/bxg/shop/set/rollform.vue
new file mode 100644
index 0000000..51f67f9
--- /dev/null
+++ b/src/views/bxg/shop/set/rollform.vue
@@ -0,0 +1,117 @@
+<template>
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增' : '编辑'" width="500px">
+    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="140px">
+      <el-form-item label="滚动文字">
+        <el-input v-model="form.info" style="width: 300px;" />
+      </el-form-item>
+      <el-form-item label="跳转url">
+        <el-input v-model="form.url" style="width: 300px;" />
+      </el-form-item>
+      <el-form-item label="uniapp路由">
+        <el-input v-model="form.uniapp_url" style="width: 300px;" />
+      </el-form-item>
+      <el-form-item label="排序">
+        <el-input v-model="form.sort" style="width: 300px;" />
+      </el-form-item>
+      <el-form-item label="是否显示">
+        <el-radio v-model="form.status" :label="1">是</el-radio>
+        <el-radio v-model="form.status" :label="0" style="width: 200px;">否</el-radio>
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <!--<el-input v-model="form.groupName" />-->
+      <el-button type="text" @click="cancel">取消</el-button>
+      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { add, edit } from '@/api/yxSystemGroupData'
+import picUpload from '@/components/pic-upload'
+export default {
+  components: { picUpload },
+  props: {
+    isAdd: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data() {
+    return {
+      loading: false, dialog: false,
+      form: {
+        id: '',
+        groupName: 'yshop_home_roll_news',
+        info: '',
+        wxapp_url: '',
+        uniapp_url: '',
+        url: '',
+        sort: 0,
+        status: 1
+      },
+      rules: {
+      }
+    }
+  },
+  methods: {
+    cancel() {
+      this.resetForm()
+    },
+    doSubmit() {
+      this.loading = true
+      if (this.isAdd) {
+        this.doAdd()
+      } else this.doEdit()
+    },
+    doAdd() {
+      add(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '添加成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    doEdit() {
+      edit(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '修改成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    resetForm() {
+      this.dialog = false
+      this.$refs['form'].resetFields()
+      this.form = {
+        id: '',
+        groupName: 'yshop_home_roll_news',
+        info: '',
+        wxapp_url: '',
+        uniapp_url: '',
+        url: '',
+        sort: 0,
+        status: 1
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/bxg/shop/set/seckill.vue b/src/views/bxg/shop/set/seckill.vue
new file mode 100644
index 0000000..b9b5b18
--- /dev/null
+++ b/src/views/bxg/shop/set/seckill.vue
@@ -0,0 +1,125 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <!-- 新增 -->
+      <div style="display: inline-block;margin: 0px 2px;">
+        <el-button
+          v-permission="['admin','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_CREATE']"
+          class="filter-item"
+          size="mini"
+          type="primary"
+          icon="el-icon-plus"
+          @click="add"
+        >新增</el-button>
+      </div>
+    </div>
+    <!--表单组件-->
+    <eForm ref="form" :is-add="isAdd" />
+    <!--表格渲染-->
+    <el-table v-loading="loading" :data="data" size="small" style="width: 100%;height:calc(100vh - 245px);overflow-y: scroll;">
+      <el-table-column prop="id" label="ID" align="center" />
+      <el-table-column prop="map.time" label="开启时间(整数小时)"  align="center"/>
+      <el-table-column prop="map.continued" label="持续时间(整数小时)" align="center" />
+      <el-table-column v-if="checkPermission(['admin','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_EDIT','YXSYSTEMGROUPDATA_DELETE'])" label="操作" width="150px" align="center">
+        <template slot-scope="scope">
+          <el-button v-permission="['admin','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)" />
+          <el-popover
+            :ref="scope.row.id"
+            v-permission="['admin','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_DELETE']"
+            placement="top"
+            width="180"
+          >
+            <p>确定删除本条数据吗？</p>
+            <div style="text-align: right; margin: 0">
+              <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
+              <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
+            </div>
+            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
+          </el-popover>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--分页组件-->
+    <el-footer style="height:60px;width:100%;background-color:#f6f6f6">
+      <div style="float:left"></div>
+      <el-pagination
+      :total="total"
+      :current-page="page + 1"
+      style="margin-top: 15px; float:right"
+      layout="total, prev, pager, next, sizes"
+      @size-change="sizeChange"
+      @current-change="pageChange"
+    />
+    </el-footer>
+  </div>
+</template>
+
+<script>
+import checkPermission from '@/utils/permission'
+import initData from '@/mixins/crud'
+import { del } from '@/api/yxSystemGroupData'
+import eForm from './seckillform'
+export default {
+  components: { eForm },
+  mixins: [initData],
+  data() {
+    return {
+      delLoading: false
+    }
+  },
+  created() {
+    this.$nextTick(() => {
+      this.init()
+    })
+  },
+  methods: {
+    checkPermission,
+    beforeInit() {
+      this.url = 'api/yxSystemGroupData'
+      const sort = 'id,desc'
+      this.params = { page: this.page, size: this.size, sort: sort, groupName: 'yshop_seckill_time' }
+      return true
+    },
+    subDelete(id) {
+      this.delLoading = true
+      del(id).then(res => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        this.dleChangePage()
+        this.init()
+        this.$notify({
+          title: '删除成功',
+          type: 'success',
+          duration: 2500
+        })
+      }).catch(err => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        console.log(err.response.data.message)
+      })
+    },
+    add() {
+      this.isAdd = true
+      this.$refs.form.dialog = true
+    },
+    edit(data) {
+      this.isAdd = false
+      const _this = this.$refs.form
+      _this.form = {
+        id: data.id,
+        groupName: data.groupName,
+        time: data.map.time,
+        continued: data.map.continued
+      }
+      _this.dialog = true
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .app-container{
+  padding-bottom: 0px;
+}
+</style>
diff --git a/src/views/bxg/shop/set/seckillform.vue b/src/views/bxg/shop/set/seckillform.vue
new file mode 100644
index 0000000..4c33b2e
--- /dev/null
+++ b/src/views/bxg/shop/set/seckillform.vue
@@ -0,0 +1,99 @@
+<template>
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增' : '编辑'" width="500px">
+    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="150px">
+      <el-form-item label="开启时间(整数小时)">
+        <el-input v-model="form.time" style="width: 270px;" />
+      </el-form-item>
+      <el-form-item label="持续时间(整数小时)">
+        <el-input v-model="form.continued" style="width: 270px;" />
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <!--<el-input v-model="form.groupName" />-->
+      <el-button type="text" @click="cancel">取消</el-button>
+      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { add, edit } from '@/api/yxSystemGroupData'
+import picUpload from '@/components/pic-upload'
+export default {
+  components: { picUpload },
+  props: {
+    isAdd: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data() {
+    return {
+      loading: false, dialog: false,
+      form: {
+        id: '',
+        groupName: 'yshop_seckill_time',
+        time: 5,
+        continued: 2
+      },
+      rules: {
+      }
+    }
+  },
+  methods: {
+    cancel() {
+      this.resetForm()
+    },
+    doSubmit() {
+      this.loading = true
+      if (this.isAdd) {
+        this.doAdd()
+      } else this.doEdit()
+    },
+    doAdd() {
+      add(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '添加成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    doEdit() {
+      edit(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '修改成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    resetForm() {
+      this.dialog = false
+      this.$refs['form'].resetFields()
+      this.form = {
+        id: '',
+        groupName: 'yshop_seckill_time',
+        time: 5,
+        continued: 2
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/bxg/shop/set/sign.vue b/src/views/bxg/shop/set/sign.vue
new file mode 100644
index 0000000..47c0449
--- /dev/null
+++ b/src/views/bxg/shop/set/sign.vue
@@ -0,0 +1,136 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <!-- 新增 -->
+      <div style="display: inline-block;margin: 0px 2px;">
+        <el-button
+          v-permission="['admin','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_CREATE']"
+          class="filter-item"
+          size="mini"
+          type="primary"
+          icon="el-icon-plus"
+          @click="add"
+        >新增</el-button>
+      </div>
+    </div>
+    <!--表单组件-->
+    <eForm ref="form" :is-add="isAdd" />
+    <!--表格渲染-->
+    <el-table v-loading="loading" :data="data" size="small" style="width: 100%;height:690px;overflow-y: scroll;">
+      <el-table-column prop="id" label="ID" />
+      <el-table-column prop="map.day" label="第几天" />
+      <el-table-column prop="map.sign_num" label="获取积分" />
+      <el-table-column prop="sort" label="排序" />
+      <el-table-column label="状态" align="center">
+        <template slot-scope="scope">
+          <div>
+            <el-tag v-if="scope.row.status === 1" style="cursor: pointer" :type="''">显示</el-tag>
+            <el-tag v-else style="cursor: pointer" :type=" 'info' ">不显示</el-tag>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column v-if="checkPermission(['admin','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_EDIT','YXSYSTEMGROUPDATA_DELETE'])" label="操作" width="150px" align="center">
+        <template slot-scope="scope">
+          <el-button v-permission="['admin','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)" />
+          <el-popover
+            :ref="scope.row.id"
+            v-permission="['admin','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_DELETE']"
+            placement="top"
+            width="180"
+          >
+            <p>确定删除本条数据吗？</p>
+            <div style="text-align: right; margin: 0">
+              <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
+              <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
+            </div>
+            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
+          </el-popover>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--分页组件-->
+    <div style="height:60px;width:100%;background-color:#f6f6f6">
+      <div style="float:left"></div>
+      <el-pagination
+      :total="total"
+      :current-page="page + 1"
+      style="margin-top: 15px;float:right"
+      layout="total, prev, pager, next, sizes"
+      @size-change="sizeChange"
+      @current-change="pageChange"
+    />
+    </div>
+  </div>
+</template>
+
+<script>
+import checkPermission from '@/utils/permission'
+import initData from '@/mixins/crud'
+import { del } from '@/api/yxSystemGroupData'
+import eForm from './signform'
+export default {
+  components: { eForm },
+  mixins: [initData],
+  data() {
+    return {
+      delLoading: false
+    }
+  },
+  created() {
+    this.$nextTick(() => {
+      this.init()
+    })
+  },
+  methods: {
+    checkPermission,
+    beforeInit() {
+      this.url = 'api/yxSystemGroupData'
+      const sort = 'id,desc'
+      this.params = { page: this.page, size: this.size, sort: sort, groupName: 'yshop_sign_day_num' }
+      return true
+    },
+    subDelete(id) {
+      this.delLoading = true
+      del(id).then(res => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        this.dleChangePage()
+        this.init()
+        this.$notify({
+          title: '删除成功',
+          type: 'success',
+          duration: 2500
+        })
+      }).catch(err => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        console.log(err.response.data.message)
+      })
+    },
+    add() {
+      this.isAdd = true
+      this.$refs.form.dialog = true
+    },
+    edit(data) {
+      this.isAdd = false
+      const _this = this.$refs.form
+      _this.form = {
+        id: data.id,
+        groupName: data.groupName,
+        day: data.map.day,
+        sign_num: data.map.sign_num,
+        sort: data.sort,
+        status: data.status
+      }
+      _this.dialog = true
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .app-container{
+  padding-bottom: 0px;
+}
+</style>
diff --git a/src/views/bxg/shop/set/signform.vue b/src/views/bxg/shop/set/signform.vue
new file mode 100644
index 0000000..c8a769a
--- /dev/null
+++ b/src/views/bxg/shop/set/signform.vue
@@ -0,0 +1,110 @@
+<template>
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增' : '编辑'" width="500px">
+    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="100px">
+      <el-form-item label="第几天">
+        <el-input v-model="form.day" style="width: 300px;" />
+      </el-form-item>
+      <el-form-item label="获取积分">
+        <el-input v-model="form.sign_num" style="width: 300px;" />
+      </el-form-item>
+      <el-form-item label="排序">
+        <el-input v-model="form.sort" style="width: 300px;" />
+      </el-form-item>
+      <el-form-item label="是否显示">
+        <el-radio v-model="form.status" :label="1">是</el-radio>
+        <el-radio v-model="form.status" :label="0" style="width: 200px;">否</el-radio>
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <!--<el-input v-model="form.groupName" />-->
+      <el-button type="text" @click="cancel">取消</el-button>
+      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { add, edit } from '@/api/yxSystemGroupData'
+import picUpload from '@/components/pic-upload'
+export default {
+  components: { picUpload },
+  props: {
+    isAdd: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data() {
+    return {
+      loading: false, dialog: false,
+      form: {
+        id: '',
+        groupName: 'yshop_sign_day_num',
+        day: 1,
+        sign_num: 0,
+        sort: 0,
+        status: 1
+      },
+      rules: {
+      }
+    }
+  },
+  methods: {
+    cancel() {
+      this.resetForm()
+    },
+    doSubmit() {
+      this.loading = true
+      if (this.isAdd) {
+        this.doAdd()
+      } else this.doEdit()
+    },
+    doAdd() {
+      add(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '添加成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    doEdit() {
+      edit(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '修改成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    resetForm() {
+      this.dialog = false
+      this.$refs['form'].resetFields()
+      this.form = {
+        id: '',
+        groupName: 'yshop_sign_day_num',
+        day: 1,
+        sign_num: 0,
+        sort: 0,
+        status: 1
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/bxg/shop/set/usermenu.vue b/src/views/bxg/shop/set/usermenu.vue
new file mode 100644
index 0000000..52ecdc3
--- /dev/null
+++ b/src/views/bxg/shop/set/usermenu.vue
@@ -0,0 +1,148 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <!-- 新增 -->
+      <div style="display: inline-block;margin: 0px 2px;">
+        <el-button
+          v-permission="['admin','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_CREATE']"
+          class="filter-item"
+          size="mini"
+          type="primary"
+          icon="el-icon-plus"
+          @click="add"
+        >新增</el-button>
+      </div>
+    </div>
+    <!--表单组件-->
+    <eForm ref="form" :is-add="isAdd" />
+    <!--表格渲染-->
+    <el-table v-loading="loading" :data="data" size="small" style="width: 100%;height:calc(100vh - 245px);overflow-y: scroll;">
+      <el-table-column prop="id" label="ID" />
+      <el-table-column prop="map.name" label="菜单名" />
+      <el-table-column prop="map.url" label="链接url" />
+      <el-table-column prop="map.uniapp_url" label="uniapp路由" />
+      <el-table-column ref="table" label="图标">
+        <template slot-scope="scope">
+          <a :href="scope.row.map.pic" style="color: #42b983" target="_blank">
+            <img :src="scope.row.map.pic" alt="点击打开" class="el-avatar">
+          </a>
+        </template>
+      </el-table-column>
+      <el-table-column prop="sort" label="排序" />
+      <el-table-column label="状态" align="center">
+        <template slot-scope="scope">
+          <div>
+            <el-tag v-if="scope.row.status === 1" style="cursor: pointer" :type="''">显示</el-tag>
+            <el-tag v-else style="cursor: pointer" :type=" 'info' ">不显示</el-tag>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column v-if="checkPermission(['admin','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_EDIT','YXSYSTEMGROUPDATA_DELETE'])" label="操作" width="150px" align="center">
+        <template slot-scope="scope">
+          <el-button v-permission="['admin','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)" />
+          <el-popover
+            :ref="scope.row.id"
+            v-permission="['admin','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_DELETE']"
+            placement="top"
+            width="180"
+          >
+            <p>确定删除本条数据吗？</p>
+            <div style="text-align: right; margin: 0">
+              <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
+              <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
+            </div>
+            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
+          </el-popover>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--分页组件-->
+  <el-footer style="height:60px;width:100%;background-color:#f6f6f6">
+    <div style="float:left"></div>
+      <el-pagination
+      :total="total"
+      :current-page="page + 1"
+      style="margin-top: 15px;float:right"
+      layout="total, prev, pager, next, sizes"
+      @size-change="sizeChange"
+      @current-change="pageChange"
+    />
+  </el-footer>
+  </div>
+</template>
+
+<script>
+import checkPermission from '@/utils/permission'
+import initData from '@/mixins/crud'
+import { del } from '@/api/yxSystemGroupData'
+import eForm from './usermenuform'
+export default {
+  components: { eForm },
+  mixins: [initData],
+  data() {
+    return {
+      delLoading: false
+    }
+  },
+  created() {
+    this.$nextTick(() => {
+      this.init()
+    })
+  },
+  methods: {
+    checkPermission,
+    beforeInit() {
+      this.url = 'api/yxSystemGroupData'
+      const sort = 'id,desc'
+      this.params = { page: this.page, size: this.size, sort: sort, groupName: 'yshop_my_menus' }
+      return true
+    },
+    subDelete(id) {
+      this.delLoading = true
+      del(id).then(res => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        this.dleChangePage()
+        this.init()
+        this.$notify({
+          title: '删除成功',
+          type: 'success',
+          duration: 2500
+        })
+      }).catch(err => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        console.log(err.response.data.message)
+      })
+    },
+    add() {
+      this.isAdd = true
+      this.$refs.form.dialog = true
+    },
+    edit(data) {
+      this.isAdd = false
+      const _this = this.$refs.form
+      _this.form = {
+        id: data.id,
+        groupName: data.groupName,
+        name: data.map.name,
+        url: data.map.url,
+        wxapp_url: data.map.wxapp_url,
+        uniapp_url: data.map.uniapp_url,
+        pic: data.map.pic,
+        imageArr: data.map.pic ? data.map.pic.split(',') : [],
+        sort: data.sort,
+        status: data.status
+      }
+      _this.dialog = true
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .app-container{
+  padding-bottom: 0px;
+}
+</style>
diff --git a/src/views/bxg/shop/set/usermenuform.vue b/src/views/bxg/shop/set/usermenuform.vue
new file mode 100644
index 0000000..8a4d0af
--- /dev/null
+++ b/src/views/bxg/shop/set/usermenuform.vue
@@ -0,0 +1,132 @@
+<template>
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增' : '编辑'" width="500px">
+    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="140px">
+      <el-form-item label="菜单名">
+        <el-input v-model="form.name" style="width: 300px;" />
+      </el-form-item>
+      <el-form-item label="跳转url">
+        <el-input v-model="form.url" style="width: 300px;" />
+      </el-form-item>
+      <el-form-item label="uniapp路由">
+        <el-input v-model="form.uniapp_url" style="width: 300px;" />
+      </el-form-item>
+      <el-form-item label="图标(52*52)">
+        <MaterialList v-model="form.imageArr" style="width: 300px" type="image" :num="1" :width="150" :height="150" />
+      </el-form-item>
+      <el-form-item label="排序">
+        <el-input v-model="form.sort" style="width: 300px;" />
+      </el-form-item>
+      <el-form-item label="是否显示">
+        <el-radio v-model="form.status" :label="1">是</el-radio>
+        <el-radio v-model="form.status" :label="0" style="width: 200px;">否</el-radio>
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <!--<el-input v-model="form.groupName" />-->
+      <el-button type="text" @click="cancel">取消</el-button>
+      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { add, edit } from '@/api/yxSystemGroupData'
+import picUpload from '@/components/pic-upload'
+import MaterialList from '@/components/material'
+export default {
+  components: { picUpload, MaterialList },
+  props: {
+    isAdd: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data() {
+    return {
+      loading: false, dialog: false,
+      form: {
+        id: '',
+        groupName: 'yshop_my_menus',
+        name: '',
+        url: '',
+        wxapp_url: '',
+        uniapp_url: '',
+        pic: '',
+        imageArr: [],
+        sort: 0,
+        status: 1
+      },
+      rules: {
+      }
+    }
+  },
+  watch: {
+    'form.imageArr': function(val) {
+      if (val) {
+        this.form.pic = val.join(',')
+      }
+    }
+  },
+  methods: {
+    cancel() {
+      this.resetForm()
+    },
+    doSubmit() {
+      this.loading = true
+      if (this.isAdd) {
+        this.doAdd()
+      } else this.doEdit()
+    },
+    doAdd() {
+      add(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '添加成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    doEdit() {
+      edit(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '修改成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    resetForm() {
+      this.dialog = false
+      this.$refs['form'].resetFields()
+      this.form = {
+        id: '',
+        groupName: 'yshop_my_menus',
+        name: '',
+        url: '',
+        wxapp_url: '',
+        uniapp_url: '',
+        pic: '',
+        imageArr: [],
+        sort: 0,
+        status: 1
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/bxg/shop/shippingTemplates/city.vue b/src/views/bxg/shop/shippingTemplates/city.vue
new file mode 100644
index 0000000..b80fd91
--- /dev/null
+++ b/src/views/bxg/shop/shippingTemplates/city.vue
@@ -0,0 +1,356 @@
+<template>
+  <el-dialog
+    :close-on-click-modal="false"
+    :visible.sync="addressView"
+    append-to-body
+    class="modal"
+    title="选择城市"
+    width="950px"
+  >
+    <el-row :gutter="24" type="flex">
+      <el-col :xl="24" :lg="24" :md="24" :sm="24" :xs="24" class="item">
+        <div class="acea-row row-right row-middle">
+          <el-checkbox v-model="iSselect" @change="allCheckbox"
+            >全选</el-checkbox
+          >
+          <div class="empty" @click="empty">清空</div>
+        </div>
+      </el-col>
+    </el-row>
+    <el-row :gutter="24" :loading="loading">
+      <el-col
+        :xl="6"
+        :lg="6"
+        :md="6"
+        :sm="8"
+        :xs="6"
+        class="item"
+        v-for="(item, index) in cityList"
+        :key="index"
+      >
+        <div @mouseenter="enter(index)" @mouseleave="leave()">
+          <el-checkbox
+            v-model="item.checked"
+            :label="item.name"
+            @change="checkedClick(index)">{{ item.name }}</el-checkbox>
+          <span class="red">
+            ({{ (item.count || 0) + "/" + item.children.length }})
+          </span>
+          <div class="city" v-show="activeCity === index">
+            <div class="checkBox">
+              <div class="arrow"></div>
+              <div
+                @mouseenter="enterse(index)"
+                @mouseleave="leavese()"
+                v-for="(city, indexn) in item.children"
+                :key="indexn"
+              >
+                <el-checkbox
+                  v-model="city.checked"
+                  :label="city.name"
+                  @change="primary(index, indexn)"
+                  class="itemn"
+                  >{{ city.name }}</el-checkbox
+                >
+                <div class="citys" v-show="activeCitys === index">
+                  <div class="checkBoxs">
+                    <div class="arrows"></div>
+                    <div>
+                      <el-checkbox
+                        v-model="cityes.checked"
+                        :label="cityes.name"
+                        @change="primaryes(indexns)"
+                        class="itemns"
+                        v-for="(cityes, indexns) in city.children"
+                        :key="indexns"
+                        >{{ cityes.name }}</el-checkbox
+                      >
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </el-col>
+    </el-row>
+    <div slot="footer">
+      <el-button @click="close">取消</el-button>
+      <el-button type="primary" @click="confirm">确定</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import crudYxShippingTemplates from "@/api/yxShippingTemplates";
+import CRUD, { presenter, header, form, crud } from "@crud/crud";
+import rrOperation from "@crud/RR.operation";
+import crudOperation from "@crud/CRUD.operation";
+import udOperation from "@crud/UD.operation";
+import MaterialList from "@/components/material";
+export default {
+  name: "city",
+  props: {
+    type: {
+      type: Number,
+      default: 0,
+    },
+  },
+  components: { crudOperation, rrOperation, udOperation, MaterialList },
+  mixins: [header(), crud()],
+  data() {
+    return {
+      iSselect: false,
+      addressView: false,
+      cityList: [],
+      activeCity: -1,
+      activeCitys: -1,
+      loading: false,
+    };
+  },
+  methods: {
+    enterse(index) {
+      console.log(index, "子元素移入");
+      this.activeCitys = index;
+    },
+    leavese() {
+      console.log("子元素移出");
+      this.activeCitys = null;
+    },
+    enter(index) {
+      console.log(index, "移入");
+      this.activeCity = index;
+    },
+    leave() {
+      console.log("移出");
+      this.activeCity = null;
+    },
+    getCityList() {
+      this.loading = true;
+      crudYxShippingTemplates.getCity().then((res) => {
+        this.loading = false;
+        this.cityList = res;
+        console.log("jjj:" + res);
+      });
+    },
+    /**
+     * 全选或者反选
+     * @param checked
+     */
+    allCheckbox: function () {
+      let that = this,
+        checked = this.iSselect;
+      that.cityList.forEach(function (item, key) {
+        that.$set(that.cityList[key], "checked", checked);
+        if (checked) {
+          that.$set(
+            that.cityList[key],
+            "count",
+            that.cityList[key].children.length
+          );
+        } else {
+          that.$set(that.cityList[key], "count", 0);
+        }
+        that.cityList[key].children.forEach(function (val, k) {
+          that.$set(that.cityList[key].children[k], "checked", checked);
+        });
+      });
+    },
+    // 清空；
+    empty() {
+      let that = this;
+      that.cityList.forEach(function (item, key) {
+        that.$set(that.cityList[key], "checked", false);
+        that.cityList[key].children.forEach(function (val, k) {
+          that.$set(that.cityList[key].children[k], "checked", false);
+        });
+        that.$set(that.cityList[key], "count", 0);
+      });
+      this.iSselect = false;
+    },
+    /**
+     * 点击省
+     * @param index
+     */
+    checkedClick: function (index) {
+      console.log(index);
+      let that = this;
+      if (that.cityList[index].checked) {
+        that.$set(
+          that.cityList[index],
+          "count",
+          that.cityList[index].children.length
+        );
+        that.cityList[index].children.forEach(function (item, key) {
+          that.$set(that.cityList[index].children[key], "checked", true);
+        });
+      } else {
+        that.$set(that.cityList[index], "count", 0);
+        that.$set(that.cityList[index], "checked", false);
+        that.cityList[index].children.forEach(function (item, key) {
+          that.$set(that.cityList[index].children[key], "checked", false);
+        });
+        that.iSselect = false;
+      }
+    },
+    /**
+     * 点击市区
+     * @param index
+     * @param ind
+     */
+    primary: function (index, ind) {
+      console.log(index, "？？");
+      let checked = false,
+        count = 0;
+      this.cityList[index].children.forEach(function (item, key) {
+        console.log("item:" + item.checked);
+        if (item.checked) {
+          checked = true;
+          count++;
+        }
+      });
+      this.$set(this.cityList[index], "count", count);
+      this.$set(this.cityList[index], "checked", checked);
+      console.log(this.cityList, "数据格式");
+    },
+    //点击区域
+    primaryes(index, inds) {
+      console.log(index, "区域的id");
+      let checked = false,
+        count = 0;
+      this.cityList[16].children[0].children.forEach((item) => {
+        console.log(item, "设置区域");
+        if (item.children) {
+          checked = true;
+          count++;
+        }
+      });
+      this.$set(this.cityList[16], "count", count);
+      this.$set(this.cityList[16].children[0], "count", count);
+      this.$set(this.cityList[16], "checked", true);
+      this.$set(this.cityList[16].children[0], "checked", true);
+    },
+    // 确定;
+    confirm() {
+      let that = this;
+      // 被选中的省市；
+      let selectList = [];
+      console.log(that.cityList, "点击获取省");
+      console.log("city:" + that.cityList[0].children);
+      that.cityList.forEach(function (item, key) {
+        let data = {};
+        if (item.checked) {
+          data = {
+            name: item.name,
+            city_id: item.city_id,
+            children: [],
+          };
+        }
+        console.log(data, "点击获取的城市");
+        that.cityList[key].children.forEach(function (i, k) {
+          if (i.checked) {
+            data.children.push({
+              city_id: i.city_id,
+            });
+          }
+        });
+        if (data.city_id !== undefined) {
+          selectList.push(data);
+        }
+      });
+      console.log(selectList);
+      if (selectList.length === 0) {
+        return this.$message({
+          message: "至少选择一个省份或者城市",
+          type: "error",
+        });
+      } else {
+        console.log(selectList, this.type, "发送的城市");
+        this.$emit("selectCity", selectList, this.type);
+        that.addressView = false;
+        this.cityList = [];
+      }
+    },
+    close() {
+      this.addressView = false;
+      this.cityList = [];
+    },
+  },
+  mounted() {},
+};
+</script>
+
+<style scoped>
+.modal .item {
+  position: relative;
+  margin-bottom: 20px;
+}
+.citys {
+  position: absolute;
+  top: 10px;
+  width: 100%;
+  border: 1px solid #eee;
+  background-color: #fff;
+  margin-top: 10px;
+  margin-left: 150px;
+  overflow-x: hidden;
+  overflow-y: auto;
+  max-height: 100px;
+  z-index: 99;
+}
+.modal .item .city {
+  position: absolute;
+  z-index: 9;
+  top: 17px;
+  width: 100%;
+  padding-top: 18px;
+}
+
+.modal .item .city .checkBox {
+  width: 97%;
+  padding: 10px;
+  border: 1px solid #eee;
+  background-color: #fff;
+  max-height: 100px;
+  overflow-x: hidden;
+  overflow-y: auto;
+}
+
+.modal .item .city .checkBox .arrow {
+  position: absolute;
+  top: 3px;
+  width: 0;
+  height: 0;
+  border: 8px solid transparent;
+  border-bottom-color: #ddd;
+}
+
+.modal .item .city .checkBox .arrow:before {
+  position: absolute;
+  bottom: -8px;
+  right: -7px;
+  content: "";
+  width: 0;
+  height: 0;
+  border: 7px solid transparent;
+  border-bottom-color: #fff;
+}
+
+.modal .item .city .checkBox .itemn {
+  margin-bottom: 10px;
+}
+
+.radio {
+  padding: 5px 0;
+  font-size: 14px !important;
+}
+
+.red {
+  color: #ff0000;
+}
+
+.empty {
+  cursor: pointer;
+  margin-left: 10px;
+}
+</style>
diff --git a/src/views/bxg/shop/shippingTemplates/form.vue b/src/views/bxg/shop/shippingTemplates/form.vue
new file mode 100644
index 0000000..bf1c8af
--- /dev/null
+++ b/src/views/bxg/shop/shippingTemplates/form.vue
@@ -0,0 +1,475 @@
+<template>
+  <el-dialog
+    :close-on-click-modal="false"
+    :before-close="crud.cancelCU"
+    :visible.sync="crud.status.cu > 0"
+    :title="crud.status.title"
+    width="950px"
+  >
+    <el-form
+      ref="formData"
+      :model="formData"
+      class="attrFrom"
+      :rules="rules"
+      label-width="130px"
+      :inline="true"
+    >
+      <el-row :gutter="24" type="flex">
+        <el-col :xl="18" :lg="18" :md="18" :sm="24" :xs="24">
+          <el-form-item label="模板名称：" prop="name">
+            <el-input
+              type="text"
+              placeholder="请输入模板名称"
+              v-model="formData.name"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" type="flex">
+        <el-col :xl="18" :lg="18" :md="18" :sm="24" :xs="24">
+          <el-form-item label="计费方式：" props="state">
+            <el-radio-group class="radio" v-model="formData.type">
+              <el-radio :label="1">按件数</el-radio>
+              <el-radio :label="2">按重量</el-radio>
+              <el-radio :label="3">按体积</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" type="flex">
+        <el-col :xl="24" :lg="24" :md="24" :sm="24" :xs="24">
+          <el-form-item class="label" label="配送区域及运费：" props="state">
+            <el-table
+              ref="table"
+              :data="templateList"
+              empty-text="暂无数据"
+              border
+            >
+              <el-table-column
+                prop="regionName"
+                label="可配送区域"
+                width="130"
+              />
+              <el-table-column prop="first" label="首件" width="120">
+                <template slot="header" slot-scope="scope">
+                  <span v-if="formData.type == 1">首件</span>
+                  <span v-else-if="formData.type == 2">首件重量(KG)</span>
+                  <span v-else>首件体积(m³)</span>
+                </template>
+                <template slot-scope="scope">
+                  <span
+                    ><el-input type="text" v-model="scope.row.first"
+                  /></span>
+                </template>
+              </el-table-column>
+              <el-table-column prop="price" label="运费（元）" width="110">
+                <template slot-scope="scope">
+                  <span
+                    ><el-input type="text" v-model="scope.row.price"
+                  /></span>
+                </template>
+              </el-table-column>
+              <el-table-column prop="_continue" label="续件" width="120">
+                <template slot="header" slot-scope="scope">
+                  <span v-if="formData.type == 1">续件</span>
+                  <span v-else-if="formData.type == 2">续件重量(KG)</span>
+                  <span v-else>续件体积(m³)</span>
+                </template>
+                <template slot-scope="scope">
+                  <span
+                    ><el-input type="text" v-model="scope.row._continue"
+                  /></span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="continue_price"
+                label="续费（元）"
+                width="110"
+              >
+                <template slot-scope="scope">
+                  <span
+                    ><el-input type="text" v-model="scope.row.continue_price"
+                  /></span>
+                </template>
+              </el-table-column>
+              <el-table-column label="操作">
+                <template slot-scope="scope">
+                  <a
+                    v-if="scope.row.regionName !== '默认全国'"
+                    @click="delCity(index, 1)"
+                    >删除</a
+                  >
+                </template>
+              </el-table-column>
+            </el-table>
+            <el-row type="flex" class="addTop">
+              <el-col>
+                <el-button type="primary" icon="md-add" @click="addCity(1)"
+                  >单独添加配送区域</el-button
+                >
+              </el-col>
+            </el-row>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <span
+        style="
+          line-height: 30px;
+          font-weight: 700;
+          color: red;
+          margin-left: 50px;
+        "
+        >注意：选择包邮件数时，既满足包邮件数，又满足包邮金额才可包邮</span
+      >
+      <el-row :gutter="24" type="flex">
+        <el-col :xl="24" :lg="24" :md="24" :sm="24" :xs="24">
+          <el-form-item label="指定包邮：" prop="store_name">
+            <el-radio-group class="radio" v-model="formData.appoint_check">
+              <el-radio :label="1">开启</el-radio>
+              <el-radio :label="0">关闭</el-radio>
+            </el-radio-group>
+            <el-table
+              ref="table"
+              :data="appointList"
+              empty-text="暂无数据"
+              border
+              v-if="formData.appoint_check === 1"
+            >
+              <el-table-column prop="placeName" label="选择地区" />
+              <el-table-column prop="a_num" label="包邮件数" width="120">
+                <template slot="header" slot-scope="scope">
+                  <span v-if="formData.type == 1">包邮件数</span>
+                  <span v-else-if="formData.type == 2">包邮重量(KG)</span>
+                  <span v-else>包邮体积(m³)</span>
+                </template>
+                <template slot-scope="scope">
+                  <span
+                    ><el-input type="text" v-model="scope.row.a_num"
+                  /></span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="a_price"
+                label="包邮金额（元）"
+                width="120"
+              >
+                <template slot-scope="scope">
+                  <span
+                    ><el-input type="text" v-model="scope.row.a_price"
+                  /></span>
+                </template>
+              </el-table-column>
+              <el-table-column label="操作">
+                <template slot-scope="scope">
+                  <a
+                    v-if="scope.row.regionName !== '默认全国'"
+                    @click="delCity(index, 2)"
+                    >删除</a
+                  >
+                </template>
+              </el-table-column>
+            </el-table>
+            <el-row type="flex" v-if="formData.appoint_check === 1">
+              <el-col>
+                <el-button type="primary" icon="md-add" @click="addCity(2)"
+                  >单独指定包邮</el-button
+                >
+              </el-col>
+            </el-row>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" type="flex">
+        <el-col :xl="18" :lg="18" :md="18" :sm="24" :xs="24">
+          <el-form-item label="排序：" prop="store_name">
+            <el-input-number
+              :min="0"
+              placeholder="输入值越大越靠前"
+              v-model="formData.sort"
+            ></el-input-number>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" type="flex">
+        <el-col>
+          <el-form-item prop="store_name" label=" ">
+            <el-button type="primary" @click="handleSubmit">{{
+              id ? "立即修改" : "立即提交"
+            }}</el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <!--<el-button type="text" @click="crud.cancelCU">取消</el-button>-->
+      <!--<el-button :loading="modal_loading" type="primary" @click="handleSubmit('formData')">确认</el-button>-->
+    </div>
+    <city ref="city" @selectCity="selectCity" :type="type"></city>
+  </el-dialog>
+</template>
+<script>
+import crudYxShippingTemplates from "@/api/yxShippingTemplates";
+import CRUD, { presenter, header, form, crud } from "@crud/crud";
+import rrOperation from "@crud/RR.operation";
+import crudOperation from "@crud/CRUD.operation";
+import udOperation from "@crud/UD.operation";
+import MaterialList from "@/components/material";
+import city from "./city";
+var g = [
+  {
+    region: [
+      {
+        name: "默认全国",
+        city_id: 0,
+      },
+    ],
+    regionName: "默认全国",
+    first: 1,
+    price: 0,
+    _continue: 1,
+    continue_price: 0,
+  },
+];
+const defaultForm = {
+  id: null,
+  type: null,
+  sort: null,
+  appointInfo: null,
+  appoint: null,
+  name: null,
+};
+export default {
+  name: "tempForm",
+  components: { crudOperation, rrOperation, udOperation, MaterialList, city },
+  mixins: [header(), form(defaultForm), crud()],
+  data() {
+    return {
+      permission: {
+        add: ["admin", "storeProductRule:add"],
+        edit: ["admin", "storeProductRule:edit"],
+        del: ["admin", "storeProductRule:del"],
+      },
+      rules: {
+        ruleName: [
+          { required: true, message: "规格名称不能为空", trigger: "blur" },
+        ],
+      },
+      templateList: g,
+      appointList: [],
+      type: 1,
+      formData: {
+        type: 1,
+        sort: 0,
+        name: "",
+        appoint_check: 0,
+      },
+      id: 0,
+      addressView: false,
+      indeterminate: true,
+      checkAll: false,
+      checkAllGroup: [],
+      activeCity: -1,
+      provinceAllGroup: [],
+      index: -1,
+      displayData: "",
+      currentProvince: "",
+    };
+  },
+  watch: {},
+  methods: {
+    // 获取数据前设置好接口地址
+    [CRUD.HOOK.beforeRefresh]() {
+      return true;
+    }, // 新增与编辑前做的操作
+    [CRUD.HOOK.afterToCU](crud, form) {
+      console.log("uu:" + form.name);
+      this.appointList = form.appointInfo
+        ? eval("(" + form.appointInfo + ")")
+        : [];
+      if (form.id) {
+        this.templateList = eval("(" + form.regionInfo + ")");
+      } else {
+        this.templateList = g;
+      }
+      this.formData.type = form.type || 1;
+      this.formData.sort = form.sort || 0;
+      this.formData.name = form.name || "";
+      this.formData.appoint_check = form.appoint || 0;
+      this.id = form.id || 0;
+    },
+    selectCity: function (data, type) {
+      console.log(data, "接收的城市");
+      let cityName = data
+        .map(function (item) {
+          return item.name;
+        })
+        .join(";");
+      switch (type) {
+        case 1:
+          this.templateList.push({
+            region: data,
+            regionName: cityName,
+            first: 1,
+            price: 0,
+            _continue: 1,
+            continue_price: 0,
+          });
+          break;
+        case 2:
+          this.appointList.push({
+            place: data,
+            placeName: cityName,
+            a_num: 0,
+            a_price: 0,
+          });
+          break;
+      }
+    },
+    // 单独添加配送区域
+    addCity(type) {
+      this.$refs.city.addressView = true;
+      this.type = type;
+      this.$refs.city.getCityList();
+    },
+    // 提交
+    handleSubmit: function () {
+      let that = this;
+      if (!that.formData.name.trim().length) {
+        return this.$message({
+          message: "请填写模板名称",
+          type: "error",
+        });
+      }
+      for (let i = 0; i < that.templateList.length; i++) {
+        if (that.templateList[i].first <= 0) {
+          return this.$message({
+            message: "首件/重量/体积应大于0'",
+            type: "error",
+          });
+        }
+        if (that.templateList[i].price < 0) {
+          return this.$message({
+            message: "运费应大于等于0",
+            type: "error",
+          });
+        }
+        if (that.templateList[i].continue <= 0) {
+          return this.$message({
+            message: "续件/重量/体积应大于0",
+            type: "error",
+          });
+        }
+        if (that.templateList[i].continue_price < 0) {
+          return this.$message({
+            message: "续费应大于等于0",
+            type: "error",
+          });
+        }
+      }
+      if (that.formData.appoint_check === 1) {
+        for (let i = 0; i < that.appointList.length; i++) {
+          if (that.appointList[i].a_num <= 0) {
+            return this.$message({
+              message: "包邮件数应大于0",
+              type: "error",
+            });
+          }
+          if (that.appointList[i].a_price < 0) {
+            return this.$message({
+              message: "包邮金额应大于等于0",
+              type: "error",
+            });
+          }
+        }
+      }
+      let data = {
+        appoint_info: that.appointList,
+        region_info: that.templateList,
+        sort: that.formData.sort,
+        type: that.formData.type,
+        name: that.formData.name,
+        appoint: that.formData.appoint_check,
+      };
+      crudYxShippingTemplates.add(data, that.id).then(() => {
+        if (that.id) {
+          this.crud.status.edit = CRUD.STATUS.NORMAL;
+          this.crud.editSuccessNotify();
+        } else {
+          this.crud.status.add = CRUD.STATUS.NORMAL;
+          this.crud.addSuccessNotify();
+        }
+        this.crud.resetForm();
+        this.crud.toQuery();
+        this.formData = {
+          type: 1,
+          sort: 0,
+          name: "",
+          appoint_check: 0,
+        };
+        this.appointList = [];
+        this.addressView = false;
+        this.templateList = [
+          {
+            region: [
+              {
+                name: "默认全国",
+                city_id: 0,
+              },
+            ],
+            regionName: "默认全国",
+            first: 1,
+            price: 0,
+            continue: 1,
+            continue_price: 0,
+          },
+        ];
+      });
+    },
+    // 删除
+    delCity(index, type) {
+      if (type === 1) {
+        this.templateList.splice(index, 1);
+      } else {
+        this.appointList.splice(index, 1);
+      }
+    },
+    // 关闭
+    cancel() {
+      this.formData = {
+        type: 1,
+        sort: 0,
+        name: "",
+        appoint_check: 0,
+      };
+      this.appointList = [];
+      this.addressView = false;
+      this.templateList = [
+        {
+          region: [
+            {
+              name: "默认全国",
+              city_id: 0,
+            },
+          ],
+          regionName: "默认全国",
+          first: 0,
+          price: 0,
+          continue: 0,
+          continue_price: 0,
+        },
+      ];
+    },
+    address() {
+      this.addressView = true;
+    },
+    enter(index) {
+      this.activeCity = index;
+    },
+    leave() {
+      this.activeCity = null;
+    },
+  },
+};
+</script>
+<style scoped>
+</style>
\ No newline at end of file
diff --git a/src/views/bxg/shop/shippingTemplates/index.vue b/src/views/bxg/shop/shippingTemplates/index.vue
new file mode 100644
index 0000000..d054530
--- /dev/null
+++ b/src/views/bxg/shop/shippingTemplates/index.vue
@@ -0,0 +1,206 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <crudOperation :permission="permission" />
+      <add />
+      <el-table
+        id="tablee"
+        ref="table"
+        v-loading="crud.loading"
+        :data="crud.data"
+        size="small"
+        style="width: 100%; height: calc(100vh - 250px); overflow-y: scroll"
+        @selection-change="crud.selectionChangeHandler"
+      >
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column
+          v-if="columns.visible('id')"
+          prop="id"
+          label="模板ID"
+          align="center"
+        />
+        <el-table-column
+          v-if="columns.visible('name')"
+          prop="name"
+          label="模板名称"
+          align="center"
+          width="400"
+        />
+        <el-table-column
+          v-if="columns.visible('type')"
+          prop="type"
+          label="计费方式"
+          align="center"
+        >
+          <template slot-scope="scope">
+            <span v-if="scope.row.type == 1">按件数</span>
+            <span v-else-if="scope.row.type == 2">按重量</span>
+            <span v-else>按体积</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-if="columns.visible('appoint')"
+          prop="appoint"
+          label="指定包邮开关"
+          align="center"
+        >
+          <template slot-scope="scope">
+            <span v-if="scope.row.appoint == 1">开启</span>
+            <span v-else>关闭</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column
+          v-if="columns.visible('createTime')"
+          prop="createTime"
+          label="添加时间"
+          align="center"
+        >
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.createTime) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-if="columns.visible('sort')"
+          prop="sort"
+          label="排序"
+          align="center"
+        />
+        <el-table-column
+          v-permission="[
+            'admin',
+            'yxShippingTemplates:edit',
+            'yxShippingTemplates:del',
+          ]"
+          label="操作"
+          width="150px"
+          align="center "
+        >
+          <template slot-scope="scope">
+            <udOperation :data="scope.row" :permission="permission" />
+          </template>
+        </el-table-column>
+      </el-table>
+      <!--分页组件-->
+      <el-footer style="height: 60px; width: 100%; background-color: #f6f6f6">
+        <div style="float: left">
+          <el-select
+            v-model="batchExport"
+            @change="handleExportOption"
+            clearable
+            placeholder="导出数据"
+            class="filter-item"
+            style="width: 130px; margin-left: 15px; margin-top: 15px"
+          >
+            <el-option
+              v-for="item in exportOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </div>
+        <pagination style="float: right; margin-top: 15px" />
+      </el-footer>
+    </div>
+  </div>
+</template>
+<script>
+import crudYxShippingTemplates from "@/api/yxShippingTemplates";
+import CRUD, { presenter, header, form, crud } from "@crud/crud";
+import rrOperation from "@crud/RR.operation";
+import crudOperation from "@crud/CRUD.operation";
+import udOperation from "@crud/UD.operation";
+import pagination from "@crud/Pagination";
+import MaterialList from "@/components/material";
+import add from "./form";
+import FileSaver from "file-saver";
+import XLSX from "xlsx";
+// crud交由presenter持有
+const defaultCrud = CRUD({
+  title: "运费模板",
+  url: "api/yxShippingTemplates",
+  sort: "id,desc",
+  crudMethod: { ...crudYxShippingTemplates },
+});
+const defaultForm = {
+  id: null,
+  name: null,
+  type: null,
+  regionInfo: null,
+  appoint: null,
+  appointInfo: null,
+  createTime: null,
+  updateTime: null,
+  isDel: null,
+  sort: null,
+};
+export default {
+  name: "YxShippingTemplates",
+  components: {
+    pagination,
+    crudOperation,
+    rrOperation,
+    udOperation,
+    MaterialList,
+    add,
+  },
+  mixins: [presenter(defaultCrud), header(), form(defaultForm), crud()],
+  data() {
+    return {
+      batchExport: "",
+      exportOptions: [{ value: "0", label: "导出本页数据" }],
+      permission: {
+        add: ["admin", "yxShippingTemplates:add"],
+        edit: ["admin", "yxShippingTemplates:edit"],
+        del: ["admin", "yxShippingTemplates:del"],
+      },
+      rules: {},
+    };
+  },
+  watch: {},
+  methods: {
+    handleExportOption(val) {
+      var table = XLSX.utils.table_to_book(document.querySelector("#tablee"));
+      var tb = XLSX.write(table, {
+        bookType: "xlsx",
+        bookSST: true,
+        type: "array",
+      });
+      try {
+        FileSaver.saveAs(
+          new Blob([tb], { type: "application/octet-stream" }),
+          "运费.xlsx"
+        );
+      } catch (e) {
+        if (typeof console !== "undefined") console.log(e, tb);
+      }
+    },
+    // 获取数据前设置好接口地址
+    [CRUD.HOOK.beforeRefresh]() {
+      return true;
+    }, // 新增与编辑前做的操作
+    [CRUD.HOOK.afterToCU](crud, form) {},
+  },
+};
+</script>
+<style scoped>
+.table-img {
+  display: inline-block;
+  text-align: center;
+  background: #ccc;
+  color: #fff;
+  white-space: nowrap;
+  position: relative;
+  overflow: hidden;
+  vertical-align: middle;
+  width: 32px;
+  height: 32px;
+  line-height: 32px;
+}
+.app-container {
+  padding-bottom: 0px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/bxg/shop/shippingTemplates/sxiuGai.vue b/src/views/bxg/shop/shippingTemplates/sxiuGai.vue
new file mode 100644
index 0000000..31d62b2
--- /dev/null
+++ b/src/views/bxg/shop/shippingTemplates/sxiuGai.vue
@@ -0,0 +1,399 @@
+<template>
+  <div style="padding:20px">
+      <el-form ref="formData" :model="formData" class="attrFrom"  :rules="rules" label-width="130px" :inline="true">
+      <el-row :gutter="24" type="flex">
+        <el-col :xl="18" :lg="18" :md="18" :sm="24" :xs="24">
+          <el-form-item label="模板名称：" prop="name">
+            <el-input type="text" placeholder="请输入模板名称" v-model="formData.name"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" type="flex">
+        <el-col :xl="18" :lg="18" :md="18" :sm="24" :xs="24">
+          <el-form-item label="计费方式：" props="state" >
+            <el-radio-group class="radio" v-model="formData.type" >
+              <el-radio :label="1">按件数</el-radio>
+              <el-radio :label="2">按重量</el-radio>
+              <el-radio :label="3">按体积</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" type="flex">
+        <el-col :xl="24" :lg="24" :md="24" :sm="24" :xs="24">
+          <el-form-item class="label" label="配送区域及运费：" props="state">
+            <el-table
+              ref="table"
+              :data="templateList"
+              empty-text="暂无数据"
+              border
+            >
+              <el-table-column prop="regionName" label="可配送区域" width="130" />
+              <el-table-column prop="first" label="首件" width="120">
+                <template slot="header" slot-scope="scope">
+                  <span v-if="formData.type == 1">首件</span>
+                  <span v-else-if="formData.type == 2">首件重量(KG)</span>
+                  <span v-else>首件体积(m³)</span>
+                </template>
+                <template slot-scope="scope">
+                  <span><el-input type="text" v-model="scope.row.first" /></span>
+                </template>
+              </el-table-column>
+              <el-table-column prop="price" label="运费（元）" width="110">
+                <template slot-scope="scope">
+                  <span><el-input type="text" v-model="scope.row.price"/></span>
+                </template>
+              </el-table-column>
+              <el-table-column prop="_continue" label="续件" width="120">
+                <template slot="header" slot-scope="scope">
+                  <span v-if="formData.type == 1">续件</span>
+                  <span v-else-if="formData.type == 2">续件重量(KG)</span>
+                  <span v-else>续件体积(m³)</span>
+                </template>
+                <template slot-scope="scope">
+                  <span><el-input type="text" v-model="scope.row._continue"/></span>
+                </template>
+              </el-table-column>
+              <el-table-column prop="continue_price" label="续费（元）" width="110">
+                <template slot-scope="scope">
+                  <span><el-input type="text" v-model="scope.row.continue_price"/></span>
+                </template>
+              </el-table-column>
+              <el-table-column  label="操作">
+                <template slot-scope="scope">
+                  <a v-if="scope.row.regionName!=='默认全国'" @click="delCity(index,1)">删除</a>
+                </template>
+              </el-table-column>
+            </el-table>
+            <el-row type="flex" class="addTop">
+              <el-col>
+                <el-button type="primary" icon="md-add" @click="addCity(1)">单独添加配送区域</el-button>
+              </el-col>
+            </el-row>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" type="flex">
+        <el-col :xl="24" :lg="24" :md="24" :sm="24" :xs="24">
+          <el-form-item label="指定包邮：" prop="store_name">
+            <el-radio-group class="radio" v-model="formData.appoint_check">
+              <el-radio :label="1">开启</el-radio>
+              <el-radio :label="0">关闭</el-radio>
+            </el-radio-group>
+            <el-table
+              ref="table"
+              :data="appointList"
+              empty-text="暂无数据"
+              border
+              v-if="formData.appoint_check === 1"
+            >
+              <el-table-column prop="placeName" label="选择地区" />
+              <el-table-column prop="a_num" label="包邮件数" width="120" >
+                <template slot="header" slot-scope="scope">
+                  <span v-if="formData.type == 1">包邮件数</span>
+                  <span v-else-if="formData.type == 2">包邮重量(KG)</span>
+                  <span v-else>包邮体积(m³)</span>
+                </template>
+                <template slot-scope="scope">
+                  <span><el-input type="text" v-model="scope.row.a_num"/></span>
+                </template>
+              </el-table-column>
+              <el-table-column prop="a_price" label="包邮金额（元）" width="120">
+                <template slot-scope="scope">
+                  <span><el-input type="text" v-model="scope.row.a_price"/></span>
+                </template>
+              </el-table-column>
+              <el-table-column  label="操作">
+                <template slot-scope="scope">
+                  <a v-if="scope.row.regionName!=='默认全国'" @click="delCity(index,2)">删除</a>
+                </template>
+              </el-table-column>
+
+            </el-table>
+            <el-row type="flex" v-if="formData.appoint_check === 1">
+              <el-col>
+                <el-button type="primary" icon="md-add" @click="addCity(2)">单独指定包邮</el-button>
+              </el-col>
+            </el-row>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" type="flex">
+        <el-col :xl="18" :lg="18" :md="18" :sm="24" :xs="24">
+          <el-form-item label="排序：" prop="store_name">
+            <el-input-number :min="0" placeholder="输入值越大越靠前" v-model="formData.sort" ></el-input-number>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" type="flex">
+        <el-col>
+          <el-form-item prop="store_name" label=" ">
+            <el-button type="primary" @click="handleSubmit">立即提交</el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+  </div>
+</template>
+<script>
+  import crudYxShippingTemplates from '@/api/yxShippingTemplates'
+  import CRUD, {presenter, header, form, crud} from '@crud/crud'
+  import rrOperation from '@crud/RR.operation'
+  import crudOperation from '@crud/CRUD.operation'
+  import udOperation from '@crud/UD.operation'
+  import MaterialList from "@/components/material";
+  import city from './city';
+  var g =  [
+    {
+      region: [
+        {
+          name: '默认全国',
+          city_id: 0
+        }
+      ],
+      regionName: '默认全国',
+      first: 1,
+      price: 0,
+      _continue: 1,
+      continue_price: 0
+    }
+  ]
+  const defaultForm = {id: null, type: null, sort: null, appointInfo: null, appoint: null, name: null}
+  export default {
+    name: 'tempForm',
+    components: {crudOperation, rrOperation, udOperation, MaterialList, city},
+    mixins: [header(), form(defaultForm), crud()],
+    data() {
+      return {
+          centerDialogVisible:false,
+        permission: {
+          add: ['admin', 'storeProductRule:add'],
+          edit: ['admin', 'storeProductRule:edit'],
+          del: ['admin', 'storeProductRule:del']
+        },
+        rules: {
+          ruleName: [
+            {required: true, message: '规格名称不能为空', trigger: 'blur'}
+          ]
+        },
+        templateList: g,
+        appointList: [],
+        type: 1,
+        formData: {
+          type: 1,
+          sort: 0,
+          name: '',
+          appoint_check: 0
+        },
+        id: 0,
+        addressView: false,
+        indeterminate: true,
+        checkAll: false,
+        checkAllGroup: [],
+        activeCity: -1,
+        provinceAllGroup: [],
+        index: -1,
+        displayData: '',
+        currentProvince: ''
+      }
+    },
+    watch: {},
+    created(){
+        this.getfo()
+    },
+    methods: {
+        getfo(){
+            this.formData = this.$route.query.forms
+            console.log(this.formData)
+        },
+      // 获取数据前设置好接口地址
+      [CRUD.HOOK.beforeRefresh]() {
+        return true
+      }, // 新增与编辑前做的操作
+      [CRUD.HOOK.afterToCU](crud, form) {
+        console.log('uu:'+form.name)
+        this.appointList = form.appointInfo ? eval('(' + form.appointInfo + ')') : []
+        if(form.id){
+          this.templateList =  eval('(' + form.regionInfo + ')')
+        }else{
+          this.templateList = g
+        }
+        this.formData.type = form.type || 1
+        this.formData.sort = form.sort || 0
+        this.formData.name = form.name || ''
+        this.formData.appoint_check = form.appoint || 0
+        this.id = form.id || 0
+      },
+      selectCity: function (data, type) {
+        let cityName = data.map(function (item) {
+          return item.name;
+        }).join(';');
+        switch (type) {
+          case 1:
+            this.templateList.push({
+              region: data,
+              regionName: cityName,
+              first: 1,
+              price: 0,
+              _continue: 1,
+              continue_price: 0
+            });
+            break;
+          case 2:
+            this.appointList.push({
+              place: data,
+              placeName: cityName,
+              a_num: 0,
+              a_price: 0
+            });
+            break;
+        }
+      },
+      // 单独添加配送区域
+      addCity (type) {
+        this.$refs.city.addressView = true;
+        this.type = type;
+        this.$refs.city.getCityList()
+      },
+      // 提交
+      handleSubmit: function () {
+        let that = this;
+        if (!that.formData.name.trim().length) {
+          return this.$message({
+            message:'请填写模板名称',
+            type: 'error'
+          });
+        }
+        for (let i = 0; i < that.templateList.length; i++) {
+          if (that.templateList[i].first <= 0) {
+            return this.$message({
+              message:'首件/重量/体积应大于0\'',
+              type: 'error'
+            });
+          }
+          if (that.templateList[i].price < 0) {
+            return this.$message({
+              message:'运费应大于等于0',
+              type: 'error'
+            });
+          }
+          if (that.templateList[i].continue <= 0) {
+            return this.$message({
+              message:'续件/重量/体积应大于0',
+              type: 'error'
+            });
+          }
+          if (that.templateList[i].continue_price < 0) {
+            return this.$message({
+              message:'续费应大于等于0',
+              type: 'error'
+            });
+          }
+        }
+        if (that.formData.appoint_check === 1) {
+          for (let i = 0; i < that.appointList.length; i++) {
+            if (that.appointList[i].a_num <= 0) {
+              return this.$message({
+                message:'包邮件数应大于0',
+                type: 'error'
+              });
+            }
+            if (that.appointList[i].a_price < 0) {
+              return this.$message({
+                message:'包邮金额应大于等于0',
+                type: 'error'
+              });
+            }
+          }
+        }
+        let data = {
+          appoint_info: that.appointList,
+          region_info: that.templateList,
+          sort: that.formData.sort,
+          type: that.formData.type,
+          name: that.formData.name,
+          appoint: that.formData.appoint_check
+        };
+        crudYxShippingTemplates.add(data,that.id).then(() => {
+          if(that.id){
+            this.crud.status.edit = CRUD.STATUS.NORMAL
+            this.crud.editSuccessNotify()
+          }else{
+            this.crud.status.add = CRUD.STATUS.NORMAL
+            this.crud.addSuccessNotify()
+          }
+          this.crud.resetForm()
+          this.crud.toQuery()
+          this.formData = {
+            type: 1,
+            sort: 0,
+            name: '',
+            appoint_check: 0
+          };
+          this.appointList = [];
+          this.addressView = false;
+          this.templateList = [
+            {
+              region: [
+                {
+                  name: '默认全国',
+                  city_id: 0
+                }
+              ],
+              regionName: '默认全国',
+              first: 1,
+              price: 0,
+              continue: 1,
+              continue_price: 0
+            }
+          ];
+        });
+      },
+      // 删除
+      delCity (index,type) {
+        if (type === 1) {
+          this.templateList.splice(index, 1);
+        } else {
+          this.appointList.splice(index, 1);
+        }
+      },
+      // 关闭
+      cancel () {
+        this.formData = {
+          type: 1,
+          sort: 0,
+          name: '',
+          appoint_check: 0
+        };
+        this.appointList = [];
+        this.addressView = false;
+        this.templateList = [
+          {
+            region: [
+              {
+                name: '默认全国',
+                city_id: 0
+              }
+            ],
+            regionName: '默认全国',
+            first: 0,
+            price: 0,
+            continue: 0,
+            continue_price: 0
+          }
+        ];
+      },
+      address () {
+        this.addressView = true
+      },
+      enter (index) {
+        this.activeCity = index;
+      },
+      leave () {
+        this.activeCity = null;
+      }
+    }
+  }
+</script>
+<style scoped>
+</style>
\ No newline at end of file
diff --git a/src/views/bxg/shop/store/index.vue b/src/views/bxg/shop/store/index.vue
new file mode 100644
index 0000000..c6163aa
--- /dev/null
+++ b/src/views/bxg/shop/store/index.vue
@@ -0,0 +1,231 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <crudOperation :permission="permission" />
+      <!--表单组件-->
+      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
+        <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
+          <el-form-item label="门店名称" prop="name">
+            <el-input v-model="form.name" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="门店简介" prop="introduction">
+            <el-input v-model="form.introduction" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="门店手机" prop="phone">
+            <el-input v-model="form.phone" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="门店地址" prop="address">
+            <el-input v-model="form.address" style="width: 370px;" />
+            <el-button  size="medium" type="primary" @click="getL(form.address)">获取经纬度</el-button>
+          </el-form-item>
+          <el-form-item label="门店logo" prop="image">
+            <MaterialList v-model="form.imageArr" style="width: 370px" type="image" :num="1" :width="150" :height="150" />
+          </el-form-item>
+          <el-form-item label="纬度" prop="latitude">
+            <el-input v-model="form.latitude" style="width: 370px;" :disabled="true" />
+          </el-form-item>
+          <el-form-item label="经度" prop="longitude">
+            <el-input v-model="form.longitude" style="width: 370px;" :disabled="true" />
+          </el-form-item>
+          <el-form-item label="核销时效" prop="validTime">
+            <el-date-picker
+              @change="getTimeT"
+              style="width: 370px;"
+              v-model="form.validTimeArr"
+              type="daterange"
+              range-separator="-"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="营业时间" prop="dayTime">
+            <el-time-picker
+              @change="getTime"
+              style="width: 370px;"
+              is-range
+              v-model="form.dayTimeArr"
+              range-separator="-"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
+              placeholder="选择时间范围">
+            </el-time-picker>
+          </el-form-item>
+          <el-form-item label="是否显示" prop="isShow">
+            <el-radio-group v-model="form.isShow" style="width: 178px">
+              <el-radio :label="1">显示</el-radio>
+              <el-radio :label="0">隐藏</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="text" @click="crud.cancelCU">取消</el-button>
+          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+        </div>
+      </el-dialog>
+      <!--表格渲染-->
+      <el-table id="tablee" ref="table" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;height:calc(100vh - 245px);overflow-y: scroll;" @selection-change="crud.selectionChangeHandler">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column v-if="columns.visible('id')" prop="id" label="id" width="50" align="center" />
+        <el-table-column v-if="columns.visible('name')" prop="name" label="门店名称"  align="center"/>
+        <el-table-column v-if="columns.visible('phone')" prop="phone" label="门店电话" align="center" />
+        <el-table-column v-if="columns.visible('address')" prop="address" label="地址"  align="center"/>
+        <el-table-column v-if="columns.visible('image')" prop="image" label="门店logo"  align="center">
+          <template slot-scope="scope">
+            <a :href="scope.row.image" style="color: #42b983" target="_blank"><img :src="scope.row.image" alt="点击打开" class="el-avatar"></a>
+          </template>
+        </el-table-column>
+        <el-table-column v-if="columns.visible('validTime')" prop="validTime" label="核销有效日期" align="center"  />
+        <el-table-column v-if="columns.visible('dayTime')" prop="dayTime" label="营业时间" align="center" />
+        <el-table-column v-if="columns.visible('isShow')" prop="isShow" label="是否显示" align="center" >
+          <template slot-scope="scope">
+            <div>
+              <el-tag v-if="scope.row.isShow === 1" :type="''">显示</el-tag>
+              <el-tag v-else :type=" 'info' ">隐藏</el-tag>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column v-permission="['admin','yxSystemStore:edit','yxSystemStore:del']" label="操作" width="150px" align="center">
+          <template slot-scope="scope">
+            <udOperation
+              :data="scope.row"
+              :permission="permission"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+      <!--分页组件-->
+      <el-footer style="height:60px;width:100%;background-color:#f6f6f6">
+        <div style="float:left">
+           <el-select v-model="batchExport" @change="handleExportOption" clearable placeholder="导出数据" class="filter-item" style="width: 130px;margin-left:15px;margin-top:15px">
+          <el-option
+            v-for="item in exportOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+        </div>
+        <pagination style="float:right;margin-top:15px;" />
+      </el-footer>
+    </div>
+  </div>
+</template>
+
+<script>
+  import crudYxSystemStore from '@/api/yxSystemStore'
+  import CRUD, { presenter, header, form, crud } from '@crud/crud'
+  import rrOperation from '@crud/RR.operation'
+  import crudOperation from '@crud/CRUD.operation'
+  import udOperation from '@crud/UD.operation'
+  import pagination from '@crud/Pagination'
+  import MaterialList from '@/components/material'
+  import { parseTime } from '@/utils/index'
+  import FileSaver from "file-saver";
+  import XLSX from "xlsx";
+  // crud交由presenter持有
+  const defaultCrud = CRUD({ title: '门店', url: 'api/yxSystemStore', sort: 'id,desc', crudMethod: { ...crudYxSystemStore }})
+  const defaultForm = { id: null, name: null, introduction: null, phone: null, address: null, detailedAddress: null, image: null, latitude:
+  null, longitude: null, validTime: null, dayTime: null, addTime: null, isShow: 1, imageArr: [], validTimeArr: [],  dayTimeArr: [new Date(),new Date()] }
+  export default {
+    name: 'YxSystemStore',
+    components: { pagination, crudOperation, rrOperation, udOperation, MaterialList },
+    mixins: [presenter(defaultCrud), header(), form(defaultForm), crud()],
+    data() {
+      return {
+          batchExport:'',
+      exportOptions: [
+          
+          {value: '0', label: '导出本页数据'},
+          
+        ],
+        permission: {
+          add: ['admin', 'yxSystemStore:add'],
+          edit: ['admin', 'yxSystemStore:edit'],
+          del: ['admin', 'yxSystemStore:del']
+        },
+        rules: {
+          name: [
+            { required: true, message: '门店名称不能为空', trigger: 'blur' }
+          ],
+          introduction: [
+            { required: true, message: '简介不能为空', trigger: 'blur' }
+          ],
+          phone: [
+            { required: true, message: '手机号码不能为空', trigger: 'blur' }
+          ],
+          address: [
+            { required: true, message: '省市区不能为空', trigger: 'blur' }
+          ],
+          latitude: [
+            { required: true, message: '纬度不能为空', trigger: 'blur' }
+          ],
+          longitude: [
+            { required: true, message: '经度不能为空', trigger: 'blur' }
+          ],
+          isShow: [
+            { required: true, message: '是否显示不能为空', trigger: 'blur' }
+          ]
+        }
+        }
+    },
+    methods: {
+      handleExportOption(val){
+        var table = XLSX.utils.table_to_book(document.querySelector("#tablee"));
+      var tb = XLSX.write(table, {
+        bookType: "xlsx",
+        bookSST: true,
+        type: "array",
+      });
+      try {
+        FileSaver.saveAs(
+          new Blob([tb], { type: "application/octet-stream" }),
+          "门店列表.xlsx"
+        );
+      } catch (e) {
+        if (typeof console !== "undefined") console.log(e, tb);
+      }
+      },
+      // 获取数据前设置好接口地址
+      [CRUD.HOOK.beforeRefresh]() {
+        return true
+      },
+      // 添加后
+      [CRUD.HOOK.beforeSubmit]() {
+        //console.log('hah:'+this.form.imageArr)
+        this.form.image = this.form.imageArr.join(',')
+      },
+      // 编辑前
+      [CRUD.HOOK.beforeToEdit](crud, form) {
+        form.imageArr = [form.image]
+        form.dayTimeArr = [form.dayTimeStart,form.dayTimeEnd]
+        form.validTimeArr = [form.validTimeStart,form.validTimeEnd]
+      },
+      getTime(t) {
+        this.form.dayTimeStart = t[0]
+        this.form.dayTimeEnd = t[1]
+        this.form.dayTime = parseTime(t[0],'{h}:{i}:{s}') + ' - ' + parseTime(t[1],'{h}:{i}:{s}')
+      },
+      getTimeT(t) {
+        this.form.validTimeStart = t[0]
+        this.form.validTimeEnd = t[1]
+        this.form.validTime = parseTime(t[0],'{y}-{m}-{d}') + ' - ' + parseTime(t[1],'{y}-{m}-{d}')
+      },
+      getL(addr) {
+        crudYxSystemStore.getL({addr}).then(res => {
+          this.form.latitude = res.result.location.lat
+          this.form.longitude = res.result.location.lng
+
+          //console.log(this.form)
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .app-container{
+  padding-bottom: 0px;
+}
+</style>
diff --git a/src/views/bxg/shop/store/recommend.vue b/src/views/bxg/shop/store/recommend.vue
new file mode 100644
index 0000000..afcdaf9
--- /dev/null
+++ b/src/views/bxg/shop/store/recommend.vue
@@ -0,0 +1,518 @@
+<template>
+  <div class="zongc">
+    <div style="margin:20px">
+      <el-input
+        v-model="inpu"
+        clearable
+        placeholder="输入用户id或文本描述"
+        style="width: 200px;margin-right: 15px;"
+        class="filter-item"
+      />
+      <el-select
+        v-model="type"
+        clearable
+        placeholder="类型"
+        class="filter-item"
+        style="width: 130px;margin-right: 15px;"
+      >
+        <el-option
+          v-for="item in queryTypeOptions"
+          :key="item.key"
+          :label="item.display_name"
+          :value="item.key"
+        />
+      </el-select>
+      <el-button type="primary" icon="el-icon-zoom-in" @click="search">搜索</el-button>
+      <el-button type="danger" icon="el-icon-refresh-right" @click="Refresh">刷新</el-button>
+      <!-- <el-button class="filter-item" type="warning" icon="el-icon-download" @click="dao">导出</el-button> -->
+      <el-button type="primary" icon="el-icon-circle-plus-outline" @click="newlyAdded">新增</el-button>
+    </div>
+    <el-table :data="tableData" stripe style="width: 100%;height:calc(100vh - 253px);overflow-y: scroll;" id="tablee">
+      <el-table-column prop="id" label="ID" align="center"></el-table-column>
+      <el-table-column prop="uid" label="用户ID"  align="center"></el-table-column>
+      <el-table-column prop="nickname" label="用户昵称"  align="center"></el-table-column>
+      <el-table-column label="用户头像" align="center" width="100">
+        <template slot-scope="scope"> 
+            <a :href="scope.row.avatar" style="color: #42b983" target="blank">
+              <img :src="scope.row.avatar" alt="点击打开" class="el-avatar" />
+            </a>
+        </template>
+      </el-table-column>
+      <el-table-column label="发布的文本描述" align="center" width="500">
+        <template slot-scope="scope">
+          <div v-html="scope.row.text"></div>
+        </template>
+      </el-table-column>
+      <el-table-column label="图片地址" align="center" width="200">
+        <template slot-scope="scope"> 
+          <template v-for="(col) in scope.row.imageAll">
+            <a :href="col.photo" style="color: #42b983" target="blank">
+              <img :src="col.photo" alt="点击打开" class="el-avatar" />
+            </a>
+          </template>
+        </template>
+      </el-table-column>
+      <el-table-column prop="productId" label=" 商品id" align="center"></el-table-column>
+      <el-table-column prop="thumbsUp" label=" 点赞数" align="center"></el-table-column>
+      <el-table-column  width="160" label="创建时间" align="center">
+        <template slot-scope="scope">
+          <span>{{ formatTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column  width="160" label="修改时间" align="center">
+        <template slot-scope="scope">
+          <span>{{ formatTime(scope.row.updateTime) }}</span>
+        </template>
+      </el-table-column> 
+      <el-table-column label=" 操作" align="center" width="150">
+        <template slot-scope="scope">
+          <el-button size="mini" type="primary" @click="modify(scope.row)">修改</el-button>
+          <el-button size="mini" type="danger" @click="deletee(scope.row)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- <el-pagination
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+      :page-sizes="[10, 20, 30, 40]"
+      :page-size="10"
+      layout="sizes, prev, pager, next"
+      :total="totable"
+    ></el-pagination>-->
+    <el-footer style="height:60px;width:100%;background-color:#f6f6f6">
+      <div style="floa:left">
+        <el-select v-model="batchExport" @change="handleExportOption" clearable placeholder="导出数据" class="filter-item" style="width: 130px;margin-left:15px;margin-top:15px;float:left">
+          <el-option
+            v-for="item in exportOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </div>
+      <el-pagination
+      :total="totable"
+       :current-page="feng"
+      style="margin-top: 15px;height: 80px;float:right"
+      layout="total, prev, pager, next, sizes"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+    ></el-pagination>
+    </el-footer>
+    <!-- 新增  -->
+    <el-dialog title="新增信息流" :visible.sync="centerDialogVisible" width="30%" center>
+      <el-form :model="forms">
+        <el-form-item label="用户ID:" :label-width="formLabelWidth">
+          <el-input v-model="forms.uid" autocomplete="off"></el-input>
+        </el-form-item>
+        <el-form-item label="发布的文本描述" :label-width="formLabelWidth">
+          <el-input type="textarea" v-model="forms.text" autocomplete="off"></el-input>
+        </el-form-item>
+        <el-form-item label="照片" :label-width="formLabelWidth">
+          <MaterialList
+            v-model="formValidate.image"
+            type="image"
+            :num="4"
+            :width="150"
+            :height="150"
+          />
+        </el-form-item>
+        <el-form-item label="商品id：" :label-width="formLabelWidth">
+          <!-- <el-input v-model="forms.productId" autocomplete="off"></el-input> -->
+           <cgood  @selectGoods="getGoods"></cgood>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="centerDialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="centerDialogVi">确 定</el-button>
+      </span>
+    </el-dialog>
+    <!-- 修改 -->
+    <el-dialog title="修改信息流" :visible.sync="centerDialogVisiblemodify" width="30%" center :before-close="handleClose">
+      <el-form :model="formsm">
+        <el-form-item label="用户ID:" :label-width="formLabelWidth">
+          <el-input v-model="formsm.uid" autocomplete="off"></el-input>
+        </el-form-item>
+        <el-form-item label="发布的文本描述" :label-width="formLabelWidth">
+          <el-input type="textarea" v-model="formsm.text" autocomplete="off"></el-input>
+        </el-form-item>
+        <el-form-item label="照片" :label-width="formLabelWidth">
+          <MaterialList
+            v-model="formValidatem.image"
+            type="image"
+            :num="4"
+            :width="150"
+            :height="150"
+          />
+        </el-form-item>
+        <el-form-item label="商品id：" :label-width="formLabelWidth">
+          <!-- <el-input v-model="formsm.productId" autocomplete="off"></el-input> -->
+          <cgood  v-model="formsm.yxStoreProduct" @selectGoods="getGoodsres"></cgood>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="centerDialogVisib">取 消</el-button>
+        <el-button type="primary" @click="centerDialogVimodify">确 定</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import { gets, add, edit, del } from "@/api/yxUserRecommend";
+// import { getCat } from "@/api/writeOff";
+import FileSaver from "file-saver";
+import XLSX from "xlsx";
+import MaterialList from "@/components/material";
+import { formatTime } from '@/utils/index'
+import cgood from '@/views/components/godds'
+export default {
+  components: {
+    MaterialList,
+     cgood 
+  },
+  inject: ["reload"],
+  data() {
+    return {
+        batchExport:'',
+      exportOptions: [
+          
+          {value: '0', label: '导出本页数据'},
+          
+        ],
+        feng:1,
+        currentPyu:10,
+      page: 0,
+      forms: {
+        productId: "",
+        text: "",
+        uid: "",
+        imageAll: [],
+        yxStoreProduct:[]
+      },
+      formsm: {
+        id: "",
+        productId: "",
+        text: "",
+        uid: "",
+        imageAll: [],
+        yxStoreProduct:[]
+      },
+      formValidatem: {
+        image: [],
+      },
+      formValidate: {
+        imageArr: [],
+        sliderImageArr: [],
+        store_name: "",
+        cate_id: "",
+        keyword: "",
+        unit_name: "",
+        store_info: "",
+        image: "",
+        image: [],
+        description: "",
+        ficti: 0,
+        give_integral: 0,
+        sort: 0,
+        is_show: 1,
+        is_hot: 0,
+        is_benefit: 0,
+        is_best: 0,
+        is_new: 0,
+        is_good: 0,
+        is_postage: 0,
+        is_sub: 0,
+        id: 0,
+        spec_type: 0,
+        temp_id: "",
+        attrs: [],
+        items: [
+          {
+            pic: "",
+            price: 0,
+            cost: 0,
+            ot_price: 0,
+            stock: 0,
+            bar_code: "",
+          },
+        ],
+        header: [],
+        selectRule: "",
+      },
+      form: {
+        remarks: "",
+      },
+      formLabelWidth: "120px",
+      centerDialogVisible: false,
+      centerDialogVisiblemodify: false,
+      tableData: [],
+      totable: 0,
+      inpu: "",
+      type: "",
+      gety: {
+        orderId: "",
+        operationRemark: "",
+      },
+      queryTypeOptions: [
+        { key: "uid", display_name: "用户ID" },
+        { key: "text", display_name: "文本描述" },
+      ],
+      form: {
+        name: "",
+        region: "",
+        date1: "",
+        date2: "",
+        delivery: false,
+        type: [],
+        resource: "",
+        desc: "",
+      },
+    };
+  },
+  created() {
+    this.fu();
+    
+  },
+  methods: {
+    centerDialogVisib(){
+      this.centerDialogVisiblemodify = false;
+      if(this.centerDialogVisiblemodify == false){
+        this.reload()
+        
+      }
+    },
+  handleClose(done) {
+        this.$confirm('确认关闭？')
+          .then(_ => {
+            this.reload()
+            done();
+          })
+          .catch(_ => {});
+      },
+    getGoodsres(p){
+      console.log('shaihi')
+      this.formsm.yxStoreProduct = p
+      this.formsm.productId = p[0].id
+    },
+    getGoods(p){
+      console.log(p,'商品id')
+      // productId
+      this.forms.yxStoreProduct = p
+      this.forms.productId = p[0].id
+      // this.formsm.product = p[0]
+      console.log(this.forms.yxStoreProduct)
+    },
+    handleExportOption(val){
+      var table = XLSX.utils.table_to_book(document.querySelector("#tablee"));
+      var tb = XLSX.write(table, {
+        bookType: "xlsx",
+        bookSST: true,
+        type: "array",
+      });
+      try {
+        FileSaver.saveAs(
+          new Blob([tb], { type: "application/octet-stream" }),
+          "信息流列表.xlsx"
+        );
+      } catch (e) {
+        if (typeof console !== "undefined") console.log(e, tb);
+      }
+    },
+    formatTime,
+    centerDialogVimodify() {
+      this.centerDialogVisiblemodify = false;
+      if(this.centerDialogVisiblemodify == false){
+        this.reload()
+        
+      }
+      this.formsm.imageAll = this.formValidatem.image;
+      // console.log(this.formValidatem.image)
+      edit(this.formsm).then((res) => {
+        this.fu();
+        this.reload()
+      });
+    },
+    modify(row) {
+      console.log(this.formsm)
+      console.log(row.yxStoreProduct)
+      this.centerDialogVisiblemodify = true;
+      this.formsm.productId = row.productId;
+      this.formsm.text = row.text;
+      this.formsm.uid = row.uid;
+      this.formsm.id = row.id;
+      this.formsm.yxStoreProduct = row.yxStoreProduct
+      console.log(this.formsm.yxStoreProduct,'dsadwqewqrerewroiewp')
+      
+      // this.formsm.imagess = row.yxStoreProduct[0].image
+      // console.log(this.formsm.imagess+'454564');
+      var art = [];
+      for (var i = 0; i < row.imageAll.length; i++) {
+        console.log(row.imageAll[i].photo);
+        art.push(row.imageAll[i].photo);
+        console.log(i);
+      }
+      // this.formValidatem.image = art
+      console.log(art);
+      this.formValidatem.image = art;
+    },
+    newlyAdded() {
+      this.centerDialogVisible = true;
+    },
+    fu() {
+      let params = {
+        page: 0,
+        size: 10,
+      };
+      // console.log(params);
+      gets(params).then((res) => {
+        console.log(res);
+        this.tableData = res.content;
+        this.totable = res.totalElements;
+        console.log(this.tableData)
+        this.tableData.forEach(item => {
+          console.log(item.text)
+        });
+      });
+    },
+    // dao() {
+    //   var table = XLSX.utils.table_to_book(document.querySelector("#tablee"));
+    //   var tb = XLSX.write(table, {
+    //     bookType: "xlsx",
+    //     bookSST: true,
+    //     type: "array",
+    //   });
+    //   try {
+    //     FileSaver.saveAs(
+    //       new Blob([tb], { type: "application/octet-stream" }),
+    //       "信息流.xlsx"
+    //     );
+    //   } catch (e) {
+    //     if (typeof console !== "undefined") console.log(e, tb);
+    //   }
+    // },
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`);
+      this.feng = 1
+      this.currentPyu = val
+      console.log(this.feng+'这是正常的 ')
+      let params = {
+        page: 0,
+        size: val,
+      };
+      console.log(params);
+      gets(params).then((res) => {
+        console.log(res);
+        this.tableData = res.content;
+        this.totable = res.totalElements;
+      });
+      console.log(val);
+    },
+    handleCurrentChange(val) {
+      this.feng = val
+      console.log(`当前页: ${val}`);
+      console.log(val);
+      let params = {
+        page: val - 1,
+        size: this.currentPyu,
+      };
+      gets(params).then((res) => {
+        console.log(res);
+        this.tableData = res.content;
+        this.totable = res.totalElements;
+      });
+    },
+    Refresh() {
+      this.fu();
+      this.inpu = "";
+      this.type = "";
+    },
+    search() {
+      console.log(this.type);
+      if (this.type == "uid") {
+        let params = {
+          page: 0,
+          size: 10,
+          uid: this.inpu,
+          text: "",
+        };
+        gets(params).then((res) => {
+          console.log(res);
+          this.tableData = res.content;
+          this.totable = res.totalElements;
+        });
+      } else if (this.type == "text") {
+        let params = {
+          page: 0,
+          size: 10,
+          uid: "",
+          text: this.inpu,
+        };
+        gets(params).then((res) => {
+          console.log(res);
+          this.tableData = res.content;
+          this.totable = res.totalElements;
+        });
+      }
+    },
+    centerDial(row) {
+      this.centerDialogVisible = true;
+      this.gety.orderId = row.ordersId;
+      console.log(this.Id);
+    },
+    centerDialogVi() {
+      console.log(this.formValidate.image);
+      let lisss = this.formValidate.image;
+      // let arr = {}
+      // this.formValidate.image.forEach(item => {
+      //   console.log(item)
+      //   arr.photo =  item
+      //  lisss.push(arr)
+      // })
+      console.log(lisss);
+      this.forms.imageAll = lisss;
+      console.log(this.forms.imageAll);
+      this.centerDialogVisible = false;
+      console.log(this.gety);
+      add(this.forms).then((res) => {
+        console.log(res);
+        if (res == true) {
+          this.reload();
+        }
+      });
+      // this.form.remarks = ''
+    },
+    deletee(row) {
+      console.log(row.id);
+      del(row.id).then((res) => {
+        console.log(res);
+        this.fu();
+      });
+    },
+  },
+};
+</script>
+<style scoped>
+.table-img {
+  display: inline-block;
+  text-align: center;
+  background: #ccc;
+  color: #fff;
+  white-space: nowrap;
+  position: relative;
+  overflow: hidden;
+  vertical-align: middle;
+  width: 32px;
+  height: 32px;
+  line-height: 32px;
+}
+.map {
+  width: 100%;
+  height: 400px;
+}
+  .app-container{
+  padding-bottom: 0px;
+}
+.el-table::before{
+  height: 0;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/bxg/shop/store/set.vue b/src/views/bxg/shop/store/set.vue
new file mode 100644
index 0000000..21a6c4e
--- /dev/null
+++ b/src/views/bxg/shop/store/set.vue
@@ -0,0 +1,70 @@
+<template>
+  <div class="app-container">
+    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="150px">
+      <el-form-item label="开启门店自提">
+        <el-radio v-model="form.store_self_mention" :label="1">开启</el-radio>
+        <el-radio v-model="form.store_self_mention" :label="2">关闭</el-radio>
+      </el-form-item>
+      <el-form-item label="腾讯地图KEY">
+        <el-input v-model="form.tengxun_map_key" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="">
+        <el-button type="primary" @click="doSubmit">提交</el-button>
+      </el-form-item>
+
+    </el-form>
+
+  </div>
+</template>
+
+<script>
+import checkPermission from '@/utils/permission'
+import initData from '@/mixins/crud'
+import { del, add, get } from '@/api/yxSystemConfig'
+
+import { Message } from 'element-ui'
+
+export default {
+  mixins: [initData],
+  data() {
+    return {
+      delLoading: false,
+      form: {
+        store_self_mention: 1,
+        tengxun_map_key: ''
+      },
+      rules: {
+      }
+    }
+  },
+  created() {
+    get().then(rese => {
+      const that = this
+      rese.content.map(function(key, value) {
+        const keyName = key.menuName
+        const newValue = key.value
+        if(keyName in that.form){
+          that.form[keyName] = newValue
+        }
+      })
+      this.form.store_self_mention = parseInt(this.form.store_self_mention)
+    })
+  },
+  methods: {
+    checkPermission,
+    doSubmit() {
+      add(this.form).then(res => {
+        Message({ message: '设置成功', type: 'success' })
+      }).catch(err => {
+        // this.loading = false
+        console.log(err.response.data.message)
+      })
+    }
+
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/bxg/shop/storeProductRule/form.vue b/src/views/bxg/shop/storeProductRule/form.vue
new file mode 100644
index 0000000..3a9628b
--- /dev/null
+++ b/src/views/bxg/shop/storeProductRule/form.vue
@@ -0,0 +1,228 @@
+<template>
+  <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU"
+             :visible.sync="crud.status.cu > 0"
+             :title="crud.status.title" width="950px">
+    <el-form ref="formData" :model="formData" class="attrFrom"  :rules="rules" label-width="92px" :inline="true">
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-col :span="9" class="mb15">
+            <el-form-item label="标题名称：" prop="ruleName">
+              <el-input placeholder="请输入标题名称" v-model="formData.ruleName"/>
+            </el-form-item>
+          </el-col>
+        </el-col>
+        <el-col :span="23" class="noForm" v-for="(item, index) in formData.ruleValue" :key="index">
+          <el-form-item label=" ">
+            <div class="acea-row row-middle"><span class="mr5">{{item.value}}</span>
+              <i class="el-icon-circle-close"  @click="handleRemove(index)"></i>
+            </div>
+            <div class="rulesBox">
+              <el-tag   class="mb5" style="margin: 2px 4px 2px 0;" closable
+              v-for="(j, indexn) in item.detail" :key="indexn"
+              :name="j" @close="handleRemove2(item.detail,indexn)">{{j}}
+              </el-tag>
+              <el-input placeholder="请输入属性名称" v-model="item.detail.attrsVal"
+                        style="width: 170px">
+                <el-button slot="append" type="primary" @click="createAttr(item.detail.attrsVal,index)">添加</el-button>
+              </el-input>
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24" v-if="isBtn" class="mt10">
+          <el-col :span="9" class="mr15">
+            <el-form-item label="规格：">
+              <el-input placeholder="请输入规格" v-model="attrsName"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="9" class="mr20">
+            <el-form-item label="规格值：">
+              <el-input v-model="attrsVal" placeholder="请输入规格值"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="2">
+            <el-button type="primary" @click="createAttrName">确定</el-button>
+          </el-col>
+          <el-col :span="2">
+            <el-button @click="offAttrName">取消</el-button>
+          </el-col>
+        </el-col>
+      </el-row>
+      <el-button type="primary" icon="md-add" @click="addBtn" v-if="!isBtn" class="ml95 mt10">添加新规格</el-button>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="text" @click="crud.cancelCU">取消</el-button>
+      <el-button :loading="modal_loading" type="primary" @click="handleSubmit('formData')">确认</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+  import crudYxStoreProductRule from '@/api/storeProductRule'
+  import CRUD, {presenter, header, form, crud} from '@crud/crud'
+  import rrOperation from '@crud/RR.operation'
+  import crudOperation from '@crud/CRUD.operation'
+  import udOperation from '@crud/UD.operation'
+  import MaterialList from "@/components/material";
+
+  const defaultForm = {id: null, ruleName: null, ruleValue: null, createTime: null, updateTime: null, isDel: null}
+  export default {
+    name: 'ruleForm',
+    components: {crudOperation, rrOperation, udOperation, MaterialList},
+    mixins: [header(), form(defaultForm), crud()],
+    data() {
+      return {
+
+        permission: {
+          add: ['admin', 'yxStoreProductRule:add'],
+          edit: ['admin', 'yxStoreProductRule:edit'],
+          del: ['admin', 'yxStoreProductRule:del']
+        },
+        rules: {
+          ruleName: [
+            {required: true, message: '规格名称不能为空', trigger: 'blur'}
+          ]
+        },
+
+        modal_loading: false,
+        index: 1,
+        formData: {
+          ruleName: '',
+          ruleValue: []
+        },
+        attrsName: '',
+        attrsVal: '',
+        formDataNameData: [],
+        isBtn: false,
+        formDataName: [],
+        ids: 0
+
+      }
+    },
+    watch: {},
+    methods: {
+      // 获取数据前设置好接口地址
+      [CRUD.HOOK.beforeRefresh]() {
+        return true
+      }, // 新增与编辑前做的操作
+      [CRUD.HOOK.afterToCU](crud, form) {
+          this.formData.ruleName = form.ruleName || ''
+          this.formData.ruleValue = form.ruleValue || []
+          this.ids = form.id || 0
+      },
+
+      onCancel () {
+        this.clear();
+      },
+      // 添加按钮
+      addBtn () {
+        this.isBtn = true;
+      },
+      // 提交
+      handleSubmit (name) {
+        this.$refs[name].validate((valid) => {
+          if (valid) {
+            if (!this.formData.ruleValue) {
+              return this.$message.warning('请至少添加一条商品规格！');
+            }
+            if (this.formData.ruleValue.length === 0) {
+              return this.$message.warning('请至少添加一条商品规格！');
+            }
+            this.modal_loading = true;
+
+            setTimeout(() => {
+              crudYxStoreProductRule.add(this.formData, this.ids).then(res => {
+                setTimeout(() => {
+                  if(this.ids){
+                    this.crud.status.edit = CRUD.STATUS.NORMAL
+                    this.crud.editSuccessNotify()
+                  }else{
+                    this.crud.status.add = CRUD.STATUS.NORMAL
+                    this.crud.addSuccessNotify()
+                  }
+
+                  this.crud.resetForm()
+                  this.crud.toQuery()
+                  this.modal_loading = false;
+                }, 500);
+                setTimeout(() => {
+                  this.clear();
+                }, 600);
+              }).catch(res => {
+                this.modal_loading = false;
+                this.$message({
+                  message:res.msg,
+                  type: 'error'
+                });
+              });
+            }, 1200);
+          } else {
+            return false
+          }
+        })
+      },
+      clear () {
+        this.$refs['formData'].resetFields();
+        this.formData.ruleValue = [];
+        this.isBtn = false;
+        this.attrsName = '';
+        this.attrsVal = '';
+      },
+      // 取消
+      offAttrName () {
+        this.isBtn = false;
+      },
+      // 删除
+      handleRemove (index) {
+        this.formData.ruleValue.splice(index, 1);
+      },
+      // 删除属性
+      handleRemove2 (item, index) {
+        item.splice(index, 1);
+      },
+      // 添加规则名称
+      createAttrName () {
+        if (this.attrsName && this.attrsVal) {
+          let data = {
+            value: this.attrsName,
+            detail: [
+              this.attrsVal
+            ]
+          };
+          this.formData.ruleValue.push(data);
+          var hash = {};
+          this.formData.ruleValue = this.formData.ruleValue.reduce(function (item, next) {
+            /* eslint-disable */
+            hash[next.value] ? '' : hash[next.value] = true && item.push(next);
+            return item
+          }, [])
+          this.attrsName = '';
+          this.attrsVal = '';
+          this.isBtn = false;
+        } else {
+          return this.$message.warning('请添加规格名称！');
+        }
+      },
+      // 添加属性
+      createAttr (num, idx) {
+        if (num) {
+          this.formData.ruleValue[idx].detail.push(num);
+          var hash = {};
+          this.formData.ruleValue[idx].detail = this.formData.ruleValue[idx].detail.reduce(function (item, next) {
+            hash[next] ? '' : hash[next] = true && item.push(next);
+            return item
+          }, [])
+        } else {
+          return this.$message.warning('请添加属性！');
+        }
+      }
+
+
+    }
+  }
+
+
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/bxg/shop/storeProductRule/index.vue b/src/views/bxg/shop/storeProductRule/index.vue
new file mode 100644
index 0000000..b92b0b4
--- /dev/null
+++ b/src/views/bxg/shop/storeProductRule/index.vue
@@ -0,0 +1,134 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <crudOperation :permission="permission" />
+      <add />
+      <el-table ref="table"  id="tablee" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;height:calc(100vh - 250px);overflow-y: scroll;" @selection-change="crud.selectionChangeHandler">
+        <el-table-column type="selection" width="55" align="center"  />
+        <el-table-column v-if="columns.visible('id')" prop="id" label="id" align="center" />
+        <el-table-column v-if="columns.visible('ruleName')" prop="ruleName" label="规格名称" align="center" />
+        <el-table-column v-if="columns.visible('ruleValue')" prop="ruleValue" label="规格值" align="center" >
+          <template slot-scope="scope">
+            <div v-for="(item, index) in scope.row.ruleValue">
+              {{ item.value }} : {{ item.detail.join(',')}}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column v-if="columns.visible('createTime')" prop="createTime" label="创建时间" align="center">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.createTime) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column v-permission="['admin','yxStoreProductRule:edit','yxStoreProductRule:del']" label="操作" width="150px" align="center" >
+          <template slot-scope="scope">
+            <udOperation
+              :data="scope.row"
+              :permission="permission"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+      <!--分页组件-->
+      <el-footer style="height:60px;width:100%;background-color:#f6f6f6">
+        <div style="float:left">
+           <el-select v-model="batchExport" @change="handleExportOption" clearable placeholder="导出数据" class="filter-item" style="width: 130px;margin-left:15px;margin-top:15px">
+          <el-option
+            v-for="item in exportOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+        </div>
+        <pagination style="float:right;margin-top:15px" />
+      </el-footer>
+    </div>
+  </div>
+</template>
+
+<script>
+import crudYxStoreProductRule from '@/api/storeProductRule'
+import CRUD, { presenter, header, form, crud } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+import pagination from '@crud/Pagination'
+import MaterialList from "@/components/material"
+import add from './form'
+import FileSaver from 'file-saver'
+import XLSX from "xlsx";
+
+// crud交由presenter持有
+const defaultCrud = CRUD({ title: 'sku规则', url: 'api/yxStoreProductRule', sort: 'id,desc', crudMethod: { ...crudYxStoreProductRule }})
+const defaultForm = { id: null, ruleName: null, ruleValue: null, createTime: null, updateTime: null, isDel: null }
+export default {
+  name: 'YxStoreProductRule',
+  components: { pagination, crudOperation, rrOperation, udOperation ,MaterialList,add},
+  mixins: [presenter(defaultCrud), header(), form(defaultForm), crud()],
+  data() {
+    return {
+      batchExport:'',
+      exportOptions: [
+          
+          {value: '0', label: '导出本页数据'},
+          
+        ],
+        permission: {
+          add: ['admin', 'yxStoreProductRule:add'],
+          edit: ['admin', 'yxStoreProductRule:edit'],
+          del: ['admin', 'yxStoreProductRule:del']
+        }
+      }
+  },
+  watch: {
+  },
+  methods: {
+    handleExportOption(val){
+      var table = XLSX.utils.table_to_book(document.querySelector("#tablee"));
+      var tb = XLSX.write(table, {
+        bookType: "xlsx",
+        bookSST: true,
+        type: "array",
+      });
+      try {
+        FileSaver.saveAs(
+          new Blob([tb], { type: "application/octet-stream" }),
+          "商品规格.xlsx"
+        );
+      } catch (e) {
+        if (typeof console !== "undefined") console.log(e, tb);
+      }
+    },
+    // 获取数据前设置好接口地址
+    [CRUD.HOOK.beforeRefresh]() {
+      return true
+    }, // 新增与编辑前做的操作
+    [CRUD.HOOK.afterToCU](crud, form) {
+    },
+  }
+}
+
+
+
+</script>
+
+<style scoped>
+  .table-img {
+    display: inline-block;
+    text-align: center;
+    background: #ccc;
+    color: #fff;
+    white-space: nowrap;
+    position: relative;
+    overflow: hidden;
+    vertical-align: middle;
+    width: 32px;
+    height: 32px;
+    line-height: 32px;
+  }
+  .app-container{
+  padding-bottom: 0px;
+}
+</style>
diff --git a/src/views/bxg/shop/storestaff/index.vue b/src/views/bxg/shop/storestaff/index.vue
new file mode 100644
index 0000000..7afd706
--- /dev/null
+++ b/src/views/bxg/shop/storestaff/index.vue
@@ -0,0 +1,218 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <div v-if="crud.props.searchToggle">
+        <!-- 搜索 -->
+        <el-input v-model="query.value" clearable placeholder="输入搜索内容" style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
+        <el-select v-model="query.type" clearable placeholder="类型" class="filter-item" style="width: 130px">
+          <el-option v-for="item in queryTypeOptions" :key="item.key" :label="item.display_name" :value="item.key" />
+        </el-select>
+        <rrOperation :crud="crud" />
+      </div>
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <crudOperation :permission="permission" />
+      <!--表单组件-->
+      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
+        <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
+          <el-form-item label="商城用户" prop="uid">
+            <cuser v-model="form.user"></cuser>
+          </el-form-item>
+          <el-form-item label="所属门店" prop="storeId">
+            <el-select v-model="form.storeId" style="width: 178px" placeholder="请先选择门店">
+              <el-option
+                v-for="(item, index) in mystores"
+                :key="item.name + index"
+                :label="item.name"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="店员名称" prop="staffName">
+            <el-input v-model="form.staffName" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="手机号码" prop="phone">
+            <el-input v-model="form.phone" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="核销开关" prop="verifyStatus">
+            <el-radio-group v-model="form.verifyStatus" style="width: 178px">
+              <el-radio :label="1">开启</el-radio>
+              <el-radio :label="0">关闭</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="text" @click="crud.cancelCU">取消</el-button>
+          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+        </div>
+      </el-dialog>
+      <!--表格渲染-->
+      <el-table id="tablee" ref="table" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;height:calc(100vh - 290px);overflow-y: scroll;" @selection-change="crud.selectionChangeHandler">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column v-if="columns.visible('id')" prop="id" label="id" width="55" align="center" />
+        <el-table-column v-if="columns.visible('nickname')" prop="nickname" label="微信昵称"  align="center"/>
+        <el-table-column v-if="columns.visible('avatar')" prop="avatar" label="店员头像"  align="center">
+          <template slot-scope="scope">
+            <a :href="scope.row.avatar" style="color: #42b983" target="_blank"><img :src="scope.row.avatar" alt="点击打开" class="el-avatar"></a>
+          </template>
+        </el-table-column>
+        <el-table-column v-if="columns.visible('staffName')" prop="staffName" label="店员名称"  align="center"/>
+        <el-table-column v-if="columns.visible('storeName')" prop="storeName" label="所属门店" align="center" />
+        <el-table-column v-if="columns.visible('verifyStatus')" prop="verifyStatus" label="核销开关" align="center" >
+          <template slot-scope="scope">
+            <div>
+              <el-tag v-if="scope.row.verifyStatus === 1" :type="''">开启</el-tag>
+              <el-tag v-else :type=" 'info' ">关闭</el-tag>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column v-if="columns.visible('createTime')" prop="createTime" label="添加时间"  align="center">
+          <template slot-scope="scope">
+            <span>{{ formatTimeTwo(scope.row.createTime) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column v-permission="['admin','yxSystemStoreStaff:edit','yxSystemStoreStaff:del']" label="操作" width="150px" align="center">
+          <template slot-scope="scope">
+            <udOperation
+              :data="scope.row"
+              :permission="permission"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+      <!--分页组件-->
+      <el-footer style="height:60px;width:100%;background-color:#f6f6f6">
+        <div style="float:left">
+           <el-select v-model="batchExport" @change="handleExportOption" clearable placeholder="导出数据" class="filter-item" style="width: 130px;margin-left:15px;margin-top:15px">
+          <el-option
+            v-for="item in exportOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+        </div>
+        <pagination style="float:right;margin-top:15px" />
+      </el-footer>
+    </div>
+  </div>
+</template>
+
+<script>
+import crudYxSystemStoreStaff from '@/api/yxSystemStoreStaff'
+import CRUD, { presenter, header, form, crud } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+import pagination from '@crud/Pagination'
+import cuser from '@/views/components/user'
+import crudYxSystemStore from '@/api/yxSystemStore'
+import { formatTimeTwo } from '@/utils/index'
+import FileSaver from "file-saver";
+import XLSX from "xlsx";
+// crud交由presenter持有
+const defaultCrud = CRUD({ title: '门店店员', url: 'api/yxSystemStoreStaff', sort: 'id,desc', crudMethod: { ...crudYxSystemStoreStaff }})
+const defaultForm = { user: {uid: null,nickname: null,avatar: null}, id: null, uid: null, avatar: null, storeId: null, staffName: null, phone: null, verifyStatus: 1, status: null, addTime: null, nickname: null, storeName: null }
+export default {
+  name: 'YxSystemStoreStaff',
+  components: { pagination, crudOperation, rrOperation, udOperation, cuser },
+  mixins: [presenter(defaultCrud), header(), form(defaultForm), crud()],
+  data() {
+    return {
+      batchExport:'',
+      exportOptions: [
+          
+          {value: '0', label: '导出本页数据'},
+          
+        ],
+      mystores: [],
+      permission: {
+        add: ['admin', 'yxSystemStoreStaff:add'],
+        edit: ['admin', 'yxSystemStoreStaff:edit'],
+        del: ['admin', 'yxSystemStoreStaff:del']
+      },
+      rules: {
+        // uid: [
+        //   { required: true, message: '微信用户id不能为空', trigger: 'blur' }
+        // ],
+        // avatar: [
+        //   { required: true, message: '店员头像不能为空', trigger: 'blur' }
+        // ],
+        // storeId: [
+        //   { required: true, message: '门店id不能为空', trigger: 'blur' }
+        // ],
+        // staffName: [
+        //   { required: true, message: '店员名称不能为空', trigger: 'blur' }
+        // ],
+        // phone: [
+        //   { required: true, message: '手机号码不能为空', trigger: 'blur' }
+        // ],
+        // verifyStatus: [
+        //   { required: true, message: '核销开关不能为空', trigger: 'blur' }
+        // ],
+        // nickname: [
+        //   { required: true, message: '微信昵称不能为空', trigger: 'blur' }
+        // ]
+      },
+      queryTypeOptions: [
+        { key: 'staffName', display_name: '店员名称' },
+        { key: 'nickname', display_name: '微信昵称' }
+      ]
+    }
+  },
+  methods: {
+    handleExportOption(val){
+      var table = XLSX.utils.table_to_book(document.querySelector("#tablee"));
+      var tb = XLSX.write(table, {
+        bookType: "xlsx",
+        bookSST: true,
+        type: "array",
+      });
+      try {
+        FileSaver.saveAs(
+          new Blob([tb], { type: "application/octet-stream" }),
+          "店员列表.xlsx"
+        );
+      } catch (e) {
+        if (typeof console !== "undefined") console.log(e, tb);
+      }
+    },
+    formatTimeTwo,
+    // 获取数据前设置好接口地址
+    [CRUD.HOOK.beforeRefresh]() {
+      const query = this.query
+      console.log('query:'+query.value)
+      if (query.type && query.value) {
+        this.crud.params[query.type] = query.value
+      }else{
+        delete this.crud.params.staffName
+        delete this.crud.params.nickname
+      }
+      return true
+    },
+    //新增与编辑前做的操作
+    [CRUD.HOOK.afterToCU](crud, form) {
+      crudYxSystemStore.get().then(res => {
+         this.mystores= res.content
+      })
+    },
+    // 编辑前
+    [CRUD.HOOK.beforeToEdit](crud, form) {
+      this.form.user.uid = form.uid
+      this.form.user.nickname = form.nickname
+      this.form.user.avatar = form.avatar
+    },
+    [CRUD.HOOK.beforeSubmit]() {
+      this.form.uid = this.form.user.uid
+      this.form.nickname = this.form.user.nickname
+      this.form.avatar = this.form.user.avatar
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .app-container{
+  padding-bottom: 0px;
+}
+</style>
diff --git a/src/views/bxg/shop/user/aindex.vue b/src/views/bxg/shop/user/aindex.vue
new file mode 100644
index 0000000..a01a2a1
--- /dev/null
+++ b/src/views/bxg/shop/user/aindex.vue
@@ -0,0 +1,204 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <!-- 搜索 -->
+      <el-input v-model="query.value" clearable placeholder="输入搜索内容" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
+      <el-select v-model="query.type" clearable placeholder="类型" class="filter-item" style="width: 130px">
+        <el-option v-for="item in queryTypeOptions" :key="item.key" :label="item.display_name" :value="item.key" />
+      </el-select>
+      <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
+      <!-- 新增 -->
+      <el-button
+        type="danger"
+        class="filter-item"
+        size="mini"
+        icon="el-icon-refresh"
+        @click="toQuery"
+      >刷新</el-button>
+    </div>
+    <!--表单组件-->
+    <eForm ref="form" :is-add="isAdd" />
+    <!--表格渲染-->
+    <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
+      <el-table-column prop="uid" label="用户id" />
+      <el-table-column prop="nickname" label="用户昵称" />
+      <el-table-column ref="table" prop="avatar" label="用户头像">
+        <template slot-scope="scope">
+          <a :href="scope.row.avatar" style="color: #42b983" target="_blank"><img :src="scope.row.avatar" alt="点击打开" class="el-avatar"></a>
+        </template>
+      </el-table-column>
+      <el-table-column prop="phone" label="手机号码" />
+      <el-table-column prop="nowMoney" label="用户余额" />
+      <el-table-column prop="brokeragePrice" label="佣金金额" />
+      <el-table-column :show-overflow-tooltip="true" prop="addTime" label="创建日期">
+        <template slot-scope="scope">
+          <span>{{ formatTime(scope.row.addTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="状态" align="center">
+        <template slot-scope="scope">
+          <div @click="onStatus(scope.row.uid,scope.row.status)">
+            <el-tag v-if="scope.row.status == 1" style="cursor: pointer" :type="''">正常</el-tag>
+            <el-tag v-else style="cursor: pointer" :type=" 'info' ">禁用</el-tag>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="spreadCount" label="直推人数" />
+      <el-table-column prop="payCount" label="购买次数" />
+      <!---->
+      <!--<el-table-column v-if="checkPermission(['admin','YXUSER_ALL','YXUSER_EDIT','YXUSER_DELETE'])" label="操作" width="150px" align="center">-->
+      <!--<template slot-scope="scope">-->
+      <!--<el-button v-permission="['admin','YXUSER_ALL','YXUSER_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)"/>-->
+      <!--<el-popover-->
+      <!--v-permission="['admin','YXUSER_ALL','YXUSER_DELETE']"-->
+      <!--:ref="scope.row.uid"-->
+      <!--placement="top"-->
+      <!--width="180">-->
+      <!--<p>确定删除本条数据吗？</p>-->
+      <!--<div style="text-align: right; margin: 0">-->
+      <!--<el-button size="mini" type="text" @click="$refs[scope.row.uid].doClose()">取消</el-button>-->
+      <!--<el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.uid)">确定</el-button>-->
+      <!--</div>-->
+      <!--<el-button slot="reference" type="danger" icon="el-icon-delete" size="mini"/>-->
+      <!--</el-popover>-->
+      <!--</template>-->
+      <!--</el-table-column>-->
+      <!---->
+    </el-table>
+    <!--分页组件-->
+    <el-pagination
+      :total="total"
+      :current-page="page + 1"
+      style="margin-top: 8px;"
+      layout="total, prev, pager, next, sizes"
+      @size-change="sizeChange"
+      @current-change="pageChange"
+    />
+  </div>
+</template>
+
+<script>
+import checkPermission from '@/utils/permission'
+import initData from '@/mixins/crud'
+import { del, onStatus } from '@/api/yxUser'
+import eForm from './form'
+import { formatTime } from '@/utils/index'
+export default {
+  components: { eForm },
+  mixins: [initData],
+  data() {
+    return {
+      delLoading: false,
+      queryTypeOptions: [
+        { key: 'nickname', display_name: '用户昵称' },
+        { key: 'phone', display_name: '手机号码' }
+      ]
+    }
+  },
+  created() {
+    this.$nextTick(() => {
+      this.init()
+    })
+  },
+  methods: {
+    formatTime,
+    checkPermission,
+    onStatus(id, status) {
+      this.$confirm(`确定进行[${status ? '禁用' : '开启'}]操作?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          onStatus(id, { status: status }).then(({ data }) => {
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1000,
+              onClose: () => {
+                this.init()
+              }
+            })
+          })
+        })
+        .catch(() => { })
+    },
+    beforeInit() {
+      this.url = 'api/yxUser'
+      const sort = 'uid,desc'
+      this.params = { page: this.page, size: this.size, sort: sort, isPromoter: 1 }
+      const query = this.query
+      const type = query.type
+      const value = query.value
+      if (type && value) { this.params[type] = value }
+      return true
+    },
+    subDelete(uid) {
+      this.delLoading = true
+      del(uid).then(res => {
+        this.delLoading = false
+        this.$refs[uid].doClose()
+        this.dleChangePage()
+        this.init()
+        this.$notify({
+          title: '删除成功',
+          type: 'success',
+          duration: 2500
+        })
+      }).catch(err => {
+        this.delLoading = false
+        this.$refs[uid].doClose()
+        console.log(err.response.data.message)
+      })
+    },
+    add() {
+      this.isAdd = true
+      this.$refs.form.dialog = true
+    },
+    edit(data) {
+      this.isAdd = false
+      const _this = this.$refs.form
+      _this.form = {
+        uid: data.uid,
+        account: data.account,
+        pwd: data.pwd,
+        realName: data.realName,
+        birthday: data.birthday,
+        cardId: data.cardId,
+        mark: data.mark,
+        partnerId: data.partnerId,
+        groupId: data.groupId,
+        nickname: data.nickname,
+        avatar: data.avatar,
+        phone: data.phone,
+        addTime: data.addTime,
+        addIp: data.addIp,
+        lastTime: data.lastTime,
+        lastIp: data.lastIp,
+        nowMoney: data.nowMoney,
+        brokeragePrice: data.brokeragePrice,
+        integral: data.integral,
+        signNum: data.signNum,
+        status: data.status,
+        level: data.level,
+        spreadUid: data.spreadUid,
+        spreadTime: data.spreadTime,
+        userType: data.userType,
+        isPromoter: data.isPromoter,
+        payCount: data.payCount,
+        spreadCount: data.spreadCount,
+        cleanTime: data.cleanTime,
+        addres: data.addres,
+        adminid: data.adminid,
+        loginType: data.loginType
+      }
+      _this.dialog = true
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/bxg/shop/user/bill.vue b/src/views/bxg/shop/user/bill.vue
new file mode 100644
index 0000000..f944194
--- /dev/null
+++ b/src/views/bxg/shop/user/bill.vue
@@ -0,0 +1,213 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <!-- 搜索 -->
+      <el-input v-model="nickname" clearable placeholder="输入用户昵称" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
+      <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
+      <!-- 新增 -->
+      <el-button
+        type="danger"
+        class="filter-item"
+        size="mini"
+        icon="el-icon-refresh"
+        @click="toQuery"
+      >刷新</el-button>
+
+
+    </div>
+    <!--表单组件-->
+    <eForm ref="form" :is-add="isAdd" />
+    <pForm ref="formp" :is-add="isAdd" />
+    <!--表格渲染-->
+    <el-table v-loading="loading" :data="data" size="small" style="width: 100%;height:calc(100vh - 250px);overflow-y: scroll;">
+      <el-table-column prop="nickname" label="用户昵称" align="center" />
+      <el-table-column prop="title" label="账单标题" align="center" />
+      <el-table-column prop="category" label="明细种类" align="center">
+        <template slot-scope="scope">
+          <span v-if="scope.row.category == 'now_money'">余额</span>
+          <span v-else-if="scope.row.category == 'integral'">积分</span>
+          <span v-else-if="scope.row.category == 'commission'">佣金</span>
+          <span v-else>未知</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="number" label="明细数字" align="center">
+        <template slot-scope="scope">
+          <span v-if="scope.row.pm == 1">+</span>
+          <span v-else>-</span>
+          <span>{{ scope.row.number }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column :show-overflow-tooltip="true" prop="addTime" label="创建日期" align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.row.createTime }}</span>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--分页组件-->
+   <el-footer style="height:60px;width:100%;background-color:#f6f6f6">
+     <div style="float:left"></div>
+      <el-pagination
+      :total="total"
+      :current-page="page + 1"
+      style="margin-top: 15px;float:right"
+      layout="total, prev, pager, next, sizes"
+      @size-change="sizeChange"
+      @current-change="pageChange"
+    />
+   </el-footer>
+  </div>
+</template>
+
+<script>
+import checkPermission from '@/utils/permission'
+import initData from '@/mixins/crud'
+import { del, onStatus } from '@/api/yxUser'
+import eForm from './form'
+import pForm from './formp'
+import { formatTime } from '@/utils/index'
+export default {
+  components: { eForm, pForm },
+  mixins: [initData],
+  data() {
+    return {
+      delLoading: false, nickname: '', category: '', type: '',
+      queryTypeOptions: [
+        { key: 'nickname', display_name: '用户昵称' },
+        { key: 'phone', display_name: '手机号码' }
+      ],
+      categoryOptions: [
+        { value: 'now_money', label: '余额' },
+        { value: 'integral', label: '积分' }
+      ],
+      typeOptions: [
+        { value: 'brokerage', label: '佣金' },
+        { value: 'sign', label: '签到' }
+      ]
+    }
+  },
+  created() {
+    this.$nextTick(() => {
+      this.init()
+    })
+  },
+  methods: {
+    formatTime,
+    checkPermission,
+    onStatus(id, status) {
+      this.$confirm(`确定进行[${status ? '禁用' : '开启'}]操作?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          onStatus(id, { status: status }).then(({ data }) => {
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1000,
+              onClose: () => {
+                this.init()
+              }
+            })
+          })
+        })
+        .catch(() => { })
+    },
+    beforeInit() {
+      this.url = 'api/yxUserBill'
+      const sort = 'id,desc'
+      this.params = {
+        page: this.page,
+        size: this.size,
+        nickname: this.nickname,
+        category: 'now_money',
+        type: ''
+      }
+      const query = this.query
+      const type = query.type
+      const value = query.value
+      if (type && value) { this.params[type] = value }
+      return true
+    },
+    subDelete(uid) {
+      this.delLoading = true
+      del(uid).then(res => {
+        this.delLoading = false
+        this.$refs[uid].doClose()
+        this.dleChangePage()
+        this.init()
+        this.$notify({
+          title: '删除成功',
+          type: 'success',
+          duration: 2500
+        })
+      }).catch(err => {
+        this.delLoading = false
+        this.$refs[uid].doClose()
+        console.log(err.response.data.message)
+      })
+    },
+    add() {
+      this.isAdd = true
+      this.$refs.form.dialog = true
+    },
+    edit(data) {
+      this.isAdd = false
+      const _this = this.$refs.form
+      _this.form = {
+        uid: data.uid,
+        account: data.account,
+        pwd: data.pwd,
+        realName: data.realName,
+        birthday: data.birthday,
+        cardId: data.cardId,
+        mark: data.mark,
+        partnerId: data.partnerId,
+        groupId: data.groupId,
+        nickname: data.nickname,
+        avatar: data.avatar,
+        phone: data.phone,
+        addTime: data.addTime,
+        addIp: data.addIp,
+        lastTime: data.lastTime,
+        lastIp: data.lastIp,
+        nowMoney: data.nowMoney,
+        brokeragePrice: data.brokeragePrice,
+        integral: data.integral,
+        signNum: data.signNum,
+        status: data.status,
+        level: data.level,
+        spreadUid: data.spreadUid,
+        spreadTime: data.spreadTime,
+        userType: data.userType,
+        isPromoter: data.isPromoter,
+        payCount: data.payCount,
+        spreadCount: data.spreadCount,
+        cleanTime: data.cleanTime,
+        addres: data.addres,
+        adminid: data.adminid,
+        loginType: data.loginType
+      }
+      _this.dialog = true
+    },
+    editP(data) {
+      this.isAdd = false
+      const _this = this.$refs.formp
+      _this.form = {
+        uid: data.uid,
+        nickname: data.nickname,
+        ptype: 1,
+        money: 0
+      }
+      _this.dialog = true
+    }
+  }
+}
+</script>
+
+<style scoped>
+.app-container{
+  padding-bottom: 0px;
+}
+</style>
diff --git a/src/views/bxg/shop/user/brobill.vue b/src/views/bxg/shop/user/brobill.vue
new file mode 100644
index 0000000..f8d68b3
--- /dev/null
+++ b/src/views/bxg/shop/user/brobill.vue
@@ -0,0 +1,383 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <!-- 搜索 -->
+      <el-input v-model="nickname" clearable placeholder="输入用户昵称" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
+       <!-- <el-date-picker
+      v-model="value1"
+      type="daterange"
+      :default-time="['00:00:00', '23:59:59']"
+      range-separator=":"
+      value-format="yyyy-MM-dd HH:mm:ss"
+      start-placeholder="开始日期"
+      end-placeholder="结束日期">
+    </el-date-picker> -->
+    <el-date-picker
+      v-model="value1"
+      type="datetime"
+      value-format="yyyy-MM-dd HH:mm:ss"
+      placeholder="开始时间">
+    </el-date-picker>
+    <span>至</span>
+    <el-date-picker
+      v-model="value2"
+      type="datetime"
+      value-format="yyyy-MM-dd HH:mm:ss"
+      placeholder="结束时间">
+    </el-date-picker>
+      <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
+      <!-- 新增 -->
+      <el-button
+        type="danger"
+        class="filter-item"
+        size="mini"
+        icon="el-icon-refresh"
+        @click="toQuerys"
+      >刷新</el-button>
+
+
+    </div>
+    <!--表单组件-->
+    <eForm ref="form" :is-add="isAdd" />
+    <pForm ref="formp" :is-add="isAdd" />
+    <!--表格渲染-->
+    <el-table v-loading="loading" :data="data" size="small" style="width: 100%;height:calc(100vh - 245px);overflow-y: scroll;" @selection-change="handleSelectionChange" >
+      <el-table-column  type="selection" width="50" align="center" />
+      <el-table-column prop="nickname" label="用户昵称" align='center'  />
+      <el-table-column prop="uid" label="用户ID"  align='center'/>
+      <el-table-column prop="title" label="账单标题" align='center' width="150"/>
+       <el-table-column label="订单号" align='center' width="200">
+      <template slot-scope="scope">
+        <el-button
+          
+          @click="handleEdit(scope.$index, scope.row)">{{scope.row.linkId}}</el-button>
+        
+      </template>
+    </el-table-column>
+    <el-table-column prop="mark" label="备注" align='center' width="650" />
+      <el-table-column prop="category" label="明细种类" align='center'>
+        <template slot-scope="scope">
+          <span v-if="scope.row.category == 'now_money'">余额</span>
+          <span v-else-if="scope.row.category == 'integral'">积分</span>
+          <span v-else-if="scope.row.category == 'commission'">佣金</span>
+          <span v-else>未知</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="number" label="明细数字" align='center'>
+        <template slot-scope="scope">
+          <span v-if="scope.row.pm == 1">+</span>
+          <span v-else>-</span>
+          <span>{{ scope.row.number }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="balance" label="余额"  align='center'/>
+      <el-table-column :show-overflow-tooltip="true" prop="addTime" label="创建日期" align='center' width="150">
+        <template slot-scope="scope">
+          <span>{{ scope.row.createTime }}</span>
+        </template>
+      </el-table-column>
+      
+    </el-table>
+    <!--分页组件-->
+    <el-footer style="height:60px;width:100%;background-color:#f6f6f6">
+      <div style="float:left">
+        <el-select v-model="batchExport" @change="handleExportOption" clearable placeholder="批量导出" class="filter-item" style="width: 130px;margin-left:15px;margin-top:15px">
+          <el-option
+            v-for="item in exportOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </div>
+       <el-pagination
+      :total="total"
+      :current-page="page + 1"
+      style="margin-top: 15px; float:right"
+      layout="total, prev, pager, next, sizes"
+      @size-change="sizeChange"
+      @current-change="pageChange"
+    />
+    </el-footer>
+  </div>
+</template>
+
+<script>
+import checkPermission from '@/utils/permission'
+import initData from '@/mixins/crud'
+import { del, onStatus } from '@/api/yxUser'
+import {add,gett} from'@/api/yxUserBill'
+import eForm from './form'
+import pForm from './formp'
+import { formatTime } from '@/utils/index'
+import $axios from 'axios'
+// import $axios from 'axios'
+export default {
+  components: { eForm, pForm },
+  mixins: [initData],
+  inject:['reload'],
+  data() {
+    return {
+      value1:'',
+      value2:'',
+      batchExport:'',
+      exportOptions: [
+          {value: '', label: '批量导出'},
+          {value: '0', label: '导出全部'},
+          {value: '1', label: '导出选中'},
+        ],
+        checkList:[],
+        checkdd:[],
+      delLoading: false, nickname: '', category: '', type: '',
+      queryTypeOptions: [
+        { key: 'nickname', display_name: '用户昵称' },
+        { key: 'phone', display_name: '手机号码' }
+      ],
+      categoryOptions: [
+        { value: 'now_money', label: '余额' },
+        { value: 'integral', label: '积分' }
+      ],
+      typeOptions: [
+        { value: 'brokerage', label: '佣金' },
+        { value: 'sign', label: '签到' }
+      ],
+      linkId:'',
+      params:{
+        page:'',
+        size:'',
+        nickname:'',
+        linkId:'',
+        category: 'now_money',
+          type: 'brokerage'
+      }
+    }
+  },
+  created() {
+    this.$nextTick(() => {
+      this.init()
+    })
+  },
+  methods: {
+   
+    handleSelectionChange(val){
+       this.checkdd = val
+    },
+    handleExportOption(val){
+      console.log(this.checkdd)
+     
+      this.checkdd.forEach(item => {
+        console.log(item)
+        this.checkList.push(item.linkId)
+      });
+      console.log(this.checkList)
+      if(val ==0){
+        this.page = 0;
+      this.size = 10000;
+      
+      this.listContent = '';
+      console.log(this.listContent)
+      this.beforeInit()
+      this.downloadMethod();
+      this.reload();
+      }else if(val == 1){
+       this.page = 0;
+      this.size = 10000;
+      
+      this.listContent = JSON.stringify(this.checkList);
+      console.log(this.listContent)
+      this.beforeInit()
+      this.downloadMethod();
+      this.reload();
+      }
+    },
+    toQuerys(){
+      this.reload()
+    },
+     handleEdit(index, row) {
+      //  console.log('ujiooi')
+       let inde = row.linkId
+      //  console.log(inde)
+       this.linkId = row.linkId
+       this.init()
+      // //  console.log(this.linkId)
+      //  this.beforeInit()
+       
+       
+        // console.log( this.page);
+        // console.log(this.size)
+        // console.log(this.nickname)
+    //     let plam ={
+    //       page: this.page,
+    //     size: this.size,
+    //     nickname: this.nickname,
+    //     category: 'now_money',
+    //     type: 'brokerage',
+    //     linkId:inde,
+    //     }
+
+    // $axios({
+    //   method:'get',
+    //   url:'api/yxUserBill',
+    //   data:plam
+    // }).then(res=>{
+    //   console.log(res)
+    // })
+
+        // $axios.get('api/yxUserBill',{
+        //   params:{  
+        // page: this.page,
+        // size: this.size,
+        // nickname: this.nickname,
+        // category: 'now_money',
+        // type: 'brokerage',
+        // linkId:inde,
+        //   }
+        // }).then(res=>{
+        //   console.log(res)
+        // })
+
+      //    let plames = {
+      //   page: this.page,
+      //   size: this.size,
+      //   nickname: this.nickname,
+      //   category: 'now_money',
+      //   type: 'brokerage',
+      //   linkId:row.linkId,
+      // }
+      //  console.log(plames)
+       
+        
+      //   gett(plames).then(res=>{
+      //     console.log('456456')
+      //   })
+       
+        
+      },
+    formatTime,
+    checkPermission,
+    onStatus(id, status) {
+      this.$confirm(`确定进行[${status ? '禁用' : '开启'}]操作?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          onStatus(id, { status: status }).then(({ data }) => {
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1000,
+              onClose: () => {
+                this.init()
+              }
+            })
+          })
+        })
+        .catch(() => { })
+    },
+    beforeInit() {
+      console.log(this.value1,'显示数据')
+      this.url = 'api/yxUserBill'
+      const sort = 'id,desc'
+      this.params = {
+        page: this.page,
+        size: this.size,
+        nickname: this.nickname,
+        createTime:this.value1,
+        endTime:this.value2,
+        // shijian:'',
+        // category: 'now_money',
+        // type: 'brokerage',
+        sort: sort,
+        linkId:this.linkId,
+        listContent: this.listContent,
+        uid:0
+      }
+      const query = this.query
+      const type = query.type
+      const value = query.value
+      if (type && value) { this.params[type] = value }
+      return true
+    },
+    subDelete(uid) {
+      this.delLoading = true
+      del(uid).then(res => {
+        this.delLoading = false
+        this.$refs[uid].doClose()
+        this.dleChangePage()
+        this.init()
+        this.$notify({
+          title: '删除成功',
+          type: 'success',
+          duration: 2500
+        })
+      }).catch(err => {
+        this.delLoading = false
+        this.$refs[uid].doClose()
+        console.log(err.response.data.message)
+      })
+    },
+    add() {
+      this.isAdd = true
+      this.$refs.form.dialog = true
+    },
+    edit(data) {
+      this.isAdd = false
+      const _this = this.$refs.form
+      _this.form = {
+        uid: data.uid,
+        account: data.account,
+        pwd: data.pwd,
+        realName: data.realName,
+        birthday: data.birthday,
+        cardId: data.cardId,
+        mark: data.mark,
+        partnerId: data.partnerId,
+        groupId: data.groupId,
+        nickname: data.nickname,
+        avatar: data.avatar,
+        phone: data.phone,
+        addTime: data.addTime,
+        addIp: data.addIp,
+        lastTime: data.lastTime,
+        lastIp: data.lastIp,
+        nowMoney: data.nowMoney,
+        brokeragePrice: data.brokeragePrice,
+        integral: data.integral,
+        signNum: data.signNum,
+        status: data.status,
+        level: data.level,
+        spreadUid: data.spreadUid,
+        spreadTime: data.spreadTime,
+        userType: data.userType,
+        isPromoter: data.isPromoter,
+        payCount: data.payCount,
+        spreadCount: data.spreadCount,
+        cleanTime: data.cleanTime,
+        addres: data.addres,
+        adminid: data.adminid,
+        loginType: data.loginType
+      }
+      _this.dialog = true
+    },
+    editP(data) {
+      this.isAdd = false
+      const _this = this.$refs.formp
+      _this.form = {
+        uid: data.uid,
+        nickname: data.nickname,
+        ptype: 1,
+        money: 0
+      }
+      _this.dialog = true
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .app-container{
+  padding-bottom: 0px;
+}
+</style>
diff --git a/src/views/bxg/shop/user/detail.vue b/src/views/bxg/shop/user/detail.vue
new file mode 100644
index 0000000..fc4edd6
--- /dev/null
+++ b/src/views/bxg/shop/user/detail.vue
@@ -0,0 +1,195 @@
+<template>
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" title="查看分销下级" width="700px">
+    <el-card>
+      <div slot="header">
+        <span>{{ form.nickname }}的下级</span>
+      </div>
+      <el-tabs type="border-card" @tab-click="handleClick" v-model="activeName">
+        <el-tab-pane :label="uio + io + op" name="first">
+          <el-table
+          class="tabk"
+            :data="tableData"
+            border
+            style="width: 100%">
+            <el-table-column
+              prop="nickname"
+              label="姓名"
+              width="180">
+            </el-table-column>
+            <el-table-column
+              prop="avatar"
+              label="头像">
+              <template slot-scope="scope">
+                <a :href="scope.row.avatar" style="color: #42b983" target="_blank"><img :src="scope.row.avatar" alt="点击打开" class="el-avatar"></a>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="time"
+              label="加入时间"
+              width="180">
+            </el-table-column>
+          </el-table>
+        </el-tab-pane>
+        <el-tab-pane :label="uios + ios + op" name="second">
+          <el-table
+          class="tabl"
+            :data="tableData"
+            border
+            style="width: 100%">
+            <el-table-column
+              prop="nickname"
+              label="姓名"
+              width="180">
+            </el-table-column>
+            <el-table-column
+              prop="avatar"
+              label="头像">
+              <template slot-scope="scope">
+                <a :href="scope.row.avatar" style="color: #42b983" target="_blank"><img :src="scope.row.avatar" alt="点击打开" class="el-avatar"></a>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="time"
+              label="加入时间"
+              width="180">
+            </el-table-column>
+          </el-table>
+        </el-tab-pane>
+      </el-tabs>
+    </el-card>
+  </el-dialog>
+</template>
+
+<script>
+import { add, edit, getSpread } from '@/api/yxUser'
+import { gets } from "@/api/spreadCount"
+import { parseTime } from '@/utils/index'
+import index from "./index";
+export default {
+  props: {
+    // isAdd: {
+    //   type: Boolean,
+    //   required: true
+    // }
+  },
+  data() {
+    return {
+      uio:'一级',
+      uios:'二级',
+      io:'',
+      ios:'',
+      op:'人',
+      loading: false, dialog: false, expressInfo: [],
+      activeName: "first",
+      tableData: [],
+      form: {
+        uid: '',
+        nickname: ''
+      },
+      rules: {
+        unique: [
+          { required: true, message: 'please enter', trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  mounted() {
+   // this.express()
+
+  },
+  
+  methods: {
+   
+    handleClick(tab, event) {
+      
+      this.spread(this.form.uid)
+      // console.log(this.form.uid+'1')
+      
+    },
+    parseTime,
+    cancel() {
+      this.dialog = false
+    },
+    spread(uid) {
+      
+      console.log(uid)
+      let plamm = {
+        uid,
+      }
+      gets(plamm).then(res=>{
+        console.log(res)
+       this.io =  res.first
+       this.ios = res.second
+      })
+      if(this.activeName == 'second') {
+        var grade = 1;
+         let params = {
+        uid,
+        grade
+      }
+
+      getSpread(params).then(res=>{
+        // var suns = 0
+        // for(var j =0;j<=res.length;j++){
+        //   if(j>suns){
+        //     suns = suns+1
+        //   }
+        // }
+        // console.log(suns)
+        // this.io = ''
+        // this.ios = suns
+        // console.log(res)
+        this.tableData = res
+
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+      }
+      if(this.activeName == 'first') {
+        var grade = 0;
+        let params ={
+        uid,
+        grade
+      }
+
+      getSpread(params).then(res=>{
+
+        // console.log(res)
+        // var sun =0
+        // for(var i =0 ;i<=res.length;i++){
+        //   if(i>sun){
+        //     sun=sun+1
+        //   }
+        // }
+        // console.log(sun)
+        // this.ios = ''
+        // this.io = sun
+        this.tableData = res
+
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+      }
+     
+
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .text {
+    font-size: 12px;
+  }
+
+  .item {
+    padding: 6px 0;
+  }
+  .tabk ,.tabl{
+    height: 385px;
+    overflow-y: scroll;
+  }
+
+</style>
diff --git a/src/views/bxg/shop/user/form.vue b/src/views/bxg/shop/user/form.vue
new file mode 100644
index 0000000..7663b77
--- /dev/null
+++ b/src/views/bxg/shop/user/form.vue
@@ -0,0 +1,1258 @@
+<template>
+  <el-dialog
+    :append-to-body="true"
+    :close-on-click-modal="false"
+    :before-close="cancel"
+    :visible.sync="dialog"
+    :title="isAdd ? '新增' : '用户详情'"
+    width="85vw"
+    style="margin-top: -11vh; font-weight: 700"
+  >
+    <el-form
+      ref="form"
+      :model="form"
+      :rules="rules"
+      size="small"
+      label-width="110px"
+    >
+      <el-form-item label="用户昵称" style="float: left; width: 30%">
+        <el-input
+          v-model="form.nickname"
+          :disabled="true"
+          style="width: 80%; z-index: 99999"
+        />
+      </el-form-item>
+      <el-form-item label="真实姓名" style="float: left; width: 30%">
+        <el-input v-model="form.realName" style="width: 80%; z-index: 99999" />
+      </el-form-item>
+      <el-form-item label="用户备注" style="float: left; width: 30%">
+        <el-input v-model="form.mark" style="width: 80%; z-index: 99999" />
+      </el-form-item>
+      <el-form-item label="手机号码" style="float: left; width: 30%">
+        <el-input v-model="form.phone" style="width: 80%; z-index: 99999" />
+      </el-form-item>
+      <el-form-item label="用户积分" style="float: left; width: 30%">
+        <el-input
+          v-model="form.integral"
+          :disabled="true"
+          style="width: 80%; z-index: 99999"
+        />
+      </el-form-item>
+      <el-form-item label="推荐人" style="float: left; width: 30%">
+        <el-input v-model="form.spreadUid" style="width: 80%; z-index: 99999" />
+      </el-form-item>
+      <el-form-item label="钱包余额(￥)" style="float: left; width: 30%">
+        <el-input
+          v-model="form.nowMoney"
+          :disabled="true"
+          style="width: 80%; z-index: 99999"
+        />
+      </el-form-item>
+      <el-form-item label="佣金明细(￥)" style="float: left; width: 30%">
+        <el-input
+          v-model="form.brokeragePrice"
+          :disabled="true"
+          style="width: 80%; z-index: 99999"
+        />
+      </el-form-item>
+      <el-form-item label="个人购物额(￥)" style="float: left; width: 30%">
+        <el-input
+          v-model="form.oneselfTotal"
+          :disabled="true"
+          style="width: 80%; z-index: 99999"
+        />
+      </el-form-item>
+      <el-form-item label="商户管理" style="float: left">
+        <el-radio v-model="form.adminid" :label="1">开启</el-radio>
+        <el-radio v-model="form.adminid" :label="0">关闭</el-radio>
+        <!-- <el-radio-group v-model="form.adminid">
+        <el-radio :label="1">开启</el-radio>
+        <el-radio :label="0">关闭</el-radio>
+        </el-radio-group>-->
+      </el-form-item>
+
+      <!-- <el-form-item label="代理" style="float:left;width:300px">
+        <el-radio v-model="form.isPromoter" :label="1" @change="kai">开启</el-radio>
+        <el-radio v-model="form.isPromoter" :label="0" @change="kai">关闭</el-radio>
+      </el-form-item> -->
+      <el-form-item label="代理级别" style="width: 60%; margin-left: 300px">
+        <el-radio v-model="form.promoterLevel" :label="0">会员</el-radio>
+        <el-radio v-model="form.promoterLevel" :label="1">团长</el-radio>
+        <el-radio v-model="form.promoterLevel" :label="2">站长</el-radio>
+      </el-form-item>
+    </el-form>
+
+    <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
+      <el-tab-pane label="个人订单" name="first">
+        <el-tabs v-model="activeN"  tab-position="left" >
+          <el-tab-pane label="线上订单" name="firstse" >
+            <el-table
+              ref="table"
+              border
+              stripe
+              highlight-current-row
+              :data="this.form.drres"
+              style="height: 300px; overflow-y: scroll"
+            >
+              <el-table-column
+                label="订单号"
+                prop="orderId"
+                align="center"
+              ></el-table-column>
+              <el-table-column
+                prop="cartInfoList"
+                width="500"
+                label="商品信息"
+                align="center"
+              >
+                <template slot-scope="scope">
+                  <div
+                    style="height: 62px; margin-left: 120px"
+                    v-for="(item, index) in scope.row.cartInfoList"
+                    v-if="item.cartInfoMap.productInfo.attrInfo"
+                  >
+                    <div
+                      style="
+                        float: left;
+                        height: 30px;
+                        margin-bottom: 5px;
+                        width: 30px;
+                      "
+                    >
+                      <img
+                        style="
+                          width: 30px;
+                          height: 30px;
+                          margin: 0;
+                          cursor: pointer;
+                        "
+                        v-if="item.cartInfoMap.productInfo.attrInfo.image == ''"
+                        :src="item.cartInfoMap.productInfo.image"
+                      />
+                      <img
+                        style="
+                          width: 30px;
+                          height: 30px;
+                          margin: 0;
+                          cursor: pointer;
+                        "
+                        v-if="
+                          item.cartInfoMap.productInfo.attrInfo.image !== ''
+                        "
+                        :src="item.cartInfoMap.productInfo.attrInfo.image"
+                      />
+                    </div>
+                    <div style="float: left; width: 120px; padding-left: 10px">
+                      <span>{{ item.cartInfoMap.productInfo.storeName }}</span>
+
+                      <span
+                        style="display: block; margin-top: -8px; color: #9e9e9e"
+                      >
+                        <span
+                          v-if="
+                            item.cartInfoMap.productInfo.attrInfo.sku !== '默认'
+                          "
+                          >规格：</span
+                        >
+                        <span>{{
+                          item.cartInfoMap.productInfo.attrInfo.sku
+                        }}</span>
+                      </span>
+                    </div>
+
+                    <div style="float: left; width: 100px; padding-left: 10px">
+                      <span
+                        >| &nbsp; &nbsp; ￥{{ item.cartInfoMap.truePrice }}×{{
+                          item.cartInfoMap.cartNum
+                        }}</span
+                      >
+                    </div>
+                  </div>
+                  <div v-else>
+                    <span>
+                      <img
+                        style="
+                          width: 30px;
+                          height: 30px;
+                          margin: 0;
+                          cursor: pointer;
+                        "
+                        :src="item.cartInfoMap.productInfo.image"
+                      />
+                    </span>
+                    <span>{{ item.cartInfoMap.productInfo.storeName }}</span>
+                    <span
+                      >| ￥{{ item.cartInfoMap.truePrice }}×{{
+                        item.cartInfoMap.cartNum
+                      }}</span
+                    >
+                  </div>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="payTypeName"
+                label="支付状态"
+                align="center"
+              />
+              <el-table-column
+                prop="payPrice"
+                label="微信支付"
+                align="center"
+              />
+              <el-table-column
+                prop="yuePrice"
+                label="余额支付"
+                align="center"
+              />
+              <el-table-column
+                prop="statusName"
+                label="订单状态"
+                align="center"
+              >
+                <template slot-scope="scope">
+                  <span v-html="scope.row.statusName"></span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="addTime"
+                width="160"
+                label="创建时间"
+                align="center"
+              >
+                <template slot-scope="scope">
+                  <span>{{ formatTime(scope.row.createTime) }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="操作" align="center">
+                <template slot-scope="scope">
+                  <el-button type="text" @click="toogleExpand(scope.row)"
+                    >更多</el-button
+                  >
+                </template>
+              </el-table-column>
+              <el-table-column type="expand" width="1">
+                <template slot-scope="props">
+                  <el-form
+                    label-position="left"
+                    inline
+                    class="demo-table-expand"
+                    style="width: 100%"
+                  >
+                    <el-form
+                      style="
+                        width: 25%;
+                        float: left;
+                        border-right: 2px solid #585858;
+                        padding-right: 40px;
+                      "
+                    >
+                      <p
+                        style="font-size: 18px; color: black; font-weight: 700"
+                      >
+                        收货信息
+                      </p>
+                      <p>
+                        <span style="font-size: 15px; color: black"
+                          >收件人：</span
+                        >
+                        <span style="font-size: 14px">{{
+                          props.row.realName
+                        }}</span>
+                      </p>
+                      <p>
+                        <span style="font-size: 15px; color: black"
+                          >联系电话：</span
+                        >
+                        <span style="font-size: 14px">{{
+                          props.row.userPhone
+                        }}</span>
+                      </p>
+                      <p>
+                        <span style="font-size: 15px; color: black"
+                          >收货地址：</span
+                        >
+                        <span style="font-size: 14px">{{
+                          props.row.userAddress
+                        }}</span>
+                      </p>
+                    </el-form>
+                    <el-form
+                      style="
+                        width: 50%;
+                        float: left;
+                        border-right: 2px solid #585858;
+                        padding-left: 90px;
+                      "
+                    >
+                      <p
+                        style="font-size: 18px; color: black; font-weight: 700"
+                      >
+                        订单信息
+                      </p>
+                      <div style="height: 35px">
+                        <div style="float: left">
+                          <span style="font-size: 15px; color: black"
+                            >订单编号:</span
+                          >
+                          <span>{{ props.row.orderId }}</span>
+                        </div>
+                        <div style="float: left; margin-left: 100px">
+                          <span style="font-size: 15px; color: black"
+                            >订单状态：</span
+                          >
+                          <span>{{ props.row.statusName }}</span>
+                        </div>
+                        <div style="float: left; margin-left: 100px">
+                          <span style="font-size: 15px; color: black"
+                            >商品总数:</span
+                          >
+                          <span>{{ props.row.totalNum }}</span>
+                        </div>
+                      </div>
+
+                      <div style="height: 35px">
+                        <div style="float: left">
+                          <span style="font-size: 15px; color: black"
+                            >商品总价:</span
+                          >
+                          <span>{{ props.row.totalPrice }}</span>
+                        </div>
+                        <div style="float: left; margin-left: 40px">
+                          <span style="font-size: 15px; color: black"
+                            >支付邮费</span
+                          >
+                          <span>{{ props.row.totalPostage }}</span>
+                        </div>
+                        <div style="float: left; margin-left: 95px">
+                          <span style="font-size: 15px; color: black"
+                            >优惠券金额:</span
+                          >
+                          <span>{{ props.row.couponPrice }}</span>
+                        </div>
+                        <div style="float: left; margin-left: 130px">
+                          <span style="font-size: 15px; color: black"
+                            >实际支付:</span
+                          >
+                          <span>{{ props.row.payPrice }}</span>
+                        </div>
+                      </div>
+                      <div style="height: 35px">
+                        <div style="float: left">
+                          <span style="font-size: 15px; color: black"
+                            >支付方式:</span
+                          >
+                          <span>{{ props.row.payTypeName }}</span>
+                        </div>
+                        <div style="float: left; margin-left: 175px">
+                          <span style="font-size: 15px; color: black"
+                            >支付时间：</span
+                          >
+                          <span>{{ formatTime(props.row.payTime) }}</span>
+                        </div>
+                      </div>
+                    </el-form>
+                    <el-form
+                      style="width: 25%; float: left; padding-left: 40px"
+                    >
+                      <p
+                        style="font-size: 18px; color: black; font-weight: 700"
+                      >
+                        物流信息
+                      </p>
+                      <div>
+                        <div style="height: 20px">
+                          <span>快递公司：</span>
+                          <span>{{ props.row.deliveryName }}</span>
+                        </div>
+                        <div style="height: 20px">
+                          <span>快递单号：</span>
+                          <span>{{ props.row.deliveryId }}</span>
+                        </div>
+                      </div>
+                      <p
+                        style="font-size: 18px; color: black; font-weight: 700"
+                      >
+                        备注信息：
+                      </p>
+                      <span>{{ props.row.remark }}</span>
+                    </el-form>
+                  </el-form>
+                </template>
+              </el-table-column>
+            </el-table>
+            <!-- 个人订单分页 -->
+            <el-footer
+              style="height: 60px; width: 100%; background-color: #f6f6f6"
+            >
+              <div style="floa: left"></div>
+              <el-pagination
+                :total="form.totableg"
+                :current-page="fen"
+                style="margin-top: 15px; height: 80px; float: right"
+                layout="total, prev, pager, next, sizes"
+                @size-change="handleSizeChange"
+                @current-change="handleCurrentChange"
+              ></el-pagination>
+            </el-footer>
+          </el-tab-pane>
+          <el-tab-pane label="自提核销" name="secondrt">
+            <el-table
+              ref="table"
+              border
+              stripe
+              highlight-current-row
+              :data="this.formsse.drres"
+              style="height: 300px; overflow-y: scroll"
+            >
+              <el-table-column
+                label="订单号"
+                prop="orderId"
+                align="center"
+              ></el-table-column>
+              <el-table-column
+                prop="cartInfoList"
+                width="500"
+                label="商品信息"
+                align="center"
+              >
+                <template slot-scope="scope">
+                  <div
+                    style="height: 62px; margin-left: 120px"
+                    v-for="(item, index) in scope.row.cartInfoList"
+                    v-if="item.cartInfoMap.productInfo.attrInfo"
+                  >
+                    <div
+                      style="
+                        float: left;
+                        height: 30px;
+                        margin-bottom: 5px;
+                        width: 30px;
+                      "
+                    >
+                      <img
+                        style="
+                          width: 30px;
+                          height: 30px;
+                          margin: 0;
+                          cursor: pointer;
+                        "
+                        v-if="item.cartInfoMap.productInfo.attrInfo.image == ''"
+                        :src="item.cartInfoMap.productInfo.image"
+                      />
+                      <img
+                        style="
+                          width: 30px;
+                          height: 30px;
+                          margin: 0;
+                          cursor: pointer;
+                        "
+                        v-if="
+                          item.cartInfoMap.productInfo.attrInfo.image !== ''
+                        "
+                        :src="item.cartInfoMap.productInfo.attrInfo.image"
+                      />
+                    </div>
+                    <div style="float: left; width: 120px; padding-left: 10px">
+                      <span>{{ item.cartInfoMap.productInfo.storeName }}</span>
+
+                      <span
+                        style="display: block; margin-top: -8px; color: #9e9e9e"
+                      >
+                        <span
+                          v-if="
+                            item.cartInfoMap.productInfo.attrInfo.sku !== '默认'
+                          "
+                          >规格：</span
+                        >
+                        <span>{{
+                          item.cartInfoMap.productInfo.attrInfo.sku
+                        }}</span>
+                      </span>
+                    </div>
+
+                    <div style="float: left; width: 100px; padding-left: 10px">
+                      <span
+                        >| &nbsp; &nbsp; ￥{{ item.cartInfoMap.truePrice }}×{{
+                          item.cartInfoMap.cartNum
+                        }}</span
+                      >
+                    </div>
+                  </div>
+                  <div v-else>
+                    <span>
+                      <img
+                        style="
+                          width: 30px;
+                          height: 30px;
+                          margin: 0;
+                          cursor: pointer;
+                        "
+                        :src="item.cartInfoMap.productInfo.image"
+                      />
+                    </span>
+                    <span>{{ item.cartInfoMap.productInfo.storeName }}</span>
+                    <span
+                      >| ￥{{ item.cartInfoMap.truePrice }}×{{
+                        item.cartInfoMap.cartNum
+                      }}</span
+                    >
+                  </div>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="payTypeName"
+                label="支付状态"
+                align="center"
+              />
+              <el-table-column
+                prop="payPrice"
+                label="微信支付"
+                align="center"
+              />
+              <el-table-column
+                prop="yuePrice"
+                label="余额支付"
+                align="center"
+              />
+              <el-table-column
+                prop="statusName"
+                label="订单状态"
+                align="center"
+              >
+                <template slot-scope="scope">
+                  <span v-html="scope.row.statusName"></span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="addTime"
+                width="160"
+                label="创建时间"
+                align="center"
+              >
+                <template slot-scope="scope">
+                  <span>{{ formatTime(scope.row.createTime) }}</span>
+                </template>
+              </el-table-column>
+            </el-table>
+            <!-- 个人订单分页 -->
+            <el-footer
+              style="height: 60px; width: 100%; background-color: #f6f6f6"
+            >
+              <div style="floa: left"></div>
+              <el-pagination
+                :total="formsse.totableg"
+                :current-page="fen"
+                style="margin-top: 15px; height: 80px; float: right"
+                layout="total, prev, pager, next, sizes"
+                @size-change="handleSizeChange"
+                @current-change="handleCurrentChange"
+              ></el-pagination>
+            </el-footer>
+          </el-tab-pane>
+        </el-tabs>
+      </el-tab-pane>
+
+      <el-tab-pane label="团队信息" name="second">
+        <div>
+          <div style="float: left">
+            <span style="font-size: 18px; color: black; font-weight: 700"
+              >团队总人数：</span
+            >
+            <span
+              style="
+                font-size: 18px;
+                color: black;
+                font-weight: 700;
+                margin-left: 50px;
+              "
+              >{{ counts }}</span
+            >
+            <span
+              style="
+                font-size: 18px;
+                color: black;
+                font-weight: 700;
+                margin-left: 50px;
+              "
+              >团队总销售额：</span
+            >
+            <span
+              style="
+                font-size: 18px;
+                color: black;
+                font-weight: 700;
+                margin-left: 50px;
+              "
+              >{{ "￥" + lastTotalSums }}</span
+            >
+          </div>
+          <div style="float: right">
+            <span
+              style="
+                font-size: 18px;
+                color: red;
+                font-weight: 700;
+                margin-right: 50px;
+              "
+              >一级团员 ·</span
+            >
+            <span style="font-size: 18px; color: #1682e6; font-weight: 700"
+              >二级团员 ·</span
+            >
+          </div>
+        </div>
+        <el-table
+          :data="tableDatatd"
+          :default-sort="{ prop: 'date', order: 'descending' }"
+          style="width: 80%; height: 300px; overflow-y: scroll"
+          @expand-change="handleExpandChange"
+          ref="classTable"
+        >
+          <el-table-column type="expand">
+            <template slot-scope="props">
+              <p
+                v-if="props.row.last == ''"
+                style="font-size: 16px; text-align: center"
+              >
+                暂无数据
+              </p>
+              <div
+                v-for="item in props.row.last"
+                style="width: 100%; height: 60px"
+              >
+                <p
+                  style="
+                    text-align: center;
+                    display: block;
+                    width: 22%;
+                    float: left;
+                  "
+                >
+                  <a :href="item.avatar" style="color: #42b983" target="_blank">
+                    <img :src="item.avatar" alt="点击打开" class="el-avatar" />
+                  </a>
+                </p>
+                <p
+                  style="
+                    text-align: center;
+                    display: block;
+                    width: 8%;
+                    float: left;
+                    color: #1682e6;
+                  "
+                >
+                  {{ item.uid }}
+                </p>
+                <p
+                  style="
+                    text-align: center;
+                    display: block;
+                    width: 20%;
+                    float: left;
+                    color: #1682e6;
+                  "
+                >
+                  {{ item.nickname }}
+                </p>
+                <p
+                  style="
+                    text-align: center;
+                    display: block;
+                    width: 9%;
+                    float: left;
+                    color: #1682e6;
+                  "
+                  v-if="item.phone == null"
+                >
+                  {{ "无" }}
+                </p>
+                <p
+                  style="
+                    text-align: center;
+                    display: block;
+                    width: 9%;
+                    float: left;
+                    color: #1682e6;
+                  "
+                  v-if="item.phone !== null"
+                >
+                  {{ item.phone }}
+                </p>
+                <p
+                  style="
+                    text-align: center;
+                    display: block;
+                    width: 19%;
+                    float: left;
+                    color: #1682e6;
+                  "
+                >
+                  {{ "￥" + item.sumPayPrice }}
+                </p>
+                <p
+                  style="
+                    text-align: center;
+                    display: block;
+                    width: 10%;
+                    float: left;
+                    color: #1682e6;
+                  "
+                >
+                  {{ "——" }}
+                </p>
+                <p
+                  style="
+                    text-align: center;
+                    display: block;
+                    width: 5%;
+                    float: right;
+                    color: #1682e6;
+                  "
+                >
+                  {{ "——" }}
+                </p>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column type="index" align="center"> </el-table-column>
+          <el-table-column label="头像" align="center">
+            <template slot-scope="scope">
+              <a
+                :href="scope.row.avatar"
+                style="color: #42b983"
+                target="_blank"
+              >
+                <img :src="scope.row.avatar" alt="点击打开" class="el-avatar" />
+              </a>
+            </template>
+          </el-table-column>
+          <el-table-column label="ID" prop="uid" align="center">
+            <template slot-scope="scope">
+              <span style="color: red">{{ scope.row.uid }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="昵称" prop="nickname" align="center">
+            <template slot-scope="scope">
+              <span style="color: red">{{ scope.row.nickname }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="电话" prop="phone" align="center">
+            <template slot-scope="scope">
+              <span style="color: red" v-if="scope.row.phone == null">{{
+                "无"
+              }}</span>
+              <span style="color: red" v-if="scope.row.phone !== null">{{
+                scope.row.phone
+              }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="个人销售额" prop="sumPayPrice" align="center">
+            <template slot-scope="scope">
+              <span style="color: red">{{ "￥" + scope.row.sumPayPrice }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="二级团员销售额"
+            prop="teamPayPrice"
+            align="center"
+          >
+            <template slot-scope="scope">
+              <span style="color: red">{{
+                "￥" + scope.row.teamPayPrice
+              }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="二级团员" prop="teamSumPeople" align="center">
+            <template slot-scope="scope">
+              <span style="color: red">{{ scope.row.teamSumPeople }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <!-- 团队信息的分页 -->
+        <el-footer style="height: 60px; width: 100%; background-color: #f6f6f6">
+          <div style="floa: left"></div>
+          <el-pagination
+            :total="totleat"
+            :current-page="fent"
+            :page-size="limitt"
+            style="margin-top: 15px; height: 80px; float: right"
+            layout="total, prev, pager, next, sizes"
+            @size-change="handleSizeChangeT"
+            @current-change="handleCurrentChangeT"
+          ></el-pagination>
+        </el-footer>
+      </el-tab-pane>
+
+      <el-tab-pane label="佣金明细" name="third">
+        <el-table
+          :data="tableData"
+          border
+          style="height: 300px; overflow-y: scroll"
+        >
+          <el-table-column prop="title" label="账单标题" align="center" />
+          <el-table-column prop="mark" label="备注" align="center" />
+          <el-table-column prop="category" label="明细种类" align="center">
+            <template slot-scope="scope">
+              <span v-if="scope.row.category == 'now_money'">余额</span>
+              <span v-else-if="scope.row.category == 'integral'">积分</span>
+              <span v-else-if="scope.row.category == 'commission'">佣金</span>
+              <span v-else>未知</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="number" label="明细数字" align="center">
+            <template slot-scope="scope">
+              <span v-if="scope.row.pm == 1">+</span>
+              <span v-else>-</span>
+              <span>{{ scope.row.number }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="balance" label="余额" align="center" />
+          <el-table-column
+            :show-overflow-tooltip="true"
+            prop="addTime"
+            label="创建日期"
+            align="center"
+            width="150"
+          >
+            <template slot-scope="scope">
+              <span>{{ scope.row.createTime }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-footer style="height: 60px; width: 100%; background-color: #f6f6f6">
+          <div style="floa: left"></div>
+          <el-pagination
+            :total="toloate"
+            :current-page="feng"
+            style="margin-top: 15px; height: 80px; float: right"
+            layout="total, prev, pager, next, sizes"
+            @size-change="handleSizeChangeY"
+            @current-change="handleCurrentChangeY"
+          ></el-pagination>
+        </el-footer>
+      </el-tab-pane>
+    </el-tabs>
+    <div slot="footer" class="dialog-footer;margon-top:-10px">
+      <el-button type="text" @click="cancel">取消</el-button>
+      <el-button
+        :loading="loading"
+        type="primary"
+        @click="doSubmit"
+        v-permission="['YXUSER_EDIT']"
+        >确认</el-button
+      >
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { add, edit } from "@/api/yxUser";
+import { getss } from "@/api/yxStoreOrder";
+import { getCYj } from "@/api/YxUserBillByUid";
+import { gett } from "@/api/yxUserBill";
+import { getYB } from "@/api/yxUserTeamByUid";
+import { formatTime } from "@/utils/index";
+export default {
+  inject: ["reload"],
+  props: {
+    isAdd: {
+      type: Boolean,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      activeN: "firstse",
+      // dingda:0,
+      totleat: 0,
+      getRowKey(row) {
+        console.log(row.uid);
+        return row.uid;
+      },
+      expands: [],
+      counts: "",
+      lastTotalSums: "",
+      tableDatatd: [],
+      keyword: "",
+      sort: "",
+      fen: 1,
+      feng: 1,
+      fent: 1,
+      toloate: 0,
+      pages: 0,
+      limits: 10,
+      pageY: 0,
+      limitY: 10,
+      paget: 1,
+      limitt: 10,
+      tableData: [],
+      activeName: "first",
+      huiYuan: false,
+      loading: false,
+      dialog: false,
+      form: {
+        uid: "",
+        account: "",
+        pwd: "",
+        realName: "",
+        birthday: "",
+        cardId: "",
+        mark: "",
+        promoterLevel: "",
+        groupId: "",
+        nickname: "",
+        avatar: "",
+        phone: "",
+        addTime: "",
+        addIp: "",
+        lastTime: "",
+        lastIp: "",
+        nowMoney: "",
+        brokeragePrice: "",
+        integral: "",
+        signNum: "",
+        status: "",
+        level: "",
+        spreadUid: "",
+        spreadTime: "",
+        userType: "",
+        isPromoter: 0,
+        payCount: "",
+        spreadCount: "",
+        cleanTime: "",
+        addres: "",
+        adminid: 0,
+        loginType: "",
+        drres: "",
+        totableg: 0,
+        oneselfTotal: "",
+      },
+      formsse: {
+        uid: "",
+        account: "",
+        pwd: "",
+        realName: "",
+        birthday: "",
+        cardId: "",
+        mark: "",
+        promoterLevel: "",
+        groupId: "",
+        nickname: "",
+        avatar: "",
+        phone: "",
+        addTime: "",
+        addIp: "",
+        lastTime: "",
+        lastIp: "",
+        nowMoney: "",
+        brokeragePrice: "",
+        integral: "",
+        signNum: "",
+        status: "",
+        level: "",
+        spreadUid: "",
+        spreadTime: "",
+        userType: "",
+        isPromoter: 0,
+        payCount: "",
+        spreadCount: "",
+        cleanTime: "",
+        addres: "",
+        adminid: 0,
+        loginType: "",
+        drres: "",
+        totableg: 0,
+        oneselfTotal: "",
+      },
+      rules: {},
+    };
+  },
+  created() {
+    console.log();
+  },
+  methods: {
+    formatTime,
+    // toggleRowExpansion(row){
+    //   console.log(row)
+    //         this.expands = [];
+    //         this.expands.push(row.uid);
+    //     },
+    handleExpandChange(row, expandRows) {
+      const $classTable = this.$refs.classTable;
+      if (expandRows.length > 1) {
+        expandRows.forEach((expandRow) => {
+          if (row.uid !== expandRow.uid) {
+            $classTable.toggleRowExpansion(expandRow, false);
+          }
+        });
+      }
+      this.currentClassId = row.uid;
+    },
+    handleSizeChangeT(val) {
+      this.fent = 1;
+      this.limitt = val;
+      console.log("zhehi");
+      let plamsT = {
+        page: 1,
+        limit: val,
+        uid: this.form.uid,
+        keyword: this.keyword,
+        sort: this.sort,
+      };
+      getYB(plamsT).then((res) => {
+        console.log(res);
+        this.tableDatatd = res.front;
+        this.counts = res.count;
+        this.lastTotalSums = res.lastTotalSum;
+        this.totleat = res.total;
+      });
+    },
+    handleCurrentChangeT(val) {
+      console.log(val + "454564564564848468");
+      this.fent = val;
+
+      let plamsT = {
+        page: val,
+        limit: this.limitt,
+        uid: this.form.uid,
+        keyword: this.keyword,
+        sort: this.sort,
+      };
+      getYB(plamsT).then((res) => {
+        console.log(res);
+        this.tableDatatd = res.front;
+        this.counts = res.count;
+        this.lastTotalSums = res.lastTotalSum;
+        this.totleat = res.total;
+      });
+    },
+    handleSizeChange(val) {
+      this.fen = 1;
+      this.limits = val;
+      console.log(val);
+      let plamsUid = {
+        page: this.pages,
+        size: val,
+        uid: this.form.uid,
+        sort: "id,desc",
+      };
+      getss(plamsUid).then((res) => {
+        console.log(res);
+        this.form.drres = res.content;
+        this.form.totableg = res.totalElements;
+        console.log(this.totableg);
+      });
+    },
+    handleCurrentChange(val) {
+      console.log(val + 121231);
+      let plamsUid = {
+        page: val - 1,
+        size: this.limits,
+        uid: this.form.uid,
+        sort: "id,desc",
+      };
+      getss(plamsUid).then((res) => {
+        console.log(res);
+        this.form.drres = res.content;
+        this.form.totableg = res.totalElements;
+        console.log(this.totableg);
+      });
+    },
+    handleSizeChangeY(val) {
+      console.log(val + "eeee");
+      this.feng = 1;
+      this.limitY = val;
+      let plamsYj = {
+        page: 0,
+        size: val,
+        uid: this.form.uid,
+      };
+      gett(plamsYj).then((res) => {
+        console.log(res);
+        this.tableData = res.content;
+        this.toloate = res.totalElements;
+      });
+    },
+    handleCurrentChangeY(val) {
+      console.log(val + "pppp");
+      this.feng = val;
+
+      let plamsYj = {
+        page: val - 1,
+        size: this.limitY,
+        uid: this.form.uid,
+      };
+      gett(plamsYj).then((res) => {
+        console.log(res);
+        this.tableData = res.content;
+        this.toloate = res.totalElements;
+      });
+    },
+    toogleExpand(row) {
+      let $table = this.$refs.table;
+      this.form.drres.map((item) => {
+        if (row.id != item.id) {
+          $table.toggleRowExpansion(item, false);
+        }
+      });
+      $table.toggleRowExpansion(row);
+    },
+    handleClick(tab, event) {
+      console.log(tab);
+      console.log(event);
+      if (tab.index == 0) {
+        this.dingda = tab.index;
+        //个人订单
+        let plamsUid = {
+          page: this.pages,
+          size: this.limits,
+          uid: this.form.uid,
+          sort: "id,desc",
+        };
+        getss(plamsUid).then((res) => {
+          console.log(res);
+          this.form.drres = res.content;
+          this.form.totableg = res.totalElements;
+          console.log(this.totableg);
+        });
+      } else if (tab.index == 1) {
+        console.log(this.form);
+        this.dingda = tab.index;
+        // this.fent = 1
+        // this.limitt = 10
+        //团队信息
+        let plamsT = {
+          page: 1,
+          limit: this.limitt,
+          uid: this.form.uid,
+          keyword: this.keyword,
+          sort: this.sort,
+        };
+        getYB(plamsT).then((res) => {
+          console.log(res);
+          this.tableDatatd = res.front;
+          this.counts = res.count;
+          this.lastTotalSums = res.lastTotalSum;
+          this.totleat = res.total;
+        });
+      } else if (tab.index == 2) {
+        //佣金明细
+        this.dingda = tab.index;
+        let plamsYj = {
+          page: this.pageY,
+          size: this.limitY,
+          uid: this.form.uid,
+        };
+        gett(plamsYj).then((res) => {
+          console.log(res);
+          this.tableData = res.content;
+          this.toloate = res.totalElements;
+        });
+      }
+      console.log(this.form);
+      console.log(tab.index);
+      console.log(event);
+      console.log(this.form.uid);
+    },
+    cancel() {
+      this.resetForm();
+    },
+    doSubmit() {
+      this.loading = true;
+      if (this.isAdd) {
+        this.doAdd();
+      } else this.doEdit();
+    },
+    doAdd() {
+      add(this.form)
+        .then((res) => {
+          this.resetForm();
+          this.$notify({
+            title: "添加成功",
+            type: "success",
+            duration: 2500,
+          });
+          this.loading = false;
+          this.$parent.init();
+          this.reload();
+        })
+        .catch((err) => {
+          this.loading = false;
+          console.log(err.response.data.message);
+        });
+    },
+    doEdit() {
+      edit(this.form)
+        .then((res) => {
+          this.resetForm();
+          this.$notify({
+            title: "修改成功",
+            type: "success",
+            duration: 2500,
+          });
+          this.loading = false;
+          this.$parent.init();
+          this.reload();
+        })
+        .catch((err) => {
+          this.loading = false;
+          console.log(err.response.data.message);
+        });
+    },
+    resetForm() {
+      this.dialog = false;
+      if (this.dialog == false) {
+        // this.reload();
+        this.activeName = "first";
+      }
+      this.$refs["form"].resetFields();
+      this.form = {
+        uid: "",
+        account: "",
+        pwd: "",
+        realName: "",
+        birthday: "",
+        cardId: "",
+        mark: "",
+        promoterLevel: "",
+        groupId: "",
+        nickname: "",
+        avatar: "",
+        phone: "",
+        addTime: "",
+        addIp: "",
+        lastTime: "",
+        lastIp: "",
+        nowMoney: "",
+        brokeragePrice: "",
+        integral: "",
+        signNum: "",
+        status: "",
+        level: "",
+        spreadUid: "",
+        spreadTime: "",
+        userType: "",
+        isPromoter: "",
+        payCount: "",
+        spreadCount: "",
+        cleanTime: "",
+        addres: "",
+        adminid: "",
+        loginType: "",
+      };
+    },
+    kai() {
+      console.log(this.form.isPromoter);
+    },
+  },
+};
+</script>
+
+<style scoped>
+.el-dialog__title {
+  color: red;
+}
+.el-table::before {
+  height: 0px;
+}
+</style>
diff --git a/src/views/bxg/shop/user/formp.vue b/src/views/bxg/shop/user/formp.vue
new file mode 100644
index 0000000..25b2433
--- /dev/null
+++ b/src/views/bxg/shop/user/formp.vue
@@ -0,0 +1,128 @@
+<template>
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增' : '余额修改'" width="500px">
+    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
+      <el-form-item label="用户昵称">
+        <el-input v-model="form.nickname" :disabled="true" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="修改余额">
+        <el-radio v-model="form.ptype" :label="1">增加</el-radio>
+        <el-radio v-model="form.ptype" :label="2">减少</el-radio>
+      </el-form-item>
+      <el-form-item label="">
+        <el-input v-model="form.money" style="width: 370px;" />
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="text" @click="cancel">取消</el-button>
+      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { add, edit, editp } from '@/api/yxUser'
+export default {
+  props: {
+    isAdd: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data() {
+    return {
+      loading: false, dialog: false,
+      form: {
+        uid: '',
+        nickname: '',
+        money: '',
+        ptype: '1'
+      },
+      rules: {
+      }
+    }
+  },
+  methods: {
+    cancel() {
+      this.resetForm()
+    },
+    doSubmit() {
+      this.loading = true
+      if (this.isAdd) {
+        this.doAdd()
+      } else this.doEdit()
+    },
+    doAdd() {
+      add(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '添加成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    doEdit() {
+      editp(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '修改成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    resetForm() {
+      this.dialog = false
+      this.$refs['form'].resetFields()
+      this.form = {
+        uid: '',
+        account: '',
+        pwd: '',
+        realName: '',
+        birthday: '',
+        cardId: '',
+        mark: '',
+        partnerId: '',
+        groupId: '',
+        nickname: '',
+        avatar: '',
+        phone: '',
+        addTime: '',
+        addIp: '',
+        lastTime: '',
+        lastIp: '',
+        nowMoney: '',
+        brokeragePrice: '',
+        integral: '',
+        signNum: '',
+        status: '',
+        level: '',
+        spreadUid: '',
+        spreadTime: '',
+        userType: '',
+        isPromoter: '',
+        payCount: '',
+        spreadCount: '',
+        cleanTime: '',
+        addres: '',
+        adminid: '',
+        loginType: ''
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/bxg/shop/user/index.vue b/src/views/bxg/shop/user/index.vue
new file mode 100644
index 0000000..cb1ea2c
--- /dev/null
+++ b/src/views/bxg/shop/user/index.vue
@@ -0,0 +1,700 @@
+<template>
+  <div class="app-container" style="padding-bottom:45px;">
+    <!--工具栏-->
+  <div style="height: calc(100vh - 218px);overflow: auto;">
+    <div class="head-container">
+      <!-- 搜索 -->
+      <el-input
+        v-model="query.value"
+        clearable
+        placeholder="输入搜索内容"
+        style="width: 200px;"
+        class="filter-item"
+        @keyup.enter.native="toQuery"
+      />
+      <el-select
+        v-model="query.type"
+        clearable
+        placeholder="类型"
+        class="filter-item"
+        style="width: 130px"
+      >
+        <el-option
+          v-for="item in queryTypeOptions"
+          :key="item.key"
+          :label="item.display_name"
+          :value="item.key"
+        />
+      </el-select>
+      <el-select
+        v-model="userType"
+        clearable
+        placeholder="用户来源"
+        class="filter-item"
+        style="width: 130px"
+      >
+        <el-option
+          v-for="item in statusOptions"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        />
+      </el-select>
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="success"
+        icon="el-icon-search"
+        @click="toQuery"
+      >搜索</el-button>
+      <!-- 新增 -->
+      <el-button
+        type="danger"
+        class="filter-item"
+        size="mini"
+        icon="el-icon-refresh"
+        @click="toQuerys"
+      >刷新</el-button>
+      <el-button
+        type="primary"
+        class="filter-item"
+        size="mini"
+        style="float:right;margin-right:20px"
+        @click="Reverse"
+      >团队销售额从高到低</el-button>
+      <!-- <el-button
+        type="primary"
+        class="filter-item"
+        size="mini"
+        style="float:right;margin-right:20px"
+        @click="positive"
+      >正序</el-button> -->
+      <!-- <el-button
+        class="filter-item"
+        size="mini"
+        type="warning"
+        icon="el-icon-download"
+        @click="dao"
+      >导出</el-button>-->
+    </div>
+    <!--表单组件-->
+    <eForm ref="form" :is-add="isAdd" />
+    <pForm ref="formp" :is-add="isAdd" />
+    <detail ref="formd" />
+    <!--表格渲染-->
+    
+      <el-table
+      v-loading="loading"
+      :data="data"
+      size="small"
+      style="width: 100%;;"
+      id="tablee"
+      @filter-change="filterTagTable"
+    >
+      <el-table-column prop="uid" label="用户id" width="100"  align="center" />
+      <el-table-column prop="nickname" label="用户昵称" width="100"  align="center" />
+      <el-table-column ref="table" prop="avatar" label="用户头像" width="100"  align="center">
+        <template slot-scope="scope">
+          <a :href="scope.row.avatar" style="color: #42b983" target="_blank">
+            <img :src="scope.row.avatar" alt="点击打开" class="el-avatar" />
+          </a>
+        </template>
+      </el-table-column>
+      <el-table-column prop="phone" label="手机号码" align="center" width="150">
+        <template slot-scope="scope">
+          <span v-if="scope.row.phone == null">{{'无'}}</span>
+          <span v-if="scope.row.phone !== null">{{scope.row.phone}}</span>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column prop="nowMoney" label="用户余额" width="100" align="center" /> -->
+      <el-table-column prop="nowMoney" label="用户余额"  width="100"  align="center">
+        <template slot-scope="scope">
+          <span>{{'￥'+scope.row.nowMoney}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="brokeragePrice" label="佣金金额"   width="150" align="center">
+        <template slot-scope="scope">
+          <span>{{'￥'+scope.row.brokeragePrice}}</span>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column prop="integral" label="用户积分" /> -->
+      <el-table-column prop="createTime" label="创建日期" align="center"  width="250">
+        <template slot-scope="scope">
+          <span>{{ scope.row.createTime }}</span>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column
+      prop="isPromoter"
+      label="用户状态" 
+      width="100" 
+      :filter-multiple="false"
+      :filters="filterStatus"
+      :column-key=" 'aStatus' "
+      filter-placement="bottom-end">
+      <template slot-scope="scope">
+          <el-tag   
+          :type="scope.row.isPromoter === 0 ? 'primary' : 'success'"
+          disable-transitions >
+          <el-tag v-if="scope.row.isPromoter == 0" class="uuio">用户</el-tag>
+          <el-tag v-if="scope.row.isPromoter == 1" class="uuio">会员</el-tag>
+          </el-tag>
+      </template>
+      </el-table-column>-->
+
+      <el-table-column label="用户来源" align="center"  width="100">
+        <template slot-scope="scope">
+          <div>
+            <el-tag v-if="scope.row.userType == 'wechat'">公众号</el-tag>
+            <el-tag v-else-if="scope.row.userType == 'routine'">小程序</el-tag>
+            <el-tag v-else>H5</el-tag>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="payCount" label="购买次数" align="center"  width="100" />
+      <el-table-column prop="spreadUid" label="推荐人" align="center"  width="100" fixed="right"  />
+      <el-table-column
+        prop="promoterLevel"
+        label="用户身份"
+        align="center"
+        fixed="right"
+        :filter-multiple="false"
+        :filters="filterSt"
+        :column-key=" 'aStatus' "
+        filter-placement="bottom-end"
+      >
+        <template slot-scope="scope">
+          <!-- <el-tag
+          :type="scope.row.isPromoter === '0' ? 'primary' : 'success'"
+          disable-transitions>{{scope.row.isPromoter}}</el-tag>-->
+          <el-tag :type="scope.row.promoterLevel === 0 ? 'primary' : 'success'" disable-transitions>
+            
+            <el-tag
+              v-if="   scope.row.promoterLevel == 0"
+              class="uuio"
+            >会员</el-tag>
+            <el-tag
+              v-if="  scope.row.promoterLevel == 1"
+              class="uuio"
+            >团长</el-tag>
+            <el-tag
+              v-if="  scope.row.promoterLevel == 2"
+              class="uuio"
+            >站长</el-tag>
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column prop="oneselfTotal" label="个人销售额"  align="center" width="100" fixed="right" >
+        <template slot-scope="scope">
+          <span>{{'￥'+scope.row.oneselfTotal}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="zcount" label="团队人数"  align="center" width="100" fixed="right" >
+        <template slot-scope="scope">
+          <span v-if="scope.row.zcount == null">{{1}}</span>
+          <span v-else="scope.row.zcount !== null">{{scope.row.zcount}}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column prop="zsum" label="团队销售额"  align="center" width="100" fixed="right" >
+        <template slot-scope="scope">
+          <span v-if="scope.row.zsum == null">{{'￥'+scope.row.oneselfTotal }}</span>
+          <span v-else="scope.row.zsum !== null">{{'￥'+scope.row.zsum }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="上级开关" align='center' width="100" fixed="right">
+          <template slot-scope="scope">
+          <div @click="onSale(scope.row)">
+            <el-tag v-if="scope.row.noSpreadUid == null || scope.row.noSpreadUid == 0 " style="cursor: pointer" :type="''">已开启</el-tag>
+            <el-tag v-if='scope.row.noSpreadUid == 1' style="cursor: pointer" :type=" 'info' ">已关闭</el-tag>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column
+        
+        label="更多"
+        width="200" 
+        fixed="right"
+        align="center"
+      >
+        <template slot-scope="scope">
+          <el-button
+            type="primary"
+            round
+            @click="edit(scope.row)"
+          >更多详情</el-button>
+          <!-- <el-button
+            v-permission="['admin','YXUSER_ALL','YXUSER_EDIT']"
+            size="mini"
+            type="danger"
+            @click="editD(scope.row)"
+          >查看下级</el-button>-->
+          <!-- <el-dropdown size="mini" split-button type="primary" trigger="click">
+            操作
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item>
+                <div
+                  v-permission="['admin','YXUSER_ALL','YXUSER_EDIT']"
+                  style="text-align: center;width: 60px;height: 25px;"
+                  @click="edit(scope.row)"
+                >更多操作</div>
+          </el-dropdown-item>-->
+          <!-- <el-dropdown-item>
+                <div
+                  v-permission="['admin','YXUSER_ALL','YXUSER_EDIT']"
+                  style="text-align: center;width: 60px;height: 25px;"
+                  @click="editP(scope.row)"
+                >修改余额</div>
+          </el-dropdown-item>-->
+          <!-- </el-dropdown-menu>
+          </el-dropdown>-->
+        </template>
+      </el-table-column>
+    </el-table>
+    </div>
+
+    <!--分页组件-->
+    <el-footer style="height:60px;width:100%;background-color:#f6f6f6">
+      <div style="float:left"></div>
+      <el-pagination
+        :total="total"
+        :current-page="page + 1"
+        style="margin-top: 15px;float:right"
+        layout="total, prev, pager, next, sizes"
+        @size-change="sizeChange"
+        @current-change="pageChange"
+      />
+    </el-footer>
+  </div>
+</template>
+
+<script>
+import checkPermission from "@/utils/permission";
+import initData from "@/mixins/crud";
+import { del, onStatus,switchs  } from "@/api/yxUser";
+import { getss ,getes } from "@/api/yxStoreOrder";
+import { getCuid } from "@/api/orderByUid";
+import eForm from "./form";
+import pForm from "./formp";
+import detail from "./detail";
+import { formatTime } from "@/utils/index";
+import FileSaver from "file-saver";
+import XLSX from "xlsx";
+export default {
+  components: { eForm, pForm, detail },
+  mixins: [initData],
+  inject: ["reload"],
+  data() {
+    return {
+      sahng:true,
+      xia:false,
+      sort: "uid,desc",
+      tolar: 0,
+      pages: 0,
+      limits: 10,
+      drre: [],
+      batchExport: "",
+      exportOptions: [{ value: "0", label: "导出本页数据" }],
+      // filterStatus:[{ text: '用户', value: 0 }, { text: '会员', value: 1 }],
+      filterSt: [
+       
+        { text: "会员", value: 1 },
+        { text: "团长", value: 2 },
+        { text: "站长", value: 3 },
+      ],
+      listQuery: {
+        status: "",
+      },
+      zhuang: "",
+      jibie: "",
+      isPromoter: "",
+      delLoading: false,
+      userType: "",
+      queryTypeOptions: [
+        { key: "nickname", display_name: "用户昵称" },
+        { key: "phone", display_name: "手机号码" },
+        { key: "uid", display_name: "用户ID" },
+      ],
+      statusOptions: [
+        { value: "routine", label: "小程序" },
+        { value: "wechat", label: "公众号" },
+        { value: "H5", label: "H5" },
+      ],
+    };
+  },
+  created() {
+    this.$nextTick(() => {
+      this.init();
+    });
+  },
+  methods: {
+    onSale(row) {
+      console.log(row)
+      let status = ''
+      if(row.noSpreadUid == null ||0){
+        status = '关闭上级'
+      }else if(row.noSpreadUid ==1){
+        status = '开启上级'
+      }
+      this.$confirm('确定进行'+status+'操作?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => { 
+          console.log('成功')
+          let plam ={
+            uid:row.uid
+          }
+          switchs(plam).then(res=>{
+                this.$message({
+              message: '操作成功',
+              type: 'success',
+              
+            })
+          })
+          this.reload()
+        })
+        .catch(() => {
+          console.log('取消')
+         })
+    },
+    // filters:{
+    //   rounding(value){
+    //     return value.toFixed(2)
+    //   }
+    // },
+    positive() {
+      this.sort = "team_pay_price_sum,asc";
+      this.page = 0;
+      this.size = 10;
+      this.init();
+    },
+    Reverse() {
+      this.sort = "team_pay_price_sum,desc";
+      this.page = 0;
+      this.size = 10;
+      this.init();
+    },
+    handleExportOption(val) {
+      var table = XLSX.utils.table_to_book(document.querySelector("#tablee"));
+      var tb = XLSX.write(table, {
+        bookType: "xlsx",
+        bookSST: true,
+        type: "array",
+      });
+      try {
+        FileSaver.saveAs(
+          new Blob([tb], { type: "application/octet-stream" }),
+          "会员列表.xlsx"
+        );
+      } catch (e) {
+        if (typeof console !== "undefined") console.log(e, tb);
+      }
+    },
+    // dao() {
+    //   var table = XLSX.utils.table_to_book(document.querySelector("#tablee"));
+    //   var tb = XLSX.write(table, {
+    //     bookType: "xlsx",
+    //     bookSST: true,
+    //     type: "array",
+    //   });
+    //   try {
+    //     FileSaver.saveAs(
+    //       new Blob([tb], { type: "application/octet-stream" }),
+    //       "会员列表.xlsx"
+    //     );
+    //   } catch (e) {
+    //     if (typeof console !== "undefined") console.log(e, tb);
+    //   }
+    // },
+    //  resetDateFilter() {
+    //     this.$refs.filterTable.clearFilter('date');
+    //   },
+    //   clearFilter() {
+    //     this.$refs.filterTable.clearFilter();
+    //   },
+    //   formatter(row, column) {
+    //     return row.address;
+    //   },
+    //   filterTag(value, row) {
+    //     return row.isPromoter === value;
+    //   },
+    //   filterTage(value, row) {
+    //     console.log(value)
+    //     console.log(row)
+    //     return row.partnerId === value;
+    //   },
+    //   filterHandler(value, row, column) {
+    //     const property = column['property'];
+    //     return row[property] === value;
+    //   },
+    filterTagTable(filters) {
+      console.log(filters);
+
+      if (filters.aStatus.length == 0) {
+        this.reload();
+      }
+
+      // if(filters.aStatus==0){
+      //     console.log('用户')
+      //     this.zhuang = filters.aStatus[0]
+      //     console.log(this.zhuang)
+      //     this.init()
+
+      // }
+      if (filters.aStatus == 0) {
+        console.log("用户");
+        if (filters.aStatus[0] == 0) {
+          this.zhuang = 0;
+          this.jibie = 0;
+          this.init();
+        }
+        console.log(this.zhuang);
+        console.log(this.jibie);
+      }
+      if (filters.aStatus == 1) {
+        if (filters.aStatus[0] == 1) {
+          this.zhuang = 1;
+          this.jibie = 0;
+          this.init();
+        }
+        console.log(this.zhuang);
+        console.log(this.jibie);
+      }
+      if (filters.aStatus == 2) {
+        if (filters.aStatus[0] == 2) {
+          this.zhuang = 1;
+          this.jibie = 1;
+          this.init();
+        }
+        console.log(this.zhuang);
+        console.log(this.jibie);
+      }
+      if (filters.aStatus == 3) {
+        if (filters.aStatus[0] == 3) {
+          this.zhuang = 1;
+          this.jibie = 2;
+          this.init();
+        }
+        console.log(this.zhuang);
+        console.log(this.jibie);
+      }
+    },
+    formatTime,
+    checkPermission,
+    onStatus(id, status) {
+      this.$confirm(`确定进行[${status ? "禁用" : "开启"}]操作?`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          onStatus(id, { status: status }).then(({ data }) => {
+            this.$message({
+              message: "操作成功",
+              type: "success",
+              duration: 1000,
+              onClose: () => {
+                this.init();
+              },
+            });
+          });
+        })
+        .catch(() => {});
+    },
+    beforeInit() {
+      this.url = "api/yxUser";
+
+      this.params = {
+        page: this.page,
+        size: this.size,
+        sort: this.sort,
+        userType: this.userType,
+        isPromoter: this.isPromoter,
+        isPromoter: this.zhuang,
+        promoterLevel: this.jibie,
+      };
+      const query = this.query;
+      const type = query.type;
+      const value = query.value;
+      if (type && value) {
+        this.params[type] = value;
+      }
+      return true;
+    },
+    subDelete(uid) {
+      this.delLoading = true;
+      del(uid)
+        .then((res) => {
+          this.delLoading = false;
+          this.$refs[uid].doClose();
+          this.dleChangePage();
+          this.init();
+          this.$notify({
+            title: "删除成功",
+            type: "success",
+            duration: 2500,
+          });
+        })
+        .catch((err) => {
+          this.delLoading = false;
+          this.$refs[uid].doClose();
+          console.log(err.response.data.message);
+        });
+    },
+    toQuerys() {
+      this.reload();
+    },
+    handleEdit(index, row) {
+      console.log(row.isPromoter);
+      let isProm = row.isPromoter;
+      this.isPromoter = isProm;
+      this.init();
+    },
+    add() {
+      this.isAdd = true;
+      this.$refs.form.dialog = true;
+    },
+    edit(data) {
+      console.log(data);
+      
+      let plamsUid = {
+        page: this.pages,
+        size: this.limits,
+        uid: data.uid,
+        sort: "id,desc",
+      };
+      getss(plamsUid).then((res) => {
+        console.log(res);
+        this.drre = res.content;
+        this.tolar = res.totalElements;
+        this.isAdd = false;
+        const _this = this.$refs.form;
+        _this.form = {
+          uid: data.uid,
+          account: data.account,
+          pwd: data.pwd,
+          realName: data.realName,
+          birthday: data.birthday,
+          cardId: data.cardId,
+          mark: data.mark,
+          partnerId: data.partnerId,
+          promoterLevel: data.promoterLevel,
+          groupId: data.groupId,
+          nickname: data.nickname,
+          avatar: data.avatar,
+          phone: data.phone,
+          addTime: data.addTime,
+          addIp: data.addIp,
+          lastTime: data.lastTime,
+          lastIp: data.lastIp,
+          nowMoney: data.nowMoney,
+          brokeragePrice: data.brokeragePrice,
+          integral: data.integral,
+          signNum: data.signNum,
+          status: data.status,
+          level: data.level,
+          spreadUid: data.spreadUid,
+          spreadTime: data.spreadTime,
+          userType: data.userType,
+          isPromoter: data.isPromoter,
+          payCount: data.payCount,
+          spreadCount: data.spreadCount,
+          cleanTime: data.cleanTime,
+          addres: data.addres,
+          adminid: data.adminid,
+          loginType: data.loginType,
+          drres: this.drre,
+          totableg: this.tolar,
+          oneselfTotal: data.oneselfTotal,
+        };
+        _this.dialog = true;
+      });
+      getes(plamsUid).then((res) => {
+        console.log(res);
+        this.drre = res.content;
+        this.tolar = res.totalElements;
+        this.isAdd = false;
+        const _this = this.$refs.form;
+        _this.formsse = {
+          uid: data.uid,
+          account: data.account,
+          pwd: data.pwd,
+          realName: data.realName,
+          birthday: data.birthday,
+          cardId: data.cardId,
+          mark: data.mark,
+          partnerId: data.partnerId,
+          promoterLevel: data.promoterLevel,
+          groupId: data.groupId,
+          nickname: data.nickname,
+          avatar: data.avatar,
+          phone: data.phone,
+          addTime: data.addTime,
+          addIp: data.addIp,
+          lastTime: data.lastTime,
+          lastIp: data.lastIp,
+          nowMoney: data.nowMoney,
+          brokeragePrice: data.brokeragePrice,
+          integral: data.integral,
+          signNum: data.signNum,
+          status: data.status,
+          level: data.level,
+          spreadUid: data.spreadUid,
+          spreadTime: data.spreadTime,
+          userType: data.userType,
+          isPromoter: data.isPromoter,
+          payCount: data.payCount,
+          spreadCount: data.spreadCount,
+          cleanTime: data.cleanTime,
+          addres: data.addres,
+          adminid: data.adminid,
+          loginType: data.loginType,
+          drres: this.drre,
+          totableg: this.tolar,
+          oneselfTotal: data.oneselfTotal,
+        };
+        _this.dialog = true;
+      });
+    },
+    editP(data) {
+      this.isAdd = false;
+      const _this = this.$refs.formp;
+      _this.form = {
+        uid: data.uid,
+        nickname: data.nickname,
+        ptype: 1,
+        money: 0,
+      };
+      _this.dialog = true;
+    },
+    editD(data) {
+      // let plam = {
+      //   uid:data.uid
+      // }
+
+      // gets(plam).thne(res=>{
+      //   console.log(res)
+      // })
+      // console.log(data)
+      const _this = this.$refs.formd;
+      _this.form = {
+        uid: data.uid,
+        nickname: data.nickname,
+      };
+      _this.dialog = true;
+      _this.spread(data.uid);
+    },
+  },
+};
+</script>
+
+<style scoped>
+.uuio {
+  background: none;
+  border: none;
+}
+.app-container {
+  padding-bottom: 0px;
+}
+</style>
diff --git a/src/views/bxg/shop/user/pobill.vue b/src/views/bxg/shop/user/pobill.vue
new file mode 100644
index 0000000..c76bd67
--- /dev/null
+++ b/src/views/bxg/shop/user/pobill.vue
@@ -0,0 +1,213 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <!-- 搜索 -->
+      <el-input v-model="nickname" clearable placeholder="输入用户昵称" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
+      <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
+      <!-- 新增 -->
+      <el-button
+        type="danger"
+        class="filter-item"
+        size="mini"
+        icon="el-icon-refresh"
+        @click="toQuery"
+      >刷新</el-button>
+
+
+    </div>
+    <!--表单组件-->
+    <eForm ref="form" :is-add="isAdd" />
+    <pForm ref="formp" :is-add="isAdd" />
+    <!--表格渲染-->
+    <el-table v-loading="loading" :data="data" size="small" style="width: 100%;height:calc(100vh - 250px);overflow-y: scroll;">
+      <el-table-column prop="nickname" label="用户昵称" align="center" />
+      <el-table-column prop="title" label="账单标题" align="center" />
+      <el-table-column prop="category" label="明细种类" align="center">
+        <template slot-scope="scope">
+          <span v-if="scope.row.category == 'now_money'">余额</span>
+          <span v-else-if="scope.row.category == 'integral'">积分</span>
+          <span v-else-if="scope.row.category == 'commission'">佣金</span>
+          <span v-else>未知</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="number" label="明细数字" align="center">
+        <template slot-scope="scope">
+          <span v-if="scope.row.pm == 1">+</span>
+          <span v-else>-</span>
+          <span>{{ scope.row.number }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column :show-overflow-tooltip="true" prop="addTime" label="创建日期" align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.row.createTime }}</span>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--分页组件-->
+    <el-footer style="height:60px;width:100%;background-color:#f6f6f6">
+      <div style="float:left"></div>
+      <el-pagination
+      :total="total"
+      :current-page="page + 1"
+      style="margin-top: 15px;float:right"
+      layout="total, prev, pager, next, sizes"
+      @size-change="sizeChange"
+      @current-change="pageChange"
+    />
+    </el-footer>
+  </div>
+</template>
+
+<script>
+import checkPermission from '@/utils/permission'
+import initData from '@/mixins/crud'
+import { del, onStatus } from '@/api/yxUser'
+import eForm from './form'
+import pForm from './formp'
+import { formatTime } from '@/utils/index'
+export default {
+  components: { eForm, pForm },
+  mixins: [initData],
+  data() {
+    return {
+      delLoading: false, nickname: '', category: '', type: '',
+      queryTypeOptions: [
+        { key: 'nickname', display_name: '用户昵称' },
+        { key: 'phone', display_name: '手机号码' }
+      ],
+      categoryOptions: [
+        { value: 'now_money', label: '余额' },
+        { value: 'integral', label: '积分' }
+      ],
+      typeOptions: [
+        { value: 'brokerage', label: '佣金' },
+        { value: 'sign', label: '签到' }
+      ]
+    }
+  },
+  created() {
+    this.$nextTick(() => {
+      this.init()
+    })
+  },
+  methods: {
+    formatTime,
+    checkPermission,
+    onStatus(id, status) {
+      this.$confirm(`确定进行[${status ? '禁用' : '开启'}]操作?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          onStatus(id, { status: status }).then(({ data }) => {
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1000,
+              onClose: () => {
+                this.init()
+              }
+            })
+          })
+        })
+        .catch(() => { })
+    },
+    beforeInit() {
+      this.url = 'api/yxUserBill'
+      const sort = 'id,desc'
+      this.params = {
+        page: this.page,
+        size: this.size,
+        nickname: this.nickname,
+        category: 'integral',
+        type: ''
+      }
+      const query = this.query
+      const type = query.type
+      const value = query.value
+      if (type && value) { this.params[type] = value }
+      return true
+    },
+    subDelete(uid) {
+      this.delLoading = true
+      del(uid).then(res => {
+        this.delLoading = false
+        this.$refs[uid].doClose()
+        this.dleChangePage()
+        this.init()
+        this.$notify({
+          title: '删除成功',
+          type: 'success',
+          duration: 2500
+        })
+      }).catch(err => {
+        this.delLoading = false
+        this.$refs[uid].doClose()
+        console.log(err.response.data.message)
+      })
+    },
+    add() {
+      this.isAdd = true
+      this.$refs.form.dialog = true
+    },
+    edit(data) {
+      this.isAdd = false
+      const _this = this.$refs.form
+      _this.form = {
+        uid: data.uid,
+        account: data.account,
+        pwd: data.pwd,
+        realName: data.realName,
+        birthday: data.birthday,
+        cardId: data.cardId,
+        mark: data.mark,
+        partnerId: data.partnerId,
+        groupId: data.groupId,
+        nickname: data.nickname,
+        avatar: data.avatar,
+        phone: data.phone,
+        addTime: data.addTime,
+        addIp: data.addIp,
+        lastTime: data.lastTime,
+        lastIp: data.lastIp,
+        nowMoney: data.nowMoney,
+        brokeragePrice: data.brokeragePrice,
+        integral: data.integral,
+        signNum: data.signNum,
+        status: data.status,
+        level: data.level,
+        spreadUid: data.spreadUid,
+        spreadTime: data.spreadTime,
+        userType: data.userType,
+        isPromoter: data.isPromoter,
+        payCount: data.payCount,
+        spreadCount: data.spreadCount,
+        cleanTime: data.cleanTime,
+        addres: data.addres,
+        adminid: data.adminid,
+        loginType: data.loginType
+      }
+      _this.dialog = true
+    },
+    editP(data) {
+      this.isAdd = false
+      const _this = this.$refs.formp
+      _this.form = {
+        uid: data.uid,
+        nickname: data.nickname,
+        ptype: 1,
+        money: 0
+      }
+      _this.dialog = true
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .app-container{
+  padding-bottom: 0px;
+}
+</style>
diff --git a/src/views/bxg/shop/userlevel/form.vue b/src/views/bxg/shop/userlevel/form.vue
new file mode 100644
index 0000000..07df209
--- /dev/null
+++ b/src/views/bxg/shop/userlevel/form.vue
@@ -0,0 +1,163 @@
+<template>
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增' : '编辑'" width="600px">
+    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="100px">
+      <el-form-item label="等级名称">
+        <el-input v-model="form.name" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="是否永久">
+        <el-radio v-model="form.isForever" :label="1">是</el-radio>
+        <el-radio v-model="form.isForever" :label="0" style="width: 200px;">否</el-radio>
+      </el-form-item>
+      <el-form-item label="有效时间(天)">
+        <el-input-number v-model="form.validDate" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="会员等级">
+        <el-input-number v-model="form.grade" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="享受折扣">
+        <el-input-number v-model="form.discount" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="会员背景">
+        <MaterialList v-model="form.imageArr" style="width: 300px" type="image" :num="1" :width="150" :height="150" />
+      </el-form-item>
+      <el-form-item label="会员图标">
+        <MaterialList v-model="form.iconArr" style="width: 300px" type="image" :num="1" :width="150" :height="150" />
+      </el-form-item>
+      <el-form-item label="是否显示">
+        <el-radio v-model="form.isShow" :label="1">是</el-radio>
+        <el-radio v-model="form.isShow" :label="0" style="width: 200px;">否</el-radio>
+      </el-form-item>
+      <el-form-item label="说明">
+        <el-input v-model="form.explain" rows="3" type="textarea" />
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="text" @click="cancel">取消</el-button>
+      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { add, edit } from '@/api/yxSystemUserLevel'
+import picUpload from '@/components/pic-upload'
+import MaterialList from '@/components/material'
+export default {
+  components: { picUpload, MaterialList },
+  props: {
+    isAdd: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data() {
+    return {
+      loading: false, dialog: false,
+      form: {
+        id: '',
+        merId: '',
+        name: '',
+        money: '',
+        validDate: '',
+        isForever: 1,
+        isPay: '',
+        isShow: 1,
+        grade: '',
+        discount: '',
+        image: '',
+        icon: '',
+        imageArr: [],
+        iconArr: [],
+        explain: '',
+        addTime: '',
+        isDel: ''
+      },
+      rules: {
+        // grade: [
+        //   { type: 'number', message: '只能输入数字', trigger: 'blur' }
+        // ]
+      }
+    }
+  },
+  watch: {
+    'form.imageArr': function(val) {
+      if (val) {
+        this.form.image = val.join(',')
+      }
+    },
+    'form.iconArr': function(val) {
+      if (val) {
+        this.form.icon = val.join(',')
+      }
+    }
+  },
+  methods: {
+    cancel() {
+      this.resetForm()
+    },
+    doSubmit() {
+      this.loading = true
+      if (this.isAdd) {
+        this.doAdd()
+      } else this.doEdit()
+    },
+    doAdd() {
+      add(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '添加成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    doEdit() {
+      edit(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '修改成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    resetForm() {
+      this.dialog = false
+      this.$refs['form'].resetFields()
+      this.form = {
+        id: '',
+        merId: '',
+        name: '',
+        money: '',
+        validDate: '',
+        isForever: 1,
+        isPay: '',
+        isShow: 1,
+        grade: '',
+        discount: '',
+        image: '',
+        icon: '',
+        imageArr: [],
+        iconArr: [],
+        explain: '',
+        addTime: '',
+        isDel: ''
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/bxg/shop/userlevel/index.vue b/src/views/bxg/shop/userlevel/index.vue
new file mode 100644
index 0000000..454fe8a
--- /dev/null
+++ b/src/views/bxg/shop/userlevel/index.vue
@@ -0,0 +1,157 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <!-- 新增 -->
+      <div style="display: inline-block;margin: 0px 2px;">
+        <el-button
+          v-permission="['admin','YXSYSTEMUSERLEVEL_ALL','YXSYSTEMUSERLEVEL_CREATE']"
+          class="filter-item"
+          size="mini"
+          type="primary"
+          icon="el-icon-plus"
+          @click="add"
+        >新增</el-button>
+      </div>
+    </div>
+    <!--表单组件-->
+    <eForm ref="form" :is-add="isAdd" />
+    <!--表格渲染-->
+    <el-table v-loading="loading" :data="data" size="small" style="width: 100%;height:calc(100vh - 245px);overflow-y: scroll;">
+      <el-table-column prop="id" label="id" align="center" />
+      <el-table-column prop="icon" label="等级图标" align="center">
+        <template slot-scope="scope">
+          <a :href="scope.row.icon" style="color: #42b983" target="_blank"><img :src="scope.row.icon" alt="点击打开" class="el-avatar"></a>
+        </template>
+      </el-table-column>
+      <el-table-column prop="name" label="等级名称" align="center" />
+      <el-table-column prop="grade" label="会员等级" align="center" />
+      <el-table-column prop="discount" label="享受折扣" align="center" />
+      <el-table-column prop="validDate" label="有效时间"  align="center" />
+      <el-table-column prop="isForever" label="是否永久" align="center">
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.isForever === 1" style="cursor: pointer" :type="''">是</el-tag>
+          <el-tag v-else style="cursor: pointer" :type=" 'info' ">否</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column prop="isShow" label="是否显示" align="center">
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.isShow === 1" style="cursor: pointer" :type="''">是</el-tag>
+          <el-tag v-else style="cursor: pointer" :type=" 'info' ">否</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column v-if="checkPermission(['admin','YXSYSTEMUSERLEVEL_ALL','YXSYSTEMUSERLEVEL_EDIT','YXSYSTEMUSERLEVEL_DELETE'])" label="操作" width="150px" align="center">
+        <template slot-scope="scope">
+          <el-button v-permission="['admin','YXSYSTEMUSERLEVEL_ALL','YXSYSTEMUSERLEVEL_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)" />
+          <el-popover
+            :ref="scope.row.id"
+            v-permission="['admin','YXSYSTEMUSERLEVEL_ALL','YXSYSTEMUSERLEVEL_DELETE']"
+            placement="top"
+            width="180"
+          >
+            <p>确定删除本条数据吗？</p>
+            <div style="text-align: right; margin: 0">
+              <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
+              <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
+            </div>
+            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
+          </el-popover>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--分页组件-->
+    <el-footer style="height:60px;width:100%;background-color:#f6f6f6">
+      <div style="flaot:left"></div>
+      <el-pagination
+      :total="total"
+      :current-page="page + 1"
+      style="margin-top: 15px;float:right"
+      layout="total, prev, pager, next, sizes"
+      @size-change="sizeChange"
+      @current-change="pageChange"
+    />
+    </el-footer>
+  </div>
+</template>
+
+<script>
+import checkPermission from '@/utils/permission'
+import initData from '@/mixins/crud'
+import { del } from '@/api/yxSystemUserLevel'
+import eForm from './form'
+export default {
+  components: { eForm },
+  mixins: [initData],
+  data() {
+    return {
+      delLoading: false
+    }
+  },
+  created() {
+    this.$nextTick(() => {
+      this.init()
+    })
+  },
+  methods: {
+    checkPermission,
+    beforeInit() {
+      this.url = 'api/yxSystemUserLevel'
+      const sort = 'id,desc'
+      this.params = { page: this.page, size: this.size, sort: sort }
+      return true
+    },
+    subDelete(id) {
+      this.delLoading = true
+      del(id).then(res => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        this.dleChangePage()
+        this.init()
+        this.$notify({
+          title: '删除成功',
+          type: 'success',
+          duration: 2500
+        })
+      }).catch(err => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        console.log(err.response.data.message)
+      })
+    },
+    add() {
+      this.isAdd = true
+      this.$refs.form.dialog = true
+    },
+    edit(data) {
+      this.isAdd = false
+      const _this = this.$refs.form
+      _this.form = {
+        id: data.id,
+        merId: data.merId,
+        name: data.name,
+        money: data.money,
+        validDate: data.validDate,
+        isForever: data.isForever,
+        isPay: data.isPay,
+        isShow: data.isShow,
+        grade: data.grade,
+        discount: data.discount,
+        image: data.image,
+        icon: data.icon,
+        imageArr: data.image ? data.image.split(',') : [],
+        iconArr: data.icon ? data.icon.split(',') : [],
+        explain: data.explain,
+        addTime: data.addTime,
+        isDel: data.isDel
+      }
+      _this.dialog = true
+    }
+  }
+}
+</script>
+
+<style scoped>
+.app-container{
+  padding-bottom: 0px;
+}
+</style>
diff --git a/src/views/bxg/shop/usertask/form.vue b/src/views/bxg/shop/usertask/form.vue
new file mode 100644
index 0000000..a7023ef
--- /dev/null
+++ b/src/views/bxg/shop/usertask/form.vue
@@ -0,0 +1,126 @@
+<template>
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增' : '编辑'" width="500px">
+    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
+      <el-form-item label="任务名称">
+        <el-input v-model="form.levalName" :disabled="true" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="任务类型">
+        <el-input v-model="form.taskType" :disabled="true" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="任务名称">
+        <el-input v-model="form.name" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="限定数">
+        <el-input-number v-model="form.number" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="排序">
+        <el-input-number v-model="form.sort" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="是否显示">
+        <el-radio v-model="form.isShow" :label="1">是</el-radio>
+        <el-radio v-model="form.isShow" :label="0" style="width: 200px;">否</el-radio>
+      </el-form-item>
+      <el-form-item label="任务说明">
+        <el-input v-model="form.illustrate" rows="3" type="textarea" />
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="text" @click="cancel">取消</el-button>
+      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { add, edit } from '@/api/yxSystemUserTask'
+export default {
+  props: {
+    isAdd: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data() {
+    return {
+      loading: false, dialog: false,
+      form: {
+        id: '',
+        name: '',
+        realName: '',
+        taskType: '',
+        number: '',
+        levelId: '',
+        sort: '',
+        isShow: '',
+        isMust: '',
+        illustrate: '',
+        addTime: ''
+      },
+      rules: {
+      }
+    }
+  },
+  methods: {
+    cancel() {
+      this.resetForm()
+    },
+    doSubmit() {
+      this.loading = true
+      if (this.isAdd) {
+        this.doAdd()
+      } else this.doEdit()
+    },
+    doAdd() {
+      add(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '添加成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    doEdit() {
+      edit(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '修改成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    resetForm() {
+      this.dialog = false
+      this.$refs['form'].resetFields()
+      this.form = {
+        id: '',
+        name: '',
+        realName: '',
+        taskType: '',
+        number: '',
+        levelId: '',
+        sort: '',
+        isShow: '',
+        isMust: '',
+        illustrate: '',
+        addTime: ''
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/bxg/shop/usertask/index.vue b/src/views/bxg/shop/usertask/index.vue
new file mode 100644
index 0000000..6365874
--- /dev/null
+++ b/src/views/bxg/shop/usertask/index.vue
@@ -0,0 +1,117 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <!-- 新增 -->
+
+    </div>
+    <!--表单组件-->
+    <eForm ref="form" :is-add="isAdd" />
+    <!--表格渲染-->
+    <el-table v-loading="loading" :data="data" size="small" style="width: 100%;height:calc(100vh - 207px);overflow-y: scroll;">
+      <el-table-column prop="levalName" label="等级名称" align="center" />
+      <el-table-column prop="name" label="任务名称" align="center" />
+      <el-table-column prop="sort" label="排序" align="center" />
+      <el-table-column prop="isShow" label="是否显示" align="center">
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.isShow === 1" style="cursor: pointer" :type="''">是</el-tag>
+          <el-tag v-else style="cursor: pointer" :type=" 'info' ">否</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column v-if="checkPermission(['admin','YXSYSTEMUSERTASK_ALL','YXSYSTEMUSERTASK_EDIT','YXSYSTEMUSERTASK_DELETE'])" label="操作" width="150px" align="center">
+        <template slot-scope="scope">
+          <el-button v-permission="['admin','YXSYSTEMUSERTASK_ALL','YXSYSTEMUSERTASK_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)" />
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--分页组件-->
+    <el-footer style="height:60px;width:100%;background-color:#f6f6f6">
+      <div style="float:left"></div>
+      <el-pagination
+      :total="total"
+      :current-page="page + 1"
+      style="margin-top: 15px;float:right"
+      layout="total, prev, pager, next, sizes"
+      @size-change="sizeChange"
+      @current-change="pageChange"
+    />
+    </el-footer>
+  </div>
+</template>
+
+<script>
+import checkPermission from '@/utils/permission'
+import initData from '@/mixins/crud'
+import { del } from '@/api/yxSystemUserTask'
+import eForm from './form'
+export default {
+  components: { eForm },
+  mixins: [initData],
+  data() {
+    return {
+      delLoading: false
+    }
+  },
+  created() {
+    this.$nextTick(() => {
+      this.init()
+    })
+  },
+  methods: {
+    checkPermission,
+    beforeInit() {
+      this.url = 'api/yxSystemUserTask'
+      const sort = 'id,desc'
+      this.params = { page: this.page, size: this.size, sort: sort }
+      return true
+    },
+    subDelete(id) {
+      this.delLoading = true
+      del(id).then(res => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        this.dleChangePage()
+        this.init()
+        this.$notify({
+          title: '删除成功',
+          type: 'success',
+          duration: 2500
+        })
+      }).catch(err => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        console.log(err.response.data.message)
+      })
+    },
+    add() {
+      this.isAdd = true
+      this.$refs.form.dialog = true
+    },
+    edit(data) {
+      this.isAdd = false
+      const _this = this.$refs.form
+      _this.form = {
+        levalName: data.levalName,
+        id: data.id,
+        name: data.name,
+        realName: data.realName,
+        taskType: data.taskType,
+        number: data.number,
+        levelId: data.levelId,
+        sort: data.sort,
+        isShow: data.isShow,
+        isMust: data.isMust,
+        illustrate: data.illustrate,
+        addTime: data.addTime
+      }
+      _this.dialog = true
+    }
+  }
+}
+</script>
+
+<style scoped>
+.app-container{
+  padding-bottom: 0px;
+}
+</style>
diff --git a/src/views/bxg/stores/elephant.vue b/src/views/bxg/stores/elephant.vue
new file mode 100644
index 0000000..dc74933
--- /dev/null
+++ b/src/views/bxg/stores/elephant.vue
@@ -0,0 +1,117 @@
+<template>
+  <div class="body">
+    <div>
+      <el-table :data="tableData" style="width: 100%" height="550px">
+        <el-table-column prop="id" label="商品id"  align="center" ></el-table-column>
+      <el-table-column ref="table" prop="image" label="商品图片"  align="center">
+        <template slot-scope="scope">
+          <a :href="scope.row.image" style="color: #42b983" target="_blank">
+            <img :src="scope.row.image" alt="点击打开" class="el-avatar">
+          </a>
+        </template>
+      </el-table-column>
+      <el-table-column prop="storeName" label="商品名称"  width="400" align="center" />
+      <el-table-column prop="price" label="商品价格" align="center" />
+      <el-table-column prop="sales" label="销量"  align="center" />
+      <el-table-column prop="stock" label="库存"  align="center" />
+      <el-table-column label="操作" align="center">
+          <template slot-scope="scope">
+              <el-popover
+              placement="top"
+              title="确定删除？"
+              width="200"
+              :ref="'popover-' + scope.row.id"
+              trigger="click"
+            >
+              <div style="text-align: right; margin: 0">
+                <el-button
+                  type="primary"
+                  size="mini"
+                  @click="deleteDeviceRow(scope.row)"
+                  >确定</el-button
+                >
+                <el-button size="mini" @click="pCancel(scope.row.id)"
+                  >取消</el-button
+                >
+              </div>
+              <el-button slot="reference" type="text">删除</el-button>
+            </el-popover>
+          </template>
+      </el-table-column>
+      </el-table>
+    </div>
+    <div>
+    <el-pagination
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+      :current-page="currentPage4"
+      :page-sizes="[10, 20, 30, 40]"
+      :page-size="10"
+      layout="total, sizes, prev, pager, next, jumper"
+      :total="totals">
+    </el-pagination>
+    </div>
+  </div>
+</template>
+<script>
+import { add,del } from '@/api/yxStoreElephant'
+export default {
+        inject: ['reload'],
+  data() {
+    return {
+        totals:null,
+        currentPage4: 1,
+        page:1,
+        limit:10,
+      tableData: [
+       
+      ],
+    };
+  },
+  created(){
+     this.yxStoreElephant()
+  },
+  methods: {
+      yxStoreElephant(){
+          let plams = {
+              page:this.page,
+              limit:this.limit
+          }
+          add(plams).then(res=>{
+              console.log(res,'大象')
+              this.tableData = res.product
+              this.totals = res.integer
+          })
+      },
+        handleSizeChange(val) {
+        console.log(`每页 ${val} 条`);
+        this.limit = val
+        this.yxStoreElephant()
+      },
+      handleCurrentChange(val) {
+        console.log(`当前页: ${val}`);
+        this.page = val
+        this.yxStoreElephant()
+      },
+      deleteDeviceRow(row){
+          let plams = {
+              id:row.id
+          }
+          del(plams).then(res=>{
+              console.log(res)
+          })
+          console.log(row,'删除成功')
+          this.reload()
+      },
+      pCancel(row){
+          console.log(row,'删除失败')
+          this.reload()
+      }
+  },
+};
+</script>
+<style scoped>
+.body {
+  padding: 20px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/bxg/stores/index.vue b/src/views/bxg/stores/index.vue
new file mode 100644
index 0000000..7d2aa72
--- /dev/null
+++ b/src/views/bxg/stores/index.vue
@@ -0,0 +1,466 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <crudOperation :permission="permission" />
+      <!--表单组件-->
+      <el-dialog
+        :close-on-click-modal="false"
+        :before-close="crud.cancelCU"
+        :visible.sync="crud.status.cu > 0"
+        :title="crud.status.title"
+        style="font-weight: 700"
+      >
+        <el-form
+          ref="form"
+          :model="form"
+          :rules="rules"
+          size="small"
+          label-width="80px"
+        >
+        
+          <!-- <el-form-item label="id" :label-width="formLabelWidth">
+            <el-input v-model="form.id" style="width: 370px" />
+          </el-form-item> -->
+          <el-form-item label="名称" :label-width="formLabelWidth" >
+            <el-input v-model="form.shopName" style="width: 370px" />
+          </el-form-item>
+          <el-form-item label="介绍" :label-width="formLabelWidth">
+            <el-input v-model="form.info" style="width: 370px" />
+          </el-form-item>
+          <!-- <el-form-item label="创建时间" :label-width="formLabelWidth">
+            <el-input v-model="form.createTime" style="width: 370px" />
+          </el-form-item> -->
+          <!-- <el-form-item label="updateTime">
+            <el-input v-model="form.updateTime" style="width: 370px" />
+          </el-form-item>
+          <el-form-item label="isDel">
+            <el-input v-model="form.isDel" style="width: 370px" />
+          </el-form-item> -->
+          <el-form-item label="包邮金额" :label-width="formLabelWidth" >
+            <el-input v-model="form.reserve" style="width: 370px" onkeyup="value=value.replace(/[^\d]/g,'')" />
+          </el-form-item>
+          <el-form-item label="图标" :label-width="formLabelWidth">
+          <MaterialList v-model="images" type="image" :num="1" :width="150" :height="150"  />
+        </el-form-item>
+        <el-form-item label="运费模板：" :label-width="formLabelWidth" prop="tempId">
+              <div class="acea-row">
+                <el-select v-model="form.tempId" class="mr20" style="width: 370px">
+                  <el-option
+                    v-for="(item, index) in templateList"
+                    :value="item.id"
+                    :key="index"
+                    :label="item.name"
+                  ></el-option>
+                </el-select>
+              </div>
+            </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="text" @click="crud.cancelCU">取消</el-button>
+          <el-button
+            :loading="crud.cu === 2"
+            type="primary"
+            @click="crud.submitCU"
+            >确认</el-button
+          >
+        </div>
+      </el-dialog>
+      <!--表格渲染-->
+      <el-table
+        ref="table"
+        v-loading="crud.loading"
+        :data="crud.data"
+        size="small"
+        style="width: 100%"
+        @selection-change="crud.selectionChangeHandler"
+      >
+        <el-table-column type="selection" width="55" />
+        <el-table-column label="图标" align="center">
+          <template slot-scope="scope">
+          <a :href="scope.row.img" style="color: #42b983" target="_blank">
+            <img :src="scope.row.img" alt="点击打开" class="el-avatar">
+          </a>
+        </template>
+        </el-table-column>
+        <el-table-column
+          v-if="columns.visible('id')"
+          prop="id"
+          label="id"
+          align="center"
+        />
+        <el-table-column
+          v-if="columns.visible('shopName')"
+          prop="shopName"
+          label="名称"
+          align="center"
+        />
+        <el-table-column
+          v-if="columns.visible('info')"
+          prop="info"
+          label="介绍"
+          align="center"
+        />
+        <el-table-column
+          v-if="columns.visible('createTime')"
+          prop="createTime"
+          label="创建时间"
+          align="center"
+        >
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.createTime) }}</span>
+          </template>
+        </el-table-column>
+          <el-table-column label="开启同城配送" align='center' width="100" >
+          <template slot-scope="scope">
+          <div @click="onSale(scope.row)">
+            <el-tag v-if=" scope.row.openCity == 1 " style="cursor: pointer" :type="''">已开启</el-tag>
+            <el-tag v-if='scope.row.openCity == 0' style="cursor: pointer" :type=" 'info' ">已关闭</el-tag>
+          </div>
+        </template>
+      </el-table-column>
+        <!-- <el-table-column
+          v-if="columns.visible('updateTime')"
+          prop="updateTime"
+          label="updateTime"
+        >
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.updateTime) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-if="columns.visible('isDel')"
+          prop="isDel"
+          label="isDel"
+        /> -->
+        <el-table-column
+          v-if="columns.visible('reserve')"
+          prop="reserve"
+          label="包邮金额"
+          align="center"
+        />
+        <el-table-column
+          prop="tempName"
+          label="运费模板"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          v-permission="[
+            'admin',
+            'yxStoreCategoryShop:edit',
+            'yxStoreCategoryShop:del',
+          ]"
+          label="操作"
+          width="200"
+          align="center"
+        >
+          <template slot-scope="scope">
+            <div style="float: left">
+              <el-button type="text" @click="writtenWords(scope.row)"
+                >查看商铺商品</el-button
+              >
+            </div>
+            <udOperation :data="scope.row" :permission="permission" />
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <!-- 查看店铺商品  -->
+      <el-dialog
+        title="商铺商品"
+        :visible.sync="shopTableVisible"
+        style="font-weight: 700"
+      >
+        <el-table :data="gridData" height="400px">
+          <el-table-column
+            property="id"
+            label="商品ID"
+            align="center"
+          ></el-table-column>
+          <el-table-column label="商品图片" align="center">
+            <template slot-scope="scope">
+              <a :href="scope.row.image" style="color: #42b983" target="_blank">
+            <img :src="scope.row.image" alt="点击打开" class="el-avatar">
+          </a>
+              <!-- <img :src="scope.row.img" alt="" style="width:50px;height:50px;border-radius: 50px"> -->
+            </template>
+          </el-table-column>
+          <el-table-column
+            property="store_name"
+            label="商品名称"
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            property="price"
+            label="商品价格(元)"
+            align="center"
+          ></el-table-column>
+          <el-table-column label="操作" align="center">
+            <template slot-scope="scope">
+              <el-popover
+                placement="top"
+                title="确定解除绑定？"
+                width="200"
+                :ref="'popover-' + scope.row.id"
+                trigger="click"
+              >
+                <div style="text-align: right; margin: 0">
+                  <el-button
+                    type="primary"
+                    size="mini"
+                    @click="deleteDeviceRow(scope.row)"
+                    >确定</el-button
+                  >
+                  <el-button size="mini" @click="pCancel(scope.row.id)"
+                    >取消</el-button
+                  >
+                </div>
+                <el-button slot="reference" type="text">解除绑定</el-button>
+              </el-popover>
+              
+              <el-popover
+                placement="top"
+                title="确定删除商品？"
+                width="200"
+                :ref="'popover-' + scope.row.id"
+                trigger="click"
+                style="margin-left:15px"
+              >
+                <div style="text-align: right; margin: 0">
+                  <el-button
+                    type="primary"
+                    size="mini"
+                    @click="deleteDe(scope.row)"
+                    >确定</el-button
+                  >
+                  <el-button size="mini" @click="pCan(scope.row.id)"
+                    >取消</el-button
+                  >
+                </div>
+                <el-button slot="reference" type="text" style="color:red">删除</el-button>
+              </el-popover>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-dialog>
+
+      <!--分页组件-->
+      <pagination />
+    </div>
+  </div>
+</template>
+
+<script>
+import crudYxStoreCategoryShop from "@/api/yxStoreCategoryShop";
+import { get, dels,delse,putse,getTempList } from "@/api/yxStoreCategoryShop";
+import CRUD, { presenter, header, form, crud } from "@crud/crud";
+import rrOperation from "@crud/RR.operation";
+import crudOperation from "@crud/CRUD.operation";
+import udOperation from "@crud/UD.operation";
+import pagination from "@crud/Pagination";
+import MaterialList from "@/components/material";
+
+// crud交由presenter持有
+const defaultCrud = CRUD({
+  title: "商铺",
+  url: "api/yxStoreCategoryShop",
+  sort: "id,desc",
+  crudMethod: { ...crudYxStoreCategoryShop },
+  
+});
+const defaultForm = {
+  id: null,
+  shopName: null,
+  info: null,
+  createTime: null,
+  updateTime: null,
+  isDel: null,
+  reserve: null,
+  tempId:null,
+  // img:[],
+  img:'',
+};
+export default {
+  inject: ["reload"],
+  name: "YxStoreCategoryShop",
+  components: {
+    pagination,
+    crudOperation,
+    rrOperation,
+    udOperation,
+    MaterialList,
+  },
+  mixins: [presenter(defaultCrud), header(), form(defaultForm), crud()],
+  data() {
+    return {
+      images:[],
+      templateList:[],
+      shopTableVisible: false,
+      formLabelWidth: "120px",
+      permission: {
+        add: ["admin", "yxStoreCategoryShop:add"],
+        edit: ["admin", "yxStoreCategoryShop:edit"],
+        del: ["admin", "yxStoreCategoryShop:del"],
+      },
+      gridData: [],
+      // loading:true,
+      rules: {
+         tempId: [
+          {
+            required: true,
+            message: "请选择运费模板",
+            trigger: "change",
+            type: "number",
+          },
+        ],
+         reserve: [
+          {
+            required: true,
+            message: "请填写包邮金额",
+            trigger: "change",
+            type: "number",
+          },
+        ],
+         shopName: [
+          {
+            required: true,
+            message: "请填写名称",
+            trigger: "change",
+            type: "number",
+          },
+        ],
+      },
+    };
+  },
+  watch: {
+  images: function(val) {
+      console.log(val,'图片');
+      this.form.img = val.join(',')
+      
+      console.log(this.form.img,'我哦哦')
+      
+    },
+  },
+  created(){
+    this.getTempList()
+    
+  },
+  methods: {
+    // 获取数据前设置好接口地址
+    [CRUD.HOOK.beforeRefresh]() {
+      return true;
+    }, // 新增与编辑前做的操作
+    [CRUD.HOOK.afterToCU](crud, form) {
+      
+       if (form.img && form.id ) {
+        this.images = form.img.split(',')
+        
+      }
+    },
+    getTempList(){
+      getTempList().then(res=>{
+        console.log(res,'运费')
+        this.templateList = res
+        // this.images = []
+      })
+    },
+    onSale(row) {
+      console.log(row,'接受数据')
+      let status = ''
+       let opectui =null
+      if(row.openCity == 0){
+        status = '开启配送'
+        opectui = 1
+      }else if(row.openCity ==1){
+        status = '关闭配送'
+        opectui = 0
+      }
+     
+      this.$confirm('确定进行'+status+'操作?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => { 
+          console.log('成功')
+          let plam ={
+            openCity:opectui,
+            id:row.id
+          }
+          putse(plam).then(res=>{
+            console.log(res)
+             this.$message({
+              message: '操作成功',
+              type: 'success',
+              
+            })
+          })
+     
+          this.reload()
+        })
+        .catch(() => {
+          console.log('取消')
+         })
+    },
+    writtenWords(row) {
+      this.shopTableVisible = true;
+      console.log(row);
+      let plams = {
+        shopId: row.id,
+      };
+
+      get(plams).then((res) => {
+        console.log(res);
+        this.gridData = res;
+        
+      });
+    },
+    deleteDeviceRow(row) {
+      let palm = {
+        id: row.id,
+      };
+      dels(palm).then((res) => {
+        console.log(res,'解除绑定');
+      });
+      this.reload();
+    },
+    deleteDe(row){
+      console.log(row,'删除')
+      let plams = {
+        id:row.id
+      }
+      delse(plams).then(res=>{
+
+      })
+      this.reload();
+    },
+    pCan(row){
+        this.reload();
+    },
+    pCancel(row) {
+      this.reload();
+      console.log(row, "删除失败");
+    },
+    yui(){
+      console.log('图像')
+    }
+  },
+};
+</script>
+
+<style scoped>
+.table-img {
+  display: inline-block;
+  text-align: center;
+  background: #ccc;
+  color: #fff;
+  white-space: nowrap;
+  position: relative;
+  overflow: hidden;
+  vertical-align: middle;
+  width: 32px;
+  height: 32px;
+  line-height: 32px;
+}
+</style>
diff --git a/src/views/components/Editor.vue b/src/views/components/Editor.vue
new file mode 100644
index 0000000..1426c9b
--- /dev/null
+++ b/src/views/components/Editor.vue
@@ -0,0 +1,74 @@
+<template>
+  <div>
+    <div ref="editor" style="text-align:left;margin: 5px;width: 700px" />
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import E from 'wangeditor'
+import { getToken } from '@/utils/auth'
+export default {
+  name: 'Editor',
+  model: {
+    prop: 'value',
+    event: 'change'
+  },
+  props: {
+    value: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      headers: {
+        'Authorization': getToken()
+      },
+      info: null,
+      editor: null
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'uploadApi'
+    ])
+  },
+  watch: {
+    value: function(val) {
+      this.editor.txt.html(val)
+      // this.editor.txt.html(val)
+    }
+  },
+  mounted() {
+    // console.log(222)
+    console.log(this.value)
+    this.editor = new E(this.$refs.editor)
+    this.editor.customConfig.uploadImgShowBase64 = true // 使用 base64 保存图片
+    // 不可修改
+    this.editor.customConfig.uploadImgHeaders = this.headers
+    // 自定义文件名，不可修改，修改后会上传失败
+    this.editor.customConfig.uploadFileName = 'file'
+    this.editor.customConfig.uploadImgServer = this.uploadApi // 上传图片到服务器
+    this.editor.customConfig.uploadImgHooks = {
+      customInsert: function(insertImg, result, editor) {
+        var url = result.link
+        insertImg(url)
+      }
+    }
+    this.editor.customConfig.onchange = (html) => {
+      this.info = html
+      this.$emit('change', this.info)
+      this.$emit('input', this.info)
+    }
+    this.editor.create()
+    this.editor.txt.html(this.value)
+  }
+}
+</script>
+
+<style scoped>
+  .editor-content{
+    padding-left: 5px;
+  }
+</style>
diff --git a/src/views/components/godds/activity/Activitylist/form.vue b/src/views/components/godds/activity/Activitylist/form.vue
new file mode 100644
index 0000000..f098c2e
--- /dev/null
+++ b/src/views/components/godds/activity/Activitylist/form.vue
@@ -0,0 +1,561 @@
+<template>
+  <div class="bodys">
+    <h4
+      style="
+        margin-left: 15px;
+        font-size: 20px;
+        color: #323335;
+        margin-top: 10px;
+        margin-bottom: 20px;
+      "
+    >
+      新增活动
+    </h4>
+    <el-form
+      :model="ruleForm"
+      :rules="rules"
+      ref="ruleForm"
+      label-width="120px"
+      class="demo-ruleForm"
+    > 
+     <el-form-item label="活动ID" prop="indexId">
+        <el-input v-model="ruleForm.indexId" style="width: 500px" onkeyup="value=value.replace(/[^\d]/g,'')"></el-input>
+      </el-form-item>
+      <el-form-item label="活动名称" prop="name">
+        <el-input v-model="ruleForm.name" style="width: 500px"></el-input>
+      </el-form-item>
+      <el-form-item label="活动介绍" prop="intro">
+        <el-input
+          type="textarea"
+          v-model="ruleForm.intro"
+          style="width: 500px"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="活动时间" required>
+        <el-col :span="3.5">
+          <el-form-item prop="activityStartTime">
+            <el-date-picker
+              type="date"
+              placeholder="选择活动开始日期"
+              v-model="ruleForm.activityStartTime"
+              style="width: 100%"
+              
+            ></el-date-picker>
+          </el-form-item>
+        </el-col>
+
+        <el-col class="line" :span="1">-----至-----</el-col>
+        <el-col :span="3.5">
+          <el-form-item prop="activityEndTime">
+            <el-date-picker
+              type="date"
+              placeholder="选择活动结束日期"
+              v-model="ruleForm.activityEndTime"
+              style="width: 100%"
+              
+            ></el-date-picker>
+          </el-form-item>
+        </el-col>
+      </el-form-item>
+      <el-form-item label="活动首页图片:" prop="img">
+        <single-pic
+          v-model="ruleForm.img"
+          type="image"
+          :num="1"
+          :width="150"
+          :height="150"
+          style="float: left"
+        />
+      </el-form-item>
+      <el-form-item label="活动分享图:" prop="sharingImg">
+        <single-pic
+          v-model="ruleForm.sharingImg"
+          type="image"
+          :num="1"
+          :width="150"
+          :height="150"
+          style="float: left"
+        />
+      </el-form-item>
+      <el-form-item label="活动海报图:" prop="activityPoster">
+        <single-pic
+          v-model="ruleForm.activityPoster"
+          type="image"
+          :num="1"
+          :width="150"
+          :height="150"
+          style="float: left"
+        />
+      </el-form-item>
+      <el-form-item label="活动颜色选择" prop="color">
+        <colorPicker
+          v-model="ruleForm.color"
+          v-on:change="headleChangeColor"
+          class="colores"
+        ></colorPicker>
+        <el-input
+          v-model="ruleForm.color"
+          placeholder="请输入活动颜色"
+          style="width: 100px"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="活动店铺选择" prop="idList">
+        <el-button type="text" @click="ShopSelection">选择店铺</el-button>
+        <!-- <el-button v-for="(item,index) in optio" :key="index" type="text" @click="ShopSelection(index)">选择店铺</el-button> -->
+        <!-- <el-button type="primary" icon="el-icon-circle-plus" size="mini" @click="addTo"></el-button> -->
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="submitForm('ruleForm')"
+          >立即创建</el-button
+        >
+        <el-button @click="resetForm('ruleForm')">重置</el-button>
+      </el-form-item>
+    </el-form>
+    <h4
+      style="
+        margin-left: 15px;
+        font-size: 20px;
+        color: #323335;
+        margin-top: 10px;
+        margin-bottom: 20px;
+      "
+    >
+      已勾选商品
+    </h4>
+    <div style="margin-bottom:20px">
+      <el-button
+              type="danger"
+              size="mini"
+              icon="el-icon-delete-solid"
+              :disabled="disabl"
+              @click="BatchDelete"
+              style="margin-left:15px"
+            >
+              批量删除
+            </el-button>
+      <el-table :data="tableDataCheck" style="width: 100%"  max-height="500"  @selection-change="handleSChange">
+                    <el-table-column
+              type="selection"
+              width="55"
+            ></el-table-column>
+        <el-table-column prop="paiban" label="商品分类" align="center">
+        </el-table-column>
+        <el-table-column prop="id" label="商品ID" align="center">
+        </el-table-column>
+            <el-table-column label="商品图片" align="center">
+              <template slot-scope="scope">
+                <a
+                  :href="scope.row.image"
+                  style="color: #42b983"
+                  target="_blank"
+                >
+                  <img
+                    :src="scope.row.image"
+                    alt="点击打开"
+                    class="el-avatar"
+                  />
+                </a>
+              </template>
+            </el-table-column>
+            <el-table-column
+              property="store_name"
+              label="商品名称"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              property="price"
+              label="商品价格(元)"
+              align="center"
+            ></el-table-column>
+      </el-table>
+    </div>
+    <!-- 新增活动 -->
+    <el-dialog
+      title="新增活动"
+      :visible.sync="dialogFormVisible"
+      :before-close="handleClose"
+    >
+      <div style="margin-bottom: 10px">
+        <el-input
+          v-model="input"
+          placeholder="请输入要搜索的商品名称"
+          style="width: 200px"
+        ></el-input>
+        <el-button type="primary" icon="el-icon-zoom-in" @click="products">搜索</el-button>
+        <el-select v-model="paiban" @change="qihuan" placeholder="请选择商品分类" style="margin-left:20px">
+    <el-option
+      v-for="(item,index) in options"
+      :key="index"
+      :label="item"
+      :value="index">
+    </el-option>
+  </el-select>
+      </div>
+      <div class="dial">
+        <div style="flex: 2">
+          <el-table
+            :data="tableD"
+            style="width: 100%"
+            max-height="500"
+            @selection-change="handleSelec"
+            
+          >
+            <el-table-column
+              type="selection"
+              width="55"
+            ></el-table-column>
+            <el-table-column prop="shopName" label="店铺名称" align="center">
+            </el-table-column>
+          </el-table>
+        </div>
+        <div style="flex: 1"></div>
+        <div style="flex: 5">
+          <el-table
+            :data="tableData"
+            style="width: 100%"
+            max-height="395"
+            @selection-change="handleSelectionChange"
+            
+          >
+            <el-table-column
+              type="selection"
+              width="55"
+              
+            >
+            </el-table-column>
+            <el-table-column
+              property="id"
+              label="商品ID"
+              align="center"
+            ></el-table-column>
+            <el-table-column label="商品图片" align="center">
+              <template slot-scope="scope">
+                <a
+                  :href="scope.row.image"
+                  style="color: #42b983"
+                  target="_blank"
+                >
+                  <img
+                    :src="scope.row.image"
+                    alt="点击打开"
+                    class="el-avatar"
+                  />
+                </a>
+                <!-- <img :src="scope.row.img" alt="" style="width:50px;height:50px;border-radius: 50px"> -->
+              </template>
+            </el-table-column>
+            <el-table-column
+              property="store_name"
+              label="商品名称"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              property="price"
+              label="商品价格(元)"
+              align="center"
+            ></el-table-column>
+          </el-table>
+          <el-footer
+            style="height: 60px; width: 100%; background-color: #f6f6f6"
+          >
+            <div style="float: left"></div>
+            <el-pagination
+              :total="total"
+              :current-page="plamses.page"
+              style="margin-top: 15px; float: right"
+              layout="total, prev, pager, next, sizes"
+              @size-change="sizeChange"
+              @current-change="pageChange"
+            />
+          </el-footer>
+        </div>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormVisible = false">取 消</el-button>
+        <el-button type="primary" @click="dialogForm">确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import { getses, gePtses, add, gePtsesForm,getsesInput } from "@/api/yxStoreActivity";
+import singlePic from "@/components/singlematerial";
+export default {
+  inject: ["reload"],
+  components: {
+    singlePic,
+  },
+  data() {
+    return {
+       paiban:0, 
+      dialogFormVisible: false,
+      input: "",
+      ruleForm: {
+        indexId:null,
+        name: "",
+        intro: "",
+        color: "#ff0000",
+        idList: [],
+        img: "",
+        sharingImg:'',
+        activityPoster:'',
+        activityStartTime: "",
+        activityEndTime: "",
+        idInfo:[
+            {idList:'',ids:''}
+        ]
+      },
+      rules: {
+        indexId: [{ required: true, message: "请输入活动ID", trigger: "blur" }],
+        name: [{ required: true, message: "请输入活动名称", trigger: "blur" }],
+        idList: [
+          { required: true, message: "请选择活动店铺", trigger: "change" },
+        ],
+        intro: [{ required: true, message: "请填写活动介绍", trigger: "blur" }],
+        activityStartTime: [
+          { required: true, message: "请填写活动开始时间", trigger: "blur" },
+        ],
+        activityEndTime: [
+          { required: true, message: "请填写活动结束时间", trigger: "blur" },
+        ],
+        img: [{ required: true, message: "请填写活动图片", trigger: "blur" }],
+        sharingImg: [{ required: true, message: "请填写活动分享图片", trigger: "blur" }],
+        activityPoster: [{ required: true, message: "请填写活动海报图片", trigger: "blur" }],
+      },
+      tableD: [],
+      total: 0,
+      tableData: [],
+      tableDataCheck: [],
+      plamses: {
+        shopId: [],
+        page: 1,
+        limit: 10,
+      },
+      options:[],
+      optio:[],
+      disabl:true,
+      multipleSelection:[],
+      
+    };
+  },
+  methods: {
+      BatchDelete(){
+            console.log(this.multipleSelection)
+            let val = this.multipleSelection
+            val.forEach((val,index)=>{
+                this.tableDataCheck.forEach((v,i)=>{
+                    if(val.id === v.id){
+                        this.tableDataCheck.splice(i,1)
+                    }
+                })
+                this.ruleForm.idList.forEach((vs,is)=>{
+                    if(val.id === vs){
+                        this.ruleForm.idList.splice(is,1)
+                    }
+                })
+                // this.ruleForm.idInfo.forEach((ve,ise)=>{
+                //     console.log(ve,ise,'741852')
+                //     if(val.id ===ve.idList){
+                //         this.ruleForm.idInfo.splice(ise,1)
+                //     }
+                // })
+            })
+      },
+      handleSChange(val){
+          this.multipleSelection = val
+          console.log(val,'不知道')
+          if(val.length > 0){
+              this.disabl = false
+          }else{
+              this.disabl = true 
+          }
+      },
+      products(){
+         
+          let plams = {
+              value:this.input
+          }
+           console.log(plams)
+          getsesInput(plams).then(res=>{
+              console.log(res)
+              this.tableData = res
+          })
+      },
+    sizeChange(val) {
+      this.plamses.limit = val;
+      this.gerts();
+    },
+    pageChange(val) {
+      this.plamses.page = val;
+      this.gerts();
+    },
+    addTo(){
+        this.optio.push('admin')
+        console.log(this.optio)
+    },
+    ShopSelection(val) {
+        this.dialogFormVisible = true;
+        this.getses();
+    },
+    getses() {
+      console.log(this.plamses.shopId, "店铺的ID");
+      let plams = {
+        page: 0,
+        size: 100,
+      };
+      getses(plams).then((res) => {
+        console.log(res.content, "商铺");
+        this.tableD = res.content;
+        this.options = res.paiban
+        // this.tableD.forEach((item1) => {
+        //   this.plamses.shopId.forEach((item2) => {
+        //     if (item1.id === item2) {
+        //       this.$refs.multipleTable.toggleRowSelection(item2, true);
+        //     }
+        //   });
+        // });
+      });
+    },
+    handleSelec(val) {
+      console.log(val);
+      this.plamses.shopId = [];
+      val.forEach((item) => {
+        this.plamses.shopId.push(item.id);
+      });
+      this.gerts();
+    },
+    gerts() {
+      console.log(this.ruleForm.idList, "查看数据");
+      gePtses(this.plamses).then((res) => {
+        console.log(res);
+        this.total = Number(res.code);
+        this.tableData = res.list;
+        this.tableData.forEach((item1) => {
+          console.log(item1);
+        //   this.ruleForm.idList.forEach((item2) => {
+        //     console.log(item2, "循环");
+        //     if (item1.id === item2) {
+        //       this.$refs.multipleTable.toggleRowSelection(item2, true);
+        //     }
+        //   });
+        });
+      });
+    },
+    qihuan(val){
+        console.log(val)
+        this.ruleForm.idList = [];
+    },
+    handleSelectionChange(val) {
+    //   this.ruleForm.idList = [];
+      val.forEach((item) => {
+        this.ruleForm.idList.push(item.id);
+      });
+    },
+    dialogForm() {
+      this.dialogFormVisible = false;
+      let plams = {
+        productId: this.ruleForm.idList,
+      };
+      gePtsesForm(plams).then((res) => {
+        console.log(res);
+        res.map(item=>{
+            item.paiban=this.paiban
+        })
+        res.forEach(item=>{
+            this.tableDataCheck.push(item);
+        })
+        console.log(this.tableDataCheck,'数据')
+       
+        
+        
+        // this.plamses.shopId = [];
+        // this.ruleForm.idList = [];
+       console.log(this.ruleForm,'看看是什么玩意')
+        
+      });
+     
+      //   this.reload();
+    },
+
+    handleClose(done) {
+      this.$confirm("确认关闭？")
+        .then((_) => {
+          done();
+          this.reload();
+        })
+        .catch((_) => {});
+    },
+
+    headleChangeColor() {
+      console.log(this.form);
+    },
+    add() {
+      this.ruleForm.activityStartTime = String(Date.parse(
+        this.ruleForm.activityStartTime
+      ));
+      this.ruleForm.activityEndTime = String(Date.parse(this.ruleForm.activityEndTime));
+      this.ruleForm.indexId = Number(this.ruleForm.indexId)
+      this.ruleForm.idInfo.forEach(item=>{
+            this.tableDataCheck.forEach(item2=>{
+               let plamt = {
+                   idList : item2.id,
+                   ids : item2.paiban
+               }
+                this.ruleForm.idInfo.push(
+                plamt
+                )
+            })
+        })
+        this.ruleForm.idInfo.shift()
+
+        let pilamse = []
+        this.tableDataCheck.forEach(iter=>{
+            console.log(iter)
+            pilamse.push(iter.id)
+        })
+        this.ruleForm.idList = pilamse
+      console.log(this.ruleForm,'到底哪里出了问题')
+      add(this.ruleForm).then((res) => {
+        console.log(res);
+        if (res == true) {
+          this.$message({
+            showClose: true,
+            message: "新增成功",
+            type: "success",
+          });
+          this.$router.push({
+            path: "/activity/Activitylist/",
+          });
+        }
+      });
+    },
+    submitForm(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          console.log(this.ruleForm,777);
+          this.add();
+        } else {
+          console.log("error submit!!");
+          return false;
+        }
+      });
+    },
+    resetForm(formName) {
+      this.$refs[formName].resetFields();
+      this.reload()
+    },
+  },
+};
+</script>
+<style scoped>
+.bodys {
+  padding: 15px;
+}
+.colores {
+  cursor: pointer;
+}
+.dial {
+  display: flex;
+  width: 100%;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/components/godds/activity/Activitylist/forms.vue b/src/views/components/godds/activity/Activitylist/forms.vue
new file mode 100644
index 0000000..e69de29
diff --git a/src/views/components/godds/activity/Activitylist/index.vue b/src/views/components/godds/activity/Activitylist/index.vue
new file mode 100644
index 0000000..81bf8b4
--- /dev/null
+++ b/src/views/components/godds/activity/Activitylist/index.vue
@@ -0,0 +1,246 @@
+<template>
+  <div class="body">
+    <div class="body-top">
+      <el-button type="primary" icon="el-icon-check" @click="NewActivities"
+        >新增</el-button
+      >
+    </div>
+    <div>
+      <el-table :data="tableData" style="width: 100%" v-loading="loading">
+        <el-table-column prop="id" label="活动ID" align="center">
+        </el-table-column>
+        <el-table-column  prop="img" label="活动图片"  align="center">
+        <template slot-scope="scope">
+          <a :href="scope.row.img" style="color: #42b983" target="_blank">
+            <img :src="scope.row.img" alt="点击打开" class="el-avatar">
+          </a>
+        </template>
+      </el-table-column>
+      <el-table-column  prop="sharingImg" label="活动分享图片"  align="center">
+        <template slot-scope="scope">
+          <a :href="scope.row.sharingImg" style="color: #42b983" target="_blank">
+            <img :src="scope.row.sharingImg" alt="点击打开" class="el-avatar">
+          </a>
+        </template>
+      </el-table-column>
+        <el-table-column prop="name" label="开始时间" align="center">
+          <template slot-scope="scope">
+            <span>{{formatTime(scope.row.startTime) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="name" label="结束时间" align="center">
+          <template slot-scope="scope">
+            <span>{{formatTime(scope.row.endTime) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="name" label="活动名称" align="center">
+        </el-table-column>
+        <el-table-column prop="intro" label="活动介绍" align="center">
+        </el-table-column>
+        <el-table-column label="操作" align="center">
+          <template slot-scope="scope">
+            <el-button slot="reference" type="text" @click="ViewProduct(scope.row)">查看商品</el-button>
+            <!-- <el-button type="text"  @click="handleEdit(scope.row)"
+              >修改</el-button
+            > -->
+            <!-- <el-button
+          size="mini"
+          type="danger"
+          @click="handleDelete(scope.row)">删除</el-button> -->
+            <el-popover
+              placement="top"
+              title="确定删除？"
+              width="200"
+              :ref="'popover-' + scope.row.id"
+              trigger="click"
+            >
+              <div style="text-align: right; margin: 0">
+                <el-button
+                  type="primary"
+                  size="mini"
+                  @click="deleteDeviceRow(scope.row)"
+                  >确定</el-button
+                >
+                <el-button size="mini" @click="pCancel(scope.row.id)"
+                  >取消</el-button
+                >
+              </div>
+              <el-button slot="reference" type="text">删除</el-button>
+            </el-popover>
+          </template>
+        </el-table-column>
+      </el-table>
+                <el-footer
+            style="height: 60px; width: 100%;"
+          >
+            <div style="float: left"></div>
+            <el-pagination
+              :total="total"
+              :current-page="plamses.page"
+              style="margin-top: 15px; float: right"
+              layout="total, prev, pager, next, sizes"
+              @size-change="sizeChange"
+              @current-change="pageChange"
+            />
+          </el-footer>
+    </div>
+    <el-dialog title="查看商品" :visible.sync="dialogTableVisible">
+      
+  <div v-for="(item,indexs) in gridData"  :key="indexs" style="margin-top:50px;margin-bottom:50px">
+    <h4
+      style="
+        margin-left: 15px;
+        font-size: 20px;
+        color: #323335;
+        margin-top: 10px;
+        margin-bottom: 20px;
+      "
+      v-if="indexs ==0"
+    >
+      {{'第一栏'}}
+    </h4>
+    <h4
+      style="
+        margin-left: 15px;
+        font-size: 20px;
+        color: #323335;
+        margin-top: 10px;
+        margin-bottom: 20px;
+      "
+      v-if="indexs ==1"
+    >
+      {{'第二栏'}}
+    </h4>
+    <h4
+      style="
+        margin-left: 15px;
+        font-size: 20px;
+        color: #323335;
+        margin-top: 10px;
+        margin-bottom: 20px;
+      "
+      v-if="indexs ==2"
+    >
+      {{'第三栏'}}
+    </h4>
+    <el-table  :data="item"  >
+    
+    <el-table-column property="id" label="ID" align="center" ></el-table-column>
+            <el-table-column  prop="image" label="商品图片"  align="center">
+        <template slot-scope="scope">
+          <a :href="scope.row.image" style="color: #42b983" target="_blank">
+            <img :src="scope.row.image" alt="点击打开" class="el-avatar">
+          </a>
+        </template>
+      </el-table-column>
+    <el-table-column property="store_name" label="商品名称" align="center"></el-table-column>
+    <el-table-column property="price" label="商品价格" align="center"></el-table-column>
+  </el-table>
+  </div>
+</el-dialog>
+   
+  </div>
+</template>
+<script>
+import { gets, del, getList } from '@/api/yxStoreActivity'
+import { formatTime } from "@/utils/index";
+export default {
+  inject: ["reload"],
+  data() {
+    return {
+      loading: false,
+      dialogTableVisible:false,
+      tableData: [],
+       gridData: [],
+      total:0,
+      plamses: {
+        page: 1,
+        limit: 10,
+      },
+      
+    };
+  },
+  created(){
+      this.gets()
+  },
+  methods: {
+    formatTime,
+    NewActivities() {
+        this.$router.push({
+            path:'/activity/Form/'
+        })
+    },
+    ViewProduct(row){ //查看商品
+    this.gridData = []
+      console.log(row)
+      this.dialogTableVisible = true
+      let plams = {
+        aid:row.id
+      }
+      
+      getList(plams).then(res=>{
+        for(let i in res ){
+          this.gridData.push(res[i])
+        }
+        
+        
+       
+      })
+    },
+    gets(){
+        gets(this.plamses).then(res=>{
+            console.log(res)
+            this.tableData = res.content
+            this.total = Number(res.totalElements)
+        })
+    },
+    deleteDeviceRow(row){
+      console.log(row,'删除')
+      let plams = {
+        ids:[]
+      }
+      plams.ids.push(Number(row.id))
+      del(plams).then(res =>{
+        console.log(res)
+      })
+      this.reload()
+    },
+    pCancel(row){
+      console.log(row,'取消删除')
+      this.reload()
+    },
+    handleEdit(row){
+      console.log(row,'修改')
+      localStorage.setItem('rows',JSON.stringify(row))
+      this.$router.push({
+            path:'/activity/Forms/' + row.id,
+           
+        })
+
+    },
+    sizeChange(val){
+      console.log(val,'条')
+      this.plamses.limit = val
+      this.gets()
+    },
+    pageChange(val){
+      console.log(val)
+      this.plamses.page = val
+      this.gets()
+    }
+   
+
+    
+      
+  },
+};
+</script>
+<style scoped>
+.body {
+  padding: 15px;
+}
+.body-top {
+  margin-bottom: 10px;
+}
+
+</style>
\ No newline at end of file
diff --git a/src/views/components/godds/activity/activityZone/index.vue b/src/views/components/godds/activity/activityZone/index.vue
new file mode 100644
index 0000000..675d4b7
--- /dev/null
+++ b/src/views/components/godds/activity/activityZone/index.vue
@@ -0,0 +1,101 @@
+<template>
+  <div class="body">
+    <el-input
+      class="input"
+      v-model="input"
+      placeholder="请输入要修改的活动商品id"
+    ></el-input>
+    <el-button type="primary" @click="comma">修改活动商品ID</el-button>
+    <p class="comma">请输入需要修改的活动商品ID请以","分隔开来</p>
+    <div>
+      <el-table
+ v-loading="loading"
+ :default-sort="{prop: 'sortNum', order: 'ascending'}"
+ :data="list"
+ border
+ align="left"
+>
+ <el-table-column
+  show-overflow-tooltip
+  v-for="(item, index) in col"
+  :key="`col_${index}`"
+  :prop="col[index].prop"
+  :label="item.label"
+ >
+  <template slot-scope="scope">
+   <p>{{scope.row[item.prop]}}</p> 
+  </template>
+ </el-table-column>
+</el-table>
+    </div>
+  </div>
+</template>
+<script>
+import Sortable from "sortablejs";
+export default {
+  components: {
+ Sortable
+ },
+  data() {
+    return {
+      input: "",
+      col: [
+  {
+   label: '位置',
+   prop: 'location'
+  },
+  {
+   label: '序号',
+   prop: 'sortNum'
+  },
+  {
+   label: '经办人',
+   prop: 'operator'
+  },
+  {
+   label: '操作',
+   prop: 'isClick'
+  }
+  ]
+    };
+  },
+  mounted(){
+    this.rowDrop()
+  },
+  methods: {
+    comma() {
+      console.log(this.input);
+    },
+      rowDrop() {
+  const tbody = document.querySelector('.el-table__body-wrapper tbody')
+  const _this = this
+  Sortable.create(tbody, {
+   onEnd({ newIndex, oldIndex }) {
+    const currRow = _this.list.splice(oldIndex, 1)[0]
+    _this.list.splice(newIndex, 0, currRow)
+    _this.list = _this.list.filter(({ adId }) => adId !== 0)
+  
+    _this.list.forEach((item, index) => {
+     _this.sortString += item.adId + ':' + (index + 1) + ','
+    })
+    _this.sortString = _this.sortString.substr(0, _this.sortString.length - 1)
+   }
+  })
+ }
+  },
+};
+</script>
+<style scoped>
+.body {
+  padding: 15px;
+}
+.input {
+  width: 70%;
+  margin-right: 15px;
+}
+.comma {
+  font-weight: 700;
+  font-size: 14px;
+  color: red;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/components/godds/activity/bargain/HowToPlay.vue b/src/views/components/godds/activity/bargain/HowToPlay.vue
new file mode 100644
index 0000000..12088ff
--- /dev/null
+++ b/src/views/components/godds/activity/bargain/HowToPlay.vue
@@ -0,0 +1,88 @@
+<template>
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" title="砍价玩法说明" width="900px">
+    <el-form ref="form" :model="form" :rules="rules" :inline="true" size="small" label-width="140px">
+      <el-form-item label="说明">
+        <editor v-model="form.bargainStatement" />
+      </el-form-item>
+      <el-form-item label="玩法">
+        <editor v-model="form.bargainRegulations" />
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="text" @click="cancel">取消</el-button>
+      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+// import { List,Config } from '@/api/yxStoreCombination'
+import { List , Config } from '@/api/yxStoreBargain'
+import editor from '../../components/Editor'
+import MaterialList from '@/components/material'
+import cgood from '@/views/components/goodss'
+export default {
+  components: { editor,  MaterialList ,cgood },
+  props: {
+    isAdd: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data() {
+    return {
+      loading: false, dialog: false,
+      form: {
+       
+        bargainStatement:'',
+        bargainRegulations:''
+      },
+      rules: {
+      }
+    }
+  },
+  created(){
+      this.List()
+  },
+  methods: {
+      cancel(){
+          this.dialog = false
+      },
+      
+    List(){
+        List().then(res=>{
+            console.log(res,'iopioipo')
+            this.form = res
+        })
+    },
+    doSubmit() {
+    //   this.loading = true
+
+      
+       this.Config()
+    },
+    Config() {  
+         console.log(this.form)
+      Config(this.form).then(res => {
+          console.log(res)
+        this.$notify({
+          title: '添加成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.dialog = false
+       
+      }).catch(err => {
+        this.dialog = false
+        console.log(err.response.data.message)
+      })
+    },
+    
+    
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/components/godds/activity/bargain/form.vue b/src/views/components/godds/activity/bargain/form.vue
new file mode 100644
index 0000000..fa6697e
--- /dev/null
+++ b/src/views/components/godds/activity/bargain/form.vue
@@ -0,0 +1,283 @@
+<template>
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="handleClose" :visible.sync="dialog" title=" 开启砍价" width="900px">
+    <el-form ref="form" :model="form" :rules="rules" :inline="true" size="small" label-width="140px">
+      <el-form-item label="砍价名称">
+        <el-input v-model="form.title" style="width: 500px;" />
+      </el-form-item>
+      <!-- <el-form-item label="砍价简介">
+        <el-input v-model="form.info" style="width: 500px;" rows="5" type="textarea" />
+      </el-form-item> -->
+      <el-form-item label="单位">
+        <el-input v-model="form.unitName" style="width: 500px;" />
+      </el-form-item>
+
+      <el-form-item label="活动开始时间">
+        <template>
+          <el-date-picker
+            v-model="form.startTime"
+            type="datetime"
+            placeholder="选择日期时间"
+          />
+        </template>
+      </el-form-item>
+      <el-form-item label="活动结束时间">
+        <template>
+          <el-date-picker
+            v-model="form.stopTime"
+            type="datetime"
+            placeholder="选择日期时间"
+          />
+        </template>
+      </el-form-item>
+      <!-- <el-form-item label="砍价产品主图片">
+        <MaterialList v-model="form.imageArr" style="width: 500px" type="image" :num="1" :width="150" :height="150" />
+      </el-form-item> -->
+      <el-form-item label="产品主图片" style="display: block;">
+           <!-- <el-input v-model="forms.productId" autocomplete="off"></el-input> -->
+           <cgood  @selectGoods="getGoods" v-model="form.imageArr"></cgood>
+        </el-form-item>
+      <el-form-item label="砍价产品轮播图">
+        <MaterialList v-model="form.sliderImageArr" style="width: 500px" type="image" :num="4" :width="150" :height="150" />
+      </el-form-item>
+      <!-- <el-form-item label="库存">
+        <el-input-number v-model="form.stock" />
+      </el-form-item> -->
+      <el-form-item label="虚假销量">
+        <el-input style="width:120px" onkeyup="value=value.replace(/[^\d]/g,'')" v-model="form.sales" />
+      </el-form-item>
+      <el-form-item label="砍价起始额">
+        <el-input style="width:120px" onkeyup="value=value.replace(/[^\d]/g,'')" v-model="form.price" />
+      </el-form-item>
+      <el-form-item label="最终付款额">
+        <el-input style="width:120px" onkeyup="value=value.replace(/[^\d]/g,'')" v-model="form.minPrice" />
+      </el-form-item>
+      <!-- <el-form-item label="限购">
+        <el-input-number v-model="form.num" />
+      </el-form-item> -->
+      <!-- <el-form-item label="单次砍最高价">
+        <el-input style="width:120px" onkeyup="value=value.replace(/[^\d]/g,'')" v-model="form.bargainMaxPrice" />
+      </el-form-item>
+      <el-form-item label="单次砍最低价">
+        <el-input style="width:120px" onkeyup="value=value.replace(/[^\d]/g,'')" v-model="form.bargainMinPrice" />
+      </el-form-item> -->
+      <el-form-item label="砍价次数">
+        <el-input-number v-model="form.needNum" />
+      </el-form-item>
+      <!-- <el-form-item label="用户每次砍价的次数">
+        <el-input-number v-model="form.bargainNum" />
+      </el-form-item> -->
+      
+      <!-- <el-form-item label="成本价">
+        <el-input-number v-model="form.cost" />
+      </el-form-item> -->
+      <!-- <el-form-item label="排序">
+        <el-input-number v-model="form.sort" />
+      </el-form-item> -->
+      <el-form-item label="砍价状态">
+        <el-radio v-model="form.status" :label="1">开启</el-radio>
+        <el-radio v-model="form.status" :label="0" style="width: 110px;">关闭</el-radio>
+      </el-form-item>
+      <!-- <el-form-item label="是否包邮">
+        <el-radio v-model="form.isPostage" :label="1">是</el-radio>
+        <el-radio v-model="form.isPostage" :label="0" style="width: 110px;">否</el-radio>
+      </el-form-item> -->
+      <!-- <el-form-item v-if="form.isPostage ===0" label="邮费">
+        <el-input-number v-model="form.postage" />
+      </el-form-item> -->
+      <!-- <el-form-item label="砍价规则">
+        <editor v-model="form.rule" />
+      </el-form-item> -->
+      <!-- <el-form-item label="砍价详情">
+        <editor v-model="form.description" />
+      </el-form-item> -->
+      <el-form-item label="规则">
+        <editor v-model="form.info" />
+      </el-form-item>
+      <!-- <el-form-item label="玩法">
+        <editor v-model="form.regulations" />
+      </el-form-item> -->
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="text" @click="cancel">取消</el-button>
+      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { add, edit } from '@/api/yxStoreBargain'
+import editor from '../../components/Editor'
+import MaterialList from '@/components/material'
+import cgood from '@/views/components/goodss'
+export default {
+  components: { editor, MaterialList,cgood },
+  inject: ["reload"],
+  props: {
+    isAdd: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data() {
+    return {
+      loading: false, dialog: false,
+      form: {
+        id: '',
+        productId: '',
+        title: '',
+        image: '',
+        unitName: '',
+        stock: 1,
+        sales: '',
+        images: '',
+        imageArr: [],
+        sliderImageArr: [],
+        startTime: '',
+        stopTime: '',
+        storeName: '',
+        price: '',
+        minPrice: '',
+        num: 1,
+        bargainMaxPrice: 0,
+        bargainMinPrice: 0,
+        bargainNum: 1,
+        status: '',
+        // description: '<p>熊</p>',
+        giveIntegral: '',
+        info: '',
+        cost: 0,
+        sort: 0,
+        isHot: 0,
+        isDel: 0,
+        addTime: '',
+        isPostage: 1,
+        postage: '',
+        // rule: '',
+        look: '',
+        share: '',
+        startTimeDate: '',
+        endTimeDate: '',
+        info:'',
+        needNum:''
+        // regulations:''
+      },
+      rules: {
+      }
+    }
+  },
+  watch: {
+    // 'form.imageArr': function(val) {
+    //   if (val) {
+    //     this.form.image = val.join(',')
+    //   }
+    // },
+    'form.sliderImageArr': function(val) {
+      if (val) {
+        this.form.images = val.join(',')
+      }
+    }
+  },
+  methods: {
+    getGoods(val){
+      console.log(val[0].id,'商品id关联')
+      this.form.productId = val[0].id
+      this.form.image = val[0].image
+      this.form.imageArr = val
+      
+    },
+    handleClose(done) {
+        this.$confirm('确认关闭？')
+          .then(_ => {
+            done();
+            this.reload()
+          })
+          .catch(_ => {});
+      },
+    cancel() {
+      this.resetForm()
+    },
+    doSubmit() {
+      this.loading = true
+      
+       this.doEdit()
+    },
+    // doAdd() {
+    //   add(this.form).then(res => {
+    //     this.resetForm()
+    //     this.$notify({
+    //       title: '添加成功',
+    //       type: 'success',
+    //       duration: 2500
+    //     })
+    //     this.loading = false
+    //     this.$parent.init()
+    //   }).catch(err => {
+    //     this.loading = false
+    //     console.log(err.response.data.message)
+    //   })
+    // },
+    doEdit() {
+      edit(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '修改成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+        this.reload()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    resetForm() {
+      this.dialog = false
+      this.$refs['form'].resetFields()
+      this.form = {
+        id: '',
+        productId: '',
+        title: '',
+        image: '',
+        unitName: '',
+        stock: '',
+        sales: '',
+        images: '',
+        imageArr: [],
+        sliderImageArr: [],
+        startTime: '',
+        stopTime: '',
+        storeName: '',
+        price: '',
+        minPrice: '',
+        num: 1,
+        bargainMaxPrice: 0,
+        bargainMinPrice: 0,
+        bargainNum: 1,
+        status: '',
+        // description: '<p>熊</p>',
+        giveIntegral: '',
+        info: '',
+        cost: 0,
+        sort: '',
+        isHot: '',
+        isDel: '',
+        addTime: '',
+        isPostage: '',
+        postage: '',
+        // rule: '',
+        look: '',
+        share: '',
+        info:'',
+        needNum:''
+        // regulations:''
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/components/godds/activity/bargain/formse.vue b/src/views/components/godds/activity/bargain/formse.vue
new file mode 100644
index 0000000..b11fa0b
--- /dev/null
+++ b/src/views/components/godds/activity/bargain/formse.vue
@@ -0,0 +1,286 @@
+<template>
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="handleClose" :visible.sync="dialog" title=" 新增砍价" width="900px">
+    <el-form ref="form" :model="form" :rules="rules" :inline="true" size="small" label-width="140px">
+      <el-form-item label="砍价名称">
+        <el-input v-model="form.title" style="width: 500px;" />
+      </el-form-item>
+      <!-- <el-form-item label="砍价简介">
+        <el-input v-model="form.info" style="width: 500px;" rows="5" type="textarea" />
+      </el-form-item> -->
+      <el-form-item label="单位">
+        <el-input v-model="form.unitName" style="width: 500px;" />
+      </el-form-item>
+
+      <el-form-item label="活动开始时间">
+        <template>
+          <el-date-picker
+            v-model="form.startTime"
+            type="datetime"
+            placeholder="选择日期时间"
+          />
+        </template>
+      </el-form-item>
+      <el-form-item label="活动结束时间">
+        <template>
+          <el-date-picker
+            v-model="form.stopTime"
+            type="datetime"
+            placeholder="选择日期时间"
+          />
+        </template>
+      </el-form-item>
+      <!-- <el-form-item label="砍价产品主图片">
+        <MaterialList v-model="form.imageArr" style="width: 500px" type="image" :num="1" :width="150" :height="150" />
+      </el-form-item> -->
+        <el-form-item label="产品主图片" style="display: block;">
+           <!-- <el-input v-model="forms.productId" autocomplete="off"></el-input> -->
+           <cgood  @selectGoods="getGoods" v-model="form.imageArr"></cgood>
+        </el-form-item>
+      <el-form-item label="砍价产品轮播图">
+        <MaterialList v-model="form.sliderImageArr" style="width: 500px" type="image" :num="4" :width="150" :height="150" />
+      </el-form-item>
+      <!-- <el-form-item label="库存">
+        <el-input-number v-model="form.stock" />
+      </el-form-item> -->
+      <el-form-item label="虚假销量">
+        <el-input style="width:120px" onkeyup="value=value.replace(/[^\d]/g,'')" v-model="form.sales" />
+      </el-form-item>
+      <el-form-item label="砍价起始额">
+        <el-input style="width:120px" onkeyup="value=value.replace(/[^\d]/g,'')" v-model="form.price" />
+      </el-form-item>
+      <el-form-item label="最终付款额">
+        <el-input style="width:120px" onkeyup="value=value.replace(/[^\d]/g,'')" v-model="form.minPrice" />
+      </el-form-item>
+      <!-- <el-form-item label="限购">
+        <el-input-number v-model="form.num" />
+      </el-form-item> -->
+      <!-- <el-form-item label="单次砍最高价">
+        <el-input style="width:120px" onkeyup="value=value.replace(/[^\d]/g,'')" v-model="form.bargainMaxPrice" />
+      </el-form-item>
+      <el-form-item label="单次砍最低价" >
+        <el-input style="width:120px" onkeyup="value=value.replace(/[^\d]/g,'')" v-model="form.bargainMinPrice" />
+      </el-form-item> -->
+      <el-form-item label="砍价次数">
+        <el-input-number v-model="form.needNum" />
+      </el-form-item>
+      <!-- <el-form-item label="砍价次数" >
+        <el-input style="width:120px" onkeyup="value=value.replace(/[^\d]/g,'')" v-model="form.needNum" />
+      </el-form-item> -->
+      <!-- <el-form-item label="用户每次砍价的次数">
+        <el-input-number v-model="form.bargainNum" />
+      </el-form-item> -->
+     
+      <!-- <el-form-item label="成本价">
+        <el-input-number v-model="form.cost" />
+      </el-form-item> -->
+      <!-- <el-form-item label="排序">
+        <el-input-number v-model="form.sort" />
+      </el-form-item> -->
+       <el-form-item label="砍价状态" >
+        <el-radio v-model="form.status" :label="1">开启</el-radio>
+        <el-radio v-model="form.status" :label="0" style="width: 110px;">关闭</el-radio>
+      </el-form-item>
+      <!-- <el-form-item label="是否包邮">
+        <el-radio v-model="form.isPostage" :label="1">是</el-radio>
+        <el-radio v-model="form.isPostage" :label="0" style="width: 110px;">否</el-radio>
+      </el-form-item> -->
+      <!-- <el-form-item v-if="form.isPostage ===0" label="邮费">
+        <el-input-number v-model="form.postage" />
+      </el-form-item> -->
+      <!-- <el-form-item label="砍价规则">
+        <editor v-model="form.rule" />
+      </el-form-item> -->
+      <!-- <el-form-item label="砍价详情">
+        <editor v-model="form.description" />
+      </el-form-item> -->
+      <el-form-item label="规则">
+        <editor v-model="form.info" />
+      </el-form-item>
+      <!-- <el-form-item label="玩法">
+        <editor v-model="form.regulations" />
+      </el-form-item> -->
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="text" @click="cancel">取消</el-button>
+      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { add, edit } from '@/api/yxStoreBargain'
+import editor from '../../components/Editor'
+import MaterialList from '@/components/material'
+import cgood from '@/views/components/goodss'
+export default {
+  inject: ["reload"],
+  components: { editor, MaterialList,cgood },
+  props: {
+    isAdd: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data() {
+    return {
+      loading: false, dialog: false,
+      form: {
+        id: '',
+        productId: '',
+        title: '',
+        image: '',
+        unitName: '',
+        stock: 1,
+        sales: '',
+        images: '',
+        imageArr: [],
+        sliderImageArr: [],
+        startTime: '',
+        stopTime: '',
+        storeName: '',
+        price: '',
+        minPrice: '',
+        num: 1,
+        bargainMaxPrice: 0,
+        bargainMinPrice: 0,
+        bargainNum: 1,
+        status: 0,
+        description: '<p>熊</p>',
+        giveIntegral: '',
+        info: '',
+        cost: 0,
+        sort: 0,
+        isHot: 0,
+        isDel: 0,
+        addTime: '',
+        isPostage: 1,
+        postage: '',
+        // rule: '',
+        look: '',
+        share: '',
+        startTimeDate: '',
+        endTimeDate: '',
+        info:'',
+        // regulations:'',
+        needNum:null
+      },
+      rules: {
+      }
+    }
+  },
+  watch: {
+    // 'form.imageArr': function(val) {
+    //   if (val) {
+    //     this.form.image = val.join(',')
+    //   }
+    // },
+    'form.sliderImageArr': function(val) {
+      if (val) {
+        this.form.images = val.join(',')
+      }
+    }
+  },
+  methods: {
+      getGoods(val){
+      console.log(val[0].id,'商品id关联')
+      this.form.productId = val[0].id
+      this.form.image = val[0].image
+      this.form.imageArr = val
+      
+    },
+    handleClose(done) {
+        this.$confirm('确认关闭？')
+          .then(_ => {
+            done();
+            this.reload()
+          })
+          .catch(_ => {});
+      },
+    cancel() {
+      this.resetForm()
+    },
+    doSubmit() {
+      this.loading = true
+      
+        this.doAdd()
+      
+    },
+    doAdd() {
+      add(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '添加成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+        this.reload()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    // doEdit() {
+    //   edit(this.form).then(res => {
+    //     this.resetForm()
+    //     this.$notify({
+    //       title: '修改成功',
+    //       type: 'success',
+    //       duration: 2500
+    //     })
+    //     this.loading = false
+    //     this.$parent.init()
+    //   }).catch(err => {
+    //     this.loading = false
+    //     console.log(err.response.data.message)
+    //   })
+    // },
+    resetForm() {
+      this.dialog = false
+      this.$refs['form'].resetFields()
+      this.form = {
+        id: '',
+        productId: '',
+        title: '',
+        image: '',
+        unitName: '',
+        stock: '',
+        sales: '',
+        images: '',
+        imageArr: [],
+        sliderImageArr: [],
+        startTime: '',
+        stopTime: '',
+        storeName: '',
+        price: '',
+        minPrice: '',
+        num: 1,
+        bargainMaxPrice: 0,
+        bargainMinPrice: 0,
+        bargainNum: 1,
+        status: '',
+        description: '<p>熊</p>',
+        giveIntegral: '',
+        info: '',
+        cost: 0,
+        sort: '',
+        isHot: '',
+        isDel: '',
+        addTime: '',
+        isPostage: '',
+        postage: '',
+        // rule: '',
+        look: '',
+        share: '',
+        info:'',
+        // regulations:''
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/components/godds/activity/bargain/index.vue b/src/views/components/godds/activity/bargain/index.vue
new file mode 100644
index 0000000..2c5e4cf
--- /dev/null
+++ b/src/views/components/godds/activity/bargain/index.vue
@@ -0,0 +1,214 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container" >
+      <el-button
+        type="danger"
+        class="filter-item"
+        size="mini"
+        icon="el-icon-refresh"
+        @click="toQuery"
+      >刷新</el-button>
+      <el-button
+        type="primary"
+        class="filter-item"
+        size="mini"
+        icon="el-icon-check"
+        @click="add"
+       
+      >
+      新增
+      </el-button>
+      <!-- <el-button
+        type="primary"
+        class="filter-item"
+        size="mini"
+        icon="el-icon-info"
+        @click="addew"
+       
+      >
+      玩法说明
+      </el-button> -->
+    </div>
+    <!--表单组件-->
+    <eForm ref="form" :is-add="isAdd" />
+    <newl ref="form2" :is-add="isAdd" />
+    <how ref="form3" :is-add="isAdd" />
+    <!--表格渲染-->
+    <el-table v-loading="loading" :data="data" size="small" style="width: 100%;height:calc(100vh - 245px);overflow-y: scroll;">
+      <el-table-column prop="id" label="砍价产品ID"  align="center"/>
+      <el-table-column prop="title" label="砍价名称" align="center" />
+      <el-table-column prop="image" label="砍价图片" align="center">
+        <template slot-scope="scope">
+          <a :href="scope.row.image" style="color: #42b983" target="_blank"><img :src="scope.row.image" alt="点击打开" class="el-avatar"></a>
+        </template>
+      </el-table-column>
+      <el-table-column prop="price" label="砍价价格" align="center" />
+      <!-- <el-table-column prop="price" label="砍价区间" align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.row.bargainMinPrice }}~{{ scope.row.bargainMaxPrice }}</span>
+        </template>
+      </el-table-column> -->
+      <el-table-column prop="needNum" label="砍价次数" align="center" />
+      <el-table-column prop="minPrice" label="最低价" align="center" />
+      <el-table-column prop="stock" label="库存" align="center" />
+      <el-table-column prop="statusStr" label="砍价状态" align="center" />
+      <el-table-column prop="startTime" label="开始时间" align="center" width="150">
+        <template slot-scope="scope">
+          <span>{{ formatTimeTwo(scope.row.startTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="stopTime" label="结束时间" align="center" width="150">
+        <template slot-scope="scope">
+          <span>{{ formatTimeTwo(scope.row.stopTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="sales" label="销量" align="center" />
+      <el-table-column prop="look" label="浏览量"  align="center"/>
+      <el-table-column prop="share" label="分享量"  align="center"/>
+      <el-table-column v-if="checkPermission(['admin','YXSTOREBARGAIN_ALL','YXSTOREBARGAIN_EDIT','YXSTOREBARGAIN_DELETE'])" label="操作" width="150px" align="center" fixed="right">
+        <template slot-scope="scope">
+          <el-button v-permission="['admin','YXSTOREBARGAIN_ALL','YXSTOREBARGAIN_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)" />
+          <el-popover
+            :ref="scope.row.id"
+            v-permission="['admin','YXSTOREBARGAIN_ALL','YXSTOREBARGAIN_DELETE']"
+            placement="top"
+            width="180"
+          >
+            <p>确定删除本条数据吗？</p>
+            <div style="text-align: right; margin: 0">
+              <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
+              <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
+            </div>
+            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
+          </el-popover>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--分页组件-->
+   <el-footer style="height:60px;width:100%;background-color:#f6f6f6">
+     <div style="float:left"></div>
+     <el-pagination
+      :total="total"
+      :current-page="page + 1"
+      style="margin-top: 15px; float:right"
+      layout="total, prev, pager, next, sizes"
+      @size-change="sizeChange"
+      @current-change="pageChange"
+    />
+   </el-footer>
+  </div>
+</template>
+
+<script>
+import checkPermission from '@/utils/permission'
+import initData from '@/mixins/crud'
+import { del } from '@/api/yxStoreBargain'
+import eForm from './form'
+import { formatTimeTwo, parseTime } from '@/utils/index'
+import newl from './formse'
+import how from './HowToPlay'
+export default {
+  components: { eForm ,newl ,how},
+  mixins: [initData],
+  data() {
+    return {
+      delLoading: false
+    }
+  },
+  created() {
+    this.$nextTick(() => {
+      this.init()
+    })
+  },
+  methods: {
+    parseTime,
+    formatTimeTwo,
+    checkPermission,
+    beforeInit() {
+      this.url = 'api/yxStoreBargain'
+      const sort = 'id,desc'
+      this.params = { page: this.page, size: this.size, sort: sort }
+      return true
+    },
+    subDelete(id) {
+      this.delLoading = true
+      del(id).then(res => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        this.dleChangePage()
+        this.init()
+        this.$notify({
+          title: '删除成功',
+          type: 'success',
+          duration: 2500
+        })
+      }).catch(err => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        console.log(err.response.data.message)
+      })
+    },
+    add() {
+      this.isAdd = true
+      this.$refs.form2.dialog = true
+    },
+    addew(){
+      this.isAdd = true
+      this.$refs.form3.dialog = true
+    },
+    edit(data) {
+      console.log(data,'修改的数据')
+      this.isAdd = false
+      const _this = this.$refs.form
+      _this.form = {
+        id: data.id,
+        productId: data.productId,
+        title: data.title,
+        image: data.image,
+        unitName: data.unitName,
+        stock: data.stock,
+        sales: data.sales,
+        images: data.images,
+        imageArr: data.imageArr,
+        sliderImageArr: data.images.split(','),
+        startTime: data.startTime,
+        stopTime: data.stopTime,
+        storeName: data.storeName,
+        price: data.price,
+        minPrice: data.minPrice,
+        num: 1,
+        bargainMaxPrice: data.bargainMaxPrice,
+        bargainMinPrice: data.bargainMinPrice,
+        bargainNum: data.bargainNum,
+        status: data.status,
+        description: data.description,
+        giveIntegral: data.giveIntegral,
+        info: data.info,
+        cost: data.cost,
+        sort: data.sort,
+        isHot: data.isHot,
+        isDel: data.isDel,
+        addTime: data.addTime,
+        isPostage: data.isPostage,
+        postage: data.postage,
+        rule: data.rule,
+        look: data.look,
+        share: data.share,
+        startTimeDate: new Date(data.startTimeDate),
+        endTimeDate: new Date(data.endTimeDate),
+        info:data.info,
+        needNum:data.needNum
+        // regulations:data.regulations
+      }
+      _this.dialog = true
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .app-container{
+  padding-bottom: 0px;
+}
+</style>
diff --git a/src/views/components/godds/activity/bargain_user/form.vue b/src/views/components/godds/activity/bargain_user/form.vue
new file mode 100644
index 0000000..a60fef4
--- /dev/null
+++ b/src/views/components/godds/activity/bargain_user/form.vue
@@ -0,0 +1,124 @@
+<template>
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增' : '编辑'" width="500px">
+    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
+      <el-form-item label="用户ID">
+        <el-input v-model="form.uid" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="砍价产品id">
+        <el-input v-model="form.bargainId" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="砍价的最低价">
+        <el-input v-model="form.bargainPriceMin" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="砍价金额">
+        <el-input v-model="form.bargainPrice" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="砍掉的价格">
+        <el-input v-model="form.price" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="状态 1参与中 2 活动结束参与失败 3活动结束参与成功">
+        <el-input v-model="form.status" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="参与时间">
+        <el-input v-model="form.addTime" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="是否取消">
+        <el-input v-model="form.isDel" style="width: 370px;" />
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="text" @click="cancel">取消</el-button>
+      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { add, edit } from '@/api/yxStoreBargainUser'
+export default {
+  props: {
+    isAdd: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data() {
+    return {
+      loading: false, dialog: false,
+      form: {
+        id: '',
+        uid: '',
+        bargainId: '',
+        bargainPriceMin: '',
+        bargainPrice: '',
+        price: '',
+        status: '',
+        addTime: '',
+        isDel: ''
+      },
+      rules: {
+      }
+    }
+  },
+  methods: {
+    cancel() {
+      this.resetForm()
+    },
+    doSubmit() {
+      this.loading = true
+      if (this.isAdd) {
+        this.doAdd()
+      } else this.doEdit()
+    },
+    doAdd() {
+      add(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '添加成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    doEdit() {
+      edit(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '修改成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    resetForm() {
+      this.dialog = false
+      this.$refs['form'].resetFields()
+      this.form = {
+        id: '',
+        uid: '',
+        bargainId: '',
+        bargainPriceMin: '',
+        bargainPrice: '',
+        price: '',
+        status: '',
+        addTime: '',
+        isDel: ''
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/components/godds/activity/bargain_user/index.vue b/src/views/components/godds/activity/bargain_user/index.vue
new file mode 100644
index 0000000..71c18ef
--- /dev/null
+++ b/src/views/components/godds/activity/bargain_user/index.vue
@@ -0,0 +1,131 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <!-- 新增 -->
+      <div style="display: inline-block;margin: 0px 2px;">
+        <el-button
+          v-permission="['admin','YXSTOREBARGAINUSER_ALL','YXSTOREBARGAINUSER_CREATE']"
+          class="filter-item"
+          size="mini"
+          type="primary"
+          icon="el-icon-plus"
+          @click="add"
+        >新增</el-button>
+      </div>
+    </div>
+    <!--表单组件-->
+    <eForm ref="form" :is-add="isAdd" />
+    <!--表格渲染-->
+    <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
+      <el-table-column prop="id" label="用户参与砍价表ID" />
+      <el-table-column prop="uid" label="用户ID" />
+      <el-table-column prop="bargainId" label="砍价产品id" />
+      <el-table-column prop="bargainPriceMin" label="砍价的最低价" />
+      <el-table-column prop="bargainPrice" label="砍价金额" />
+      <el-table-column prop="price" label="砍掉的价格" />
+      <el-table-column prop="status" label="状态 1参与中 2 活动结束参与失败 3活动结束参与成功" />
+      <el-table-column prop="addTime" label="参与时间" />
+      <el-table-column prop="isDel" label="是否取消" />
+      <el-table-column v-if="checkPermission(['admin','YXSTOREBARGAINUSER_ALL','YXSTOREBARGAINUSER_EDIT','YXSTOREBARGAINUSER_DELETE'])" label="操作" width="150px" align="center">
+        <template slot-scope="scope">
+          <el-button v-permission="['admin','YXSTOREBARGAINUSER_ALL','YXSTOREBARGAINUSER_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)" />
+          <el-popover
+            :ref="scope.row.id"
+            v-permission="['admin','YXSTOREBARGAINUSER_ALL','YXSTOREBARGAINUSER_DELETE']"
+            placement="top"
+            width="180"
+          >
+            <p>确定删除本条数据吗？</p>
+            <div style="text-align: right; margin: 0">
+              <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
+              <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
+            </div>
+            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
+          </el-popover>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--分页组件-->
+    <el-pagination
+      :total="total"
+      :current-page="page + 1"
+      style="margin-top: 8px;"
+      layout="total, prev, pager, next, sizes"
+      @size-change="sizeChange"
+      @current-change="pageChange"
+    />
+  </div>
+</template>
+
+<script>
+import checkPermission from '@/utils/permission'
+import initData from '@/mixins/crud'
+import { del } from '@/api/yxStoreBargainUser'
+import eForm from './form'
+export default {
+  components: { eForm },
+  mixins: [initData],
+  data() {
+    return {
+      delLoading: false
+    }
+  },
+  created() {
+    this.$nextTick(() => {
+      this.init()
+    })
+  },
+  methods: {
+    checkPermission,
+    beforeInit() {
+      this.url = 'api/yxStoreBargainUser'
+      const sort = 'id,desc'
+      this.params = { page: this.page, size: this.size, sort: sort }
+      return true
+    },
+    subDelete(id) {
+      this.delLoading = true
+      del(id).then(res => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        this.dleChangePage()
+        this.init()
+        this.$notify({
+          title: '删除成功',
+          type: 'success',
+          duration: 2500
+        })
+      }).catch(err => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        console.log(err.response.data.message)
+      })
+    },
+    add() {
+      this.isAdd = true
+      this.$refs.form.dialog = true
+    },
+    edit(data) {
+      this.isAdd = false
+      const _this = this.$refs.form
+      _this.form = {
+        id: data.id,
+        uid: data.uid,
+        bargainId: data.bargainId,
+        bargainPriceMin: data.bargainPriceMin,
+        bargainPrice: data.bargainPrice,
+        price: data.price,
+        status: data.status,
+        addTime: data.addTime,
+        isDel: data.isDel
+      }
+      _this.dialog = true
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/components/godds/activity/combination/HowToPlay.vue b/src/views/components/godds/activity/combination/HowToPlay.vue
new file mode 100644
index 0000000..ac78f0e
--- /dev/null
+++ b/src/views/components/godds/activity/combination/HowToPlay.vue
@@ -0,0 +1,87 @@
+<template>
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" title="拼团玩法说明" width="900px">
+    <el-form ref="form" :model="form" :rules="rules" :inline="true" size="small" label-width="140px">
+      <el-form-item label="说明">
+        <editor v-model="form.pinkStatement" />
+      </el-form-item>
+      <el-form-item label="玩法">
+        <editor v-model="form.pinkRegulations" />
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="text" @click="cancel">取消</el-button>
+      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { List,Config } from '@/api/yxStoreCombination'
+import editor from '../../components/Editor'
+import MaterialList from '@/components/material'
+import cgood from '@/views/components/goodss'
+export default {
+  components: { editor,  MaterialList ,cgood },
+  props: {
+    isAdd: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data() {
+    return {
+      loading: false, dialog: false,
+      form: {
+       
+        pinkStatement:'',
+        pinkRegulations:''
+      },
+      rules: {
+      }
+    }
+  },
+  created(){
+      this.List()
+  },
+  methods: {
+      cancel(){
+          this.dialog = false
+      },
+      
+    List(){
+        List().then(res=>{
+            console.log(res,'iopioipo')
+            this.form = res
+        })
+    },
+    doSubmit() {
+    //   this.loading = true
+
+      
+       this.Config()
+    },
+    Config() {  
+         console.log(this.form)
+      Config(this.form).then(res => {
+          console.log(res)
+        this.$notify({
+          title: '添加成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.dialog = false
+       
+      }).catch(err => {
+        this.dialog = false
+        console.log(err.response.data.message)
+      })
+    },
+    
+    
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/components/godds/activity/combination/form.vue b/src/views/components/godds/activity/combination/form.vue
new file mode 100644
index 0000000..3aff5a7
--- /dev/null
+++ b/src/views/components/godds/activity/combination/form.vue
@@ -0,0 +1,258 @@
+<template>
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="handleClose" :visible.sync="dialog" title=" 开启拼团" width="900px">
+    <el-form ref="form" :model="form" :rules="rules" :inline="true" size="small" label-width="140px">
+      <el-form-item label="拼团名称">
+        <el-input v-model="form.title" style="width: 500px;" />
+      </el-form-item>
+      <!-- <el-form-item label="拼团简介">
+        <el-input v-model="form.info" style="width: 500px;" />
+      </el-form-item> -->
+      <el-form-item label="单位">
+        <el-input v-model="form.unitName" style="width: 500px;" />
+      </el-form-item>
+      <el-form-item label="拼团开始时间">
+        <template>
+          <el-date-picker
+            v-model="form.startTime"
+            type="datetime"
+            placeholder="选择日期时间"
+          />
+        </template>
+      </el-form-item>
+      <el-form-item label="拼团结束时间">
+        <template>
+          <el-date-picker
+            v-model="form.stopTime"
+            type="datetime"
+            placeholder="选择日期时间"
+          />
+        </template>
+      </el-form-item>
+      <!-- <el-form-item label="产品主图片">
+        <MaterialList v-model="form.imageArr" style="width: 500px" type="image" :num="1" :width="150" :height="150" />
+      </el-form-item> -->
+      <el-form-item label="产品主图片" style="display: block;">
+          <!-- <el-input v-model="forms.productId" autocomplete="off"></el-input> -->
+           <cgood  @selectGoods="getGoods" v-model="form.imageArr"></cgood>
+        </el-form-item>
+      <el-form-item label="产品轮播图">
+        <MaterialList v-model="form.sliderImageArr" style="width: 500px" type="image" :num="4" :width="150" :height="150" />
+      </el-form-item>
+      <el-form-item label="拼团时效(单位小时)">
+        <el-input-number v-model="form.effectiveTime" style="width: 500px;" />
+      </el-form-item>
+      <!-- <el-form-item label="拼团价">
+        <el-input-number v-model="form.price" />
+      </el-form-item> -->
+      <el-form-item label="拼团人数">
+        <el-input style="width:100px" onkeyup="value=value.replace(/[^\d]/g,'')" v-model="form.people" />
+      </el-form-item>
+      <el-form-item label="虚拟原价">
+        <el-input style="width:100px" onkeyup="value=value.replace(/[^\d]/g,'')" v-model="form.productPrice" />
+      </el-form-item>
+      <!-- <el-form-item label="库存">
+        <el-input-number v-model="form.stock" />
+      </el-form-item> -->
+      <el-form-item label="销量">
+        <el-input style="width:100px" onkeyup="value=value.replace(/[^\d]/g,'')" v-model="form.sales" />
+      </el-form-item>
+      <!-- <el-form-item label="排序">
+        <el-input-number v-model="form.sort" />
+      </el-form-item> -->
+      <!-- <el-form-item label="邮费">
+        <el-input-number v-model="form.postage" />
+      </el-form-item> -->
+      <!-- <el-form-item label="是否包邮">
+        <el-radio v-model="form.isPostage" :label="1">是</el-radio>
+        <el-radio v-model="form.isPostage" :label="0" style="width: 110px;">否</el-radio>
+      </el-form-item> -->
+      <el-form-item label="活动状态">
+        <el-radio v-model="form.isShow" :label="1">开启</el-radio>
+        <el-radio v-model="form.isShow" :label="0" style="width: 200px;">关闭</el-radio>
+      </el-form-item>
+      <!-- <el-form-item label="详情">
+        <editor v-model="form.description" />
+      </el-form-item> -->
+      <!-- <el-form-item label="说明">
+        <editor v-model="form.pinkStatement" />
+      </el-form-item>
+      <el-form-item label="玩法">
+        <editor v-model="form.pinkRegulations" />
+      </el-form-item> -->
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="text" @click="cancel">取消</el-button>
+      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { add, edit } from '@/api/yxStoreCombination'
+import editor from '../../components/Editor'
+import MaterialList from '@/components/material'
+import cgood from '@/views/components/goodss'
+export default {
+  components: { editor,  MaterialList,cgood },
+   inject: ["reload"],
+  props: {
+    isAdd: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data() {
+    return {
+      loading: false, dialog: false,
+      form: {
+        id: '',
+        productId: '',
+        merId: '',
+        image: '',
+        images: '',
+        imageArr: [],
+        sliderImageArr: [],
+        title: '',
+        attr: null,
+        people: '',
+        info: '',
+        price: 0,
+        sort: 0,
+        sales: '',
+        addTime: '',
+        isHost: '',
+        isShow: 1,
+        isDel: 0,
+        merUse: '',
+        isPostage: null,
+        postage: 0,
+        description: '<p>123</p>',
+        startTime: '',
+        stopTime: '',
+        effectiveTime: '',
+        cost: '',
+        browse: '',
+        unitName: '',
+        combination: 1,
+        browse: 0,
+        startTimeDate: '',
+        endTimeDate: '',
+        productPrice:'',
+        // pinkStatement:'',
+        // pinkRegulations:''
+      },
+      rules: {
+      }
+    }
+  },
+  watch: {
+    // 'form.imageArr': function(val) {
+    //   if (val) {
+    //     this.form.image = val.join(',')
+    //   }
+    // },
+    'form.sliderImageArr': function(val) {
+      if (val) {
+        this.form.images = val.join(',')
+      }
+    }
+  },
+  methods: {
+    handleClose(done) {
+        this.$confirm('确认关闭？')
+          .then(_ => {
+            done();
+            this.reload()
+          })
+          .catch(_ => {});
+      },
+    getGoods(val){
+      console.log(val[0].id,'商品id关联')
+      this.form.productId = val[0].id
+      this.form.image = val[0].image
+      this.form.imageArr = val
+    },
+    cancel() {
+      this.resetForm()
+    },
+    doSubmit() {
+      this.loading = true
+       this.doEdit()
+    },
+    // doAdd() {
+    //   add(this.form).then(res => {
+    //     this.resetForm()
+    //     this.$notify({
+    //       title: '添加成功',
+    //       type: 'success',
+    //       duration: 2500
+    //     })
+    //     this.loading = false
+    //     this.$parent.init()
+    //   }).catch(err => {
+    //     this.loading = false
+    //     console.log(err.response.data.message)
+    //   })
+    // },
+    doEdit() {
+      
+      edit(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '操作成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+        this.reload()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    resetForm() {
+      this.dialog = false
+      this.$refs['form'].resetFields()
+      this.form = {
+        id: '',
+        productId: '',
+        merId: '',
+        image: '',
+        images: '',
+        imageArr: [],
+        sliderImageArr: [],
+        title: '',
+        attr: null,
+        people: 0,
+        info: '',
+        price: 0,
+        sort: '',
+        sales: '',
+        addTime: '',
+        isHost: '',
+        isShow: '',
+        isDel: '',
+        combination: '',
+        merUse: '',
+        isPostage: '',
+        postage: '',
+        description: '<p>123</p>',
+        startTimeDate: '',
+        endTimeDate: '',
+        effectiveTime: 24,
+        cost: '',
+        browse: '',
+        unitName: '',
+        productPrice:'',
+        // pinkStatement:'',
+        // pinkRegulations:''
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/components/godds/activity/combination/formt.vue b/src/views/components/godds/activity/combination/formt.vue
new file mode 100644
index 0000000..66c00a5
--- /dev/null
+++ b/src/views/components/godds/activity/combination/formt.vue
@@ -0,0 +1,264 @@
+<template>
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="handleClose" :visible.sync="dialog" title=" 新增拼团" width="900px">
+    <el-form ref="form" :model="form" :rules="rules" :inline="true" size="small" label-width="140px">
+      <el-form-item label="拼团名称">
+        <el-input v-model="form.title" style="width: 500px;" />
+      </el-form-item>
+      <!-- <el-form-item label="拼团简介">
+        <el-input v-model="form.info" style="width: 500px;" />
+      </el-form-item> -->
+      <el-form-item label="单位">
+        <el-input v-model="form.unitName" style="width: 500px;" />
+      </el-form-item>
+      <el-form-item label="拼团开始时间">
+        <template>
+          <el-date-picker
+            v-model="form.startTime"
+            type="datetime"
+            placeholder="选择日期时间"
+          />
+        </template>
+      </el-form-item>
+      <el-form-item label="拼团结束时间">
+        <template>
+          <el-date-picker
+            v-model="form.stopTime"
+            type="datetime"
+            placeholder="选择日期时间"
+          />
+        </template>
+      </el-form-item>
+      <!-- <el-form-item label="产品主图片">
+        <MaterialList v-model="form.imageArr" style="width: 500px" type="image" :num="1" :width="150" :height="150" />
+      </el-form-item> -->
+      <el-form-item label="产品主图片" style="display: block;">
+          <!-- <el-input v-model="forms.productId" autocomplete="off"></el-input> -->
+           <cgood  @selectGoods="getGoods" v-model="form.imageArr"></cgood>
+        </el-form-item>
+      <el-form-item label="产品轮播图">
+        <MaterialList v-model="form.sliderImageArr" style="width: 500px" type="image" :num="4" :width="150" :height="150" />
+      </el-form-item>
+      <el-form-item label="拼团时效(单位小时)">
+        <el-input-number v-model="form.effectiveTime" style="width: 500px;" />
+      </el-form-item>
+      <!-- <el-form-item label="拼团价">
+        <el-input-number v-model="form.price" />
+      </el-form-item> -->
+      <el-form-item label="拼团人数">
+        <el-input style="width:100px" onkeyup="value=value.replace(/[^\d]/g,'')" v-model="form.people" />
+      </el-form-item>
+      <el-form-item label="虚拟原价">
+        <el-input style="width:100px" onkeyup="value=value.replace(/[^\d]/g,'')" v-model="form.productPrice" />
+      </el-form-item>
+      <!-- <el-form-item label="库存">
+        <el-input-number v-model="form.stock" />
+      </el-form-item> -->
+      <el-form-item label="销量">
+        <el-input style="width:100px" onkeyup="value=value.replace(/[^\d]/g,'')" v-model="form.sales" />
+      </el-form-item>
+      <!-- <el-form-item label="排序">
+        <el-input-number v-model="form.sort" />
+      </el-form-item> -->
+      <!-- <el-form-item label="邮费">
+        <el-input-number v-model="form.postage" />
+      </el-form-item> -->
+      <!-- <el-form-item label="是否包邮">
+        <el-radio v-model="form.isPostage" :label="1">是</el-radio>
+        <el-radio v-model="form.isPostage" :label="0" style="width: 110px;">否</el-radio>
+      </el-form-item> -->
+      <el-form-item label="活动状态">
+        <el-radio v-model="form.isShow" :label="1">开启</el-radio>
+        <el-radio v-model="form.isShow" :label="0" style="width: 200px;">关闭</el-radio>
+      </el-form-item>
+      <!-- <el-form-item label="详情">
+        <editor v-model="form.description" />
+      </el-form-item> -->
+      
+      <!-- <el-form-item label="说明">
+        <editor v-model="form.pinkStatement" />
+      </el-form-item>
+      <el-form-item label="玩法">
+        <editor v-model="form.pinkRegulations" />
+      </el-form-item> -->
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="text" @click="cancel">取消</el-button>
+      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { add, edit } from '@/api/yxStoreCombination'
+import editor from '../../components/Editor'
+import MaterialList from '@/components/material'
+import cgood from '@/views/components/goodss'
+export default {
+  inject: ["reload"],
+  components: { editor,  MaterialList ,cgood },
+  props: {
+    isAdd: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data() {
+    return {
+      loading: false, dialog: false,
+      form: {
+        id: '',
+        productId: '',
+        merId: '',
+        image: '',
+        images: '',
+        imageArr: [],
+        sliderImageArr: [],
+        title: '',
+        attr: null,
+        people: '',
+        info: '',
+        price: 0,
+        sort: 0,
+        sales: '',
+        stock: 20,
+        addTime: '',
+        isHost: '',
+        isShow: 1,
+        isDel: 0,
+        merUse: '',
+        isPostage: null,
+        postage: 0,
+        description: '<p>123</p>',
+        startTime: '',
+        stopTime: '',
+        effectiveTime: '',
+        cost: '',
+        browse: '',
+        unitName: '',
+        combination: 1,
+        browse: 0,
+        startTimeDate: '',
+        endTimeDate: '',
+        productPrice:'',
+        // pinkStatement:'',
+        // pinkRegulations:''
+      },
+      rules: {
+      }
+    }
+  },
+  watch: {
+    // 'form.imageArr': function(val) {
+    //   if (val) {
+    //     this.form.image = val.join(',')
+    //   }
+    // },
+    'form.sliderImageArr': function(val) {
+      if (val) {
+        this.form.images = val.join(',')
+      }
+    }
+  },
+  methods: {
+    handleClose(done) {
+        this.$confirm('确认关闭？')
+          .then(_ => {
+            done();
+            this.reload()
+          })
+          .catch(_ => {});
+      },
+      getGoods(val){
+      console.log(val[0].id,'商品id关联')
+      this.form.productId = val[0].id
+      this.form.image = val[0].image
+      this.form.imageArr = val
+      
+    },
+    cancel() {
+      this.resetForm()
+    },
+    doSubmit() {
+      this.loading = true
+      
+       this.doAdd()
+    },
+    doAdd() {  //添加
+         console.log(this.form)
+      add(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '添加成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+        this.reload()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    // doEdit() {
+       
+    //   edit(this.form).then(res => {
+    //     this.resetForm()
+    //     this.$notify({
+    //       title: '操作成功',
+    //       type: 'success',
+    //       duration: 2500
+    //     })
+    //     this.loading = false
+    //     this.$parent.init()
+    //   }).catch(err => {
+    //     this.loading = false
+    //     console.log(err.response.data.message)
+    //   })
+    // },
+    resetForm() {
+      this.dialog = false
+      this.$refs['form'].resetFields()
+      this.form = {
+        id: '',
+        productId: '',
+        merId: '',
+        image: '',
+        images: '',
+        imageArr: [],
+        sliderImageArr: [],
+        title: '',
+        attr: null,
+        people: 0,
+        info: '',
+        price: 0,
+        sort: '',
+        sales: '',
+        stock: '',
+        addTime: '',
+        isHost: '',
+        isShow: '',
+        isDel: '',
+        combination: '',
+        merUse: '',
+        isPostage: '',
+        postage: '',
+        description: '<p>123</p>',
+        startTimeDate: '',
+        endTimeDate: '',
+        effectiveTime: 24,
+        cost: '',
+        browse: '',
+        unitName: '',
+        productPrice:'',
+        // pinkStatement:'',
+        // pinkRegulations:''
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/components/godds/activity/combination/index.vue b/src/views/components/godds/activity/combination/index.vue
new file mode 100644
index 0000000..fe6856e
--- /dev/null
+++ b/src/views/components/godds/activity/combination/index.vue
@@ -0,0 +1,244 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <!-- 搜索 -->
+      <el-input v-model="query.value" clearable placeholder="输入搜索内容" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
+      <el-select v-model="query.type" clearable placeholder="类型" class="filter-item" style="width: 130px">
+        <el-option v-for="item in queryTypeOptions" :key="item.key" :label="item.display_name" :value="item.key" />
+      </el-select>
+      <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
+      <!-- 新增 -->
+      <el-button
+        type="danger"
+        class="filter-item"
+        size="mini"
+        icon="el-icon-refresh"
+        @click="toQuery"
+      >刷新</el-button>
+       <el-button
+        type="primary"
+        class="filter-item"
+        size="mini"
+        icon="el-icon-check"
+        @click="add"
+       
+      >
+      新增
+      </el-button>
+      <el-button
+        type="primary"
+        class="filter-item"
+        size="mini"
+        icon="el-icon-info"
+        @click="addew"
+       
+      >
+      玩法说明
+      </el-button>
+    </div>
+    <!--表单组件-->
+    <eForm ref="form" :is-add="isAdd" />
+    <newl ref="form2" :is-add="isAdd" />
+    <how ref="form3" :is-add="isAdd" />
+    <!--表格渲染-->
+    <el-table v-loading="loading" :data="data" size="small" style="width: 100%;height:calc(100vh - 245px);overflow-y: scroll;">
+      <el-table-column prop="id" label="id" align="center" />
+      <el-table-column prop="productId" label="商品id"  align="center" />
+      <el-table-column prop="image" label="产品主图" align="center">
+        <template slot-scope="scope">
+          <a :href="scope.row.image" style="color: #42b983" target="_blank"><img :src="scope.row.image" alt="点击打开" class="el-avatar"></a>
+        </template>
+      </el-table-column>
+      <el-table-column prop="title" label="拼团名称" align="center"  width="150"/>
+      <el-table-column prop="people" label="参团人数"  align="center"/>
+      <el-table-column prop="price" label="拼团价" align="center" />
+      <el-table-column prop="productPrice" label="原价" align="center" />
+      <el-table-column prop="stock" label="库存"  align="center"/>
+      <el-table-column prop="browse" label="浏览量" align="center" />
+      <el-table-column prop="countPeopleAll" label="参与人数" align="center" />
+      <el-table-column prop="countPeoplePink" label="成团数量"  align="center"/>
+      <el-table-column prop="countPeopleBrowse" label="访客人数"  align="center"/>
+      <el-table-column label="状态" align="center">
+        <template slot-scope="scope">
+          <div @click="onSale(scope.row.id,scope.row.isShow)">
+            <el-tag v-if="scope.row.isShow === 1" style="cursor: pointer" :type="''">已开启</el-tag>
+            <el-tag v-else style="cursor: pointer" :type=" 'info' ">已关闭</el-tag>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="stopTime" label="结束时间" align="center" width="200">
+        <template slot-scope="scope">
+          <span>{{ formatTimeTwo(scope.row.stopTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column v-if="checkPermission(['admin','YXSTORECOMBINATION_ALL','YXSTORECOMBINATION_EDIT','YXSTORECOMBINATION_DELETE'])" label="操作" width="150px" align="center" fixed="right">
+        <template slot-scope="scope">
+          <el-button v-permission="['admin','YXSTORECOMBINATION_ALL','YXSTORECOMBINATION_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)" />
+          <el-popover
+            :ref="scope.row.id"
+            v-permission="['admin','YXSTORECOMBINATION_ALL','YXSTORECOMBINATION_DELETE']"
+            placement="top"
+            width="180"
+          >
+            <p>确定删除本条数据吗？</p>
+            <div style="text-align: right; margin: 0">
+              <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
+              <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
+            </div>
+            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
+          </el-popover>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--分页组件-->
+   <el-footer style="height:60px;width:100%;background-color:#f6f6f6">
+     <div style="float:left"></div>
+      <el-pagination
+      :total="total"
+      :current-page="page + 1"
+      style="margin-top: 15px; float:right"
+      layout="total, prev, pager, next, sizes"
+      @size-change="sizeChange"
+      @current-change="pageChange"
+    />
+   </el-footer>
+  </div>
+</template>
+
+<script>
+import checkPermission from '@/utils/permission'
+import initData from '@/mixins/crud'
+import { del, onsale } from '@/api/yxStoreCombination'
+import eForm from './form'
+import { formatTimeTwo, parseTime } from '@/utils/index'
+import newl from './formt'
+import how from './HowToPlay'
+export default {
+  components: { eForm ,newl,how },
+  mixins: [initData],
+  data() {
+    return {
+      delLoading: false,
+      queryTypeOptions: [
+        { key: 'title', display_name: '活动标题' }
+      ]
+    }
+  },
+  created() {
+    this.$nextTick(() => {
+      this.init()
+    })
+    
+  },
+  methods: {
+    
+    parseTime,
+    formatTimeTwo,
+    checkPermission,
+    beforeInit() {
+      this.url = 'api/yxStoreCombination'
+      const sort = 'id,desc'
+      this.params = { page: this.page, size: this.size, sort: sort }
+      const query = this.query
+      const type = query.type
+      const value = query.value
+      if (type && value) { this.params[type] = value }
+      return true
+    },
+    subDelete(id) {
+      this.delLoading = true
+      del(id).then(res => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        this.dleChangePage()
+        this.init()
+        this.$notify({
+          title: '删除成功',
+          type: 'success',
+          duration: 2500
+        })
+      }).catch(err => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        console.log(err.response.data.message)
+      })
+    },
+    onSale(id, status) {
+      this.$confirm(`确定进行[${status ? '下架' : '上架'}]操作?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          onsale(id, { status: status }).then(({ data }) => {
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1000,
+              onClose: () => {
+                this.init()
+              }
+            })
+          })
+        })
+        .catch(() => { })
+    },
+    add() {
+      this.isAdd = true
+      this.$refs.form2.dialog = true
+    },
+    addew(){
+      this.isAdd = true
+      this.$refs.form3.dialog = true
+    },
+    edit(data) {
+      console.log(data,'pintuan')
+      this.isAdd = false
+      const _this = this.$refs.form
+      _this.form = {
+        id: data.id,
+        productId: data.productId,
+        merId: data.merId,
+        image: data.image,
+        images: data.images,
+        imageArr: data.imageArr,
+        sliderImageArr: data.images.split(','),
+        title: data.title,
+        attr: data.attr,
+        people: data.people,
+        info: data.info,
+        price: data.price,
+        sort: data.sort,
+        sales: data.sales,
+        addTime: data.addTime,
+        isHost: data.isHost,
+        isShow: data.isShow,
+        isDel: data.isDel,
+        combination: data.combination,
+        merUse: data.merUse,
+        isPostage: data.isPostage,
+        postage: data.postage,
+        description: data.description,
+        startTime: data.startTime,
+        stopTime: data.stopTime,
+        startTimeDate: new Date(data.startTimeDate),
+        endTimeDate: new Date(data.endTimeDate),
+        effectiveTime: data.effectiveTime,
+        productPrice: data.productPrice,
+        browse: data.browse,
+        unitName: data.unitName
+        // pinkStatement:data.pinkStatement,
+        // pinkRegulations:data.pinkRegulations
+      }
+      _this.dialog = true
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .app-container{
+  padding-bottom: 0px;
+}
+</style>
diff --git a/src/views/components/godds/activity/combinlist/form.vue b/src/views/components/godds/activity/combinlist/form.vue
new file mode 100644
index 0000000..56f0c5c
--- /dev/null
+++ b/src/views/components/godds/activity/combinlist/form.vue
@@ -0,0 +1,159 @@
+<template>
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增' : '编辑'" width="500px">
+    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
+      <el-form-item label="用户id">
+        <el-input v-model="form.uid" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="订单id 生成">
+        <el-input v-model="form.orderId" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="订单id  数据库">
+        <el-input v-model="form.orderIdKey" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="购买商品个数">
+        <el-input v-model="form.totalNum" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="购买总金额">
+        <el-input v-model="form.totalPrice" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="拼团产品id">
+        <el-input v-model="form.cid" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="产品id">
+        <el-input v-model="form.pid" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="拼图总人数">
+        <el-input v-model="form.people" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="拼团产品单价">
+        <el-input v-model="form.price" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="开始时间">
+        <el-input v-model="form.addTime" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="stopTime">
+        <el-input v-model="form.stopTime" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="团长id 0为团长">
+        <el-input v-model="form.kId" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="是否发送模板消息0未发送1已发送">
+        <el-input v-model="form.isTpl" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="是否退款 0未退款 1已退款">
+        <el-input v-model="form.isRefund" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="状态1进行中2已完成3未完成">
+        <el-input v-model="form.status" style="width: 370px;" />
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="text" @click="cancel">取消</el-button>
+      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { add, edit } from '@/api/yxStorePink'
+export default {
+  props: {
+    isAdd: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data() {
+    return {
+      loading: false, dialog: false,
+      form: {
+        id: '',
+        uid: '',
+        orderId: '',
+        orderIdKey: '',
+        totalNum: '',
+        totalPrice: '',
+        cid: '',
+        pid: '',
+        people: '',
+        price: '',
+        addTime: '',
+        stopTime: '',
+        kId: '',
+        isTpl: '',
+        isRefund: '',
+        status: ''
+      },
+      rules: {
+      }
+    }
+  },
+  methods: {
+    cancel() {
+      this.resetForm()
+    },
+    doSubmit() {
+      this.loading = true
+      if (this.isAdd) {
+        this.doAdd()
+      } else this.doEdit()
+    },
+    doAdd() {
+      add(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '添加成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    doEdit() {
+      edit(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '修改成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    resetForm() {
+      this.dialog = false
+      this.$refs['form'].resetFields()
+      this.form = {
+        id: '',
+        uid: '',
+        orderId: '',
+        orderIdKey: '',
+        totalNum: '',
+        totalPrice: '',
+        cid: '',
+        pid: '',
+        people: '',
+        price: '',
+        addTime: '',
+        stopTime: '',
+        kId: '',
+        isTpl: '',
+        isRefund: '',
+        status: ''
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/components/godds/activity/combinlist/index.vue b/src/views/components/godds/activity/combinlist/index.vue
new file mode 100644
index 0000000..85fb578
--- /dev/null
+++ b/src/views/components/godds/activity/combinlist/index.vue
@@ -0,0 +1,170 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <!-- 搜索 -->
+      <el-input v-model="query.value" clearable placeholder="输入搜索内容" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
+      <el-select v-model="query.type" clearable placeholder="类型" class="filter-item" style="width: 130px">
+        <el-option v-for="item in queryTypeOptions" :key="item.key" :label="item.display_name" :value="item.key" />
+      </el-select>
+      <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
+      <!-- 新增 -->
+      <el-button
+        type="danger"
+        class="filter-item"
+        size="mini"
+        icon="el-icon-refresh"
+        @click="toQuery"
+      >刷新</el-button>
+    </div>
+    <!--表单组件-->
+    <eForm ref="form" :is-add="isAdd" />
+    <!--表格渲染-->
+    <el-table v-loading="loading" :data="data" size="small" style="width: 100%;height:calc(100vh - 245px);overflow-y: scroll;">
+      <el-table-column
+        label="序号"
+        type="index"
+        width="50"
+        align="center">
+      </el-table-column>
+      <el-table-column prop="uid" label="参与人" width="150" align="center" >
+        <template slot-scope="scope">
+          头像：<a :href="scope.row.userImg" style="color: #42b983" target="_blank"><img :src="scope.row.userImg" alt="点击打开" class="el-avatar"></a><br>
+          昵称：{{ scope.row.nickname }}<br>
+          用户ID：{{ scope.row.uid }}<br>
+          手机号：{{ scope.row.phone }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="createTime" label="开团时间" align="center" />
+      <el-table-column label="拼团产品" width="200" align="center">
+        <template slot-scope="scope">
+          产品主图：<a :href="scope.row.image" style="color: #42b983" target="_blank"><img :src="scope.row.image" alt="点击打开" class="el-avatar"></a><br>
+          拼团名称：{{ scope.row.product }}<br>
+          拼团 ID：{{ scope.row.cid }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="orderId" label="订单号" width="150" align="center" />
+      <el-table-column prop="totalPrice" label="拼团价" align="center" />
+      <el-table-column prop="people" label="几人团"  align="center"/>
+      <el-table-column prop="countPeople" label="几人参加" align="center" />
+      <el-table-column label="结束时间" align="center">
+        <template slot-scope="scope">
+          <span>{{ formatTimeTwo(scope.row.stopTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="状态" align="center">
+        <template slot-scope="scope">
+          <span v-if="scope.row.status == 1">进行中</span>
+          <span v-else-if="scope.row.status == 2">已完成</span>
+          <span v-else>未完成</span>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--分页组件-->
+    <el-footer style="height:60px;width:100%;background-color:#f6f6f6">
+      <div style="float:left"></div>
+      <el-pagination
+      :total="total"
+      :current-page="page + 1"
+      style="margin-top: 15px; float:right"
+      layout="total, prev, pager, next, sizes"
+      @size-change="sizeChange"
+      @current-change="pageChange"
+    />
+    </el-footer>
+  </div>
+</template>
+
+<script>
+  import checkPermission from '@/utils/permission'
+  import initData from '@/mixins/crud'
+  import { del } from '@/api/yxStorePink'
+  import eForm from './form'
+  import { formatTimeTwo, parseTime } from '@/utils/index'
+  export default {
+    components: { eForm },
+    mixins: [initData],
+    data() {
+      return {
+        delLoading: false,
+        queryTypeOptions: [
+          { key: 'cid', display_name: '拼团id' }
+        ]
+      }
+    },
+    created() {
+      this.$nextTick(() => {
+        this.init()
+      })
+    },
+    methods: {
+      parseTime,
+      formatTimeTwo,
+      checkPermission,
+      beforeInit() {
+        this.url = 'api/yxStorePink'
+        const sort = 'id,desc'
+        this.params = { page: this.page, size: this.size, sort: sort }
+        const query = this.query
+        const type = query.type
+        const value = query.value
+        if (type && value) { this.params[type] = value }
+        return true
+      },
+      subDelete(id) {
+        this.delLoading = true
+        del(id).then(res => {
+          this.delLoading = false
+          this.$refs[id].doClose()
+          this.dleChangePage()
+          this.init()
+          this.$notify({
+            title: '删除成功',
+            type: 'success',
+            duration: 2500
+          })
+        }).catch(err => {
+          this.delLoading = false
+          this.$refs[id].doClose()
+          console.log(err.response.data.message)
+        })
+      },
+      add() {
+        this.isAdd = true
+        this.$refs.form.dialog = true
+      },
+      edit(data) {
+        this.isAdd = false
+        const _this = this.$refs.form
+        _this.form = {
+          id: data.id,
+          uid: data.uid,
+          orderId: data.orderId,
+          orderIdKey: data.orderIdKey,
+          totalNum: data.totalNum,
+          totalPrice: data.totalPrice,
+          cid: data.cid,
+          pid: data.pid,
+          people: data.people,
+          price: data.price,
+          addTime: data.addTime,
+          stopTime: data.stopTime,
+          kId: data.kId,
+          isTpl: data.isTpl,
+          isRefund: data.isRefund,
+          status: data.status
+        }
+        _this.dialog = true
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .app-container{
+  padding-bottom: 0px;
+}
+.el-table::before{
+  height: 0px;
+}
+</style>
diff --git a/src/views/components/godds/activity/coupon/form.vue b/src/views/components/godds/activity/coupon/form.vue
new file mode 100644
index 0000000..f421020
--- /dev/null
+++ b/src/views/components/godds/activity/coupon/form.vue
@@ -0,0 +1,180 @@
+<template>
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增' : '编辑'" width="800px">
+    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="140px">
+      <el-form-item label="优惠券类型">
+        <el-radio-group v-model="form.type" @change="couponsType">
+          <el-radio :label=0>通用券</el-radio>
+          <el-radio :label=1>商品券</el-radio>
+          <el-radio :label=2>商铺券</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="选择商品" v-if="form.type == 1">
+        <cgood v-model="form.product" @selectGoods="getGoods"></cgood>
+      </el-form-item>
+      <el-form-item label="商铺选择" v-if="form.type == 2">
+            <el-select v-model="form.categoryShopId" style="width: 300px;" >
+                <el-option
+                  v-for="item in category"
+                  :value="item.id"
+                  :key="item.id"
+                  :label="item.shopName"
+                >
+                </el-option>
+                <!-- <el-option label="-------空-------" value="0"></el-option> -->
+              </el-select>
+      </el-form-item>
+      <el-form-item label="优惠券名称">
+        <el-input v-model="form.title" style="width: 300px;" />
+      </el-form-item>
+      <el-form-item label="优惠券面值">
+        <el-input v-model="form.couponPrice" style="width: 300px;" onkeyup="value=value.replace(/[^\d]/g,'')" />
+      </el-form-item>
+      <el-form-item label="优惠券最低消费">
+        <el-input v-model="form.useMinPrice" style="width: 300px;" onkeyup="value=value.replace(/[^\d]/g,'')" />
+      </el-form-item>
+      <el-form-item label="优惠券有效期限(天)">
+        <el-input v-model="form.couponTime" style="width: 300px;" onkeyup="value=value.replace(/[^\d]/g,'')" />
+      </el-form-item>
+      <el-form-item label="排序">
+        <el-input-number v-model="form.sort" style="width: 300px;" />
+      </el-form-item>
+      <el-form-item label="状态">
+        <el-radio v-model="form.status" :label="1">开启</el-radio>
+        <el-radio v-model="form.status" :label="0">关闭</el-radio>
+      </el-form-item>
+       <el-form-item label="新人卷">
+        <el-radio v-model="form.rookieRoll" :label="1">开启</el-radio>
+        <el-radio v-model="form.rookieRoll" :label="0">关闭</el-radio>
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="text" @click="cancel">取消</el-button>
+      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { add, edit } from '@/api/yxStoreCoupon'
+import { gets } from "@/api/yxStoreProduct";
+import cgood from '@/views/components/goods'
+export default {
+  components: { cgood },
+  props: {
+    isAdd: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data() {
+    return {
+      category:[],
+      loading: false, dialog: false,
+      form: {
+        id: '',
+        title: '',
+        integral: 0,
+        couponPrice: 0,
+        useMinPrice: 0,
+        couponTime: 1,
+        sort: 0,
+        status: 1,
+        rookieRoll:0,
+        type: 0,
+        productId: '',
+        product: [],
+        categoryShopId:''
+      },
+      rules: {
+      }
+    }
+  },
+  created(){
+    this.yxStoreCategoryShop()
+  },
+  methods: {
+    yxStoreCategoryShop(){
+      let plams = {
+        page:0,
+        size:10,
+        sort:'id,desc'
+      }
+      gets(plams).then(res=>{
+        this.category = res.content
+        console.log(this.category,'商户数据')
+      })
+    },
+    getGoods(p) {
+      var ids = []
+      p.forEach((item,index) => {
+        ids.push(item.id)
+      })
+      this.form.productId = ids.join(",")
+    },
+    couponsType() {
+      //alert(this.form.type)
+    },
+    cancel() {
+      this.resetForm()
+    },
+    doSubmit() {
+      this.loading = true
+      if (this.isAdd) {
+        this.doAdd()
+      } else this.doEdit()
+    },
+    doAdd() {
+      add(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '添加成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    doEdit() {
+      edit(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '修改成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    resetForm() {
+      this.dialog = false
+      this.$refs['form'].resetFields()
+      this.form = {
+        id: '',
+        title: '',
+        integral: 0,
+        couponPrice: 0,
+        useMinPrice: 0,
+        couponTime: 1,
+        sort: 0,
+        status: 1,
+        rookieRoll:0,
+        type: 0,
+        productId: '',
+        product: []
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/components/godds/activity/coupon/formte.vue b/src/views/components/godds/activity/coupon/formte.vue
new file mode 100644
index 0000000..a37e79e
--- /dev/null
+++ b/src/views/components/godds/activity/coupon/formte.vue
@@ -0,0 +1,105 @@
+<template>
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" title="添加轮播图" width="800px">
+    <el-form ref="form" :model="form"  size="small" label-width="160px">
+      <el-form-item label="产品轮播图(266x355)" >
+          
+        <!-- <MaterialList
+          v-model="form.slideshow"
+          style="width: 500px"
+          type="image"
+          :num="4"
+          :width="150"
+          :height="150"
+        /> -->
+        <single-pic
+                v-model="form.slideshow"
+                type="image"
+                :num="1"
+                :width="150"
+                :height="150"
+              />
+        
+      </el-form-item>
+      
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="text" @click="cancel">取消</el-button>
+      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { add, edit, showList,show } from '@/api/yxStoreCoupon'
+import cgood from '@/views/components/goods'
+import MaterialList from "@/components/material";
+import singlePic from "@/components/singlematerial";
+export default {
+    inject: ["reload"],
+  components: { cgood ,MaterialList,singlePic },
+  props: {
+    isAdd: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data() {
+    return {
+      loading: false, dialog: false,
+      form: {
+      slideshow:''
+      },
+      
+    }
+  },
+  created(){
+      this.showList()
+  },
+  methods: {
+    
+    cancel(){
+        this.dialog = false
+    },
+    showList(){
+        showList().then(res=>{
+            console.log(res,'图片查询')
+            this.form.slideshow = res
+        })
+    },
+    doSubmit() {
+        console.log(this.form)
+      this.loading = true
+      this.doAdd()
+    //   console.log(this.form.slideshow)
+    //   show(this.form).then(res=>{
+    //       console.log(res)
+    //       this.dialog = false
+    //   })
+  
+    },
+    doAdd() {
+      show(this.form).then(res => {
+        // this.resetForm()
+        this.$notify({
+          title: '添加成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.dialog = false
+        this.reload()
+        // this.$parent.init()
+      }).catch(err => {
+        this.dialog = false
+        console.log(err.response.data.message)
+      })
+    },
+    
+    
+ 
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/components/godds/activity/coupon/index.vue b/src/views/components/godds/activity/coupon/index.vue
new file mode 100644
index 0000000..ae47d8d
--- /dev/null
+++ b/src/views/components/godds/activity/coupon/index.vue
@@ -0,0 +1,220 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <!-- 新增 -->
+      <div style="display: inline-block;margin: 0px 2px;">
+        <el-button
+          v-permission="['admin','YXSTORECOUPON_ALL','YXSTORECOUPON_CREATE']"
+          class="filter-item"
+          size="mini"
+          type="primary"
+          icon="el-icon-plus"
+          @click="add"
+        >新增</el-button>
+        <el-button
+          v-permission="['admin','YXSTORECOUPON_ALL','YXSTORECOUPON_CREATE']"
+          class="filter-item"
+          size="mini"
+          type="primary"
+          icon="el-icon-plus"
+          @click="addr"
+        >添加轮播图</el-button>
+      </div>
+    </div>
+    <!--表单组件-->
+    <eForm ref="form" :is-add="isAdd" />
+    <eIForm ref="form2" :is-add="isAdd" />
+    <sForm ref="form3" :is-add='isAdd'></sForm>
+    <!--表格渲染-->
+    <el-table v-loading="loading" :data="data" size="small" style="width: 100%;height:calc(100vh - 245px);overflow-y: scroll;">
+      <!--<el-table-column prop="id" label="ID"/>-->
+      <el-table-column prop="title" label="优惠券名称" align="center" width="250" />
+      <el-table-column prop="type" label="优惠券类型 " align="center">
+        <template slot-scope="scope">
+          <div>
+            <el-tag v-if="scope.row.type === 1" style="cursor: pointer" :type="''">商品券</el-tag>
+            <el-tag v-if="scope.row.type === 2" style="cursor: pointer" :type="''">商铺卷</el-tag>
+            <el-tag v-if="scope.row.type === 0" :type=" 'info' ">普通券</el-tag>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="couponPrice" label="优惠券面值" align="center" />
+      <el-table-column prop="useMinPrice" label="优惠券最低消费" align="center"/>
+      <el-table-column label="优惠券有效期限" align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.row.couponTime }}天</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="sort" label="排序" width="100" align="center" />
+      <el-table-column label="状态" width="100" align="center">
+        <template slot-scope="scope">
+          <div>
+            <el-tag v-if="scope.row.status === 1" style="cursor: pointer" :type="''">开启</el-tag>
+            <el-tag v-else :type=" 'info' ">关闭</el-tag>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="createTime" label="创建时间" width="140">
+        <template slot-scope="scope">
+          <span>{{ scope.row.createTime }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column v-if="checkPermission(['admin','YXSTORECOUPON_ALL','YXSTORECOUPON_EDIT','YXSTORECOUPON_DELETE'])" width="200" label="操作" align="center">
+        <template slot-scope="scope">
+          <el-button
+            v-permission="['admin','YXSTORECOUPON_ALL','YXSTORECOUPON_EDIT']"
+            size="mini"
+            type="primary"
+            @click="edit2(scope.row)"
+          >
+            发布
+          </el-button>
+          <el-dropdown size="mini" split-button type="primary" trigger="click">
+            操作
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item>
+                <el-button
+                  v-permission="['admin','YXSTORECOUPON_ALL','YXSTORECOUPON_EDIT']"
+                  size="mini"
+                  type="primary"
+                  icon="el-icon-edit"
+                  @click="edit(scope.row)"
+                >编辑</el-button>
+              </el-dropdown-item>
+              <el-dropdown-item>
+                <el-popover
+                  :ref="scope.row.id"
+                  v-permission="['admin','YXSTORECOUPON_ALL','YXSTORECOUPON_DELETE']"
+                  placement="top"
+                  width="180"
+                >
+                  <p>确定删除本条数据吗？</p>
+                  <div style="text-align: right; margin: 0">
+                    <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
+                    <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
+                  </div>
+                  <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini">删除</el-button>
+                </el-popover>
+              </el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--分页组件-->
+   <el-footer style="height:60px;width:100%;background-color:#f6f6f6">
+     <div style="float:left"></div>
+      <el-pagination
+      :total="total"
+      :current-page="page + 1"
+      style="margin-top: 15px; float:right"
+      layout="total, prev, pager, next, sizes"
+      @size-change="sizeChange"
+      @current-change="pageChange"
+    />
+   </el-footer>
+  </div>
+</template>
+
+<script>
+import checkPermission from '@/utils/permission'
+import initData from '@/mixins/crud'
+import { del } from '@/api/yxStoreCoupon'
+import eForm from './form'
+import sForm from './formte'
+import eIForm from '../couponissue/form'
+import { formatTime } from '@/utils/index'
+export default {
+  components: { eForm, eIForm ,sForm},
+  mixins: [initData],
+  data() {
+    return {
+      delLoading: false
+    }
+  },
+  created() {
+    this.$nextTick(() => {
+      this.init()
+    })
+  },
+  methods: {
+    formatTime,
+    checkPermission,
+    beforeInit() {
+      this.url = 'api/yxStoreCoupon'
+      const sort = 'id,desc'
+      this.params = { page: this.page, size: this.size, sort: sort, isDel: 0 }
+      return true
+    },
+    subDelete(id) {
+      this.delLoading = true
+      del(id).then(res => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        this.dleChangePage()
+        this.init()
+        this.$notify({
+          title: '删除成功',
+          type: 'success',
+          duration: 2500
+        })
+      }).catch(err => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        console.log(err.response.data.message)
+      })
+    },
+    add() {
+      this.isAdd = true
+      this.$refs.form.dialog = true
+    },
+    addr(){
+      this.isAdd = true
+      this.$refs.form3.dialog = true
+    },
+    edit(data) {
+      console.log(data,'商铺卷')
+      this.isAdd = false
+      const _this = this.$refs.form
+      _this.form = {
+        id: data.id,
+        title: data.title,
+        integral: data.integral,
+        couponPrice: data.couponPrice,
+        useMinPrice: data.useMinPrice,
+        couponTime: data.couponTime,
+        sort: data.sort,
+        status: data.status,
+        type: data.type,
+        productId: data.productId,
+        product: data.product,
+        categoryShopId:data.categoryShopId,
+        rookieRoll:data.rookieRoll
+      }
+      _this.dialog = true
+    },
+    edit2(data) {
+      this.isAdd = true
+      const _this = this.$refs.form2
+      _this.form = {
+        cid: data.id,
+        cname: data.title,
+        ctype: data.type,
+        isPermanent: 0,
+        status: 1,
+        totalCount: 0,
+        remainCount: 0,
+        isDel: 0
+      }
+      _this.dialog = true
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .app-container{
+  padding-bottom: 0px;
+}
+</style>
diff --git a/src/views/components/godds/activity/couponissue/form.vue b/src/views/components/godds/activity/couponissue/form.vue
new file mode 100644
index 0000000..bed1c0a
--- /dev/null
+++ b/src/views/components/godds/activity/couponissue/form.vue
@@ -0,0 +1,140 @@
+<template>
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增' : '发布优惠券'" width="500px">
+    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="100px">
+      <el-form-item label="优惠券ID">
+        <el-input v-model="form.cid" style="width: 300px;" :disabled="true" />
+        <el-input v-model="form.ctype" type="hidden" />
+      </el-form-item>
+      <el-form-item label="优惠券名称">
+        <el-input v-model="form.cname" style="width: 300px;" :disabled="true" />
+      </el-form-item>
+      <el-form-item label="领取开启时间">
+        <template>
+          <el-date-picker
+            v-model="form.startTime"
+            type="datetime"
+            placeholder="选择日期时间"
+          />
+        </template>
+      </el-form-item>
+      <el-form-item label="券领结束时间">
+        <template>
+          <el-date-picker
+            v-model="form.endTime"
+            type="datetime"
+            placeholder="选择日期时间"
+          />
+        </template>
+      </el-form-item>
+      <el-form-item label="发布数量">
+        <el-input v-model="form.totalCount" style="width: 300px;" />
+      </el-form-item>
+      <el-form-item label="是否不限量">
+        <el-radio v-model="form.isPermanent" :label="1">不限量</el-radio>
+        <el-radio v-model="form.isPermanent" :label="0">限量</el-radio>
+      </el-form-item>
+      <el-form-item label="状态">
+        <el-radio v-model="form.status" :label="1">开启</el-radio>
+        <el-radio v-model="form.status" :label="0">关闭</el-radio>
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="text" @click="cancel">取消</el-button>
+      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { add, edit } from '@/api/yxStoreCouponIssue'
+export default {
+  props: {
+    isAdd: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data() {
+    return {
+      loading: false, dialog: false,
+      form: {
+        id: '',
+        cid: '',
+        cname: '',
+        ctype: 0,
+        startTimeDate: '',
+        endTimeDate: '',
+        totalCount: 0,
+        remainCount: 0,
+        isPermanent: 0,
+        status: 1,
+        isDel: 0,
+        addTime: ''
+      },
+      rules: {
+      }
+    }
+  },
+  methods: {
+    cancel() {
+      this.resetForm()
+    },
+    doSubmit() {
+      this.loading = true
+      if (this.isAdd) {
+        this.doAdd()
+      } else this.doEdit()
+    },
+    doAdd() {
+      add(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '添加成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    doEdit() {
+      edit(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '修改成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    resetForm() {
+      this.dialog = false
+      this.$refs['form'].resetFields()
+      this.form = {
+        id: '',
+        cid: '',
+        startTime: '',
+        endTime: '',
+        totalCount: '',
+        remainCount: '',
+        isPermanent: '',
+        status: '',
+        isDel: '',
+        addTime: ''
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/components/godds/activity/couponissue/formt.vue b/src/views/components/godds/activity/couponissue/formt.vue
new file mode 100644
index 0000000..a707f6e
--- /dev/null
+++ b/src/views/components/godds/activity/couponissue/formt.vue
@@ -0,0 +1,108 @@
+<template>
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增' : '修改状态'" width="500px">
+    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="100px">
+      <el-form-item label="状态">
+        <el-radio v-model="form.status" :label="1">开启</el-radio>
+        <el-radio v-model="form.status" :label="0">关闭</el-radio>
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="text" @click="cancel">取消</el-button>
+      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { add, edit } from '@/api/yxStoreCouponIssue'
+export default {
+  props: {
+    isAdd: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data() {
+    return {
+      loading: false, dialog: false,
+      form: {
+        id: '',
+        cid: '',
+        cname: '',
+        startTimeDate: '',
+        endTimeDate: '',
+        totalCount: 0,
+        remainCount: 0,
+        isPermanent: 0,
+        status: 1,
+        isDel: 0,
+        addTime: ''
+      },
+      rules: {
+      }
+    }
+  },
+  methods: {
+    cancel() {
+      this.resetForm()
+    },
+    doSubmit() {
+      this.loading = true
+      if (this.isAdd) {
+        this.doAdd()
+      } else this.doEdit()
+    },
+    doAdd() {
+      // console.log(this.form)
+      add(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '添加成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    doEdit() {
+      edit(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '修改成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    resetForm() {
+      this.dialog = false
+      this.$refs['form'].resetFields()
+      this.form = {
+        id: '',
+        cid: '',
+        startTime: '',
+        endTime: '',
+        totalCount: '',
+        remainCount: '',
+        isPermanent: '',
+        status: '',
+        isDel: '',
+        addTime: ''
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/components/godds/activity/couponissue/index.vue b/src/views/components/godds/activity/couponissue/index.vue
new file mode 100644
index 0000000..3172885
--- /dev/null
+++ b/src/views/components/godds/activity/couponissue/index.vue
@@ -0,0 +1,162 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <!-- 新增 -->
+      <el-button
+        type="danger"
+        class="filter-item"
+        size="mini"
+        icon="el-icon-refresh"
+        @click="toQuery"
+      >刷新</el-button>
+    </div>
+    <!--表单组件-->
+    <eForm ref="form" :is-add="isAdd" />
+    <!--表格渲染-->
+    <el-table v-loading="loading" :data="data" size="small" style="width: 100%;height:calc(100vh - 245px);overflow-y: scroll;">
+      <el-table-column prop="id" label="id"  align="center"/>
+      <el-table-column prop="ctype" label="优惠券类型" align="center">
+        <template slot-scope="scope">
+          <div>
+            <el-tag v-if="scope.row.ctype === 1" style="cursor: pointer" :type="''">商品券</el-tag>
+            <el-tag v-else :type=" 'info' ">普通券</el-tag>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="cname" label="优惠券名称"  align="center"/>
+      <el-table-column label="领取日期" prop="startTime" width="300" align="center">
+        <template slot-scope="scope">
+          <span>{{ formatTimeTwo(scope.row.startTime) }}</span> - -
+           <span>{{ formatTimeTwo(scope.row.endTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="发布数量" prop="totalCount" align="center">
+        <template slot-scope="scope">
+          <p>发布:{{ scope.row.totalCount }}</p>
+          <p>剩余:{{ scope.row.remainCount }}</p>
+        </template>
+      </el-table-column>
+      <el-table-column label="状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <div>
+            <el-tag v-if="scope.row.status === 1" style="cursor: pointer" :type="''">开启</el-tag>
+            <el-tag v-else :type=" 'info' ">关闭</el-tag>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="兑换码" align="center" prop="cdKey">
+        
+      </el-table-column>
+      <el-table-column v-if="checkPermission(['admin','YXSTORECOUPONISSUE_ALL','YXSTORECOUPONISSUE_EDIT','YXSTORECOUPONISSUE_DELETE'])" label="操作" width="150px" align="center">
+        <template slot-scope="scope">
+          <el-button v-permission="['admin','YXSTORECOUPONISSUE_ALL','YXSTORECOUPONISSUE_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)" />
+          <el-popover
+            :ref="scope.row.id"
+            v-permission="['admin','YXSTORECOUPONISSUE_ALL','YXSTORECOUPONISSUE_DELETE']"
+            placement="top"
+            width="180"
+          >
+            <p>确定删除本条数据吗？</p>
+            <div style="text-align: right; margin: 0">
+              <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
+              <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
+            </div>
+            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
+          </el-popover>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--分页组件-->
+    <el-footer style="height:60px;width:100%;background-color:#f6f6f6">
+      <div style="float:left"></div>
+      <el-pagination
+      :total="total"
+      :current-page="page + 1"
+      style="margin-top: 15px; float:right"
+      layout="total, prev, pager, next, sizes"
+      @size-change="sizeChange"
+      @current-change="pageChange"
+    />
+    </el-footer>
+  </div>
+</template>
+
+<script>
+import checkPermission from '@/utils/permission'
+import initData from '@/mixins/crud'
+import { del } from '@/api/yxStoreCouponIssue'
+import eForm from './formt'
+import { formatTimeTwo } from '@/utils/index'
+export default {
+  components: { eForm },
+  mixins: [initData],
+  data() {
+    return {
+      delLoading: false
+    }
+  },
+  created() {
+    this.$nextTick(() => {
+      this.init()
+    })
+  },
+  methods: {
+    formatTimeTwo,
+    checkPermission,
+    beforeInit() {
+      this.url = 'api/yxStoreCouponIssue'
+      const sort = 'id,desc'
+      this.params = { page: this.page, size: this.size, sort: sort }
+      return true
+    },
+    subDelete(id) {
+      this.delLoading = true
+      del(id).then(res => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        this.dleChangePage()
+        this.init()
+        this.$notify({
+          title: '删除成功',
+          type: 'success',
+          duration: 2500
+        })
+      }).catch(err => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        console.log(err.response.data.message)
+      })
+    },
+    add() {
+      this.isAdd = true
+      this.$refs.form.dialog = true
+    },
+    edit(data) {
+      this.isAdd = false
+      const _this = this.$refs.form
+      _this.form = {
+        id: data.id,
+        cid: data.cid,
+        startTime: data.startTime,
+        endTime: data.endTime,
+        startTimeDate: data.startTimeDate,
+        endTimeDate: data.endTimeDate,
+        totalCount: data.totalCount,
+        remainCount: data.remainCount,
+        isPermanent: data.isPermanent,
+        status: data.status,
+        isDel: data.isDel,
+        addTime: data.addTime
+      }
+      _this.dialog = true
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .app-container{
+  padding-bottom: 0px;
+}
+</style>
diff --git a/src/views/components/godds/activity/couponuser/form.vue b/src/views/components/godds/activity/couponuser/form.vue
new file mode 100644
index 0000000..2b60977
--- /dev/null
+++ b/src/views/components/godds/activity/couponuser/form.vue
@@ -0,0 +1,99 @@
+<template>
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增' : '编辑'" width="500px">
+    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
+      <el-form-item label="领取优惠券用户ID">
+        <el-input v-model="form.uid" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="优惠券前台领取ID">
+        <el-input v-model="form.issueCouponId" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="领取时间">
+        <el-input v-model="form.addTime" style="width: 370px;" />
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="text" @click="cancel">取消</el-button>
+      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { add, edit } from '@/api/yxStoreCouponIssueUser'
+export default {
+  props: {
+    isAdd: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data() {
+    return {
+      loading: false, dialog: false,
+      form: {
+        id: '',
+        uid: '',
+        issueCouponId: '',
+        addTime: ''
+      },
+      rules: {
+      }
+    }
+  },
+  methods: {
+    cancel() {
+      this.resetForm()
+    },
+    doSubmit() {
+      this.loading = true
+      if (this.isAdd) {
+        this.doAdd()
+      } else this.doEdit()
+    },
+    doAdd() {
+      add(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '添加成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    doEdit() {
+      edit(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '修改成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    resetForm() {
+      this.dialog = false
+      this.$refs['form'].resetFields()
+      this.form = {
+        id: '',
+        uid: '',
+        issueCouponId: '',
+        addTime: ''
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/components/godds/activity/couponuser/index.vue b/src/views/components/godds/activity/couponuser/index.vue
new file mode 100644
index 0000000..daa7cbb
--- /dev/null
+++ b/src/views/components/godds/activity/couponuser/index.vue
@@ -0,0 +1,121 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <!-- 新增 -->
+      <div style="display: inline-block;margin: 0px 2px;">
+        <el-button
+          v-permission="['admin','YXSTORECOUPONISSUEUSER_ALL','YXSTORECOUPONISSUEUSER_CREATE']"
+          class="filter-item"
+          size="mini"
+          type="primary"
+          icon="el-icon-plus"
+          @click="add"
+        >新增</el-button>
+      </div>
+    </div>
+    <!--表单组件-->
+    <eForm ref="form" :is-add="isAdd" />
+    <!--表格渲染-->
+    <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
+      <el-table-column prop="id" label="id"  align="center" />
+      <el-table-column prop="uid" label="领取优惠券用户ID" align="center" />
+      <el-table-column prop="issueCouponId" label="优惠券前台领取ID" align="center" />
+      <el-table-column prop="addTime" label="领取时间" align="center" />
+      <el-table-column v-if="checkPermission(['admin','YXSTORECOUPONISSUEUSER_ALL','YXSTORECOUPONISSUEUSER_EDIT','YXSTORECOUPONISSUEUSER_DELETE'])" label="操作" width="150px" align="center">
+        <template slot-scope="scope">
+          <el-button v-permission="['admin','YXSTORECOUPONISSUEUSER_ALL','YXSTORECOUPONISSUEUSER_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)" />
+          <el-popover
+            :ref="scope.row.id"
+            v-permission="['admin','YXSTORECOUPONISSUEUSER_ALL','YXSTORECOUPONISSUEUSER_DELETE']"
+            placement="top"
+            width="180"
+          >
+            <p>确定删除本条数据吗？</p>
+            <div style="text-align: right; margin: 0">
+              <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
+              <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
+            </div>
+            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
+          </el-popover>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--分页组件-->
+    <el-pagination
+      :total="total"
+      :current-page="page + 1"
+      style="margin-top: 8px;"
+      layout="total, prev, pager, next, sizes"
+      @size-change="sizeChange"
+      @current-change="pageChange"
+    />
+  </div>
+</template>
+
+<script>
+import checkPermission from '@/utils/permission'
+import initData from '@/mixins/crud'
+import { del } from '@/api/yxStoreCouponIssueUser'
+import eForm from './form'
+export default {
+  components: { eForm },
+  mixins: [initData],
+  data() {
+    return {
+      delLoading: false
+    }
+  },
+  created() {
+    this.$nextTick(() => {
+      this.init()
+    })
+  },
+  methods: {
+    checkPermission,
+    beforeInit() {
+      this.url = 'api/yxStoreCouponIssueUser'
+      const sort = 'id,desc'
+      this.params = { page: this.page, size: this.size, sort: sort }
+      return true
+    },
+    subDelete(id) {
+      this.delLoading = true
+      del(id).then(res => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        this.dleChangePage()
+        this.init()
+        this.$notify({
+          title: '删除成功',
+          type: 'success',
+          duration: 2500
+        })
+      }).catch(err => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        console.log(err.response.data.message)
+      })
+    },
+    add() {
+      this.isAdd = true
+      this.$refs.form.dialog = true
+    },
+    edit(data) {
+      this.isAdd = false
+      const _this = this.$refs.form
+      _this.form = {
+        id: data.id,
+        uid: data.uid,
+        issueCouponId: data.issueCouponId,
+        addTime: data.addTime
+      }
+      _this.dialog = true
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/components/godds/activity/extract/form.vue b/src/views/components/godds/activity/extract/form.vue
new file mode 100644
index 0000000..6955b9b
--- /dev/null
+++ b/src/views/components/godds/activity/extract/form.vue
@@ -0,0 +1,125 @@
+<template>
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增' : '编辑'" width="500px">
+    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
+      <el-form-item label="姓名">
+        <el-input v-model="form.realName" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="提现金额">
+        <el-input-number v-model="form.extractPrice" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="审核状态">
+        <el-radio v-model="form.status" :label="-1">无效</el-radio>
+        <el-radio v-model="form.status" :label="1">通过</el-radio>
+      </el-form-item>
+      <el-form-item label="无效原因">
+        <el-input v-model="form.failMsg" style="width: 300px;" rows="5" type="textarea" />
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="text" @click="cancel">取消</el-button>
+      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { add, edit } from '@/api/yxUserExtract'
+export default {
+  props: {
+    isAdd: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data() {
+    return {
+      loading: false, dialog: false,
+      form: {
+        id: '',
+        uid: '',
+        realName: '',
+        extractType: '',
+        bankCode: '',
+        bankAddress: '',
+        alipayCode: '',
+        extractPrice: '',
+        mark: '',
+        balance: '',
+        failMsg: '',
+        failTime: '',
+        addTime: '',
+        status: '',
+        wechat: ''
+      },
+      rules: {
+      }
+    }
+  },
+  methods: {
+    cancel() {
+      this.resetForm()
+    },
+    doSubmit() {
+      this.loading = true
+      if (this.isAdd) {
+        this.doAdd()
+      } else this.doEdit()
+    },
+    doAdd() {
+      add(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '添加成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    doEdit() {
+      edit(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '修改成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    resetForm() {
+      this.dialog = false
+      this.$refs['form'].resetFields()
+      this.form = {
+        id: '',
+        uid: '',
+        realName: '',
+        extractType: '',
+        bankCode: '',
+        bankAddress: '',
+        alipayCode: '',
+        extractPrice: '',
+        mark: '',
+        balance: '',
+        failMsg: '',
+        failTime: '',
+        addTime: '',
+        status: '',
+        wechat: ''
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/components/godds/activity/extract/index.vue b/src/views/components/godds/activity/extract/index.vue
new file mode 100644
index 0000000..a6723ab
--- /dev/null
+++ b/src/views/components/godds/activity/extract/index.vue
@@ -0,0 +1,189 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <!-- 搜索 -->
+      <el-input v-model="query.value" clearable placeholder="输入搜索内容" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
+      <el-select v-model="query.type" clearable placeholder="类型" class="filter-item" style="width: 130px">
+        <el-option v-for="item in queryTypeOptions" :key="item.key" :label="item.display_name" :value="item.key" />
+      </el-select>
+      <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
+      <!-- 新增 -->
+      <el-button
+        type="danger"
+        class="filter-item"
+        size="mini"
+        icon="el-icon-refresh"
+        @click="toQuery"
+      >刷新</el-button>
+    </div>
+    <!--表单组件-->
+    <eForm ref="form" :is-add="isAdd" />
+    <!--表格渲染-->
+    <el-table v-loading="loading" :data="data" size="small" style="width: 100%;height:calc(100vh - 245px);overflow-y: scroll;">
+      <el-table-column prop="id" label="id" align="center" />
+      <el-table-column prop="extractPrice" label="提现金额"  align="center"/>
+      <el-table-column prop="wechat" label="用户名称" align="center" />
+      <el-table-column prop="extractType" label="提现信息" align="center">
+        <template slot-scope="scope">
+          <!-- <div v-if="scope.row.extractType='weixin'">
+            姓名:{{ scope.row.realName }}<br>
+            微信号:{{ scope.row.wechat }}
+          </div>
+          <div v-else>
+            姓名:{{ scope.row.realName }}<br>
+            支付宝号:{{ scope.row.alipayCode }}
+          </div> -->
+          <div>
+            支付宝用户名:{{ scope.row.realName }}<br>
+            支付宝账号:{{ scope.row.alipayCode }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="addTime" label="申请时间" align="center">
+        <template slot-scope="scope">
+          <span>{{ formatTimeTwo(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="status" label="审核状态" align="center">
+        <template slot-scope="scope">
+          <div v-if="scope.row.status==1">
+            提现通过
+          </div>
+          <div v-else-if="scope.row.status==-1">
+            提现未通过<br>
+            未通过原因：{{ scope.row.failMsg }}
+            <br>
+            未通过时间：{{ formatTimeTwo(scope.row.failTime) }}
+          </div>
+          <div v-else>
+            未提现
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column v-if="checkPermission(['admin','YXUSEREXTRACT_ALL','YXUSEREXTRACT_EDIT','YXUSEREXTRACT_DELETE'])" label="操作" width="150px" align="center">
+        <template slot-scope="scope">
+          <el-button
+            v-permission="['admin','YXUSEREXTRACT_ALL','YXUSEREXTRACT_EDIT']"
+            size="mini"
+            type="primary"
+            @click="edit(scope.row)"
+          >操作</el-button>
+          <!--<el-popover-->
+          <!--v-permission="['admin','YXUSEREXTRACT_ALL','YXUSEREXTRACT_DELETE']"-->
+          <!--:ref="scope.row.id"-->
+          <!--placement="top"-->
+          <!--width="180">-->
+          <!--<p>确定删除本条数据吗？</p>-->
+          <!--<div style="text-align: right; margin: 0">-->
+          <!--<el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>-->
+          <!--<el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>-->
+          <!--</div>-->
+          <!--<el-button slot="reference" type="danger" icon="el-icon-delete" size="mini"/>-->
+          <!--</el-popover>-->
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--分页组件-->
+   <el-footer style="height:60px;width:100%;background-color:#f6f6f6">
+     <div style="float:left"></div>
+      <el-pagination
+      :total="total"
+      :current-page="page + 1"
+      style="margin-top: 15px;float:right"
+      layout="total, prev, pager, next, sizes"
+      @size-change="sizeChange"
+      @current-change="pageChange"
+    />
+   </el-footer>
+  </div>
+</template>
+
+<script>
+import checkPermission from '@/utils/permission'
+import initData from '@/mixins/crud'
+import { del } from '@/api/yxUserExtract'
+import eForm from './form'
+import { formatTimeTwo } from '@/utils/index'
+export default {
+  components: { eForm },
+  mixins: [initData],
+  data() {
+    return {
+      delLoading: false,
+      queryTypeOptions: [
+        { key: 'realName', display_name: '用户姓名' }
+      ]
+    }
+  },
+  created() {
+    this.$nextTick(() => {
+      this.init()
+    })
+  },
+  methods: {
+    formatTimeTwo,
+    checkPermission,
+    beforeInit() {
+      this.url = 'api/yxUserExtract'
+      const sort = 'id,desc'
+      this.params = { page: this.page, size: this.size, sort: sort }
+      const query = this.query
+      const type = query.type
+      const value = query.value
+      if (type && value) { this.params[type] = value }
+      return true
+    },
+    subDelete(id) {
+      this.delLoading = true
+      del(id).then(res => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        this.dleChangePage()
+        this.init()
+        this.$notify({
+          title: '删除成功',
+          type: 'success',
+          duration: 2500
+        })
+      }).catch(err => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        console.log(err.response.data.message)
+      })
+    },
+    add() {
+      this.isAdd = true
+      this.$refs.form.dialog = true
+    },
+    edit(data) {
+      this.isAdd = false
+      const _this = this.$refs.form
+      _this.form = {
+        id: data.id,
+        uid: data.uid,
+        realName: data.realName,
+        extractType: data.extractType,
+        bankCode: data.bankCode,
+        bankAddress: data.bankAddress,
+        alipayCode: data.alipayCode,
+        extractPrice: data.extractPrice,
+        mark: data.mark,
+        balance: data.balance,
+        failMsg: data.failMsg,
+        failTime: data.failTime,
+        addTime: data.addTime,
+        status: data.status,
+        wechat: data.wechat
+      }
+      _this.dialog = true
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .app-container{
+  padding-bottom: 0px;
+}
+</style>
diff --git a/src/views/components/godds/activity/seckill/HowToPlay.vue b/src/views/components/godds/activity/seckill/HowToPlay.vue
new file mode 100644
index 0000000..0646330
--- /dev/null
+++ b/src/views/components/godds/activity/seckill/HowToPlay.vue
@@ -0,0 +1,87 @@
+<template>
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" title=" 秒杀玩法说明" width="900px">
+    <el-form ref="form" :model="form" :rules="rules" :inline="true" size="small" label-width="140px">
+      <el-form-item label="说明">
+        <editor v-model="form.seckillStatement" />
+      </el-form-item>
+      <el-form-item label="玩法">
+        <editor v-model="form.seckillRegulations" />
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="text" @click="cancel">取消</el-button>
+      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { List,Config} from "@/api/yxStoreSeckill";
+import editor from '../../components/Editor'
+import MaterialList from '@/components/material'
+import cgood from '@/views/components/goodss'
+export default {
+  components: { editor,  MaterialList ,cgood },
+  props: {
+    isAdd: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data() {
+    return {
+      loading: false, dialog: false,
+      form: {
+       
+        seckillStatement:'',
+        seckillRegulations:''
+      },
+      rules: {
+      }
+    }
+  },
+  created(){
+      this.List()
+  },
+  methods: {
+      cancel(){
+          this.dialog = false
+      },
+      
+    List(){
+        List().then(res=>{
+            console.log(res,'iopioipo')
+            this.form = res
+        })
+    },
+    doSubmit() {
+    //   this.loading = true
+
+      
+       this.Config()
+    },
+    Config() {  
+         console.log(this.form)
+      Config(this.form).then(res => {
+          console.log(res)
+        this.$notify({
+          title: '添加成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.dialog = false
+       
+      }).catch(err => {
+        this.dialog = false
+        console.log(err.response.data.message)
+      })
+    },
+    
+    
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/components/godds/activity/seckill/form.vue b/src/views/components/godds/activity/seckill/form.vue
new file mode 100644
index 0000000..85add74
--- /dev/null
+++ b/src/views/components/godds/activity/seckill/form.vue
@@ -0,0 +1,280 @@
+<template>
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="handleClose" :visible.sync="dialog" title= '开启秒杀' width="900px" >
+    <el-form ref="form" :model="form" :rules="rules" :inline="true" size="small" label-width="140px">
+      <el-form-item label="秒杀名称">
+        <el-input v-model="form.title" style="width: 500px;" />
+      </el-form-item>
+      <!-- <el-form-item label="秒杀简介">
+        <el-input v-model="form.info" style="width: 500px;" />
+      </el-form-item> -->
+      <el-form-item label="单位">
+        <el-input v-model="form.unitName" style="width: 500px;" />
+      </el-form-item>
+      <el-form-item label="秒杀开始时间">
+        <template>
+          <el-date-picker
+            v-model="form.startTime"
+            type="date"
+            placeholder="选择日期时间"
+          />
+        </template>
+      </el-form-item>
+      <el-form-item label="秒杀结束时间">
+        <template>
+          <el-date-picker
+            v-model="form.stopTime"
+            type="date"
+            placeholder="选择日期时间"
+          />
+        </template>
+      </el-form-item>
+      <el-form-item label="开始时间" prop="storeId">
+        <el-select v-model="form.timeId" style="width: 178px" placeholder="请先选择开始时间">
+          <el-option
+            v-for="(item, index) in myTimes"
+            :key="index"
+            :label="item.map.time + '点开始，持续' + item.map.continued + '小时'"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+      <!-- <el-form-item label="产品主图片">
+        <MaterialList v-model="form.imageArr" style="width: 500px" type="image" :num="1" :width="150" :height="150" />
+      </el-form-item> -->
+      <el-form-item label="产品主图片" style="display: block;">
+          <!-- <el-input v-model="form.imgWrap" autocomplete="off"></el-input> -->
+           <cgood  @selectGoods="getGoods" v-model="form.imageArr" ></cgood>
+        </el-form-item>
+      <el-form-item label="产品轮播图">
+        <MaterialList v-model="form.sliderImageArr" style="width: 500px" type="image" :num="4" :width="150" :height="150" />
+      </el-form-item>
+      <!-- <el-form-item label="秒杀价">
+        <el-input-number v-model="form.price" />
+      </el-form-item> -->
+      <!-- <el-form-item label="成本">
+        <el-input-number v-model="form.cost" />
+      </el-form-item> -->
+      <el-form-item label="虚拟原价">
+        <el-input style="width:100px" onkeyup="value=value.replace(/[^\d]/g,'')" v-model="form.otPrice"    />
+      </el-form-item>
+      <!-- <el-form-item label="库存">
+        <el-input-number v-model="form.stock" />
+      </el-form-item> -->
+      <el-form-item label="虚拟销量">
+        <el-input style="width:100px" v-model="form.sales"  onkeyup="value=value.replace(/[^\d]/g,'')" />
+      </el-form-item>
+      <el-form-item label="排序">
+        <el-input-number v-model="form.sort" />
+      </el-form-item>
+      <!-- <el-form-item label="限单">
+        <el-input-number v-model="form.num" />
+      </el-form-item> -->
+      <!-- <el-form-item label="邮费">
+        <el-input-number v-model="form.postage" />
+      </el-form-item> -->
+      <!-- <el-form-item label="是否包邮">
+        <el-radio v-model="form.isPostage" :label="1">是</el-radio>
+        <el-radio v-model="form.isPostage" :label="0" style="width: 110px;">否</el-radio>
+      </el-form-item> -->
+      <el-form-item label="活动状态">
+        <el-radio v-model="form.status" :label="1">开启</el-radio>
+        <el-radio v-model="form.status" :label="0" style="width: 200px;">关闭</el-radio>
+      </el-form-item>
+      <!-- <el-form-item label="详情">
+        <editor v-model="form.description" />
+      </el-form-item> -->
+      <!-- <el-form-item label="说明">
+        <editor v-model="form.seckillStatement" />
+      </el-form-item>
+      <el-form-item label="玩法">
+        <editor v-model="form.seckillRegulations" />
+      </el-form-item> -->
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="text" @click="cancel">取消</el-button>
+      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { add, edit } from '@/api/yxStoreSeckill'
+import { initData } from '@/api/data'
+import editor from '../../components/Editor'
+import MaterialList from '@/components/material'
+import cgood from '@/views/components/goodss'
+
+export default {
+  components: { editor, MaterialList,cgood },
+  inject: ["reload"],
+  props: {
+    isAdd: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data() {
+    return {
+      loading: false, dialog: false, myTimes: [],
+      form: {
+        id: '',
+        productId: '',
+        image: '',
+        images: '',
+        imageArr: [],
+        sliderImageArr: [],
+        title: '',
+        info: '',
+        price: '',
+        cost: '',
+        otPrice: '',
+        giveIntegral: '',
+        sort: '',
+        stock: '',
+        sales: '',
+        unitName: '',
+        postage: '',
+        description: '<p>123</p>',
+        startTime: '',
+        stopTime: '',
+        addTime: '',
+        status: 1,
+        isPostage: 1,
+        isHot: '',
+        isDel: 0,
+        num: '',
+        isShow: '',
+        startTimeDate: '',
+        endTimeDate: '',
+        timeId: '',
+        // seckillStatement:'',
+        // seckillRegulations:''
+      },
+      rules: {
+      }
+    }
+  },
+  watch: {
+    // 'form.imageArr': function(val) {
+    //   if (val) {
+    //     this.form.image = val.join(',')
+    //   }
+    // },
+    'form.sliderImageArr': function(val) {
+      if (val) {
+        this.form.images = val.join(',')
+      }
+    }
+  },
+  mounted() {
+    
+    initData('api/yxSystemGroupData',{ groupName: 'yshop_seckill_time' }).then(res => {
+      //console.log(res.content)
+      this.myTimes = res.content
+    })
+  },
+  created(){
+    
+  },
+  methods: {
+     handleClose(done) {
+        this.$confirm('确认关闭？')
+          .then(_ => {
+            done();
+            this.reload()
+          })
+          .catch(_ => {});
+      },
+    getGoods(val){
+      this.form.productId = val[0].id
+      this.form.image = val[0].image
+      // this.form.imageArr.push(val[0].image)
+      this.form.imageArr = val
+    },
+    cancel() {
+      this.resetForm()
+    },
+    doSubmit() {
+      console.log(this.form,'9999')
+      // alert('dsadas')
+       this.doEdit()
+    },
+    // doAdd() {
+    //   add(this.form).then(res => {
+    //     this.resetForm()
+    //     this.$notify({
+    //       title: '添加成功',
+    //       type: 'success',
+    //       duration: 2500
+    //     })
+    //     this.loading = false
+    //     this.$parent.init()
+        
+    //   }).catch(err => {
+    //     this.loading = false
+    //     console.log(err.response.data.message)
+    //   })
+    // },
+    doEdit() {
+       console.log(this.form,'修队')
+      console.log('xiugai')
+      edit(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '修改成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+        this.reload()
+        
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    resetForm() {
+      this.dialog = false
+      this.$refs['form'].resetFields()
+      this.form = {
+        id: '',
+        productId: '',
+        image: '',
+        images: '',
+        imageArr: [],
+        sliderImageArr: [],
+        title: '',
+        info: '',
+        price: '',
+        cost: '',
+        otPrice: '',
+        giveIntegral: '',
+        sort: '',
+        stock: '',
+        sales: '',
+        unitName: '',
+        postage: '',
+        description: '<p>123</p>',
+        startTime: '',
+        stopTime: '',
+        addTime: '',
+        status: '',
+        isPostage: '',
+        isHot: '',
+        isDel: '',
+        num: '',
+        isShow: '',
+        timeId:'',
+        // seckillStatement:'',
+        // seckillRegulations:''
+      }
+      // console.log(this.form,'测试测试')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/components/godds/activity/seckill/index.vue b/src/views/components/godds/activity/seckill/index.vue
new file mode 100644
index 0000000..4e0ea4a
--- /dev/null
+++ b/src/views/components/godds/activity/seckill/index.vue
@@ -0,0 +1,219 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <!-- 搜索 -->
+      <el-input v-model="query.value" clearable placeholder="输入搜索内容" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
+      <el-select v-model="query.type" clearable placeholder="类型" class="filter-item" style="width: 130px">
+        <el-option v-for="item in queryTypeOptions" :key="item.key" :label="item.display_name" :value="item.key" />
+      </el-select>
+      <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
+      <!-- 新增 -->
+      <el-button
+        type="danger"
+        class="filter-item"
+        size="mini"
+        icon="el-icon-refresh"
+        @click="toQuery"
+      >刷新</el-button>
+      <el-button
+        type="primary"
+        class="filter-item"
+        size="mini"
+        icon="el-icon-check"
+        @click="add"
+       
+      >
+      新增
+      </el-button>
+      <el-button
+        type="primary"
+        class="filter-item"
+        size="mini"
+        icon="el-icon-info"
+        @click="addew"
+       
+      >
+      玩法说明
+      </el-button>
+    </div>
+    <!--表单组件-->
+    <eForm ref="form" :is-add="isAdd" />
+    <newl ref="form2" :is-add="isAdd" />
+    <how ref="form3" :is-add="isAdd" />
+    <!--表格渲染-->
+    <el-table v-loading="loading" :data="data" size="small" style="width: 100%;height:calc(100vh - 245px);overflow-y: scroll;">
+      <el-table-column prop="id" label="id" align="center" />
+      <el-table-column prop="image" label="产品主图" align="center">
+        <template slot-scope="scope">
+          <a :href="scope.row.image" style="color: #42b983" target="_blank"><img :src="scope.row.image" alt="点击打开" class="el-avatar"></a>
+        </template>
+      </el-table-column>
+      <el-table-column label="产品ID" align="center">
+        <template slot-scope="scope">
+          <span>{{scope.row.imageArr[0].id}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="title" label="产品标题" align="center" />
+      <el-table-column prop="price" label="秒杀价" align="center" />
+      <el-table-column prop="otPrice" label="原价" align="center" />
+      <el-table-column prop="stock" label="库存" align="center" />
+      <el-table-column prop="sales" label="销量" align="center" />
+      <!-- <el-table-column prop="num" label="限单" align="center" /> -->
+      <el-table-column prop="statusStr" label="秒杀状态" align="center" />
+      <el-table-column prop="stopTime" label="开始时间" align="center" width="200">
+        <template slot-scope="scope">
+          <span>{{ formatTimeTwo(scope.row.startTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="stopTime" label="结束时间" align="center" width="200">
+        <template slot-scope="scope">
+          <span>{{ formatTimeTwo(scope.row.stopTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column v-if="checkPermission(['admin','YXSTORESECKILL_ALL','YXSTORESECKILL_EDIT','YXSTORESECKILL_DELETE'])" label="操作" width="150px" align="center">
+        <template slot-scope="scope">
+          <el-button v-permission="['admin','YXSTORESECKILL_ALL','YXSTORESECKILL_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)" />
+          <el-popover
+            :ref="scope.row.id"
+            v-permission="['admin','YXSTORESECKILL_ALL','YXSTORESECKILL_DELETE']"
+            placement="top"
+            width="180"
+          >
+            <p>确定删除本条数据吗？</p>
+            <div style="text-align: right; margin: 0">
+              <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
+              <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
+            </div>
+            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini" />
+          </el-popover>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--分页组件-->
+   <el-footer style="height:60px;width:100%;background-color:#f6f6f6">
+     <div style="float:left"></div>
+     <el-pagination
+      :total="total"
+      :current-page="page + 1"
+      style="margin-top: 15px; float:right"
+      layout="total, prev, pager, next, sizes"
+      @size-change="sizeChange"
+      @current-change="pageChange"
+    />
+   </el-footer>
+  </div>
+</template>
+
+<script>
+import checkPermission from '@/utils/permission'
+import initData from '@/mixins/crud'
+import { del } from '@/api/yxStoreSeckill'
+import eForm from './form'
+import newl from './newlyAdded'
+import { formatTimeTwo, parseTime } from '@/utils/index'
+import how from './HowToPlay'
+export default {
+  components: { eForm ,newl,how },
+  mixins: [initData],
+  data() {
+    return {
+      delLoading: false,
+      queryTypeOptions: [
+        { key: 'title', display_name: '产品标题' }
+      ]
+    }
+  },
+  created() {
+    this.$nextTick(() => {
+      this.init()
+    })
+  },
+  methods: {
+    parseTime,
+    formatTimeTwo,
+    checkPermission,
+    beforeInit() {
+      this.url = 'api/yxStoreSeckill'
+      const sort = 'id,desc'
+      this.params = { page: this.page, size: this.size, sort: sort }
+      const query = this.query
+      const type = query.type
+      const value = query.value
+      if (type && value) { this.params[type] = value }
+      return true
+    },
+    subDelete(id) {
+      this.delLoading = true
+      del(id).then(res => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        this.dleChangePage()
+        this.init()
+        this.$notify({
+          title: '删除成功',
+          type: 'success',
+          duration: 2500
+        })
+      }).catch(err => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        console.log(err.response.data.message)
+      })
+    },
+    add() {
+      this.isAdd = true
+      this.$refs.form2.dialog = true
+    },
+    addew(){
+      this.isAdd = true
+      this.$refs.form3.dialog = true
+    },
+    edit(data) {
+      console.log(data,'s设置')
+      this.isAdd = false
+      const _this = this.$refs.form
+      _this.form = {
+        id: data.id,
+        productId: data.productId,
+        image: data.image,
+        images: data.images,
+        imageArr: data.imageArr,
+        sliderImageArr: data.images.split(','),
+        title: data.title,
+        info: data.info,
+        price: data.price,
+        cost: data.cost,
+        otPrice: data.otPrice,
+        giveIntegral: data.giveIntegral,
+        sort: data.sort,
+        stock: data.stock,
+        sales: data.sales,
+        unitName: data.unitName,
+        postage: data.postage,
+        description: data.description,
+        startTime: data.startTime,
+        stopTime: data.stopTime,
+        addTime: data.addTime,
+        status: data.status,
+        isPostage: data.isPostage,
+        isHot: data.isHot,
+        isDel: data.isDel,
+        num: data.num,
+        isShow: data.isShow,
+        timeId: data.timeId
+        // seckillStatement:data.seckillStatement,
+        // seckillRegulations:data.seckillRegulations
+      }
+      _this.dialog = true
+    },
+  
+  }
+}
+</script>
+
+<style scoped>
+  .app-container{
+  padding-bottom: 0px;
+}
+</style>
diff --git a/src/views/components/godds/activity/seckill/newlyAdded.vue b/src/views/components/godds/activity/seckill/newlyAdded.vue
new file mode 100644
index 0000000..bf40c9e
--- /dev/null
+++ b/src/views/components/godds/activity/seckill/newlyAdded.vue
@@ -0,0 +1,666 @@
+<template>
+  <el-dialog
+    :append-to-body="true"
+    :close-on-click-modal="false"
+    :before-close="handleClose"
+    :visible.sync="dialog"
+    title="新增秒杀"
+    width="900px"
+  >
+    <el-form
+      ref="form"
+      :model="form"
+      :rules="rules"
+      :inline="true"
+      size="small"
+      label-width="140px"
+    >
+      <el-form-item label="秒杀名称">
+        <el-input v-model="form.title" style="width: 500px" />
+      </el-form-item>
+      <!-- <el-form-item label="秒杀简介">
+        <el-input v-model="form.info" style="width: 500px" />
+      </el-form-item> -->
+      <el-form-item label="单位">
+        <el-input v-model="form.unitName" style="width: 500px" />
+      </el-form-item>
+      <el-form-item label="秒杀开始时间">
+        <template>
+          <el-date-picker
+            v-model="form.startTime"
+            type="date"
+            placeholder="选择日期时间"
+          />
+        </template>
+      </el-form-item>
+      <el-form-item label="秒杀结束时间">
+        <template>
+          <el-date-picker
+            v-model="form.stopTime"
+            type="date"
+            placeholder="选择日期时间"
+          />
+        </template>
+      </el-form-item>
+      <el-form-item label="开始时间" prop="storeId">
+        <el-select
+          v-model="form.timeId"
+          style="width: 178px"
+          placeholder="请先选择开始时间"
+        >
+          <el-option
+            v-for="(item, index) in myTimes"
+            :key="index"
+            :label="
+              item.map.time + '点开始，持续' + item.map.continued + '小时'
+            "
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="产品主图片" style="display: block;">
+          <!-- <el-input v-model="forms.productId" autocomplete="off"></el-input> -->
+           <cgood  v-model="form.imageArr" @selectGoods="getGoods"></cgood>
+        </el-form-item>
+      <!-- <el-form-item label="产品主图片">
+        <MaterialList
+          v-model="form.imageArr"
+          style="width: 500px"
+          type="image"
+          :num="1"
+          :width="150"
+          :height="150"
+        />
+      </el-form-item> -->
+      <el-form-item label="产品轮播图">
+        <MaterialList
+          v-model="form.sliderImageArr"
+          style="width: 500px"
+          type="image"
+          :num="4"
+          :width="150"
+          :height="150"
+        />
+      </el-form-item>
+
+    
+        <!-- <el-form-item label="运费模板：" prop="temp_id" style="display: block;">
+              <div class="acea-row">
+                <el-select v-model="form.temp_id" class="mr20">
+                  <el-option
+                    v-for="(item, index) in templateList"
+                    :value="item.id"
+                    :key="index"
+                    :label="item.name"
+                  ></el-option>
+                </el-select>
+              </div>
+            </el-form-item> -->
+      <!-- 秒杀规格设置 -->
+      
+      <!-- <div>
+        <el-form-item label="商品规格：" props="spec_type">
+          <el-radio-group v-model="form.spec_type" @change="changeSpec">
+            <el-radio :label="0" class="radio">单规格</el-radio>
+            <el-radio :label="1">多规格{{ form.spec_typ }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </div> -->
+      <!-- <div :span="24" style="margin-left: 60px" v-if="form.spec_type === 1">
+        <el-form-item v-if="attrs.length !== 0">
+          <div v-for="(item, index) in attrs" :key="index">
+            <div class="acea-row row-middle">
+              <span class="mr5">{{ item.value }}</span>
+              <i
+                class="el-icon-circle-close"
+                @click="handleRemoveRole(index)"
+              ></i>
+            </div>
+            <div class="rulesBox">
+              <el-tag
+                type="dot"
+                closable
+                color="primary"
+                v-for="(j, indexn) in item.detail"
+                :key="indexn"
+                :name="j"
+                class="mr20"
+                @close="handleRemove2(item.detail, indexn)"
+                >{{ j }}</el-tag
+              >
+              <el-input
+                placeholder="请输入属性值与属性单位"
+                v-model="item.detail.attrsVal"
+                style="width: 250px"
+              >
+                <el-button
+                  slot="append"
+                  type="primary"
+                  @click="createAttr(item.detail.attrsVal, index)"
+                  >添加</el-button
+                >
+              </el-input>
+            </div>
+          </div>
+        </el-form-item>
+      </div> -->
+      <!-- <div
+        :span="24"
+        v-if="createBnt"
+        style="margin-left: 140px;
+}"
+      >
+        <el-form-item>
+          <el-button type="primary" icon="md-add" @click="addBtn" class="mr15"
+            >添加新规格</el-button
+          >
+          <el-button type="success" @click="generate">立即生成</el-button>
+        </el-form-item>
+      </div> -->
+      <!-- <div :span="24" v-if="showIput">
+        <div :xl="6" :lg="9" :md="10" :sm="24" :xs="24">
+          <el-form-item label="规格：">
+            <el-input
+              placeholder="请输入规格"
+              v-model="formDynamic.attrsName"
+            />
+          </el-form-item>
+        </div>
+        <div :xl="6" :lg="9" :md="10" :sm="24" :xs="24">
+          <el-form-item label="规格值：">
+            <el-input
+              v-model="formDynamic.attrsVal"
+              placeholder="请输入规格值与规格单位"
+            />
+          </el-form-item>
+        </div>
+        <div
+          :xl="6"
+          :lg="5"
+          :md="10"
+          :sm="24"
+          :xs="24"
+          style="margin-left: 140px; margin-bottom: 20px"
+        >
+          <el-button type="primary" @click="createAttrName">确定</el-button>
+          <el-button type="danger" @click="offAttrName">取消</el-button>
+        </div>
+      </div> -->
+       <!-- 多规格设置-->
+
+            <!-- <div
+              :xl="24"
+              :lg="24"
+              :md="24"
+              :sm="24"
+              :xs="24"
+              v-if="
+                manyFormValidate.length &&
+                form.header.length !== 0 &&
+                attrs.length !== 0&&
+                form.spec_type === 1
+              "
+            >
+              
+              <div :span="24">
+                <el-form-item label="商品属性：" class="labeltop">
+                  <div style="margin-left:45px">
+                    <el-table :data="manyFormValidate" border>
+                    <el-table-column
+                      type="myindex"
+                      v-for="(item, index) in form.header"
+                      :key="index"
+                      :label="item.title"
+                      :property="item.slot"
+                      align="center"
+                     
+                    >
+                      <template slot-scope="scope">
+                        <div v-if="scope.column.property == 'pic'">
+                          <single-pic
+                            v-model="scope.row[scope.column.property]"
+                            type="image"
+                            :num="1"
+                            :width="60"
+                            :height="60"
+                          />
+                        </div>
+                        <div
+                          v-else-if="
+                            scope.column.property.indexOf('value') != -1
+                          "
+                        >
+                          {{ scope.row[scope.column.property] }}
+                        </div>
+                        <div v-else-if="scope.column.property == 'action'">
+                          <a @click="delAttrTable(scope.$index)">删除</a>
+                        </div>
+                        <div v-else>
+                          <el-input
+                            v-model="scope.row[scope.column.property]"
+                          />
+                        </div>
+                      </template>
+                    </el-table-column>
+                   </el-table>
+                  </div>
+                </el-form-item>
+              </div>
+            </div> -->
+          
+          <!-- 单规格表格-->
+          <!-- <div
+            
+            v-if="form.spec_type === 0"
+            style="margin-left:140px"
+          >
+            <el-form-item>
+              <el-table :data="oneFormValidate" border>
+                <el-table-column prop="pic" label="图片" align="center">
+                  <template slot-scope="scope">
+                    <single-pic
+                      v-model="scope.row.pic"
+                      type="image"
+                      :num="1"
+                      :width="60"
+                      :height="60"
+                    />
+                  </template>
+                </el-table-column>
+                <el-table-column prop="price" label="售价" align="center">
+                  <template slot-scope="scope">
+                    <el-input type="text" v-model="scope.row.price" />
+                  </template>
+                </el-table-column>
+                <el-table-column prop="cost" label="成本价" align="center">
+                  <template slot-scope="scope">
+                    <el-input type="text" v-model="scope.row.cost" />
+                  </template>
+                </el-table-column>
+                <el-table-column prop="ot_price" label="原价" align="center">
+                  <template slot-scope="scope">
+                    <el-input type="text" v-model="scope.row.ot_price" />
+                  </template>
+                </el-table-column>
+                <el-table-column prop="stock" label="库存" align="center">
+                  <template slot-scope="scope">
+                    <el-input type="text" v-model="scope.row.stock" />
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="bar_code"
+                  label="商品编号"
+                  align="center"
+                >
+                  <template slot-scope="scope">
+                    <el-input type="text" v-model="scope.row.bar_code" />
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="weight"
+                  label="重量（KG）"
+                  align="center"
+                  width="100"
+                >
+                  <template slot-scope="scope">
+                    <el-input type="text" v-model="scope.row.weight" />
+                  </template>
+                </el-table-column>
+                <el-table-column prop="volume" label="体积(m³" align="center">
+                  <template slot-scope="scope">
+                    <el-input type="text" v-model="scope.row.volume" />
+                  </template>
+                </el-table-column>
+              </el-table>
+            </el-form-item>
+          </div> -->
+      <!-- <el-form-item label="秒杀价">
+        <el-input-number v-model="form.price" />
+      </el-form-item> -->
+      <!-- <el-form-item label="成本">
+        <el-input-number v-model="form.cost" />
+      </el-form-item> -->
+      <el-form-item label="虚拟原价">
+        <el-input style="width:100px" onkeyup="value=value.replace(/[^\d]/g,'')" v-model="form.otPrice" />
+      </el-form-item>
+      <!-- <el-form-item label="库存">
+        <el-input-number v-model="form.stock" />
+      </el-form-item> -->
+      <el-form-item label="虚拟销量">
+        <el-input style="width:100px" onkeyup="value=value.replace(/[^\d]/g,'')" v-model="form.sales" />
+      </el-form-item>
+      <el-form-item label="排序">
+        <el-input-number v-model="form.sort" />
+      </el-form-item>
+      <!-- <el-form-item label="限单">
+        <el-input-number v-model="form.num" />
+      </el-form-item> -->
+      <!-- <el-form-item label="邮费">
+        <el-input-number v-model="form.postage" />
+      </el-form-item> -->
+      <!-- <el-form-item label="是否包邮">
+        <el-radio v-model="form.isPostage" :label="1">是</el-radio>
+        <el-radio v-model="form.isPostage" :label="0" style="width: 110px"
+          >否</el-radio
+        >
+      </el-form-item> -->
+      <el-form-item label="活动状态">
+        <el-radio v-model="form.status" :label="1">开启</el-radio>
+        <el-radio v-model="form.status" :label="0" style="width: 200px"
+          >关闭</el-radio
+        >
+      </el-form-item>
+      <!-- <el-form-item label="详情">
+        <editor v-model="form.description" />
+      </el-form-item> -->
+      <!-- <el-form-item label="说明">
+        <editor v-model="form.seckillStatement" />
+      </el-form-item>
+      <el-form-item label="玩法">
+        <editor v-model="form.seckillRegulations" />
+      </el-form-item> -->
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="text" @click="cancel">取消</el-button>
+      <el-button :loading="loading" type="primary" @click="doSubmit"
+        >确认</el-button
+      >
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { add, edit,isFormatAttr ,getInfo} from "@/api/yxStoreSeckill";
+import { initData } from "@/api/data";
+import editor from "../../components/Editor";
+import MaterialList from "@/components/material";
+import singlePic from "@/components/singlematerial";
+import cgood from '@/views/components/goodss'
+export default {
+  components: { editor, MaterialList,singlePic,cgood },
+  inject: ["reload"],
+  props: {
+    isAdd: {
+      type: Boolean,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      templateList:[],
+      // 单规格表格data
+      oneFormValidate: [
+        {
+          imageArr: [],
+          pic: "",
+          price: 0,
+          cost: 0,
+          ot_price: 0,
+          stock: 0,
+          bar_code: "",
+          weight: 0,
+          volume: 0,
+          brokerage: 0,
+          brokerage_two: 0,
+        },
+      ],
+      // 多规格表格data
+      manyFormValidate:[],
+      loading: false,
+      dialog: false,
+      myTimes: [],
+      createBnt: false,
+      showIput: false,
+      formDynamic: {
+        attrsName: "",
+        attrsVal: "",
+      },
+      attrs: [],
+      form: {
+        id: '',
+        productId: "",
+        image: "",
+        images: "",
+        imageArr: [],
+        sliderImageArr: [],
+        title: "",
+        info: "",
+        price: "",
+        cost: "",
+        otPrice: "",
+        giveIntegral: "",
+        sort: "",
+        stock: 0,
+        sales: "",
+        unitName: "",
+        postage: "",
+        description: '<p>123</p>',
+        // seckillStatement:'',
+        // seckillRegulations:'',
+        startTime: "",
+        stopTime: "",
+        addTime: "",
+        status: 1,
+        isPostage: 1,
+        isHot: "",
+        isDel: 0,
+        num: "",
+        isShow: "",
+        startTimeDate: "",
+        endTimeDate: "",
+        timeId: '',
+        spec_type: 0,
+        attrs: [],
+        header:[],
+        items:[],
+        temp_id:''
+      },
+      rules: {},
+    };
+  },
+  watch: {
+    // "form.imageArr": function (val) {
+    //   if (val) {
+    //     this.form.image = val.join(",");
+    //   }
+    // },
+    "form.sliderImageArr": function (val) {
+      if (val) {
+        this.form.images = val.join(",");
+      }
+    },
+  },
+  mounted() {
+    this.getInfos();
+    console.log("9999");
+    initData("api/yxSystemGroupData", { groupName: "yshop_seckill_time" }).then(
+      (res) => {
+        //console.log(res.content)
+        this.myTimes = res.content;
+      }
+    );
+  },
+  
+  methods: {
+    getInfos(){
+      let id  = 0
+      getInfo(id).then(res=>{
+        console.log(res,'运费模板')
+        this.templateList = res.tempList
+      })
+    },
+    getGoods(val){
+      console.log(val[0].id,'商品id关联')
+      this.form.productId = val[0].id
+      this.form.image = val[0].image
+      // this.form.imageArr.push(val[0].image)
+      this.form.imageArr = val
+      
+    },
+     handleClose(done) {
+        this.$confirm('确认关闭？')
+          .then(_ => {
+            done();
+            this.reload()
+          })
+          .catch(_ => {});
+      },
+    cancel() {
+      this.resetForm();
+    },
+    changeSpec(val) {
+      console.log(this.form)
+      console.log(val);
+      if (val == 1) {
+        // this.createBnt=true;
+        this.showIput = true;
+      }if(val == 0){
+        this.showIput = false;
+      }
+    },
+    handleRemove2(item, index) {
+      item.splice(index, 1);
+    },
+    createAttr(num, idx) {
+      if (num) {
+        this.attrs[idx].detail.push(num);
+        var hash = {};
+        this.attrs[idx].detail = this.attrs[idx].detail.reduce(function (
+          item,
+          next
+        ) {
+          hash[next] ? "" : (hash[next] = true && item.push(next));
+          return item;
+        },
+        []);
+      } else {
+        this.$message.warning("请添加属性！");
+      }
+    },
+    generate() {
+      
+      isFormatAttr(this.form.id, { attrs: this.attrs }).then(res=>{
+        this.manyFormValidate = res.value;
+        this.form.header = res.header;
+      })
+      console.log(this.attrs);
+      this.createBnt = false;
+    },
+    addBtn() {
+      this.createBnt = false;
+      this.showIput = true;
+      this.clearAttr();
+    },
+    clearAttr() {
+      this.formDynamic.attrsName = "";
+      this.formDynamic.attrsVal = "";
+    },
+    createAttrName() {
+      if (this.formDynamic.attrsName && this.formDynamic.attrsVal) {
+        let data = {
+          value: this.formDynamic.attrsName,
+          detail: [this.formDynamic.attrsVal],
+        };
+        this.attrs.push(data);
+        var hash = {};
+        this.attrs = this.attrs.reduce(function (item, next) {
+          hash[next.value] ? "" : (hash[next.value] = true && item.push(next));
+          return item;
+        }, []);
+        this.clearAttr();
+        this.showIput = false;
+        this.createBnt = true;
+      } else {
+        this.$message.warning("请添加完整的规格！");
+      }
+      console.log(this.attrs, "dsdsada");
+    },
+    offAttrName() {
+      this.showIput = false;
+      this.createBnt = true;
+    },
+    doSubmit() {
+      this.loading = true;
+     
+      // this.form.attrs = this.oneFormValidate
+      //  console.log(this.form,'oneFormValidateoneFormValidate')
+      this.doAdd();
+    },
+    doAdd() {
+      console.log(this.form,'修队')
+      add(this.form)
+        .then((res) => {
+          this.resetForm();
+          this.$notify({
+            title: "添加成功",
+            type: "success",
+            duration: 2500,
+          });
+          this.loading = false;
+          this.$parent.init();
+          this.reload()
+        })
+        .catch((err) => {
+          this.loading = false;
+          console.log(err.response.data.message);
+        });
+    },
+    doEdit() {
+      edit(this.form)
+        .then((res) => {
+          this.resetForm();
+          this.$notify({
+            title: "修改成功",
+            type: "success",
+            duration: 2500,
+          });
+          this.loading = false;
+          this.$parent.init();
+        })
+        .catch((err) => {
+          this.loading = false;
+          console.log(err.response.data.message);
+        });
+    },
+    resetForm() {
+      this.dialog = false;
+      this.$refs["form"].resetFields();
+      this.form = {
+        id: "",
+        productId: "",
+        image: "",
+        images: "",
+        imageArr: [],
+        sliderImageArr: [],
+        title: "",
+        info: "",
+        price: "",
+        cost: "",
+        otPrice: "",
+        giveIntegral: "",
+        sort: "",
+        stock: "",
+        sales: "",
+        unitName: "",
+        postage: "",
+        description: '<p>123</p>',
+        startTime: "",
+        stopTime: "",
+        addTime: "",
+        status: "",
+        isPostage: "",
+        isHot: "",
+        isDel: "",
+        num: "",
+        isShow: "",
+        timeId:''
+        // seckillStatement:'',
+        // seckillRegulations:''
+      };
+    },
+  },
+};
+</script>
+
+<style scoped>
+</style>
diff --git a/src/views/components/godds/activity/storecouponuser/form.vue b/src/views/components/godds/activity/storecouponuser/form.vue
new file mode 100644
index 0000000..c81c47e
--- /dev/null
+++ b/src/views/components/godds/activity/storecouponuser/form.vue
@@ -0,0 +1,139 @@
+<template>
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增' : '编辑'" width="500px">
+    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
+      <el-form-item label="兑换的项目id">
+        <el-input v-model="form.cid" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="优惠券所属用户">
+        <el-input v-model="form.uid" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="优惠券名称">
+        <el-input v-model="form.couponTitle" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="优惠券的面值">
+        <el-input v-model="form.couponPrice" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="最低消费多少金额可用优惠券">
+        <el-input v-model="form.useMinPrice" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="优惠券创建时间">
+        <el-input v-model="form.addTime" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="优惠券结束时间">
+        <el-input v-model="form.endTime" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="使用时间">
+        <el-input v-model="form.useTime" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="获取方式">
+        <el-input v-model="form.type" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="状态（0：未使用，1：已使用, 2:已过期）">
+        <el-input v-model="form.status" style="width: 370px;" />
+      </el-form-item>
+      <el-form-item label="是否有效">
+        <el-input v-model="form.isFail" style="width: 370px;" />
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="text" @click="cancel">取消</el-button>
+      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { add, edit } from '@/api/yxStoreCouponUser'
+export default {
+  props: {
+    isAdd: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data() {
+    return {
+      loading: false, dialog: false,
+      form: {
+        id: '',
+        cid: '',
+        uid: '',
+        couponTitle: '',
+        couponPrice: '',
+        useMinPrice: '',
+        addTime: '',
+        endTime: '',
+        useTime: '',
+        type: '',
+        status: '',
+        isFail: ''
+      },
+      rules: {
+      }
+    }
+  },
+  methods: {
+    cancel() {
+      this.resetForm()
+    },
+    doSubmit() {
+      this.loading = true
+      if (this.isAdd) {
+        this.doAdd()
+      } else this.doEdit()
+    },
+    doAdd() {
+      add(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '添加成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    doEdit() {
+      edit(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '修改成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    resetForm() {
+      this.dialog = false
+      this.$refs['form'].resetFields()
+      this.form = {
+        id: '',
+        cid: '',
+        uid: '',
+        couponTitle: '',
+        couponPrice: '',
+        useMinPrice: '',
+        addTime: '',
+        endTime: '',
+        useTime: '',
+        type: '',
+        status: '',
+        isFail: ''
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/components/godds/activity/storecouponuser/index.vue b/src/views/components/godds/activity/storecouponuser/index.vue
new file mode 100644
index 0000000..cd773de
--- /dev/null
+++ b/src/views/components/godds/activity/storecouponuser/index.vue
@@ -0,0 +1,163 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <!-- 搜索 -->
+      <el-input v-model="query.value" clearable placeholder="输入搜索内容" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
+      <el-select v-model="query.type" clearable placeholder="类型" class="filter-item" style="width: 130px">
+        <el-option v-for="item in queryTypeOptions" :key="item.key" :label="item.display_name" :value="item.key" />
+      </el-select>
+      <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
+      <!-- 新增 -->
+      <el-button
+        type="danger"
+        class="filter-item"
+        size="mini"
+        icon="el-icon-refresh"
+        @click="toQuery"
+      >刷新</el-button>
+    </div>
+    <!--表单组件-->
+    <eForm ref="form" :is-add="isAdd" />
+    <!--表格渲染-->
+    <el-table v-loading="loading" :data="data" size="small" style="width: 100%;height:calc(100vh - 245px);overflow-y: scroll;">
+      <el-table-column prop="couponTitle" label="优惠券名称" />
+      <el-table-column prop="nickname" label="所属用户" />
+      <el-table-column prop="couponPrice" label="优惠券的面值" />
+      <el-table-column prop="useMinPrice" label="优惠券最低消费" />
+      <el-table-column label="优惠券开始时间">
+        <template slot-scope="scope">
+          {{ formatTimeTwo(scope.row.addTime) }}
+        </template>
+      </el-table-column>
+      <el-table-column label="优惠券结束时间">
+        <template slot-scope="scope">
+          {{ formatTimeTwo(scope.row.endTime) }}
+        </template>
+      </el-table-column>
+      <el-table-column label="获取方式">
+        <template slot-scope="scope">
+          <div>
+            <el-tag v-if="scope.row.type == 'get'" style="cursor: pointer" :type="''">手动领取</el-tag>
+            <el-tag v-else :type=" 'info' ">后台发放</el-tag>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="是否可用">
+        <template slot-scope="scope">
+          <div>
+            <el-tag v-if="scope.row.status == 0 && scope.row.isFail == 0" style="cursor: pointer" :type="''">可用</el-tag>
+            <el-tag v-else :type=" 'info' ">不可用</el-tag>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="状态">
+        <template slot-scope="scope">
+          <div>
+            <el-tag v-if="scope.row.status == 2">已过期</el-tag>
+            <el-tag v-if="scope.row.status == 1">已使用</el-tag>
+            <el-tag v-else>未使用</el-tag>
+          </div>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--分页组件-->
+   <el-footer style="height:60px;width:100%;background-color:#f6f6f6">
+     <div style="float:left"></div>
+      <el-pagination
+      :total="total"
+      :current-page="page + 1"
+      style="margin-top: 15px; float:right"
+      layout="total, prev, pager, next, sizes"
+      @size-change="sizeChange"
+      @current-change="pageChange"
+    />
+   </el-footer>
+  </div>
+</template>
+
+<script>
+import checkPermission from '@/utils/permission'
+import initData from '@/mixins/crud'
+import { del } from '@/api/yxStoreCouponUser'
+import eForm from './form'
+import { formatTimeTwo } from '@/utils/index'
+export default {
+  components: { eForm },
+  mixins: [initData],
+  data() {
+    return {
+      delLoading: false,
+      queryTypeOptions: [
+        { key: 'couponTitle', display_name: '优惠券名称' }
+      ]
+    }
+  },
+  created() {
+    this.$nextTick(() => {
+      this.init()
+    })
+  },
+  methods: {
+    formatTimeTwo,
+    checkPermission,
+    beforeInit() {
+      this.url = 'api/yxStoreCouponUser'
+      const sort = 'id,desc'
+      this.params = { page: this.page, size: this.size, sort: sort }
+      const query = this.query
+      const type = query.type
+      const value = query.value
+      if (type && value) { this.params[type] = value }
+      return true
+    },
+    subDelete(id) {
+      this.delLoading = true
+      del(id).then(res => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        this.dleChangePage()
+        this.init()
+        this.$notify({
+          title: '删除成功',
+          type: 'success',
+          duration: 2500
+        })
+      }).catch(err => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        console.log(err.response.data.message)
+      })
+    },
+    add() {
+      this.isAdd = true
+      this.$refs.form.dialog = true
+    },
+    edit(data) {
+      this.isAdd = false
+      const _this = this.$refs.form
+      _this.form = {
+        id: data.id,
+        cid: data.cid,
+        uid: data.uid,
+        couponTitle: data.couponTitle,
+        couponPrice: data.couponPrice,
+        useMinPrice: data.useMinPrice,
+        addTime: data.addTime,
+        endTime: data.endTime,
+        useTime: data.useTime,
+        type: data.type,
+        status: data.status,
+        isFail: data.isFail
+      }
+      _this.dialog = true
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .app-container{
+  padding-bottom: 0px;
+}
+</style>
diff --git a/src/views/components/godds/index.vue b/src/views/components/godds/index.vue
new file mode 100644
index 0000000..7f8c331
--- /dev/null
+++ b/src/views/components/godds/index.vue
@@ -0,0 +1,168 @@
+<template>
+  <div>
+    <div>
+      <ul v-for="(item,index) in newValue" :key="index" class="el-upload-list el-upload-list--picture-card">
+        <li tabindex="0" class="el-upload-list__item is-ready" :style="'width: '+width+'px;height: '+height+'px'">
+          <div>
+            <img :src="item.image" alt="" class="el-upload-list__item-thumbnail">
+            <span class="el-upload-list__item-actions">
+            <!-- <span class="el-upload-list__item-delete" @click="deleteGood(index)">
+              <i class="el-icon-delete" />
+            </span> -->
+          </span>
+          </div>
+        </li>
+      </ul>
+      <div tabindex="0" class="el-upload el-upload--picture-card"  @click="toSelete">
+        <i class="el-icon-plus" />
+      </div>
+    </div>
+
+    <el-dialog :visible.sync="dialog" append-to-body width="60%" title="商品列表">
+    <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <!-- 搜索 -->
+      <el-input v-model="query.value" clearable placeholder="输入搜索内容" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
+      <el-select v-model="query.type" clearable placeholder="类型" class="filter-item" style="width: 130px">
+        <el-option v-for="item in queryTypeOptions" :key="item.key" :label="item.display_name" :value="item.key" />
+      </el-select>
+      <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
+      <!-- 新增 -->
+
+    </div>
+    <!--表单组件-->
+
+    <!--表格渲染-->
+    <el-table v-loading="loading" :data="data" size="small" style="width: 100%;" 
+     highlight-current-row
+    @current-change="handleCurrentChange">
+     
+      <el-table-column prop="id" label="商品id" />
+      <el-table-column ref="table" prop="image" label="商品图片">
+        <template slot-scope="scope">
+          <a :href="scope.row.image" style="color: #42b983" target="_blank"><img :src="scope.row.image" alt="点击打开" class="el-avatar"></a>
+        </template>
+      </el-table-column>
+      <el-table-column prop="storeName" label="商品名称" />
+      <el-table-column prop="storeCategory.cateName" label="分类名称" />
+      <el-table-column prop="price" label="商品价格" />
+    </el-table>
+
+      <div style="margin-top: 20px">
+        <el-button type="primary" @click="doSelect()">确定选择</el-button>
+      </div>
+    <!--分页组件-->
+    <el-pagination
+      :total="total"
+      :current-page="page + 1"
+      style="margin-top: 8px;"
+      layout="total, prev, pager, next, sizes"
+      @size-change="sizeChange"
+      @current-change="pageChange"
+    />
+  </div>
+  </el-dialog>
+  </div>
+</template>
+
+<script>
+import checkPermission from '@/utils/permission'
+import initData from '@/mixins/crud'
+import { del, onsale } from '@/api/yxStoreProduct'
+export default {
+  components: { },
+  mixins: [initData],
+  props: {
+    value: {
+      type: Array,
+      default() {
+        return []
+      }
+    },
+    // 宽度
+    width: {
+      type: Number,
+      default() {
+        return 150
+      }
+    },
+    // 宽度
+    height: {
+      type: Number,
+      default() {
+        return 150
+      }
+    }
+  },
+  data() {
+    return {
+      newValue:this.value,
+      delLoading: false,
+      visible: false,
+      queryTypeOptions: [
+        { key: 'storeName', display_name: '商品名称' }
+      ],
+      isAttr: false,
+      multipleSelection: []
+    }
+  },
+  created() {
+    this.$nextTick(() => {
+      this.init()
+     
+    })
+     console.log(this.newValue,'这是什么')
+     console.log(this.value)
+      // this.newValue = this.value
+  },
+  methods: {
+    deleteGood(index) {
+      const that = this
+      this.$confirm('是否确认删除？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(function() {
+        that.value.splice(index, 1)
+        that.urls = []
+      })
+    },
+    doSelect() {
+      this.newValue = this.multipleSelection
+      this.$emit("selectGoods", this.newValue)
+      this.dialog = false
+      console.log(this.newValue)
+    },
+    // handleSelectionChange(val) {
+    //   this.multipleSelection = val;
+    //   console.log(this.multipleSelection)
+    // },
+    handleCurrentChange(val) {
+        
+        let shu = []
+        shu.push(val)
+        console.log(shu)
+        this.multipleSelection = shu;
+      },
+    toSelete() {
+      this.dialog = true
+    },
+    checkPermission,
+    beforeInit() {
+      this.url = 'api/yxStoreProduct'
+      const sort = 'id,desc'
+      this.params = { page: this.page, size: this.size, sort: sort, isShow: 1, isDel: 0 }
+      const query = this.query
+      const type = query.type
+      const value = query.value
+      if (type && value) { this.params[type] = value }
+      return true
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/components/goodss/index.vue b/src/views/components/goodss/index.vue
new file mode 100644
index 0000000..e1eb212
--- /dev/null
+++ b/src/views/components/goodss/index.vue
@@ -0,0 +1,175 @@
+<template>
+  <div>
+    <div>
+      <ul v-for="(item,index) in newValue" :key="index" class="el-upload-list el-upload-list--picture-card">
+        <li tabindex="0" class="el-upload-list__item is-ready" :style="'width: '+width+'px;height: '+height+'px'">
+          <div>
+            <img :src="item.image" alt="" class="el-upload-list__item-thumbnail">
+            <span class="el-upload-list__item-actions">
+            <!-- <span class="el-upload-list__item-delete" @click="deleteGood(index)">
+              <i class="el-icon-delete" />
+            </span> -->
+          </span>
+          </div>
+        </li>
+      </ul>
+      <div tabindex="0" class="el-upload el-upload--picture-card"  @click="toSelete">
+        <i class="el-icon-plus" />
+      </div>
+    </div>
+
+    <el-dialog :visible.sync="dialog" append-to-body width="60%" title="商品列表">
+    <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <!-- 搜索 -->
+      <el-input v-model="query.value" clearable placeholder="输入搜索内容" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
+      <el-select v-model="query.type" clearable placeholder="类型" class="filter-item" style="width: 130px">
+        <el-option v-for="item in queryTypeOptions" :key="item.key" :label="item.display_name" :value="item.key" />
+      </el-select>
+      <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
+      <!-- 新增 -->
+
+    </div>
+    <!--表单组件-->
+
+    <!--表格渲染-->
+    <el-table v-loading="loading" :data="data" size="small" style="width: 100%;" 
+     highlight-current-row
+    @current-change="handleCurrentChange">
+     
+      <el-table-column prop="id" label="商品id"  align="center"/>
+      <el-table-column ref="table" prop="image" label="商品图片" align="center">
+        <template slot-scope="scope">
+          <a :href="scope.row.image" style="color: #42b983" target="_blank"><img :src="scope.row.image" alt="点击打开" class="el-avatar"></a>
+        </template>
+      </el-table-column>
+      <el-table-column prop="storeName" label="商品名称" align="center" />
+      <el-table-column prop="storeCategory.cateName" label="分类名称" align="center" />
+      <el-table-column prop="price" label="商品价格" align="center" />
+      <el-table-column label="跳转商品" align="center">
+          <template slot-scope="scope">
+              <router-link :to="'../../shop/goodsEdit/'+scope.row.id">
+              <el-button type="primary" icon="el-icon-share" circle></el-button>
+              </router-link>
+          </template>
+      </el-table-column>
+    </el-table>
+
+      <div style="margin-top: 20px">
+        <el-button type="primary" @click="doSelect()">确定选择</el-button>
+      </div>
+    <!--分页组件-->
+    <el-pagination
+      :total="total"
+      :current-page="page + 1"
+      style="margin-top: 8px;"
+      layout="total, prev, pager, next, sizes"
+      @size-change="sizeChange"
+      @current-change="pageChange"
+    />
+  </div>
+  </el-dialog>
+  </div>
+</template>
+
+<script>
+import checkPermission from '@/utils/permission'
+import initData from '@/mixins/crud'
+import { del, onsale } from '@/api/yxStoreProduct'
+export default {
+  components: { },
+  mixins: [initData],
+  props: {
+    value: {
+      type: Array,
+      default() {
+        return []
+      }
+    },
+    // 宽度
+    width: {
+      type: Number,
+      default() {
+        return 150
+      }
+    },
+    // 宽度
+    height: {
+      type: Number,
+      default() {
+        return 150
+      }
+    }
+  },
+  data() {
+    return {
+      newValue:this.value,
+      delLoading: false,
+      visible: false,
+      queryTypeOptions: [
+        { key: 'storeName', display_name: '商品名称' }
+      ],
+      isAttr: false,
+      multipleSelection: []
+    }
+  },
+  created() {
+    this.$nextTick(() => {
+      this.init()
+     
+    })
+     console.log(this.newValue,'这是什么')
+     console.log(this.value)
+      // this.newValue = this.value
+  },
+  methods: {
+    deleteGood(index) {
+      const that = this
+      this.$confirm('是否确认删除？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(function() {
+        that.value.splice(index, 1)
+        that.urls = []
+      })
+    },
+    doSelect() {
+      this.newValue = this.multipleSelection
+      this.$emit("selectGoods", this.newValue)
+      this.dialog = false
+      console.log(this.newValue)
+    },
+    // handleSelectionChange(val) {
+    //   this.multipleSelection = val;
+    //   console.log(this.multipleSelection)
+    // },
+    handleCurrentChange(val) {
+        
+        let shu = []
+        shu.push(val)
+        console.log(shu)
+        this.multipleSelection = shu;
+      },
+    toSelete() {
+      this.dialog = true
+    },
+    checkPermission,
+    beforeInit() {
+      this.url = 'api/yxStoreProduct'
+      const sort = 'id,desc'
+      this.params = { page: this.page, size: this.size, sort: sort, isShow: 1, isDel: 0 }
+      const query = this.query
+      const type = query.type
+      const value = query.value
+      if (type && value) { this.params[type] = value }
+      return true
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/components/user/index.vue b/src/views/components/user/index.vue
new file mode 100644
index 0000000..dd19029
--- /dev/null
+++ b/src/views/components/user/index.vue
@@ -0,0 +1,161 @@
+<template>
+  <div>
+    <div v-if="value.uid">
+      <ul  class="el-upload-list el-upload-list--picture-card">
+        <li tabindex="0" class="el-upload-list__item is-ready">
+          <div>
+            <img :src="value.avatar" alt="" class="el-upload-list__item-thumbnail">
+            <span class="el-upload-list__item-actions">
+              <span class="el-upload-list__item-delete" @click="deleteUser">
+                <i class="el-icon-delete" />
+              </span>
+            </span>
+          </div>
+        </li>
+      </ul>
+    </div>
+    <div v-else tabindex="0" class="el-upload el-upload--picture-card"  @click="toSelete">
+      <i class="el-icon-plus" />
+    </div>
+    <el-dialog :visible.sync="dialog" append-to-body width="60%" title="商城会员">
+      <div class="app-container">
+      <!--工具栏-->
+      <div class="head-container">
+        <!-- 搜索 -->
+        <el-input v-model="query.value" clearable placeholder="输入搜索内容" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
+        <el-select v-model="query.type" clearable placeholder="类型" class="filter-item" style="width: 130px">
+          <el-option v-for="item in queryTypeOptions" :key="item.key" :label="item.display_name" :value="item.key" />
+        </el-select>
+        <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
+        <!-- 新增 -->
+        <el-button
+          type="danger"
+          class="filter-item"
+          size="mini"
+          icon="el-icon-refresh"
+          @click="toQuery"
+        >刷新</el-button>
+      </div>
+
+      <!--表格渲染-->
+      <el-table  :data="data" size="small" style="width: 100%;">
+        <el-table-column prop="uid" label="用户id" />
+        <el-table-column prop="nickname" label="用户昵称" />
+        <el-table-column ref="table" prop="avatar" label="用户头像">
+          <template slot-scope="scope">
+            <a :href="scope.row.avatar" style="color: #42b983" target="_blank"><img :src="scope.row.avatar" alt="点击打开" class="el-avatar"></a>
+          </template>
+        </el-table-column>
+        <el-table-column prop="phone" label="手机号码" />
+        <el-table-column label="用户来源" align="center">
+          <template slot-scope="scope">
+            <div>
+              <el-tag v-if="scope.row.userType == 'wechat'">公众号</el-tag>
+              <el-tag v-else-if="scope.row.userType == 'routine'">小程序</el-tag>
+              <el-tag v-else>H5</el-tag>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column v-if="checkPermission(['admin','YXUSER_ALL','YXUSER_EDIT','YXUSER_DELETE'])" label="操作" width="185" align="center" fixed="right">
+          <template slot-scope="scope">
+            <el-button
+              v-permission="['admin','YXUSER_ALL','YXUSER_EDIT']"
+              size="mini"
+              type="primary"
+              icon="el-icon-edit"
+              @click="doSelect(scope.row)"
+            >选择</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <!--分页组件-->
+      <el-pagination
+        :total="total"
+        :current-page="page + 1"
+        style="margin-top: 8px;"
+        layout="total, prev, pager, next, sizes"
+        @size-change="sizeChange"
+        @current-change="pageChange"
+      />
+    </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import checkPermission from '@/utils/permission'
+import initData from '@/mixins/crud'
+export default {
+  components: {},
+  mixins: [initData],
+  props: {
+    value: {
+      type: Object
+    }
+  },
+  data() {
+    return {
+      myValue: this.value,
+      delLoading: false, dialog: false,
+      userType: '',
+      queryTypeOptions: [
+        { key: 'nickname', display_name: '用户昵称' },
+        { key: 'phone', display_name: '手机号码' }
+      ]
+    }
+  },
+  created() {
+    this.$nextTick(() => {
+      this.init()
+    })
+  },
+  methods: {
+    checkPermission,
+    beforeInit() {
+      this.url = 'api/yxUser'
+      const sort = 'uid,desc'
+      this.params = { page: this.page, size: this.size, sort: sort }
+      const query = this.query
+      const type = query.type
+      const value = query.value
+      if (type && value) { this.params[type] = value }
+      return true
+    },
+    deleteUser() {
+      const that = this
+      this.$confirm('是否确认删除？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(function() {
+        //that.myValue = {uid: null,nickname: null,avatar: null}
+        that.$set(that.value,"uid", null)
+        that.$set(that.value,"nickname", null)
+        that.$set(that.value,"avatar", null)
+      })
+    },
+    toSelete() {
+      this.dialog = true
+    },
+    doSelect(data) {
+      this.$set(this.value,"uid", data.uid)
+      this.$set(this.value,"nickname", data.nickname)
+      this.$set(this.value,"avatar", data.avatar)
+
+      this.dialog = false
+    }
+
+  }
+}
+</script>
+
+<style scoped>
+  .avatar-uploader-icon {
+    font-size: 28px;
+    color: #8c939d;
+    width: 178px;
+    height: 178px;
+    line-height: 178px;
+    text-align: center;
+  }
+</style>
diff --git a/src/views/login.vue b/src/views/login.vue
index 95ddb98..d07b22f 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">芋道后台管理系统</h3>
+      <h3 class="title">眼界甄选后台管理系统</h3>
       <el-form-item prop="tenantName" v-if="tenantEnable">
         <el-input v-model="loginForm.tenantName" type="text" auto-complete="off" placeholder='租户'>
           <svg-icon slot="prefix" icon-class="tree" class="el-input__icon input-icon" />
diff --git a/vue.config.js b/vue.config.js
index 4f29dff..5a35a8e 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -8,7 +8,7 @@ function resolve(dir) {
 
 const CompressionPlugin = require('compression-webpack-plugin')
 
-const name = process.env.VUE_APP_TITLE || '农场管理系统' // 网页标题
+const name = process.env.VUE_APP_TITLE || '眼界甄选' // 网页标题
 
 const port = process.env.port || process.env.npm_config_port || 80 // 端口
 
diff --git a/yarn.lock b/yarn.lock
index 7832006..074b0ae 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1659,25 +1659,15 @@
   "resolved" "https://registry.npmmirror.com/acorn-walk/-/acorn-walk-7.2.0.tgz"
   "version" "7.2.0"
 
-"acorn@^6.0.0 || ^7.0.0 || ^8.0.0", "acorn@^6.4.1":
-  "integrity" "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ=="
-  "resolved" "https://registry.npmmirror.com/acorn/-/acorn-6.4.2.tgz"
-  "version" "6.4.2"
-
-"acorn@^7.1.1":
-  "integrity" "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="
-  "resolved" "https://registry.npmmirror.com/acorn/-/acorn-7.4.1.tgz"
-  "version" "7.4.1"
-
-"acorn@^7.2.0":
+"acorn@^6.0.0 || ^7.0.0 || ^8.0.0", "acorn@^7.1.1", "acorn@^7.2.0", "acorn@^7.4.0":
   "integrity" "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="
   "resolved" "https://registry.npmmirror.com/acorn/-/acorn-7.4.1.tgz"
   "version" "7.4.1"
 
-"acorn@^7.4.0":
-  "integrity" "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="
-  "resolved" "https://registry.npmmirror.com/acorn/-/acorn-7.4.1.tgz"
-  "version" "7.4.1"
+"acorn@^6.4.1":
+  "integrity" "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ=="
+  "resolved" "https://registry.npmmirror.com/acorn/-/acorn-6.4.2.tgz"
+  "version" "6.4.2"
 
 "acorn@^8.5.0":
   "integrity" "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ=="
@@ -1764,21 +1754,28 @@
   "resolved" "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-2.2.1.tgz"
   "version" "2.2.1"
 
-"ansi-styles@^3.1.0", "ansi-styles@^3.2.0", "ansi-styles@^3.2.1":
+"ansi-styles@^3.1.0":
   "integrity" "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="
   "resolved" "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-3.2.1.tgz"
   "version" "3.2.1"
   dependencies:
     "color-convert" "^1.9.0"
 
-"ansi-styles@^4.0.0":
-  "integrity" "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="
-  "resolved" "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz"
-  "version" "4.3.0"
+"ansi-styles@^3.2.0":
+  "integrity" "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="
+  "resolved" "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-3.2.1.tgz"
+  "version" "3.2.1"
   dependencies:
-    "color-convert" "^2.0.1"
+    "color-convert" "^1.9.0"
+
+"ansi-styles@^3.2.1":
+  "integrity" "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="
+  "resolved" "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-3.2.1.tgz"
+  "version" "3.2.1"
+  dependencies:
+    "color-convert" "^1.9.0"
 
-"ansi-styles@^4.1.0":
+"ansi-styles@^4.0.0", "ansi-styles@^4.1.0":
   "integrity" "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="
   "resolved" "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz"
   "version" "4.3.0"
@@ -2125,13 +2122,6 @@
   "resolved" "https://registry.npmmirror.com/binary-extensions/-/binary-extensions-2.2.0.tgz"
   "version" "2.2.0"
 
-"bindings@^1.5.0":
-  "integrity" "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ=="
-  "resolved" "https://registry.npmmirror.com/bindings/-/bindings-1.5.0.tgz"
-  "version" "1.5.0"
-  dependencies:
-    "file-uri-to-path" "1.0.0"
-
 "bluebird@^3.1.1", "bluebird@^3.5.0", "bluebird@^3.5.5":
   "integrity" "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="
   "resolved" "https://registry.npmmirror.com/bluebird/-/bluebird-3.7.2.tgz"
@@ -2403,7 +2393,28 @@
   "resolved" "https://registry.npmmirror.com/bytes/-/bytes-3.1.2.tgz"
   "version" "3.1.2"
 
-"cacache@^12.0.2", "cacache@^12.0.3":
+"cacache@^12.0.2":
+  "integrity" "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ=="
+  "resolved" "https://registry.npmmirror.com/cacache/-/cacache-12.0.4.tgz"
+  "version" "12.0.4"
+  dependencies:
+    "bluebird" "^3.5.5"
+    "chownr" "^1.1.1"
+    "figgy-pudding" "^3.5.1"
+    "glob" "^7.1.4"
+    "graceful-fs" "^4.1.15"
+    "infer-owner" "^1.0.3"
+    "lru-cache" "^5.1.1"
+    "mississippi" "^3.0.0"
+    "mkdirp" "^0.5.1"
+    "move-concurrently" "^1.0.1"
+    "promise-inflight" "^1.0.1"
+    "rimraf" "^2.6.3"
+    "ssri" "^6.0.1"
+    "unique-filename" "^1.1.1"
+    "y18n" "^4.0.0"
+
+"cacache@^12.0.3":
   "integrity" "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ=="
   "resolved" "https://registry.npmmirror.com/cacache/-/cacache-12.0.4.tgz"
   "version" "12.0.4"
@@ -2604,7 +2615,7 @@
     "escape-string-regexp" "^1.0.5"
     "supports-color" "^5.3.0"
 
-"chalk@^2.0.1":
+"chalk@^2.0.1", "chalk@^2.4.2":
   "integrity" "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="
   "resolved" "https://registry.npmmirror.com/chalk/-/chalk-2.4.2.tgz"
   "version" "2.4.2"
@@ -2622,15 +2633,6 @@
     "escape-string-regexp" "^1.0.5"
     "supports-color" "^5.3.0"
 
-"chalk@^2.4.2":
-  "integrity" "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="
-  "resolved" "https://registry.npmmirror.com/chalk/-/chalk-2.4.2.tgz"
-  "version" "2.4.2"
-  dependencies:
-    "ansi-styles" "^3.2.1"
-    "escape-string-regexp" "^1.0.5"
-    "supports-color" "^5.3.0"
-
 "chalk@^3.0.0":
   "integrity" "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg=="
   "resolved" "https://registry.npmmirror.com/chalk/-/chalk-3.0.0.tgz"
@@ -2705,7 +2707,12 @@
   optionalDependencies:
     "fsevents" "~2.3.2"
 
-"chownr@^1.1.1", "chownr@^1.1.2":
+"chownr@^1.1.1":
+  "integrity" "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="
+  "resolved" "https://registry.npmmirror.com/chownr/-/chownr-1.1.4.tgz"
+  "version" "1.1.4"
+
+"chownr@^1.1.2":
   "integrity" "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="
   "resolved" "https://registry.npmmirror.com/chownr/-/chownr-1.1.4.tgz"
   "version" "1.1.4"
@@ -2871,7 +2878,14 @@
     "map-visit" "^1.0.0"
     "object-visit" "^1.0.0"
 
-"color-convert@^1.9.0", "color-convert@^1.9.3":
+"color-convert@^1.9.0":
+  "integrity" "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="
+  "resolved" "https://registry.npmmirror.com/color-convert/-/color-convert-1.9.3.tgz"
+  "version" "1.9.3"
+  dependencies:
+    "color-name" "1.1.3"
+
+"color-convert@^1.9.3":
   "integrity" "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="
   "resolved" "https://registry.npmmirror.com/color-convert/-/color-convert-1.9.3.tgz"
   "version" "1.9.3"
@@ -2885,16 +2899,16 @@
   dependencies:
     "color-name" "~1.1.4"
 
-"color-name@^1.0.0", "color-name@1.1.3":
-  "integrity" "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
-  "resolved" "https://registry.npmmirror.com/color-name/-/color-name-1.1.3.tgz"
-  "version" "1.1.3"
-
-"color-name@~1.1.4":
+"color-name@^1.0.0", "color-name@~1.1.4":
   "integrity" "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
   "resolved" "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz"
   "version" "1.1.4"
 
+"color-name@1.1.3":
+  "integrity" "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
+  "resolved" "https://registry.npmmirror.com/color-name/-/color-name-1.1.3.tgz"
+  "version" "1.1.3"
+
 "color-string@^1.6.0":
   "integrity" "sha512-9Mrz2AQLefkH1UvASKj6v6hj/7eWgjnT/cVsR8CumieLoT+g900exWeNogqtweI8dxloXN9BDQTYro1oWu/5CQ=="
   "resolved" "https://registry.npmmirror.com/color-string/-/color-string-1.9.0.tgz"
@@ -2923,7 +2937,17 @@
   dependencies:
     "delayed-stream" "~1.0.0"
 
-"commander@^2.18.0", "commander@^2.19.0", "commander@^2.20.0":
+"commander@^2.18.0":
+  "integrity" "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
+  "resolved" "https://registry.npmmirror.com/commander/-/commander-2.20.3.tgz"
+  "version" "2.20.3"
+
+"commander@^2.19.0":
+  "integrity" "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
+  "resolved" "https://registry.npmmirror.com/commander/-/commander-2.20.3.tgz"
+  "version" "2.20.3"
+
+"commander@^2.20.0":
   "integrity" "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
   "resolved" "https://registry.npmmirror.com/commander/-/commander-2.20.3.tgz"
   "version" "2.20.3"
@@ -3248,16 +3272,7 @@
     "shebang-command" "^1.2.0"
     "which" "^1.2.9"
 
-"cross-spawn@^7.0.0":
-  "integrity" "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w=="
-  "resolved" "https://registry.npmmirror.com/cross-spawn/-/cross-spawn-7.0.3.tgz"
-  "version" "7.0.3"
-  dependencies:
-    "path-key" "^3.1.0"
-    "shebang-command" "^2.0.0"
-    "which" "^2.0.1"
-
-"cross-spawn@^7.0.2":
+"cross-spawn@^7.0.0", "cross-spawn@^7.0.2":
   "integrity" "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w=="
   "resolved" "https://registry.npmmirror.com/cross-spawn/-/cross-spawn-7.0.3.tgz"
   "version" "7.0.3"
@@ -3803,7 +3818,7 @@
   "resolved" "https://registry.npmmirror.com/domready/-/domready-1.0.8.tgz"
   "version" "1.0.8"
 
-"domutils@^1.5.1", "domutils@^1.7.0":
+"domutils@^1.5.1":
   "integrity" "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg=="
   "resolved" "https://registry.npmmirror.com/domutils/-/domutils-1.7.0.tgz"
   "version" "1.7.0"
@@ -3811,16 +3826,15 @@
     "dom-serializer" "0"
     "domelementtype" "1"
 
-"domutils@^2.5.2":
-  "integrity" "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A=="
-  "resolved" "https://registry.npmmirror.com/domutils/-/domutils-2.8.0.tgz"
-  "version" "2.8.0"
+"domutils@^1.7.0":
+  "integrity" "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg=="
+  "resolved" "https://registry.npmmirror.com/domutils/-/domutils-1.7.0.tgz"
+  "version" "1.7.0"
   dependencies:
-    "dom-serializer" "^1.0.1"
-    "domelementtype" "^2.2.0"
-    "domhandler" "^4.2.0"
+    "dom-serializer" "0"
+    "domelementtype" "1"
 
-"domutils@^2.8.0":
+"domutils@^2.5.2", "domutils@^2.8.0":
   "integrity" "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A=="
   "resolved" "https://registry.npmmirror.com/domutils/-/domutils-2.8.0.tgz"
   "version" "2.8.0"
@@ -4015,7 +4029,7 @@
   dependencies:
     "stackframe" "^1.1.1"
 
-"es-abstract@^1.17.2", "es-abstract@^1.19.0", "es-abstract@^1.19.1":
+"es-abstract@^1.19.0", "es-abstract@^1.19.1":
   "integrity" "sha512-gfSBJoZdlL2xRiOCy0g8gLMryhoe1TlimjzU99L/31Z8QEGIhVQI+EWwt5lT+AuU9SnorVupXFqqOGqGfsyO6w=="
   "resolved" "https://registry.npmmirror.com/es-abstract/-/es-abstract-1.19.2.tgz"
   "version" "1.19.2"
@@ -4767,19 +4781,6 @@
   "resolved" "https://registry.npmmirror.com/fs.realpath/-/fs.realpath-1.0.0.tgz"
   "version" "1.0.0"
 
-"fsevents@^1.2.7":
-  "integrity" "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw=="
-  "resolved" "https://registry.npmmirror.com/fsevents/-/fsevents-1.2.13.tgz"
-  "version" "1.2.13"
-  dependencies:
-    "bindings" "^1.5.0"
-    "nan" "^2.12.1"
-
-"fsevents@~2.3.2":
-  "integrity" "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA=="
-  "resolved" "https://registry.npmmirror.com/fsevents/-/fsevents-2.3.2.tgz"
-  "version" "2.3.2"
-
 "function-bind@^1.1.1":
   "integrity" "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
   "resolved" "https://registry.npmmirror.com/function-bind/-/function-bind-1.1.1.tgz"
@@ -4876,7 +4877,14 @@
     "is-glob" "^3.1.0"
     "path-dirname" "^1.0.0"
 
-"glob-parent@^5.0.0", "glob-parent@~5.1.2":
+"glob-parent@^5.0.0":
+  "integrity" "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="
+  "resolved" "https://registry.npmmirror.com/glob-parent/-/glob-parent-5.1.2.tgz"
+  "version" "5.1.2"
+  dependencies:
+    "is-glob" "^4.0.1"
+
+"glob-parent@~5.1.2":
   "integrity" "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="
   "resolved" "https://registry.npmmirror.com/glob-parent/-/glob-parent-5.1.2.tgz"
   "version" "5.1.2"
@@ -5628,16 +5636,7 @@
     "is-data-descriptor" "^0.1.4"
     "kind-of" "^5.0.0"
 
-"is-descriptor@^1.0.0":
-  "integrity" "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg=="
-  "resolved" "https://registry.npmmirror.com/is-descriptor/-/is-descriptor-1.0.2.tgz"
-  "version" "1.0.2"
-  dependencies:
-    "is-accessor-descriptor" "^1.0.0"
-    "is-data-descriptor" "^1.0.0"
-    "kind-of" "^6.0.2"
-
-"is-descriptor@^1.0.2":
+"is-descriptor@^1.0.0", "is-descriptor@^1.0.2":
   "integrity" "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg=="
   "resolved" "https://registry.npmmirror.com/is-descriptor/-/is-descriptor-1.0.2.tgz"
   "version" "1.0.2"
@@ -5661,6 +5660,11 @@
   "resolved" "https://registry.npmmirror.com/is-extendable/-/is-extendable-0.1.1.tgz"
   "version" "0.1.1"
 
+"is-extendable@^0.1.1":
+  "integrity" "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw=="
+  "resolved" "https://registry.npmmirror.com/is-extendable/-/is-extendable-0.1.1.tgz"
+  "version" "0.1.1"
+
 "is-extendable@^1.0.1":
   "integrity" "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA=="
   "resolved" "https://registry.npmmirror.com/is-extendable/-/is-extendable-1.0.1.tgz"
@@ -6037,14 +6041,7 @@
   "resolved" "https://registry.npmmirror.com/killable/-/killable-1.0.1.tgz"
   "version" "1.0.1"
 
-"kind-of@^3.0.2":
-  "integrity" "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ=="
-  "resolved" "https://registry.npmmirror.com/kind-of/-/kind-of-3.2.2.tgz"
-  "version" "3.2.2"
-  dependencies:
-    "is-buffer" "^1.1.5"
-
-"kind-of@^3.0.3":
+"kind-of@^3.0.2", "kind-of@^3.0.3":
   "integrity" "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ=="
   "resolved" "https://registry.npmmirror.com/kind-of/-/kind-of-3.2.2.tgz"
   "version" "3.2.2"
@@ -6315,7 +6312,23 @@
   "resolved" "https://registry.npmmirror.com/lower-case/-/lower-case-1.1.4.tgz"
   "version" "1.1.4"
 
-"lru-cache@^4.0.1", "lru-cache@^4.1.2", "lru-cache@^4.1.5":
+"lru-cache@^4.0.1":
+  "integrity" "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g=="
+  "resolved" "https://registry.npmmirror.com/lru-cache/-/lru-cache-4.1.5.tgz"
+  "version" "4.1.5"
+  dependencies:
+    "pseudomap" "^1.0.2"
+    "yallist" "^2.1.2"
+
+"lru-cache@^4.1.2":
+  "integrity" "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g=="
+  "resolved" "https://registry.npmmirror.com/lru-cache/-/lru-cache-4.1.5.tgz"
+  "version" "4.1.5"
+  dependencies:
+    "pseudomap" "^1.0.2"
+    "yallist" "^2.1.2"
+
+"lru-cache@^4.1.5":
   "integrity" "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g=="
   "resolved" "https://registry.npmmirror.com/lru-cache/-/lru-cache-4.1.5.tgz"
   "version" "4.1.5"
@@ -6572,17 +6585,7 @@
     "component-query" "^0.0.3"
     "domify" "^1.3.1"
 
-"min-dom@^3.1.0":
-  "integrity" "sha512-Lbi1NZjLV9Hg6/bEe2Lfk2Fzsv1MwheR61whqTLP+FxLndYo9TxpksEgM5Kr1khjfCtFTMr0waeEfwIpStkRdw=="
-  "resolved" "https://registry.npmmirror.com/min-dom/-/min-dom-3.1.3.tgz"
-  "version" "3.1.3"
-  dependencies:
-    "component-event" "^0.1.4"
-    "domify" "^1.3.1"
-    "indexof" "0.0.1"
-    "matches-selector" "^1.2.0"
-
-"min-dom@^3.1.3":
+"min-dom@^3.1.0", "min-dom@^3.1.3":
   "integrity" "sha512-Lbi1NZjLV9Hg6/bEe2Lfk2Fzsv1MwheR61whqTLP+FxLndYo9TxpksEgM5Kr1khjfCtFTMr0waeEfwIpStkRdw=="
   "resolved" "https://registry.npmmirror.com/min-dom/-/min-dom-3.1.3.tgz"
   "version" "3.1.3"
@@ -6694,38 +6697,22 @@
     "for-in" "^1.0.2"
     "is-extendable" "^1.0.1"
 
-"mkdirp@^0.5.1":
+"mkdirp@^0.5.1", "mkdirp@^0.5.3", "mkdirp@^0.5.5", "mkdirp@~0.5.1":
   "integrity" "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw=="
   "resolved" "https://registry.npmmirror.com/mkdirp/-/mkdirp-0.5.6.tgz"
   "version" "0.5.6"
   dependencies:
     "minimist" "^1.2.6"
 
-"mkdirp@^0.5.3":
-  "integrity" "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw=="
-  "resolved" "https://registry.npmmirror.com/mkdirp/-/mkdirp-0.5.6.tgz"
-  "version" "0.5.6"
-  dependencies:
-    "minimist" "^1.2.6"
-
-"mkdirp@^0.5.5":
-  "integrity" "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw=="
-  "resolved" "https://registry.npmmirror.com/mkdirp/-/mkdirp-0.5.6.tgz"
-  "version" "0.5.6"
-  dependencies:
-    "minimist" "^1.2.6"
-
-"mkdirp@^1.0.3", "mkdirp@^1.0.4":
+"mkdirp@^1.0.3":
   "integrity" "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="
   "resolved" "https://registry.npmmirror.com/mkdirp/-/mkdirp-1.0.4.tgz"
   "version" "1.0.4"
 
-"mkdirp@~0.5.1":
-  "integrity" "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw=="
-  "resolved" "https://registry.npmmirror.com/mkdirp/-/mkdirp-0.5.6.tgz"
-  "version" "0.5.6"
-  dependencies:
-    "minimist" "^1.2.6"
+"mkdirp@^1.0.4":
+  "integrity" "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="
+  "resolved" "https://registry.npmmirror.com/mkdirp/-/mkdirp-1.0.4.tgz"
+  "version" "1.0.4"
 
 "moddle-xml@^9.0.5":
   "integrity" "sha512-1t9N35ZMQZTYZmRDoh1mBVd0XwLB34BkBywNJ0+YlLLYxaDBjFR/I+fqwsY746ayYPBz6yNRg8JpLyFgNF+eHg=="
@@ -6797,11 +6784,6 @@
     "object-assign" "^4.0.1"
     "thenify-all" "^1.0.0"
 
-"nan@^2.12.1":
-  "integrity" "sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ=="
-  "resolved" "https://registry.npmmirror.com/nan/-/nan-2.15.0.tgz"
-  "version" "2.15.0"
-
 "nanoid@^3.3.1":
   "integrity" "sha512-CuHBogktKwpm5g2sRgv83jEy2ijFzBwMoYA60orPDR7ynsLijJDqgsi4RDGj3OJpy3Ieb+LYwiRmIOGyytgITA=="
   "resolved" "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.2.tgz"
@@ -7060,7 +7042,7 @@
     "define-properties" "^1.1.3"
     "es-abstract" "^1.19.1"
 
-"object.getownpropertydescriptors@^2.0.3", "object.getownpropertydescriptors@^2.1.0":
+"object.getownpropertydescriptors@^2.0.3":
   "integrity" "sha512-VdDoCwvJI4QdC6ndjpqFmoL3/+HxffFBbcJzKi5hwLLqqx3mdbedRpfZDdK0SrOSauj8X4GzBvnDZl4vTN7dOw=="
   "resolved" "https://registry.npmmirror.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.3.tgz"
   "version" "2.1.3"
@@ -7407,7 +7389,12 @@
   "resolved" "https://registry.npmmirror.com/path-is-inside/-/path-is-inside-1.0.2.tgz"
   "version" "1.0.2"
 
-"path-key@^2.0.0", "path-key@^2.0.1":
+"path-key@^2.0.0":
+  "integrity" "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw=="
+  "resolved" "https://registry.npmmirror.com/path-key/-/path-key-2.0.1.tgz"
+  "version" "2.0.1"
+
+"path-key@^2.0.1":
   "integrity" "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw=="
   "resolved" "https://registry.npmmirror.com/path-key/-/path-key-2.0.1.tgz"
   "version" "2.0.1"
@@ -8448,7 +8435,28 @@
   "resolved" "https://registry.npmmirror.com/rgba-regex/-/rgba-regex-1.0.0.tgz"
   "version" "1.0.0"
 
-"rimraf@^2.5.4", "rimraf@^2.6.1", "rimraf@^2.6.3", "rimraf@^2.7.1":
+"rimraf@^2.5.4":
+  "integrity" "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w=="
+  "resolved" "https://registry.npmmirror.com/rimraf/-/rimraf-2.7.1.tgz"
+  "version" "2.7.1"
+  dependencies:
+    "glob" "^7.1.3"
+
+"rimraf@^2.6.1":
+  "integrity" "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w=="
+  "resolved" "https://registry.npmmirror.com/rimraf/-/rimraf-2.7.1.tgz"
+  "version" "2.7.1"
+  dependencies:
+    "glob" "^7.1.3"
+
+"rimraf@^2.6.3":
+  "integrity" "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w=="
+  "resolved" "https://registry.npmmirror.com/rimraf/-/rimraf-2.7.1.tgz"
+  "version" "2.7.1"
+  dependencies:
+    "glob" "^7.1.3"
+
+"rimraf@^2.7.1":
   "integrity" "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w=="
   "resolved" "https://registry.npmmirror.com/rimraf/-/rimraf-2.7.1.tgz"
   "version" "2.7.1"
@@ -8636,32 +8644,17 @@
   "resolved" "https://registry.npmmirror.com/semver-compare/-/semver-compare-1.0.0.tgz"
   "version" "1.0.0"
 
-"semver@^5.5.0", "semver@^5.6.0", "semver@2 || 3 || 4 || 5":
+"semver@^5.5.0":
   "integrity" "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
   "resolved" "https://registry.npmmirror.com/semver/-/semver-5.7.1.tgz"
   "version" "5.7.1"
 
-"semver@^6.0.0":
-  "integrity" "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
-  "resolved" "https://registry.npmmirror.com/semver/-/semver-6.3.0.tgz"
-  "version" "6.3.0"
-
-"semver@^6.1.0":
-  "integrity" "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
-  "resolved" "https://registry.npmmirror.com/semver/-/semver-6.3.0.tgz"
-  "version" "6.3.0"
-
-"semver@^6.1.1":
-  "integrity" "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
-  "resolved" "https://registry.npmmirror.com/semver/-/semver-6.3.0.tgz"
-  "version" "6.3.0"
-
-"semver@^6.1.2":
-  "integrity" "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
-  "resolved" "https://registry.npmmirror.com/semver/-/semver-6.3.0.tgz"
-  "version" "6.3.0"
+"semver@^5.6.0":
+  "integrity" "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+  "resolved" "https://registry.npmmirror.com/semver/-/semver-5.7.1.tgz"
+  "version" "5.7.1"
 
-"semver@^6.3.0":
+"semver@^6.0.0", "semver@^6.1.0", "semver@^6.1.1", "semver@^6.1.2", "semver@^6.3.0":
   "integrity" "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
   "resolved" "https://registry.npmmirror.com/semver/-/semver-6.3.0.tgz"
   "version" "6.3.0"
@@ -8687,6 +8680,11 @@
   dependencies:
     "lru-cache" "^6.0.0"
 
+"semver@2 || 3 || 4 || 5":
+  "integrity" "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+  "resolved" "https://registry.npmmirror.com/semver/-/semver-5.7.1.tgz"
+  "version" "5.7.1"
+
 "semver@7.0.0":
   "integrity" "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A=="
   "resolved" "https://registry.npmmirror.com/semver/-/semver-7.0.0.tgz"
@@ -8984,7 +8982,7 @@
   "resolved" "https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz"
   "version" "0.6.1"
 
-"source-map@^0.6.1":
+"source-map@^0.6.1", "source-map@~0.6.1":
   "integrity" "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
   "resolved" "https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz"
   "version" "0.6.1"
@@ -8994,11 +8992,6 @@
   "resolved" "https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz"
   "version" "0.6.1"
 
-"source-map@~0.6.1":
-  "integrity" "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-  "resolved" "https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz"
-  "version" "0.6.1"
-
 "source-map@~0.7.2":
   "integrity" "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="
   "resolved" "https://registry.npmmirror.com/source-map/-/source-map-0.7.3.tgz"
@@ -9125,7 +9118,12 @@
     "define-property" "^0.2.5"
     "object-copy" "^0.1.0"
 
-"statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", "statuses@~1.5.0":
+"statuses@>= 1.4.0 < 2":
+  "integrity" "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA=="
+  "resolved" "https://registry.npmmirror.com/statuses/-/statuses-1.5.0.tgz"
+  "version" "1.5.0"
+
+"statuses@>= 1.5.0 < 2":
   "integrity" "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA=="
   "resolved" "https://registry.npmmirror.com/statuses/-/statuses-1.5.0.tgz"
   "version" "1.5.0"
@@ -9135,6 +9133,11 @@
   "resolved" "https://registry.npmmirror.com/statuses/-/statuses-1.3.1.tgz"
   "version" "1.3.1"
 
+"statuses@~1.5.0":
+  "integrity" "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA=="
+  "resolved" "https://registry.npmmirror.com/statuses/-/statuses-1.5.0.tgz"
+  "version" "1.5.0"
+
 "stream-browserify@^2.0.1":
   "integrity" "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg=="
   "resolved" "https://registry.npmmirror.com/stream-browserify/-/stream-browserify-2.0.2.tgz"
@@ -9336,14 +9339,7 @@
   dependencies:
     "has-flag" "^3.0.0"
 
-"supports-color@^7.0.0":
-  "integrity" "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="
-  "resolved" "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz"
-  "version" "7.2.0"
-  dependencies:
-    "has-flag" "^4.0.0"
-
-"supports-color@^7.1.0":
+"supports-color@^7.0.0", "supports-color@^7.1.0":
   "integrity" "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="
   "resolved" "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz"
   "version" "7.2.0"
@@ -9499,7 +9495,16 @@
     "terser" "^5.3.4"
     "webpack-sources" "^1.4.3"
 
-"terser@^4.1.2", "terser@^4.6.12":
+"terser@^4.1.2":
+  "integrity" "sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw=="
+  "resolved" "https://registry.npmmirror.com/terser/-/terser-4.8.0.tgz"
+  "version" "4.8.0"
+  dependencies:
+    "commander" "^2.20.0"
+    "source-map" "~0.6.1"
+    "source-map-support" "~0.5.12"
+
+"terser@^4.6.12":
   "integrity" "sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw=="
   "resolved" "https://registry.npmmirror.com/terser/-/terser-4.8.0.tgz"
   "version" "4.8.0"
@@ -9917,17 +9922,7 @@
   "resolved" "https://registry.npmmirror.com/util-deprecate/-/util-deprecate-1.0.2.tgz"
   "version" "1.0.2"
 
-"util.promisify@~1.0.0":
-  "integrity" "sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA=="
-  "resolved" "https://registry.npmmirror.com/util.promisify/-/util.promisify-1.0.1.tgz"
-  "version" "1.0.1"
-  dependencies:
-    "define-properties" "^1.1.3"
-    "es-abstract" "^1.17.2"
-    "has-symbols" "^1.0.1"
-    "object.getownpropertydescriptors" "^2.1.0"
-
-"util.promisify@1.0.0":
+"util.promisify@~1.0.0", "util.promisify@1.0.0":
   "integrity" "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA=="
   "resolved" "https://registry.npmmirror.com/util.promisify/-/util.promisify-1.0.0.tgz"
   "version" "1.0.0"