1.新增列表商户号

pages/index/normal-Merchant/normal-Merchant.vue

@@ -1,5 +1,10 @@
 <template>
 	<view>
+		<view class="input-box">
+			<view class="icon search"></view>
+			<input placeholder="请输入商户名称" v-model="mersearchName" placeholder-style="color:#c0c0c0;"
+				@input="getMerListBySalesman()" />
+		</view>
 		<view class="mart20 width100">
 			<view v-if="merchantlist == '' " class="mart60 fotct font14 fcor666">
 				<image mode="widthFix" style="width: 70vw;" src="../../../static/img/noorder.png"></image>
@@ -16,10 +21,10 @@
 						</view>
 					</view>
 					<!-- <view class="statucs font14">正常</view> -->
-				</view>
+				</view>
-				<view class="notes" style="padding-top: 5px;padding-bottom: 5px;">
+				<view class="notes" style="padding-top: 5px;padding-bottom: 5px;">
-					<view class="width30 fcor333 font15">商户号</view>
+					<view class="width30 fcor333 font15">商户号</view>
-					<view class="width30 fcor999 font15">{{item.merNo}}</view>
+					<view class="width30 fcor999 font15">{{item.merNo}}</view>
 				</view>
 				<view class="notes" style="padding-top: 5px;padding-bottom: 5px;">
 					<view class="width30 fcor333 font15">联系人</view>
@@ -48,6 +53,7 @@
 				pageNum: 1,
 				pagesize: 10,
 				isLoadMore: false, //是否加载中
+				mersearchName: '' //搜索商户
 			}
 		},
 		onShow() {
@@ -64,18 +70,20 @@
 		},
 		methods: {
 			//查询商户列表
-			getMerListBySalesman() {
+			getMerListBySalesman() {
+				this.merchantlist = [];
 				uni.showLoading({
 					title: '加载中'
 				})
 				let datas = {
 					merStatus: 1,
+					merName: this.mersearchName,
 					pageNum: this.pageNum,
 					pageSize: this.pagesize,
 				}
 				getMerListBySalesman(datas).then(res => {
 					uni.hideLoading();
-					if (res.return_code == '000000' && res.return_data.list) {
+					if (res.return_code == '000000' && res.return_data.list !='') {
 						this.merchantlist = this.merchantlist.concat(res.return_data.list);
 						if (res.return_data.pages == this.pageNum) {
 							this.isLoadMore = true;
@@ -83,6 +91,7 @@
 							this.isLoadMore = false
 						}
 					} else {
+						this.merchantlist = [];
 						this.isLoadMore = true
 					}
 				});
@@ -135,6 +144,38 @@
 		background-color: #f6f6f6;
 	}
 
+	.input-box {
+		width: 90%;
+		margin-left: 5%;
+		margin-top: 15px;
+		margin-bottom: 15px;
+		height: 70rpx;
+		background-color: #fff;
+		border-radius: 10rpx;
+		position: relative;
+		display: flex;
+		align-items: center;
+
+		.icon {
+			display: flex;
+			align-items: center;
+			position: absolute;
+			top: 2px;
+			left: 5px;
+			width: 60upx;
+			height: 60upx;
+			font-size: 34upx;
+			color: #c0c0c0;
+		}
+
+		input {
+			padding-left: 50upx;
+			height: 28upx;
+			font-size: 28upx;
+			width: 100%;
+		}
+	}
+
 	.notes {
 		width: calc(100% - 40upx);
 		display: flex;