调整商户管理

src/pages/xy_merc_be/mercManager/merc.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="container">
-		<u-navbar title="商户管理" @rightClick="rightClick" titleStyle="color:#fff;fontSize:36rpx;" bgColor="#2C6FF3"
-			:autoBack="true" leftIconColor="#fff" :placeholder="true">
+		<u-navbar title="商户管理" titleStyle="color:#fff;fontSize:36rpx;" bgColor="#2C6FF3" :autoBack="true"
+			leftIconColor="#fff" :placeholder="true">
 		</u-navbar>
 
 		<view class="content">
@@ -89,10 +89,10 @@
 			</scroll-view>
 		</view>
 
-		<u-popup :show="searchMenu.showPopMenu" duration="0" :customStyle="searchMenu.style" :round="10" mode="right"
-			:duration="300" :overlay="false">
+		<u-popup :show="searchMenu.showPopMenu" :customStyle="searchMenu.style" mode="right" closeOnClickOverlay
+			@close="close">
 			<view class="searchMenu popMenu flex" :style="searchMenu.searchMenu_body_style">
-				<scroll-view scroll-y class="searchMenu_body flex-wrap justify-between">
+				<view class="search-box">
 					<view>
 						<view class="label">
 							商户名称编号
@@ -126,32 +126,34 @@
 							机器ID号查找商家
 						</view>
 						<view class="flex flex-wrap justify-between">
-							<view class="flex">
+							<view>
 								<u--input placeholder="机器ID号" border="surround"
 									v-model="searchMenu.params.deviceId"></u--input>
 							</view>
-							<view class="flex">
-								<u-button size="normal" :plain="true" text="查找" @click="doSearchMerc()"></u-button>
+							<view>
+								<u-button size="normal" :plain="true" text="查找" @click="doSearchMerc"></u-button>
 							</view>
-
 						</view>
 					</view>
+				</view>
+
+				<scroll-view scroll-y class="searchMenu_body flex-wrap justify-between">
 					<view class="eq-item" v-for="(item2,index1) in searchMenu.dataList" :key="item2.id">
 						<view class=" flex flex-wrap justify-between">
-							<view class="simple_merc" @tap="searchMenu.params.searchKey=item2.name">
+							<view class="simple_merc" @click="selectMerc(item2)">
 								{{item2.name}}/{{item2.mercCode}}
 							</view>
-							<!--              <view>-->
-							<!--                <u-button size="mini" :plain="true" text="选择" @click="searchMenu.params.searchKey=item2.name"></u-button>-->
-							<!--              </view>-->
+							<!-- <view>
+								<u-button size="mini" :plain="true" text="选择"
+									@click="searchMenu.params.searchKey=item2.name"></u-button>
+							</view> -->
 						</view>
 					</view>
-
 				</scroll-view>
-				<view class="searchMenu_bottom ">
+				<view class="searchMenu_bottom">
 					<view class="flex flex-wrap justify-between">
 						<view>
-							<u-button size="normal" :plain="true" text="关闭" @click="doSearch(0)"></u-button>
+							<u-button size="normal" :plain="true" text="关闭" @click="close"></u-button>
 						</view>
 
 						<view class="flex">
@@ -160,7 +162,7 @@
 									@click="resetSearchMenu"></u-button>
 							</view>
 							<view style="margin-left: 20rpx">
-								<u-button size="normal" type="primary" text="查找" @click="doSearch(1)"></u-button>
+								<u-button size="normal" type="primary" text="查找" @click="search"></u-button>
 							</view>
 						</view>
 					</view>
@@ -226,14 +228,15 @@
 		searchMenu.params.contactPhone = undefined;
 	}
 
-	function doSearch(o) {
-		if (o == 0) resetSearchMenu();
+	function close() {
+		searchMenu.showPopMenu = false;
+		resetSearchMenu()
+	}
 
-		setTimeout(function() {
-			searchMenu.showPopMenu = false;
-			data.curPage = 1;
-			getList()
-		}, 500);
+	function search() {
+		searchMenu.showPopMenu = false;
+		data.curPage = 1;
+		getList()
 	}
 
 	const data = reactive({
@@ -356,7 +359,6 @@
 
 	function doSearchMerc() {
 		return new Promise((resolve, reject) => {
-
 			proxy.$request({
 				url: searchMenu.reqUrls.searchMerc,
 				data: {
@@ -366,13 +368,18 @@
 			}).then(data => {
 				searchMenu.dataList = data;
 				console.log('机器号查找商户', searchMenu.dataList)
-				resolve(res)
+				resolve(data)
 			}).catch(err => {
 				reject(err)
 			})
 		})
 	}
 
+	function selectMerc(item) {
+		searchMenu.params.searchKey = item.name
+		search()
+	}
+
 	function gotoMerc(merc) {
 		proxy.$request({
 			url: data.reqUrls.token,
@@ -402,10 +409,6 @@
 		})
 		//proxy.$tab.navigateTo(`/pages/xy_system/devices/deviceDetail?id=${o}`)
 	}
-
-	function rightClick() {
-		console.log('点击了右侧')
-	}
 </script>
 
 <style lang="scss" scoped>
@@ -439,6 +442,7 @@
 			.searchMenu_body {
 				overflow-y: scroll;
 				margin-bottom: 100rpx;
+				padding-top: 20rpx;
 			}
 
 			.label {
@@ -451,7 +455,7 @@
 				width: 100%;
 				padding: 20rpx;
 				position: absolute;
-				bottom: 0rpx;
+				bottom: 20rpx;
 				left: 0;
 			}
 		}