diff --git a/src/api/strategy/index.js b/src/api/strategy/index.js
new file mode 100644
index 0000000..89e7c32
--- /dev/null
+++ b/src/api/strategy/index.js
@@ -0,0 +1,33 @@
+import request from '@/utils/request'
+
+export function index(params){
+ return request({
+ method:'get',
+ url:'/api/admin/strategy/index',
+ params
+ })
+}
+
+export function store(data){
+ return request({
+ method:'post',
+ url:'/api/admin/strategy/store',
+ data
+ })
+}
+
+export function save(data){
+ return request({
+ method:'post',
+ url:'/api/admin/strategy/save',
+ data
+ })
+}
+
+export function destroy(data){
+ return request({
+ method:'post',
+ url:'/api/admin/strategy/destroy',
+ data
+ })
+}
diff --git a/src/api/strategyType/index.js b/src/api/strategyType/index.js
new file mode 100644
index 0000000..3f357fc
--- /dev/null
+++ b/src/api/strategyType/index.js
@@ -0,0 +1,33 @@
+import request from '@/utils/request'
+
+export function index(params){
+ return request({
+ method:'get',
+ url:'/api/admin/strategy-type/index',
+ params
+ })
+}
+
+export function store(data){
+ return request({
+ method:'post',
+ url:'/api/admin/strategy-type/store',
+ data
+ })
+}
+
+export function save(data){
+ return request({
+ method:'post',
+ url:'/api/admin/strategy-type/save',
+ data
+ })
+}
+
+export function destroy(data){
+ return request({
+ method:'post',
+ url:'/api/admin/strategy-type/destroy',
+ data
+ })
+}
diff --git a/src/components/Tinymce/index.vue b/src/components/Tinymce/index.vue
index fb0df2b..fd440a5 100644
--- a/src/components/Tinymce/index.vue
+++ b/src/components/Tinymce/index.vue
@@ -142,6 +142,7 @@ export default {
powerpaste_word_import: 'clean',
code_dialog_height: 450,
code_dialog_width: 1000,
+ fontsize_formats: "8px 10px 12px 14px 16px 18px 24px 28px 36px",
advlist_bullet_styles: 'square',
advlist_number_styles: 'default',
imagetools_cors_hosts: ['www.tinymce.com', 'codepen.io'],
diff --git a/src/components/Tinymce/toolbar.js b/src/components/Tinymce/toolbar.js
index 4f8a545..1d6fefb 100644
--- a/src/components/Tinymce/toolbar.js
+++ b/src/components/Tinymce/toolbar.js
@@ -1,6 +1,6 @@
// Here is a list of the toolbar
// Detail list see https://www.tinymce.com/docs/advanced/editor-control-identifiers/#toolbarcontrols
-const toolbar = ['searchreplace bold italic underline strikethrough alignleft aligncenter alignright outdent indent blockquote undo redo removeformat subscript superscript code codesample', 'hr bullist numlist link image charmap preview anchor pagebreak insertdatetime media table emoticons forecolor backcolor fullscreen']
+const toolbar = ['searchreplace bold italic underline strikethrough alignleft aligncenter alignright outdent indent blockquote undo redo removeformat subscript superscript code codesample', 'hr bullist numlist link image charmap preview anchor pagebreak insertdatetime media table emoticons forecolor backcolor fullscreen fontsizeselect fontselect']
export default toolbar
diff --git a/src/layout/noLayout.vue b/src/layout/noLayout.vue
new file mode 100644
index 0000000..38b2e40
--- /dev/null
+++ b/src/layout/noLayout.vue
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 3efa001..22a1268 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -1,3 +1,4 @@
+import Vue from 'vue'
import {
asyncRoutes,
constantRoutes
@@ -60,14 +61,32 @@ const state = {
* 后台查询的菜单数据拼装成路由格式的数据
* @param routes
*/
+const pathHandler = (path,id) => {
+ if(path.includes('#') || path == ''){
+ return id + '_key'
+ }
+ return path
+}
+const componentHandler = (path) => {
+ //return path === '#'|| path == '' ? Layout : loadView(path)
+ if(path === '#' || path === ''){
+ return Layout
+ }
+ if(path.includes('#') && path != '#'){
+ return ()=>import('@/layout/noLayout')
+ }
+ return loadView(path)
+}
export function generaMenu(routes, data) {
data.forEach(item => {
if (item.url === "/") {
} else {
const menu = {
- path: (item.path === '#'||item.path == '' ? item.id + '_key' : item.path),
- component: (item.path === '#'||item.path == '' ? Layout : loadView(item.path)),
+ path: pathHandler(item.path,item.id),
+ //(item.path === '#'||item.path == '' ? item.id + '_key' : item.path),
+ component: componentHandler(item.path),
+ //(item.path === '#'||item.path == '' ? Layout : loadView(item.path)),
// hidden: true,
children: [],
name: 'menu_' + item.id,
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 8905018..78369e3 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -173,6 +173,10 @@ top: 41px !important;
bottom: -11.5px;
}
+.el-menu-item.is-active{
+ color: $primaryColor !important;
+}
+
::-webkit-scrollbar {
width: 8px;
height: 8px;
@@ -187,3 +191,7 @@ top: 41px !important;
background: #EFF2F9;
}
+#nprogress .bar{
+ background: $primaryColor !important;
+}
+
diff --git a/src/views/business/component/addStore.vue b/src/views/business/component/addStore.vue
index 461bfb0..845a49c 100644
--- a/src/views/business/component/addStore.vue
+++ b/src/views/business/component/addStore.vue
@@ -9,7 +9,7 @@
-
+
@@ -93,30 +93,32 @@
-
-
+
+
diff --git a/src/views/productService/components/addStrategy.vue b/src/views/productService/components/addStrategy.vue
new file mode 100644
index 0000000..0554a24
--- /dev/null
+++ b/src/views/productService/components/addStrategy.vue
@@ -0,0 +1,242 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 封面图：
+
+
+
+
![]()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 图标：
+
+
+
+
![]()
+
+
+
+
+
+
+
+