guolong
/
mini_program
0
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

修改优化

master
1191151619 4 years ago
parent
f07302d443
commit
719f716f7e
12 changed files with 244 additions and 88 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      components/ui-calendar/ui-calendar.js
  2. 114
      components/ui-calendar/ui-calendar.wxml
  3. 25
      components/ui-calendar/ui-calendar.wxss
  4. 30
      pages/calculation/calculation.js
  5. 15
      pages/calculation/calculation.wxml
  6. 25
      pages/calculation/calculation.wxss
  7. 5
      pages/calendar/calendar.js
  8. 19
      pages/calendar/calendar.wxml
  9. 18
      pages/calendar/calendar.wxss
  10. 29
      pages/look-list/look-list.js
  11. 12
      pages/look-list/look-list.wxml
  12. 24
      pages/look-list/look-list.wxss

16
components/ui-calendar/ui-calendar.js
Unescape View File

@ -20,6 +20,13 @@ Component({
},
listedCount:{
type:Array
},
year:{
type:String
},
month:{
type:String
}
},
data: {
@ -46,6 +53,13 @@ Component({
indexT:data
})
console.log(data)
}
},
DateChange(e){
this.triggerEvent('DateChange', e.detail.value);
},
todayFun(){
this.triggerEvent('todayFun');
},
}
})

114
components/ui-calendar/ui-calendar.wxml
Unescape View File

@ -1,29 +1,29 @@
<wxs module="dateUtil">
var isDate = function(date) {
var isDate = function (date) {
return date && date.getMonth;
};
var isLeapYear = function(year) {
var isLeapYear = function (year) {
//传入为时间格式需要处理
if (isDate(year)) year = year.getFullYear()
if ((year % 4 == 0 && year % 100 != 0) || (year % 400 == 0)) return true;
return false;
};
var getDaysOfMonth = function(date) {
var getDaysOfMonth = function (date) {
var month = date.getMonth(); //注意此处月份要加1，所以我们要减一
var year = date.getFullYear();
return [31, isLeapYear(year) ? 29 : 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31][month];
}
var getBeginDayOfMouth = function(date) {
var getBeginDayOfMouth = function (date) {
var month = date.getMonth();
var year = date.getFullYear();
var d = getDate(year, month, 1);
return d.getDay();
}
var getDisplayInfo = function(date) {
var getDisplayInfo = function (date) {
if (!isDate(date)) {
date = getDate(date)
@ -49,17 +49,17 @@
};
//分割月之间的展示
var monthClapFn = function(year, month) {
var monthClapFn = function (year, month) {
month = month + 1;
return year + '年' + (month) + '月';
};
//时间转化
var getChangedDate = function(date) {
var getChangedDate = function (date) {
var timer = date.split('-')
var changedYear = parseInt(timer[0])
var changedMonth = parseInt(timer[1])-1
var changedMonth = parseInt(timer[1]) - 1
var my_month = parseInt(timer[1])
return {
str_month: monthClapFn(changedYear, changedMonth),
@ -70,81 +70,99 @@
};
};
var isSelected = function(date, year, month, day,auctionCount,listedCount) {
var isSelected = function (date, year, month, day, auctionCount, listedCount) {
if (!isDate(date)) {
date = getDate(date);
}
if (date.getFullYear() == year && date.getMonth() == month && date.getDate() == day) return 'active active-back-one';
// console.log(date, year, month, day);
month = month>=9?month+1:'0'+(month+1);
day = day>9?day:'0'+day;
month = month >= 9 ? month + 1 : '0' + (month + 1);
day = day > 9 ? day : '0' + day;
var dataTime = year+'-'+month+'-'+day;
var dataTime = year + '-' + month + '-' + day;
// console.log(dataTime);
var a = auctionCount.indexOf(dataTime);
var b = listedCount.indexOf(dataTime);
// console.log(a,b);
if(a>=0&&b>=0){
if (a >= 0 && b >= 0) {
return 'active active-back-four'
}else if(a>=0&&b<0){
} else if (a >= 0 && b < 0) {
return 'active active-back-three'
}else if(a<0&&b>=0){
} else if (a < 0 && b >= 0) {
return ' active active-back-two'
}
// console.log(dataTime);
// while (i<=statistics.length-1){
// while (i<=statistics.length-1){
// console.log(statistics[i].date)
// if(statistics[i].date == date){
// console.log(date);
// console.log('------');
// return 'active active-back-one'
// }
// }
// return 'active active-back-one'
// }
// }
// console.log(statistics),
// console.log('------')
return '';
};
var formatNum = function(n) {
var formatNum = function (n) {
if (n < 10) return '0' + n;
return n;
};
module.exports = {
getDipalyInfo: getDisplayInfo,
getChangedDate: getChangedDate,
isSelected: isSelected
}
</wxs>
<view class="cm-calendar">
<view class="cm-calendar-hd">
<block wx:for="{{weekDayArr}}" wx:key="weekDayKey">
<view class="item">{{item}}</view>
</block>
<view class="cm-calendar">
<!-- 地图上方控件 -->
<view class="map_top">
<view class="today" bindtap="todayFun">
回到今天
</view>
<picker mode="region" value="{{timeValue}}" fields="month" mode="date" bindchange="DateChange">
<view class="dateTime">
<view class="dateLi years">
{{year}}年
</view>
<view class="dateLi month">
{{month}}月
</view>
</view>
<block>
<view class="cm-calendar-bd ">
<view class="cm-day-list">
<block wx:key="tt"
wx:for="{{dateUtil.getDipalyInfo(dateUtil.getChangedDate(displayTime).date).days + dateUtil.getDipalyInfo(dateUtil.getChangedDate(displayTime).date).beginWeek}}"
wx:for-index="index">
<view wx:if="{{index < dateUtil.getDipalyInfo(dateUtil.getChangedDate(displayTime).date).beginWeek }}"
class="item"></view>
<view bindtap="onDayTap" data-index="{{index}}" wx:else data-year="{{dateUtil.getChangedDate(displayTime).year}}"
data-month="{{dateUtil.getChangedDate(displayTime).my_month}}"
data-day="{{index + 1 - dateUtil.getDipalyInfo(dateUtil.getChangedDate(displayTime).date).beginWeek}}"
class="item {{dateUtil.isSelected(selectedDate, dateUtil.getChangedDate(displayTime).year, dateUtil.getChangedDate(displayTime).month, index + 1 - dateUtil.getDipalyInfo(dateUtil.getChangedDate(displayTime).date).beginWeek,auctionCount,listedCount)}} ">
<view class="item_view {{indexT == index ? 'selected' :''}}">
<view class="cm-field-title">
{{index + 1 - dateUtil.getDipalyInfo(dateUtil.getChangedDate(displayTime).date).beginWeek }}
</view>
<view class="current">今天</view>
</view>
</picker>
</view>
<view class="cm-calendar-hd">
<block wx:for="{{weekDayArr}}" wx:key="weekDayKey">
<view class="item">{{item}}</view>
</block>
</view>
<block>
<view class="cm-calendar-bd ">
<view class="cm-day-list">
<block wx:key="tt"
wx:for="{{dateUtil.getDipalyInfo(dateUtil.getChangedDate(displayTime).date).days + dateUtil.getDipalyInfo(dateUtil.getChangedDate(displayTime).date).beginWeek}}"
wx:for-index="index">
<view wx:if="{{index < dateUtil.getDipalyInfo(dateUtil.getChangedDate(displayTime).date).beginWeek }}"
class="item"></view>
<view bindtap="onDayTap" data-index="{{index}}" wx:else
data-year="{{dateUtil.getChangedDate(displayTime).year}}"
data-month="{{dateUtil.getChangedDate(displayTime).my_month}}"
data-day="{{index + 1 - dateUtil.getDipalyInfo(dateUtil.getChangedDate(displayTime).date).beginWeek}}"
class="item {{dateUtil.isSelected(selectedDate, dateUtil.getChangedDate(displayTime).year, dateUtil.getChangedDate(displayTime).month, index + 1 - dateUtil.getDipalyInfo(dateUtil.getChangedDate(displayTime).date).beginWeek,auctionCount,listedCount)}} ">
<view class="item_view {{indexT == index ? 'selected' :''}}">
<view class="cm-field-title">
{{index + 1 - dateUtil.getDipalyInfo(dateUtil.getChangedDate(displayTime).date).beginWeek }}
</view>
</block>
<view class="current">今天</view>
</view>
</view>
</view>
</block>
</view>
</block>
</view>
</view>
</block>
</view>

25
components/ui-calendar/ui-calendar.wxss
Unescape View File

@ -91,4 +91,29 @@
.item_view.selected view{
color:#ffffff !important;
}
.map_top{
display: flex;
align-items: center;
justify-content:space-between;
padding:0 20rpx;
}
.dateTime{
display: flex;
}
.dateTime .dateLi{
height: 50rpx;
line-height: 50rpx;
padding:0 20rpx;
border-radius: 25rpx;
border:2rpx solid #333333;
columns: #333333;
margin:0 10rpx;
}
.today{
font-size: 24rpx;
font-weight: bold;
color:#136AE7;
}

30
pages/calculation/calculation.js
Unescape View File

@ -24,12 +24,38 @@ Page({
}],
list: [],
refresher: false,
setScroll: true
setScroll: true,
// 搜索框
is_search:false,
is_focusing:false,//是否聚焦
},
onReady() {
this.refresh()
},
// 地图搜索框
searchFun(){
this.setData({
is_search:true,
is_focusing:true,
})
},
blurFun(){//隐藏
this.setData({
is_search:this.data.page.landListedId?true:false,
is_focusing:false,
})
},
// 清空搜索内容
emptyFun(){
this.setData({
['page.landListedId']:'',
is_focusing:true,
})
this.refresh();
},
onShow() {
if (typeof this.getTabBar === 'function' &&
@ -122,6 +148,8 @@ Page({
this.setData({
[t]:e.detail.value
})
this.refresh();
},
showInput(){
if(this.data.inputShow==true){return false}

15
pages/calculation/calculation.wxml
Unescape View File

@ -1,11 +1,20 @@
<view class="pages">
<mp-navigation-bar ext-class="set-bar" title="测算" back="{{false}}"></mp-navigation-bar>
<view class="top">
<view class="search center" bindtap="showInput">
<view class="top look-top">
<!-- <view class="search center" bindtap="showInput">
<image wx:if="{{!inputShow}}" src="../../assets/images/search-mini.png"></image>
<input value="{{page.landListedId}}" bindconfirm="refresh" wx:if="{{inputShow}}" focus="true" bindblur="hideInput" class="form-input" bindinput="vmodel" type="text" />
</view>
</view> -->
<view class="look-search center {{is_search?'focusing':''}}" bindtap="searchFun">
<image class="look-s-icon" src="../../assets/images/search.png"></image>
<input type="text" focus="{{is_focusing}}" auto-focus="{{is_focusing}}" bindconfirm="refresh" model:value="{{page.landListedId}}" hold-keyboard="true" bindinput="vmodel" bindblur="blurFun" placeholder="请输入搜索内容" />
<image class="del ml10" bindtap="emptyFun"
wx:if="{{page.landListedId != '' && page.landListedId}}" src="../../assets/images/del-icon.png" mode="widthFix"></image>
</view>
<view class="top-box center" bindtap="comeHistory">
<image class="top-icon" src="../../assets/images/jiankong.png"></image>
<text>测算监控</text>

25
pages/calculation/calculation.wxss
Unescape View File

@ -151,4 +151,29 @@
.noText{
text-align: center;
padding-top: 50rpx;
}
/* 2021 07-28 */
.look-top{
position: relative;
}
.look-search{
padding: 0 20rpx;
}
.look-search .look-s-icon{
margin-right: 10rpx;
}
.look-search input{
width: 0;
transition: all .5s ease;
width: 0;
}
.look-search.focusing input{
width: 350rpx;
}
.look-search .del{
width: 25rpx;
}

5
pages/calendar/calendar.js
Unescape View File

@ -50,8 +50,9 @@ Page({
listedCount: [],//有挂牌数量日期
},
bindDateChange(res) {
let calendarDisplayTime = res.detail.value;
bindDateChange(value) {
let calendarDisplayTime = value.detail;
console.log(calendarDisplayTime);
this.setData({

19
pages/calendar/calendar.wxml
Unescape View File

@ -24,23 +24,16 @@
<text>{{cityName}}</text>
<image class="tag" src="../../assets/images/arrow-down.png"></image>
</view>
<picker mode="region" value="{{timeValue}}" fields="month" mode="date" bindchange="bindDateChange">
<view class="dateTime">
<view class="dateLi years">
{{year}}年
</view>
<view class="dateLi month">
{{month}}月
</view>
</view>
</picker>
</view>
<view class="cal-box">
<image class="cal-back" src="../../assets/images/cal-back.png"></image>
<view class="calendar-box">
<!-- <calendar bind:callSomeFun="onShow"></calendar> -->
<ui-calendar ex-class="calendar-cm-month" id='calendarId' bindonDayTap="onCalendarDayTap" auctionCount="{{auctionCount}}"
<ui-calendar ex-class="calendar-cm-month"
bindtodayFun="todayFun"
bindDateChange="bindDateChange" id='calendarId' bindonDayTap="onCalendarDayTap" auctionCount="{{auctionCount}}" year="{{year}}" month="{{month}}"
listedCount="{{listedCount}}" displayTime="{{calendarDisplayTime}}" selectedDate="{{calendarSelectedDate}}"
displayMonthNum="{{calendarDisplayMonthNum}}" is-show="{{isCalendarShow}}"></ui-calendar>
</view>
@ -56,9 +49,7 @@
<image class="tab-tag" src="../../assets/images/tab-tag.png"></image>
</view>
</view>
<view class="today" bindtap="todayFun">
回到今天
</view>
</view>
<!-- 展示部分 -->
<view wx:if="{{active == 1}}">

18
pages/calendar/calendar.wxss
Unescape View File

@ -118,11 +118,7 @@
display: flex;
align-items: center;
}
.today{
font-size: 24rpx;
font-weight: bold;
color:#136AE7;
}
.tab-item {
display: flex;
flex-direction: column;
@ -172,15 +168,3 @@
padding-right: 20rpx;
}
.dateTime{
display: flex;
}
.dateTime .dateLi{
height: 50rpx;
line-height: 50rpx;
padding:0 20rpx;
border-radius: 25rpx;
border:2rpx solid #333333;
columns: #333333;
margin:0 10rpx;
}

29
pages/look-list/look-list.js
Unescape View File

@ -42,7 +42,34 @@ Page({
region: ["500000", "500100"],
title:'',//传递待测算名
// 搜索框
is_search:false,
is_focusing:false,//是否聚焦
},
// 地图搜索框
searchFun(){
this.setData({
is_search:true,
is_focusing:true,
})
},
blurFun(){//隐藏
this.setData({
is_search:this.data.page.landCode?true:false,
is_focusing:false,
})
},
// 清空搜索内容
emptyFun(){
this.setData({
['page.landCode']:'',
is_focusing:true,
})
this.refresh();
},
// 选择城市
bindAddressChangeCity(res) {
let cityName = res.detail.value[1];
@ -299,6 +326,8 @@ Page({
this.setData({
[t]:e.detail.value
})
this.refresh();
},
showInput(){
if(this.data.inputShow==true){return false}

12
pages/look-list/look-list.wxml
Unescape View File

@ -30,11 +30,19 @@
<view class="pages">
<mp-navigation-bar ext-class="set-bar" title="列表"></mp-navigation-bar>
<view class="look-top" bindtap="inShow">
<view class="look-search center" bindtap="showInput">
<!-- <view class="look-search center" bindtap="showInput">
<image wx:if="{{!inputShow}}" class="look-s-icon" src="../../assets/images/search.png"></image>
<input value="{{page.landCode}}" bindconfirm="refresh" wx:if="{{inputShow}}" focus="true" bindblur="hideInput"
class="form-input" bindinput="vmodel" type="text" />
</view>
</view> -->
<view class="look-search center {{is_search?'focusing':''}}" bindtap="searchFun">
<image class="look-s-icon" src="../../assets/images/search.png"></image>
<input type="text" focus="{{is_focusing}}" auto-focus="{{is_focusing}}" bindconfirm="refresh" model:value="{{page.landCode}}" hold-keyboard="true" bindinput="vmodel" bindblur="blurFun" placeholder="请输入搜索内容" />
<image class="del ml10" bindtap="emptyFun"
wx:if="{{page.landListedId != '' && page.landListedId}}" src="../../assets/images/del-icon.png" mode="widthFix"></image>
</view>
<view class="look-top-right flex-center" bindtap="comeBack">
<image class="look-top-tag" src="../../assets/images/map.png"></image>
<text class="look-top-text">地图</text>

24
pages/look-list/look-list.wxss
Unescape View File

@ -222,4 +222,28 @@
.radioView:last-child{
border-top-right-radius: 8rpx;
border-bottom-right-radius: 8rpx;
}
/* 2021 07-28 */
.look-top{
position: relative;
}
.look-search{
padding: 0 20rpx;
}
.look-search .look-s-icon{
margin-right: 10rpx;
}
.look-search input{
width: 0;
transition: all .5s ease;
width: 0;
}
.look-search.focusing input{
width: 350rpx;
}
.look-search .del{
width: 25rpx;
}
Write Preview
Loading…
Cancel
Save