caoliancun/LSM_OIL_SITE
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'zyj' (#11) from zyj into master

Browse Source 
Reviewed-on: #11
This commit was merged in pull request #11.
This commit is contained in:
zhangyouji
2024-05-11 03:03:35 +00:00
parent 4813635a78 e56aa1c24f
commit b01b735ab8
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packageIntegral/productList/index.vue
View File

@@ -598,4 +598,4 @@
} }
} }
</style> </style>

20
packageOrders/pages/orderList/orderList.vue
View File

@@ -109,19 +109,21 @@
<input v-model="params.email" class="card_item_input" placeholder="请输入邮箱" /> <input v-model="params.email" class="card_item_input" placeholder="请输入邮箱" />
</view> </view>
<view class="popup_card_from_item"> <view class="popup_card_from_item">
<view class="popup_card_from_item_left_text">开始时间：</view> <view class="popup_card_from_item_left_text" style="margin-top: 32rpx;">开始时间：</view>
<view class="uni-list-cell-db"> <view class="uni-list-cell-db">
<picker mode="date" :value="startDate" @change="startDateChange" class="uni-picker"> <uni-datetime-picker type="datetime" :value="startDate" @change="startDateChange" />
<!-- <picker mode="date" :value="startDate" @change="startDateChange" class="uni-picker">
<view class="uni-input">{{startDate}}</view> <view class="uni-input">{{startDate}}</view>
</picker> </picker> -->
</view> </view>
</view> </view>
<view class="popup_card_from_item"> <view class="popup_card_from_item">
<view class="popup_card_from_item_left_text">结束时间：</view> <view class="popup_card_from_item_left_text" style="margin-top: 32rpx;">结束时间：</view>
<view class="uni-list-cell-db"> <view class="uni-list-cell-db">
<picker mode="date" :value="endDate" @change="endDateChange" :start="endStartDate" :end="endEndDate" class="uni-picker"> <uni-datetime-picker type="datetime" :value="endDate" @change="endDateChange" :start="endStartDate" :end="endEndDate" />
<!-- <picker mode="date" :value="endDate" @change="endDateChange" :start="endStartDate" :end="endEndDate" class="uni-picker">
<view class="uni-input">{{endDate}}</view> <view class="uni-input">{{endDate}}</view>
</picker> </picker> -->
</view> </view>
</view> </view>
</view> </view>
@@ -452,10 +454,10 @@
} }
}, },
startDateChange:function(e){ startDateChange:function(e){
this.startDate = e.detail.value this.startDate = e
let data=this.startDate let data=this.startDate
this.endStartDate = data this.endStartDate = data
this.endEndDate = this.getEndDate(Date.parse(data)+ 3600 * 1000 * 24 * 30) this.endEndDate = this.getEndDate(Date.parse(data)+ 3600 * 1000 * 24 * 31)
this.params.startTime = this.startDate this.params.startTime = this.startDate
}, },
endDateChange:function(e){ endDateChange:function(e){
@@ -465,7 +467,7 @@
icon: 'none' icon: 'none'
}); });
}else{ }else{
this.endDate = e.detail.value this.endDate = e
this.params.endTime = this.endDate this.params.endTime = this.endDate
} }