normalize

8 years ago · cb3667c84a
7 changed files with 73 additions and 133 deletions
--- a/index.html
+++ b/index.html
@ -3,7 +3,7 @@

 <head>
  <meta charset="utf-8">
-  <title>vue element admin</title>
+  <title>vueadmin</title>
 </head>

 <body>
--- a/package.json
+++ b/package.json
@ -1,9 +1,9 @@
 {
  "name": "vueadmin",
-  "version": "1.0.0",
+  "version": "1.0.2",
  "description": "vue admin project",
  "author": "taylor <709161610@qq.com>",
-  "private": true,
+  "license": "MIT",
  "scripts": {
    "dev": "node build/dev-server.js",
    "build": "node build/build.js"
@ -11,7 +11,6 @@
  "dependencies": {
    "axios": "^0.15.3",
    "echarts": "^3.3.2",
-    "flex.css": "^1.1.6",
    "nprogress": "^0.2.0",
    "vue": "^2.1.10",
    "vuex": "^2.0.0-rc.6"
--- a/src/App.vue
+++ b/src/App.vue
@ -1,65 +1,19 @@
 <template>
 	<div id="app">
-		<!--<transition name="bounce">-->
 		<router-view></router-view>
-		<!--</transition>-->
 	</div>
 </template>

 <script>
-
 	export default {
 		name: 'app',
 		components: {
 		}
 	}
+
 </script>

 <style>
-	@import "../node_modules/font-awesome/css/font-awesome.min.css";
-	@import "../node_modules/flex.css/dist/flex.css";
-	.bounce-enter-active {
-		animation: bounce-in .5s;
-	}
-	
-	.bounce-leave-active {
-		animation: bounce-out .2s;
-	}
-	
-	@keyframes bounce-in {
-		0% {
-			transform: scale(0);
-		}
-		50% {
-			transform: scale(1.05);
-		}
-		100% {
-			transform: scale(1);
-		}
-	}
-	
-	@keyframes bounce-out {
-		0% {
-			transform: scale(1);
-		}
-		50% {
-			transform: scale(0.95);
-		}
-		100% {
-			transform: scale(0);
-		}
-	}
-
-
-
-	.fade-enter-active, .fade-leave-active {
-		transition: opacity .5s
-	}
-	.fade-enter, .fade-leave-active {
-		opacity: 0
-	}
-
-	
 	body {
 		/*background-color: #324057;*/
 		margin: 0px;
--- a/src/main.js
+++ b/src/main.js
@ -9,8 +9,9 @@ import Vuex from 'vuex'
 import NProgress from 'nprogress'//页面顶部进度条
 import 'nprogress/nprogress.css'
 import routes from './routes'
-import Mock from './mock';
+import Mock from './mock'
 Mock.bootstrap();
+import 'font-awesome/css/font-awesome.min.css'

 Vue.use(ElementUI)
 Vue.use(VueRouter)
@ -40,13 +41,11 @@ router.beforeEach((to, from, next) => {
 //});

 new Vue({
-  el: '#app',
-  template: '<App/>',
+  //el: '#app',
+  //template: '<App/>',
  router,
  store,
-  components: { App }
-  //render: h => h(Login)
+  //components: { App }
+  render: h => h(App)
 }).$mount('#app')

-//router.replace('/login')
-
--- a/src/mock/mock.js
+++ b/src/mock/mock.js
@ -39,7 +39,7 @@ export default {
          } else {
            resolve([200, { code: 500, msg: '账号或密码错误' }]);
          }
-        }, 500);
+        }, 1000);
      });
    });

@ -55,7 +55,7 @@ export default {
          resolve([200, {
            users: mockUsers
          }]);
-        }, 500);
+        }, 1000);
      });
    });

@ -74,7 +74,7 @@ export default {
            total: total,
            users: mockUsers
          }]);
-        }, 500);
+        }, 1000);
      });
    });

--- a/src/pages/Home.vue
+++ b/src/pages/Home.vue
@ -1,8 +1,8 @@
 <template>
 	<el-row class="panel">
 		<el-col :span="24" class="panel-top">
-			<el-col :span="20" style="font-size:26px;">
-				<img src="../assets/logo4.png" class="logo"> <span>AD<i style="color:#20a0ff">MIN</i>
+			<el-col :span="20" style="font-size:22px;">
+				<img src="../assets/logo4.png" class="logo"> <span>VUE<i style="color:#20a0ff">ADMIN</i>
 </span>
 			</el-col>
 			<el-col :span="4" class="rightbar">
@ -44,9 +44,9 @@
 						</el-breadcrumb>
 					</el-col>
 					<el-col :span="24" style="background-color:#fff;box-sizing: border-box;">
-						<!--<transition name="fade">-->
+						<transition>
 							<router-view></router-view>
-						<!--</transition>-->
+						</transition>
 					</el-col>
 				</div>
 			</section>
@ -113,16 +113,6 @@
 </script>

 <style scoped>
-	.fade-enter-active,
-	.fade-leave-active {
-		transition: opacity .5s
-	}
-	
-	.fade-enter,
-	.fade-leave-active {
-		opacity: 0
-	}
-	
 	.panel {
 		position: absolute;
 		top: 0px;
--- a/src/pages/nav1/Table.vue
+++ b/src/pages/nav1/Table.vue
@ -73,7 +73,7 @@
 			</el-form>
 			<div slot="footer" class="dialog-footer">
 				<el-button @click.native="editFormVisible = false">取消</el-button>
-		<el-button type="primary" @click.native="editSubmit" :loading="editLoading">{{btnEditText}}</el-button>
+				<el-button type="primary" @click.native="editSubmit" :loading="editLoading">提交</el-button>
 			</div>
 		</el-dialog>
 	</section>
@ -106,7 +106,6 @@
 					addr: ''
 				},
 				editLoading: false,
-				btnEditText: '提 交',
 				editFormRules: {
 					name: [
 						{ required: true, message: '请输入姓名', trigger: 'blur' }
@ -185,7 +184,6 @@
 						_this.$confirm('确认提交吗？', '提示', {}).then(() => {
 							_this.editLoading = true;
 							NProgress.start();
-							_this.btnEditText = '提交中';

 							if (_this.editForm.id == 0) {
 								//新增
@ -199,7 +197,6 @@
 								addUser(para).then((res) => {
 									_this.editLoading = false;
 									NProgress.done();
-									_this.btnEditText = '提 交';
 									_this.$notify({
 										title: '成功',
 										message: '提交成功',
@ -221,7 +218,6 @@
 								editUser(para).then((res) => {
 									_this.editLoading = false;
 									NProgress.done();
-									_this.btnEditText = '提 交';
 									_this.$notify({
 										title: '成功',
 										message: '提交成功',
@ -258,7 +254,9 @@
 			this.getUsers();
 		}
 	}
+
 </script>

 <style scoped>
+
 </style>