Merge branch 'master' of http://114.215.101.231:8099/miniprogram/appui into wj
# Conflicts: # app.json
正在显示
27 个修改的文件
包含
1211 行增加
和
83 行删除
@@ -40,6 +40,12 @@ App({ | @@ -40,6 +40,12 @@ App({ | ||
40 | let day = date.getDate(); | 40 | let day = date.getDate(); |
41 | return date.getFullYear() + '年' + (month > 9 ? month : ('0' + month)) + '月' + (day > 9 ? day : ('0' + day)) + '日'; | 41 | return date.getFullYear() + '年' + (month > 9 ? month : ('0' + month)) + '月' + (day > 9 ? day : ('0' + day)) + '日'; |
42 | }, | 42 | }, |
43 | + qiendate(){ | ||
44 | + let date = new Date(); | ||
45 | + let month = date.getMonth() + 1; | ||
46 | + let day = date.getDate()+1; | ||
47 | + return date.getFullYear() + '年' + (month > 9 ? month : ('0' + month)) + '月' + (day > 9 ? day : ('0' + day)) + '日'; | ||
48 | + }, | ||
43 | 49 | ||
44 | newnowDate() { | 50 | newnowDate() { |
45 | let date = new Date(); | 51 | let date = new Date(); |
img/banben.png
0 → 100644
815 字节
img/fankui.png
0 → 100644
1.1 KB
img/minbac.png
0 → 100644
12.9 KB
img/qiyerow.png
0 → 100644
452 字节
img/success.png
0 → 100644
8.8 KB
img/suo.png
0 → 100644
1002 字节
img/tuichu.png
0 → 100644
1.3 KB
@@ -12,10 +12,11 @@ function initChart1(canvas, width, height) { | @@ -12,10 +12,11 @@ function initChart1(canvas, width, height) { | ||
12 | var option = { | 12 | var option = { |
13 | title: { | 13 | title: { |
14 | text: '开平机01每日开工时间', | 14 | text: '开平机01每日开工时间', |
15 | - left: 'center' | 15 | + left: 'center', |
16 | + textStyle: { | ||
17 | + fontSize: 13 | ||
18 | + }, | ||
16 | }, | 19 | }, |
17 | - | ||
18 | - | ||
19 | toolbox: { | 20 | toolbox: { |
20 | 21 | ||
21 | }, | 22 | }, |
@@ -27,8 +28,6 @@ function initChart1(canvas, width, height) { | @@ -27,8 +28,6 @@ function initChart1(canvas, width, height) { | ||
27 | interval: 1, | 28 | interval: 1, |
28 | }, | 29 | }, |
29 | name: '日期' | 30 | name: '日期' |
30 | - | ||
31 | - | ||
32 | }, | 31 | }, |
33 | yAxis: { | 32 | yAxis: { |
34 | type: 'value', | 33 | type: 'value', |
@@ -84,7 +83,10 @@ function initChart2(canvas, width, height) { | @@ -84,7 +83,10 @@ function initChart2(canvas, width, height) { | ||
84 | var option = { | 83 | var option = { |
85 | title: { | 84 | title: { |
86 | text: '开平机02每日开工时间', | 85 | text: '开平机02每日开工时间', |
87 | - left: 'center' | 86 | + left: 'center', |
87 | + textStyle: { | ||
88 | + fontSize: 13 | ||
89 | + }, | ||
88 | }, | 90 | }, |
89 | 91 | ||
90 | 92 | ||
@@ -156,7 +158,10 @@ function initChart3(canvas, width, height) { | @@ -156,7 +158,10 @@ function initChart3(canvas, width, height) { | ||
156 | var option = { | 158 | var option = { |
157 | title: { | 159 | title: { |
158 | text: '企业开工月累计时间', | 160 | text: '企业开工月累计时间', |
159 | - left: 'center' | 161 | + left: 'center', |
162 | + textStyle: { | ||
163 | + fontSize: 13 | ||
164 | + }, | ||
160 | }, | 165 | }, |
161 | 166 | ||
162 | 167 | ||
@@ -216,6 +221,7 @@ function initChart3(canvas, width, height) { | @@ -216,6 +221,7 @@ function initChart3(canvas, width, height) { | ||
216 | chart.setOption(option); | 221 | chart.setOption(option); |
217 | return chart; | 222 | return chart; |
218 | } | 223 | } |
224 | + | ||
219 | // 半年度开工时间对比 | 225 | // 半年度开工时间对比 |
220 | function initChart4(canvas, width, height) { | 226 | function initChart4(canvas, width, height) { |
221 | const chart = echarts.init(canvas, null, { | 227 | const chart = echarts.init(canvas, null, { |
@@ -225,23 +231,48 @@ function initChart4(canvas, width, height) { | @@ -225,23 +231,48 @@ function initChart4(canvas, width, height) { | ||
225 | canvas.setChart(chart); | 231 | canvas.setChart(chart); |
226 | 232 | ||
227 | var option = { | 233 | var option = { |
234 | + title: { | ||
235 | + text: '半年度企业电耗对比', | ||
236 | + textStyle: { | ||
237 | + fontSize: 13 | ||
238 | + }, | ||
239 | + left: 'center' | ||
240 | + }, | ||
241 | + | ||
228 | xAxis: { | 242 | xAxis: { |
229 | type: 'category', | 243 | type: 'category', |
230 | - data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'] | 244 | + data: ['2018-11', '2018-12', '2019-01', '2019-02', '2019-03', '2019-04'], |
245 | + axisLabel: { | ||
246 | + interval: 0, | ||
247 | + textStyle: { | ||
248 | + fontSize: 12 | ||
249 | + } | ||
250 | + }, | ||
251 | + name: '日期' | ||
231 | }, | 252 | }, |
232 | yAxis: { | 253 | yAxis: { |
233 | - type: 'value' | 254 | + type: 'value', |
255 | + min: 0, | ||
256 | + max: 500, | ||
257 | + splitNumber: 5, | ||
258 | + name: '小时(h)', | ||
259 | + // textStyle: { | ||
260 | + // fontSize: 14 | ||
261 | + // } | ||
234 | }, | 262 | }, |
235 | series: [{ | 263 | series: [{ |
236 | - data: [120, 200, 150, 80, 70, 110, 130], | ||
237 | - type: 'bar' | 264 | + data: [120, 200, 150, 80, 70, 110], |
265 | + type: 'bar', | ||
266 | + color: '#3CDACD', | ||
267 | + barWidth: '55%', | ||
238 | }] | 268 | }] |
239 | }; | 269 | }; |
240 | 270 | ||
241 | chart.setOption(option); | 271 | chart.setOption(option); |
242 | return chart; | 272 | return chart; |
243 | } | 273 | } |
244 | -// 企业每日电耗 | 274 | +// 企业月开工率 |
275 | + | ||
245 | function initChart5(canvas, width, height) { | 276 | function initChart5(canvas, width, height) { |
246 | const chart = echarts.init(canvas, null, { | 277 | const chart = echarts.init(canvas, null, { |
247 | width: width, | 278 | width: width, |
@@ -252,63 +283,107 @@ function initChart5(canvas, width, height) { | @@ -252,63 +283,107 @@ function initChart5(canvas, width, height) { | ||
252 | var option = { | 283 | var option = { |
253 | title: { | 284 | title: { |
254 | text: '企业月开工率', | 285 | text: '企业月开工率', |
255 | - left: 'center' | 286 | + subtext: '', |
287 | + left: 'center', | ||
288 | + textStyle: { | ||
289 | + fontSize: 13 | ||
290 | + }, | ||
291 | + }, | ||
292 | + textStyle: { | ||
293 | + fontSize: 12 | ||
294 | + }, | ||
295 | + tooltip: { | ||
296 | + trigger: 'axis' | ||
256 | }, | 297 | }, |
257 | - | ||
258 | 298 | ||
259 | toolbox: { | 299 | toolbox: { |
260 | 300 | ||
301 | + | ||
261 | }, | 302 | }, |
262 | xAxis: { | 303 | xAxis: { |
263 | type: 'category', | 304 | type: 'category', |
264 | boundaryGap: false, | 305 | boundaryGap: false, |
265 | - data: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '23', '24', '25', '26', '27', '28', '29', '30', '31'], | 306 | + data: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '23', '24', '25', '26', '27', '28', '29', '30','31'], |
266 | axisLabel: { | 307 | axisLabel: { |
267 | interval: 1, | 308 | interval: 1, |
268 | }, | 309 | }, |
269 | - name: '日期' | ||
270 | - | ||
271 | - | 310 | + name:"日期" |
272 | }, | 311 | }, |
273 | yAxis: { | 312 | yAxis: { |
274 | type: 'value', | 313 | type: 'value', |
314 | + min:0, | ||
315 | + max: 100, | ||
316 | + splitNumber: 10, | ||
317 | + | ||
318 | + | ||
275 | axisLabel: { | 319 | axisLabel: { |
276 | formatter: '{value}' | 320 | formatter: '{value}' |
277 | }, | 321 | }, |
278 | - min: 1, | ||
279 | - max: 24, | ||
280 | - splitNumber: 24, | ||
281 | - name: '小时(h)' | ||
282 | - | 322 | + name:'百分比' |
283 | }, | 323 | }, |
284 | - series: [ | ||
285 | - { | 324 | + series: [{ |
286 | name: '', | 325 | name: '', |
287 | type: 'line', | 326 | type: 'line', |
288 | - smooth: true, | ||
289 | - color: '#6495F8', | ||
290 | - data: [11, 11, 15, 13, 12, 13, 10], | 327 | + color: '#FA9C03', |
328 | + data: [11, 11, 15, 13, 12, 13, 10,23,45,67], | ||
291 | markPoint: { | 329 | markPoint: { |
292 | - data: [ | ||
293 | - { type: 'max', name: '最大值' }, | ||
294 | - { type: 'min', name: '最小值' } | 330 | + data: [{ |
331 | + type: 'max', | ||
332 | + name: '最大值' | ||
333 | + }, | ||
334 | + { | ||
335 | + type: 'min', | ||
336 | + name: '最小值' | ||
337 | + } | ||
295 | ] | 338 | ] |
296 | }, | 339 | }, |
297 | markLine: { | 340 | markLine: { |
298 | - data: [ | ||
299 | - { type: 'average', name: '平均值' } | ||
300 | - ] | 341 | + data: [{ |
342 | + type: 'average', | ||
343 | + name: '平均值' | ||
344 | + }] | ||
345 | + } | ||
301 | }, | 346 | }, |
302 | - // areaStyle: { | ||
303 | - // // normal: { | ||
304 | - // // color: '#F8E9DD' //改变区域颜色 | ||
305 | - // // } | ||
306 | - // }, | 347 | + { |
348 | + name: '', | ||
349 | + type: 'line', | ||
350 | + color: '#95D602', | ||
351 | + data: [78, 18, 44, 33, 25, 45, 67,89,34,45], | ||
352 | + markPoint: { | ||
353 | + data: [{ | ||
354 | + name: '周最低', | ||
355 | + value: 10, | ||
356 | + xAxis: 1, | ||
357 | + yAxis: 10 | ||
358 | + }] | ||
307 | }, | 359 | }, |
308 | - | 360 | + markLine: { |
361 | + data: [{ | ||
362 | + type: 'average', | ||
363 | + name: '平均值' | ||
364 | + }, | ||
365 | + [{ | ||
366 | + symbol: 'none', | ||
367 | + x: '90%', | ||
368 | + yAxis: 'max' | ||
369 | + }, { | ||
370 | + symbol: 'circle', | ||
371 | + label: { | ||
372 | + normal: { | ||
373 | + position: 'start', | ||
374 | + formatter: '最大值' | ||
375 | + } | ||
376 | + }, | ||
377 | + type: 'max', | ||
378 | + name: '最高点' | ||
379 | + }] | ||
380 | + ] | ||
381 | + } | ||
382 | + } | ||
309 | ] | 383 | ] |
310 | }; | 384 | }; |
311 | 385 | ||
386 | + | ||
312 | chart.setOption(option); | 387 | chart.setOption(option); |
313 | return chart; | 388 | return chart; |
314 | } | 389 | } |
@@ -323,7 +398,10 @@ function initChart6(canvas, width, height) { | @@ -323,7 +398,10 @@ function initChart6(canvas, width, height) { | ||
323 | var option = { | 398 | var option = { |
324 | title: { | 399 | title: { |
325 | text: '企业月开工率', | 400 | text: '企业月开工率', |
326 | - left: 'center' | 401 | + left: 'center', |
402 | + textStyle: { | ||
403 | + fontSize: 13 | ||
404 | + }, | ||
327 | }, | 405 | }, |
328 | 406 | ||
329 | 407 | ||
@@ -392,16 +470,40 @@ function initChart7(canvas, width, height) { | @@ -392,16 +470,40 @@ function initChart7(canvas, width, height) { | ||
392 | canvas.setChart(chart); | 470 | canvas.setChart(chart); |
393 | 471 | ||
394 | var option = { | 472 | var option = { |
473 | + title: { | ||
474 | + text: '半年度企业电耗对比', | ||
475 | + textStyle:{ | ||
476 | + fontSize:13 | ||
477 | + }, | ||
478 | + left: 'center' | ||
479 | + }, | ||
480 | + | ||
395 | xAxis: { | 481 | xAxis: { |
396 | type: 'category', | 482 | type: 'category', |
397 | - data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'] | 483 | + data: ['2018-11', '2018-12', '2019-01', '2019-02', '2019-03', '2019-04'], |
484 | + axisLabel: { | ||
485 | + interval: 0, | ||
486 | + textStyle: { | ||
487 | + fontSize:12 | ||
488 | + } | ||
489 | + }, | ||
490 | + name: '日期' | ||
398 | }, | 491 | }, |
399 | yAxis: { | 492 | yAxis: { |
400 | - type: 'value' | 493 | + type: 'value', |
494 | + min:0, | ||
495 | + max:500, | ||
496 | + splitNumber: 5, | ||
497 | + name:'小时(h)', | ||
498 | + // textStyle: { | ||
499 | + // fontSize: 14 | ||
500 | + // } | ||
401 | }, | 501 | }, |
402 | series: [{ | 502 | series: [{ |
403 | - data: [120, 200, 150, 80, 70, 110, 130], | ||
404 | - type: 'bar' | 503 | + data: [120, 200, 150, 80, 70, 110], |
504 | + type: 'bar', | ||
505 | + color:'#3CDACD', | ||
506 | + barWidth: '55%', | ||
405 | }] | 507 | }] |
406 | }; | 508 | }; |
407 | 509 | ||
@@ -540,6 +642,7 @@ Page({ | @@ -540,6 +642,7 @@ Page({ | ||
540 | */ | 642 | */ |
541 | data: { | 643 | data: { |
542 | statedate:"", | 644 | statedate:"", |
645 | + state:1, | ||
543 | ec1: { | 646 | ec1: { |
544 | 647 | ||
545 | onInit: initChart1 | 648 | onInit: initChart1 |
@@ -579,6 +682,12 @@ Page({ | @@ -579,6 +682,12 @@ Page({ | ||
579 | }) | 682 | }) |
580 | 683 | ||
581 | }, | 684 | }, |
685 | + // 顶部tab切换 | ||
686 | + selectshebei(e){ | ||
687 | + this.setData({ | ||
688 | + state:e.currentTarget.dataset.id | ||
689 | + }) | ||
690 | + }, | ||
582 | 691 | ||
583 | // 选择日期 | 692 | // 选择日期 |
584 | bindstateDateChange(e) { | 693 | bindstateDateChange(e) { |
@@ -4,28 +4,41 @@ | @@ -4,28 +4,41 @@ | ||
4 | <image src="/img/whiterow.png"></image> | 4 | <image src="/img/whiterow.png"></image> |
5 | </view> | 5 | </view> |
6 | <view class="datetime"> | 6 | <view class="datetime"> |
7 | - <view class="datesel"> | ||
8 | <picker mode="date" value="{{date}}" start="" end="" bindchange="bindstateDateChange" fields="month"> | 7 | <picker mode="date" value="{{date}}" start="" end="" bindchange="bindstateDateChange" fields="month"> |
8 | + <view class="datesel"> | ||
9 | + | ||
9 | <view class="picker"> | 10 | <view class="picker"> |
10 | {{statedate}} | 11 | {{statedate}} |
11 | </view> | 12 | </view> |
12 | - </picker> | ||
13 | - </view> | ||
14 | - | ||
15 | <view class="datepic"> | 13 | <view class="datepic"> |
16 | <image src="/img/whiterow.png"></image> | 14 | <image src="/img/whiterow.png"></image> |
17 | </view> | 15 | </view> |
18 | </view> | 16 | </view> |
19 | 17 | ||
18 | + | ||
19 | + </picker> | ||
20 | + </view> | ||
21 | + | ||
20 | <view class="dateright"> | 22 | <view class="dateright"> |
21 | <image src="/img/whiterow.png"></image> | 23 | <image src="/img/whiterow.png"></image> |
22 | </view> | 24 | </view> |
25 | + | ||
26 | + | ||
23 | </view> | 27 | </view> |
24 | 28 | ||
25 | 29 | ||
30 | +<!-- 顶部tab切换 --> | ||
31 | +<view class="detailhead"> | ||
32 | + <view class="detailname {{state==1?'selactive':''}}" bindtap="selectshebei" data-id="1">生产总评</view> | ||
33 | + <view class="detailname {{state==2?'selactive':''}}" bindtap="selectshebei" data-id="2">客观信息</view> | ||
34 | + | ||
35 | + <view class="detailname {{state==3?'selactive':''}}" bindtap="selectshebei" data-id="3">生产预警</view> | ||
36 | + | ||
37 | +</view> | ||
38 | + | ||
26 | 39 | ||
27 | <!-- 客观信息 --> | 40 | <!-- 客观信息 --> |
28 | -<view class="keguaninfo" wx:if="{{index==0}}"> | 41 | +<view class="keguaninfo" wx:if="{{state==1}}"> |
29 | <!-- 企业开工时间 --> | 42 | <!-- 企业开工时间 --> |
30 | <view class="worktime"> | 43 | <view class="worktime"> |
31 | <!-- 头部日期 --> | 44 | <!-- 头部日期 --> |
@@ -57,14 +70,14 @@ | @@ -57,14 +70,14 @@ | ||
57 | 70 | ||
58 | <view class="companybox"> | 71 | <view class="companybox"> |
59 | <view class="boxhead"> | 72 | <view class="boxhead"> |
60 | - <view class="boxtopitem">企业名称</view> | ||
61 | - <view class="boxtopitem">生产平稳性</view> | ||
62 | - <view class="boxtopitem">生产趋势</view> | ||
63 | - <view class="boxtopitem">生产状态</view> | ||
64 | - <view class="boxtopitem">综合评分</view> | 73 | + <view class="boxtopitem ">企业名称</view> |
74 | + <view class="boxtopitem ">生产平稳性</view> | ||
75 | + <view class="boxtopitem ">生产趋势</view> | ||
76 | + <view class="boxtopitem ">生产状态</view> | ||
77 | + <view class="boxtopitem ">综合评分</view> | ||
65 | </view> | 78 | </view> |
66 | <view class="boxhead"> | 79 | <view class="boxhead"> |
67 | - <view class="boxbottomitem">无锡市好事达人供 应链管理有限公司 | 80 | + <view class="boxbottomitem ">无锡市好事达人供 应链管理有限公司 |
68 | </view> | 81 | </view> |
69 | <view class="boxbottomitem common">较平稳</view> | 82 | <view class="boxbottomitem common">较平稳</view> |
70 | <view class="boxbottomitem common">下降</view> | 83 | <view class="boxbottomitem common">下降</view> |
@@ -173,7 +186,7 @@ | @@ -173,7 +186,7 @@ | ||
173 | 186 | ||
174 | <!-- 生产总评 --> | 187 | <!-- 生产总评 --> |
175 | 188 | ||
176 | -<view class="shengchanzog" wx:if="{{index==0}}"> | 189 | +<view class="shengchanzog" wx:if="{{state==2}}"> |
177 | <!-- 企业生产总评--> | 190 | <!-- 企业生产总评--> |
178 | 191 | ||
179 | <view class="shebeinum"> | 192 | <view class="shebeinum"> |
@@ -214,7 +227,7 @@ | @@ -214,7 +227,7 @@ | ||
214 | </view> | 227 | </view> |
215 | <!-- 生产预警 --> | 228 | <!-- 生产预警 --> |
216 | 229 | ||
217 | -<view class="yujing"> | 230 | +<view class="yujing" wx:if="{{state==3}}"> |
218 | <view class="yujinghead"> | 231 | <view class="yujinghead"> |
219 | <view class="yuitem xuhao">序号</view> | 232 | <view class="yuitem xuhao">序号</view> |
220 | <view class="yuitem time">生产预警时间</view> | 233 | <view class="yuitem time">生产预警时间</view> |
@@ -6,6 +6,8 @@ | @@ -6,6 +6,8 @@ | ||
6 | 6 | ||
7 | .datesel { | 7 | .datesel { |
8 | color: #fff; | 8 | color: #fff; |
9 | + display:flex; | ||
10 | + align-items: center | ||
9 | } | 11 | } |
10 | 12 | ||
11 | .containerzhe { | 13 | .containerzhe { |
@@ -156,7 +158,7 @@ word-break: break-all; | @@ -156,7 +158,7 @@ word-break: break-all; | ||
156 | } | 158 | } |
157 | .time{ | 159 | .time{ |
158 | /* width:116rpx; */ | 160 | /* width:116rpx; */ |
159 | - margin-left:40rpx; | 161 | + margin-left:52rpx; |
160 | } | 162 | } |
161 | .reason{ | 163 | .reason{ |
162 | margin-left:49rpx; | 164 | margin-left:49rpx; |
@@ -187,3 +189,34 @@ word-break: break-all; | @@ -187,3 +189,34 @@ word-break: break-all; | ||
187 | width:56%; | 189 | width:56%; |
188 | text-align: left | 190 | text-align: left |
189 | } | 191 | } |
192 | + | ||
193 | +.detailhead { | ||
194 | + display: flex; | ||
195 | + align-items: center; | ||
196 | + justify-content: space-around; | ||
197 | + padding: 20rpx 69rpx; | ||
198 | + box-sizing: border-box; | ||
199 | + border-bottom: 1rpx solid #f5f5f5; | ||
200 | +} | ||
201 | + | ||
202 | +.detailname { | ||
203 | + color: #999; | ||
204 | + font-size: 28rpx; | ||
205 | +} | ||
206 | + | ||
207 | +.selactive { | ||
208 | + position: relative; | ||
209 | +} | ||
210 | + | ||
211 | +.selactive::after { | ||
212 | + display: block; | ||
213 | + content: ''; | ||
214 | + width: 60rpx; | ||
215 | + | ||
216 | + border: 1rpx solid #ff9400; | ||
217 | + position: absolute; | ||
218 | + left: 50%; | ||
219 | + right: 50%; | ||
220 | + transform: translate(-50%); | ||
221 | + bottom: -20rpx; | ||
222 | +} |
pages/mine/changemima/changemima.js
0 → 100644
1 | +// pages/mine/changemima/changemima.js | ||
2 | +Page({ | ||
3 | + | ||
4 | + /** | ||
5 | + * 页面的初始数据 | ||
6 | + */ | ||
7 | + data: { | ||
8 | + sure: true, | ||
9 | + oldpassword: '', | ||
10 | + newpassword: '', | ||
11 | + surepassword: '' | ||
12 | + }, | ||
13 | + | ||
14 | + /** | ||
15 | + * 生命周期函数--监听页面加载 | ||
16 | + */ | ||
17 | + onLoad: function(options) { | ||
18 | + | ||
19 | + }, | ||
20 | + //输入旧密码 | ||
21 | + | ||
22 | + enterold(e) { | ||
23 | + let that=this; | ||
24 | + console.log(e.detail.value) | ||
25 | + this.setData({ | ||
26 | + oldpassword: e.detail.value | ||
27 | + }) | ||
28 | + | ||
29 | + | ||
30 | + this.panduan() | ||
31 | + }, | ||
32 | + //输入新密码 | ||
33 | + enternew(e) { | ||
34 | + this.setData({ | ||
35 | + newpassword: e.detail.value | ||
36 | + }) | ||
37 | + | ||
38 | + | ||
39 | + this.panduan() | ||
40 | + }, | ||
41 | + | ||
42 | + //确认密码 | ||
43 | + quenew(e) { | ||
44 | + this.setData({ | ||
45 | + surepassword: e.detail.value | ||
46 | + }) | ||
47 | + | ||
48 | + this.panduan() | ||
49 | + }, | ||
50 | + // 判断 | ||
51 | + panduan() { | ||
52 | + let that=this | ||
53 | + if (this.data.oldpassword.length>0&&this.data.newpassword.length>0&&this.data.surepassword.length>0){ | ||
54 | + this.setData({ | ||
55 | + sure:false | ||
56 | + }) | ||
57 | + }else{ | ||
58 | + this.setData({ | ||
59 | + sure: true | ||
60 | + }) | ||
61 | + } | ||
62 | + }, | ||
63 | + /** | ||
64 | + * 生命周期函数--监听页面初次渲染完成 | ||
65 | + */ | ||
66 | + onReady: function() { | ||
67 | + | ||
68 | + }, | ||
69 | + | ||
70 | + /** | ||
71 | + * 生命周期函数--监听页面显示 | ||
72 | + */ | ||
73 | + onShow: function() { | ||
74 | + | ||
75 | + }, | ||
76 | + | ||
77 | + /** | ||
78 | + * 生命周期函数--监听页面隐藏 | ||
79 | + */ | ||
80 | + onHide: function() { | ||
81 | + | ||
82 | + }, | ||
83 | + | ||
84 | + /** | ||
85 | + * 生命周期函数--监听页面卸载 | ||
86 | + */ | ||
87 | + onUnload: function() { | ||
88 | + | ||
89 | + }, | ||
90 | + | ||
91 | + /** | ||
92 | + * 页面相关事件处理函数--监听用户下拉动作 | ||
93 | + */ | ||
94 | + onPullDownRefresh: function() { | ||
95 | + | ||
96 | + }, | ||
97 | + | ||
98 | + /** | ||
99 | + * 页面上拉触底事件的处理函数 | ||
100 | + */ | ||
101 | + onReachBottom: function() { | ||
102 | + | ||
103 | + }, | ||
104 | + | ||
105 | + /** | ||
106 | + * 用户点击右上角分享 | ||
107 | + */ | ||
108 | + onShareAppMessage: function() { | ||
109 | + | ||
110 | + } | ||
111 | +}) |
pages/mine/changemima/changemima.json
0 → 100644
pages/mine/changemima/changemima.wxml
0 → 100644
1 | +<view class="mimabox"> | ||
2 | + <view class="mimaitem"> | ||
3 | + <input placeholder='旧密码' placeholder-class='mimaword' value="{{oldpassword}}" bindinput="enterold" type="password"/> | ||
4 | + </view> | ||
5 | + <view class="mimaitem"> | ||
6 | + <input placeholder='新密码' placeholder-class='mimaword' value="{{newpassword}}" bindinput="enternew" type="password"/> | ||
7 | + </view> | ||
8 | + <view class="mimaitem"> | ||
9 | + <input placeholder='请确认' placeholder-class='mimaword' value="{{surepassword}}" bindinput="quenew" type="password"/> | ||
10 | + </view> | ||
11 | +</view> | ||
12 | + | ||
13 | +<view class="tijiao" wx:if="{{sure}}">确认</view> | ||
14 | +<view class="tijiao queti" wx:else>确认</view> |
pages/mine/changemima/changemima.wxss
0 → 100644
1 | +page{ | ||
2 | + background: #F4F4F4 | ||
3 | +} | ||
4 | +.mimabox{ | ||
5 | + margin-top:82rpx; | ||
6 | +} | ||
7 | +.mimaitem{ | ||
8 | + width:580rpx; | ||
9 | + height:80rpx; | ||
10 | + background: #fff; | ||
11 | + padding: 20rpx 36rpx; | ||
12 | + box-sizing: border-box; | ||
13 | + margin:0 auto; | ||
14 | + border-radius: 4rpx; | ||
15 | + margin-top:30rpx; | ||
16 | +} | ||
17 | +.mimaitem input{ | ||
18 | + | ||
19 | + | ||
20 | + color:#999999; | ||
21 | + font-size: 28rpx; | ||
22 | +} | ||
23 | +.mimaword{ | ||
24 | + color:#999999; | ||
25 | + font-size: 28rpx; | ||
26 | +} | ||
27 | +.tijiao { | ||
28 | + width: 580rpx; | ||
29 | + height: 80rpx; | ||
30 | + background: rgba(255, 206, 139, 1); | ||
31 | + opacity: 1; | ||
32 | + border-radius: 12rpx; | ||
33 | + color: #fff; | ||
34 | + font-size: 32rpx; | ||
35 | + text-align: center; | ||
36 | + line-height: 80rpx; | ||
37 | + margin: 40rpx auto 0; | ||
38 | +} | ||
39 | + | ||
40 | +.queti { | ||
41 | + background: #ff9400; | ||
42 | +} |
1 | -<!--pages/mine/mine.wxml--> | ||
2 | -<text>pages/mine/mine.wxml</text> | 1 | +<view class="minhead"> |
2 | + | ||
3 | + <image src="/img/minbac.png"></image> | ||
4 | + | ||
5 | + <view class='myword'>我的</view> | ||
6 | + | ||
7 | + <view class="myinfo"> | ||
8 | + <view class="myname">你的名字</view> | ||
9 | + <view class="number">工号:7789008</view> | ||
10 | + | ||
11 | + <view class="jigou">所属机构:华翰科技技术有限公司</view> | ||
12 | + </view> | ||
13 | + | ||
14 | +</view> | ||
15 | + | ||
16 | +<!-- 列表 --> | ||
17 | + | ||
18 | +<view class="mylist"> | ||
19 | + <navigator url="/pages/mine/changemima/changemima" hover-class="none"> | ||
20 | + <view class="mylistitem"> | ||
21 | + | ||
22 | + <view class="left"> | ||
23 | + <view class="itemleft"> | ||
24 | + <image src="/img/suo.png"></image> | ||
25 | + </view> | ||
26 | + | ||
27 | + <view class="itemname">修改密码</view> | ||
28 | + </view> | ||
29 | + | ||
30 | + <view class="myrow"> | ||
31 | + <image src="/img/row.png"></image> | ||
32 | + </view> | ||
33 | + </view> | ||
34 | + </navigator> | ||
35 | + <navigator url="/pages/mine/yijianfankui/yijianfankui" hover-class="none"> | ||
36 | + <view class="mylistitem"> | ||
37 | + | ||
38 | + <view class="left"> | ||
39 | + <view class="itemleft"> | ||
40 | + <image src="/img/fankui.png"></image> | ||
41 | + </view> | ||
42 | + | ||
43 | + <view class="itemname">意见反馈</view> | ||
44 | + </view> | ||
45 | + | ||
46 | + <view class="myrow"> | ||
47 | + <image src="/img/row.png"></image> | ||
48 | + </view> | ||
49 | + </view> | ||
50 | + </navigator> | ||
51 | + | ||
52 | + | ||
53 | + <view class="mylistitem"> | ||
54 | + | ||
55 | + <view class="left"> | ||
56 | + <view class="itemleft"> | ||
57 | + <image src="/img/tuichu.png"></image> | ||
58 | + </view> | ||
59 | + | ||
60 | + <view class="itemname">退出登录</view> | ||
61 | + </view> | ||
62 | + | ||
63 | + </view> | ||
64 | + <view class="mylistitem"> | ||
65 | + | ||
66 | + <view class="left"> | ||
67 | + <view class="itemleft"> | ||
68 | + <image src="/img/banben.png"></image> | ||
69 | + </view> | ||
70 | + | ||
71 | + <view class="itemname">版本号 v5.6</view> | ||
72 | + </view> | ||
73 | + | ||
74 | + | ||
75 | + </view> | ||
76 | + | ||
77 | +</view> |
1 | -/* pages/mine/mine.wxss */ | ||
1 | +.minhead { | ||
2 | + width: 750rpx; | ||
3 | + height: 348rpx; | ||
4 | + font-size: 0; | ||
5 | + position: relative; | ||
6 | +} | ||
7 | + | ||
8 | +.myinfo { | ||
9 | + position: absolute; | ||
10 | + top: 129rpx; | ||
11 | + left: 30rpx; | ||
12 | + width: 690rpx; | ||
13 | + height: 305rpx; | ||
14 | + background: rgba(255, 255, 255, 1); | ||
15 | + opacity: 1; | ||
16 | + border-radius: 10rpx; | ||
17 | + | ||
18 | + | ||
19 | + box-shadow: 5rpx 6rpx 50rpx #FFEBAE; | ||
20 | + padding: 30rpx; | ||
21 | + box-sizing: border-box | ||
22 | + | ||
23 | +} | ||
24 | +.myword{ | ||
25 | + color:#fff; | ||
26 | + font-size: 36rpx; | ||
27 | + position: absolute; | ||
28 | + top:30rpx; | ||
29 | + left:30rpx; | ||
30 | + font-weight: bold | ||
31 | +} | ||
32 | +.myname{ | ||
33 | + color:#333333; | ||
34 | + font-size: 32rpx; | ||
35 | + margin-top:70rpx; | ||
36 | + text-align: center; | ||
37 | + font-weight: bold; | ||
38 | +} | ||
39 | +.number{ | ||
40 | + color:#333333; | ||
41 | + font-size: 28rpx; | ||
42 | + margin-top:30rpx; | ||
43 | + text-align: center | ||
44 | +} | ||
45 | +.jigou{ | ||
46 | + color:#333333; | ||
47 | + font-size: 28rpx; | ||
48 | + margin-top:10rpx; | ||
49 | + text-align: center; | ||
50 | +} | ||
51 | +.mylist{ | ||
52 | + margin-top:191rpx; | ||
53 | +} | ||
54 | +.mylistitem{ | ||
55 | + display:flex; | ||
56 | + align-items: center; | ||
57 | + padding: 32rpx; | ||
58 | + box-sizing: border-box; | ||
59 | + border-bottom:1rpx solid #f5f5f5; | ||
60 | + justify-content: space-between | ||
61 | + | ||
62 | +} | ||
63 | +.itemleft{ | ||
64 | + width:38rpx; | ||
65 | + height:42rpx; | ||
66 | + font-size:0; | ||
67 | +} | ||
68 | +.myrow{ | ||
69 | + width:27rpx; | ||
70 | + height:27rpx; | ||
71 | + font-size: 0 | ||
72 | +} | ||
73 | +.left{ | ||
74 | + display:flex; | ||
75 | + align-items: center; | ||
76 | +} | ||
77 | +.itemname{ | ||
78 | + color:#333333; | ||
79 | + font-size: 28rpx; | ||
80 | + margin-left:23rpx; | ||
81 | +} |
pages/mine/yijianfankui/yijianfankui.js
0 → 100644
1 | +// pages/mine/yijianfankui/yijianfankui.js | ||
2 | +Page({ | ||
3 | + | ||
4 | + /** | ||
5 | + * 页面的初始数据 | ||
6 | + */ | ||
7 | + data: { | ||
8 | + tijiao:true, | ||
9 | + fankui:false | ||
10 | + }, | ||
11 | + | ||
12 | + /** | ||
13 | + * 生命周期函数--监听页面加载 | ||
14 | + */ | ||
15 | + onLoad: function (options) { | ||
16 | + | ||
17 | + }, | ||
18 | + enterword(e){ | ||
19 | + console.log(e.detail.value.length) | ||
20 | + if(e.detail.value.length>0){ | ||
21 | + this.setData({ | ||
22 | + tijiao:false | ||
23 | + }) | ||
24 | + } | ||
25 | + }, | ||
26 | + | ||
27 | + // 提交 | ||
28 | + sub(){ | ||
29 | + this.setData({ | ||
30 | + fankui:true | ||
31 | + }) | ||
32 | + }, | ||
33 | + // 返回 | ||
34 | + fanhui(){ | ||
35 | + this.setData({ | ||
36 | + fankui:false | ||
37 | + }) | ||
38 | + }, | ||
39 | + /** | ||
40 | + * 生命周期函数--监听页面初次渲染完成 | ||
41 | + */ | ||
42 | + onReady: function () { | ||
43 | + | ||
44 | + }, | ||
45 | + | ||
46 | + /** | ||
47 | + * 生命周期函数--监听页面显示 | ||
48 | + */ | ||
49 | + onShow: function () { | ||
50 | + | ||
51 | + }, | ||
52 | + | ||
53 | + /** | ||
54 | + * 生命周期函数--监听页面隐藏 | ||
55 | + */ | ||
56 | + onHide: function () { | ||
57 | + | ||
58 | + }, | ||
59 | + | ||
60 | + /** | ||
61 | + * 生命周期函数--监听页面卸载 | ||
62 | + */ | ||
63 | + onUnload: function () { | ||
64 | + | ||
65 | + }, | ||
66 | + | ||
67 | + /** | ||
68 | + * 页面相关事件处理函数--监听用户下拉动作 | ||
69 | + */ | ||
70 | + onPullDownRefresh: function () { | ||
71 | + | ||
72 | + }, | ||
73 | + | ||
74 | + /** | ||
75 | + * 页面上拉触底事件的处理函数 | ||
76 | + */ | ||
77 | + onReachBottom: function () { | ||
78 | + | ||
79 | + }, | ||
80 | + | ||
81 | + /** | ||
82 | + * 用户点击右上角分享 | ||
83 | + */ | ||
84 | + onShareAppMessage: function () { | ||
85 | + | ||
86 | + } | ||
87 | +}) |
pages/mine/yijianfankui/yijianfankui.json
0 → 100644
pages/mine/yijianfankui/yijianfankui.wxml
0 → 100644
1 | +<view class="fankuibox" > | ||
2 | + <view class="yijianfan"> | ||
3 | + <textarea placeholder="感谢您使用感知智能,使用过程中有任何意见或意见请反馈给我们" placeholder-class='entersugges' bindinput="enterword" /> | ||
4 | + </view> | ||
5 | + <view class="tijiao" wx:if="{{tijiao==true}}">提交</view> | ||
6 | + <view class="tijiao queti" wx:else bindtap="sub">提交</view> | ||
7 | +</view> | ||
8 | + | ||
9 | +<!-- 反馈成功 --> | ||
10 | + | ||
11 | +<view class="register" wx:if="{{fankui}}"> | ||
12 | + | ||
13 | + <view class="fanimg"> | ||
14 | + <image src="/img/success.png"></image> | ||
15 | + </view> | ||
16 | + <view class="fancheng">反馈成功</view> | ||
17 | + <view class="content"> | ||
18 | + <view class="contentitem">感谢您的反馈,我们会认真处理, | ||
19 | + </view> | ||
20 | + <view class="contentitem">尽快修复和完善相关功能。</view> | ||
21 | + </view> | ||
22 | + <view class="back" bindtap="fanhui">返回</view> | ||
23 | +</view> |
pages/mine/yijianfankui/yijianfankui.wxss
0 → 100644
1 | +page { | ||
2 | + background: #f4f4f4; | ||
3 | +} | ||
4 | + | ||
5 | +.yijianfan { | ||
6 | + width: 690rpx; | ||
7 | + height: 450rpx; | ||
8 | + margin: 50rpx auto 0; | ||
9 | + background: #fff; | ||
10 | + padding: 30rpx; | ||
11 | + box-sizing: border-box; | ||
12 | + border-radius: 10rpx; | ||
13 | +} | ||
14 | + | ||
15 | +.yijianfan textarea { | ||
16 | + width: 690rpx; | ||
17 | + height: 450rpx; | ||
18 | + padding: 30rpx; | ||
19 | + box-sizing: border-box; | ||
20 | + color: #b1b1b1; | ||
21 | + font-size: 28rpx; | ||
22 | + line-height: 1.5; | ||
23 | +} | ||
24 | + | ||
25 | +.entersugges { | ||
26 | + color: #b1b1b1; | ||
27 | + font-size: 28rpx; | ||
28 | + line-height: 1.5; | ||
29 | +} | ||
30 | + | ||
31 | +.tijiao { | ||
32 | + width: 690rpx; | ||
33 | + height: 80rpx; | ||
34 | + background: rgba(255, 206, 139, 1); | ||
35 | + opacity: 1; | ||
36 | + border-radius: 12rpx; | ||
37 | + color: #fff; | ||
38 | + font-size: 32rpx; | ||
39 | + text-align: center; | ||
40 | + line-height: 80rpx; | ||
41 | + margin: 40rpx auto 0; | ||
42 | +} | ||
43 | + | ||
44 | +.queti { | ||
45 | + background: #ff9400; | ||
46 | +} | ||
47 | + | ||
48 | +.register { | ||
49 | + background: #fff; | ||
50 | +} | ||
51 | + | ||
52 | +/* 反馈成功 */ | ||
53 | + | ||
54 | +.fanimg { | ||
55 | + width: 185rpx; | ||
56 | + height: 185rpx; | ||
57 | + font-size: 0; | ||
58 | + margin: 108rpx auto 0; | ||
59 | +} | ||
60 | + | ||
61 | +.fancheng { | ||
62 | + color: #333; | ||
63 | + font-size: 36rpx; | ||
64 | + margin-top: 47rpx; | ||
65 | + text-align: center; | ||
66 | +} | ||
67 | + | ||
68 | +.content { | ||
69 | + color: #666; | ||
70 | + font-size: 28rpx; | ||
71 | + margin-top: 30rpx; | ||
72 | +} | ||
73 | + | ||
74 | +.contentitem { | ||
75 | + text-align: center; | ||
76 | +} | ||
77 | + | ||
78 | +.back { | ||
79 | + width: 260rpx; | ||
80 | + height: 80rpx; | ||
81 | + background: rgba(255, 148, 0, 1); | ||
82 | + opacity: 1; | ||
83 | + border-radius: 10rpx; | ||
84 | + font-size: 30rpx; | ||
85 | + color:#fff; | ||
86 | + text-align: center; | ||
87 | + line-height: 80rpx; | ||
88 | + margin:425rpx auto 0; | ||
89 | +} |
@@ -14,7 +14,7 @@ | @@ -14,7 +14,7 @@ | ||
14 | .souimg { | 14 | .souimg { |
15 | width: 80rpx; | 15 | width: 80rpx; |
16 | height: 64rpx; | 16 | height: 64rpx; |
17 | - background: #ff9400ff; | 17 | + background: #ff9400; |
18 | border-radius: 8rpx; | 18 | border-radius: 8rpx; |
19 | display: flex; | 19 | display: flex; |
20 | align-items: center; | 20 | align-items: center; |
@@ -35,7 +35,7 @@ | @@ -35,7 +35,7 @@ | ||
35 | } | 35 | } |
36 | 36 | ||
37 | .qiname { | 37 | .qiname { |
38 | - color: #333333ff; | 38 | + color: #333333; |
39 | font-size: 36rpx; | 39 | font-size: 36rpx; |
40 | font-weight: bold; | 40 | font-weight: bold; |
41 | } | 41 | } |
@@ -44,13 +44,13 @@ | @@ -44,13 +44,13 @@ | ||
44 | width: 368rpx; | 44 | width: 368rpx; |
45 | height: 64rpx; | 45 | height: 64rpx; |
46 | margin-left: 26rpx; | 46 | margin-left: 26rpx; |
47 | - background: #f7f8faff; | ||
48 | - color: #ccccccff; | 47 | + background: #f7f8fa; |
48 | + color: #cccccc; | ||
49 | font-size: 24rpx; | 49 | font-size: 24rpx; |
50 | } | 50 | } |
51 | 51 | ||
52 | .qiword { | 52 | .qiword { |
53 | - color: #ccccccff; | 53 | + color: #cccccc; |
54 | font-size: 24rpx; | 54 | font-size: 24rpx; |
55 | } | 55 | } |
56 | 56 | ||
@@ -71,7 +71,7 @@ | @@ -71,7 +71,7 @@ | ||
71 | padding: 20rpx 26rpx 20rpx 40rpx; | 71 | padding: 20rpx 26rpx 20rpx 40rpx; |
72 | box-sizing: border-box; | 72 | box-sizing: border-box; |
73 | justify-content: space-between; | 73 | justify-content: space-between; |
74 | - background: #f7f8faff; | 74 | + background: #f7f8fa; |
75 | } | 75 | } |
76 | 76 | ||
77 | .ping { | 77 | .ping { |
@@ -80,7 +80,7 @@ | @@ -80,7 +80,7 @@ | ||
80 | } | 80 | } |
81 | 81 | ||
82 | .branditem { | 82 | .branditem { |
83 | - color: #666666ff; | 83 | + color: #666666; |
84 | font-size: 28rpx; | 84 | font-size: 28rpx; |
85 | /* margin-right:73rpx; */ | 85 | /* margin-right:73rpx; */ |
86 | } | 86 | } |
@@ -121,12 +121,12 @@ | @@ -121,12 +121,12 @@ | ||
121 | overflow: hidden; | 121 | overflow: hidden; |
122 | text-overflow: ellipsis; | 122 | text-overflow: ellipsis; |
123 | white-space: nowrap; | 123 | white-space: nowrap; |
124 | - color: #333333ff; | 124 | + color: #333333; |
125 | font-size: 28rpx; | 125 | font-size: 28rpx; |
126 | } | 126 | } |
127 | 127 | ||
128 | .hangname { | 128 | .hangname { |
129 | - color: #333333ff; | 129 | + color: #333333; |
130 | font-size: 28rpx; | 130 | font-size: 28rpx; |
131 | width: 112rpx; | 131 | width: 112rpx; |
132 | overflow: hidden; | 132 | overflow: hidden; |
@@ -135,12 +135,12 @@ | @@ -135,12 +135,12 @@ | ||
135 | } | 135 | } |
136 | 136 | ||
137 | .fenshu { | 137 | .fenshu { |
138 | - color: #ff3038ff; | 138 | + color: #ff3038; |
139 | font-size: 28rpx; | 139 | font-size: 28rpx; |
140 | } | 140 | } |
141 | 141 | ||
142 | .creattime { | 142 | .creattime { |
143 | - color: #999999ff; | 143 | + color: #999999; |
144 | font-size: 24rpx; | 144 | font-size: 24rpx; |
145 | } | 145 | } |
146 | 146 | ||
@@ -169,13 +169,13 @@ | @@ -169,13 +169,13 @@ | ||
169 | } | 169 | } |
170 | 170 | ||
171 | .hangfen { | 171 | .hangfen { |
172 | - color: #777777ff; | 172 | + color: #777777; |
173 | font-size: 24rpx; | 173 | font-size: 24rpx; |
174 | margin-top: 64rpx; | 174 | margin-top: 64rpx; |
175 | } | 175 | } |
176 | 176 | ||
177 | .gaojisearch { | 177 | .gaojisearch { |
178 | - color: #161616ff; | 178 | + color: #161616; |
179 | font-size: 36rpx; | 179 | font-size: 36rpx; |
180 | font-weight: bold; | 180 | font-weight: bold; |
181 | margin-top: 86rpx; | 181 | margin-top: 86rpx; |
@@ -184,7 +184,7 @@ | @@ -184,7 +184,7 @@ | ||
184 | .fenlist { | 184 | .fenlist { |
185 | width: 464rpx; | 185 | width: 464rpx; |
186 | height: 64rpx; | 186 | height: 64rpx; |
187 | - background: #f7f8faff; | 187 | + background: #f7f8fa; |
188 | padding: 13rpx 16rpx; | 188 | padding: 13rpx 16rpx; |
189 | box-sizing: border-box; | 189 | box-sizing: border-box; |
190 | margin-top: 22rpx; | 190 | margin-top: 22rpx; |
@@ -195,7 +195,7 @@ | @@ -195,7 +195,7 @@ | ||
195 | } | 195 | } |
196 | 196 | ||
197 | .fenleft { | 197 | .fenleft { |
198 | - color: #ccccccff; | 198 | + color: #cccccc; |
199 | font-size: 27rpx; | 199 | font-size: 27rpx; |
200 | width: 350rpx; | 200 | width: 350rpx; |
201 | height:64rpx; | 201 | height:64rpx; |
@@ -206,7 +206,7 @@ | @@ -206,7 +206,7 @@ | ||
206 | line-height: 64rpx; | 206 | line-height: 64rpx; |
207 | } | 207 | } |
208 | .entershuzi{ | 208 | .entershuzi{ |
209 | - color: #ccccccff; | 209 | + color: #cccccc; |
210 | font-size: 27rpx; | 210 | font-size: 27rpx; |
211 | } | 211 | } |
212 | 212 | ||
@@ -225,14 +225,14 @@ | @@ -225,14 +225,14 @@ | ||
225 | .fenleft { | 225 | .fenleft { |
226 | width: 224rpx; | 226 | width: 224rpx; |
227 | height: 64rpx; | 227 | height: 64rpx; |
228 | - background: #f7f8faff; | 228 | + background: #f7f8fa; |
229 | border-radius: 10rpx; | 229 | border-radius: 10rpx; |
230 | text-align: center; | 230 | text-align: center; |
231 | line-height: 64rpx; | 231 | line-height: 64rpx; |
232 | } | 232 | } |
233 | 233 | ||
234 | .fenheng { | 234 | .fenheng { |
235 | - color: #777777ff; | 235 | + color: #777777; |
236 | margin-right: 2rpx; | 236 | margin-right: 2rpx; |
237 | margin-left: 2rpx; | 237 | margin-left: 2rpx; |
238 | } | 238 | } |
pages/yujing/yujingsearch/yujingsearch.js
0 → 100644
1 | +// pages/yujing/yujingsearch/yujingsearch.js | ||
2 | +const app=getApp() | ||
3 | +Page({ | ||
4 | + | ||
5 | + /** | ||
6 | + * 页面的初始数据 | ||
7 | + */ | ||
8 | + data: { | ||
9 | + datechu:false, | ||
10 | + currentdate:false, | ||
11 | + startdate:'', | ||
12 | + enddate:'', | ||
13 | + datePickerValue: ['', '', ''], | ||
14 | + timesel:1, | ||
15 | + chaxun:true, | ||
16 | + reset:true, | ||
17 | + // 显示企业信息搜索还是查询列表 | ||
18 | + qiyexinxi:false | ||
19 | + }, | ||
20 | + | ||
21 | + /** | ||
22 | + * 生命周期函数--监听页面加载 | ||
23 | + */ | ||
24 | + onLoad: function (options) { | ||
25 | + this.setData({ | ||
26 | + startdate: app.nowDate(), | ||
27 | + enddate: app.qiendate() | ||
28 | + }) | ||
29 | + }, | ||
30 | + | ||
31 | + //输入企业姓名 | ||
32 | + enterqiyename(e){ | ||
33 | + this.setData({ | ||
34 | + qiyename:e.detail.value | ||
35 | + }) | ||
36 | + | ||
37 | + if(this.data.qiyename.length>0){ | ||
38 | + this.setData({ | ||
39 | + chaxun: false, | ||
40 | + reset: false | ||
41 | + }) | ||
42 | + } | ||
43 | + }, | ||
44 | + // 显示时间弹出层 | ||
45 | + begintime(){ | ||
46 | + this.setData({ | ||
47 | + datechu: true, | ||
48 | + currentdate: true, | ||
49 | + }) | ||
50 | + | ||
51 | + this.datexianshi() | ||
52 | + }, | ||
53 | + | ||
54 | + //开始时间和结束时间切换 | ||
55 | + xuanshijan(e) { | ||
56 | + this.setData({ | ||
57 | + timesel:e.currentTarget.dataset.time, | ||
58 | + currentdate: true | ||
59 | + }) | ||
60 | + | ||
61 | + this.datexianshi() | ||
62 | + }, | ||
63 | + // 显示日期 | ||
64 | + datexianshi() { | ||
65 | + this.setData({ | ||
66 | + datechu: true, | ||
67 | + currentdate: true | ||
68 | + }) | ||
69 | + | ||
70 | + //获取年 | ||
71 | + var date = new Date(); | ||
72 | + var obj = {} | ||
73 | + var year = date.getFullYear(); | ||
74 | + var month = date.getMonth() + 1; | ||
75 | + if (month < 10) { | ||
76 | + month = '0' + month | ||
77 | + } | ||
78 | + | ||
79 | + var day = date.getDate(); | ||
80 | + if (day < 10) { | ||
81 | + day = "0" + day | ||
82 | + } | ||
83 | + console.log() | ||
84 | + if (typeof (day) == 'number') { | ||
85 | + day = day.toString() | ||
86 | + } | ||
87 | + console.log(typeof (day)) | ||
88 | + this.setData({ | ||
89 | + datePickerValue: [year, month, day], | ||
90 | + }) | ||
91 | + | ||
92 | + }, | ||
93 | + | ||
94 | + | ||
95 | +//确定选择时间 | ||
96 | + datePickerOnSureClick: function (e) { | ||
97 | + console.log('datePickerOnSureClick'); | ||
98 | + | ||
99 | + if (this.data.timesel == 1) { | ||
100 | + console.log(e); | ||
101 | + this.setData({ | ||
102 | + date: `${e.detail.value[0]}年${e.detail.value[1]}月${e.detail.value[2]}日`, | ||
103 | + datePickerValue: e.detail.value, | ||
104 | + datePickerIsShow: false, | ||
105 | + currentdate: false, | ||
106 | + state: 2, | ||
107 | + startdate: e.detail.value[0] + '年' + e.detail.value[1] + "月" + e.detail.value[2]+'日' | ||
108 | + }); | ||
109 | + } else { | ||
110 | + console.log(e); | ||
111 | + this.setData({ | ||
112 | + date: `${e.detail.value[0]}年${e.detail.value[1]}月${e.detail.value[2]}日`, | ||
113 | + datePickerValue: e.detail.value, | ||
114 | + datePickerIsShow: false, | ||
115 | + currentdate: false, | ||
116 | + state: 2, | ||
117 | + enddate: e.detail.value[0] + '年' + e.detail.value[1] + "月" + e.detail.value[2]+'日' | ||
118 | + }); | ||
119 | + } | ||
120 | + | ||
121 | + }, | ||
122 | +// 取消选择时间 | ||
123 | + datePickerOnCancelClick: function (event) { | ||
124 | + console.log('datePickerOnCancelClick'); | ||
125 | + console.log(event); | ||
126 | + this.setData({ | ||
127 | + datePickerIsShow: false, | ||
128 | + | ||
129 | + currentdate: false, | ||
130 | + state: 2 | ||
131 | + }); | ||
132 | + }, | ||
133 | + | ||
134 | + //确定选择开始日期和结束日期 | ||
135 | + qudingxuandate() { | ||
136 | + this.setData({ | ||
137 | + datechu: false, | ||
138 | + watertime: this.data.startdate + '-' + this.data.enddate | ||
139 | + }) | ||
140 | + }, | ||
141 | + | ||
142 | + | ||
143 | + /** | ||
144 | + * 生命周期函数--监听页面初次渲染完成 | ||
145 | + */ | ||
146 | + onReady: function () { | ||
147 | + | ||
148 | + }, | ||
149 | + | ||
150 | + /** | ||
151 | + * 生命周期函数--监听页面显示 | ||
152 | + */ | ||
153 | + onShow: function () { | ||
154 | + | ||
155 | + }, | ||
156 | + | ||
157 | + /** | ||
158 | + * 生命周期函数--监听页面隐藏 | ||
159 | + */ | ||
160 | + onHide: function () { | ||
161 | + | ||
162 | + }, | ||
163 | + | ||
164 | + /** | ||
165 | + * 生命周期函数--监听页面卸载 | ||
166 | + */ | ||
167 | + onUnload: function () { | ||
168 | + | ||
169 | + }, | ||
170 | + | ||
171 | + /** | ||
172 | + * 页面相关事件处理函数--监听用户下拉动作 | ||
173 | + */ | ||
174 | + onPullDownRefresh: function () { | ||
175 | + | ||
176 | + }, | ||
177 | + | ||
178 | + /** | ||
179 | + * 页面上拉触底事件的处理函数 | ||
180 | + */ | ||
181 | + onReachBottom: function () { | ||
182 | + | ||
183 | + }, | ||
184 | + | ||
185 | + /** | ||
186 | + * 用户点击右上角分享 | ||
187 | + */ | ||
188 | + onShareAppMessage: function () { | ||
189 | + | ||
190 | + } | ||
191 | +}) |
pages/yujing/yujingsearch/yujingsearch.json
0 → 100644
pages/yujing/yujingsearch/yujingsearch.wxml
0 → 100644
1 | +<!-- 日期弹出层 --> | ||
2 | +<view class="register" wx:if="{{datechu}}"> | ||
3 | + <view class="timewrap"> | ||
4 | + | ||
5 | + | ||
6 | + <!-- 开始时间和结束时间 --> | ||
7 | + | ||
8 | + <view class="timetwo"> | ||
9 | + <view class="timebetin" bindtap="xuanshijan" data-time="1"> | ||
10 | + | ||
11 | + <view class="timetop {{timesel==1?'seltimeactive':''}}">开始时间</view> | ||
12 | + <view class="timebottom {{timesel==1?'selnameactive':''}}">{{startdate}}</view> | ||
13 | + </view> | ||
14 | + <view class="timebetin" bindtap="xuanshijan" data-time="2"> | ||
15 | + | ||
16 | + <view class="timetop {{timesel==2?'seltimeactive':''}}">结束时间</view> | ||
17 | + <view class="timebottom {{timesel==2?'selnameactive':''}}">{{enddate}}</view> | ||
18 | + </view> | ||
19 | + </view> | ||
20 | + | ||
21 | + <view class="timebox" wx:if="{{currentdate}}"> | ||
22 | + <view class="timeboxitem {{sel==index?'timeboxactive':''}}" wx:for="{{timearr}}" wx:key=""> | ||
23 | + <view class="itemcontent">{{item.year}}</view> | ||
24 | + <view class="itemcontent">{{item.month}}</view> | ||
25 | + <view class="itemcontent">{{item.day}}</view> | ||
26 | + </view> | ||
27 | + | ||
28 | + | ||
29 | + </view> | ||
30 | + <view class="qudingdate" wx:else bindtap='qudingxuandate'>确定</view> | ||
31 | + | ||
32 | + | ||
33 | + <view wx:if="{{currentdate}}"> | ||
34 | + | ||
35 | + <date-picker id="date-picker" value="{{datePickerValue}}" isShow="{{datePickerIsShow}}" bindsureclick="datePickerOnSureClick" bindcancelclick="datePickerOnCancelClick" /> | ||
36 | + | ||
37 | + </view> | ||
38 | + | ||
39 | + | ||
40 | + </view> | ||
41 | +</view> | ||
42 | + | ||
43 | +<!-- 企业信息输入 --> | ||
44 | +<view class="qiyexinxi" wx:if="{{qiyexinxi}}"> | ||
45 | + | ||
46 | + <view class="search"> | ||
47 | + <view class="searchinput"> | ||
48 | + <input placeholder='输入企业信息' placeholder-class='qiyeinfo' placeholder-class='enterqiname' /> | ||
49 | + </view> | ||
50 | + | ||
51 | + <view class="quxiao"> | ||
52 | + 取消 | ||
53 | + </view> | ||
54 | + </view> | ||
55 | + | ||
56 | + <!-- 企业列表 --> | ||
57 | + | ||
58 | + <view class="qiyebox"> | ||
59 | + | ||
60 | + <view class="qiyeitem"> | ||
61 | + <view class="qiyename">企业名称</view> | ||
62 | + <view class="qiyeshuru"> | ||
63 | + <input placeholder='请输入企业姓名' value="{{qiyename}}" bindinput="enterqiyename" /> | ||
64 | + </view> | ||
65 | + </view> | ||
66 | + | ||
67 | + | ||
68 | + <view class="qiyetime" bindtap="begintime"> | ||
69 | + | ||
70 | + <view class="qiyetimeleft"> | ||
71 | + <view class='qiyetimeleft'>开始时间</view> | ||
72 | + | ||
73 | + <view class="starttime">{{startdate}}</view> | ||
74 | + </view> | ||
75 | + | ||
76 | + <view class="qiyerowimg"> | ||
77 | + <image src="/img/qiyerow.png"></image> | ||
78 | + </view> | ||
79 | + </view> | ||
80 | + | ||
81 | + <view class="qiyetime" bindtap="begintime"> | ||
82 | + <view class="qiyetimeleft"> | ||
83 | + <view class='qiyetimeleft'>结束时间</view> | ||
84 | + | ||
85 | + <view class="starttime">{{enddate}}</view> | ||
86 | + </view> | ||
87 | + | ||
88 | + <view class="qiyerowimg"> | ||
89 | + <image src="/img/qiyerow.png"></image> | ||
90 | + </view> | ||
91 | + </view> | ||
92 | + </view> | ||
93 | + | ||
94 | + <view class="chaxun" wx:if="{{chaxun}}">查询</view> | ||
95 | + | ||
96 | + <view class="chaxun cha" wx:else>查询</view> | ||
97 | + | ||
98 | + <view class="reset" wx:if="{{reset}}">重置</view> | ||
99 | + <view class="reset re" wx:else>重置</view> | ||
100 | +</view> | ||
101 | + | ||
102 | +<!-- 企业列表 --> | ||
103 | + | ||
104 | +<view class="qiyelsit"> | ||
105 | + <view class="qiyeitem"></view> | ||
106 | +</view> |
pages/yujing/yujingsearch/yujingsearch.wxss
0 → 100644
1 | +@import '../../companybox/zhishudetail/member/member.wxss'; | ||
2 | +page { | ||
3 | + background: #f4f4f4; | ||
4 | +} | ||
5 | + | ||
6 | +.search { | ||
7 | + display: flex; | ||
8 | + align-items: center; | ||
9 | + justify-content: space-between; | ||
10 | + background: #fff; | ||
11 | + padding: 14rpx 44rpx; | ||
12 | + box-sizing: border-box; | ||
13 | + background: #fff; | ||
14 | +} | ||
15 | + | ||
16 | +.searchinput { | ||
17 | + width: 575rpx; | ||
18 | + padding: 10rpx 20rpx 10rpx 74rpx; | ||
19 | + box-sizing: border-box; | ||
20 | + background: #ebecee; | ||
21 | + border-radius: 30rpx; | ||
22 | + color: #a4a4a4; | ||
23 | + font-size: 28rpx; | ||
24 | +} | ||
25 | + | ||
26 | +searchinput input { | ||
27 | + width: 575rpx; | ||
28 | + padding: 10rpx 20rpx 10rpx 74rpx; | ||
29 | + box-sizing: border-box; | ||
30 | +} | ||
31 | + | ||
32 | +.quxiao { | ||
33 | + color: #ff9400; | ||
34 | + margin-left: 30rpx; | ||
35 | +} | ||
36 | + | ||
37 | +.qiyeinfo { | ||
38 | + color: #a4a4a4; | ||
39 | + font-size: 28rpx; | ||
40 | +} | ||
41 | + | ||
42 | +.qiyeitem { | ||
43 | + display: flex; | ||
44 | + align-items: center; | ||
45 | + padding: 40rpx 0 40rpx 0; | ||
46 | + box-sizing: border-box; | ||
47 | + border-bottom: 1rpx solid #f5f5f5; | ||
48 | +} | ||
49 | + | ||
50 | +.qiyebox { | ||
51 | + width: 690rpx; | ||
52 | + background: #fff; | ||
53 | + border-radius: 10rpx; | ||
54 | + margin: 67rpx auto 0; | ||
55 | + padding: 0 30rpx; | ||
56 | + box-sizing: border-box; | ||
57 | +} | ||
58 | + | ||
59 | +.qiyename { | ||
60 | + color: #333; | ||
61 | + font-size: 32rpx; | ||
62 | +} | ||
63 | + | ||
64 | +.qiyeshuru { | ||
65 | + color: #999; | ||
66 | + font-size: 30rpx; | ||
67 | + margin-left: 20rpx; | ||
68 | +} | ||
69 | + | ||
70 | +.qiyeshuru input { | ||
71 | + height: 50rpx; | ||
72 | + line-height: 50rpx; | ||
73 | +} | ||
74 | + | ||
75 | +.qiyetime { | ||
76 | + display: flex; | ||
77 | + align-items: center; | ||
78 | + justify-content: space-between; | ||
79 | + padding: 40rpx 0 40rpx 0; | ||
80 | + box-sizing: border-box; | ||
81 | + border-bottom: 1rpx solid #f5f5f5; | ||
82 | +} | ||
83 | +.qiyetimeleft{ | ||
84 | + display:flex; | ||
85 | + align-items: center; | ||
86 | + | ||
87 | +} | ||
88 | + | ||
89 | +.qiyerowimg { | ||
90 | + width: 30rpx; | ||
91 | + height: 30rpx; | ||
92 | + font-size: 0; | ||
93 | +} | ||
94 | + | ||
95 | +.enterqiname { | ||
96 | + color: #999; | ||
97 | + font-size: 28rpx; | ||
98 | +} | ||
99 | + | ||
100 | +.chaxun { | ||
101 | + width: 600rpx; | ||
102 | + height: 80rpx; | ||
103 | + background: rgba(255, 206, 139, 1); | ||
104 | + opacity: 1; | ||
105 | + border-radius: 12rpx; | ||
106 | + color: #fff; | ||
107 | + font-size: 28rpx; | ||
108 | + text-align: center; | ||
109 | + line-height: 80rpx; | ||
110 | + margin: 120rpx auto 0; | ||
111 | +} | ||
112 | +.cha{ | ||
113 | + background: #FF9400 | ||
114 | +} | ||
115 | + | ||
116 | +.reset { | ||
117 | + width: 600rpx; | ||
118 | + height: 80rpx; | ||
119 | + border: 2rpx solid rgba(186, 186, 186, 1); | ||
120 | + opacity: 1; | ||
121 | + border-radius: 12rpx; | ||
122 | + color:#999999; | ||
123 | + font-size: 28rpx; | ||
124 | + margin:24rpx auto 0; | ||
125 | + text-align: center; | ||
126 | + line-height: 80rpx; | ||
127 | +} | ||
128 | +.re{ | ||
129 | + border:1rpx solid #FF9400; | ||
130 | + color:#FF9400; | ||
131 | +} | ||
132 | +.starttime{ | ||
133 | + color:#333333; | ||
134 | + font-size: 32rpx; | ||
135 | + margin-left:25rpx; | ||
136 | +} |
-
请 注册 或 登录 后发表评论