From e0d29a0ac043cdf3c3b96ba6a1ddd97ca9fb36d1 Mon Sep 17 00:00:00 2001
From: youmengting <2080639302@qq.com>
Date: Tue, 2 Jan 2024 16:33:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=86=E9=A1=B5=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82=E9=80=BB=E8=BE=91=E4=BB=A5=E5=8F=8A=E5=8F=98=E9=87=8F?=
 =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E5=86=99=E9=94=99=E8=AF=AF=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/bindScan/bindScan.vue             | 63 +++++++++++--------
 .../equity-activities-details.vue             | 27 ++++----
 .../equity-activities/equity-activities.vue   |  8 +--
 .../index/normal-Merchant/normal-Merchant.vue | 27 ++++----
 pages/index/scanList/scanList.vue             | 29 +++++----
 5 files changed, 85 insertions(+), 69 deletions(-)

diff --git a/pages/index/bindScan/bindScan.vue b/pages/index/bindScan/bindScan.vue
index 424be23..a0c66e6 100644
--- a/pages/index/bindScan/bindScan.vue
+++ b/pages/index/bindScan/bindScan.vue
@@ -34,7 +34,7 @@
 			return {
 				serviceList: [],
 				pageNum: 1,
-				pagesize: 15,
+				pageSize: 15,
 				isLoadMore: false, //是否加载中
 				userInfo: app.globalData.userInfo, //用户信息
 				typeId: '', //类型
@@ -43,14 +43,10 @@
 			}
 		},
 		onReachBottom() { //上拉触底函数
-			if (!this.isLoadMore) { //此处判断，上锁，防止重复请求
-				this.isLoadMore = true
-				this.pageNum += 1
-				if (this.typeId == 2) {
-					this.getStoreQrCodeList();
-				} else {
-					this.getSalesmanQrCodeList();
-				}
+			if (this.typeId == 2) {
+				this.getStoreQrCodeList();
+			} else {
+				this.getSalesmanQrCodeList();
 			}
 		},
 		onLoad(options) {
@@ -68,7 +64,6 @@
 		methods: {
 			toSearch() {
 				this.pageNum = 1;
-				this.pageSize = 10;
 				this.isLoadMore = false;
 				this.serviceList = [];
 				if (this.typeId == 2) {
@@ -79,59 +74,75 @@
 			},
 			//门店查询设备列表
 			getStoreQrCodeList() {
+				if (this.isLoadMore) {
+					return false;
+				}
+				
 				uni.showLoading({
 					title: '加载中...'
 				})
 				let params = {
 					pageNum: this.pageNum,
-					pageSize: this.pagesize,
+					pageSize: this.pageSize,
 					serialNumber: this.scanNo,
 					storeId: this.storeId
 				}
 				getStoreQrCodeList(params).then(res => {
 					uni.hideLoading();
 					if (res.return_code == '000000' && res.return_data.list) {
-						this.isLoadMore = res.return_data.list.length == this.pageSize ? false : true;
 						this.serviceList = this.serviceList.concat(res.return_data.list);
-						if (res.return_data.total == (this.pageNum * this.pageSize)) {
+						if (res.return_data.total == this.serviceList.length) {
 							this.isLoadMore = true;
+						}else{
+							this.isLoadMore = false;
 						}
-						this.pageNum = res.return_data.list.length == this.pageSize ? ++pagenum : pagenum;
+						this.pageNum = this.pageNum + 1;
 					} else {
 						this.serviceList = [];
-						this.isLoadMore = true
+						this.isLoadMore = true;
+						uni.showToast({
+							title: res.return_msg,
+							icon: 'none',
+							duration: 2000
+						})
 					}
 				});
 			},
 			//业务员查询设备列表
 			getSalesmanQrCodeList() {
-				uni.showLoading({
-					title: '加载中...'
-				})
 				if (this.isLoadMore) {
-					uni.hideLoading()
 					return false;
 				}
-				let pagenum = this.pageNum;
+				uni.showLoading({
+					title: '加载中...'
+				})
+
 				let datas = {
 					salesmanId: this.userInfo.salesman.id,
 					isAssignStore: false,
 					serialNumber: this.scanNo,
-					pageNum: pagenum,
-					pageSize: this.pagesize,
+					pageNum: this.pageNum,
+					pageSize: this.pageSize,
 				}
 				getSalesmanQrCodeList(datas).then(res => {
 					uni.hideLoading();
 					if (res.return_code == '000000' && res.return_data.list) {
-						this.isLoadMore = res.return_data.list.length == this.pageSize ? false : true;
 						this.serviceList = this.serviceList.concat(res.return_data.list);
-						if (res.return_data.total == (this.pageNum * this.pageSize)) {
+						if (res.return_data.total == this.serviceList.length) {
 							this.isLoadMore = true;
+						}else{
+							this.isLoadMore = false;
 						}
-						this.pageNum = res.return_data.list.length == this.pageSize ? ++pagenum : pagenum;
+						this.pageNum = this.pageNum + 1;
+						
 					} else {
 						this.serviceList = [];
-						this.isLoadMore = true
+						this.isLoadMore = true;
+						uni.showToast({
+							title: res.return_msg,
+							icon: 'none',
+							duration: 2000
+						})
 					}
 				});
 			},
diff --git a/pages/index/equity-activities-details/equity-activities-details.vue b/pages/index/equity-activities-details/equity-activities-details.vue
index 2ef26b2..2b7eb30 100644
--- a/pages/index/equity-activities-details/equity-activities-details.vue
+++ b/pages/index/equity-activities-details/equity-activities-details.vue
@@ -22,19 +22,20 @@
 		<view class="width90 mart20 marb15 fcor333 fontwig6 font16" v-if="activitydetails.bankActivityRoster ==null">
 			商户信息
 		</view>
-		
-		<view class="username">
-			<view class="namecont">商户名称</view>
-			<view class="font14 fcor333 text2 width75 fotrt">{{merDetailInfo.mer.merName}}</view>
-		</view>
-		<view class="username">
-			<view class="namecont">支行名称</view>
-			<view class="font14 fcor333 text2 width75 fotrt">{{merDetailInfo.mer.merSettleAcct.openningBankName}}</view>
-		</view>
-		<view class="username">
-			<view class="namecont">支行行号</view>
-			<view class="font14 fcor333 text2 width75 fotrt">{{merDetailInfo.mer.merSettleAcct.openningBankCode}}</view>
-		</view>
+		<template v-if="merDetailInfo">
+			<view class="username">
+				<view class="namecont">商户名称</view>
+				<view class="font14 fcor333 text2 width75 fotrt">{{merDetailInfo.mer.merName}}</view>
+			</view>
+			<view class="username">
+				<view class="namecont">支行名称</view>
+				<view class="font14 fcor333 text2 width75 fotrt">{{merDetailInfo.mer.merSettleAcct.openningBankName}}</view>
+			</view>
+			<view class="username">
+				<view class="namecont">支行行号</view>
+				<view class="font14 fcor333 text2 width75 fotrt">{{merDetailInfo.mer.merSettleAcct.openningBankCode}}</view>
+			</view>
+		</template>
 		<!-- <view class="username">
 			<view class="namecont">银行地址</view>
 			<pickRegions :defaultRegion="defaultRegionCodes" class="width70" @getRegion="handleBankCityCode">
diff --git a/pages/index/equity-activities/equity-activities.vue b/pages/index/equity-activities/equity-activities.vue
index 6183f4a..728c0d2 100644
--- a/pages/index/equity-activities/equity-activities.vue
+++ b/pages/index/equity-activities/equity-activities.vue
@@ -59,8 +59,7 @@
 					}
 				], //状态
 				activityList: [], //权益活动列表
-				pageNum: 1,
-				pagesize: 15,
+
 				statusid: 1, //当前状态
 				isLoadMore: false, //是否加载中
 				merId: '' // 商户id
@@ -68,17 +67,12 @@
 		},
 		onLoad(options) {
 			this.merId = options.id;
-		},
-		onShow() {
-			this.pageNum = 1;
-			this.activityList = [];
 			this.queryActivityList();
 		},
 		methods: {
 			//切换id
 			switchid(item) {
 				this.statusid = item.id;
-				this.pageNum = 1;
 			},
 			//查询活动列表
 			queryActivityList() {
diff --git a/pages/index/normal-Merchant/normal-Merchant.vue b/pages/index/normal-Merchant/normal-Merchant.vue
index 227e2de..0ff0117 100644
--- a/pages/index/normal-Merchant/normal-Merchant.vue
+++ b/pages/index/normal-Merchant/normal-Merchant.vue
@@ -5,7 +5,7 @@
 			<input placeholder="请输入商户名称" v-model="mersearchName" placeholder-style="color:#c0c0c0;"
 				@input="getMerListBySalesman()" />
 		</view>
-		<view class="mart20 width100">
+		<view class="paddbotm10 width100 ">
 			<view v-if="merchantlist == '' " class="mart60 fotct font14 fcor666">
 				<image mode="widthFix" style="width: 70vw;" src="../../../static/img/noorder.png"></image>
 			</view>
@@ -50,7 +50,7 @@
 			return {
 				merchantlist: [],
 				pageNum: 1,
-				pagesize: 10,
+				pageSize: 10,
 				isLoadMore: false, //是否加载中
 				mersearchName: '' //搜索商户
 			}
@@ -58,19 +58,18 @@
 		onShow() {
 			this.merchantlist = [];
 			this.pageNum = 1;
+			this.isLoadMore = false;
 			this.getMerListBySalesman();
 		},
 		onReachBottom() { //上拉触底函数
-			if (!this.isLoadMore) { //此处判断，上锁，防止重复请求
-				this.isLoadMore = true
-				this.pageNum += 1
-				this.getMerListBySalesman()
-			}
+			this.getMerListBySalesman()
 		},
 		methods: {
 			//查询商户列表
 			getMerListBySalesman() {
-				this.merchantlist = [];
+				if(this.isLoadMore){
+					return
+				}
 				uni.showLoading({
 					title: '加载中'
 				})
@@ -78,7 +77,7 @@
 					merStatus: 1,
 					merName: this.mersearchName,
 					pageNum: this.pageNum,
-					pageSize: this.pagesize,
+					pageSize: this.pageSize,
 				}
 				getMerListBySalesman(datas).then(res => {
 					uni.hideLoading();
@@ -87,11 +86,17 @@
 						if (res.return_data.pages == this.pageNum) {
 							this.isLoadMore = true;
 						} else {
-							this.isLoadMore = false
+							this.isLoadMore = false;
 						}
+						this.pageNum = this.pageNum+1;
 					} else {
 						this.merchantlist = [];
-						this.isLoadMore = true
+						this.isLoadMore = true;
+						uni.showToast({
+							title: res.return_msg,
+							icon: 'none',
+							duration: 2000
+						})
 					}
 				});
 			},
diff --git a/pages/index/scanList/scanList.vue b/pages/index/scanList/scanList.vue
index 66bedeb..91ce04a 100644
--- a/pages/index/scanList/scanList.vue
+++ b/pages/index/scanList/scanList.vue
@@ -36,7 +36,7 @@
 			return {
 				serviceList: [],
 				pageNum: 1,
-				pagesize: 15,
+				pageSize: 15,
 				isLoadMore: false, //是否加载中
 				userInfo: app.globalData.userInfo, //用户信息
 				scanNo: '' ,// 二维码编号
@@ -44,11 +44,12 @@
 			}
 		},
 		onReachBottom() { //上拉触底函数
-			if (!this.isLoadMore) { //此处判断，上锁，防止重复请求
-				this.isLoadMore = true
-				this.pageNum += 1
-				this.getStoreQrCodeList();
-			}
+			// if (!this.isLoadMore) { //此处判断，上锁，防止重复请求
+			// 	this.isLoadMore = true
+			// 	this.pageNum += 1
+			// 	this.getStoreQrCodeList();
+			// }
+			this.getStoreQrCodeList();
 		},
 		onLoad(options) {
 			this.getStoreQrCodeList();
@@ -56,7 +57,6 @@
 		methods: {
 			toSearch() {
 				this.pageNum = 1;
-				this.pageSize = 10;
 				this.isLoadMore = false;
 				this.serviceList = [];
 				this.getStoreQrCodeList();
@@ -68,21 +68,26 @@
 				})
 				let params = {
 					pageNum: this.pageNum,
-					pageSize: this.pagesize,
+					pageSize: this.pageSize,
 					serialNumber: this.scanNo,
 					storeId: this.userInfo.store.id
 				}
 				getStoreQrCodeList(params).then(res => {
 					uni.hideLoading();
 					if (res.return_code == '000000' && res.return_data.list) {
-						this.receiverList = this.receiverList.concat(res.return_data.list);
+						this.serviceList = this.serviceList.concat(res.return_data.list);
 						if (res.return_data.pages == this.pageNum) {
 							this.isLoadMore = true;
 						} else {
 							this.isLoadMore = false
-						}
-					} else {
-						this.isLoadMore = true
+						}
+						this.pageNum = this.pageNum+1;
+					} else {
+						uni.showToast({
+							title: res.return_msg,
+							icon: 'none',
+							duration: 2000
+						})
 					}
 				});
 			},