Merge pull request #198 from lin-xin/dev

优化表格、登录页面代码

.prettierrc

@@ -0,0 +1,6 @@
+{
+ "tabWidth": 4,
+ "singleQuote": true,
+ "trailingComma": "none",
+ "printWidth": 140
+}

package.json

@@ -10,7 +10,7 @@
  "dependencies": {
  "axios": "^0.18.0",
  "babel-polyfill": "^6.26.0",
- "element-ui": "^2.9.2",
+ "element-ui": "^2.11.0",
  "mavon-editor": "^2.6.17",
  "vue": "^2.6.10",
  "vue-cropperjs": "^3.0.0",
@@ -25,4 +25,4 @@
  "@vue/cli-service": "^3.2.0",
  "vue-template-compiler": "^2.5.21"
  }
-}
+}

src/assets/css/main.css

@@ -56,6 +56,10 @@ a {
  margin: 10px 0;
 }
 
+.el-table th {
+ background-color: #f5f7fa !important;
+}
+
 .pagination {
  margin: 20px 0;
  text-align: right;
@@ -170,4 +174,4 @@ a {
 
 .v-note-wrapper .v-note-panel {
  min-height: 500px;
-}
+}

src/components/page/BaseForm.vue

@@ -2,7 +2,9 @@
  <div>
  <div class="crumbs">
  <el-breadcrumb separator="/">
- <el-breadcrumb-item><i class="el-icon-lx-calendar"></i> 表单</el-breadcrumb-item>
+ <el-breadcrumb-item>
+ <i class="el-icon-lx-calendar"></i> 表单
+ </el-breadcrumb-item>
  <el-breadcrumb-item>基本表单</el-breadcrumb-item>
  </el-breadcrumb>
  </div>
@@ -21,11 +23,21 @@
  </el-form-item>
  <el-form-item label="日期时间">
  <el-col :span="11">
- <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
+ <el-date-picker
+ type="date"
+ placeholder="选择日期"
+ v-model="form.date1"
+ value-format="yyyy-MM-dd"
+ style="width: 100%;"
+ ></el-date-picker>
  </el-col>
  <el-col class="line" :span="2">-</el-col>
  <el-col :span="11">
- <el-time-picker placeholder="选择时间" v-model="form.date2" style="width: 100%;"></el-time-picker>
+ <el-time-picker
+ placeholder="选择时间"
+ v-model="form.date2"
+ style="width: 100%;"
+ ></el-time-picker>
  </el-col>
  </el-form-item>
  <el-form-item label="城市级联">
@@ -58,84 +70,83 @@
  </el-form>
  </div>
  </div>
-
  </div>
 </template>
 
 <script>
- export default {
- name: 'baseform',
- data: function(){
- return {
- options:[
- {
- value: 'guangdong',
- label: '广东省',
- children: [
- {
- value: 'guangzhou',
- label: '广州市',
- children: [
- {
- value: 'tianhe',
- label: '天河区'
- },
- {
- value: 'haizhu',
- label: '海珠区'
- }
- ]
- },
- {
- value: 'dongguan',
- label: '东莞市',
- children: [
- {
- value: 'changan',
- label: '长安镇'
- },
- {
- value: 'humen',
- label: '虎门镇'
- }
- ]
- }
- ]
- },
- {
- value: 'hunan',
- label: '湖南省',
- children: [
- {
- value: 'changsha',
- label: '长沙市',
- children: [
- {
- value: 'yuelu',
- label: '岳麓区'
- }
- ]
- }
- ]
- }
- ],
- form: {
- name: '',
- region: '',
- date1: '',
- date2: '',
- delivery: true,
- type: ['步步高'],
- resource: '小天才',
- desc: '',
- options: []
+export default {
+ name: 'baseform',
+ data() {
+ return {
+ options: [
+ {
+ value: 'guangdong',
+ label: '广东省',
+ children: [
+ {
+ value: 'guangzhou',
+ label: '广州市',
+ children: [
+ {
+ value: 'tianhe',
+ label: '天河区'
+ },
+ {
+ value: 'haizhu',
+ label: '海珠区'
+ }
+ ]
+ },
+ {
+ value: 'dongguan',
+ label: '东莞市',
+ children: [
+ {
+ value: 'changan',
+ label: '长安镇'
+ },
+ {
+ value: 'humen',
+ label: '虎门镇'
+ }
+ ]
+ }
+ ]
+ },
+ {
+ value: 'hunan',
+ label: '湖南省',
+ children: [
+ {
+ value: 'changsha',
+ label: '长沙市',
+ children: [
+ {
+ value: 'yuelu',
+ label: '岳麓区'
+ }
+ ]
+ }
+ ]
  }
+ ],
+ form: {
+ name: '',
+ region: '',
+ date1: '',
+ date2: '',
+ delivery: true,
+ type: ['步步高'],
+ resource: '小天才',
+ desc: '',
+ options: []
  }
- },
-  methods: {
-  onSubmit() {
-  this.$message.success('提交成功！');
- }
+ };
+ },
+ methods: {
+ onSubmit() {
+ this.$message.success('提交成功！');
  }
  }
+};
 </script>