From 94f9fcb631f6e3117ed68625c98c19df6ab0e05a Mon Sep 17 00:00:00 2001 From: xsf <416175716@qq.com> Date: Fri, 19 Aug 2016 14:58:54 +0800 Subject: [PATCH] 20160819/14:58 --- .idea/encodings.xml | 6 - .idea/modules.xml | 8 - .idea/vcs.xml | 6 - .idea/vue-vueRouter-webpack.iml | 11 - .idea/workspace.xml | 1039 ------------------------------- package.json | 1 - src/app.js | 9 +- src/app.vue | 54 +- src/css/common.css | 10 +- src/css/main.css | 20 + src/routers.js | 5 +- 11 files changed, 47 insertions(+), 1122 deletions(-) delete mode 100644 .idea/encodings.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/vcs.xml delete mode 100644 .idea/vue-vueRouter-webpack.iml delete mode 100644 .idea/workspace.xml create mode 100644 src/css/main.css diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index 97626ba..0000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 66f26e7..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/vue-vueRouter-webpack.iml b/.idea/vue-vueRouter-webpack.iml deleted file mode 100644 index d7a18b1..0000000 --- a/.idea/vue-vueRouter-webpack.iml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index 0acac18..0000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,1039 +0,0 @@ - - - -<<<<<<< HEAD - - - -======= - ->>>>>>> 446dbea5d21c3e6eaffa7a2245970b8d1c4c6dfa - - - - - - - - - - - -<<<<<<< HEAD - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -======= - - - - - - - - - - - - - - - - - - - - - - - - ->>>>>>> 446dbea5d21c3e6eaffa7a2245970b8d1c4c6dfa - - - - - - - - $USER_HOME$/AppData/Roaming/npm/bower.cmd - - - - - - - - true - DEFINITION_ORDER - - -<<<<<<< HEAD - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -<<<<<<< HEAD - - -======= - - ->>>>>>> 446dbea5d21c3e6eaffa7a2245970b8d1c4c6dfa - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - project - - - - - - - - - - - - - - - - C:/Program Files/nodejs/node.exe - - $PROJECT_DIR$ - true - - bdd - - DIRECTORY - - false - - - - - - - - - - - - - - - - - - - - 1471498492040 - - - - - - -<<<<<<< HEAD - -======= - ->>>>>>> 446dbea5d21c3e6eaffa7a2245970b8d1c4c6dfa - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -<<<<<<< HEAD - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -======= ->>>>>>> 446dbea5d21c3e6eaffa7a2245970b8d1c4c6dfa - - - - - - - - - -<<<<<<< HEAD - - - - - - - - - - -======= - - - - ->>>>>>> 446dbea5d21c3e6eaffa7a2245970b8d1c4c6dfa - - - - - - - - - - - - -<<<<<<< HEAD - - - - - - - - - - - - -======= - - - - - - - - - - - - - - ->>>>>>> 446dbea5d21c3e6eaffa7a2245970b8d1c4c6dfa - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -<<<<<<< HEAD - - -======= - - - - - - - - - - - - - - - - - ->>>>>>> 446dbea5d21c3e6eaffa7a2245970b8d1c4c6dfa - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -<<<<<<< HEAD - - -======= - - ->>>>>>> 446dbea5d21c3e6eaffa7a2245970b8d1c4c6dfa - - - - - - - - - - - - -<<<<<<< HEAD - -======= - - - - - - - - - ->>>>>>> 446dbea5d21c3e6eaffa7a2245970b8d1c4c6dfa - - - - - - - -<<<<<<< HEAD - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -======= - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ->>>>>>> 446dbea5d21c3e6eaffa7a2245970b8d1c4c6dfa - - - - - - \ No newline at end of file diff --git a/package.json b/package.json index 4d42449..5baf879 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,6 @@ "babel-runtime": "^5.8.34", "css-loader": "^0.23.0", "cssnext-loader": "^1.0.1", - "fastclick": "^1.0.6", "file-loader": "^0.8.4", "hammerjs": "^2.0.6", "html-loader": "^0.3.0", diff --git a/src/app.js b/src/app.js index c8632c0..f69db00 100644 --- a/src/app.js +++ b/src/app.js @@ -1,11 +1,10 @@ - -require('./css/common.css');//加载公共样式 -require('./css/animate.css');//加载公共样式 +//加载公共样式 +require('./css/common.css'); +require('./css/main.css'); +require('./css/animate.css'); var Vue = require('vue'); var VueRouter = require('vue-router'); -var fastclick = require('fastclick'); -fastclick.attach(document.body); // register filters 自定义过滤器 金额格式化， var filters = require('./filters'); diff --git a/src/app.vue b/src/app.vue index 159d606..26f983b 100644 --- a/src/app.vue +++ b/src/app.vue @@ -1,45 +1,17 @@ - - - diff --git a/src/css/common.css b/src/css/common.css index c1869ca..506c976 100644 --- a/src/css/common.css +++ b/src/css/common.css @@ -1,5 +1,4 @@ @charset "utf-8"; -@charset "utf-8"; /*清零*/ body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,textarea,p,blockquote,th,td { margin:0; padding:0;} @@ -48,10 +47,10 @@ button{ @font-face { - font-family: "iconfont"; - src: require('iconfont.woff') format('woff'), - require('iconfont.ttf') format('truetype'), - require('iconfont.svg#iconfont') format('svg'); + /*font-family: "iconfont";*/ + /*src: require('iconfont.woff') format('woff'),*/ + /*require('iconfont.ttf') format('truetype'),*/ + /*require('iconfont.svg#iconfont') format('svg');*/ } .iconfont { @@ -66,6 +65,7 @@ button{ display: none; } +/* common css */ .col2{ width: 50%; } diff --git a/src/css/main.css b/src/css/main.css new file mode 100644 index 0000000..c047b68 --- /dev/null +++ b/src/css/main.css @@ -0,0 +1,20 @@ +.fixed-bottom { + position: fixed; + background: #fff; + width: 100%; + bottom: 0; + z-index: 99; + border-top: 1px solid #ccc; +} +.fixed-bottom div { + display: inline-block; + float: left; + text-align: center; +} +.fixed-bottom a { + width: 100%; + display: inline-block; + font-size: 12px; + color: #7a7a7a; + line-height: 50px; +} \ No newline at end of file diff --git a/src/routers.js b/src/routers.js index efc03a9..39c9552 100644 --- a/src/routers.js +++ b/src/routers.js @@ -31,11 +31,12 @@ module.exports = function(router){ console.log('before---------------'); //可以通过在路由中的自定义字段来验证用户是否需要登陆 if(transition.to.auth){ + alert(1); console.log('通过配置路由中自定义的字段验证是否需要登陆'); } - // //如果是中止，这里可以判断用户登录 - // //if(transition.to.path === '/forbidden'){ + //如果是中止，这里可以判断用户登录 + //if(transition.to.path === '/forbidden'){ if(transition.to.name == 'forbidden'){ router.app.authenticating = true setTimeout(function(){