1.安全承诺书冲突修改
guoyuepeng
parent
93666ae7e7
commit
3eb3b8f28c
|
|
@ -6,7 +6,6 @@
|
||||||
itemStyle="height:80upx;padding-bottom:10upx;background-color: #fff;"
|
itemStyle="height:80upx;padding-bottom:10upx;background-color: #fff;"
|
||||||
@click="tabsClick"
|
@click="tabsClick"
|
||||||
></u-tabs>
|
></u-tabs>
|
||||||
<<<<<<< HEAD
|
|
||||||
<view class="container">
|
<view class="container">
|
||||||
<u-sticky offset-top="200">
|
<u-sticky offset-top="200">
|
||||||
<u-button type="primary" text="高级搜索" @click="popupOpen" style="height: 30px;"></u-button>
|
<u-button type="primary" text="高级搜索" @click="popupOpen" style="height: 30px;"></u-button>
|
||||||
|
|
@ -55,56 +54,6 @@
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
</u-popup>
|
</u-popup>
|
||||||
=======
|
|
||||||
<view class="container">
|
|
||||||
<u-sticky offset-top="200">
|
|
||||||
<u-button type="primary" text="高级搜索" @click="popupOpen" style="height: 30px;"></u-button>
|
|
||||||
</u-sticky>
|
|
||||||
</view>
|
|
||||||
<u-popup :show="popupShow" mode="right" :overlay="true" customStyle='width: 300px;' :safeAreaInsetTop="true" @close="popupClose" @open="popupOpen">
|
|
||||||
<view>
|
|
||||||
<u-datetime-picker
|
|
||||||
:show="addStartPickBarShow"
|
|
||||||
v-model="addTimeStart"
|
|
||||||
mode="date"
|
|
||||||
@close="addPickBarOnClose('start')"
|
|
||||||
@cancel="addPickBarOnCancel('start')"
|
|
||||||
@confirm="addPickBarOnConfirm"
|
|
||||||
></u-datetime-picker>
|
|
||||||
<u-button @click="addStartPickBarShow = true">起始时间：{{ addTimeStartStr == '' ? '请选择起始时间...' : addTimeStartStr }}</u-button>
|
|
||||||
<u-datetime-picker
|
|
||||||
:show="addEndPickBarShow"
|
|
||||||
v-model="addTimeEnd"
|
|
||||||
mode="date"
|
|
||||||
@close="addPickBarOnClose('end')"
|
|
||||||
@cancel="addPickBarOnCancel('end')"
|
|
||||||
@confirm="addPickBarOnConfirm"
|
|
||||||
></u-datetime-picker>
|
|
||||||
<u-button @click="addEndPickBarShow = true">结束时间：{{ addTimeEndStr == '' ? '请选择结束时间...' : addTimeEndStr }}</u-button>
|
|
||||||
<u-toast ref="uToast"></u-toast>
|
|
||||||
<view class="u-page">
|
|
||||||
<view class="u-demo-block">
|
|
||||||
<view class="u-demo-block__content">
|
|
||||||
<u-row customStyle="margin-bottom: 10px">
|
|
||||||
<u-col span="6">
|
|
||||||
<view class="demo-layout bg-purple-light">
|
|
||||||
<u-button @click="resetAdvancedParam">重置</u-button>
|
|
||||||
</view>
|
|
||||||
</u-col>
|
|
||||||
<u-col span="6">
|
|
||||||
<view class="demo-layout bg-purple">
|
|
||||||
<u-button @click="advancedSearch">搜索</u-button>
|
|
||||||
</view>
|
|
||||||
</u-col>
|
|
||||||
</u-row>
|
|
||||||
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
|
|
||||||
</view>
|
|
||||||
</u-popup>
|
|
||||||
>>>>>>> remotes/origin/pet
|
|
||||||
<view class="message_list">
|
<view class="message_list">
|
||||||
<u-list @scrolltolower="scrolltolower" v-if="list.length > 0">
|
<u-list @scrolltolower="scrolltolower" v-if="list.length > 0">
|
||||||
<u-list-item v-for="(item, index) in list" :key="index">
|
<u-list-item v-for="(item, index) in list" :key="index">
|
||||||
|
|
@ -224,17 +173,10 @@ export default {
|
||||||
|
|
||||||
},
|
},
|
||||||
// 高级搜索弹窗关闭函数
|
// 高级搜索弹窗关闭函数
|
||||||
<<<<<<< HEAD
|
|
||||||
popupClose() {
|
popupClose() {
|
||||||
this.popupShow = false
|
this.popupShow = false
|
||||||
|
|
||||||
},
|
},
|
||||||
=======
|
|
||||||
popupClose() {
|
|
||||||
this.popupShow = false
|
|
||||||
|
|
||||||
},
|
|
||||||
>>>>>>> remotes/origin/pet
|
|
||||||
// 高级搜索日期选择器关闭回调
|
// 高级搜索日期选择器关闭回调
|
||||||
addPickBarOnClose(type) {
|
addPickBarOnClose(type) {
|
||||||
switch (type) {
|
switch (type) {
|
||||||
|
|
@ -270,11 +212,7 @@ export default {
|
||||||
this.$refs.uToast.show({message:'日期选择参数错误',duration:1000})
|
this.$refs.uToast.show({message:'日期选择参数错误',duration:1000})
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
<<<<<<< HEAD
|
|
||||||
// 清除高级搜索内的起始日期、结束日期组件绑定的时间属性（时间戳类型）；清除根据时间戳格式化的文本日期
|
// 清除高级搜索内的起始日期、结束日期组件绑定的时间属性（时间戳类型）；清除根据时间戳格式化的文本日期
|
||||||
=======
|
|
||||||
// 清除高级搜索内的起始日期、结束日期组件绑定的时间属性（时间戳类型）；清除根据时间戳格式化的文本日期
|
|
||||||
>>>>>>> remotes/origin/pet
|
|
||||||
resetAllAddTime() {
|
resetAllAddTime() {
|
||||||
this.addTimeStart = Number(new Date())
|
this.addTimeStart = Number(new Date())
|
||||||
this.addTimeEnd = Number(new Date())
|
this.addTimeEnd = Number(new Date())
|
||||||
|
|
@ -291,11 +229,7 @@ export default {
|
||||||
const toast = uni.$u.toast
|
const toast = uni.$u.toast
|
||||||
// 日期合法判定
|
// 日期合法判定
|
||||||
if (this.addTimeStartStr > this.addTimeEndStr){
|
if (this.addTimeStartStr > this.addTimeEndStr){
|
||||||
<<<<<<< HEAD
|
|
||||||
// 包含两种case：case1 开始时间 > 结束时间；case2 开始时间有值，结束时间为空
|
// 包含两种case：case1 开始时间 > 结束时间；case2 开始时间有值，结束时间为空
|
||||||
=======
|
|
||||||
// 包含两种case：case1 开始时间 > 结束时间；case2 开始时间有值，结束时间为空
|
|
||||||
>>>>>>> remotes/origin/pet
|
|
||||||
this.$refs.uToast.show({message:'日期不合法',duration:1000})
|
this.$refs.uToast.show({message:'日期不合法',duration:1000})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue