Skip to content

dev / pingan-life-index-pro

Go to a project
Toggle navigation
Toggle navigation pinning
00614d72 by simon
Options

默认提交

1 parent 2e716e32
Inline Side-by-side
Showing 5 changed files with 76 additions and 68 deletions
...@@ -150,54 +150,60 @@ export default { ...@@ -150,54 +150,60 @@ export default {
150 curData.standards = 0; 150 curData.standards = 0;
151 let date = index + 1; 151 let date = index + 1;
152 let buildDate = Date.parse(`${year}.${month}.${date}`); 152 let buildDate = Date.parse(`${year}.${month}.${date}`);
153 let nowDate = new Date(); 153 if (buildDate) {
154 let day = buildDate.getDay(); 154 let nowDate = new Date();
155 let isWeekend = day == 0 || day == 6; 155 let day = buildDate.getDay();
156 let disable = false; // 判断是否不可选 156 let isWeekend = day == 0 || day == 6;
157 if (this.filtModel.indexOf("weekend") >= 0) { 157 let disable = false; // 判断是否不可选
158 disable = isWeekend; 158 if (this.filtModel.indexOf("weekend") >= 0) {
159 } 159 disable = isWeekend;
160 if (!disable && this.filtModel.indexOf("future") >= 0) {
161 buildDate.setHours(23, 59, 59, 999);
162 disable = buildDate.getTime() > nowDate.getTime()
163 }
164 if (!disable && this.filtModel.indexOf("history") >= 0) {
165 buildDate.setHours(0, 0, 0, 0);
166 disable = buildDate.getTime() < nowDate.getTime()
167 }
168 if (!disable && this.filtModel.indexOf("today") >= 0) {
169 buildDate.setHours(0, 0, 0, 0);
170 nowDate.setHours(0, 0, 0, 0);
171 disable = buildDate.getTime() == nowDate.getTime();
172 }
173 // disable = isWeekend && !this.weekend; // 判断周末不可选
174 let filterDates = this.filterDates;
175 filterDates.forEach(element => {
176 let curDate = `${year}-${month}-${date}`;
177 if (element == curDate) {
178 disable = true;
179 } 160 }
180 }); 161 if (!disable && this.filtModel.indexOf("future") >= 0) {
181 curData = Object.assign({ 162 buildDate.setHours(23, 59, 59, 999);
182 year: year, 163 disable = buildDate.getTime() > nowDate.getTime()
183 month: month, 164 }
184 date: date, // (1~31) 165 if (!disable && this.filtModel.indexOf("history") >= 0) {
185 day: day, 166 buildDate.setHours(0, 0, 0, 0);
186 isWeekend: isWeekend, 167 disable = buildDate.getTime() < nowDate.getTime()
187 disable: disable, 168 }
188 }, curData); 169 if (!disable && this.filtModel.indexOf("today") >= 0) {
189 result.push(curData); 170 buildDate.setHours(0, 0, 0, 0);
171 nowDate.setHours(0, 0, 0, 0);
172 disable = buildDate.getTime() == nowDate.getTime();
173 }
174 // disable = isWeekend && !this.weekend; // 判断周末不可选
175 let filterDates = this.filterDates;
176 filterDates.forEach(element => {
177 let curDate = `${year}-${month}-${date}`;
178 if (element == curDate) {
179 disable = true;
180 }
181 });
182 curData = Object.assign({
183 year: year,
184 month: month,
185 date: date, // (1~31)
186 day: day,
187 isWeekend: isWeekend,
188 disable: disable,
189 }, curData);
190 result.push(curData);
191 }
190 } 192 }
191 193
192 // 当月1号星期几 0-6 往前塞值 194 // 当月1号星期几 0-6 往前塞值
193 let dateStr = month + '.' + '1' + '.' + year; 195 let dateStr = month + '.' + '1' + '.' + year;
194 let firstDay = Date.parse(dateStr).getDay(); 196 let firstDate = Date.parse(dateStr);
197 if (firstDate) {
198 let firstDay = Date.parse(dateStr).getDay();
195 199
196 // 根据星期几在前面补空格 星期日0格子，星期一1格子，星期六6格子 200 // 根据星期几在前面补空格 星期日0格子，星期一1格子，星期六6格子
197 for (let index = 0; index < firstDay; index++) { 201 for (let index = 0; index < firstDay; index++) {
198 result.unshift(null); 202 result.unshift(null);
203 }
204 this.fortmatMonthData = result;
199 } 205 }
200 this.fortmatMonthData = result; 206
201 }, 207 },
202 // 加/减 月份 208 // 加/减 月份
203 addMonths(value) { 209 addMonths(value) {
...@@ -372,6 +378,7 @@ export default { ...@@ -372,6 +378,7 @@ export default {
372 fortmatMonthData.forEach((element, idx) => { 378 fortmatMonthData.forEach((element, idx) => {
373 if (element) { 379 if (element) {
374 let curDate = `${element.year}-${element.month}-${element.date}`; 380 let curDate = `${element.year}-${element.month}-${element.date}`;
381 curDate = Date.parse(curDate).toString("yyyy-MM-dd"); //转成yyyy-MM-dd
375 if (curDate == dateValue && element.disable == true) { 382 if (curDate == dateValue && element.disable == true) {
376 disable = true; 383 disable = true;
377 } 384 }
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
21 21
22 @extend .bb; 22 @extend .bb;
23 max-width: 450px; 23 max-width: 450px;
24 min-width: 100%;
24 height: 320px; 25 height: 320px;
25 border-radius: $borderRadius; 26 border-radius: $borderRadius;
26 background-color: wheat; 27 background-color: wheat;
......
...@@ -60,7 +60,6 @@ ...@@ -60,7 +60,6 @@
60 .n-item { 60 .n-item {
61 cursor: pointer; 61 cursor: pointer;
62 min-width: 14.75rem; 62 min-width: 14.75rem;
63
64 } 63 }
65 } 64 }
66 65
...@@ -99,7 +98,8 @@ ...@@ -99,7 +98,8 @@
99 // 公共组件 98 // 公共组件
100 .n-item { 99 .n-item {
101 margin-bottom: 2rem; 100 margin-bottom: 2rem;
102 padding-right: .833333rem ; 101 // padding-right: .833333rem ;
102 padding-right: 3rem ;
103 color: #dcdddd; 103 color: #dcdddd;
104 104
105 &:first-child { 105 &:first-child {
......
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
60 <div class="label">{{dataForm.insuredIdNumber}}</div> 60 <div class="label">{{dataForm.insuredIdNumber}}</div>
61 </div> 61 </div>
62 </div> 62 </div>
63 63
64 </div> 64 </div>
65 </div> 65 </div>
66 66
...@@ -138,7 +138,7 @@ ...@@ -138,7 +138,7 @@
138 <div class="td w2">{{$t('customService.insuranceQuery.t4Allocation')}}</div> 138 <div class="td w2">{{$t('customService.insuranceQuery.t4Allocation')}}</div>
139 </div> 139 </div>
140 <div class="separator-h"></div> 140 <div class="separator-h"></div>
141 141
142 <div v-for="(item,index) in dataForm.benefitList" :key="index"> 142 <div v-for="(item,index) in dataForm.benefitList" :key="index">
143 <div class="data-line"> 143 <div class="data-line">
144 <div class="td w2">{{item.name}}</div> 144 <div class="td w2">{{item.name}}</div>
......
1 @import '@/styles/_support'; 1 @import '@/styles/_support';
2 .list-container { 2 .list-container {
3 overflow-x: scroll; 3 overflow-x: auto;
4 padding-bottom: 2rem; 4 padding-bottom: 2rem;
5 } 5 }
6 6
...@@ -32,15 +32,15 @@ ...@@ -32,15 +32,15 @@
32 32
33 .cell-group { 33 .cell-group {
34 margin-bottom: 1rem; 34 margin-bottom: 1rem;
35 35
36 &:last-child { 36 &:last-child {
37 margin-bottom: 0; 37 margin-bottom: 0;
38 } 38 }
39 39
40 div { 40 div {
41 color: #4c4948; 41 color: #4c4948;
42 } 42 }
43 43
44 .w1 { 44 .w1 {
45 // width: 10rem; 45 // width: 10rem;
46 width: 20rem; 46 width: 20rem;
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
52 width: 12.5rem; 52 width: 12.5rem;
53 text-align: center; 53 text-align: center;
54 } 54 }
55 55
56 .table-header { 56 .table-header {
57 // width: 64.166667rem; 57 // width: 64.166667rem;
58 height: 3.25rem; 58 height: 3.25rem;
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
61 background-color: #f2f2f2; 61 background-color: #f2f2f2;
62 display: flex; 62 display: flex;
63 align-items: center; 63 align-items: center;
64 64
65 .normal-header { 65 .normal-header {
66 // width: 58.833333rem; 66 // width: 58.833333rem;
67 @extend .bb; 67 @extend .bb;
...@@ -71,12 +71,12 @@ ...@@ -71,12 +71,12 @@
71 display: flex; 71 display: flex;
72 justify-content: space-between; 72 justify-content: space-between;
73 align-items: center; 73 align-items: center;
74 74
75 .title { 75 .title {
76 font-weight: bold; 76 font-weight: bold;
77 color: #575453; 77 color: #575453;
78 } 78 }
79 79
80 .guide { 80 .guide {
81 transition: all 0.5s; 81 transition: all 0.5s;
82 cursor: pointer; 82 cursor: pointer;
...@@ -85,17 +85,17 @@ ...@@ -85,17 +85,17 @@
85 background: url("~@/assets/images/insurance-query/triangle-down.png") no-repeat center center; 85 background: url("~@/assets/images/insurance-query/triangle-down.png") no-repeat center center;
86 background-size: 100% 100%; 86 background-size: 100% 100%;
87 } 87 }
88 88
89 .rotate180 { 89 .rotate180 {
90 transform: rotate(180deg); 90 transform: rotate(180deg);
91 transition: all 0.5s; 91 transition: all 0.5s;
92 } 92 }
93 } 93 }
94 } 94 }
95 95
96 .table-content { 96 .table-content {
97 // width: 64.166667rem; 97 // width: 64.166667rem;
98 98
99 height: auto; 99 height: auto;
100 max-height: 50rem; 100 max-height: 50rem;
101 // display: inline-block; 101 // display: inline-block;
...@@ -107,8 +107,8 @@ ...@@ -107,8 +107,8 @@
107 padding: 0 2.75rem; 107 padding: 0 2.75rem;
108 // max-height: 41.666667rem; 108 // max-height: 41.666667rem;
109 transition: max-height ease-out 0.3s !important; 109 transition: max-height ease-out 0.3s !important;
110 overflow: scroll; 110 overflow: auto;
111 111
112 .data-line { 112 .data-line {
113 // padding: 0 2.75rem; 113 // padding: 0 2.75rem;
114 height: 4.416667rem; 114 height: 4.416667rem;
...@@ -116,20 +116,20 @@ ...@@ -116,20 +116,20 @@
116 display: flex; 116 display: flex;
117 justify-content: space-between; 117 justify-content: space-between;
118 align-items: center; 118 align-items: center;
119 119
120 .td { 120 .td {
121 display: flex; 121 display: flex;
122 justify-content: center; 122 justify-content: center;
123 align-items: center; 123 align-items: center;
124 } 124 }
125 125
126 .cell1 { 126 .cell1 {
127 width: 98%; 127 width: 98%;
128 display: flex; 128 display: flex;
129 justify-content: space-between; 129 justify-content: space-between;
130 margin: auto; 130 margin: auto;
131 } 131 }
132 132
133 .separator-v { 133 .separator-v {
134 height: 2.5rem; 134 height: 2.5rem;
135 width: .166667rem; 135 width: .166667rem;
...@@ -137,29 +137,29 @@ ...@@ -137,29 +137,29 @@
137 margin: 0 .916667rem; 137 margin: 0 .916667rem;
138 } 138 }
139 } 139 }
140 140
141 .label span { 141 .label span {
142 color: $cOrange; 142 color: $cOrange;
143 margin-left: .583333rem; 143 margin-left: .583333rem;
144 cursor: pointer; 144 cursor: pointer;
145 text-decoration: underline; 145 text-decoration: underline;
146 } 146 }
147 147
148 .separator-h { 148 .separator-h {
149 width: 100%; 149 width: 100%;
150 height: 1px; 150 height: 1px;
151 background-color: #f2f2f2; 151 background-color: #f2f2f2;
152 } 152 }
153 } 153 }
154 154
155 .orange { 155 .orange {
156 background-color: $cOrange !important; 156 background-color: $cOrange !important;
157 157
158 div { 158 div {
159 color: #ffffff; 159 color: #ffffff;
160 } 160 }
161 } 161 }
162 162
163 .hide { 163 .hide {
164 max-height: 0; 164 max-height: 0;
165 border-bottom: none; 165 border-bottom: none;
...@@ -182,7 +182,7 @@ ...@@ -182,7 +182,7 @@
182 cursor: pointer; 182 cursor: pointer;
183 justify-content: center !important; 183 justify-content: center !important;
184 } 184 }
185 185
186 .pointer { 186 .pointer {
187 cursor: pointer; 187 cursor: pointer;
188 } 188 }
...@@ -214,4 +214,4 @@ ...@@ -214,4 +214,4 @@
214 color: $cOrange; 214 color: $cOrange;
215 } 215 }
216 } 216 }
217 }
...\ No newline at end of file ...\ No newline at end of file
217 }
......