Merge branch 'master' of git.linkerplus.com:huangwf/Property-admin

# Conflicts:
#	src/router/index.js
#	static/api/viewAPI.json

src/pages/Letter/index.vue

@@ -0,0 +1,79 @@
+// 收信记录
+<template>
+  <el-table
+    :data="tableData"
+    border
+    style="width: 100%">
+    <el-table-column
+      prop="address"
+      label="发布人"
+      >
+    </el-table-column>
+    <el-table-column
+      prop="name"
+      label="标题"
+      >
+    </el-table-column>
+    <el-table-column
+      prop="date"
+      label="时间"
+      >
+    </el-table-column>
+    <el-table-column
+      prop="zip"
+      label="类型"
+      >
+    </el-table-column>
+    <el-table-column
+      prop="remarks"
+      label="提前终止日期"
+      >
+    </el-table-column>
+    <el-table-column
+      prop="remarks"
+      label="收租方式"
+      >
+    </el-table-column>
+    <el-table-column
+      prop="remarks"
+      label="租金单价(/月)"
+      >
+    </el-table-column>
+    <el-table-column
+      prop="remarks"
+      label="备注"
+      >
+    </el-table-column>
+    <el-table-column
+      label="操作"
+      >
+      <template scope="">
+        <el-button type="text" size="small">编辑</el-button>
+      </template>
+    </el-table-column>
+  </el-table>
+</template>
+
+<script>
+  export default {
+    methods: {
+      handleClick(row) {
+        console.log(row);
+      }
+    },
+
+    data() {
+      return {
+        tableData: [{
+          date: '2016-05-02',
+          name: '1001',
+          province: '上海',
+          city: '普陀区',
+          address: '上海市普陀区金沙江路 1518 弄',
+          zip: '-',
+          remarks: '11111'
+        }]
+      }
+    }
+  }
+</script>

src/pages/Parking/index.vue

@@ -0,0 +1,74 @@
+//
+<template>
+  <el-table
+    :data="tableData"
+    border
+    style="width: 100%">
+    <el-table-column
+      prop="address"
+      label="区域名称"
+      >
+    </el-table-column>
+    <el-table-column
+      prop="name"
+      label="租赁单价"
+      >
+    </el-table-column>
+    <el-table-column
+      prop="province"
+      label="管理费"
+      >
+    </el-table-column>
+    <el-table-column
+      prop="city"
+      label="车位数量"
+      >
+    </el-table-column>
+    <el-table-column
+      prop="date"
+      label="充值类型"
+      >
+    </el-table-column>
+    <el-table-column
+      prop="zip"
+      label="状态"
+      >
+    </el-table-column>
+    <el-table-column
+      prop="remarks"
+      label="备注"
+      >
+    </el-table-column>
+    <el-table-column
+      label="操作"
+      >
+      <template scope="">
+        <el-button type="text" size="small">编辑</el-button>
+      </template>
+    </el-table-column>
+  </el-table>
+</template>
+
+<script>
+  export default {
+    methods: {
+      handleClick(row) {
+        console.log(row);
+      }
+    },
+
+    data() {
+      return {
+        tableData: [{
+          date: '2016-05-02',
+          name: '1001',
+          province: '上海',
+          city: '普陀区',
+          address: '上海市普陀区金沙江路 1518 弄',
+          zip: '-',
+          remarks: '11111'
+        }]
+      }
+    }
+  }
+</script>