diff --git a/components/uni-drawer/uni-drawer.vue b/components/uni-drawer/uni-drawer.vue
new file mode 100644
index 0000000..ab92a3d
--- /dev/null
+++ b/components/uni-drawer/uni-drawer.vue
@@ -0,0 +1,166 @@
+<template>
+	<view v-if="visibleSync" :class="{ 'uni-drawer--visible': showDrawer }" class="uni-drawer" @touchmove.stop.prevent="clear">
+		<view class="uni-drawer__mask" :class="{ 'uni-drawer__mask--visible': showDrawer && mask }" @tap="close('mask')" />
+		<view class="uni-drawer__content" :class="{'uni-drawer--right': rightMode,'uni-drawer--left': !rightMode, 'uni-drawer__content--visible': showDrawer}" :style="[{width:drawerWidth+'px'},{top:StatusBar + 'px'}]">
+			<slot />
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * Drawer 抽屉
+	 * @description 抽屉侧滑菜单
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=26
+	 * @property {Boolean} mask = [true | false] 是否显示遮罩
+	 * @property {Boolean} maskClick = [true | false] 点击遮罩是否关闭
+	 * @property {Boolean} mode = [left | right] Drawer 滑出位置
+	 * 	@value left 从左侧滑出
+	 * 	@value right 从右侧侧滑出
+	 * @property {Number} width 抽屉的宽度 ，仅 vue 页面生效
+	 * @event {Function} close 组件关闭时触发事件
+	 */
+	export default {
+		name: 'UniDrawer',
+		props: {
+			/**
+			 * 显示模式（左、右），只在初始化生效
+			 */
+			mode: {
+				type: String,
+				default: ''
+			},
+			/**
+			 * 蒙层显示状态
+			 */
+			mask: {
+				type: Boolean,
+				default: true
+			},
+			/**
+			 * 遮罩是否可点击关闭
+			 */
+			maskClick: {
+				type: Boolean,
+				default: true
+			},
+			/**
+			 * 抽屉宽度
+			 */
+			width: {
+				type: Number,
+				default: 300
+			}
+		},
+		data() {
+			return {
+				StatusBar: this.StatusBar,
+				visibleSync: false,
+				showDrawer: false,
+				rightMode: false,
+				watchTimer: null,
+				drawerWidth: 300
+			}
+		},
+		created() {
+			// #ifndef APP-NVUE
+			this.drawerWidth = this.width
+			// #endif
+			this.rightMode = this.mode === 'right'
+		},
+		methods: {
+			clear() {},
+			close(type) {
+				// fixed by mehaotian 抽屉尚未完全关闭或遮罩禁止点击时不触发以下逻辑
+				if ((type === 'mask' && !this.maskClick) || !this.visibleSync) return
+				this._change('showDrawer', 'visibleSync', false)
+			},
+			open() {
+				// fixed by mehaotian 处理重复点击打开的事件
+				if (this.visibleSync) return
+				this._change('visibleSync', 'showDrawer', true)
+			},
+			_change(param1, param2, status) {
+				this[param1] = status
+				if (this.watchTimer) {
+					clearTimeout(this.watchTimer)
+				}
+				this.watchTimer = setTimeout(() => {
+					this[param2] = status
+					this.$emit('change', status)
+				}, status ? 50 : 300)
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.uni-drawer {
+		/* #ifndef APP-NVUE */
+		display: block;
+		/* #endif */
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		overflow: hidden;
+		z-index: 999;
+	}
+
+	.uni-drawer__content {
+		/* #ifndef APP-NVUE */
+		display: block;
+		/* #endif */
+		position: absolute;
+		/* top: 0; */
+		bottom: 0;
+		background-color: #ffffff;
+		transition: transform 0.3s ease;
+	}
+
+	.uni-drawer--left {
+		left: 0;
+		/* #ifdef APP-NVUE */
+		transform: translateX(-220px);
+		/* #endif */
+		/* #ifndef APP-NVUE */
+		transform: translateX(-100%);
+		/* #endif */
+	}
+
+	.uni-drawer--right {
+		right: 0;
+		/* #ifdef APP-NVUE */
+		transform: translateX(220px);
+		/* #endif */
+		/* #ifndef APP-NVUE */
+		transform: translateX(100%);
+		/* #endif */
+	}
+
+	.uni-drawer__content--visible {
+		transform: translateX(0px);
+	}
+
+	.uni-drawer__mask {
+		/* #ifndef APP-NVUE */
+		display: block;
+		/* #endif */
+		opacity: 0;
+		position: absolute;
+		top: 0;
+		left: 0;
+		bottom: 0;
+		right: 0;
+		background-color: rgba(0, 0, 0, 0.4);
+		transition: opacity 0.3s;
+	}
+
+	.uni-drawer__mask--visible {
+		/* #ifndef APP-NVUE */
+		display: block;
+		/* #endif */
+		opacity: 1;
+	}
+</style>
diff --git a/pages/mine/promise/promise.vue b/pages/mine/promise/promise.vue
index b2946fd..ebfa7cc 100644
--- a/pages/mine/promise/promise.vue
+++ b/pages/mine/promise/promise.vue
@@ -6,56 +6,6 @@
         itemStyle="height:80upx;padding-bottom:10upx;background-color: #fff;"
         @click="tabsClick"
     ></u-tabs>
-<<<<<<< HEAD
-	<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>
-=======
 		<view class="container">
 			<u-sticky offset-top="200">
 				<u-button type="primary" text="高级搜索" @click="popupOpen" style="height: 30px;"></u-button>
@@ -104,7 +54,6 @@
 				
 			</view>
 		</u-popup>
->>>>>>> remotes/origin/pet
     <view class="message_list">
       <u-list @scrolltolower="scrolltolower" v-if="list.length > 0">
         <u-list-item v-for="(item, index) in list" :key="index">
@@ -224,17 +173,10 @@ export default {
 	  
 	},
 	// 高级搜索弹窗关闭函数
-<<<<<<< HEAD
-    popupClose() {
-	  this.popupShow = false
-	  
-    },
-=======
 	popupClose() {
 	  this.popupShow = false
 	  
 	},
->>>>>>> remotes/origin/pet
 	// 高级搜索日期选择器关闭回调
 	addPickBarOnClose(type) {
 		switch (type) {
@@ -270,11 +212,7 @@ export default {
 				this.$refs.uToast.show({message:'日期选择参数错误',duration:1000})
 		}
 	},
-<<<<<<< HEAD
-	// 清除高级搜索内的起始日期、结束日期组件绑定的时间属性（时间戳类型）；清除根据时间戳格式化的文本日期
-=======
 		// 清除高级搜索内的起始日期、结束日期组件绑定的时间属性（时间戳类型）；清除根据时间戳格式化的文本日期
->>>>>>> remotes/origin/pet
 	resetAllAddTime() {
 		this.addTimeStart = Number(new Date())
 		this.addTimeEnd = Number(new Date())
@@ -291,11 +229,7 @@ export default {
 		const toast = uni.$u.toast
 		// 日期合法判定
 		if (this.addTimeStartStr > this.addTimeEndStr){
-<<<<<<< HEAD
-			// 包含两种case：case1 开始时间 > 结束时间；case2 开始时间有值，结束时间为空
-=======
 				// 包含两种case：case1 开始时间 > 结束时间；case2 开始时间有值，结束时间为空
->>>>>>> remotes/origin/pet
 			this.$refs.uToast.show({message:'日期不合法',duration:1000})
 			return
 		}