diff --git a/package.json b/package.json
index f545437..86d1e6f 100644
--- a/package.json
+++ b/package.json
@@ -15,6 +15,7 @@
},
"dependencies": {
"element-ui": "^2.3.6",
+ "js-cookie": "^2.2.0",
"vue": "^2.5.16",
"vue-router": "^3.0.1",
"vue-template-compiler": "^2.5.16",
diff --git a/src/api/ad/ad.js b/src/api/ad/ad.js
new file mode 100644
index 0000000..57df6e1
--- /dev/null
+++ b/src/api/ad/ad.js
@@ -0,0 +1,34 @@
+/**
+ * Created by lk on 17/6/4.
+ */
+import fetch from '../../utils/fetch'
+
+// 谁最懂我相关
+
+// 列表
+export function adList (query) {
+ return fetch({
+ url: '/admin/ad/index',
+ method: 'get',
+ params: query
+ })
+}
+
+// 保存
+export function adSave (data, formName, method = 'post') {
+ var url = formName === 'add' ? '/admin/ad/save' : '/admin/ad/edit'
+ return fetch({
+ url: url,
+ method: method,
+ data: data
+ })
+}
+
+// 删除
+export function adDelete (data) {
+ return fetch({
+ url: '/admin/ad/delete',
+ method: 'post',
+ data: data
+ })
+}
diff --git a/src/api/ad/adSite.js b/src/api/ad/adSite.js
new file mode 100644
index 0000000..f6ab813
--- /dev/null
+++ b/src/api/ad/adSite.js
@@ -0,0 +1,43 @@
+/**
+ * Created by lk on 17/6/4.
+ */
+import fetch from '../../utils/fetch'
+
+// 谁最懂我相关
+
+// 列表
+export function adSiteList (query) {
+ return fetch({
+ url: '/admin/ad_site/index',
+ method: 'get',
+ params: query
+ })
+}
+
+// 广告列表
+export function adSiteAdList (query) {
+ return fetch({
+ url: '/admin/ad_site/adList',
+ method: 'get',
+ params: query
+ })
+}
+
+// 保存
+export function adSiteSave (data, formName, method = 'post') {
+ var url = formName === 'add' ? '/admin/ad_site/save' : '/admin/ad_site/edit'
+ return fetch({
+ url: url,
+ method: method,
+ data: data
+ })
+}
+
+// 删除
+export function adSiteDelete (data) {
+ return fetch({
+ url: '/admin/ad_site/delete',
+ method: 'post',
+ data: data
+ })
+}
diff --git a/src/api/authAdmin.js b/src/api/auth/authAdmin.js
similarity index 95%
rename from src/api/authAdmin.js
rename to src/api/auth/authAdmin.js
index 1d32c93..06d7643 100644
--- a/src/api/authAdmin.js
+++ b/src/api/auth/authAdmin.js
@@ -1,7 +1,7 @@
/**
* Created by lk on 17/6/4.
*/
-import fetch from '../utils/fetch'
+import fetch from '../../utils/fetch'
const API_SUFFIX = process.env.API_SUFFIX
diff --git a/src/api/authPermissionRule.js b/src/api/auth/authPermissionRule.js
similarity index 95%
rename from src/api/authPermissionRule.js
rename to src/api/auth/authPermissionRule.js
index cc4027c..066bd6e 100644
--- a/src/api/authPermissionRule.js
+++ b/src/api/auth/authPermissionRule.js
@@ -1,7 +1,7 @@
/**
* Created by lk on 17/6/4.
*/
-import fetch from '../utils/fetch'
+import fetch from '../../utils/fetch'
const API_SUFFIX = process.env.API_SUFFIX
diff --git a/src/api/authRole.js b/src/api/auth/authRole.js
similarity index 96%
rename from src/api/authRole.js
rename to src/api/auth/authRole.js
index 4bdc215..ea99814 100644
--- a/src/api/authRole.js
+++ b/src/api/auth/authRole.js
@@ -1,7 +1,7 @@
/**
* Created by lk on 17/6/4.
*/
-import fetch from '../utils/fetch'
+import fetch from '../../utils/fetch'
const API_SUFFIX = process.env.API_SUFFIX
diff --git a/src/api/login.js b/src/api/login.js
index e84cf92..6fc57c3 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -6,11 +6,10 @@ import fetch from '../utils/fetch'
const API_SUFFIX = process.env.API_SUFFIX
// 获取信息
-export function userInfo (id, token) {
+export function userInfo () {
return fetch({
url: '/admin/login/userInfo' + API_SUFFIX,
- method: 'get',
- params: {id, token}
+ method: 'get'
})
}
@@ -22,11 +21,10 @@ export function loginName (userName, pwd) {
})
}
-export function logout (uid, token) {
+export function logout () {
return fetch({
url: '/admin/login/out' + API_SUFFIX,
- method: 'post',
- data: { uid, token }
+ method: 'post'
})
}
diff --git a/src/assets/icons/demo_fontclass.html b/src/assets/icons/demo_fontclass.html
index 9e2476b..21aa6f8 100644
--- a/src/assets/icons/demo_fontclass.html
+++ b/src/assets/icons/demo_fontclass.html
@@ -60,6 +60,12 @@
IconFont 图标
.icon-eye
+
+
+ 广告
+ .icon-guanggao
+
+
管理员
@@ -78,12 +84,24 @@ IconFont 图标
.icon-shouye
+
+
+ 世界杯
+ .icon-shijiebei
+
+
角色
.icon-jiaose
+
+
+ 报表
+ .icon-baobiao
+
+
管理员
diff --git a/src/assets/icons/demo_symbol.html b/src/assets/icons/demo_symbol.html
index ae5fa42..5c73e04 100644
--- a/src/assets/icons/demo_symbol.html
+++ b/src/assets/icons/demo_symbol.html
@@ -91,6 +91,14 @@ IconFont 图标
#icon-eye
+
+
+ 广告
+ #icon-guanggao
+
+
+
+
+ 世界杯
+ #icon-shijiebei
+
+
+
+
+ 报表
+ #icon-baobiao
+
+
+
+
+ 广告
+ 
+
+
管理员
@@ -98,12 +104,24 @@ IconFont 图标

+
+
+ 世界杯
+ 
+
+
角色

+
+
+ 报表
+ 
+
+
管理员
diff --git a/src/assets/icons/iconfont.css b/src/assets/icons/iconfont.css
index 2cb8da6..8c17c7b 100644
--- a/src/assets/icons/iconfont.css
+++ b/src/assets/icons/iconfont.css
@@ -1,10 +1,10 @@
@font-face {font-family: "iconfont";
- src: url('iconfont.eot?t=1526557312884'); /* IE9*/
- src: url('iconfont.eot?t=1526557312884#iefix') format('embedded-opentype'), /* IE6-IE8 */
- url('data:application/x-font-woff;charset=utf-8;base64,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') format('woff'),
- url('iconfont.ttf?t=1526557312884') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
- url('iconfont.svg?t=1526557312884#iconfont') format('svg'); /* iOS 4.1- */
+ src: url('iconfont.eot?t=1531114397320'); /* IE9*/
+ src: url('iconfont.eot?t=1531114397320#iefix') format('embedded-opentype'), /* IE6-IE8 */
+ url('data:application/x-font-woff;charset=utf-8;base64,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') format('woff'),
+ url('iconfont.ttf?t=1531114397320') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
+ url('iconfont.svg?t=1531114397320#iconfont') format('svg'); /* iOS 4.1- */
}
.iconfont {
@@ -31,14 +31,20 @@
.icon-eye:before { content: "\e63d"; }
+.icon-guanggao:before { content: "\e679"; }
+
.icon-guanliyuan:before { content: "\e618"; }
.icon-cloud-permissions:before { content: "\e668"; }
.icon-shouye:before { content: "\e602"; }
+.icon-shijiebei:before { content: "\e60d"; }
+
.icon-jiaose:before { content: "\e67e"; }
+.icon-baobiao:before { content: "\e6fc"; }
+
.icon-guanliyuan1:before { content: "\e65d"; }
.icon-tiku:before { content: "\e62f"; }
diff --git a/src/assets/icons/iconfont.eot b/src/assets/icons/iconfont.eot
index 32622c0..95ae003 100644
Binary files a/src/assets/icons/iconfont.eot and b/src/assets/icons/iconfont.eot differ
diff --git a/src/assets/icons/iconfont.js b/src/assets/icons/iconfont.js
index 0a7492d..e2b4234 100644
--- a/src/assets/icons/iconfont.js
+++ b/src/assets/icons/iconfont.js
@@ -1,2 +1,2 @@
-/*eslint-disable */
-(function(window){var svgSprite='';var script=function(){var scripts=document.getElementsByTagName("script");return scripts[scripts.length-1]}();var shouldInjectCss=script.getAttribute("data-injectcss");var ready=function(fn){if(document.addEventListener){if(~["complete","loaded","interactive"].indexOf(document.readyState)){setTimeout(fn,0)}else{var loadFn=function(){document.removeEventListener("DOMContentLoaded",loadFn,false);fn()};document.addEventListener("DOMContentLoaded",loadFn,false)}}else if(document.attachEvent){IEContentLoaded(window,fn)}function IEContentLoaded(w,fn){var d=w.document,done=false,init=function(){if(!done){done=true;fn()}};var polling=function(){try{d.documentElement.doScroll("left")}catch(e){setTimeout(polling,50);return}init()};polling();d.onreadystatechange=function(){if(d.readyState=="complete"){d.onreadystatechange=null;init()}}}};var before=function(el,target){target.parentNode.insertBefore(el,target)};var prepend=function(el,target){if(target.firstChild){before(el,target.firstChild)}else{target.appendChild(el)}};function appendSvg(){var div,svg;div=document.createElement("div");div.innerHTML=svgSprite;svgSprite=null;svg=div.getElementsByTagName("svg")[0];if(svg){svg.setAttribute("aria-hidden","true");svg.style.position="absolute";svg.style.width=0;svg.style.height=0;svg.style.overflow="hidden";prepend(svg,document.body)}}if(shouldInjectCss&&!window.__iconfont__svg__cssinject__){window.__iconfont__svg__cssinject__=true;try{document.write("")}catch(e){console&&console.log(e)}}ready(appendSvg)})(window)
+/* eslint-disable */
+(function(window){var svgSprite='';var script=function(){var scripts=document.getElementsByTagName("script");return scripts[scripts.length-1]}();var shouldInjectCss=script.getAttribute("data-injectcss");var ready=function(fn){if(document.addEventListener){if(~["complete","loaded","interactive"].indexOf(document.readyState)){setTimeout(fn,0)}else{var loadFn=function(){document.removeEventListener("DOMContentLoaded",loadFn,false);fn()};document.addEventListener("DOMContentLoaded",loadFn,false)}}else if(document.attachEvent){IEContentLoaded(window,fn)}function IEContentLoaded(w,fn){var d=w.document,done=false,init=function(){if(!done){done=true;fn()}};var polling=function(){try{d.documentElement.doScroll("left")}catch(e){setTimeout(polling,50);return}init()};polling();d.onreadystatechange=function(){if(d.readyState=="complete"){d.onreadystatechange=null;init()}}}};var before=function(el,target){target.parentNode.insertBefore(el,target)};var prepend=function(el,target){if(target.firstChild){before(el,target.firstChild)}else{target.appendChild(el)}};function appendSvg(){var div,svg;div=document.createElement("div");div.innerHTML=svgSprite;svgSprite=null;svg=div.getElementsByTagName("svg")[0];if(svg){svg.setAttribute("aria-hidden","true");svg.style.position="absolute";svg.style.width=0;svg.style.height=0;svg.style.overflow="hidden";prepend(svg,document.body)}}if(shouldInjectCss&&!window.__iconfont__svg__cssinject__){window.__iconfont__svg__cssinject__=true;try{document.write("")}catch(e){console&&console.log(e)}}ready(appendSvg)})(window)
diff --git a/src/assets/icons/iconfont.svg b/src/assets/icons/iconfont.svg
index f32827d..f7c92ad 100644
--- a/src/assets/icons/iconfont.svg
+++ b/src/assets/icons/iconfont.svg
@@ -51,6 +51,9 @@ t9.5 -10.5t21.5 -4h37h67h81h80h64h36q23 0 34 12t2 38q-5 13 -9.5 30.5t-9.5 34.5q-
+
+
+
@@ -60,9 +63,15 @@ t9.5 -10.5t21.5 -4h37h67h81h80h64h36q23 0 34 12t2 38q-5 13 -9.5 30.5t-9.5 34.5q-
+
+
+
+
+
+
diff --git a/src/assets/icons/iconfont.ttf b/src/assets/icons/iconfont.ttf
index 41a8d9e..0804873 100644
Binary files a/src/assets/icons/iconfont.ttf and b/src/assets/icons/iconfont.ttf differ
diff --git a/src/assets/icons/iconfont.woff b/src/assets/icons/iconfont.woff
index f8dce81..2089db7 100644
Binary files a/src/assets/icons/iconfont.woff and b/src/assets/icons/iconfont.woff differ
diff --git a/config/env.js b/src/config/env.js
similarity index 87%
rename from config/env.js
rename to src/config/env.js
index 8759062..286a18d 100644
--- a/config/env.js
+++ b/src/config/env.js
@@ -6,6 +6,8 @@
* imgBaseUrl: 图片所在域名地址
*
*/
+
+// var baseUrl = 'http://www.nihuawocai.com'
var baseUrl = process.env.API_BASE
// var routerMode = 'history'
var routerMode = ''
diff --git a/src/main.js b/src/main.js
index 10c8298..dd80b4f 100644
--- a/src/main.js
+++ b/src/main.js
@@ -12,7 +12,7 @@ import './element'
import './assets/icons/iconfont'
import IconSvg from './components/common/IconSvg.vue'// svg组件
-import './mock' // 模拟数据
+// import './mock' // 模拟数据
// 注册全局组件(register globally)
Vue.component('icon-svg', IconSvg)
diff --git a/src/pages/adManage/ad.vue b/src/pages/adManage/ad.vue
new file mode 100644
index 0000000..9f61f58
--- /dev/null
+++ b/src/pages/adManage/ad.vue
@@ -0,0 +1,391 @@
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+ 新增
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{scope.row.status | statusFilterName}}
+
+
+
+
+ 编辑
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 选取文件
+
+
+
![]()
+
+
+
+
+
+
+
+ 小程序
+ web网页
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 禁用
+ 正常
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/adManage/adSite.vue b/src/pages/adManage/adSite.vue
new file mode 100644
index 0000000..ecb8b17
--- /dev/null
+++ b/src/pages/adManage/adSite.vue
@@ -0,0 +1,362 @@
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+ 新增
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.update_time }}
+
+
+
+
+ 编辑
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ option.key }} - {{ option.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/components/uploadList.vue b/src/pages/components/uploadList.vue
index 5f66e19..b6853c9 100644
--- a/src/pages/components/uploadList.vue
+++ b/src/pages/components/uploadList.vue
@@ -21,7 +21,7 @@