Browse Source

no message

feature/v1.2
xpz2018 5 years ago
parent
commit
aa7a5391e0
6 changed files with 14 additions and 6 deletions
  1. 4
      components/calendar/calendar.wxml
  2. 5
      components/calendar/components/month/index.js
  3. 2
      components/calendar/components/month/index.wxml
  4. 4
      components/calendar/index.js
  5. 1
      pages/process/agent-list/index.js
  6. 4
      pages/process/index/index.wxml

4
components/calendar/calendar.wxml

@ -3,9 +3,9 @@
<slot name="title" slot="title"></slot> <slot name="title" slot="title"></slot>
</header> </header>
<scroll-view class="van-calendar__body" scroll-y scroll-into-view="{{ scrollIntoView }}">
<scroll-view class="van-calendar__body" scroll-y="true" scroll-into-view="{{ scrollIntoView }}" scroll-top="{{ top }}">
<month wx:for="{{ computed.getMonths(minDate, maxDate) }}" wx:key="index" id="month{{ index }}" class="month" <month wx:for="{{ computed.getMonths(minDate, maxDate) }}" wx:key="index" id="month{{ index }}" class="month"
data-date="{{ item }}" date="{{ item }}" type="{{ type }}" color="{{ color }}" minDate="{{ minDate }}"
data-date="{{ item }}" date="{{ item }}" type="{{ type }}" color="{{ color }}" index="{{ index }}" minDate="{{ minDate }}"
maxDate="{{ maxDate }}" showMark="{{ showMark }}" formatter="{{ formatter }}" rowHeight="{{ rowHeight }}" maxDate="{{ maxDate }}" showMark="{{ showMark }}" formatter="{{ formatter }}" rowHeight="{{ rowHeight }}"
currentDate="{{ currentDate }}" showSubtitle="{{ showSubtitle }}" allowSameDay="{{ allowSameDay }}" currentDate="{{ currentDate }}" showSubtitle="{{ showSubtitle }}" allowSameDay="{{ allowSameDay }}"
showMonthTitle="{{ index !== 0 || !showSubtitle }}" bind:click="onClickDay" /> showMonthTitle="{{ index !== 0 || !showSubtitle }}" bind:click="onClickDay" />

5
components/calendar/components/month/index.js

@ -7,6 +7,10 @@ import {
} from '../../utils'; } from '../../utils';
VantComponent({ VantComponent({
props: { props: {
index: {
type: Number,
value: '',
},
date: { date: {
type: null, type: null,
observer: 'setDays', observer: 'setDays',
@ -51,6 +55,7 @@ VantComponent({
} }
}, },
setDays() { setDays() {
// console.log(this.data.index)
const days = []; const days = [];
const startDate = new Date(this.data.date); const startDate = new Date(this.data.date);
const year = startDate.getFullYear(); const year = startDate.getFullYear();

2
components/calendar/components/month/index.wxml

@ -1,7 +1,7 @@
<wxs src="./index.wxs" module="computed"></wxs> <wxs src="./index.wxs" module="computed"></wxs>
<wxs src="../../../wxs/utils.wxs" module="utils" /> <wxs src="../../../wxs/utils.wxs" module="utils" />
<view class="van-calendar__month" style="{{ computed.getMonthStyle(visible, date, rowHeight) }}">
<view class="van-calendar__month" style="{{ computed.getMonthStyle(visible, date, rowHeight) }}" id="month{{ index }}">
<view wx:if="{{ showMonthTitle }}" class="van-calendar__month-title"> <view wx:if="{{ showMonthTitle }}" class="van-calendar__month-title">
{{ computed.formatMonthTitle(date) }} {{ computed.formatMonthTitle(date) }}
</view> </view>

4
components/calendar/index.js

@ -104,6 +104,10 @@ VantComponent({
type: null, type: null,
value: null, value: null,
}, },
top: {
type: Number,
value: 0,
}
}, },
data: { data: {
subtitle: '', subtitle: '',

1
pages/process/agent-list/index.js

@ -55,7 +55,6 @@ Page({
} else { } else {
this.setData({ requesting: true }) this.setData({ requesting: true })
} }
console.log('getAgentOrderList======67')
getAgentOrderList(this.data.form).then(result => { getAgentOrderList(this.data.form).then(result => {
if (result.data && result.data.records.length) { if (result.data && result.data.records.length) {
var respList = result.data.records var respList = result.data.records

4
pages/process/index/index.wxml

@ -16,7 +16,7 @@
<view class="bg-white" style="border-radius: 20rpx;padding: 24rpx 0rpx 8rpx 0rpx"> <view class="bg-white" style="border-radius: 20rpx;padding: 24rpx 0rpx 8rpx 0rpx">
<view class="flex flex-justify" style="padding: 0rpx 28rpx 24rpx 28rpx"> <view class="flex flex-justify" style="padding: 0rpx 28rpx 24rpx 28rpx">
<view class="text-black text-sg text-bold">收货统计</view> <view class="text-black text-sg text-bold">收货统计</view>
<view class="flex flex-center" bindtap="showSheet">
<view class="flex flex-center" bindtap="showSheet" style="padding: 2rpx 0rpx">
<view class="text-black text-sm" style="margin-right:8rpx">{{vdateString}}</view> <view class="text-black text-sm" style="margin-right:8rpx">{{vdateString}}</view>
<van-icon name="arrow-down" /> <van-icon name="arrow-down" />
</view> </view>
@ -131,4 +131,4 @@
</scroll-view> </scroll-view>
<!-- <van-action-sheet show="{{ show }}" actions="{{ actions }}" bind:close="onClose" bind:select="onSelect" z-index="22"/> --> <!-- <van-action-sheet show="{{ show }}" actions="{{ actions }}" bind:close="onClose" bind:select="onSelect" z-index="22"/> -->
<van-calendar show="{{ show }}" type="range" row-height="50" color="#008AFF" z-index="22" min-date="{{ minDate }}" max-date="{{ maxDate }}" default-date="{{ vdate }}" show-subtitle="{{ false }}" show-confirm="{{ false }}" bind:close="onClose" bind:confirm="onSelect"/>
<van-calendar show="{{ show }}" type="range" row-height="50" color="#008AFF" z-index="22" min-date="{{ minDate }}" max-date="{{ maxDate }}" default-date="{{ vdate }}" top="{{ 1500 }}" show-subtitle="{{ false }}" show-confirm="{{ false }}" bind:close="onClose" bind:confirm="onSelect"/>
Loading…
Cancel
Save