7e8d4779 by simon

优化调整

1 parent a8d19002
...@@ -42,15 +42,11 @@ export default { ...@@ -42,15 +42,11 @@ export default {
42 42
43 <style lang="scss"> 43 <style lang="scss">
44 #app { 44 #app {
45 /* font-family: 'Avenir', Helvetica, Arial, sans-serif;
46 -webkit-font-smoothing: antialiased;
47 -moz-osx-font-smoothing: grayscale;
48 text-align: center;
49 color: #2c3e50;
50 margin-top: 60px; */
51 border: 0; 45 border: 0;
52 margin: 0; 46 margin: 0;
53 padding: 0; 47 padding: 0;
48 font-size: $fontSize;
49 color: $color;
54 } 50 }
55 51
56 body, 52 body,
...@@ -68,7 +64,6 @@ div { ...@@ -68,7 +64,6 @@ div {
68 margin: 20px; 64 margin: 20px;
69 } 65 }
70 66
71
72 .app__bgc { 67 .app__bgc {
73 position: fixed; 68 position: fixed;
74 background-color: #ffffff; 69 background-color: #ffffff;
......
1 <template> 1 <template>
2 <div class="empty-tips" v-if="visb"> 2 <div class="empty-tips" v-if="visible">
3 <div class="tips"> 3 <div class="tips">
4 <span class="iconfont iconempty"></span> 4 <span class="iconfont iconempty"></span>
5 <div class="tips">{{innerText ? innerText :'这里空空如也~'}}</div> 5 <div class="tips">{{innerText ? innerText :'暂无记录'}}</div>
6 </div> 6 </div>
7 </div> 7 </div>
8 </template> 8 </template>
9 9
10 <script> 10 <script>
11 export default { 11 export default {
12 props: ['visb', 'innerText'], 12 props: ['visible', 'innerText'],
13 data() { 13 data() {
14 return { 14 return {
15 key: 'value' 15 key: 'value'
...@@ -23,21 +23,21 @@ export default { ...@@ -23,21 +23,21 @@ export default {
23 box-sizing: border-box; 23 box-sizing: border-box;
24 position: fixed; 24 position: fixed;
25 text-align: center; 25 text-align: center;
26 color: #666666; 26 color: #888;
27 font-size: 32px; 27 font-size: 32px;
28 width: 100%; 28 width: 100%;
29 height: 100%; 29 height: 100%;
30 display: flex; 30 display: flex;
31 justify-content: center; 31 justify-content: center;
32 top: 35%; 32 top: 30%;
33 33
34 .iconfont { 34 .iconfont {
35 font-size: 100px; 35 font-size: 160px;
36 } 36 }
37 37
38 .tips { 38 .tips {
39 position: relative; 39 position: relative;
40 padding: 20px; 40 padding: 12px;
41 } 41 }
42 } 42 }
43 </style> 43 </style>
......
...@@ -178,8 +178,10 @@ export function formatDate(date, fmt) { ...@@ -178,8 +178,10 @@ export function formatDate(date, fmt) {
178 if (!date) return '-' 178 if (!date) return '-'
179 // 把-换成/ 避免iOS和安卓真机问题 179 // 把-换成/ 避免iOS和安卓真机问题
180 var reg = /-/g; 180 var reg = /-/g;
181 date = date && date.replace(reg, '/'); 181 if (typeof date == 'object') {
182 182 date += "";
183 date = date && date.replace(reg, '/');
184 }
183 date = new Date(date) 185 date = new Date(date)
184 const o = { 186 const o = {
185 'M+': date.getMonth() + 1, // 月份 187 'M+': date.getMonth() + 1, // 月份
...@@ -202,6 +204,7 @@ export function formatDate(date, fmt) { ...@@ -202,6 +204,7 @@ export function formatDate(date, fmt) {
202 204
203 205
204 206
207
205 /** 208 /**
206 * @desc 函数防抖 209 * @desc 函数防抖
207 * @param func 函数 210 * @param func 函数
......