认证才能进行部分功能

h5_web/.gitignore

@@ -14,6 +14,7 @@ selenium-debug.log
 .idea
 .vscode
 .hbuilderx
+.history
 *.suo
 *.ntvs*
 *.njsproj

h5_web/components/judge-auth/judge-auth.vue

@@ -0,0 +1,50 @@
+<template>
+  <u-modal
+    v-model="show"
+    :content="content"
+    :show-cancel-button="true"
+    @cancel="cancel"
+    @confirm="confirm"
+  ></u-modal>
+</template>
+
+<script>
+export default {
+  name: 'judgeAuth',
+  props: {
+    content: {
+      type: String,
+      default: '你还没有认证，该功能需要认证后才能使用?'
+    }
+  },
+  data() {
+    return {
+      show: false
+    };
+  },
+  methods: {
+    /**
+     * @param {Object} bool
+     */
+    modalShow(bool) {
+      this.show = bool;
+    },
+    /**
+     * 取消
+     */
+    cancel() {},
+    /**
+     * 确认
+     */
+    confirm() {
+      this.show = false;
+      uni.navigateTo({
+        url: '/pages/applyEducationCode/applyEducationCode'
+      });
+    }
+  }
+};
+</script>
+
+<style>
+</style>

h5_web/manifest.json

@@ -70,8 +70,8 @@
     },
     "h5" : {
         "router" : {
-            "mode" : "hash",
-            "base" : ""
+            "mode" : "history",
+            "base" : "/"
         },
         "template" : "template.h5.html",
         "devServer" : {

h5_web/package.json

@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "xgplayer": "^2.31.6"
+  }
+}

h5_web/pages/basicTraining/basicTraining.vue

@@ -67,6 +67,7 @@
 		<view class="study-status" v-if="tabIndex === 0">学习状态：{{ online.status === 0 ? '未完成' : '已完成' }}</view>
 		<view class="study-status" v-if="tabIndex === 1">学习状态：{{ offlineStatus === 0 ? '未完成' : '已完成'}}</view>
 		<u-toast ref="uToast" />
+		<judge-auth ref="judgeAuth" />
 	</view>
 </template>
 
@@ -174,7 +175,11 @@
 					if (type === 1) {
 						this.jumpPage('pages/basicTraining/offlineTrainingDetails/offlineTrainingDetails', { id: item.id })
 					} else {
-						this.jumpPage('/pages/basicTraining/onlineTrainingDetails/onlineTrainingDetails', { id: item.id })
+						if (Number(this.vuex_memberInfo.auditStatus) === 2) {
+							this.jumpPage('/pages/basicTraining/onlineTrainingDetails/onlineTrainingDetails', { id: item.id })
+						} else {
+							this.$refs['judgeAuth'].modalShow(true)
+						}
 					}
 				})
 			}

h5_web/pages/entrepreneurshipGuidelines/entrepreneurshipGuidelines.vue

@@ -1,80 +1,110 @@
 <!-- 创业指引 -->
 <template>
-	<view class="entrepreneurship">
-		<u-navbar back-text="" title="" back-icon-color="#FFFFFF" :background="{ background: '#3D5D4C' }" :border-bottom="false"></u-navbar>
-		<z-paging ref="paging" v-model="list" @query="queryList">
-			<view class="entrepreneurship-list">
-				<view class="entrepreneurship-list-item" v-for="(item, index) in list" :key="index" @click="jumpPage('pages/entrepreneurshipGuidelines/planDetails/planDetails', { id: item.id })">
-					<view class="entrepreneurship-list-item-title">{{ item.title }}</view>
-					<view class="entrepreneurship-list-item-content">
-						<u-parse :html="item.description" @imgtap="imageTap"></u-parse>
-					</view>
-					<view class="entrepreneurship-list-item-bottom">
-						<view class="left" :class="item.replyStatus === 0 ? 'waiting' : 'had'">{{ item.replyStatus === 0 ? '待专家回复' : '专家已回复' }}</view>
-						<view class="right">{{ item.createTime | date('yyyy-mm-dd hh:MM:ss') }} 提交</view>
-					</view>
-				</view>
-			</view>
-		</z-paging>
-		<view class="bottom-btn">
-			<view class="bottom-btn-box" @click="jumpPage('pages/entrepreneurshipGuidelines/addPlan/addPlan')">提交创业计划</view>
-		</view>
-		<u-toast ref="uToast" />
-	</view>
+  <view class="entrepreneurship">
+    <u-navbar
+      back-text=""
+      title=""
+      back-icon-color="#FFFFFF"
+      :background="{ background: '#3D5D4C' }"
+      :border-bottom="false"
+    ></u-navbar>
+    <z-paging ref="paging" v-model="list" @query="queryList">
+      <view class="entrepreneurship-list">
+        <view
+          class="entrepreneurship-list-item"
+          v-for="(item, index) in list"
+          :key="index"
+          @click="jumpPage('pages/entrepreneurshipGuidelines/planDetails/planDetails', { id: item.id })"
+        >
+          <view class="entrepreneurship-list-item-title">{{ item.title }}</view>
+          <view class="entrepreneurship-list-item-content">
+            <u-parse :html="item.description" @imgtap="imageTap"></u-parse>
+          </view>
+          <view class="entrepreneurship-list-item-bottom">
+            <view
+              class="left"
+              :class="item.replyStatus === 0 ? 'waiting' : 'had'"
+            >{{ item.replyStatus === 0 ? '待专家回复' : '专家已回复' }}</view>
+            <view class="right">{{ item.createTime | date('yyyy-mm-dd hh:MM:ss') }} 提交</view>
+          </view>
+        </view>
+      </view>
+    </z-paging>
+    <view class="bottom-btn">
+      <view
+        class="bottom-btn-box"
+        @click="jumpPageAuth('pages/entrepreneurshipGuidelines/addPlan/addPlan')"
+      >提交创业计划</view>
+    </view>
+    <u-toast ref="uToast" />
+    <judge-auth ref="judgeAuth" />
+  </view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				list: []
-			}
-		},
-		onBackPress(e){
-			// 返回主页面tabBar
-			uni.switchTab({
-				url: "../index/index"
-			})
-		  // 此处一定要return为true，否则页面不会返回到指定路径
-		  return true;
-		},
-		methods: {
-			/**
-			 * 获取列表
-			 * @param { Number } pageNum
-			 */
-			getList(pageNum) {
-				this.$u.api.entrepreneurship.getEntrepreneurshipListApi({ pageNum: pageNum || 1 }).then(res => {
-					if (res.code === 200) {
-						this.$refs.paging.complete(res.rows)
-					} else {
-						this.$refs.uToast.show({
-							title: res.msg,
-							type: 'error'
-						})
-					}
-				})
-			},
-			/**
-			 * 下拉加载组件触发
-			 * @param { Number } pageNo
-			 * @param { Number } pageSize
-			 */
-			queryList(pageNo, pageSize) {
-				this.getList(pageNo)
-			},
-			jumpPage(url, params) {
-				this.$u.route({
-					url, params
-				})
-			},
-			imageTap(e) {
-				e.ignore()
-			}
-		}
-	}
+export default {
+  data() {
+    return {
+      list: []
+    };
+  },
+  onBackPress(e) {
+    // 返回主页面tabBar
+    uni.switchTab({
+      url: '../index/index'
+    });
+    // 此处一定要return为true，否则页面不会返回到指定路径
+    return true;
+  },
+  methods: {
+    /**
+     * 获取列表
+     * @param { Number } pageNum
+     */
+    getList(pageNum) {
+      this.$u.api.entrepreneurship
+        .getEntrepreneurshipListApi({
+          pageNum: pageNum || 1
+        })
+        .then((res) => {
+          if (res.code === 200) {
+            this.$refs.paging.complete(res.rows);
+          } else {
+            this.$refs.uToast.show({
+              title: res.msg,
+              type: 'error'
+            });
+          }
+        });
+    },
+    /**
+     * 下拉加载组件触发
+     * @param { Number } pageNo
+     * @param { Number } pageSize
+     */
+    queryList(pageNo, pageSize) {
+      this.getList(pageNo);
+    },
+    jumpPage(url, params) {
+      this.$u.route({
+        url,
+        params
+      });
+    },
+    jumpPageAuth(url) {
+      if (Number(this.vuex_memberInfo.auditStatus) === 2) {
+        this.jumpPage(url);
+      } else {
+        this.$refs['judgeAuth'].modalShow(true);
+      }
+    },
+    imageTap(e) {
+      e.ignore();
+    }
+  }
+};
 </script>
 
 <style lang="scss" scoped>
-	@import './entrepreneurshipGuidelines.scss';
+@import './entrepreneurshipGuidelines.scss';
 </style>

h5_web/pages/jobDetails/jobDetails.vue

@@ -5,7 +5,8 @@
 
 <template>
 	<view class="jobdetails">
-		<u-navbar back-text="" title="" back-icon-color="#FFFFFF" :background="{ background: '#3D5D4C' }" :border-bottom="false"></u-navbar>
+		<u-navbar back-text="" title="" back-icon-color="#FFFFFF" :background="{ background: '#3D5D4C' }"
+			:border-bottom="false"></u-navbar>
 		<view class="jobdetails-head">
 			<u-card :border="false" :head-border-bottom="false" :foot-border-top="false" :padding="0" :border-radius="0"
 				class="jobdetails-head-card">
@@ -19,7 +20,9 @@
 								</view>
 							</view>
 							<view class="right">
-								<view class="salary">{{ `${recruitmentData.lowestSalary || ''}k - ${recruitmentData.highestSalary || ''}k` }}</view>
+								<view class="salary">
+									{{ `${recruitmentData.lowestSalary || ''}k - ${recruitmentData.highestSalary || ''}k` }}
+								</view>
 								<view v-if="recruitmentData.postStatus == 0">职位已下架</view>
 							</view>
 						</view>
@@ -29,16 +32,20 @@
 					<view class="jobdetails-head-cardbody">
 						<view class="container" @tap="tapHeadCardBody(recruitmentData)">
 							<view class="container-image">
-								<u-image :src="recruitmentData.companyLogoUrl" width="96" height="96" border-radius="10" mode="aspectFill">
+								<u-image :src="recruitmentData.companyLogoUrl" width="96" height="96" border-radius="10"
+									mode="aspectFill">
 									<view slot="error">
-										<u-image src="../../static/img/default-company.png" width="96" height="96" border-radius="10" mode="aspectFill"/>
+										<u-image src="../../static/img/default-company.png" width="96" height="96"
+											border-radius="10" mode="aspectFill" />
 									</view>
 								</u-image>
 							</view>
 							<view class="content">
 								<view class="content-left">
 									<view>{{ recruitmentData.companyName }}</view>
-									<view>{{ getCompanyType(companyInfo.trade) }} · {{ getCompanyScope(companyInfo.scope) }}</view>
+									<view>{{ getCompanyType(companyInfo.trade) }} ·
+										{{ getCompanyScope(companyInfo.scope) }}
+									</view>
 								</view>
 								<view class="content-right">
 									<u-icon name="arrow-right" color="#d2d3d5" size="30"></u-icon>
@@ -102,11 +109,16 @@
 			</view>
 		</view>
 		<u-toast ref="uToast" />
+		<judge-auth ref="judgeAuth" />
 	</view>
 </template>
 
 <script>
+	import JudgeAuth from '@/components/judge-auth/judge-auth.vue'
 	export default {
+		components: {
+			JudgeAuth
+		},
 		data() {
 			return {
 				recruitmentData: {},
@@ -130,8 +142,7 @@
 				this.isSubmit = param.isSubmit
 			}
 		},
-		onShow() {
-		},
+		onShow() {},
 		methods: {
 			/**
 			 * 获取字典
@@ -298,28 +309,32 @@
 			 * 提交简历按钮事件
 			 */
 			handleResumeClick() {
-				this.$u.api.company.deliveryResume({
-					postId: this.recruitmentData.id
-				}).then(res => {
-					if (res.code === 200) {
-						this.$u.route({
-							url: 'pages/resumeDeliveryResults/resumeDeliveryResults',
-							params: {
-								// item: JSON.stringify(param)
-							}
-						});
-					} else {
+				if (Number(this.vuex_memberInfo.auditStatus) === 2) {
+					this.$u.api.company.deliveryResume({
+						postId: this.recruitmentData.id
+					}).then(res => {
+						if (res.code === 200) {
+							this.$u.route({
+								url: 'pages/resumeDeliveryResults/resumeDeliveryResults',
+								params: {
+									// item: JSON.stringify(param)
+								}
+							});
+						} else {
+							this.$refs.uToast.show({
+								title: res.msg,
+								type: 'error'
+							})
+						}
+					}).catch(() => {
 						this.$refs.uToast.show({
-							title: res.msg,
+							title: '系统异常!',
 							type: 'error'
 						})
-					}
-				}).catch(() => {
-					this.$refs.uToast.show({
-						title: '系统异常!',
-						type: 'error'
 					})
-				})
+				} else {
+					this.$refs['judgeAuth'].modalShow(true)
+				}
 			}
 		}
 	}

h5_web/pages/mine/mine.vue

@@ -152,6 +152,7 @@
 					console.log('用户基本信息:', res.data)
 					if (res.code === 200){
 						this.memberinfo = res.data;
+						this.$u.vuex('vuex_memberInfo', res.data);
 					} else {
 						this.$refs.uToast.show({
 							title: res.msg,

h5_web/pages/phoneLogin/phoneLogin.vue

@@ -132,8 +132,24 @@
 						if (res.code == '200') {
 							console.log('登录信息:', res);
 							this.$u.vuex('vuex_user', res.data);
+							this.$u.api.getmemberinfo().then(res1 => {
+								console.log('用户基本信息:', res1.data)
+								if (res.code === 200){
+									this.$u.vuex('vuex_memberInfo', res1.data);
+									this.veteEducCheck();
+								} else {
+									this.$refs.uToast.show({
+										title: res.msg,
+										type: 'error'
+									})
+								}
+							}).catch(err => {
+								this.$refs.uToast.show({
+									title: err.msg,
+									type: 'error'
+								})
+							})
 							this.$u.vuex('vuex_hasLogin', true);
-							this.veteEducCheck();
 							// this.wechatLogin()
 						} else {
 							this.toastMsg = res.msg;

h5_web/pages/policyInfo/policyInfo.vue

@@ -6,7 +6,8 @@
 <template>
 	<view class="policyInfo">
 		<z-paging ref="policyInfoPaging" v-model="policyInfoList" @query="policyInfoQueryList">
-			<u-navbar slot="top" back-text="" title="" back-icon-color="#FFFFFF" :background="{background: '#3D5D4C' }" :border-bottom="false">
+			<u-navbar slot="top" back-text="" title="" back-icon-color="#FFFFFF" :background="{background: '#3D5D4C' }"
+				:border-bottom="false">
 			</u-navbar>
 			<view class="policyInfo-banner" slot="top">
 				<u-swiper :list="bannerList" name="bannerUrl" border-radius="0"

h5_web/pages/skillsTraining/registrationNotice/registrationNotice.vue

@@ -1,16 +1,13 @@
 <!-- 报班通知 -->
 <template>
 	<view class="registration">
-		<u-navbar back-text="" title="" back-icon-color="#FFFFFF" :background="{ background: '#3D5D4C' }" :border-bottom="false"></u-navbar>
-		<z-paging
-			ref="paging"
-			v-model="noticeList"
-			@query="queryList"
-		>
+		<u-navbar back-text="" title="" back-icon-color="#FFFFFF" :background="{ background: '#3D5D4C' }"
+			:border-bottom="false"></u-navbar>
+		<z-paging ref="paging" v-model="noticeList" @query="queryList">
 			<view class="registration-list">
 				<view class="registration-list-item" v-for="(item, index) in noticeList" :key="index">
 					<view class="left">
-						<u-image :src="item.img" mode="aspectFill" width="200" height="216" border-radius="10"/>
+						<u-image :src="item.img" mode="aspectFill" width="200" height="216" border-radius="10" />
 					</view>
 					<view class="right">
 						<view class="name">{{ item.name }}</view>
@@ -24,6 +21,7 @@
 			</view>
 		</z-paging>
 		<u-toast ref="uToast" />
+		<judge-auth ref="judgeAuth" />
 	</view>
 </template>
 
@@ -49,7 +47,10 @@
 			 * @param {Object} pageSize
 			 */
 			getList(pageNum, pageSize) {
-				this.$u.api.skillTraining.getClassNoticeApi({ pageNum, pageSize }).then(res => {
+				this.$u.api.skillTraining.getClassNoticeApi({
+					pageNum,
+					pageSize
+				}).then(res => {
 					if (res.code === 200) {
 						this.$refs.paging.complete(res.rows)
 					} else {
@@ -66,21 +67,27 @@
 			 * @param {Object} item
 			 */
 			signUp(item) {
-				this.$u.api.skillTraining.signUpClassApi({ packageId: item.id }).then(res => {
-					if (res.code === 200) {
-						this.jumpPage('/pages/skillsTraining/submitSuccess/submitSuccess');
-					} else {
-						this.$refs.uToast.show({
-							title: res.msg,
-							type: 'error'
-						})
-					}
-				})
+				if (Number(this.vuex_memberInfo.auditStatus) === 2) {
+					this.$u.api.skillTraining.signUpClassApi({
+						packageId: item.id
+					}).then(res => {
+						if (res.code === 200) {
+							this.jumpPage('/pages/skillsTraining/submitSuccess/submitSuccess');
+						} else {
+							this.$refs.uToast.show({
+								title: res.msg,
+								type: 'error'
+							})
+						}
+					})
+				} else {
+					this.$refs['judgeAuth'].modalShow(true)
+				}
 			}
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
-@import './registrationNotice.scss';
+	@import './registrationNotice.scss';
 </style>

h5_web/pages/skillsTraining/skillsPackage/skillsPackage.vue

@@ -58,9 +58,8 @@
 						<swiper v-if="details.courseList && details.courseList.length" class="swiper"
 							:indicator-dots="false" :autoplay="false" height="196rpx">
 							<swiper-item class="swiper-item" v-for="(item, index) in details.courseList" :key="index"
-								@click="jumpPage('pages/skillsTraining/courseDetailed/courseDetailed', { id: item.id })">
-								<!-- <u-image :src="item.img" width="95%" height="196" mode="aspectFill"
-									border-radius="10" /> -->
+								@click="jumpPageDetails(item.id)">
+								<!-- jumpPage('pages/skillsTraining/courseDetailed/courseDetailed', { id: item.id }) -->
 								<view class="img">
 									<u-image :src="item.img" width="90%" height="196" border-radius="10" mode="aspectFill">
 										<view slot="error">
@@ -91,6 +90,7 @@
 		</view>
 		<view class="package-btn" v-if="isApply == 0" @click="signUp">报名</view>
 		<u-toast ref="uToast" />
+		<judge-auth ref="judgeAuth"/>
 	</view>
 </template>
 
@@ -152,22 +152,38 @@
 					params
 				})
 			},
+			jumpPageDetails(id) {
+				if (Number(this.vuex_memberInfo.auditStatus) === 2) {
+					this.$u.route({
+						url: 'pages/skillsTraining/courseDetailed/courseDetailed',
+						params: {
+							id
+						}
+					})
+				} else {
+					this.$refs['judgeAuth'].modalShow(true)
+				}
+			},
 			/**
 			 * 报名
 			 */
 			signUp() {
-				this.$u.api.skillTraining.signUpClassApi({
-					packageId: this.packageId
-				}).then(res => {
-					if (res.code === 200) {
-						this.jumpPage('/pages/skillsTraining/submitSuccess/submitSuccess');
-					} else {
-						this.$refs.uToast.show({
-							title: res.msg,
-							type: 'error'
-						})
-					}
-				})
+				if (Number(this.vuex_memberInfo.auditStatus) === 2) {
+					this.$u.api.skillTraining.signUpClassApi({
+						packageId: this.packageId
+					}).then(res => {
+						if (res.code === 200) {
+							this.jumpPage('/pages/skillsTraining/submitSuccess/submitSuccess');
+						} else {
+							this.$refs.uToast.show({
+								title: res.msg,
+								type: 'error'
+							})
+						}
+					})
+				} else {
+					this.$refs['judgeAuth'].modalShow(true)
+				}
 			},
 			/**
 			 * 检查是否申请过该技能包

h5_web/pages/skillsTraining/skillsTraining.vue

@@ -89,6 +89,7 @@
 		<!-- 问题咨询 -->
 		<view class="training-bottom" @click="questionAsk">问题咨询</view>
 		<u-toast ref="uToast" />
+		<judge-auth ref="judgeAuth"/>
 	</view>
 </template>
 
@@ -204,18 +205,22 @@
 			 * @param {Object} item
 			 */
 			signUp(item) {
-				this.$u.api.skillTraining.signUpClassApi({
-					packageId: item.id
-				}).then(res => {
-					if (res.code === 200) {
-						this.jumpPage('/pages/skillsTraining/submitSuccess/submitSuccess');
-					} else {
-						this.$refs.uToast.show({
-							title: res.msg,
-							type: 'error'
-						})
-					}
-				})
+				if (Number(this.vuex_memberInfo.auditStatus) === 2) {
+					this.$u.api.skillTraining.signUpClassApi({
+						packageId: item.id
+					}).then(res => {
+						if (res.code === 200) {
+							this.jumpPage('/pages/skillsTraining/submitSuccess/submitSuccess');
+						} else {
+							this.$refs.uToast.show({
+								title: res.msg,
+								type: 'error'
+							})
+						}
+					})
+				} else {
+					this.$refs['judgeAuth'].modalShow(true)
+				}
 			},
 			/**
 			 * 问题咨询

h5_web/store/index.js

@@ -13,7 +13,7 @@ try{
 
 // 需要永久存储，且下次APP启动需要取出的，在state中的变量名
 
-let saveStateKeys = ['vuex_user', 'vuex_token','vuex_hasLogin'];
+let saveStateKeys = ['vuex_user', 'vuex_token','vuex_hasLogin', 'vuex_memberInfo'];
 
 // 保存变量到本地存储中
 const saveLifeData = function(key, value){
@@ -34,7 +34,8 @@ const store = new Vuex.Store({
 		// 加上vuex_前缀，是防止变量名冲突，也让人一目了然
 		vuex_user: lifeData.vuex_user ? lifeData.vuex_user : {},
 		vuex_hasLogin:lifeData.vuex_hasLogin?lifeData.vuex_hasLogin:false,
-		vuex_token: lifeData.vuex_token ? lifeData.vuex_token : ''
+		vuex_token: lifeData.vuex_token ? lifeData.vuex_token : '',
+		vuex_memberInfo: lifeData.vuex_memberInfo ? lifeData.vuex_memberInfo : {}
 	},
 	mutations: {
 		$uStore(state, payload) {

h5_web/uni_modules/z-paging/changelog.md

@@ -1,15 +1,7 @@
-## 2.0.8（2021-10-14）
-1.修复`ReferenceError: getPrivateLanguage is not defined`报错的问题  
-2.修复在nvue中使用聊天记录模式时，手动调用`scrollToTop`或`scrollToBottom`时递归调用的问题。  
-3.修复使用`u-grid`时，内部item元素过多时。`z-paging`自定义的下拉刷新view与默认下拉刷新view同时展示的问题。
-## 2.0.7（2021-10-08）
-1.修复在一些平台中，底部加载更多会被遮挡的问题。  
-2.修复在nvue中`safe-area-inset-bottom`为true时，可能出现的顶部异常偏移的问题。  
-3.修复在HbuilderX 3.2.8+中，下拉刷新时@onRefresh被触发多次的问题。  
-4.修复在iOS中滚动到顶部view，在某些情况下因bounce的影响闪一下又消失的问题。  
-5.修复在使用页面滚动时，滚动到顶部view未能正常显示的问题。  
-6.修复在nvue中，使用聊天记录模式，数据未满一页时，数组被颠倒的问题。  
-7.修复在nvue中，使用页面滚动时，`scrollToTop`无效的问题。  
-8.修复在nvue中，使用聊天记录模式时，`scrollToBottom`和`scrollToTop`效果颠倒的问题。  
-9.修复在安卓 nvue中，导航栏与z-paging间出现的白色分割线的问题。  
-10.修复在HbuilderX 3.2.9+中，vue下拉刷新加载中时有一段空白间隙的问题。
+## 2.3.2（2022-06-21）
+1.修复使用页面滚动跳转下一个页面时，返回上一个页面列表偶现的无法滚动的问题。  
+2.修复`loading-more-loading-icon-custom-style`对自定义的image无效的问题。  
+3.修复在聊天记录模式+页面滚动中，若引入mixins可能导致的滚动到底部时也会触发加载更多的问题。  
+4.修复由`2.3.1`版本引出的`show-loading-more-when-reload`属性无效的问题。  
+5.修复在vue3+h5中，使用页面滚动且隐藏了导航栏后，top位置计算不正确的问题。  
+6.优化renderjs阻止冒泡范围，以解决下拉手势从`slot="top"`view中开始时下拉导致的列表需要等待1-2秒才可以滚动的问题。

h5_web/uni_modules/z-paging/components/z-paging-cell/z-paging-cell.vue

@@ -0,0 +1,34 @@
+<!-- z-paging -->
+<!-- github地址:https://github.com/SmileZXLee/uni-z-paging -->
+<!-- dcloud地址:https://ext.dcloud.net.cn/plugin?id=3935 -->
+<!-- 反馈QQ群：790460711 -->
+
+<!-- z-paging-cell，用于在nvue中使用cell包裹，vue中使用view包裹 -->
+<template>
+	<!-- #ifdef APP-NVUE -->
+	<cell :style="[cellStyle]">
+		<slot />
+	</cell>
+	<!-- #endif -->
+	<!-- #ifndef APP-NVUE -->
+	<view :style="[cellStyle]">
+		<slot />
+	</view>
+	<!-- #endif -->
+</template>
+
+<script>
+	export default {
+		name: "z-paging-cell",
+		props: {
+			//cellStyle
+			cellStyle: {
+				type: Object,
+				default: function() {
+                    return {}
+                }
+			}
+		}
+	}
+</script>
+

h5_web/uni_modules/z-paging/components/z-paging-empty-view/z-paging-empty-view.vue

@@ -6,12 +6,11 @@
 <!-- 空数据占位view，此组件支持easycom规范，可以在项目中直接引用 -->
 <template>
 	<view :class="{'zp-container':true,'zp-container-fixed':emptyViewFixed}" :style="[finalEmptyViewStyle]">
-		<view :class="{'zp-main':true,'zp-main-fixed':emptyViewFixed}">
-			<image v-if="!emptyViewImg.length" class="zp-main-image" :style="[emptyViewImgStyle]" :src="emptyImg"></image>
-			<image v-else class="zp-main-image" mode="aspectFit" :style="[emptyViewImgStyle]" :src="emptyViewImg"></image>
+		<view class="zp-main">
+			<image v-if="!emptyViewImg.length" class="zp-main-image" :style="[emptyViewImgStyle]" :src="emptyImg" />
+			<image v-else class="zp-main-image" mode="aspectFit" :style="[emptyViewImgStyle]" :src="emptyViewImg" />
 			<text class="zp-main-title" :style="[emptyViewTitleStyle]">{{emptyViewText}}</text>
-			<text v-if="showEmptyViewReload" class="zp-main-error-btn" :style="[emptyViewReloadStyle]"
-				@click="reloadClick">{{emptyViewReloadText}}</text>
+			<text v-if="showEmptyViewReload" class="zp-main-error-btn" :style="[emptyViewReloadStyle]" @click="reloadClick">{{emptyViewReloadText}}</text>
 		</view>
 	</view>
 </template>
@@ -19,6 +18,7 @@
 <script>
 	import zStatic from '../z-paging/js/z-paging-static'
 	export default {
+		name: "z-paging-empty-view",
 		data() {
 			return {
 				base64Empty: zStatic.base64Empty,
@@ -29,88 +29,70 @@
 			//空数据描述文字
 			emptyViewText: {
 				type: String,
-				default: function() {
-					return '没有数据哦~'
-				}
+				default: '没有数据哦~'
 			},
 			//空数据图片
 			emptyViewImg: {
 				type: String,
-				default: function() {
-					return ''
-				}
+				default: ''
 			},
 			//是否显示空数据图重新加载按钮
 			showEmptyViewReload: {
 				type: Boolean,
-				default: function() {
-					return false
-				}
+				default: false
 			},
 			//空数据点击重新加载文字
 			emptyViewReloadText: {
 				type: String,
-				default: function() {
-					return '重新加载'
-				}
+				default: '重新加载'
 			},
 			//是否是加载失败
 			isLoadFailed: {
 				type: Boolean,
-				default: function() {
-					return false
-				}
+				default: false
 			},
 			//空数据图样式
 			emptyViewStyle: {
 				type: Object,
 				default: function() {
-					return {}
-				}
+                    return {}
+                }
 			},
 			//空数据图img样式
 			emptyViewImgStyle: {
 				type: Object,
 				default: function() {
-					return {}
+				    return {}
 				}
 			},
 			//空数据图描述文字样式
 			emptyViewTitleStyle: {
 				type: Object,
 				default: function() {
-					return {}
+				    return {}
 				}
 			},
 			//空数据图重新加载按钮样式
 			emptyViewReloadStyle: {
 				type: Object,
 				default: function() {
-					return {}
+				    return {}
 				}
 			},
 			//空数据图z-index
 			emptyViewZIndex: {
 				type: Number,
-				default: function() {
-					return 9
-				}
+				default: 9
 			},
 			//空数据图片是否使用fixed布局并铺满z-paging
 			emptyViewFixed: {
 				type: Boolean,
-				default: function() {
-					return true
-				}
+				default: true
 			}
 		},
 		computed: {
 			emptyImg() {
-				if (this.isLoadFailed) {
-					return this.base64Error;
-				} else {
-					return this.base64Empty;
-				}
+                return this.isLoadFailed ? this.base64Error : this.base64Empty;
 			},
 			finalEmptyViewStyle(){
 				this.emptyViewStyle['z-index'] = this.emptyViewZIndex;
@@ -152,15 +134,7 @@
 		/* #endif */
 		flex-direction: column;
 		align-items: center;
-	}
-	
-	.zp-main-fixed {
-		/* #ifndef APP-NVUE */
-		margin-top: -150rpx;
-		/* #endif */
-		/* #ifdef APP-NVUE */
-		margin-top: -100rpx;
-		/* #endif */
+        padding: 50rpx 0rpx;
 	}
 
 	.zp-main-image {

h5_web/uni_modules/z-paging/components/z-paging-swiper-item/z-paging-swiper-item.vue

@@ -6,9 +6,20 @@
 <!-- 滑动切换选项卡swiper-item，此组件支持easycom规范，可以在项目中直接引用 -->
 <template>
 	<view class="zp-swiper-item-container">
-		<z-paging ref="paging" :fixed="false" @query="_queryList" @listChange="_updateList" :mounted-auto-call-reload="false"
-			style="height: 100%;">
-			<slot></slot>
+		<z-paging ref="paging" :fixed="false" 
+			:useVirtualList="useVirtualList" :useInnerList="useInnerList" :cellKeyName="cellKeyName" :innerListStyle="innerListStyle" 
+			:preloadPage="preloadPage" :cellHeightMode="cellHeightMode" :virtualScrollFps="virtualScrollFps" :virtualListCol="virtualListCol"
+			@query="_queryList" @listChange="_updateList" :mounted-auto-call-reload="false" style="height: 100%;">
+			<slot />
+			<template v-slot:header>
+				<slot name="header"/>
+			</template>
+			<template v-slot:cell="{item,index}">
+				<slot name="cell" :item="item" :index="index"/>
+			</template>
+			<template v-slot:footer>
+				<slot name="footer"/>
+			</template>
 		</z-paging>
 	</view>
 </template>
@@ -40,6 +51,48 @@
 					return 0
 				}
 			},
+			//是否使用虚拟列表，默认为否
+			useVirtualList: {
+				type: Boolean,
+				default: false
+			},
+			//是否在z-paging内部循环渲染列表(内置列表)，默认为否。若use-virtual-list为true，则此项恒为true
+			useInnerList: {
+				type: Boolean,
+				default: false
+			},
+			//内置列表cell的key名称，仅nvue有效，在nvue中开启use-inner-list时必须填此项
+			cellKeyName: {
+				type: String,
+				default: ''
+			},
+			//innerList样式
+			innerListStyle: {
+				type: Object,
+				default: function() {
+					return {};
+				}
+			},
+			//预加载的列表可视范围(列表高度)页数，默认为7，即预加载当前页及上下各7页的cell。此数值越大，则虚拟列表中加载的dom越多，内存消耗越大(会维持在一个稳定值)，但增加预加载页面数量可缓解快速滚动短暂白屏问题
+			preloadPage: {
+				type: [Number, String],
+				default: 7
+			},
+			//虚拟列表cell高度模式，默认为fixed，也就是每个cell高度完全相同，将以第一个cell高度为准进行计算。可选值【dynamic】，即代表高度是动态非固定的，【dynamic】性能低于【fixed】。
+			cellHeightMode: {
+				type: String,
+				default: 'fixed'
+			},
+			//虚拟列表列数，默认为1。常用于每行有多列的情况，例如每行有2列数据，需要将此值设置为2
+			virtualListCol: {
+				type: [Number, String],
+				default: 1
+			},
+			//虚拟列表scroll取样帧率，默认为60，过高可能出现卡顿等问题
+			virtualScrollFps: {
+				type: [Number, String],
+				default: 60
+			},
 		},
 		watch: {
 			currentIndex: {
@@ -48,9 +101,13 @@
 						//懒加载，当滑动到当前的item时，才去加载
 						if (!this.firstLoaded) {
 							this.$nextTick(()=>{
+								let delay = 5;
+								// #ifdef MP-TOUTIAO
+								delay = 100;
+								// #endif
 								setTimeout(() => {
 									this.$refs.paging.reload();
-								}, 5);
+								}, delay);
 							})
 						}
 					}
@@ -66,8 +123,8 @@
 				this.firstLoaded = true;
 				this.$refs.paging.complete(data);
 			},
-			_queryList(pageNo, pageSize) {
-				this.$emit('query', pageNo, pageSize);
+			_queryList(pageNo, pageSize, from) {
+				this.$emit('query', pageNo, pageSize, from);
 			},
 			_updateList(list) {
 				this.$emit('updateList', list);

h5_web/uni_modules/z-paging/components/z-paging-swiper/z-paging-swiper.vue

@@ -5,14 +5,23 @@
 
 <!-- 滑动切换选项卡swiper，此组件支持easycom规范，可以在项目中直接引用 -->
 <template>
-	<view :class="fixed?'zp-swiper-container zp-swiper-container-fixed':'zp-swiper-container'" :style="[swiperStyle]">
-		<slot v-if="$slots.top" name="top"></slot>
+	<view :class="fixed?'zp-swiper-container zp-swiper-container-fixed':'zp-swiper-container'" :style="[finalSwiperStyle]">
+		<!-- #ifndef APP-PLUS -->
+		<view v-if="cssSafeAreaInsetBottom===-1" class="zp-safe-area-inset-bottom"></view>
+		<!-- #endif -->
+		<slot v-if="$slots.top" name="top" />
 		<view class="zp-swiper-super">
-			<view class="zp-swiper">
-				<slot/></slot>
+			<view v-if="$slots.left" :class="{'zp-swiper-left':true,'zp-absoulte':isOldWebView}">
+				<slot name="left" />
+			</view>
+			<view :class="{'zp-swiper':true,'zp-absoulte':isOldWebView}" :style="[swiperContentStyle]">
+				<slot />
+			</view>
+			<view v-if="$slots.right" :class="{'zp-swiper-right':true,'zp-absoulte zp-right':isOldWebView}">
+				<slot name="right" />
 			</view>
 		</view>
-		<slot v-if="$slots.bottom" name="bottom"></slot>
+		<slot v-if="$slots.bottom" name="bottom" />
 	</view>
 </template>
 
@@ -21,7 +30,9 @@
 		name: "z-paging-swiper",
 		data() {
 			return {
-				systemInfo: null
+				systemInfo: null,
+				cssSafeAreaInsetBottom: -1,
+				swiperContentStyle: {}
 			};
 		},
 		props: {
@@ -34,48 +45,114 @@
 			safeAreaInsetBottom: {
 				type: Boolean,
 				default: false
+			},
+			//z-paging-swiper样式
+			swiperStyle: {
+				type: Object,
+				default: function() {
+					return {};
+				},
 			}
 		},
 		mounted() {
 			this.$nextTick(() => {
 				this.systemInfo = uni.getSystemInfoSync();
 			})
+			// #ifndef APP-PLUS
+			this._getCssSafeAreaInsetBottom();
+			// #endif
+			this._updateLeftAndRightWidth();
+
+			this.swiperContentStyle = {'flex': '1'};
+			// #ifndef APP-NVUE
+			this.swiperContentStyle = {width: '100%',height: '100%'};
+			// #endif
 		},
 		computed: {
-			swiperStyle() {
-				if (!this.systemInfo) {
-					return {};
-				}
-				let swiperStyle = {};
-				const windowTop = this.systemInfo.windowTop;
+			finalSwiperStyle() {
+				let swiperStyle = this.swiperStyle;
+				if (!this.systemInfo) return swiperStyle;
+				let windowTop = this.systemInfo.windowTop;
+				//暂时修复vue3中隐藏系统导航栏后windowTop获取不正确的问题，具体bug详见https://ask.dcloud.net.cn/question/141634
+				//感谢litangyu！！https://github.com/SmileZXLee/uni-z-paging/issues/25
+				// #ifdef VUE3 && H5
+				const pageHeadNode = document.getElementsByTagName("uni-page-head");
+				if (!pageHeadNode.length) windowTop = 0;
+				// #endif
 				const windowBottom = this.systemInfo.windowBottom;
 				if (this.fixed) {
-					if (windowTop && windowTop !== undefined) {
+					if (windowTop && !swiperStyle.top) {
 						swiperStyle.top = windowTop + 'px';
 					}
-					let bottom = 0;
-					if (windowBottom && windowBottom !== undefined) {
-						bottom = windowBottom;
-					}
-					if (this.safeAreaInsetBottom) {
-						bottom += this.safeAreaBottom;
+					if (!swiperStyle.bottom) {
+						let bottom = windowBottom ? windowBottom : 0;
+						if (this.safeAreaInsetBottom) {
+							bottom += this.safeAreaBottom;
+						}
+						if(bottom > 0){
+							swiperStyle.bottom = bottom + 'px';
+						}
 					}
-					swiperStyle.bottom = bottom + 'px';
 				}
 				return swiperStyle;
 			},
 			safeAreaBottom() {
-				if (!this.systemInfo) {
+				if(!this.systemInfo){
 					return 0;
 				}
 				let safeAreaBottom = 0;
-				// #ifdef MP-WEIXIN
-				safeAreaBottom = this.systemInfo.screenHeight - this.systemInfo.safeArea.bottom;
-				// #endif
-				// #ifdef APP-PLUS || H5
+				// #ifdef APP-PLUS
 				safeAreaBottom = this.systemInfo.safeAreaInsets.bottom || 0;
 				// #endif
-				return Math.abs(safeAreaBottom);
+				// #ifndef APP-PLUS
+				safeAreaBottom = this.cssSafeAreaInsetBottom === -1 ? 0 : this.cssSafeAreaInsetBottom;
+				// #endif
+				return safeAreaBottom;
+			},
+			isOldWebView() {
+				// #ifndef APP-NVUE
+				try {
+					const systemInfos = uni.getSystemInfoSync().system.split(' ');
+					const deviceType = systemInfos[0];
+					const version = parseInt(systemInfos[1].slice(0,1));
+					if ((deviceType === 'iOS' && version <= 10) || (deviceType === 'Android' && version <= 6)) {
+						return true;
+					}
+				} catch(e){
+					return false;
+				}
+				// #endif
+				return false;
+			}
+		},
+		methods: {
+			//通过获取css设置的底部安全区域占位view高度设置bottom距离
+			_getCssSafeAreaInsetBottom(){
+				const query = uni.createSelectorQuery().in(this);
+				query.select('.zp-safe-area-inset-bottom').boundingClientRect(res => {
+					if (res) {
+						this.cssSafeAreaInsetBottom = res.height;
+					}
+				}).exec();
+			},
+			//获取slot="left"和slot="right"宽度并且更新布局
+			_updateLeftAndRightWidth(){
+				if (!this.isOldWebView) return;
+				this.$nextTick(() => {
+					let delayTime = 0;
+					// #ifdef MP-BAIDU
+					delayTime = 10;
+					// #endif
+					setTimeout(() => {
+						const query = uni.createSelectorQuery().in(this);
+						query.select('.zp-swiper-left').boundingClientRect(res => {
+							this.swiperContentStyle['left'] = res ? res.width + 'px' : 0;
+						}).exec();
+						query.select('.zp-swiper-right').boundingClientRect(res => {
+							this.swiperContentStyle['right'] = res ? res.width + 'px' : 0;
+						}).exec();
+					}, delayTime)
+				})
 			}
 		}
 	}
@@ -101,25 +178,49 @@
 		bottom: 0;
 		right: 0;
 	}
+	
+	.zp-safe-area-inset-bottom {
+		position: absolute;
+		/* #ifndef APP-PLUS */
+		height: env(safe-area-inset-bottom);
+		/* #endif */
+	}
 
 	.zp-swiper-super {
 		flex: 1;
 		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+	}
+	
+	.zp-swiper-left,.zp-swiper-right{
+		/* #ifndef APP-NVUE */
+		height: 100%;
+		/* #endif */
 	}
 
 	.zp-swiper {
+		flex: 1;
 		/* #ifndef APP-NVUE */
 		height: 100%;
 		width: 100%;
+		/* #endif */
+	}
+	
+	.zp-absoulte {
+		/* #ifndef APP-NVUE */
 		position: absolute;
 		top: 0;
-		left: 0;
-		/* #endif */
-		/* #ifdef APP-NVUE */
-		flex: 1;
+		width: auto;
 		/* #endif */
 	}
 	
+	.zp-right{
+		right: 0;
+	}
+	
 	.zp-swiper-item {
 		height: 100%;
 	}

h5_web/uni_modules/z-paging/components/z-paging/components/z-paging-load-more.vue

@@ -1,39 +1,26 @@
 <!-- [z-paging]上拉加载更多view -->
 
 <template>
-	<view class="zp-l-container" :style="[zConfig.customStyle]">
-		<text
-			:class="zConfig.defaultThemeStyle==='white'?'zp-l-line zp-l-line-white':'zp-l-line zp-l-line-black'"
-			:style="[zConfig.noMoreLineCustomStyle]"
-			v-if="zConfig.showNoMoreLine&&zConfig.status===2"></text>
-		<!-- #ifndef APP-NVUE -->
-		<image v-if="zConfig.status===1&&zConfig.loadingIconCustomImage.length"
-			:src="zConfig.loadingIconCustomImage" :class="{'zp-l-line-loading-custom-image':true,'zp-l-line-loading-custom-image-animated':zConfig.loadingAnimated}">
-		</image>
-		<image
-			v-if="zConfig.status===1&&zConfig.loadingIconType==='flower'&&!zConfig.loadingIconCustomImage.length"
-			class="zp-line-loading-image" :style="[zConfig.iconCustomStyle]"
-			:src="zConfig.defaultThemeStyle==='white'?base64FlowerWhite:base64Flower">
-		</image>
-		<!-- #endif -->
-		<!-- #ifdef APP-NVUE -->
-		<view>
-			<loading-indicator v-if="zConfig.status===1"
-				:style="[{color:zConfig.defaultThemeStyle==='white'?'white':'#777777'}]" :animating="true"
-				class="zp-line-loading-image">
-			</loading-indicator>
-		</view>
-		<!-- #endif -->
-		<text
-			v-if="zConfig.status===1&&zConfig.loadingIconType==='circle'&&!zConfig.loadingIconCustomImage.length"
-			:class="zConfig.defaultThemeStyle==='white'?'zp-l-line-loading-view zp-l-line-loading-view-white':'zp-l-line-loading-view zp-l-line-loading-view-black'"
-			:style="[zConfig.iconCustomStyle]"></text>
-		<text
-			:class="zConfig.defaultThemeStyle==='white'?'zp-l-text zp-l-text-white':'zp-l-text zp-l-text-black'">{{ownLoadingMoreText}}</text>
-		<text
-			:class="zConfig.defaultThemeStyle==='white'?'zp-l-line zp-l-line-white':'zp-l-line zp-l-line-black'"
-			:style="[zConfig.noMoreLineCustomStyle]"
-			v-if="zConfig.showNoMoreLine&&zConfig.status===2"></text>
+	<view class="zp-l-container" :style="[zConfig.customStyle]" @click="doClick">
+		<template v-if="!zConfig.hideContent">
+			<text v-if="zConfig.showNoMoreLine&&finalStatus===2" :class="zConfig.defaultThemeStyle==='white'?'zp-l-line zp-l-line-white':'zp-l-line zp-l-line-black'"
+				:style="[zConfig.noMoreLineCustomStyle]" />
+			<!-- #ifndef APP-NVUE -->
+			<image v-if="finalStatus===1&&zConfig.loadingIconCustomImage.length"
+				:src="zConfig.loadingIconCustomImage" :style="[zConfig.iconCustomStyle]" :class="{'zp-l-line-loading-custom-image':true,'zp-l-line-loading-custom-image-animated':zConfig.loadingAnimated}" />
+			<image v-if="finalStatus===1&&zConfig.loadingIconType==='flower'&&!zConfig.loadingIconCustomImage.length"
+				class="zp-line-loading-image" :style="[zConfig.iconCustomStyle]" :src="zConfig.defaultThemeStyle==='white'?base64FlowerWhite:base64Flower" />
+			<!-- #endif -->
+			<!-- #ifdef APP-NVUE -->
+			<view>
+				<loading-indicator v-if="finalStatus===1&&zConfig.loadingIconType!=='circle'" class="zp-line-loading-image" :style="[{color:zConfig.defaultThemeStyle==='white'?'white':'#777777'}]" animating />
+			</view>
+			<!-- #endif -->
+			<text v-if="finalStatus===1&&zConfig.loadingIconType==='circle'&&!zConfig.loadingIconCustomImage.length"
+				:class="zConfig.defaultThemeStyle==='white'?'zp-l-line-loading-view zp-l-line-loading-view-white':'zp-l-line-loading-view zp-l-line-loading-view-black'" :style="[zConfig.iconCustomStyle]" />
+			<text :class="zConfig.defaultThemeStyle==='white'?'zp-l-text zp-l-text-white':'zp-l-text zp-l-text-black'" :style="[zConfig.titleCustomStyle]">{{ownLoadingMoreText}}</text>
+			<text v-if="zConfig.showNoMoreLine&&finalStatus===2" :class="zConfig.defaultThemeStyle==='white'?'zp-l-line zp-l-line-white':'zp-l-line zp-l-line-black'" :style="[zConfig.noMoreLineCustomStyle]" />
+		</template>
 	</view>
 </template>
 <script>
@@ -50,16 +37,19 @@
 		props: ['zConfig'],
 		computed: {
 			ownLoadingMoreText() {
-				const loadingMoreText = this.loadingStatusTextMap[this.zConfig.status];
-				return loadingMoreText;
+				return this.statusTextArr[this.finalStatus];
 			},
-			loadingStatusTextMap() {
-				return {
-					0: this.zConfig.defaultText,
-					1: this.zConfig.loadingText,
-					2: this.zConfig.noMoreText,
-					3: this.zConfig.failText,
-				}
+			statusTextArr() {
+				return [this.zConfig.defaultText,this.zConfig.loadingText,this.zConfig.noMoreText,this.zConfig.failText];
+			},
+			finalStatus() {
+				if (this.zConfig.defaultAsLoading && this.zConfig.status === 0) return 1;
+				return this.zConfig.status;
+			}
+		},
+		methods: {
+			doClick() {
+				this.$emit('doClick');
 			}
 		}
 	}
@@ -95,13 +85,17 @@
 
 	.zp-l-line-loading-view {
 		margin-right: 8rpx;
-		width: 22rpx;
+		width: 23rpx;
 		height: 23rpx;
 		border: 3rpx solid #dddddd;
 		border-radius: 50%;
 		/* #ifndef APP-NVUE */
 		animation: loading-circle 1s linear infinite;
 		/* #endif */
+		/* #ifdef APP-NVUE */
+		width: 30rpx;
+		height: 30rpx;
+		/* #endif */
 	}
 
 	.zp-l-line-loading-view-black {
@@ -142,16 +136,17 @@
 	.zp-l-line-white {
 		background-color: #efefef;
 	}
-
+	
+	/* #ifndef APP-NVUE */
 	@keyframes loading-circle {
 		0% {
 			-webkit-transform: rotate(0deg);
 			transform: rotate(0deg);
 		}
-
 		100% {
 			-webkit-transform: rotate(360deg);
 			transform: rotate(360deg);
 		}
 	}
+	/* #endif */
 </style>

h5_web/uni_modules/z-paging/components/z-paging/components/z-paging-refresh.vue

@@ -2,36 +2,28 @@
 
 <template>
 	<view style="height: 100%;">
-		<view
-			:class="['zp-r-container',{'zp-r-container-padding':showUpdateTime}]" style="height: 100%;">
+		<view :class="showUpdateTime?'zp-r-container zp-r-container-padding':'zp-r-container'">
 			<view class="zp-r-left">
-				<image v-if="status!==2" :class="refresherLeftImageClass"
+				<image v-if="status!==2" :class="leftImageClass"
 					:style="[{width: showUpdateTime?'36rpx':'30rpx',height: showUpdateTime?'36rpx':'30rpx','margin-right': showUpdateTime?'20rpx':'9rpx'},imgStyle]"
-					:src="defaultThemeStyle==='white'?(status===3?base64SuccessWhite:base64ArrowWhite):(status===3?base64Success:base64Arrow)">
-				</image>
+					:src="defaultThemeStyle==='white'?(status===3?base64SuccessWhite:base64ArrowWhite):(status===3?base64Success:base64Arrow)" />
 				<!-- #ifndef APP-NVUE -->
 				<image v-else class="zp-line-loading-image zp-r-left-image"
 					:style="[{width: showUpdateTime?'36rpx':'30rpx',height: showUpdateTime?'36rpx':'30rpx','margin-right': showUpdateTime?'20rpx':'9rpx'},imgStyle]"
-					:src="defaultThemeStyle==='white'?base64FlowerWhite:base64Flower">
-				</image>
+					:src="defaultThemeStyle==='white'?base64FlowerWhite:base64Flower" />
 				<!-- #endif -->
 				<!-- #ifdef APP-NVUE -->
 				<view v-else :style="[{'margin-right':showUpdateTime?'18rpx':'12rpx'}]">
-					<loading-indicator
-						:class="systemInfo.platform==='ios'?'zp-loading-image-ios':'zp-loading-image-android'"
-						:style="[{color:defaultThemeStyle==='white'?'white':'#777777'},imgStyle]" :animating="true">
-					</loading-indicator>
+					<loading-indicator :class="systemInfo.platform==='ios'?'zp-loading-image-ios':'zp-loading-image-android'" 
+					:style="[{color:defaultThemeStyle==='white'?'white':'#777777'},imgStyle]" animating />
 				</view>
 				<!-- #endif -->
 			</view>
 			<view class="zp-r-right">
 				<text class="zp-r-right-text"
-					:style="[refresherRightTextStyle,titleStyle]">{{refresherStatusTextMap[status]||defaultText}}
-				</text>
-				<text class="zp-r-right-text zp-r-right-time-text"
-					:style="[refresherRightTextStyle,updateTimeStyle]"
-					v-if="showUpdateTime&&refresherTimeText.length">{{refresherTimeText}}
+					:style="[rightTextStyle,titleStyle]">{{statusTextArr[status]||defaultText}}
 				</text>
+				<text v-if="showUpdateTime&&refresherTimeText.length" class="zp-r-right-text zp-r-right-time-text" :style="[rightTextStyle,updateTimeStyle]">{{refresherTimeText}}</text>
 			</view>
 		</view>
 	</view>
@@ -39,9 +31,7 @@
 <script>
 	const systemInfo = uni.getSystemInfoSync();
 	import zStatic from '../js/z-paging-static'
-	import {
-		getRefesrherFormatTimeByKey
-	} from '../js/z-paging-utils'
+	import u from '../js/z-paging-utils'
 	export default {
 		name: 'z-paging-refresh',
 		data() {
@@ -62,14 +52,14 @@
 				default: 0
 			},
 			'defaultThemeStyle': {},
-			'defaultText': {},
-			'pullingText': {},
-			'refreshingText': {},
-			'completeText': {},
+			'defaultText': '',
+			'pullingText': '',
+			'refreshingText': '',
+			'completeText': '',
 			'showUpdateTime': {
 				default: false
 			},
-			'updateTimeKey': {},
+			'updateTimeKey': '',
 			'imgStyle': {
 				default: {}
 			},
@@ -81,53 +71,48 @@
 			},
 		},
 		computed: {
-			refresherStatusTextMap() {
+			statusTextArr() {
 				this.updateTime(this.updateTimeKey);
-				return {
-					0: this.defaultText,
-					1: this.pullingText,
-					2: this.refreshingText,
-					3: this.completeText
-				};
+				return [this.defaultText,this.pullingText,this.refreshingText,this.completeText];
 			},
-			refresherLeftImageClass() {
+			leftImageClass() {
 				if(this.status === 3){
 					return 'zp-r-left-image-no-transform .zp-r-left-image-pre-size';
 				}
-				let refresherLeftImageClass = 'zp-r-left-image ';
+				let cls = 'zp-r-left-image ';
 				if (this.status === 0) {
 					if (this.leftImageLoaded) {
-						refresherLeftImageClass += 'zp-r-arrow-down';
+						cls += 'zp-r-arrow-down';
 					} else {
 						this.leftImageLoaded = true;
-						refresherLeftImageClass += 'zp-r-arrow-down-no-duration';
+						cls += 'zp-r-arrow-down-no-duration';
 					}
 				} else {
-					refresherLeftImageClass += 'zp-r-arrow-top';
+					cls += 'zp-r-arrow-top';
 				}
-				return refresherLeftImageClass + ' zp-r-left-image-pre-size';
+				return cls + ' zp-r-left-image-pre-size';
 			},
-			refresherRightTextStyle() {
-				let refresherRightTextStyle = {};
+			rightTextStyle() {
+				let stl = {};
 				let color = '#555555';
 				if (this.defaultThemeStyle === 'white') {
 					color = '#efefef';
 				}
 				// #ifdef APP-NVUE
 				if (this.showUpdateTime) {
-					refresherRightTextStyle = {
+					stl = {
 						'height': '40rpx',
 						'line-height': '40rpx'
 					};
 				} else {
-					refresherRightTextStyle = {
+					stl = {
 						'height': '80rpx',
 						'line-height': '80rpx'
 					};
 				}
 				// #endif
-				refresherRightTextStyle['color'] = color;
-				return refresherRightTextStyle;
+				stl['color'] = color;
+				return stl;
 			}
 		},
 		methods: {
@@ -136,7 +121,7 @@
 					updateTimeKey = this.updateTimeKey;
 				}
 				if (this.showUpdateTime) {
-					this.refresherTimeText = getRefesrherFormatTimeByKey(updateTimeKey);
+					this.refresherTimeText = u.getRefesrherFormatTimeByKey(updateTimeKey);
 				}
 			}
 		}
@@ -149,6 +134,7 @@
 	.zp-r-container {
 		/* #ifndef APP-NVUE */
 		display: flex;
+		height: 100%;
 		/* #endif */
 		flex-direction: row;
 		justify-content: center;
@@ -168,6 +154,9 @@
 		flex-direction: row;
 		align-items: center;
 		overflow: hidden;
+		/* #ifdef MP-ALIPAY */
+		margin-top: -4rpx;
+		/* #endif */
 	}
 
 	.zp-r-left-image {
@@ -196,7 +185,7 @@
 	.zp-r-left-image-pre-size{
 		/* #ifndef APP-NVUE */
 		width: 30rpx;
-		width: 30rpx;
+		height: 30rpx;
 		overflow: hidden;
 		/* #endif */
 	}
@@ -257,28 +246,28 @@
 		margin-top: 10rpx;
 		font-size: 24rpx;
 	}
-
+	
+	/* #ifndef APP-NVUE */
 	@keyframes refresher-arrow-top {
 		0% {
 			-webkit-transform: rotate(180deg);
 			transform: rotate(180deg);
 		}
-
 		100% {
 			-webkit-transform: rotate(0deg);
 			transform: rotate(0deg);
 		}
 	}
-
+	
 	@keyframes refresher-arrow-down {
 		0% {
 			-webkit-transform: rotate(0deg);
 			transform: rotate(0deg);
 		}
-
 		100% {
 			-webkit-transform: rotate(180deg);
 			transform: rotate(180deg);
 		}
 	}
+	/* #endif */
 </style>

h5_web/uni_modules/z-paging/components/z-paging/config/index.js

@@ -1 +1,3 @@
-// z-paging全局配置文件，注意避免更新时此文件被覆盖，若被覆盖，可在此文件中右键->点击本地历史记录，找回覆盖前的配置
+// z-paging全局配置文件，注意避免更新时此文件被覆盖，若被覆盖，可在此文件中右键->点击本地历史记录，找回覆盖前的配置
+
+export default {}

h5_web/uni_modules/z-paging/components/z-paging/css/z-paging-main.css

@@ -6,11 +6,12 @@
 	display: flex;
 	width: 100%;
 	height: 100%;
+	overflow: hidden;
 	/* #endif */
 	flex-direction: column;
 }
 
-.z-paging-content-fixed {
+.z-paging-content-fixed, .zp-loading-fixed {
 	position: fixed;
 	/* #ifndef APP-NVUE */
 	height: auto;
@@ -22,8 +23,7 @@
 	right: 0;
 }
 
-.zp-page-scroll-top,
-.zp-page-scroll-bottom {
+.zp-page-top,.zp-page-bottom {
 	/* #ifndef APP-NVUE */
 	width: auto;
 	/* #endif */
@@ -33,18 +33,46 @@
 	z-index: 999;
 }
 
+.zp-page-left,.zp-page-right{
+	/* #ifndef APP-NVUE */
+	height: 100%;
+	/* #endif */
+}
+
 .zp-scroll-view-super {
 	flex: 1;
 	position: relative;
 }
 
+.zp-view-super{
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: row;
+}
+
 .zp-custom-refresher-container {
 	overflow: hidden;
 }
 
-.zp-scroll-view {
+.zp-scroll-view-container,.zp-scroll-view {
+	position: relative;
+	/* #ifndef APP-NVUE */
 	height: 100%;
 	width: 100%;
+	/* #endif */
+}
+
+.zp-absoulte{
+	/* #ifndef APP-NVUE */
+	position: absolute;
+	top: 0;
+	width: auto;
+	/* #endif */
+}
+
+.zp-right{
+	right: 0;
 }
 
 .zp-scroll-view-absolute {
@@ -61,7 +89,6 @@
 	height: 0 !important;
 	background: transparent;
 }
-
 /* #endif */
 
 .zp-paging-touch-view {
@@ -172,6 +199,17 @@
 	justify-content: center;
 }
 
+.zp-loading-fixed {
+	z-index: 9999;
+}
+
+.zp-safe-area-inset-bottom {
+	position: absolute;
+	/* #ifndef APP-PLUS */
+	height: env(safe-area-inset-bottom);
+	/* #endif */
+}
+
 .zp-n-refresh-container {
 	/* #ifndef APP-NVUE */
 	display: flex;
@@ -179,3 +217,11 @@
 	justify-content: center;
 	width: 750rpx;
 }
+
+.zp-n-list-container{
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: row;
+	flex: 1;
+}

h5_web/uni_modules/z-paging/components/z-paging/css/z-paging-static.css

@@ -20,14 +20,16 @@
 	height: 32rpx;
 }
 
+/* #ifndef APP-NVUE */
 @keyframes loading-flower {
 	0% {
 		-webkit-transform: rotate(0deg);
 		transform: rotate(0deg);
 	}
-
 	to {
 		-webkit-transform: rotate(1turn);
 		transform: rotate(1turn);
 	}
 }
+/* #endif */
+

h5_web/uni_modules/z-paging/components/z-paging/js/modules/back-to-top.js

@@ -0,0 +1,108 @@
+// [z-paging]点击返回顶部view模块
+import u from '.././z-paging-utils'
+
+const ZPBackToTop = {
+	props: {
+		//自动显示点击返回顶部按钮，默认为否
+		autoShowBackToTop: {
+			type: Boolean,
+			default: u.gc('autoShowBackToTop', false)
+		},
+		//点击返回顶部按钮显示/隐藏的阈值(滚动距离)，单位为px，默认为400rpx
+		backToTopThreshold: {
+			type: [Number, String],
+			default: u.gc('backToTopThreshold', '400rpx')
+		},
+		//点击返回顶部按钮的自定义图片地址，默认使用z-paging内置的图片
+		backToTopImg: {
+			type: String,
+			default: u.gc('backToTopImg', '')
+		},
+		//点击返回顶部按钮返回到顶部时是否展示过渡动画，默认为是
+		backToTopWithAnimate: {
+			type: Boolean,
+			default: u.gc('backToTopWithAnimate', true)
+		},
+		//点击返回顶部按钮与底部的距离，注意添加单位px或rpx，默认为160rpx
+		backToTopBottom: {
+			type: [Number, String],
+			default: u.gc('backToTopBottom', '160rpx')
+		},
+		//点击返回顶部按钮的自定义样式
+		backToTopStyle: {
+			type: Object,
+			default: function() {
+				return u.gc('backToTopStyle', {});
+			},
+		},
+		//iOS点击顶部状态栏、安卓双击标题栏时，滚动条返回顶部，只支持竖向，默认为是
+		enableBackToTop: {
+			type: Boolean,
+			default: u.gc('enableBackToTop', true)
+		},
+	},
+	data() {
+		return {
+			backToTopClass: 'zp-back-to-top zp-back-to-top-hide',
+			lastBackToTopShowTime: 0,
+			showBackToTopClass: false,
+		}
+	},
+	computed: {
+		finalEnableBackToTop() {
+			return this.usePageScroll ? false : this.enableBackToTop;
+		},
+		finalBackToTopThreshold() {
+			return u.convertTextToPx(this.backToTopThreshold);
+		},
+		finalBackToTopStyle() {
+			let tempBackToTopStyle = this.backToTopStyle;
+			if (!tempBackToTopStyle.bottom) {
+				tempBackToTopStyle.bottom = this.windowBottom + u.convertTextToPx(this.backToTopBottom) + 'px';
+			}
+			if(!tempBackToTopStyle.position){
+				tempBackToTopStyle.position = this.usePageScroll ? 'fixed': 'absolute';
+			}
+			return tempBackToTopStyle;
+		},
+	},
+	methods: {
+		//点击返回顶部
+		_backToTopClick() {
+			!this.backToTopWithAnimate && this._checkShouldShowBackToTop(1, 0);
+			this.scrollToTop(this.backToTopWithAnimate);
+		},
+		//判断是否要显示返回顶部按钮
+		_checkShouldShowBackToTop(newVal, oldVal) {
+			if (!this.autoShowBackToTop) {
+				this.showBackToTopClass = false;
+				return;
+			}
+			if (newVal !== oldVal) {
+				if (newVal > this.finalBackToTopThreshold) {
+					if (!this.showBackToTopClass) {
+						this.showBackToTopClass = true;
+						this.lastBackToTopShowTime = new Date().getTime();
+						setTimeout(() => {
+							this.backToTopClass = 'zp-back-to-top zp-back-to-top-show';
+						}, 300)
+					}
+				} else {
+					if (this.showBackToTopClass) {
+						const currentTime = new Date().getTime();
+						let dalayTime = 300;
+						if(currentTime - this.lastBackToTopShowTime < 500){
+							dalayTime = 0;
+						}
+						this.backToTopClass = 'zp-back-to-top zp-back-to-top-hide';
+						setTimeout(() => {
+							this.showBackToTopClass = false;
+						}, dalayTime)
+					}
+				}
+			}
+		},
+	}
+}
+
+export default ZPBackToTop;

h5_web/uni_modules/z-paging/components/z-paging/js/modules/data-handle.js

@@ -0,0 +1,731 @@
+// [z-paging]数据处理模块
+import u from '.././z-paging-utils'
+import c from '.././z-paging-constant'
+import Enum from '.././z-paging-enum'
+import interceptor from '../z-paging-interceptor'
+
+const ZPData = {
+	props: {
+		//自定义初始的pageNo，默认为1
+		defaultPageNo: {
+			type: [Number, String],
+			default: u.gc('defaultPageNo', 1),
+			observer: function(newVal, oldVal) {
+				this.pageNo = newVal;
+			},
+		},
+		//自定义pageSize，默认为10
+		defaultPageSize: {
+			type: [Number, String],
+			default: u.gc('defaultPageSize', 10),
+			validator: (value) => {
+				if(value <= 0) u.consoleErr('default-page-size必须大于0！');
+				return value > 0;
+			}
+		},
+		//为保证数据一致，设置当前tab切换时的标识key，并在complete中传递相同key，若二者不一致，则complete将不会生效
+		dataKey: {
+			type: [Number, String, Object],
+			default: function() {
+				return u.gc('dataKey', null);
+			},
+		},
+		//自动注入的list名，可自动修改父view(包含ref="paging")中对应name的list值
+		autowireListName: {
+			type: String,
+			default: function() {
+				return u.gc('autowireListName', '');
+			},
+		},
+		//自动注入的query名，可自动调用父view(包含ref="paging")中的query方法
+		autowireQueryName: {
+			type: String,
+			default: function() {
+				return u.gc('autowireQueryName', '');
+			},
+		},
+		//z-paging mounted后自动调用reload方法(mounted后自动调用接口)，默认为是。请使用简便写法：auto
+		mountedAutoCallReload: {
+			type: Boolean,
+			default: u.gc('mountedAutoCallReload', true)
+		},
+		//z-paging mounted后自动调用reload方法(mounted后自动调用接口)，默认为是
+		auto: {
+			type: Boolean,
+			default: u.gc('auto', true)
+		},
+		//用户下拉刷新时是否触发reload方法，默认为是
+		reloadWhenRefresh: {
+			type: Boolean,
+			default: u.gc('reloadWhenRefresh', true)
+		},
+		//reload时自动滚动到顶部，默认为是
+		autoScrollToTopWhenReload: {
+			type: Boolean,
+			default: u.gc('autoScrollToTopWhenReload', true)
+		},
+		//reload时立即自动清空原list，默认为是，若立即自动清空，则在reload之后、请求回调之前页面是空白的
+		autoCleanListWhenReload: {
+			type: Boolean,
+			default: u.gc('autoCleanListWhenReload', true)
+		},
+		//列表刷新时自动显示下拉刷新view，默认为否
+		showRefresherWhenReload: {
+			type: Boolean,
+			default: u.gc('showRefresherWhenReload', false)
+		},
+		//列表刷新时自动显示加载更多view，且为加载中状态，默认为否
+		showLoadingMoreWhenReload: {
+			type: Boolean,
+			default: u.gc('showLoadingMoreWhenReload', false)
+		},
+		//组件created时立即触发reload(可解决一些情况下先看到页面再看到loading的问题)，auto为true时有效。为否时将在mounted+nextTick后触发reload，默认为否
+		createdReload: {
+			type: Boolean,
+			default: u.gc('createdReload', false)
+		},
+		//本地分页时上拉加载更多延迟时间，单位为毫秒，默认200毫秒
+		localPagingLoadingTime: {
+			type: [Number, String],
+			default: u.gc('localPagingLoadingTime', 200)
+		},
+		//当分页未满一屏时，是否自动加载更多，默认为否(nvue无效)
+		insideMore: {
+			type: Boolean,
+			default: u.gc('insideMore', false)
+		},
+		//使用聊天记录模式，默认为否
+		useChatRecordMode: {
+			type: Boolean,
+			default: u.gc('useChatRecordMode', false)
+		},
+		//自动拼接complete中传过来的数组(使用聊天记录模式时无效)
+		concat: {
+			type: Boolean,
+			default: u.gc('concat', true)
+		},
+		//父组件v-model所绑定的list的值
+		value: {
+			type: Array,
+			default: function() {
+				return [];
+			}
+		},
+		// #ifdef VUE3
+		modelValue: {
+			type: Array,
+			default: function() {
+				return [];
+			}
+		}
+		// #endif
+	},
+	data (){
+		return {
+			currentData: [],
+			totalData: [],
+			realTotalData: [],
+			totalLocalPagingList: [],
+			pageNo: 1,
+			isLocalPaging: false,
+			isAddedData: false,
+			isTotalChangeFromAddData: false,
+			privateConcat: true,
+			myParentQuery: -1,
+			firstPageLoaded: false,
+			pagingLoaded: false,
+			loaded: false,
+			isUserReload: true,
+			fromEmptyViewReload: false,
+			listRendering: false
+		}
+	},
+	computed: {
+		pageSize() {
+			return this.defaultPageSize;
+		},
+		finalConcat() {
+			return this.concat && this.privateConcat;
+		},
+		isFirstPage() {
+			return this.pageNo === this.defaultPageNo;
+		}
+	},
+	watch: {
+		totalData(newVal, oldVal) {
+			this._totalDataChange(newVal, oldVal);
+		},
+		currentData(newVal, oldVal) {
+			this._currentDataChange(newVal, oldVal);
+		},
+		useChatRecordMode(newVal, oldVal) {
+			if (newVal) {
+				this.nLoadingMoreFixedHeight = false;
+			}
+		},
+		value: {
+			handler(newVal) {
+				this.realTotalData = newVal;
+			},
+			immediate: true
+		},
+		// #ifdef VUE3
+		modelValue: {
+			handler(newVal) {
+				this.realTotalData = newVal;
+			},
+			immediate: true
+		}
+		// #endif
+	},
+	methods: {
+		//请求结束(成功或者失败)调用此方法，将请求的结果传递给z-paging处理，第一个参数为请求结果数组，第二个参数为是否成功(默认是是）
+		complete(data, success = true) {
+			this.customNoMore = -1;
+			this.addData(data, success);
+		},
+		//简写，与complete完全相同
+		end(data, success = true) {
+			this.complete(data, success);
+		},
+		//【保证数据一致】请求结束(成功或者失败)调用此方法，将请求的结果传递给z-paging处理，第一个参数为请求结果数组，第二个参数为dataKey，需与:data-key绑定的一致，第三个参数为是否成功(默认为是）
+		completeByKey(data, dataKey = null, success = true) {
+			if (dataKey !== null && this.dataKey !== null && dataKey !== this.dataKey) {
+				if (this.isFirstPage) {
+					this.endRefresh();
+				}
+				return;
+			}
+			this.customNoMore = -1;
+			this.addData(data, success);
+		},
+		//简写，与completeByKey完全相同
+		endByKey(data, dataKey = null, success = true) {
+			this.completeByKey(data, dataKey, success);
+		},
+		//【通过totalCount判断是否有更多数据】请求结束(成功或者失败)调用此方法，将请求的结果传递给z-paging处理，第一个参数为请求结果数组，第二个参数为totalCount(列表总数)，第三个参数为是否成功(默认为是）
+		completeByTotalCount(data, totalCount, success = true) {
+			if (totalCount == 'undefined') {
+				this.customNoMore = -1;
+			} else {
+				let dataTypeRes = this._checkDataType(data, success, false);
+				data = dataTypeRes.data;
+				success = dataTypeRes.success;
+				if (totalCount >= 0 && success) {
+					this.$nextTick(() => {
+						let nomore = true;
+						let realTotalDataCount = this.realTotalData.length;
+						if (this.pageNo == this.defaultPageNo) {
+							realTotalDataCount = 0;
+						}
+						let exceedCount = realTotalDataCount + data.length - totalCount;
+						if (exceedCount >= 0) {
+							nomore = false;
+							exceedCount = this.defaultPageSize - exceedCount;
+							if (exceedCount > 0 && exceedCount < data.length) {
+								data = data.splice(0, exceedCount);
+							}
+						}
+						this.completeByNoMore(data, nomore, success);
+					})
+					return;
+				}
+			}
+			this.addData(data, success);
+		},
+		//简写，与completeByTotalCount完全相同
+		completeByTotal(data, totalCount, success = true) {
+			this.completeByTotalCount(data, totalCount, success);
+		},
+		//简写，与completeByTotalCount完全相同
+		endByTotalCount(data, totalCount, success = true) {
+			this.completeByTotalCount(data, totalCount, success);
+		},
+		//简写，与completeByTotalCount完全相同
+		endByTotal(data, totalCount, success = true) {
+			this.completeByTotalCount(data, totalCount, success);
+		},
+		//【自行判断是否有更多数据】请求结束(成功或者失败)调用此方法，将请求的结果传递给z-paging处理，第一个参数为请求结果数组，第二个参数为是否有更多数据，第三个参数为是否成功(默认是是）
+		completeByNoMore(data, nomore, success = true) {
+			if (nomore != 'undefined') {
+				this.customNoMore = nomore == true ? 1 : 0;
+			}
+			this.addData(data, success);
+		},
+		//简写，与completeByNoMore完全相同
+		endByNoMore(data, nomore, success = true) {
+			this.completeByNoMore(data, nomore, success);
+		},
+		//与上方complete方法功能一致，新版本中设置服务端回调数组请使用complete方法
+		addData(data, success = true) {
+			if (!this.fromCompleteEmit) {
+				this.disabledCompleteEmit = true;
+				this.fromCompleteEmit = false;
+			}
+			const currentTimeStamp = u.getTime();
+			let addDataDalay = 0;
+			const disTime = currentTimeStamp - this.requestTimeStamp;
+			let minDelay = this.minDelay;
+			if(this.isFirstPage && this.finalShowRefresherWhenReload){
+				minDelay = Math.max(400,minDelay);
+			}
+			if(this.requestTimeStamp > 0 && disTime < minDelay){
+				addDataDalay = minDelay - disTime;
+			}
+			this.$nextTick(() => {
+				let delay = this.delay > 0 ? this.delay : addDataDalay;
+				setTimeout(() => {
+					this._addData(data, success, false);
+				}, delay)
+			})
+		},
+		//从顶部添加数据，不会影响分页的pageNo和pageSize
+		addDataFromTop(data, toTop = true, toTopWithAnimate = true) {
+			let dataType = Object.prototype.toString.call(data);
+			if (dataType !== '[object Array]') {
+				data = [data];
+			}
+			this.totalData = [...data, ...this.totalData];
+			if (toTop) {
+				setTimeout(() => {
+					this._scrollToTop(toTopWithAnimate);
+				}, c.delayTime)
+			}
+		},
+		//重新设置列表数据，调用此方法不会影响pageNo和pageSize，也不会触发请求。适用场景：当需要删除列表中某一项时，将删除对应项后的数组通过此方法传递给z-paging。(当出现类似的需要修改列表数组的场景时，请使用此方法，请勿直接修改page中:list.sync绑定的数组)
+		resetTotalData(data) {
+			if (data == undefined) {
+				if (this.showConsoleError) {
+					u.consoleErr('方法resetTotalData参数缺失！');
+				}
+				return;
+			}
+			this.isTotalChangeFromAddData = true;
+			let dataType = Object.prototype.toString.call(data);
+			if (dataType !== '[object Array]') {
+				data = [data];
+			}
+			this.totalData = data;
+		},
+		//添加聊天记录
+		addChatRecordData(data, toBottom = true, toBottomWithAnimate = true) {
+			let dataType = Object.prototype.toString.call(data);
+			if (dataType !== '[object Array]') {
+				data = [data];
+			}
+			if (!this.useChatRecordMode) return;
+			this.isTotalChangeFromAddData = true;
+			//#ifndef APP-NVUE
+			this.totalData = [...this.totalData, ...data];
+			//#endif
+			//#ifdef APP-NVUE
+			this.totalData = this.nIsFirstPageAndNoMore ? [...this.totalData, ...data] : [...data, ...this.totalData];
+			//#endif
+			if (toBottom) {
+				setTimeout(() => {
+					//#ifndef APP-NVUE
+					this._scrollToBottom(toBottomWithAnimate);
+					//#endif
+					//#ifdef APP-NVUE
+					if (this.nIsFirstPageAndNoMore) {
+						this._scrollToBottom(toBottomWithAnimate);
+					} else {
+						this._scrollToTop(toBottomWithAnimate);
+					}
+					//#endif
+				}, c.delayTime)
+			}
+		},
+		//设置本地分页数据，请求结束(成功或者失败)调用此方法，将请求的结果传递给z-paging作分页处理（若调用了此方法，则上拉加载更多时内部会自动分页，不会触发@query所绑定的事件）
+		setLocalPaging(data, success = true) {
+			this.isLocalPaging = true;
+			this.$nextTick(() => {
+				this._addData(data, success, true);
+			})
+		},
+		//重新加载分页数据，pageNo会恢复为默认值，相当于下拉刷新的效果(animate为true时会展示下拉刷新动画，默认为false)
+		reload(animate = this.showRefresherWhenReload) {
+			if (animate) {
+				this.privateShowRefresherWhenReload = animate;
+				this.isUserPullDown = true;
+			}
+			this._preReload(animate, false);
+		},
+		//刷新列表数据，pageNo和pageSize不会重置，列表数据会重新从服务端获取。必须保证@query绑定的方法中的pageNo和pageSize和传给服务端的一致
+		refresh() {
+			if(!this.realTotalData.length){
+				this.reload();
+				return;
+			}
+			const disPageNo = this.pageNo - this.defaultPageNo + 1;
+			if (disPageNo >= 1) {
+				this.loading = true;
+				this.privateConcat = false;
+				const totalPageSize = disPageNo * this.pageSize;
+				this._emitQuery(this.defaultPageNo, totalPageSize, Enum.QueryFrom.Refresh);
+				this._callMyParentQuery(this.defaultPageNo, totalPageSize);
+			}
+		},
+		//清空分页数据
+		clean() {
+			this._reload(true);
+			this._addData([], true, false);
+		},
+		//清空分页数据
+		clear() {
+			this.clean();
+		},
+		//手动触发滚动到顶部加载更多，聊天记录模式时有效
+		doChatRecordLoadMore() {
+			this.useChatRecordMode && this._onLoadingMore('click');
+		},
+		//reload之前的一些处理
+		_preReload(animate = this.showRefresherWhenReload, isFromMounted = true) {
+			this.isUserReload = true;
+			this.loadingType = Enum.LoadingType.Refresher;
+			if (animate) {
+				this.privateShowRefresherWhenReload = animate;
+				// #ifndef APP-NVUE
+				if (this.useCustomRefresher) {
+					this._doRefresherRefreshAnimate();
+				} else {
+					this.refresherTriggered = true;
+				}
+				// #endif
+				// #ifdef APP-NVUE
+				this.refresherStatus = Enum.Refresher.Loading;
+				this.refresherRevealStackCount++;
+				setTimeout(() => {
+					this._getNodeClientRect('zp-n-refresh-container', false).then((node) => {
+						if (node) {
+							let nodeHeight = node[0].height;
+							this.nShowRefresherReveal = true;
+							this.nShowRefresherRevealHeight = nodeHeight;
+							setTimeout(() => {
+								this._nDoRefresherEndAnimation(0, -nodeHeight, false, false);
+								setTimeout(() => {
+									this._nDoRefresherEndAnimation(nodeHeight, 0);
+								}, 10)
+							}, 10)
+						}
+						this._reload(false, isFromMounted);
+						this._doRefresherLoad(false);
+					});
+				}, 10)
+				return;
+				// #endif
+			} else {
+				this._refresherEnd(false, false, false, false);
+			}
+			this._reload(false, isFromMounted);
+		},
+		//重新加载分页数据
+		_reload(isClean = false, isFromMounted = false, isUserPullDown = false) {
+			this.isAddedData = false;
+			this.cacheScrollNodeHeight = -1;
+			this.insideOfPaging = -1;
+			this.pageNo = this.defaultPageNo;
+			this._cleanRefresherEndTimeout();
+			!this.privateShowRefresherWhenReload && !isClean && this._startLoading(true);
+			this.firstPageLoaded = true;
+			this.isTotalChangeFromAddData = false;
+			this.totalData = [];
+			if (!isClean) {
+				this._emitQuery(this.pageNo, this.defaultPageSize, isUserPullDown ? Enum.QueryFrom.UserPullDown : Enum.QueryFrom.Reload);
+				let delay = 0;
+				// #ifdef MP-TOUTIAO
+				delay = 5;
+				// #endif
+				setTimeout(() => {
+					this._callMyParentQuery();
+				}, delay)
+				if (!isFromMounted && this.autoScrollToTopWhenReload) {
+					let checkedNRefresherLoading = true;
+					// #ifdef APP-NVUE
+					checkedNRefresherLoading = !this.nRefresherLoading;
+					// #endif
+					if (checkedNRefresherLoading) {
+						this._scrollToTop(false);
+					}
+				}
+				// #ifndef APP-NVUE
+				if (!this.usePageScroll && this.useChatRecordMode) {
+					if (this.showConsoleError) {
+						u.consoleWarn('使用聊天记录模式时，建议使用页面滚动，可将usePageScroll设置为true以启用页面滚动！！');
+					}
+				}
+				// #endif
+			}
+			this.$nextTick(() => {
+				// #ifdef APP-NVUE
+				this.nShowBottom = this.realTotalData.length > 0;
+				// #endif
+			})
+		},
+		//处理服务端返回的数组
+		_addData(data, success, isLocal) {
+			this.isAddedData = true;
+			this.fromEmptyViewReload = false;
+			this.isTotalChangeFromAddData = true;
+			this.refresherTriggered = false;
+			!this.useCustomRefresher && uni.stopPullDownRefresh();
+			// #ifdef APP-NVUE
+			this.usePageScroll && uni.stopPullDownRefresh();
+			// #endif
+			const tempIsUserPullDown = this.isUserPullDown;
+			if (this.showRefresherUpdateTime && this.isFirstPage) {
+				u.setRefesrherTime(u.getTime(), this.refresherUpdateTimeKey);
+				this.tempLanguageUpdateKey = u.getTime();
+				this.$refs.refresh && this.$refs.refresh.updateTime();
+			}
+			if (tempIsUserPullDown && this.isFirstPage) {
+				this.isUserPullDown = false;
+			}
+			let dataTypeRes = this._checkDataType(data, success, isLocal);
+			data = dataTypeRes.data;
+			success = dataTypeRes.success;
+			let delayTime = c.delayTime;
+			// #ifdef APP-NVUE
+			if (this.useChatRecordMode) delayTime = 0;
+			// #endif
+			this.loadingForNow = false;
+			setTimeout(() => {
+				this.pagingLoaded = true;
+				this.$nextTick(()=>{
+					this._refresherEnd(delayTime > 0, true, tempIsUserPullDown);
+				})
+			}, delayTime)
+			if (this.isFirstPage) {
+				this.isLoadFailed = !success;
+			}
+			if (success) {
+				if (!(this.privateConcat === false && this.loadingStatus === Enum.More.NoMore)) {
+					this.loadingStatus = Enum.More.Default;
+				}
+				if (isLocal) {
+					this.totalLocalPagingList = data;
+					this._localPagingQueryList(this.defaultPageNo, this.defaultPageSize, 0, (res) => {
+						this.complete(res);
+					})
+				} else {
+					let dataChangeDelayTime = 0;
+					// #ifdef APP-NVUE
+					if (this.privateShowRefresherWhenReload && this.finalNvueListIs === 'waterfall') {
+						dataChangeDelayTime = 150;
+					}
+					// #endif
+					setTimeout(() => {
+						this._currentDataChange(data, this.currentData);					
+					}, dataChangeDelayTime)
+				}
+			} else {
+				this._currentDataChange(data, this.currentData);
+				this.loadingStatus = Enum.More.Fail;
+				if (this.loadingType === Enum.LoadingType.LoadingMore) {
+					this.pageNo--;
+				}
+			}
+		},
+		//所有数据改变时调用
+		_totalDataChange(newVal, oldVal, eventThrow=true) {
+			if ((!this.isUserReload || !this.autoCleanListWhenReload) && this.firstPageLoaded && !newVal.length && oldVal.length) {
+				return;
+			}
+			this._doCheckScrollViewShouldFullHeight(newVal);
+			if(!this.realTotalData.length && !newVal.length){
+				eventThrow = false;
+			}
+			this.realTotalData = newVal;
+			if (eventThrow) {
+				this.$emit('input', newVal);
+				// #ifdef VUE3
+				this.$emit('update:modelValue', newVal);
+				// #endif
+				this.$emit('update:list', newVal);
+				this.$emit('listChange', newVal);
+				this._callMyParentList(newVal);
+			}
+			this.firstPageLoaded = false;
+			this.isTotalChangeFromAddData = false;
+			this.$nextTick(() => {
+				setTimeout(()=>{
+					this._getNodeClientRect('.zp-paging-container-content').then((res) => {
+						if (res) {
+							this.$emit('contentHeightChanged', res[0].height);
+						}
+					});
+				},this.isIos?100:300)
+				// #ifdef APP-NVUE
+				if (this.useChatRecordMode && this.nIsFirstPageAndNoMore && this.isFirstPage && !this.nFirstPageAndNoMoreChecked) {
+					this.nFirstPageAndNoMoreChecked = true;
+					this._scrollToBottom(false);
+				}
+				// #endif
+			})
+		},
+		//当前数据改变时调用
+		_currentDataChange(newVal, oldVal) {
+			newVal = [...newVal];
+			this.listRendering = true;
+			this.$nextTick(() => {
+				setTimeout(() => {
+					this.listRendering = false;
+				},50)
+			})
+			// #ifndef APP-NVUE
+			if (this.finalUseVirtualList) {
+				this._setCellIndex(newVal,this.totalData.length === 0);
+			}
+			this.useChatRecordMode && newVal.reverse();
+			// #endif
+			if (this.isFirstPage && this.finalConcat) {
+				this.totalData = [];
+			}
+			if (this.customNoMore !== -1) {
+				if (this.customNoMore === 0 || !newVal.length) {
+					this.loadingStatus = Enum.More.NoMore;
+				}
+			} else {
+				if (!newVal.length || (newVal.length && newVal.length < this.defaultPageSize)) {
+					this.loadingStatus = Enum.More.NoMore;
+				}
+			}
+			if (!this.totalData.length) {
+				if (this.finalConcat) {
+					// #ifdef APP-NVUE
+					if(this.useChatRecordMode && this.isFirstPage && this.loadingStatus === Enum.More.NoMore){
+						newVal.reverse();
+					}
+					// #endif
+					this.totalData = newVal;
+				}
+				if (this.useChatRecordMode) {
+					// #ifndef APP-NVUE
+					this.$nextTick(() => {
+						this._scrollToBottom(false);
+					})
+					// #endif
+				}
+			} else {
+				if (this.useChatRecordMode) {
+					// #ifdef APP-NVUE
+					this.totalData = [...this.totalData, ...newVal];
+					// #endif
+					//#ifndef APP-NVUE
+					const idIndex = newVal.length;
+					let idIndexStr = `z-paging-${idIndex}`;
+					this.totalData = [...newVal, ...this.totalData];
+					if (this.pageNo !== this.defaultPageNo) {
+						this.privateScrollWithAnimation = 0;
+						this.$emit('update:chatIndex', idIndex);
+						setTimeout(() => {
+							this._scrollIntoView(idIndexStr, 30 + this.cacheTopHeight, false, () => {
+								this.$emit('update:chatIndex', 0);
+							});
+						}, this.usePageScroll ? 50 : 200)
+					} else {
+						this.$nextTick(() => {
+							this._scrollToBottom(false);
+						})
+					}
+					//#endif
+		
+				} else {
+					if (this.finalConcat) {
+						const currentScrollTop = this.oldScrollTop;
+						this.totalData = [...this.totalData, ...newVal];
+						// #ifdef MP-WEIXIN
+						if (!this.isIos && !this.refresherOnly && !this.usePageScroll && newVal.length) {
+							this.loadingMoreTimeStamp = u.getTime();
+							this.$nextTick(()=>{
+								this.scrollToY(currentScrollTop);
+							})
+						}
+						// #endif
+					} else {
+						this.totalData = newVal;
+					}
+				}
+			}
+			this.privateConcat = true;
+		},
+		//本地分页请求
+		_localPagingQueryList(pageNo, pageSize, localPagingLoadingTime, callback) {
+			pageNo = parseInt(pageNo);
+			pageSize = parseInt(pageSize);
+			if (pageNo < 0 || pageSize <= 0) {
+				this._localPagingQueryResult(callback, [], localPagingLoadingTime);
+				return;
+			}
+			pageNo = Math.max(1,pageNo);
+			let totalPagingList = [...this.totalLocalPagingList];
+			let pageNoIndex = (pageNo - 1) * pageSize;
+			if (pageNoIndex + pageSize <= totalPagingList.length) {
+				this._localPagingQueryResult(callback, totalPagingList.splice(pageNoIndex, pageSize), localPagingLoadingTime);
+			} else if (pageNoIndex < totalPagingList.length) {
+				this._localPagingQueryResult(callback, totalPagingList.splice(pageNoIndex, totalPagingList.length - pageNoIndex), localPagingLoadingTime);
+			} else {
+				this._localPagingQueryResult(callback, [], localPagingLoadingTime);
+			}
+		},
+		//本地分页请求回调
+		_localPagingQueryResult(callback, arg, localPagingLoadingTime) {
+			setTimeout(() => {
+				callback(arg);
+			}, localPagingLoadingTime)
+		},
+		//修改父view的list
+		_callMyParentList(newVal) {
+			if (this.autowireListName.length) {
+				const myParent = u.getParent(this.$parent);
+				if (myParent && myParent[this.autowireListName]) {
+					myParent[this.autowireListName] = newVal;
+				}
+			}
+		},
+		//调用父view的query
+		_callMyParentQuery(customPageNo = 0, customPageSize = 0) {
+			if (this.autowireQueryName) {
+				if (this.myParentQuery === -1) {
+					const myParent = u.getParent(this.$parent);
+					if (myParent && myParent[this.autowireQueryName]) {
+						this.myParentQuery = myParent[this.autowireQueryName];
+					}
+				} 
+				if (this.myParentQuery !== -1) {
+					if (customPageSize > 0) {
+						this.myParentQuery(customPageNo, customPageSize);
+					} else {
+						this.myParentQuery(this.pageNo, this.defaultPageSize);
+					}
+				}
+			}
+		},
+		//发射query事件
+		_emitQuery(pageNo, pageSize, from){
+			this.requestTimeStamp = u.getTime();
+			this.$emit('query', ...interceptor._handleQuery(pageNo, pageSize, from));
+		},
+		//检查complete data的类型
+		_checkDataType(data, success, isLocal) {
+			const dataType = Object.prototype.toString.call(data);
+			if (dataType === '[object Boolean]') {
+				success = data;
+				data = [];
+			} else if (dataType === '[object Null]') {
+				data = [];
+			} else if (dataType !== '[object Array]') {
+				data = [];
+				let methodStr = isLocal ? 'setLocalPaging' : 'complete';
+				if (dataType !== '[object Undefined]') {
+					if (this.showConsoleError) {
+						u.consoleErr(`${methodStr}参数类型不正确，第一个参数类型必须为Array!`);
+					}
+				}
+			}
+			return {data,success};
+		},
+	}
+}
+
+export default ZPData;

h5_web/uni_modules/z-paging/components/z-paging/js/modules/empty.js

@@ -0,0 +1,150 @@
+// [z-paging]空数据图view模块
+import u from '.././z-paging-utils'
+
+const ZPEmptyView = {
+	props: {
+		//是否强制隐藏空数据图，默认为否
+		hideEmptyView: {
+			type: Boolean,
+			default: u.gc('hideEmptyView', false)
+		},
+		//空数据图描述文字，默认为“没有数据哦~”
+		emptyViewText: {
+			type: [String, Object],
+			default: u.gc('emptyViewText', null)
+		},
+		//是否显示空数据图重新加载按钮(无数据时)，默认为否
+		showEmptyViewReload: {
+			type: Boolean,
+			default: u.gc('showEmptyViewReload', false)
+		},
+		//加载失败时是否显示空数据图重新加载按钮，默认为是
+		showEmptyViewReloadWhenError: {
+			type: Boolean,
+			default: u.gc('showEmptyViewReloadWhenError', true)
+		},
+		//空数据图点击重新加载文字，默认为“重新加载”
+		emptyViewReloadText: {
+			type: [String, Object],
+			default: u.gc('emptyViewReloadText', null)
+		},
+		//空数据图图片，默认使用z-paging内置的图片
+		emptyViewImg: {
+			type: String,
+			default: u.gc('emptyViewImg', '')
+		},
+		//空数据图“加载失败”描述文字，默认为“很抱歉，加载失败”
+		emptyViewErrorText: {
+			type: [String, Object],
+			default: u.gc('emptyViewErrorText', null)
+		},
+		//空数据图“加载失败”图片，默认使用z-paging内置的图片
+		emptyViewErrorImg: {
+			type: String,
+			default: u.gc('emptyViewErrorImg', '')
+		},
+		//空数据图样式
+		emptyViewStyle: {
+			type: Object,
+			default: function() {
+				return u.gc('emptyViewStyle', {});
+			}
+		},
+		//空数据图容器样式
+		emptyViewSuperStyle: {
+			type: Object,
+			default: function() {
+				return u.gc('emptyViewSuperStyle', {});
+			}
+		},
+		//空数据图img样式
+		emptyViewImgStyle: {
+			type: Object,
+			default: function() {
+				return u.gc('emptyViewImgStyle', {});
+			}
+		},
+		//空数据图描述文字样式
+		emptyViewTitleStyle: {
+			type: Object,
+			default: function() {
+				return u.gc('emptyViewTitleStyle', {});
+			}
+		},
+		//空数据图重新加载按钮样式
+		emptyViewReloadStyle: {
+			type: Object,
+			default: function() {
+				return u.gc('emptyViewReloadStyle', {});
+			}
+		},
+		//空数据图片是否铺满z-paging，默认为是。若设置为否，则为填充满z-paging的剩余部分
+		emptyViewFixed: {
+			type: Boolean,
+			default: function() {
+				return u.gc('emptyViewFixed', false)
+			}
+		},
+		//空数据图片是否垂直居中，默认为是。emptyViewFixed为false时有效
+		emptyViewCenter: {
+			type: Boolean,
+			default: function() {
+				return u.gc('emptyViewCenter', true)
+			}
+		},
+		//加载中时是否自动隐藏空数据图，默认为是
+		autoHideEmptyViewWhenLoading: {
+			type: Boolean,
+			default: u.gc('autoHideEmptyViewWhenLoading', true)
+		},
+		//用户下拉列表触发下拉刷新加载中时是否自动隐藏空数据图，默认为是
+		autoHideEmptyViewWhenPull: {
+			type: Boolean,
+			default: u.gc('autoHideEmptyViewWhenPull', true)
+		},
+		//空数据view的z-index，默认为9
+		emptyViewZIndex: {
+			type: Number,
+			default: u.gc('emptyViewZIndex', 9)
+		},
+	},
+	computed: {
+		finalEmptyViewImg() {
+			return this.isLoadFailed ? this.emptyViewErrorImg : this.emptyViewImg;
+		},
+		finalShowEmptyViewReload() {
+			return this.isLoadFailed ? this.showEmptyViewReloadWhenError : this.showEmptyViewReload;
+		},
+		showEmpty() {
+			if(this.refresherOnly || this.hideEmptyView || this.totalData.length) return false;
+			if(this.autoHideEmptyViewWhenLoading){
+				if (this.isAddedData && !this.firstPageLoaded && !this.loading) return true;
+			}else{
+				return true;
+			}
+			if (!this.autoHideEmptyViewWhenPull && !this.isUserReload) return true;
+			return false;
+		},
+	},
+	methods: {
+		//点击了空数据view重新加载按钮
+		_emptyViewReload() {
+			let callbacked = false;
+			this.$emit('emptyViewReload', (reload) => {
+				if (reload === undefined || reload === true) {
+					this.fromEmptyViewReload = true;
+					this.reload();
+				}
+				callbacked = true;
+			});
+			this.$nextTick(() => {
+				if (!callbacked) {
+					this.fromEmptyViewReload = true;
+					this.reload();
+				}
+			})
+		},
+	}
+}
+
+export default ZPEmptyView;

h5_web/uni_modules/z-paging/components/z-paging/js/modules/i18n.js

@@ -0,0 +1,98 @@
+// [z-paging]i18n模块
+import u from '.././z-paging-utils'
+import c from '.././z-paging-constant'
+import zI18n from '.././z-paging-i18n'
+
+const systemInfo = uni.getSystemInfoSync();
+const ZPI18n = {
+	props: {
+		//i18n国际化设置语言，支持简体中文(zh-cn)、繁体中文(zh-hant-cn)和英文(en)
+		language: {
+			type: String,
+			default: u.gc('language', '')
+		},
+		//i18n国际化默认是否跟随系统语言，默认为是
+		followSystemLanguage: {
+			type: Boolean,
+			default: u.gc('followSystemLanguage', true)
+		},
+	},
+	data() {
+		return {
+			tempLanguageUpdateKey: 0,
+		}
+	},
+	computed: {
+		tempLanguage() {
+			let systemLanguage = false;
+			const temp = this.tempLanguageUpdateKey;
+			if (this.followSystemLanguage) {
+				systemLanguage = systemInfo.language;
+			}
+			return uni.getStorageSync(c.i18nUpdateKey) || systemLanguage || 'zh-cn';
+		},
+		finalTempLanguage() {
+			return this.language.length ? this.language : this.tempLanguage;
+		},
+		finalLanguage() {
+			let language = this.finalTempLanguage.toLowerCase();
+			return zI18n._getPrivateLanguage(language, this.followSystemLanguage);
+		},
+		finalRefresherDefaultText() {
+			return this._getI18nText('refresherDefaultText', this.refresherDefaultText);
+		},
+		finalRefresherPullingText() {
+			return this._getI18nText('refresherPullingText', this.refresherPullingText);
+		},
+		finalRefresherRefreshingText() {
+			return this._getI18nText('refresherRefreshingText', this.refresherRefreshingText);
+		},
+		finalRefresherCompleteText() {
+			return this._getI18nText('refresherCompleteText', this.refresherCompleteText);
+		},
+		finalLoadingMoreDefaultText() {
+			return this._getI18nText('loadingMoreDefaultText', this.loadingMoreDefaultText);
+		},
+		finalLoadingMoreLoadingText() {
+			return this._getI18nText('loadingMoreLoadingText', this.loadingMoreLoadingText);
+		},
+		finalLoadingMoreNoMoreText() {
+			return this._getI18nText('loadingMoreNoMoreText', this.loadingMoreNoMoreText);
+		},
+		finalLoadingMoreFailText() {
+			return this._getI18nText('loadingMoreFailText', this.loadingMoreFailText);
+		},
+		finalEmptyViewText() {
+			return this.isLoadFailed ? this.finalEmptyViewErrorText : this._getI18nText('emptyViewText', this.emptyViewText);
+		},
+		finalEmptyViewReloadText() {
+			return this._getI18nText('emptyViewReloadText', this.emptyViewReloadText);
+		},
+		finalEmptyViewErrorText() {
+			return this._getI18nText('emptyViewErrorText', this.emptyViewErrorText);
+		},
+	},
+	methods: {
+		//设置i18n国际化语言
+		setI18n(language) {
+			zI18n.setLanguage(language);
+		},
+		//获取当前z-paging的语言
+		getLanguage() {
+			return this.finalLanguage;
+		},
+		//获取国际化转换后的文本
+		_getI18nText(key, value) {
+			const dataType = Object.prototype.toString.call(value);
+			if (dataType === '[object Object]') {
+				const nextValue = value[this.finalLanguage];
+				if (nextValue) return nextValue;
+			} else if (dataType === '[object String]') {
+				return value;
+			}
+			return zI18n.t[key][this.finalLanguage];
+		},
+	}
+}
+
+export default ZPI18n;

h5_web/uni_modules/z-paging/components/z-paging/js/modules/load-more.js

@@ -0,0 +1,328 @@
+// [z-paging]滚动到底部加载更多模块
+import u from '.././z-paging-utils'
+import Enum from '.././z-paging-enum'
+
+const ZPLoadMore = {
+	props: {
+		//自定义底部加载更多样式
+		loadingMoreCustomStyle: {
+			type: Object,
+			default: function() {
+				return u.gc('loadingMoreCustomStyle', {});
+			}
+		},
+		//自定义底部加载更多文字样式
+		loadingMoreTitleCustomStyle: {
+			type: Object,
+			default: function() {
+				return u.gc('loadingMoreTitleCustomStyle', {});
+			}
+		},
+		//自定义底部加载更多加载中动画样式
+		loadingMoreLoadingIconCustomStyle: {
+			type: Object,
+			default: function() {
+				return u.gc('loadingMoreLoadingIconCustomStyle', {});
+			}
+		},
+		//自定义底部加载更多加载中动画图标类型，可选flower或circle，默认为flower
+		loadingMoreLoadingIconType: {
+			type: String,
+			default: u.gc('loadingMoreLoadingIconType', 'flower')
+		},
+		//自定义底部加载更多加载中动画图标图片
+		loadingMoreLoadingIconCustomImage: {
+			type: String,
+			default: u.gc('loadingMoreLoadingIconCustomImage', '')
+		},
+		//底部加载更多加载中view是否展示旋转动画，默认为是
+		loadingMoreLoadingAnimated: {
+			type: Boolean,
+			default: u.gc('loadingMoreLoadingAnimated', true)
+		},
+		//是否启用加载更多数据(含滑动到底部加载更多数据和点击加载更多数据)，默认为是
+		loadingMoreEnabled: {
+			type: Boolean,
+			default: u.gc('loadingMoreEnabled', true)
+		},
+		//是否启用滑动到底部加载更多数据，默认为是
+		toBottomLoadingMoreEnabled: {
+			type: Boolean,
+			default: u.gc('toBottomLoadingMoreEnabled', true)
+		},
+		//滑动到底部状态为默认状态时，以加载中的状态展示，默认为否。若设置为是，可避免滚动到底部看到默认状态然后立刻变为加载中状态的问题，但分页数量未超过一屏时，不会显示【点击加载更多】
+		loadingMoreDefaultAsLoading: {
+			type: [Boolean],
+			default: u.gc('loadingMoreDefaultAsLoading', false)
+		},
+		//滑动到底部"默认"文字，默认为【点击加载更多】
+		loadingMoreDefaultText: {
+			type: [String, Object],
+			default: u.gc('loadingMoreDefaultText', null)
+		},
+		//滑动到底部"加载中"文字，默认为【正在加载...】
+		loadingMoreLoadingText: {
+			type: [String, Object],
+			default: u.gc('loadingMoreLoadingText', null)
+		},
+		//滑动到底部"没有更多"文字，默认为【没有更多了】
+		loadingMoreNoMoreText: {
+			type: [String, Object],
+			default: u.gc('loadingMoreNoMoreText', null)
+		},
+		//滑动到底部"加载失败"文字，默认为【加载失败，点击重新加载】
+		loadingMoreFailText: {
+			type: [String, Object],
+			default: u.gc('loadingMoreFailText', null)
+		},
+		//当没有更多数据且分页内容未超出z-paging时是否隐藏没有更多数据的view，默认为否
+		hideLoadingMoreWhenNoMoreAndInsideOfPaging: {
+			type: Boolean,
+			default: u.gc('hideLoadingMoreWhenNoMoreAndInsideOfPaging', false)
+		},
+		//当没有更多数据且分页数组长度少于这个值时，隐藏没有更多数据的view，默认为0，代表不限制。
+		hideLoadingMoreWhenNoMoreByLimit: {
+			type: Number,
+			default: u.gc('hideLoadingMoreWhenNoMoreByLimit', 0)
+		},
+		//是否显示默认的加载更多text，默认为是
+		showDefaultLoadingMoreText: {
+			type: Boolean,
+			default: u.gc('showDefaultLoadingMoreText', true)
+		},
+		//是否显示没有更多数据的view
+		showLoadingMoreNoMoreView: {
+			type: Boolean,
+			default: u.gc('showLoadingMoreNoMoreView', true)
+		},
+		//是否显示没有更多数据的分割线，默认为是
+		showLoadingMoreNoMoreLine: {
+			type: Boolean,
+			default: u.gc('showLoadingMoreNoMoreLine', true)
+		},
+		//自定义底部没有更多数据的分割线样式
+		loadingMoreNoMoreLineCustomStyle: {
+			type: Object,
+			default: function() {
+				return u.gc('loadingMoreNoMoreLineCustomStyle', {});
+			},
+		},
+		//距底部/右边多远时（单位px），触发 scrolltolower 事件，默认为100rpx
+		lowerThreshold: {
+			type: [Number, String],
+			default: u.gc('lowerThreshold', '100rpx')
+		},
+	},
+	data() {
+		return {
+			//底部加载更多状态
+			loadingStatus: Enum.More.Default,
+			loadingStatusAfterRender: Enum.More.Default,
+			loadingMoreTimeStamp: 0,
+			loadingMoreDefaultSlot: null,
+			showLoadingMore: false,
+			customNoMore: -1,
+		}
+	},
+	computed: {
+		zPagingLoadMoreConfig() {
+			return {
+				status: this.loadingStatusAfterRender,
+				defaultAsLoading: this.loadingMoreDefaultAsLoading,
+				defaultThemeStyle: this.finalLoadingMoreThemeStyle,
+				customStyle: this.loadingMoreCustomStyle,
+				titleCustomStyle: this.loadingMoreTitleCustomStyle,
+				iconCustomStyle: this.loadingMoreLoadingIconCustomStyle,
+				loadingIconType: this.loadingMoreLoadingIconType,
+				loadingIconCustomImage: this.loadingMoreLoadingIconCustomImage,
+				loadingAnimated: this.loadingMoreLoadingAnimated,
+				showNoMoreLine: this.showLoadingMoreNoMoreLine,
+				noMoreLineCustomStyle: this.loadingMoreNoMoreLineCustomStyle,
+				defaultText: this.finalLoadingMoreDefaultText,
+				loadingText: this.finalLoadingMoreLoadingText,
+				noMoreText: this.finalLoadingMoreNoMoreText,
+				failText: this.finalLoadingMoreFailText,
+				hideContent: !this.loadingMoreDefaultAsLoading && this.listRendering
+			};
+		},
+		finalLoadingMoreThemeStyle() {
+			return this.loadingMoreThemeStyle.length ? this.loadingMoreThemeStyle : this.defaultThemeStyle;
+		},
+		showLoadingMoreDefault() {
+			return this._showLoadingMore('Default');
+		},
+		showLoadingMoreLoading() {
+			return this._showLoadingMore('Loading');
+		},
+		showLoadingMoreNoMore() {
+			return this._showLoadingMore('NoMore');
+		},
+		showLoadingMoreFail() {
+			return this._showLoadingMore('Fail');
+		},
+		showLoadingMoreCustom() {
+			return this._showLoadingMore('Custom');
+		}
+	},
+	methods: {
+		//手动触发上拉加载更多(非必须，可依据具体需求使用)
+		doLoadMore(type) {
+			this._onLoadingMore(type);
+		},
+		//通过@scroll事件检测是否滚动到了底部
+		_checkScrolledToBottom(scrollDiff, checked = false) {
+			if (this.checkScrolledToBottomTimeOut) {
+				clearTimeout(this.checkScrolledToBottomTimeOut);
+				this.checkScrolledToBottomTimeOut = null;
+			}
+			if (this.cacheScrollNodeHeight === -1) {
+				this._getNodeClientRect('.zp-scroll-view').then((res) => {
+					if (res) {
+						let pageScrollNodeHeight = res[0].height;
+						this.cacheScrollNodeHeight = pageScrollNodeHeight;
+						if (scrollDiff - pageScrollNodeHeight <= this.finalLowerThreshold) {
+							this._onLoadingMore('toBottom');
+						}
+					}
+				});
+			} else {
+				if (scrollDiff - this.cacheScrollNodeHeight <= this.finalLowerThreshold) {
+					this._onLoadingMore('toBottom');
+				} else if (scrollDiff - this.cacheScrollNodeHeight <= 500 && !checked) {
+					this.checkScrolledToBottomTimeOut = setTimeout(() => {
+						this._getNodeClientRect('.zp-scroll-view', true, true).then((res) => {
+							this.oldScrollTop = res[0].scrollTop;
+							const newScrollDiff = res[0].scrollHeight - this.oldScrollTop;
+							this._checkScrolledToBottom(newScrollDiff, true);
+						})
+					}, 150)
+				}
+			}
+		},
+		//触发加载更多时调用,from:0-滑动到底部触发；1-点击加载更多触发
+		_onLoadingMore(from = 'click') {
+			if (from === 'toBottom') {
+				if (!this.scrollToBottomBounceEnabled) {
+					if (this.scrollEnable) {
+						this.scrollEnable = false;
+						this.$nextTick(() => {
+							this.scrollEnable = true;
+						})
+					}
+				}
+				//#ifdef APP-VUE || H5
+				if (this.isIos) {
+					this.renderPropUsePageScroll = -1;
+					this.$nextTick(() => {
+						this.renderPropUsePageScroll = this.usePageScroll;
+					})
+				}
+				//#endif
+			}
+			this.$emit('scrolltolower', from);
+			if (from === 'toBottom' && (!this.toBottomLoadingMoreEnabled || this.useChatRecordMode)) return;
+			if (this.refresherOnly || !this.loadingMoreEnabled || !(this.loadingStatus === Enum.More.Default || this.loadingStatus === Enum.More.Fail) || this.loading) return;
+			// #ifdef MP-WEIXIN
+			if (!this.isIos && !this.refresherOnly && !this.usePageScroll) {
+				const currentTimestamp = u.getTime();
+				if (this.loadingMoreTimeStamp > 0 && currentTimestamp - this.loadingMoreTimeStamp < 100) {
+					this.loadingMoreTimeStamp = 0;
+					return;
+				}
+			}
+			// #endif
+			this._doLoadingMore();
+		},
+		//处理开始加载更多
+		_doLoadingMore() {
+			if (this.pageNo >= this.defaultPageNo && this.loadingStatus !== Enum.More.NoMore) {
+				this.pageNo++;
+				this._startLoading(false);
+				if (this.isLocalPaging) {
+					this._localPagingQueryList(this.pageNo, this.defaultPageSize, this.localPagingLoadingTime, (res) => {
+						this.addData(res);
+					})
+				} else {
+					this._emitQuery(this.pageNo, this.defaultPageSize, Enum.QueryFrom.LoadingMore);
+					this._callMyParentQuery();
+				}
+				this.loadingType = Enum.LoadingType.LoadingMore;
+			}
+		},
+		//(预处理)判断当没有更多数据且分页内容未超出z-paging时是否显示没有更多数据的view
+		_preCheckShowLoadingMoreWhenNoMoreAndInsideOfPaging(newVal, scrollViewNode, pagingContainerNode) {
+			if (this.loadingStatus === Enum.More.NoMore && this.hideLoadingMoreWhenNoMoreByLimit > 0 && newVal.length) {
+				this.showLoadingMore = newVal.length > this.hideLoadingMoreWhenNoMoreByLimit;
+			} else if ((this.loadingStatus === Enum.More.NoMore && this.hideLoadingMoreWhenNoMoreAndInsideOfPaging && newVal.length) || (this.insideMore && this.insideOfPaging !== false && newVal.length)) {
+				this.$nextTick(() => {
+					this._checkShowLoadingMoreWhenNoMoreAndInsideOfPaging(newVal, scrollViewNode, pagingContainerNode);
+				})
+				if (this.insideMore && this.insideOfPaging !== false && newVal.length) {
+					this.showLoadingMore = newVal.length;
+				}
+			} else {
+				this.showLoadingMore = newVal.length;
+			}
+		},
+		//判断当没有更多数据且分页内容未超出z-paging时是否显示没有更多数据的view
+		async _checkShowLoadingMoreWhenNoMoreAndInsideOfPaging(totalData, oldScrollViewNode, oldPagingContainerNode) {
+			try {
+				const scrollViewNode = oldScrollViewNode || await this._getNodeClientRect('.zp-scroll-view');
+				if (this.usePageScroll) {
+					if (scrollViewNode) {
+						const scrollViewTotalH = scrollViewNode[0].top + scrollViewNode[0].height;
+						this.insideOfPaging = scrollViewTotalH < this.windowHeight;
+						if (this.hideLoadingMoreWhenNoMoreAndInsideOfPaging) {
+							this.showLoadingMore = !this.insideOfPaging;
+						}
+						this._updateInsideOfPaging();
+					}
+				} else {
+					let pagingContainerH = 0;
+					let scrollViewH = 0;
+					const pagingContainerNode = oldPagingContainerNode || await this._getNodeClientRect('.zp-paging-container-content');
+					if (pagingContainerNode) {
+						pagingContainerH = pagingContainerNode[0].height;
+					}
+					if (scrollViewNode) {
+						scrollViewH = scrollViewNode[0].height;
+					}
+					this.insideOfPaging = pagingContainerH < scrollViewH;
+					if (this.hideLoadingMoreWhenNoMoreAndInsideOfPaging) {
+						this.showLoadingMore = !this.insideOfPaging;
+					}
+					this._updateInsideOfPaging();
+				}
+			} catch (e) {
+				this.insideOfPaging = !totalData.length;
+				if (this.hideLoadingMoreWhenNoMoreAndInsideOfPaging) {
+					this.showLoadingMore = !this.insideOfPaging;
+				}
+				this._updateInsideOfPaging();
+			}
+		},
+		//是否要展示上拉加载更多view
+		_showLoadingMore(type) {
+			if (!this.showLoadingMoreWhenReload && (!(this.loadingStatus === Enum.More.Default ? this.nShowBottom : true) || !this.totalData.length)) return false;
+			if (((!this.showLoadingMoreWhenReload || this.isUserPullDown || this.loadingStatus !== Enum.More.Loading) && !this.showLoadingMore) || 
+			(!this.loadingMoreEnabled && (!this.showLoadingMoreWhenReload || this.isUserPullDown || this.loadingStatus !== Enum.More.Loading)) || 
+			this.refresherOnly) return false;
+			if (this.useChatRecordMode && type !== 'Loading') return false;
+			if (!this.$slots) return false;
+			if (type === 'Custom') {
+				return this.showDefaultLoadingMoreText && !(this.loadingStatus === Enum.More.NoMore && !this.showLoadingMoreNoMoreView);
+			}
+			const res = this.loadingStatus === Enum.More[type] && this.$slots[`loadingMore${type}`] && (type === 'NoMore' ? this.showLoadingMoreNoMoreView : true);
+			if (res) {
+				// #ifdef APP-NVUE
+				if (!this.isIos) {
+					this.nLoadingMoreFixedHeight = false;
+				}
+				//  #endif
+			}
+			return res;
+		},
+	}
+}
+
+export default ZPLoadMore;

h5_web/uni_modules/z-paging/components/z-paging/js/modules/nvue.js

@@ -0,0 +1,219 @@
+// [z-paging]nvue独有部分模块
+import u from '.././z-paging-utils'
+import Enum from '.././z-paging-enum'
+
+// #ifdef APP-NVUE
+const weexAnimation = weex.requireModule('animation');
+// #endif
+const ZPNvue = {
+	props: {
+		//nvue中修改列表类型，可选值有list、waterfall和scroller，默认为list
+		nvueListIs: {
+			type: String,
+			default: u.gc('nvueListIs', 'list')
+		},
+		//nvue waterfall配置，仅在nvue中且nvueListIs=waterfall时有效，配置参数详情参见：https://uniapp.dcloud.io/component/waterfall
+		nvueWaterfallConfig: {
+			type: Object,
+			default: function() {
+				return u.gc('nvueWaterfallConfig', {});
+			}
+		},
+		//nvue 控制是否回弹效果，iOS不支持动态修改
+		nvueBounce: {
+			type: Boolean,
+			default: u.gc('nvueBounce', true)
+		},
+		//nvue中通过代码滚动到顶部/底部时，是否加快动画效果(无滚动动画时无效)，默认为否
+		nvueFastScroll: {
+			type: Boolean,
+			default: u.gc('nvueFastScroll', false)
+		},
+		//nvue中list的id
+		nvueListId: {
+			type: String,
+			default: u.gc('nvueListId', '')
+		},
+		//nvue中refresh组件的样式
+		nvueRefresherStyle: {
+			type: Object,
+			default: function() {
+				return u.gc('nvueRefresherStyle', {});
+			}
+		},
+		//nvue中是否按分页模式(类似竖向swiper)显示List，默认为false
+		nvuePagingEnabled: {
+			type: Boolean,
+			default: u.gc('nvuePagingEnabled', false)
+		},
+		//是否隐藏nvue列表底部的tagView，此view用于标识滚动到底部位置，若隐藏则滚动到底部功能将失效，在nvue中实现吸顶+swiper功能时需将最外层z-paging的此属性设置为true。默认为否
+		hideNvueBottomTag: {
+			type: Boolean,
+			default: u.gc('hideNvueBottomTag', false)
+		},
+	},
+	data() {
+		return {
+			nRefresherLoading: false,
+			nListIsDragging: false,
+			nShowBottom: true,
+			nFixFreezing: false,
+			nShowRefresherReveal: false,
+			nIsFirstPageAndNoMore: false,
+			nFirstPageAndNoMoreChecked: false,
+			nLoadingMoreFixedHeight: false,
+			nShowRefresherRevealHeight: 0,
+			nRefresherWidth: uni.upx2px(750),
+		}
+	},
+	watch: {
+		nIsFirstPageAndNoMore: {
+			handler(newVal) {
+				const cellStyle = !this.useChatRecordMode || newVal ? {} : {transform: 'rotate(180deg)'};
+				this.$emit('update:cellStyle', cellStyle);
+			},
+			immediate: true
+		}
+	},
+	computed: {
+		// #ifdef APP-NVUE
+		nWaterfallColumnCount() {
+			if (this.finalNvueListIs !== 'waterfall') return 0;
+			return this._nGetWaterfallConfig('column-count', 2);
+		},
+		nWaterfallColumnWidth() {
+			return this._nGetWaterfallConfig('column-width', 'auto');
+		},
+		nWaterfallColumnGap() {
+			return this._nGetWaterfallConfig('column-gap', 'normal');
+		},
+		nWaterfallLeftGap() {
+			return this._nGetWaterfallConfig('left-gap', 0);
+		},
+		nWaterfallRightGap() {
+			return this._nGetWaterfallConfig('right-gap', 0);
+		},
+		nViewIs() {
+			const is = this.finalNvueListIs;
+			return is === 'scroller' || is === 'view' ? 'view' : is === 'waterfall' ? 'header' : 'cell';
+		},
+		nSafeAreaBottomHeight() {
+			return this.safeAreaInsetBottom ? this.safeAreaBottom : 0;
+		},
+		finalNvueListIs() {
+			if (this.usePageScroll) return 'view';
+			const nvueListIsLowerCase = this.nvueListIs.toLowerCase();
+			if (['list','waterfall','scroller'].indexOf(nvueListIsLowerCase) !== -1) {
+				return nvueListIsLowerCase;
+			}
+			return 'list';
+		},
+		finalNvueSuperListIs() {
+			return this.usePageScroll ? 'view' : 'scroller';
+		},
+		finalNvueRefresherEnabled() {
+			return this.finalNvueListIs !== 'view' && this.finalRefresherEnabled && !this.nShowRefresherReveal && !this.useChatRecordMode;
+		},
+		// #endif
+	},
+	methods: {
+		// #ifdef APP-NVUE
+		//列表滚动时触发
+		_nOnScroll(e) {
+			this.$emit('scroll', e);
+			const contentOffsetY = e.contentOffset.y;
+			this.nListIsDragging = e.isDragging;
+			this._checkShouldShowBackToTop(-e.contentOffset.y, -e.contentOffset.y - 1);
+		},
+		//下拉刷新刷新中
+		_nOnRrefresh() {
+			if (this.nShowRefresherReveal) return;
+			this.nRefresherLoading = true;
+			this.refresherStatus = Enum.Refresher.Loading;
+			this._doRefresherLoad();
+		},
+		//下拉刷新下拉中
+		_nOnPullingdown(e) {
+			if (this.refresherStatus === Enum.Refresher.Loading || (this.isIos && !this.nListIsDragging)) return;
+			this._emitTouchmove(e);
+			const viewHeight = e.viewHeight;
+			const pullingDis = e.pullingDistance;
+			this.refresherStatus = pullingDis >= viewHeight ? Enum.Refresher.ReleaseToRefresh : Enum.Refresher.Default;
+		},
+		//下拉刷新结束
+		_nRefresherEnd(doEnd=true) {
+			if (doEnd) {
+			   this._nDoRefresherEndAnimation(0, -this.nShowRefresherRevealHeight); 
+			   !this.usePageScroll && this.$refs['zp-n-list'].resetLoadmore();
+			   this.nRefresherLoading = false;
+			}
+			this.$nextTick(() => {
+				setTimeout(()=> {
+					this.nShowBottom = true;
+				}, 10);
+			})
+		},
+		//执行主动触发下拉刷新动画
+		_nDoRefresherEndAnimation(height, translateY, animate = true, checkStack = true) {
+			this._cleanRefresherCompleteTimeout();
+			this._cleanRefresherEndTimeout();
+			if (!this.finalShowRefresherWhenReload) {
+				this.refresherEndTimeout = setTimeout(() => {
+					this.refresherStatus = Enum.Refresher.Default;
+				}, this.refresherCompleteDuration);
+				return;
+			}
+			const stackCount = this.refresherRevealStackCount;
+			if (height === 0 && checkStack) {
+				this.refresherRevealStackCount--;
+				if (stackCount > 1) return;
+				this.refresherEndTimeout = setTimeout(() => {
+					this.refresherStatus = Enum.Refresher.Default;
+				}, this.refresherCompleteDuration);
+			}
+			if (stackCount > 1) {
+				this.refresherStatus = Enum.Refresher.Loading;
+			}
+			const duration = animate ? 120 : 0;
+			weexAnimation.transition(this.$refs['zp-n-list-refresher-reveal'], {
+				styles: {
+					height: `${height}px`,
+					transform: `translateY(${translateY}px)`,
+				},
+				duration: duration,
+				timingFunction: 'linear',
+				needLayout: true,
+				delay: 0
+			})
+			setTimeout(() => {
+				if (animate) {
+					this.nShowRefresherReveal = height > 0;
+				}
+			}, duration > 0 ? duration - 100 : 0);
+		},
+		//滚动到底部加载更多
+		_nOnLoadmore() {
+			if (this.nShowRefresherReveal || !this.totalData.length) return;
+			this.useChatRecordMode ? this.doChatRecordLoadMore() : this._onLoadingMore('toBottom');
+		},
+		//获取nvue waterfall单项配置
+		_nGetWaterfallConfig(key, defaultValue) {
+			return this.nvueWaterfallConfig[key] || defaultValue;
+		},
+		//更新nvue 下拉刷新view容器的宽度
+		_nUpdateRefresherWidth() {
+			this.$nextTick(()=>{
+				this._getNodeClientRect('.zp-n-list').then(node => {
+					if (node) {
+						const nodeWidth = node[0].width;
+						this.nRefresherWidth = nodeWidth;
+					}
+				})
+			})
+			
+		}
+		// #endif
+	}
+}
+
+export default ZPNvue;

h5_web/uni_modules/z-paging/components/z-paging/js/modules/refresher.js

@@ -0,0 +1,632 @@
+// [z-paging]下拉刷新view模块
+import u from '.././z-paging-utils'
+import c from '.././z-paging-constant'
+import Enum from '.././z-paging-enum'
+
+const ZPRefresher = {
+	props: {
+		//下拉刷新的主题样式，支持black，white，默认black
+		refresherThemeStyle: {
+			type: String,
+			default: function() {
+				return u.gc('refresherThemeStyle', '');
+			}
+		},
+		//自定义下拉刷新中左侧图标的样式
+		refresherImgStyle: {
+			type: Object,
+			default: function() {
+				return u.gc('refresherImgStyle', {});
+			}
+		},
+		//自定义下拉刷新中右侧状态描述文字的样式
+		refresherTitleStyle: {
+			type: Object,
+			default: function() {
+				return u.gc('refresherTitleStyle', {});
+			}
+		},
+		//自定义下拉刷新中右侧最后更新时间文字的样式(show-refresher-update-time为true时有效)
+		refresherUpdateTimeStyle: {
+			type: Object,
+			default: function() {
+				return u.gc('refresherUpdateTimeStyle', {});
+			}
+		},
+		//在微信小程序和QQ小程序中，是否实时监听下拉刷新中进度，默认为否
+		watchRefresherTouchmove: {
+			type: Boolean,
+			default: u.gc('watchRefresherTouchmove', false)
+		},
+		//底部加载更多的主题样式，支持black，white，默认black
+		loadingMoreThemeStyle: {
+			type: String,
+			default: function() {
+				return u.gc('loadingMoreThemeStyle', '');
+			}
+		},
+		//是否只使用下拉刷新，设置为true后将关闭mounted自动请求数据、关闭滚动到底部加载更多，强制隐藏空数据图。默认为否
+		refresherOnly: {
+			type: Boolean,
+			default: u.gc('refresherOnly', false)
+		},
+		//自定义下拉刷新默认状态下回弹动画时间，单位为毫秒，默认为100毫秒，nvue无效
+		refresherDefaultDuration: {
+			type: [Number, String],
+			default: u.gc('refresherDefaultDuration', 100)
+		},
+		//自定义下拉刷新结束以后延迟回弹的时间，单位为毫秒，默认为0
+		refresherCompleteDelay: {
+			type: [Number, String],
+			default: u.gc('refresherCompleteDelay', 0)
+		},
+		//自定义下拉刷新结束回弹动画时间，单位为毫秒，默认为300毫秒(refresherEndBounceEnabled为false时，refresherCompleteDuration为设定值的1/3)，nvue无效
+		refresherCompleteDuration: {
+			type: [Number, String],
+			default: u.gc('refresherCompleteDuration', 300)
+		},
+		//自定义下拉刷新结束状态下是否允许列表滚动，默认为否
+		refresherCompleteScrollable: {
+			type: Boolean,
+			default: u.gc('refresherCompleteScrollable', false)
+		},
+		//是否使用自定义的下拉刷新，默认为是，即使用z-paging的下拉刷新。设置为false即代表使用uni scroll-view自带的下拉刷新，h5、App、微信小程序以外的平台不支持uni scroll-view自带的下拉刷新
+		useCustomRefresher: {
+			type: Boolean,
+			default: u.gc('useCustomRefresher', true)
+		},
+		//自定义下拉刷新下拉帧率，默认为40，过高可能会出现抖动问题
+		refresherFps: {
+			type: [Number, String],
+			default: u.gc('refresherFps', 40)
+		},
+		//自定义下拉刷新允许触发的最大下拉角度，默认为40度，当下拉角度小于设定值时，自定义下拉刷新动画不会被触发
+		refresherMaxAngle: {
+			type: [Number, String],
+			default: u.gc('refresherMaxAngle', 40)
+		},
+		//自定义下拉刷新的角度由未达到最大角度变到达到最大角度时，是否继续下拉刷新手势，默认为否
+		refresherAngleEnableChangeContinued: {
+			type: Boolean,
+			default: u.gc('refresherAngleEnableChangeContinued', false)
+		},
+		//自定义下拉刷新默认状态下的文字
+		refresherDefaultText: {
+			type: [String, Object],
+			default: u.gc('refresherDefaultText', null)
+		},
+		//自定义下拉刷新松手立即刷新状态下的文字
+		refresherPullingText: {
+			type: [String, Object],
+			default: u.gc('refresherPullingText', null)
+		},
+		//自定义下拉刷新刷新中状态下的文字
+		refresherRefreshingText: {
+			type: [String, Object],
+			default: u.gc('refresherRefreshingText', null)
+		},
+		//自定义下拉刷新刷新结束状态下的文字
+		refresherCompleteText: {
+			type: [String, Object],
+			default: u.gc('refresherCompleteText', null)
+		},
+		//是否开启自定义下拉刷新刷新结束回弹效果，默认为是
+		refresherEndBounceEnabled: {
+			type: Boolean,
+			default: u.gc('refresherEndBounceEnabled', true)
+		},
+		//是否开启自定义下拉刷新，默认为是
+		refresherEnabled: {
+			type: Boolean,
+			default: u.gc('refresherEnabled', true)
+		},
+		//设置自定义下拉刷新阈值，默认为80rpx
+		refresherThreshold: {
+			type: [Number, String],
+			default: u.gc('refresherThreshold', '80rpx')
+		},
+		//设置系统下拉刷新默认样式，支持设置 black，white，none，none 表示不使用默认样式，默认为black
+		refresherDefaultStyle: {
+			type: String,
+			default: u.gc('refresherDefaultStyle', 'black')
+		},
+		//设置自定义下拉刷新区域背景
+		refresherBackground: {
+			type: String,
+			default: u.gc('refresherBackground', 'transparent')
+		},
+		//设置固定的自定义下拉刷新区域背景
+		refresherFixedBackground: {
+			type: String,
+			default: u.gc('refresherFixedBackground', 'transparent')
+		},
+		//设置固定的自定义下拉刷新区域高度，默认为0
+		refresherFixedBacHeight: {
+			type: [Number, String],
+			default: u.gc('refresherFixedBacHeight', 0)
+		},
+		//设置自定义下拉刷新下拉超出阈值后继续下拉位移衰减的比例，范围0-1，值越大代表衰减越多。默认为0.7(nvue无效)
+		refresherOutRate: {
+			type: Number,
+			default: u.gc('refresherOutRate', 0.7)
+		},
+		//是否显示最后更新时间，默认为否
+		showRefresherUpdateTime: {
+			type: Boolean,
+			default: u.gc('showRefresherUpdateTime', false)
+		},
+		//如果需要区别不同页面的最后更新时间，请为不同页面的z-paging的`refresher-update-time-key`设置不同的字符串
+		refresherUpdateTimeKey: {
+			type: String,
+			default: u.gc('refresherUpdateTimeKey', 'default')
+		},
+	},
+	data() {
+		return {
+			//下拉刷新状态
+			refresherStatus: Enum.Refresher.Default,
+			refresherTouchstartY: 0,
+			lastRefresherTouchmove: null,
+			refresherReachMaxAngle: true,
+			refresherTransform: 'translateY(0px)',
+			refresherTransition: '',
+			finalRefresherDefaultStyle: 'black',
+			refresherRevealStackCount: 0,
+			refresherCompleteTimeout: null,
+			refresherCompleteSubTimeout: null,
+			refresherEndTimeout: null,
+			isTouchmovingTimeout: null,
+			refresherTriggered: false,
+			isTouchmoving: false,
+			isTouchEnded: false,
+			isUserPullDown: false,
+			privateRefresherEnabled: -1,
+			privateShowRefresherWhenReload: false,
+			customRefresherHeight: -1,
+			showCustomRefresher: false,
+			doRefreshAnimateAfter: false,
+			isRefresherInComplete: false,
+			pullDownTimeStamp: 0,
+			moveDis: 0,
+			oldMoveDis: 0,
+			oldRefresherTouchmoveY: 0,
+			oldTouchDirection: ''
+		}
+	},
+	watch: {
+		refresherDefaultStyle: {
+			handler(newVal) {
+				if (newVal.length) {
+					this.finalRefresherDefaultStyle = newVal;
+				}
+			},
+			immediate: true
+		},
+		refresherStatus(newVal, oldVal) {
+			if (newVal === Enum.Refresher.Loading){
+				this._cleanRefresherEndTimeout();
+			}
+			this.$emit('refresherStatusChange', newVal);
+			this.$emit('update:refresherStatus', newVal);
+		},
+		moveDis(newVal, oldVal){
+			this.oldMoveDis = oldVal;
+		}
+	},
+	computed: {
+		pullDownDisTimeStamp() {
+			return 1000 / this.refresherFps;
+		},
+		finalRefresherEnabled() {
+			if (this.useChatRecordMode) return false;
+			if (this.privateRefresherEnabled === -1) return this.refresherEnabled;
+			return this.privateRefresherEnabled === 1;
+		},
+		finalRefresherThreshold() {
+			let refresherThreshold = this.refresherThreshold;
+			let idDefault = false;
+			if (refresherThreshold === '80rpx') {
+				idDefault = true;
+				if (this.showRefresherUpdateTime) {
+					refresherThreshold = '120rpx';
+				}
+			}
+			if (idDefault && this.customRefresherHeight > 0) {
+				return this.customRefresherHeight;
+			}
+			return u.convertTextToPx(refresherThreshold);
+		},
+		finalRefresherFixedBacHeight() {
+			return u.convertTextToPx(this.refresherFixedBacHeight);
+		},
+		finalRefresherThemeStyle() {
+			return this.refresherThemeStyle.length ? this.refresherThemeStyle : this.defaultThemeStyle;
+		},
+		finalRefresherOutRate() {
+			let rate = this.refresherOutRate;
+			rate = Math.max(0,rate);
+			rate = Math.min(1,rate);
+			return rate;
+		},
+		finalRefresherTransform() {
+			if (this.refresherTransform === 'translateY(0px)') return 'none';
+			return this.refresherTransform;
+		},
+		finalShowRefresherWhenReload() {
+			return this.showRefresherWhenReload || this.privateShowRefresherWhenReload;
+		},
+		finalRefresherTriggered() {
+			if (!(this.finalRefresherEnabled && !this.useCustomRefresher)) return false;
+			return this.refresherTriggered;
+		},
+		showRefresher() {
+			const showRefresher = this.finalRefresherEnabled && this.useCustomRefresher && this.isTouchmoving;
+			// #ifndef APP-NVUE
+			if (this.customRefresherHeight === -1 && showRefresher) {
+				setTimeout(() => {
+					this.$nextTick(()=>{
+						this._updateCustomRefresherHeight();
+					})
+				}, 100)
+			}
+			// #endif
+			return showRefresher;
+		},
+		hasTouchmove(){
+			// #ifdef VUE2
+			// #ifdef APP-VUE || H5
+			if (this.$listeners && !this.$listeners.refresherTouchmove) return false;
+			// #endif
+			// #ifdef MP-WEIXIN || MP-QQ
+			return this.watchRefresherTouchmove;
+			// #endif
+			return true;
+			// #endif
+			return this.watchRefresherTouchmove;
+		},
+	},
+	methods: {
+		//终止下拉刷新状态
+		endRefresh(){
+		   this._refresherEnd();
+		},
+		handleRefresherStatusChanged(func) {
+			this.refresherStatusChangedFunc = func;
+		},
+		//自定义下拉刷新被触发
+		_onRefresh(fromScrollView=false,isUserPullDown=true) {
+			if (fromScrollView && !(this.finalRefresherEnabled && !this.useCustomRefresher)) return;
+			this.$emit('onRefresh');
+			this.$emit('Refresh');
+			// #ifdef APP-NVUE
+			if (this.loading) {
+				setTimeout(()=>{
+					this._nRefresherEnd();
+				},500)
+				return;
+			}
+			// #endif
+			if (this.loading || this.isRefresherInComplete) return;
+			this.loadingType = Enum.LoadingType.Refresher;
+			if (this.nShowRefresherReveal) return;
+			this.isUserPullDown = isUserPullDown;
+			this.isUserReload = !isUserPullDown;
+			this._startLoading(true);
+			this.refresherTriggered = true;
+			if(this.reloadWhenRefresh && isUserPullDown){
+				if (this.useChatRecordMode) {
+					this._onLoadingMore('click')
+				} else {
+					this._reload(false, false, isUserPullDown);
+				}
+			}
+		},
+		//自定义下拉刷新被复位
+		_onRestore() {
+			this.refresherTriggered = 'restore';
+			this.$emit('onRestore');
+			this.$emit('Restore');
+		},
+		// #ifndef APP-VUE || MP-WEIXIN || MP-QQ || H5
+		//拖拽开始
+		_refresherTouchstart(e) {
+			if (this._touchDisabled()) return;
+			const touch = u.getTouch(e);
+			this._handleRefresherTouchstart(touch);
+		},
+		// #endif
+		//进一步处理拖拽开始结果
+		_handleRefresherTouchstart(touch) {
+			if (!this.loading && this.isTouchEnded) {
+				this.isTouchmoving = false;
+			}
+			this.isTouchmovingTimeout && clearTimeout(this.isTouchmovingTimeout);
+			this.isTouchEnded = false;
+			this.refresherTransition = '';
+			this.refresherTouchstartY = touch.touchY;
+			this.$emit('refresherTouchstart', this.refresherTouchstartY);
+			this.lastRefresherTouchmove = touch;
+			this._cleanRefresherCompleteTimeout();
+			this._cleanRefresherEndTimeout();
+		},
+		// #ifndef APP-VUE || MP-WEIXIN || MP-QQ || H5
+		//拖拽中
+		_refresherTouchmove(e) {
+			const currentTimeStamp = u.getTime();
+			let touch = null;
+			let refresherTouchmoveY = 0;
+			if (this.watchTouchDirectionChange) {
+				touch = u.getTouch(e);
+				refresherTouchmoveY = touch.touchY;
+				const direction  = refresherTouchmoveY > this.oldRefresherTouchmoveY ? 'top' : 'bottom';
+				direction === this.oldTouchDirection && this._handleTouchDirectionChange({direction});
+				this.oldTouchDirection = direction;
+				this.oldRefresherTouchmoveY = refresherTouchmoveY;
+			}
+			if (this.pullDownTimeStamp && currentTimeStamp - this.pullDownTimeStamp <= this.pullDownDisTimeStamp) return;
+			if (this._touchDisabled()) return;
+			this.pullDownTimeStamp = Number(currentTimeStamp);
+			touch = u.getTouch(e);
+			refresherTouchmoveY = touch.touchY;
+			let moveDis = refresherTouchmoveY - this.refresherTouchstartY;
+			if (moveDis < 0) return;
+			if (this.refresherMaxAngle >= 0 && this.refresherMaxAngle <= 90 && this.lastRefresherTouchmove && this.lastRefresherTouchmove.touchY <= refresherTouchmoveY) {
+				if (!moveDis && !this.refresherAngleEnableChangeContinued && this.moveDis < 1 && !this.refresherReachMaxAngle) return;
+				const x = Math.abs(touch.touchX - this.lastRefresherTouchmove.touchX);
+				const y = Math.abs(refresherTouchmoveY - this.lastRefresherTouchmove.touchY);
+				const z = Math.sqrt(Math.pow(x, 2) + Math.pow(y, 2));
+				if ((x || y) && x > 1) {
+					const angle = Math.asin(y / z) / Math.PI * 180;
+					if (angle < this.refresherMaxAngle) {
+						this.lastRefresherTouchmove = touch;
+						this.refresherReachMaxAngle = false;
+						return;
+					}
+				}
+			}
+			moveDis = this._getFinalRefresherMoveDis(moveDis);
+			this._handleRefresherTouchmove(moveDis, touch);
+			if (!this.disabledBounce) {
+				if(this.isIos){
+					// #ifndef MP-LARK
+					this._handleScrollViewDisableBounce({bounce: false});
+					// #endif
+				}
+				this.disabledBounce = true;
+			}
+			this._emitTouchmove({pullingDistance:moveDis,dy:this.moveDis - this.oldMoveDis});
+		},
+		// #endif
+		//进一步处理拖拽中结果
+		_handleRefresherTouchmove(moveDis, touch) {
+			this.refresherReachMaxAngle = true;
+			this.isTouchmovingTimeout && clearTimeout(this.isTouchmovingTimeout);
+			this.isTouchmoving = true;
+			//this.refresherTransition = '';
+			this.isTouchEnded = false;
+			this.refresherStatus = moveDis >= this.finalRefresherThreshold ? Enum.Refresher.ReleaseToRefresh : this.refresherStatus = Enum.Refresher.Default;
+			// #ifndef APP-VUE || MP-WEIXIN || MP-QQ  || H5
+			// this.scrollEnable = false;
+			this.refresherTransform = `translateY(${moveDis}px)`;
+			this.lastRefresherTouchmove = touch;
+			// #endif
+			this.moveDis = moveDis;
+		},
+		// #ifndef APP-VUE || MP-WEIXIN || MP-QQ || H5
+		//拖拽结束
+		_refresherTouchend(e) {
+			if (this._touchDisabled() || !this.isTouchmoving) return;
+			const touch = u.getTouch(e);
+			let refresherTouchendY = touch.touchY;
+			let moveDis = refresherTouchendY - this.refresherTouchstartY;
+			moveDis = this._getFinalRefresherMoveDis(moveDis);
+			this._handleRefresherTouchend(moveDis);
+			this._handleScrollViewDisableBounce({bounce: true});
+			this.disabledBounce = false;
+		},
+		// #endif
+		//进一步处理拖拽结束结果
+		_handleRefresherTouchend(moveDis) {
+			// #ifndef APP-PLUS || H5 || MP-WEIXIN
+			if (!this.isTouchmoving) return;
+			// #endif
+			this.isTouchmovingTimeout && clearTimeout(this.isTouchmovingTimeout);
+			this.refresherReachMaxAngle = true;
+			if (moveDis < 0 && this.usePageScroll && this.loadingMoreEnabled && this.useCustomRefresher && this.pageScrollTop === -1) {
+				if (this.showConsoleError) {
+					u.consoleErr('usePageScroll为true并且自定义下拉刷新时必须引入mixin或在page滚动时通过调用z-paging组件的updatePageScrollTop方法设置当前的scrollTop');
+				}
+			}
+			this.isTouchEnded = true;
+			if (moveDis >= this.finalRefresherThreshold && this.refresherStatus === Enum.Refresher.ReleaseToRefresh) {
+				// #ifndef APP-VUE || MP-WEIXIN || MP-QQ  || H5
+				this.refresherTransform = `translateY(${this.finalRefresherThreshold}px)`;
+				// #endif
+				this.moveDis = this.finalRefresherThreshold;
+				this.refresherStatus = Enum.Refresher.Loading;
+				this._doRefresherLoad();
+			} else {
+				this._refresherEnd();
+				this.isTouchmovingTimeout = setTimeout(() => {
+					this.isTouchmoving = false;
+				}, this.refresherDefaultDuration);
+			}
+			this.scrollEnable = true;
+			this.$emit('refresherTouchend', moveDis);
+		},
+		//处理scroll-view bounce是否生效
+		_handleScrollViewDisableBounce(e) {
+			if (!this.usePageScroll && !this.scrollToTopBounceEnabled) {
+				this.refresherTransition = '';
+				this.scrollEnable = e.bounce;
+			}
+		},
+		//wxs正在下拉状态改变处理
+		_handleWxsPullingDownStatusChange(onPullingDown) {
+			this.wxsOnPullingDown = onPullingDown;
+			if (onPullingDown && !this.useChatRecordMode) {
+				this.renderPropScrollTop = 0;
+			}
+		},
+		//wxs正在下拉处理
+		_handleWxsPullingDown(e){
+			this._emitTouchmove({pullingDistance:e.moveDis,dy:e.diffDis});
+		},
+		//wxs触摸方向改变
+		_handleTouchDirectionChange(e) {
+			this.$emit('touchDirectionChange',e.direction);
+		},
+		//wxs通知更新其props
+		_handlePropUpdate(e){
+			this.wxsPropType = u.getTime().toString();
+		},
+		//下拉刷新结束
+		_refresherEnd(shouldEndLoadingDelay = true, fromAddData = false, isUserPullDown = false, setLoading = true) {
+			if (this.loadingType === Enum.LoadingType.Refresher) {
+				let refresherCompleteDelay = 0;
+				if(fromAddData && (isUserPullDown || this.showRefresherWhenReload)){
+					refresherCompleteDelay = this.refresherCompleteDuration > 700 ? 1 : this.refresherCompleteDelay;
+				}
+				const refresherStatus = refresherCompleteDelay > 0 ? Enum.Refresher.Complete : Enum.Refresher.Default;
+				if (this.finalShowRefresherWhenReload) {
+					const stackCount = this.refresherRevealStackCount;
+					this.refresherRevealStackCount--;
+					if (stackCount > 1) return;
+				}
+				this._cleanRefresherEndTimeout();
+				this.refresherEndTimeout = setTimeout(() => {
+					this.refresherStatus = refresherStatus;
+				}, this.refresherStatus !== Enum.Refresher.Default && refresherStatus === Enum.Refresher.Default ? this.refresherCompleteDuration : 0);
+				
+				// #ifndef APP-NVUE
+				if (refresherCompleteDelay > 0) {
+					this.isRefresherInComplete = true;
+				}
+				// #endif
+				this._cleanRefresherCompleteTimeout();
+				this.refresherCompleteTimeout = setTimeout(() => {
+					let animateDuration = 1;
+					const animateType = this.refresherEndBounceEnabled && fromAddData ? 'cubic-bezier(0.19,1.64,0.42,0.72)' : 'linear';
+					if (fromAddData) {
+						animateDuration = this.refresherEndBounceEnabled ? this.refresherCompleteDuration / 1000 : this.refresherCompleteDuration / 3000;
+					}
+					this.refresherTransition = `transform ${fromAddData ? animateDuration : this.refresherDefaultDuration / 1000}s ${animateType}`;
+					// #ifndef APP-VUE || MP-WEIXIN || MP-QQ  || H5
+					this.refresherTransform = 'translateY(0px)';
+					// #endif
+					// #ifdef APP-VUE || MP-WEIXIN || MP-QQ || H5
+					this.wxsPropType = this.refresherTransition + 'end' + u.getTime();
+					// #endif
+					// #ifdef APP-NVUE
+					this._nRefresherEnd();
+					// #endif
+					this.moveDis = 0;
+					// #ifndef APP-NVUE
+					if (refresherStatus === Enum.Refresher.Complete) {
+						if (this.refresherCompleteSubTimeout) {
+							clearTimeout(this.refresherCompleteSubTimeout);
+							this.refresherCompleteSubTimeout = null;
+						}
+						this.refresherCompleteSubTimeout = setTimeout(() => {
+							this.$nextTick(() => {
+								this.refresherStatus = Enum.Refresher.Default;
+								this.isRefresherInComplete = false;
+							})
+						}, animateDuration * 800);
+					}
+					// #endif
+				}, refresherCompleteDelay);
+			}
+			if (setLoading) {
+				setTimeout(() => {
+					this.loading = false;
+				}, shouldEndLoadingDelay ? c.delayTime : 0);
+				isUserPullDown && this._onRestore();
+			}
+		},
+		//模拟用户手动触发下拉刷新
+		_doRefresherRefreshAnimate() {
+			this._cleanRefresherCompleteTimeout();
+			// #ifndef APP-NVUE
+			const doRefreshAnimateAfter = !this.doRefreshAnimateAfter && (this.finalShowRefresherWhenReload) && this
+				.customRefresherHeight === -1 && this.refresherThreshold === '80rpx';
+			if (doRefreshAnimateAfter) {
+				this.doRefreshAnimateAfter = true;
+				return;
+			}
+			// #endif
+			this.refresherRevealStackCount++;
+			// #ifndef APP-VUE || MP-WEIXIN || MP-QQ  || H5
+			this.refresherTransform = `translateY(${this.finalRefresherThreshold}px)`;
+			// #endif
+			// #ifdef APP-VUE || MP-WEIXIN || MP-QQ || H5
+			this.wxsPropType = 'begin' + u.getTime();
+			// #endif
+			this.moveDis = this.finalRefresherThreshold;
+			this.refresherStatus = Enum.Refresher.Loading;
+			this.isTouchmoving = true;
+			this.isTouchmovingTimeout && clearTimeout(this.isTouchmovingTimeout);
+			this._doRefresherLoad(false);
+		},
+		//触发下拉刷新
+		_doRefresherLoad(isUserPullDown=true) {
+			this._onRefresh(false,isUserPullDown);
+			this.loading = true;
+		},
+		//获取处理后的moveDis
+		_getFinalRefresherMoveDis(moveDis) {
+			moveDis = moveDis * 0.85;
+			if (moveDis >= this.finalRefresherThreshold) {
+				moveDis = this.finalRefresherThreshold + (moveDis - this.finalRefresherThreshold) * (1 - this.finalRefresherOutRate);
+			}
+			return moveDis;
+		},
+		// #ifndef APP-VUE || MP-WEIXIN || MP-QQ || H5
+		//判断touch手势是否要触发
+		_touchDisabled() {
+			let checkOldScrollTop = this.oldScrollTop > 5;
+			return this.loading || this.isRefresherInComplete || this.useChatRecordMode || !this.refresherEnabled || !this.useCustomRefresher ||(this.usePageScroll && this.useCustomRefresher && this.pageScrollTop > 10) || (!(this.usePageScroll && this.useCustomRefresher) && checkOldScrollTop);
+		},
+		// #endif
+		//更新自定义下拉刷新view高度
+		_updateCustomRefresherHeight() {
+			this._getNodeClientRect('.zp-custom-refresher-slot-view').then((res) => {
+				if (res) {
+					this.customRefresherHeight = res[0].height;
+					if (this.customRefresherHeight > 0) {
+						this.showCustomRefresher = true;
+					}
+				} else {
+					this.customRefresherHeight = 0;
+				}
+				if (this.doRefreshAnimateAfter) {
+					this.doRefreshAnimateAfter = false;
+					this._doRefresherRefreshAnimate();
+				}
+			});
+		},
+		//发射pullingDown事件
+		_emitTouchmove(e){
+			// #ifndef APP-NVUE
+			e.viewHeight = this.finalRefresherThreshold;
+			// #endif
+			e.rate = e.pullingDistance / e.viewHeight;
+			if(this.hasTouchmove){
+				this.$emit('refresherTouchmove',e);
+			}
+		},
+		//清除refresherCompleteTimeout
+		_cleanRefresherCompleteTimeout() {
+			this.refresherCompleteTimeout = this._cleanTimeout(this.refresherCompleteTimeout);
+			// #ifdef APP-NVUE
+			this._nRefresherEnd(false);
+			// #endif
+		},
+		//清除refresherEndTimeout
+		_cleanRefresherEndTimeout() {
+			this.refresherEndTimeout = this._cleanTimeout(this.refresherEndTimeout);
+		},
+	}
+}
+
+export default ZPRefresher;

h5_web/uni_modules/z-paging/components/z-paging/js/modules/scroller.js

@@ -0,0 +1,478 @@
+// [z-paging]scroll相关模块
+import u from '.././z-paging-utils'
+import Enum from '.././z-paging-enum'
+
+// #ifdef APP-NVUE
+const weexDom = weex.requireModule('dom');
+// #endif
+const ZPScroller = {
+	props: {
+		//使用页面滚动，默认为否，当设置为是时则使用页面的滚动而非此组件内部的scroll-view的滚动，使用页面滚动时z-paging无需设置确定的高度且对于长列表展示性能更高，但配置会略微繁琐
+		usePageScroll: {
+			type: Boolean,
+			default: u.gc('usePageScroll', false)
+		},
+		//是否可以滚动，使用内置scroll-view和nvue时有效，默认为是
+		scrollable: {
+			type: Boolean,
+			default: u.gc('scrollable', true)
+		},
+		//控制是否出现滚动条，默认为是
+		showScrollbar: {
+			type: Boolean,
+			default: u.gc('showScrollbar', true)
+		},
+		//是否允许横向滚动，默认为否
+		scrollX: {
+			type: Boolean,
+			default: u.gc('scrollX', false)
+		},
+		//iOS设备上滚动到顶部时是否允许回弹效果，默认为否。关闭回弹效果后可使滚动到顶部与下拉刷新更连贯，但是有吸顶view时滚动到顶部时可能出现抖动。
+		scrollToTopBounceEnabled: {
+			type: Boolean,
+			default: u.gc('scrollToTopBounceEnabled', false)
+		},
+		//iOS设备上滚动到底部时是否允许回弹效果，默认为是。
+		scrollToBottomBounceEnabled: {
+			type: Boolean,
+			default: u.gc('scrollToBottomBounceEnabled', true)
+		},
+		//在设置滚动条位置时使用动画过渡，默认为否
+		scrollWithAnimation: {
+			type: Boolean,
+			default: u.gc('scrollWithAnimation', false)
+		},
+		//值应为某子元素id（id不能以数字开头）。设置哪个方向可滚动，则在哪个方向滚动到该元素
+		scrollIntoView: {
+			type: String,
+			default: u.gc('scrollIntoView', '')
+		},
+	},
+	data() {
+		return {
+			scrollTop: 0,
+			oldScrollTop: 0,
+			scrollViewStyle: {},
+			scrollViewContainerStyle: {},
+			scrollViewInStyle: {},
+			pageScrollTop: -1,
+			scrollEnable: true,
+			privateScrollWithAnimation: -1,
+			cacheScrollNodeHeight: -1
+		}
+	},
+	watch: {
+		oldScrollTop(newVal, oldVal) {
+			!this.usePageScroll && this._scrollTopChange(newVal,oldVal,false);
+		},
+		pageScrollTop(newVal, oldVal) {
+			this.usePageScroll && this._scrollTopChange(newVal,oldVal,true);
+		},
+		usePageScroll: {
+			handler(newVal) {
+				this.$nextTick(() => {
+					this.renderPropUsePageScroll = newVal;
+				})
+				if (this.loaded && this.autoHeight) {
+					this._setAutoHeight(!newVal);
+				}
+				// #ifdef H5
+				if (newVal) {
+					this.$nextTick(()=>{
+						const mainScrollRef = this.$refs['zp-scroll-view'].$refs.main;
+						if (mainScrollRef) {
+							mainScrollRef.style = {};
+						}
+					})
+				}
+				// #endif
+			},
+			immediate: true
+		},
+		finalScrollTop(newVal, oldVal) {
+			if (!this.useChatRecordMode) {
+				this.renderPropScrollTop = newVal < 6 ? 0 : 10;
+			}
+		},
+	},
+	computed: {
+		finalScrollWithAnimation() {
+			if (this.privateScrollWithAnimation !== -1) {
+				const scrollWithAnimation = this.privateScrollWithAnimation === 1;
+				this.privateScrollWithAnimation = -1;
+				return scrollWithAnimation;
+			}
+			return this.scrollWithAnimation;
+		},
+		finalScrollViewStyle() {
+			if (this.superContentZIndex != 1) {
+				this.scrollViewStyle['z-index'] = this.superContentZIndex;
+				this.scrollViewStyle['position'] = 'relative';
+			}
+			return this.scrollViewStyle;
+		},
+		finalScrollTop() {
+			return this.usePageScroll ? this.pageScrollTop : this.oldScrollTop;
+		},
+		finalIsOldWebView() {
+			return this.isOldWebView && !this.usePageScroll;
+		}
+	},
+	methods: {
+		//滚动到顶部，animate为是否展示滚动动画，默认为是
+		scrollToTop(animate,checkReverse = true) {
+			// #ifdef APP-NVUE
+			if (checkReverse && this.useChatRecordMode) {
+				if(!this.nIsFirstPageAndNoMore){
+					this.scrollToBottom(animate, false);
+					return;
+				}
+			}
+			// #endif
+			this.$nextTick(() => {
+				this._scrollToTop(animate, false);
+				// #ifdef APP-NVUE
+				if (this.nvueFastScroll && animate) {
+					setTimeout(() => {
+						this._scrollToTop(false, false);
+					}, 150);
+				}
+				// #endif
+			})
+		},
+		//滚动到底部，animate为是否展示滚动动画，默认为是
+		scrollToBottom(animate,checkReverse = true) {
+			// #ifdef APP-NVUE
+			if (checkReverse && this.useChatRecordMode) {
+				if(!this.nIsFirstPageAndNoMore){
+					this.scrollToTop(animate, false);
+					return;
+				}
+			}
+			// #endif
+			this.$nextTick(() => {
+				this._scrollToBottom(animate);
+				// #ifdef APP-NVUE
+				if (this.nvueFastScroll && animate) {
+					setTimeout(() => {
+						this._scrollToBottom(false);
+					}, 150);
+				}
+				// #endif
+			})
+		},
+		//滚动到指定view(vue中有效)。sel为需要滚动的view的id值，不包含"#"；offset为偏移量，单位为px；animate为是否展示滚动动画，默认为否
+		scrollIntoViewById(sel, offset, animate) {
+			this._scrollIntoView(sel, offset, animate);
+		},
+		//滚动到指定view(vue中有效)。nodeTop为需要滚动的view的top值(通过uni.createSelectorQuery()获取)；offset为偏移量，单位为px；animate为是否展示滚动动画，默认为否
+		scrollIntoViewByNodeTop(nodeTop, offset, animate) {
+			this.scrollTop = this.oldScrollTop;
+			this.$nextTick(() => {
+				this._scrollIntoViewByNodeTop(nodeTop, offset, animate);
+			})
+		},
+		//滚动到指定位置(vue中有效)。y为与顶部的距离，单位为px；offset为偏移量，单位为px；animate为是否展示滚动动画，默认为否
+		scrollToY(y, offset, animate) {
+			this.scrollTop = this.oldScrollTop;
+			this.$nextTick(() => {
+				this._scrollToY(y, offset, animate);
+			})
+		},
+		//滚动到指定view(nvue中有效)。index为需要滚动的view的index(第几个)；offset为偏移量，单位为px；animate为是否展示滚动动画，默认为否
+		scrollIntoViewByIndex(index, offset, animate) {
+			this._scrollIntoView(index, offset, animate);
+		},
+		//滚动到指定view(nvue中有效)。view为需要滚动的view(通过`this.$refs.xxx`获取)，不包含"#"；offset为偏移量，单位为px；animate为是否展示滚动动画，默认为否
+		scrollIntoViewByView(view, offset, animate) {
+			this._scrollIntoView(view, offset, animate);
+		},
+		//当使用页面滚动并且自定义下拉刷新时，请在页面的onPageScroll中调用此方法，告知z-paging当前的pageScrollTop，否则会导致在任意位置都可以下拉刷新
+		updatePageScrollTop(value) {
+			if (value == undefined) {
+				u.consoleErr('updatePageScrollTop方法缺少参数，请将页面onPageScroll事件中的scrollTop传递给此方法');
+				return;
+			}
+			this.pageScrollTop = value;
+		},
+		//当使用页面滚动并且设置了slot="top"时，默认初次加载会自动获取其高度，并使内部容器下移，当slot="top"的view高度动态改变时，在其高度需要更新时调用此方法
+		updatePageScrollTopHeight() {
+			this._updatePageScrollTopOrBottomHeight('top');
+		},
+		//当使用页面滚动并且设置了slot="bottom"时，默认初次加载会自动获取其高度，并使内部容器下移，当slot="bottom"的view高度动态改变时，在其高度需要更新时调用此方法
+		updatePageScrollBottomHeight() {
+			this._updatePageScrollTopOrBottomHeight('bottom');
+		},
+		//更新z-paging内置scroll-view的scrollTop
+		updateScrollViewScrollTop(scrollTop, animate = true) {
+			this.privateScrollWithAnimation = animate ? 1 : 0;
+			this.scrollTop = this.oldScrollTop;
+			this.$nextTick(() => {
+				this.scrollTop = scrollTop;
+				this.oldScrollTop = this.scrollTop;
+			});
+		},
+		
+		//当滚动到顶部时
+		_scrollToUpper() {
+			this.$emit('scrolltoupper');
+			this.$emit('scrollTopChange', 0);
+			this.$nextTick(() => {
+				this.oldScrollTop = 0;
+			})
+			if (!this.useChatRecordMode) return;
+			if (this.loadingStatus === Enum.More.NoMore) return;
+			this._onLoadingMore('click');
+		},
+		//滚动到顶部
+		_scrollToTop(animate = true, isPrivate = true) {
+			// #ifdef APP-NVUE
+			const el = this.$refs['zp-n-list-top-tag'];
+			if (this.usePageScroll) {
+				this._getNodeClientRect('zp-page-scroll-top', false).then((node) => {
+					let nodeHeight = 0;
+					if (node) {
+						nodeHeight = node[0].height;
+					}
+					weexDom.scrollToElement(el, {
+						offset: -nodeHeight,
+						animated: animate
+					});
+				});
+			} else {
+				if(!this.isIos && this.nvueListIs === 'scroller'){
+					this._getNodeClientRect('zp-n-refresh-container', false).then((node) => {
+						let nodeHeight = 0;
+						if (node) {
+							nodeHeight = node[0].height;
+						}
+						weexDom.scrollToElement(el, {
+							offset: -nodeHeight,
+							animated: animate
+						});
+					});
+				}else{
+					weexDom.scrollToElement(el, {
+						offset: 0,
+						animated: animate
+					});
+				}
+			}
+			return;
+			// #endif
+			if (this.usePageScroll) {
+				this.$nextTick(() => {
+					uni.pageScrollTo({
+						scrollTop: 0,
+						duration: animate ? 100 : 0,
+					});
+				});
+				return;
+			}
+			this.privateScrollWithAnimation = animate ? 1 : 0;
+			this.scrollTop = this.oldScrollTop;
+			this.$nextTick(() => {
+				this.scrollTop = 0;
+				this.oldScrollTop = this.scrollTop;
+			});
+		},
+		//滚动到底部
+		async _scrollToBottom(animate = true) {
+			// #ifdef APP-NVUE
+			const el = this.$refs['zp-n-list-bottom-tag'];
+			if (el) {
+				weexDom.scrollToElement(el, {
+					offset: 0,
+					animated: animate
+				});
+			} else {
+				u.consoleErr('滚动到底部失败，因为您设置了hideNvueBottomTag为true');
+			}
+			return;
+			// #endif
+			if (this.usePageScroll) {
+				this.$nextTick(() => {
+					uni.pageScrollTo({
+						scrollTop: Number.MAX_VALUE,
+						duration: animate ? 100 : 0,
+					});
+				});
+				return;
+			}
+			try {
+				this.privateScrollWithAnimation = animate ? 1 : 0;
+				let pagingContainerH = 0;
+				let scrollViewH = 0;
+				const pagingContainerNode = await this._getNodeClientRect('.zp-paging-container');
+				const scrollViewNode = await this._getNodeClientRect('.zp-scroll-view');
+				if (pagingContainerNode) {
+					pagingContainerH = pagingContainerNode[0].height;
+				}
+				if (scrollViewNode) {
+					scrollViewH = scrollViewNode[0].height;
+				}
+				if (pagingContainerH > scrollViewH) {
+					this.scrollTop = this.oldScrollTop;
+					this.$nextTick(() => {
+						this.scrollTop = pagingContainerH - scrollViewH + this.virtualPlaceholderTopHeight;
+						this.oldScrollTop = this.scrollTop;
+					});
+				}
+			} catch (e) {}
+		},
+		//滚动到指定view
+		_scrollIntoView(sel, offset = 0, animate = false, finishCallback) {
+			try {
+				this.scrollTop = this.oldScrollTop;
+				this.$nextTick(() => {
+					// #ifdef APP-NVUE
+					const refs = this.$parent.$refs;
+					if (!refs) return;
+					const dataType = Object.prototype.toString.call(sel);
+					let el = null;
+					if (dataType === '[object Number]') {
+						const els = refs[`z-paging-${sel}`];
+						el = els ? els[0] : null;
+					} else if (dataType === '[object Array]') {
+						el = sel[0];
+					} else {
+						el = sel;
+					}
+					if (el) {
+						weexDom.scrollToElement(el, {
+							offset: -offset,
+							animated: animate
+						});
+					} else {
+						u.consoleErr('在nvue中滚动到指定位置，cell必须设置 :ref="`z-paging-${index}`"');
+					}
+					return;
+					// #endif
+					if (sel.indexOf('#') != -1) {
+						sel = sel.replace('#', '');
+					}
+					this._getNodeClientRect('#' + sel, false).then((node) => {
+						if (node) {
+							let nodeTop = node[0].top;
+							this._scrollIntoViewByNodeTop(nodeTop, offset, animate);
+							if (finishCallback) {
+								finishCallback();
+							}
+						}
+					});
+				});
+			} catch (e) {}
+		},
+		//通过nodeTop滚动到指定view
+		_scrollIntoViewByNodeTop(nodeTop, offset = 0, animate = false) {
+			this._scrollToY(nodeTop,offset,animate,true);
+		},
+		//滚动到指定位置
+		_scrollToY(y, offset = 0, animate = false, addScrollTop = false) {
+			this.privateScrollWithAnimation = animate ? 1 : 0;
+			if (this.usePageScroll) {
+				uni.pageScrollTo({
+					scrollTop: y - offset,
+					duration: animate ? 100 : 0
+				});
+			} else {
+				if(addScrollTop){
+				   y += this.oldScrollTop; 
+				}
+				this.scrollTop = y - offset;
+				this.oldScrollTop = this.scrollTop;
+			}
+		},
+		//scroll-view滚动中
+		_scroll(e) {
+			this.$emit('scroll', e);
+			const scrollTop = e.detail.scrollTop;
+			// #ifndef APP-NVUE
+			this.finalUseVirtualList && this._updateVirtualScroll(scrollTop,this.oldScrollTop - scrollTop);
+			// #endif
+			this.oldScrollTop = scrollTop;
+			const scrollDiff = e.detail.scrollHeight - this.oldScrollTop;
+			!this.isIos && this._checkScrolledToBottom(scrollDiff);
+		},
+		//scrollTop改变时触发
+		_scrollTopChange(newVal,oldVal,isPageScrollTop){
+			this.$emit('scrollTopChange', newVal);
+			this.$emit('update:scrollTop', newVal);
+			this._checkShouldShowBackToTop(newVal, oldVal);
+			const scrollTop = this.isIos ? (newVal > 5 ? 6 : 0) : newVal;
+			if (isPageScrollTop) {
+				this.wxsPageScrollTop = scrollTop;
+			} else {
+				this.wxsScrollTop = scrollTop;
+			}
+		},
+		//更新使用页面滚动时slot="top"或"bottom"插入view的高度
+		_updatePageScrollTopOrBottomHeight(type) {
+			// #ifndef APP-NVUE
+			if (!this.usePageScroll) return;
+			// #endif
+			this._doCheckScrollViewShouldFullHeight(this.realTotalData);
+			const node = `.zp-page-${type}`;
+			const marginText = `margin${type.slice(0,1).toUpperCase() + type.slice(1)}`;
+			let safeAreaInsetBottomAdd = this.safeAreaInsetBottom;
+			// #ifdef APP-NVUE
+			if (!this.usePageScroll) {
+				safeAreaInsetBottomAdd = false;
+			}
+			// #endif
+			this.$nextTick(() => {
+				let delayTime = 0;
+				// #ifdef MP-BAIDU || APP-NVUE
+				delayTime = 10;
+				// #endif
+				setTimeout(() => {
+					this._getNodeClientRect(node).then((res) => {
+						if (res) {
+							let pageScrollNodeHeight = res[0].height;
+							if (type === 'bottom') {
+								if (safeAreaInsetBottomAdd) {
+									pageScrollNodeHeight += this.safeAreaBottom;
+								}
+							} else {
+								this.cacheTopHeight = pageScrollNodeHeight;
+							}
+							this.$set(this.scrollViewStyle, marginText,
+								`${pageScrollNodeHeight}px`);
+						} else if (safeAreaInsetBottomAdd) {
+							this.$set(this.scrollViewStyle, marginText, `${this.safeAreaBottom}px`);
+						}
+					});
+				}, delayTime)
+			})
+		},
+		//获取slot="left"和slot="right"宽度并且更新布局
+		_updateLeftAndRightWidth(){
+			if (!this.finalIsOldWebView) return;
+			this.$nextTick(() => {
+				let delayTime = 0;
+				// #ifdef MP-BAIDU
+				delayTime = 10;
+				// #endif
+				setTimeout(() => {
+					this._getNodeClientRect('.zp-page-left').then((res) => {
+						this.scrollViewContainerStyle['left'] = res ? res[0].width + 'px' : 0;
+					});
+					this._getNodeClientRect('.zp-page-right').then((res) => {
+						this.scrollViewContainerStyle['right'] = res ? res[0].width + 'px' : 0;
+					});
+				}, delayTime)
+			})
+		},
+		//更新renderJs数据
+		_updateRenderJsData(){
+			this.renderPropUsePageScroll = -1;
+			this.renderPropUsePageScroll = this.usePageScroll;
+			if (!this.useChatRecordMode) {
+				this.renderPropScrollTop = -1;
+				this.renderPropScrollTop = this.finalScrollTop < 6 ? 0 : 10;
+			}
+		}
+	}
+}
+
+export default ZPScroller;

h5_web/uni_modules/z-paging/components/z-paging/js/modules/virtual-list.js

@@ -0,0 +1,374 @@
+// [z-paging]虚拟列表模块
+import u from '.././z-paging-utils'
+import c from '.././z-paging-constant'
+import Enum from '.././z-paging-enum'
+
+const ZPVirtualList = {
+	props: {
+		//是否使用虚拟列表，默认为否
+		useVirtualList: {
+			type: Boolean,
+			default: u.gc('useVirtualList', false)
+		},
+		//是否在z-paging内部循环渲染列表(内置列表)，默认为否。若use-virtual-list为true，则此项恒为true
+		useInnerList: {
+			type: Boolean,
+			default: u.gc('useInnerList', false)
+		},
+		//强制关闭inner-list，默认为false，如果为true将强制关闭innerList，适用于开启了虚拟列表后需要强制关闭inner-list的情况
+		forceCloseInnerList: {
+			type: Boolean,
+			default: u.gc('forceCloseInnerList', false)
+		},
+		//内置列表cell的key名称，仅nvue有效，在nvue中开启use-inner-list时必须填此项
+		cellKeyName: {
+			type: String,
+			default: u.gc('cellKeyName', '')
+		},
+		//innerList样式
+		innerListStyle: {
+			type: Object,
+			default: function() {
+				return u.gc('innerListStyle', {});
+			}
+		},
+		//innerCell样式
+		innerCellStyle: {
+			type: Object,
+			default: function() {
+				return u.gc('innerCellStyle', {});
+			}
+		},
+		//预加载的列表可视范围(列表高度)页数，默认为7，即预加载当前页及上下各7页的cell。此数值越大，则虚拟列表中加载的dom越多，内存消耗越大(会维持在一个稳定值)，但增加预加载页面数量可缓解快速滚动短暂白屏问题
+		preloadPage: {
+			type: [Number, String],
+			default: u.gc('preloadPage', 7),
+			validator: (value) => {
+				if (value <= 0) u.consoleErr('preload-page必须大于0！');
+				return value > 0;
+			}
+		},
+		//虚拟列表cell高度模式，默认为fixed，也就是每个cell高度完全相同，将以第一个cell高度为准进行计算。可选值【dynamic】，即代表高度是动态非固定的，【dynamic】性能低于【fixed】。
+		cellHeightMode: {
+			type: String,
+			default: u.gc('cellHeightMode', 'fixed')
+		},
+		//虚拟列表列数，默认为1。常用于每行有多列的情况，例如每行有2列数据，需要将此值设置为2
+		virtualListCol: {
+			type: [Number, String],
+			default: u.gc('virtualListCol', 1)
+		},
+		//虚拟列表scroll取样帧率，默认为60，过高可能出现卡顿等问题
+		virtualScrollFps: {
+			type: [Number, String],
+			default: u.gc('virtualScrollFps', 60)
+		},
+	},
+	data() {
+		return {
+			virtualListKey: u.getInstanceId(),
+			virtualPageHeight: 0,
+			virtualCellHeight: 0,
+			virtualScrollTimeStamp: 0,
+			
+			virtualList: [],
+			virtualPlaceholderTopHeight: 0,
+			virtualPlaceholderBottomHeight: 0,
+			virtualTopRangeIndex: 0,
+			virtualBottomRangeIndex: 0,
+			lastVirtualTopRangeIndex: 0,
+			lastVirtualBottomRangeIndex: 0,
+			
+			virtualHeightCacheList: [],
+			
+			getCellHeightRetryCount: {
+				fixed: 0,
+				dynamic: 0
+			},
+			pagingOrgTop: -1,
+			updateVirtualListFromDataChange: false
+		}
+	},
+	watch: {
+		realTotalData(newVal) {
+			// #ifndef APP-NVUE
+			if (this.finalUseVirtualList) {
+				this.updateVirtualListFromDataChange = true;
+				this.$nextTick(() => {
+					if (!newVal.length) {
+						this._resetDynamicListState(!this.isUserPullDown);
+					}
+					this.getCellHeightRetryCount.fixed = 0;
+					this.finalUseVirtualList && newVal.length && this.cellHeightMode === Enum.CellHeightMode.Fixed && this.isFirstPage && this._updateFixedCellHeight();
+					this.finalUseVirtualList && this._updateVirtualScroll(this.oldScrollTop);
+				})
+			}
+			// #endif
+		},
+		virtualList(newVal){
+			this.$emit('update:virtualList', newVal);
+			this.$emit('virtualListChange', newVal);
+		}
+	},
+	computed: {
+		finalUseVirtualList() {
+			if (this.useVirtualList && this.usePageScroll){
+				u.consoleErr('使用页面滚动时，开启虚拟列表无效！');
+			}
+			return this.useVirtualList && !this.usePageScroll;
+		},
+		finalUseInnerList() {
+			return this.useInnerList || (this.finalUseVirtualList && !this.forceCloseInnerList)
+		},
+		finalCellKeyName() {
+			// #ifdef APP-NVUE
+			if (this.finalUseVirtualList){
+				if (!this.cellKeyName.length){
+					u.consoleErr('在nvue中开启use-virtual-list必须设置cell-key-name，否则将可能导致列表渲染错误！');
+				}
+			}
+			// #endif
+			return this.cellKeyName;
+		},
+		finalVirtualPageHeight(){
+			return this.virtualPageHeight > 0 ? this.virtualPageHeight : this.windowHeight;
+			return virtualPageHeight * this.preloadPage;
+		},
+		virtualRangePageHeight(){
+			return this.finalVirtualPageHeight * this.preloadPage;
+		},
+		virtualScrollDisTimeStamp() {
+			return 1000 / this.virtualScrollFps;
+		},
+	},
+	methods: {
+		//初始化虚拟列表
+		_virtualListInit() {
+			this.$nextTick(() => {
+				setTimeout(() => {
+					this._getNodeClientRect('.zp-scroll-view').then(node => {
+						if (node && node.length) {
+							this.pagingOrgTop = node[0].top;
+							this.virtualPageHeight = node[0].height;
+						}
+					});
+				}, 100);
+			})
+		},
+		//cellHeightMode为fixed时获取第一个cell高度
+		_updateFixedCellHeight() {
+			this.$nextTick(() => {
+				const updateFixedCellHeightTimeout = setTimeout(() => {
+					this._getNodeClientRect(`#zp-${0}`,this.finalUseInnerList).then(cellNode => {
+						const hasCellNode = cellNode && cellNode.length;
+						if (!hasCellNode) {
+							clearTimeout(updateFixedCellHeightTimeout);
+							if (this.getCellHeightRetryCount.fixed > 10) {
+								u.consoleErr('获取虚拟列表cell高度失败，可能是for循环cell处没有写:id="`zp-${item.zp_index}`"，请检查您的代码！')
+								return;
+							}
+							this.getCellHeightRetryCount.fixed++;
+							this._updateFixedCellHeight();
+						} else {
+							this.virtualCellHeight = cellNode[0].height;
+							this._updateVirtualScroll(this.oldScrollTop);
+						}
+					});
+				}, 100);
+			})
+		},
+		//cellHeightMode为dynamic时获取每个cell高度
+		_updateDynamicCellHeight(list) {
+			this.$nextTick(() => {
+				const updateDynamicCellHeightTimeout = setTimeout(async () => {
+					for (let i = 0; i < list.length; i++) {
+						let item = list[i];
+						const cellNode = await this._getNodeClientRect(`#zp-${item[c.listCellIndexKey]}`,this.finalUseInnerList);
+						const hasCellNode = cellNode && cellNode.length;
+						const currentHeight = hasCellNode ? cellNode[0].height : 0;
+						if (!hasCellNode) {
+							clearTimeout(updateDynamicCellHeightTimeout);
+							this.virtualHeightCacheList = this.virtualHeightCacheList.slice(-i);
+							if (this.getCellHeightRetryCount.dynamic > 10) {
+								u.consoleErr('获取虚拟列表cell高度失败，可能是for循环cell处没有写:id="`zp-${item.zp_index}`"，请检查您的代码！')
+								return;
+							}
+							this.getCellHeightRetryCount.dynamic++;
+							this._updateDynamicCellHeight(list);
+							break;
+						}
+						let lastHeightCache = null;
+						if (this.virtualHeightCacheList.length) {
+							lastHeightCache = this.virtualHeightCacheList.slice(-1)[0];
+						}
+						const lastHeight = lastHeightCache ? lastHeightCache.totalHeight : 0;
+						this.virtualHeightCacheList.push({
+							height: currentHeight,
+							lastHeight: lastHeight,
+							totalHeight: lastHeight + currentHeight
+						});
+					}
+					this._updateVirtualScroll(this.oldScrollTop);
+				}, 100)
+			})
+		},
+		//设置cellItem的index
+		_setCellIndex(list, isFirstPage) {
+			let lastItem = null;
+			let lastItemIndex = 0;
+			if (!isFirstPage) {
+				lastItemIndex = this.realTotalData.length;
+				if (this.realTotalData.length) {
+					lastItem = this.realTotalData.slice(-1)[0];
+				}
+				if (lastItem && lastItem[c.listCellIndexKey] !== undefined) {
+					lastItemIndex = lastItem[c.listCellIndexKey] + 1;
+				}
+			} else {			
+				this._resetDynamicListState();
+			}
+			for (let i = 0; i < list.length; i++) {
+				let item = list[i];
+				if (!item || Object.prototype.toString.call(item) !== '[object Object]') {
+					item = {item};
+				}
+				item[c.listCellIndexKey] = lastItemIndex + i;
+				item[c.listCellIndexUniqueKey] = `${this.virtualListKey}-${item[c.listCellIndexKey]}`;
+				list[i] = item;
+			}
+			this.getCellHeightRetryCount.dynamic = 0;
+			this.cellHeightMode === Enum.CellHeightMode.Dynamic && this._updateDynamicCellHeight(list);
+		},
+		//更新scroll滚动
+		_updateVirtualScroll(scrollTop, scrollDiff = 0) {
+			const currentTimeStamp = u.getTime();
+			if (scrollTop === 0) {
+				this._resetTopRange();
+			}
+			if (scrollTop !== 0 && this.virtualScrollTimeStamp && currentTimeStamp - this.virtualScrollTimeStamp <= this.virtualScrollDisTimeStamp) {
+				return;
+			}
+			this.virtualScrollTimeStamp = Number(currentTimeStamp);
+			
+			let scrollIndex = 0;
+			const cellHeightMode = this.cellHeightMode;
+			if (cellHeightMode === Enum.CellHeightMode.Fixed) {
+				scrollIndex = parseInt(scrollTop / this.virtualCellHeight) || 0;
+				this._updateFixedTopRangeIndex(scrollIndex);
+				this._updateFixedBottomRangeIndex(scrollIndex);
+			} else if(cellHeightMode === Enum.CellHeightMode.Dynamic) {
+				const scrollDirection = scrollDiff > 0 ? 'top' : 'bottom';
+				const rangePageHeight = this.virtualRangePageHeight;
+				const topRangePageOffset = scrollTop - rangePageHeight;
+				const bottomRangePageOffset = scrollTop + this.finalVirtualPageHeight + rangePageHeight;
+				
+				let virtualBottomRangeIndex = 0;
+				let virtualPlaceholderBottomHeight = 0;
+				let reachedLimitBottom = false;
+				let lastHeightCache = null;
+				const heightCacheList = this.virtualHeightCacheList;
+				if (heightCacheList.length) {
+					lastHeightCache = heightCacheList.slice(-1)[0];
+				}
+				let startTopRangeIndex = this.virtualTopRangeIndex;
+				if (scrollDirection === 'bottom') {
+					for (let i = startTopRangeIndex; i < heightCacheList.length;i++){
+						const heightCacheItem = heightCacheList[i];
+						if (heightCacheItem && heightCacheItem.totalHeight > topRangePageOffset) {
+							this.virtualTopRangeIndex = i;
+							this.virtualPlaceholderTopHeight = heightCacheItem.lastHeight;
+							break;
+						}
+					}
+				} else {
+					let topRangeMatched = false;
+					for (let i = startTopRangeIndex; i >= 0;i--){
+						const heightCacheItem = heightCacheList[i];
+						if (heightCacheItem && heightCacheItem.totalHeight < topRangePageOffset) {
+							this.virtualTopRangeIndex = i;
+							this.virtualPlaceholderTopHeight = heightCacheItem.lastHeight;
+							topRangeMatched = true;
+							break;
+						}
+					}
+					!topRangeMatched && this._resetTopRange();
+				}
+				for (let i = this.virtualTopRangeIndex; i < heightCacheList.length;i++){
+					const heightCacheItem = heightCacheList[i];
+					if (heightCacheItem && heightCacheItem.totalHeight > bottomRangePageOffset) {
+						virtualBottomRangeIndex = i;
+						virtualPlaceholderBottomHeight = lastHeightCache.totalHeight - heightCacheItem.totalHeight;
+						reachedLimitBottom = true;
+						break;
+					}
+				}
+				if (!reachedLimitBottom || this.virtualBottomRangeIndex === 0) {
+					this.virtualBottomRangeIndex = this.realTotalData.length ? this.realTotalData.length - 1 : this.pageSize;
+					this.virtualPlaceholderBottomHeight = 0;
+				} else {
+					this.virtualBottomRangeIndex = virtualBottomRangeIndex;
+					this.virtualPlaceholderBottomHeight = virtualPlaceholderBottomHeight;
+				}
+				this._updateVirtualList();
+			}
+		},
+		//更新fixedCell模式下topRangeIndex&placeholderTopHeight
+		_updateFixedTopRangeIndex(scrollIndex) {
+			let virtualTopRangeIndex = this.virtualCellHeight === 0 ? 0 : scrollIndex - parseInt(this.finalVirtualPageHeight / this.virtualCellHeight) * this.preloadPage;
+			virtualTopRangeIndex *= this.virtualListCol;
+			virtualTopRangeIndex = Math.max(0, virtualTopRangeIndex);
+			this.virtualTopRangeIndex = virtualTopRangeIndex;
+			this.virtualPlaceholderTopHeight = (virtualTopRangeIndex / this.virtualListCol) * this.virtualCellHeight;
+		},
+		//更新fixedCell模式下bottomRangeIndex&placeholderBottomHeight
+		_updateFixedBottomRangeIndex(scrollIndex) {
+			let virtualBottomRangeIndex = this.virtualCellHeight === 0 ? this.pageSize : scrollIndex + parseInt(this.finalVirtualPageHeight / this.virtualCellHeight) * (this.preloadPage + 1);
+			virtualBottomRangeIndex *= this.virtualListCol;
+			virtualBottomRangeIndex = Math.min(this.realTotalData.length, virtualBottomRangeIndex);
+			this.virtualBottomRangeIndex = virtualBottomRangeIndex;
+			this.virtualPlaceholderBottomHeight = (this.realTotalData.length - virtualBottomRangeIndex) * this.virtualCellHeight / this.virtualListCol;
+			this._updateVirtualList();
+		},
+		//更新virtualList
+		_updateVirtualList() {
+			const shouldUpdateList = this.updateVirtualListFromDataChange || (this.lastVirtualTopRangeIndex !== this.virtualTopRangeIndex || this.lastVirtualBottomRangeIndex !== this.virtualBottomRangeIndex);
+			if (shouldUpdateList) {
+				this.updateVirtualListFromDataChange = false;
+				this.lastVirtualTopRangeIndex =  this.virtualTopRangeIndex;
+				this.lastVirtualBottomRangeIndex =  this.virtualBottomRangeIndex;
+				this.virtualList = this.realTotalData.slice(this.virtualTopRangeIndex, this.virtualBottomRangeIndex + 1);
+			}
+		},
+		//重置动态cell模式下的高度缓存数据、虚拟列表和滚动状态
+		_resetDynamicListState(resetVirtualList = false) {
+			this.virtualHeightCacheList = [];
+			if (resetVirtualList) {
+				this.virtualList = [];
+			}
+			this.virtualTopRangeIndex = 0;
+			this.virtualPlaceholderTopHeight = 0;
+		},
+		//重置topRangeIndex和placeholderTopHeight
+		_resetTopRange() {
+			this.virtualTopRangeIndex = 0;
+			this.virtualPlaceholderTopHeight = 0;
+			this._updateVirtualList();
+		},
+		//检测虚拟列表当前滚动位置，如发现滚动位置不正确则重新计算虚拟列表相关参数(为解决在App中可能出现的长时间进入后台后打开App白屏的问题)
+		_checkVirtualListScroll() {
+			if (this.finalUseVirtualList) {
+				this.$nextTick(() => {
+					this._getNodeClientRect('.zp-paging-touch-view').then(node => {
+						const hasNode = node && node.length;
+						const currentTop = hasNode ? node[0].top : 0;
+						if (!hasNode || (currentTop === this.pagingOrgTop && this.virtualPlaceholderTopHeight !== 0)){
+							this._updateVirtualScroll(0);
+						}
+					});
+				})
+			}
+		}
+	}
+}
+
+export default ZPVirtualList;

h5_web/uni_modules/z-paging/components/z-paging/js/z-paging-config.js

@@ -7,22 +7,20 @@ const storageKey = 'Z-PAGING-CONFIG-STORAGE-KEY'
 function setConfig(value) {
 	try {
 		uni.setStorageSync(storageKey, value);
-	} catch {}
+	} catch (e) {}
 }
 
 function getConfig() {
 	try {
-		if (getedStorage) {
-			return config;
-		}
+		if (getedStorage) return config;
 		config = uni.getStorageSync(storageKey);
 		getedStorage = true;
-	} catch {
+	} catch (e) {
 		return null;
 	}
 }
 
-module.exports = {
+export default {
 	setConfig,
 	getConfig
 };

h5_web/uni_modules/z-paging/components/z-paging/js/z-paging-constant.js

@@ -0,0 +1,21 @@
+// [z-paging]常量
+
+const version = '2.3.2';
+const delayTime = 100;
+const i18nUpdateKey = 'z-paging-i18n-update';
+
+const errorUpdateKey = 'z-paging-error-emit';
+const completeUpdateKey = 'z-paging-complete-emit';
+
+const listCellIndexKey = 'zp_index';
+const listCellIndexUniqueKey = 'zp_unique_index';
+
+export default {
+	version,
+	delayTime,
+	i18nUpdateKey,
+	errorUpdateKey,
+	completeUpdateKey,
+	listCellIndexKey,
+	listCellIndexUniqueKey
+}

h5_web/uni_modules/z-paging/components/z-paging/js/z-paging-enum.js

@@ -1,25 +1,37 @@
 // [z-paging]枚举
 
 const Enum = {
-	//当前加载类型 0-下拉刷新 1-上拉加载更多
+	//当前加载类型 0.下拉刷新 1.上拉加载更多
 	LoadingType: {
 		Refresher: 0,
 		LoadingMore: 1
 	},
-	//下拉刷新状态 0-默认状态 1.松手立即刷新 2.刷新中 3.刷新结束
-	RefresherStatus: {
+	//下拉刷新状态 0.默认状态 1.松手立即刷新 2.刷新中 3.刷新结束
+	Refresher: {
 		Default: 0,
-		PullToRefresh: 1,
+		ReleaseToRefresh: 1,
 		Loading: 2,
 		Complete: 3
 	},
-	//底部加载更多状态 0-默认状态 1.加载中 2.没有更多数据 3.加载失败
-	LoadingMoreStatus: {
+	//底部加载更多状态 0.默认状态 1.加载中 2.没有更多数据 3.加载失败
+	More: {
 		Default: 0,
 		Loading: 1,
 		NoMore: 2,
 		Fail: 3
+	},
+	//@query触发来源 0.用户主动下拉刷新 1.通过reload触发 2.通过refresh触发 3.通过滚动到底部加载更多或点击底部加载更多触发
+	QueryFrom: {
+		UserPullDown: 0,
+		Reload: 1,
+		Refresh: 2,
+		LoadingMore: 3
+	},
+	//虚拟列表cell高度模式
+	CellHeightMode: {
+		Fixed: 'fixed',
+		Dynamic: 'dynamic'
 	}
 }
 
-module.exports = Enum;
+export default Enum;

h5_web/uni_modules/z-paging/components/z-paging/js/z-paging-i18n.js

@@ -1,90 +1,84 @@
 // z-paging国际化(支持中文、中文繁体和英文)
-
 const i18nUpdateKey = 'z-paging-i18n-update';
 
-const refresherDefaultText = {
-	'en': 'Pull down to refresh',
-	'zh-cn': '继续下拉刷新',
-	'zh-hant-cn': '繼續下拉重繪',
-}
-const refresherPullingText = {
-	'en': 'Release to refresh',
-	'zh-cn': '松开立即刷新',
-	'zh-hant-cn': '鬆開立即重繪',
-}
-const refresherRefreshingText = {
-	'en': 'Refreshing...',
-	'zh-cn': '正在刷新...',
-	'zh-hant-cn': '正在重繪...',
-}
-const refresherCompleteText = {
-	'en': 'Refresh succeeded',
-	'zh-cn': '刷新成功',
-	'zh-hant-cn': '重繪成功',
-}
-
-const loadingMoreDefaultText = {
-	'en': 'Click to load more',
-	'zh-cn': '点击加载更多',
-	'zh-hant-cn': '點擊加載更多',
-}
-const loadingMoreLoadingText = {
-	'en': 'Loading...',
-	'zh-cn': '正在加载...',
-	'zh-hant-cn': '正在加載...',
-}
-const loadingMoreNoMoreText = {
-	'en': 'No more data',
-	'zh-cn': '没有更多了',
-	'zh-hant-cn': '沒有更多了',
-}
-const loadingMoreFailText = {
-	'en': 'Load failed,click to reload',
-	'zh-cn': '加载失败，点击重新加载',
-	'zh-hant-cn': '加載失敗，點擊重新加載',
-}
-
-const emptyViewText = {
-	'en': 'No data',
-	'zh-cn': '没有数据哦~',
-	'zh-hant-cn': '沒有數據哦~',
-}
-
-const emptyViewReloadText = {
-	'en': 'Reload',
-	'zh-cn': '重新加载',
-	'zh-hant-cn': '重新加載',
-}
-
-const emptyViewErrorText = {
-	'en': 'Sorry,load failed',
-	'zh-cn': '很抱歉，加载失败',
-	'zh-hant-cn': '很抱歉，加載失敗',
-}
-
-const refresherUpdateTimeText = {
-	'en': 'Last update: ',
-	'zh-cn': '最后更新：',
-	'zh-hant-cn': '最後更新：',
-}
-
-const refresherUpdateTimeNoneText = {
-	'en': 'None',
-	'zh-cn': '无',
-	'zh-hant-cn': '無',
-}
-
-const refresherUpdateTimeTodayText = {
-	'en': 'Today',
-	'zh-cn': '今天',
-	'zh-hant-cn': '今天',
+const t = {
+	refresherDefaultText: {
+		'en': 'Pull down to refresh',
+		'zh-cn': '继续下拉刷新',
+		'zh-hant-cn': '繼續下拉重繪',
+	},
+	refresherPullingText: {
+		'en': 'Release to refresh',
+		'zh-cn': '松开立即刷新',
+		'zh-hant-cn': '鬆開立即重繪',
+	},
+	refresherRefreshingText: {
+		'en': 'Refreshing...',
+		'zh-cn': '正在刷新...',
+		'zh-hant-cn': '正在重繪...',
+	},
+	refresherCompleteText: {
+		'en': 'Refresh succeeded',
+		'zh-cn': '刷新成功',
+		'zh-hant-cn': '重繪成功',
+	},
+	loadingMoreDefaultText: {
+		'en': 'Click to load more',
+		'zh-cn': '点击加载更多',
+		'zh-hant-cn': '點擊加載更多',
+	},
+	loadingMoreLoadingText: {
+		'en': 'Loading...',
+		'zh-cn': '正在加载...',
+		'zh-hant-cn': '正在加載...',
+	},
+	loadingMoreNoMoreText: {
+		'en': 'No more data',
+		'zh-cn': '没有更多了',
+		'zh-hant-cn': '沒有更多了',
+	},
+	loadingMoreFailText: {
+		'en': 'Load failed,click to reload',
+		'zh-cn': '加载失败，点击重新加载',
+		'zh-hant-cn': '加載失敗，點擊重新加載',
+	},
+	emptyViewText: {
+		'en': 'No data',
+		'zh-cn': '没有数据哦~',
+		'zh-hant-cn': '沒有數據哦~',
+	},
+	emptyViewReloadText: {
+		'en': 'Reload',
+		'zh-cn': '重新加载',
+		'zh-hant-cn': '重新加載',
+	},
+	emptyViewErrorText: {
+		'en': 'Sorry,load failed',
+		'zh-cn': '很抱歉，加载失败',
+		'zh-hant-cn': '很抱歉，加載失敗',
+	},
+	refresherUpdateTimeText: {
+		'en': 'Last update: ',
+		'zh-cn': '最后更新：',
+		'zh-hant-cn': '最後更新：',
+	},
+	refresherUpdateTimeNoneText: {
+		'en': 'None',
+		'zh-cn': '无',
+		'zh-hant-cn': '無',
+	},
+	refresherUpdateTimeTodayText: {
+		'en': 'Today',
+		'zh-cn': '今天',
+		'zh-hant-cn': '今天',
+	},
+	refresherUpdateTimeYesterdayText: {
+		'en': 'Yesterday',
+		'zh-cn': '昨天',
+		'zh-hant-cn': '昨天',
+	}
 }
 
-const refresherUpdateTimeYesterdayText = {
-	'en': 'Yesterday',
-	'zh-cn': '昨天',
-	'zh-hant-cn': '昨天',
-}
 
 // 获取当前语言，格式为:zh-cn、zh-hant-cn、en。followSystemLanguage:获取的结果是否是在不跟随系统语言下获取到的
 function getLanguage(followSystemLanguage = true) {
@@ -116,7 +110,7 @@ function _getPrivateLanguage(myLanguage, followSystemLanguage = true) {
 	}
 	let language = myLanguage || uni.getStorageSync(i18nUpdateKey) || systemLanguage;
 	language = language.toLowerCase();
-	var reg = new RegExp('_', '');
+	const reg = new RegExp('_', '');
 	language = language.replace(reg, '-');
 	if (language.indexOf('zh') !== -1) {
 		if (language === 'zh' || language === 'zh-cn' || language.indexOf('zh-hans') !== -1) {
@@ -130,22 +124,8 @@ function _getPrivateLanguage(myLanguage, followSystemLanguage = true) {
 	return 'zh-cn';
 }
 
-module.exports = {
-	refresherDefaultText,
-	refresherPullingText,
-	refresherRefreshingText,
-	refresherCompleteText,
-	refresherUpdateTimeText,
-	refresherUpdateTimeNoneText,
-	refresherUpdateTimeTodayText,
-	refresherUpdateTimeYesterdayText,
-	loadingMoreDefaultText,
-	loadingMoreLoadingText,
-	loadingMoreNoMoreText,
-	loadingMoreFailText,
-	emptyViewText,
-	emptyViewReloadText,
-	emptyViewErrorText,
+export default {
+	t,
 	getLanguage,
 	getLanguageName,
 	setLanguage,

h5_web/uni_modules/z-paging/components/z-paging/js/z-paging-interceptor.js

@@ -0,0 +1,34 @@
+// [z-paging]拦截器
+
+//拦截&处理@query事件
+function handleQuery(callback) {
+	try {
+		setTimeout(function() {
+			_getApp().globalData.zp_handleQueryCallback = callback;
+		}, 1);
+	} catch (e) {}
+}
+
+//拦截&处理@query事件(私有，请勿调用)
+function _handleQuery(pageNo, pageSize, from){
+	const handleQueryCallback = _getApp().globalData.zp_handleQueryCallback;
+	if (handleQueryCallback) {
+		return handleQueryCallback(pageNo, pageSize, from);
+	}
+	return [pageNo, pageSize, from];
+}
+
+//获取当前app对象
+function _getApp(){
+	// #ifndef APP-NVUE
+	return getApp();
+	// #endif
+	// #ifdef APP-NVUE
+	return getApp({allowDefault: true});
+	// #endif
+}
+
+export default {
+	handleQuery,
+	_handleQuery
+};

h5_web/uni_modules/z-paging/components/z-paging/js/z-paging-mixin.js

@@ -2,25 +2,19 @@
 
 const ZPagingMixin = {
 	onPullDownRefresh() {
-		if (this.isPagingRefNotFound()) {
-			return;
-		}
+		if (this.isPagingRefNotFound()) return;
 		this.$refs.paging.reload();
 	},
 	onPageScroll(e) {
-		if (this.isPagingRefNotFound()) {
-			return;
-		}
+		if (this.isPagingRefNotFound()) return;
 		this.$refs.paging.updatePageScrollTop(e.scrollTop);
 		if (e.scrollTop < 10) {
 			this.$refs.paging.doChatRecordLoadMore();
 		}
 	},
 	onReachBottom() {
-		if (this.isPagingRefNotFound()) {
-			return;
-		}
-		this.$refs.paging.doLoadMore();
+		if (this.isPagingRefNotFound()) return;
+		this.$refs.paging.doLoadMore('toBottom');
 	},
 	methods: {
 		isPagingRefNotFound() {

h5_web/uni_modules/z-paging/components/z-paging/js/z-paging-utils.js

@@ -1,33 +1,61 @@
 // [z-paging]工具类
 
 import zI18n from './z-paging-i18n'
+import zConfig from './z-paging-config'
+import zLocalConfig from '../config/index'
 
 const storageKey = 'Z-PAGING-REFRESHER-TIME-STORAGE-KEY'
+let config = null;
+
+/*
+当z-paging未使用uni_modules管理时，控制台会有警告：WARNING: Module not found: Error: Can't resolve '@/uni_modules/z-paging'...
+此时注释下方try中的代码即可
+*/
+// #ifdef VUE2
+try {
+	const contextKeys = require.context('@/uni_modules/z-paging', false, /\z-paging-config$/).keys();
+	if (contextKeys.length) {
+		const suffix = '.js';
+		config = require('@/uni_modules/z-paging/z-paging-config' + suffix);
+	}
+} catch (e) {}
+// #endif
+
+//获取默认配置信息
+function gc(key, defaultValue) {
+	if (!config) {
+		if (zLocalConfig && Object.keys(zLocalConfig).length) {
+			config = zLocalConfig;
+		} else {
+			const temConfig = zConfig.getConfig();
+			if (zConfig && temConfig) {
+				config = temConfig;
+			}
+		}
+	}
+	if (!config) return defaultValue;
+	const value = config[_toKebab(key)];
+	return value === undefined ? defaultValue : value;
+}
 
 //判断两个数组是否相等
 function arrayIsEqual(arr1, arr2) {
-	if (arr1 === arr2) {
-		return true;
-	}
-	if (arr1.length !== arr2.length) {
-		return false;
-	}
+	if (arr1 === arr2) return true;
+	if (arr1.length !== arr2.length) return false;
 	for (let i = 0; i < arr1.length; i++) {
-		if (arr1[i] !== arr2[i]) {
-			return false;
-		}
+		if (arr1[i] !== arr2[i]) return false;
 	}
 	return true;
 }
 
 //获取最终的touch位置
-function getCommonTouch(e) {
+function getTouch(e) {
 	let touch = null;
 	if (e.touches && e.touches.length) {
 		touch = e.touches[0];
 	} else if (e.changedTouches && e.changedTouches.length) {
 		touch = e.changedTouches[0];
-	} else if (e.datail && e.datail !== {}) {
+	} else if (e.datail && e.datail != {}) {
 		touch = e.datail;
 	} else {
 		return {
@@ -44,8 +72,8 @@ function getCommonTouch(e) {
 //判断当前手势是否在z-paging内触发
 function getTouchFromZPaging(target) {
 	if (target && target.tagName && target.tagName !== 'BODY' && target.tagName !== 'UNI-PAGE-BODY') {
-		var classList = target.classList;
-		if (classList && classList.contains('zp-paging-touch-view')) {
+		const classList = target.classList;
+		if (classList && classList.contains('z-paging-content')) {
 			return true;
 		} else {
 			return getTouchFromZPaging(target.parentNode);
@@ -57,12 +85,8 @@ function getTouchFromZPaging(target) {
 
 //获取z-paging所在的parent
 function getParent(parent) {
-	if (!parent) {
-		return null;
-	}
-	if (parent.$refs.paging) {
-		return parent;
-	}
+	if (!parent) return null;
+	if (parent.$refs.paging) return parent;
 	return getParent(parent.$parent);
 }
 
@@ -85,7 +109,7 @@ function setRefesrherTime(time, key) {
 		}
 		datas[key] = time;
 		uni.setStorageSync(storageKey, datas);
-	} catch {}
+	} catch (e) {}
 }
 
 //获取下拉刷新时间
@@ -93,7 +117,7 @@ function getRefesrherTime() {
 	try {
 		const datas = uni.getStorageSync(storageKey);
 		return datas;
-	} catch {
+	} catch (e) {
 		return null;
 	}
 }
@@ -103,9 +127,7 @@ function getRefesrherTimeByKey(key) {
 	const datas = getRefesrherTime();
 	if (datas) {
 		const data = datas[key];
-		if (data) {
-			return data;
-		}
+		if (data) return data;
 	}
 	return null;
 }
@@ -113,11 +135,11 @@ function getRefesrherTimeByKey(key) {
 //通过下拉刷新标识key获取下拉刷新时间(格式化之后)
 function getRefesrherFormatTimeByKey(key) {
 	const time = getRefesrherTimeByKey(key);
-	let timeText = zI18n['refresherUpdateTimeNoneText'][zI18n.getLanguage()];
+	let timeText = zI18n.t['refresherUpdateTimeNoneText'][zI18n.getLanguage()];
 	if (time) {
 		timeText = _timeFormat(time);
 	}
-	return `${zI18n['refresherUpdateTimeText'][zI18n.getLanguage()]}${timeText}`;
+	return `${zI18n.t['refresherUpdateTimeText'][zI18n.getLanguage()]}${timeText}`;
 }
 
 //将文本的px或者rpx转为px的值
@@ -134,15 +156,29 @@ function convertTextToPx(text) {
 		text = text.replace('px', '');
 	}
 	if (!isNaN(text)) {
-		if (isRpx) {
-			return Number(uni.upx2px(text));
-		}
+		if (isRpx) return Number(uni.upx2px(text));
 		return Number(text);
 	}
 	return 0;
 }
 
+//获取当前时间
+function getTime() {
+	return (new Date()).getTime();
+}
+
+//获取z-paging实例id
+function getInstanceId() {
+    let s = [];
+    const hexDigits = "0123456789abcdef";
+    for (let i = 0; i < 10; i++) {
+        s[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1);
+    }
+    return s.join('') + getTime();
+}
+
 //------------------ 私有方法 ------------------------
+//时间格式化
 function _timeFormat(time) {
 	const date = new Date(time);
 	const currentDate = new Date();
@@ -152,15 +188,16 @@ function _timeFormat(time) {
 	let dayStr = '';
 	const timeStr = _dateTimeFormat(date);
 	if (disTime === 0) {
-		dayStr = zI18n['refresherUpdateTimeTodayText'][zI18n.getLanguage()];
+		dayStr = zI18n.t['refresherUpdateTimeTodayText'][zI18n.getLanguage()];
 	} else if (disTime === -86400000) {
-		dayStr = zI18n['refresherUpdateTimeYesterdayText'][zI18n.getLanguage()];
+		dayStr = zI18n.t['refresherUpdateTimeYesterdayText'][zI18n.getLanguage()];
 	} else {
 		dayStr = _dateDayFormat(date, date.getFullYear() !== currentDate.getFullYear());
 	}
 	return `${dayStr} ${timeStr}`;
 }
 
+//date格式化为年月日
 function _dateDayFormat(date, showYear = true) {
 	const year = date.getFullYear();
 	const month = date.getMonth() + 1;
@@ -172,28 +209,36 @@ function _dateDayFormat(date, showYear = true) {
 	}
 }
 
+//data格式化为时分
 function _dateTimeFormat(date) {
 	const hour = date.getHours();
 	const minute = date.getMinutes();
 	return `${_fullZeroToTwo(hour)}:${_fullZeroToTwo(minute)}`;
 }
 
+//不满2位在前面填充0
 function _fullZeroToTwo(str) {
 	str = str.toString();
-	if (str.length === 1) {
-		return '0' + str;
-	}
+	if (str.length === 1) return '0' + str;
 	return str;
 }
 
-module.exports = {
+//驼峰转短横线
+function _toKebab(value) {
+	return value.replace(/([A-Z])/g, "-$1").toLowerCase();
+}
+
+export default {
+	gc,
 	setRefesrherTime,
 	getRefesrherFormatTimeByKey,
 	arrayIsEqual,
-	getCommonTouch,
+	getTouch,
 	getTouchFromZPaging,
 	getParent,
 	convertTextToPx,
+	getTime,
+	getInstanceId,
 	consoleErr,
 	consoleWarn
 };

h5_web/uni_modules/z-paging/components/z-paging/wxs/z-paging-renderjs.js

@@ -1,27 +1,32 @@
 // [z-paging]使用renderjs在app-vue和h5中对touchmove事件冒泡进行处理
 
-import zUtils from '../js/z-paging-utils'
+import u from '../js/z-paging-utils'
 var data = {
 	renderScrollTop: 0,
 	renderUsePageScroll: false,
-	renderIsIos: uni.getSystemInfoSync().platform === 'ios',
 	startY: 0,
 	isTouchFromZPaging: false
 }
 
+var currentVm = null;
+
 export default {
 	mounted() {
 		this._handleTouch();
+		// #ifdef APP-VUE
+		this.$ownerInstance && this.$ownerInstance.callMethod('_checkVirtualListScroll');
+		// #endif
 	},
 	methods: {
 		//接收逻辑层发送的数据
 		renderPropScrollTopChange(newVal, oldVal, ownerVm, vm) {
+			if (newVal === -1) return;
+			currentVm = ownerVm;
 			data.renderScrollTop = newVal;
 		},
 		renderPropUsePageScrollChange(newVal, oldVal, ownerVm, vm) {
-			if(newVal !== -1){
-				data.renderUsePageScroll = newVal;
-			}
+			if (newVal === -1) return;
+			data.renderUsePageScroll = newVal;
 		},
 		//拦截处理touch事件
 		_handleTouch() {
@@ -36,19 +41,24 @@ export default {
 			}
 		},
 		_handleTouchstart(e) {
-			const touch = zUtils.getCommonTouch(e);
+			const touch = u.getTouch(e);
 			data.startY = touch.touchY;
-			data.isTouchFromZPaging = zUtils.getTouchFromZPaging(e.target);
+			data.isTouchFromZPaging = u.getTouchFromZPaging(e.target);
+			this.$ownerInstance && this.$ownerInstance.callMethod('_updateRenderJsData');
 		},
 		_handleTouchmove(e) {
-			const touch = zUtils.getCommonTouch(e);
+			const touch = u.getTouch(e);
 			var moveY = touch.touchY - data.startY;
-			if ((data.isTouchFromZPaging && data.renderScrollTop < 1 && moveY > 0) || (data.isTouchFromZPaging && data.renderIsIos && !data.renderUsePageScroll && moveY < 0)) {
+			//v2.1.4起删除条件：(data.isTouchFromZPaging && data.renderIsIos && !data.renderUsePageScroll && moveY < 0)
+			if (data.isTouchFromZPaging && data.renderScrollTop < 1 && moveY > 0) {
 				if (e.cancelable && !e.defaultPrevented) {
 					e.preventDefault();
 				}
 			}
 		},
-
+		_removeAllEventListener(){
+			window.removeEventListener('touchstart');
+			window.removeEventListener('touchmove');
+		}
 	}
 };

h5_web/uni_modules/z-paging/components/z-paging/wxs/z-paging-wxs.wxs

@@ -1,83 +1,101 @@
 // [z-paging]微信小程序、QQ小程序、app-vue、h5上使用wxs实现自定义下拉刷新，降低逻辑层与视图层的通信折损，提升性能
 
-var currentMoveDistance = 0;
+var currentDis = 0;
+var isPCFlag = -1;
+var startY = -1;
 
-function propObserver(newValue, oldValue, ownerInstance, instance) {
-	var state = ownerInstance.getState();
-	state.currentInstance = instance;
-	var dataset = instance.getDataset();
+function propObserver(newValue, oldValue, ownerIns, ins) {
+	var state = ownerIns.getState() || {};
+	state.currentIns = ins;
+	var dataset = ins.getDataset();
 	var loading = dataset.loading == true;
-	if (newValue.indexOf('end') != -1) {
-		_setTransform('translateY(0px)', instance, false)
-		state.moveDistance = 0;
-		state.oldMoveDistance = 0;
-		currentMoveDistance = 0;
-	} else if (newValue.indexOf('begin') != -1) {
-		var refresherThreshold = instance.getDataset().refresherthreshold
-		_setTransformValue(refresherThreshold, instance, state, false);
+	if (newValue && newValue.indexOf('end') != -1) {
+		var transition = newValue.split('end')[0];
+		_setTransform('translateY(0px)', ins, false, transition);
+		state.moveDis = 0;
+		state.oldMoveDis = 0;
+		currentDis = 0;
+	} else if (newValue && newValue.indexOf('begin') != -1) {
+		var refresherThreshold = ins.getDataset().refresherthreshold;
+		_setTransformValue(refresherThreshold, ins, state, false);
 	}
 }
 
-function touchstart(e, ownerInstance) {
-	var instance = ownerInstance.getState().currentInstance;
-	var state = instance.getState();
-	var dataset = instance.getDataset();
-	var isTouchEnded = state.isTouchEnded;
-	if (_getRefresherTouchDisabled(e, instance, 0)) {
-		return;
+function touchstart(e, ownerIns) {
+	var ins = _getIns(ownerIns);
+	var state = {};
+	var dataset = {};
+	if (ins) {
+		state = ins.getState();
+		dataset = ins.getDataset();
+		if (_touchDisabled(e, ins, 0)) return;
 	}
-	state.oldMoveDistance = 0;
-	var touch = _getCommonTouch(e);
+	var isTouchEnded = state.isTouchEnded;
+	state.oldMoveDis = 0;
+	var touch = _getTouch(e);
 	var loading = _getIsTrue(dataset.loading);
 	state.startY = touch.touchY;
-	state.lastRefresherTouchmove = touch;
+	startY = state.startY;
+	state.lastTouch = touch;
 	if (!loading && isTouchEnded) {
 		state.isTouchmoving = false;
 	}
 	state.isTouchEnded = false;
-	ownerInstance.callMethod('_handleRefresherTouchstart', touch);
+	ownerIns.callMethod('_handleRefresherTouchstart', touch);
 }
 
-function touchmove(e, ownerInstance) {
-	var touch = _getCommonTouch(e);
-	var instance = ownerInstance.getState().currentInstance;
-	var dataset = instance.getDataset();
+function touchmove(e, ownerIns) {
+	var touch = _getTouch(e);
+	var ins = _getIns(ownerIns);
+	var dataset = ins.getDataset();
 	var refresherThreshold = dataset.refresherthreshold;
-	var state = instance.getState();
-	if (_getRefresherTouchDisabled(e, instance, 1)) {
-		_handleTouchMovePullingDown(state, ownerInstance, false);
+	var isIos = _getIsTrue(dataset.isios);
+	var state = ins.getState();
+	var dataset = ins.getDataset();
+	var watchTouchDirectionChange = _getIsTrue(dataset.watchtouchdirectionchange);
+	var moveDisObj = {};
+	var moveDis = 0;
+	var prevent = false;
+	if (watchTouchDirectionChange) {
+		moveDisObj = _getMoveDis(e, ins);
+		moveDis = moveDisObj.currentDis;
+		prevent = moveDisObj.isDown;
+		if(state.oldAcceptedIsDown == prevent){
+			ownerIns.callMethod('_handleTouchDirectionChange', {direction: prevent ? 'top' : 'bottom'}); 
+			state.oldIsDown = prevent;
+		}
+		state.oldAcceptedIsDown = prevent;
+	}
+	if (_touchDisabled(e, ins, 1)) {
+		_handlePullingDown(state, ownerIns, false);
 		return true;
 	}
 	if (!_getAngleIsInRange(e, touch, state, dataset)) {
-		_handleTouchMovePullingDown(state, ownerInstance, false);
+		_handlePullingDown(state, ownerIns, false);
 		return true;
 	}
-	var moveDistanceObj = _getMoveDistance(e, instance);
-	var moveDistance = moveDistanceObj.currentMoveDistance;
-	var prevent = moveDistanceObj.isDown;
-	if (moveDistance < 0) {
-		_setTransformValue(0, instance, state, false);
-		_handleTouchMovePullingDown(state, ownerInstance, false);
+	moveDisObj = _getMoveDis(e, ins);
+	moveDis = moveDisObj.currentDis;
+	prevent = moveDisObj.isDown;
+	if (moveDis < 0) {
+		_setTransformValue(0, ins, state, false);
+		_handlePullingDown(state, ownerIns, false);
 		return true;
 	}
 	if (prevent && !state.disabledBounce) {
-		ownerInstance.callMethod('_handleScrollViewDisableBounce', {
-			bounce: false
-		});
+		if (isIos) {
+			ownerIns.callMethod('_handleScrollViewDisableBounce', {bounce: false}); 
+		}
 		state.disabledBounce = true;
-		_handleTouchMovePullingDown(state, ownerInstance, prevent);
+		_handlePullingDown(state, ownerIns, prevent);
 		return !prevent;
 	}
-	_setTransformValue(moveDistance, instance, state, false);
+	_setTransformValue(moveDis, ins, state, false);
 	var oldRefresherStatus = state.refresherStatus;
-	var dataset = instance.getDataset();
 	var oldIsTouchmoving = _getIsTrue(dataset.oldistouchmoving);
+	var hasTouchmove = _getIsTrue(dataset.hastouchmove);
 	var isTouchmoving = state.isTouchmoving;
-	if (moveDistance >= refresherThreshold) {
-		state.refresherStatus = 1;
-	} else {
-		state.refresherStatus = 0;
-	}
+	state.refresherStatus = moveDis >= refresherThreshold ? 1 : 0;
 	if (!isTouchmoving) {
 		state.isTouchmoving = true;
 		isTouchmoving = true;
@@ -85,66 +103,60 @@ function touchmove(e, ownerInstance) {
 	if (state.isTouchEnded) {
 		state.isTouchEnded = false;
 	}
-	if (oldRefresherStatus == undefined || oldRefresherStatus != state.refresherStatus || oldIsTouchmoving !=
-		isTouchmoving) {
-		ownerInstance.callMethod('_handleRefresherTouchmove', moveDistance, touch);
+	if (hasTouchmove) {
+		ownerIns.callMethod('_handleWxsPullingDown', {moveDis:moveDis, diffDis:moveDisObj.diffDis});
+	}
+	if (oldRefresherStatus == undefined || oldRefresherStatus != state.refresherStatus || oldIsTouchmoving != isTouchmoving) {
+		ownerIns.callMethod('_handleRefresherTouchmove', moveDis, touch);
 	}
-	_handleTouchMovePullingDown(state, ownerInstance, prevent);
+	_handlePullingDown(state, ownerIns, prevent);
 	return !prevent;
 }
 
-function touchend(e, ownerInstance) {
-	var touch = _getCommonTouch(e);
-	var instance = ownerInstance.getState().currentInstance;
-	var dataset = instance.getDataset();
-	var state = instance.getState();
-	if (_getRefresherTouchDisabled(e, instance, 2)) {
-		return;
-	}
-	state.refresherReachMaxAngle = true;
+function touchend(e, ownerIns) {
+	var touch = _getTouch(e);
+	var ins = _getIns(ownerIns);
+	var dataset = ins.getDataset();
+	var state = ins.getState();
+	if (_touchDisabled(e, ins, 2)) return;
+	state.reachMaxAngle = true;
 	state.hitReachMaxAngleCount = 0;
 	state.disabledBounce = false;
 	state.fixedIsTopHitCount = 0;
-	//ownerInstance.callMethod('_handleScrollViewDisableBounce', {bounce:true});
-	var isTouchmoving = state.isTouchmoving;
-	if (!isTouchmoving) {
-		return;
-	}
+	//ownerIns.callMethod('_handleScrollViewDisableBounce', {bounce:true});
+	if (!state.isTouchmoving) return;
 	var oldRefresherStatus = state.refresherStatus;
-	var oldMoveDistance = state.moveDistance;
-	var refresherThreshold = instance.getDataset().refresherthreshold
-	var moveDistance = _getMoveDistance(e, instance).currentMoveDistance;
-	if (!(moveDistance >= refresherThreshold && oldRefresherStatus === 1)) {
+	var oldMoveDis = state.moveDis;
+	var refresherThreshold = ins.getDataset().refresherthreshold
+	var moveDis = _getMoveDis(e, ins).currentDis;
+	if (!(moveDis >= refresherThreshold && oldRefresherStatus === 1)) {
 		state.isTouchmoving = false;
 	}
-	ownerInstance.callMethod('_handleRefresherTouchend', moveDistance);
+	ownerIns.callMethod('_handleRefresherTouchend', moveDis);
 	state.isTouchEnded = true;
-	if (oldMoveDistance < refresherThreshold) {
-		return;
-	}
+	if (oldMoveDis < refresherThreshold) return;
 	var animate = false;
-	if (moveDistance >= refresherThreshold) {
-		moveDistance = refresherThreshold;
-		var isIos13 = _getIsTrue(dataset.isios13);
-		if (isIos13) {
-			animate = true;
-		}
+	if (moveDis >= refresherThreshold) {
+		moveDis = refresherThreshold;
+		animate = true;
 	}
-	_setTransformValue(moveDistance, instance, state, animate);
+	_setTransformValue(moveDis, ins, state, animate);
 }
 
 // #ifdef H5
 function isPC() {
+	if (isPCFlag != -1) return isPCFlag;
 	var userAgentInfo = navigator.userAgent;
 	var Agents = ["Android", "iPhone", "SymbianOS", "Windows Phone", "iPad", "iPod"];
 	var flag = true;
-	for (var v = 0; v < Agents.length - 1; v++) {
-		if (userAgentInfo.indexOf(Agents[v]) > 0) {
+	for (var i = 0; i < Agents.length; i++) {
+		if (userAgentInfo.indexOf(Agents[i]) > 0) {
 			flag = false;
 			break;
 		}
 	}
-	return flag;
+	isPCFlag = flag;
+	return isPCFlag;
 }
 
 var movable = false;
@@ -174,70 +186,67 @@ function mouseleave(e, ins) {
 // #endif
 
 
-function _setTransformValue(value, instance, state, animate) {
+function _setTransformValue(value, ins, state, animate) {
 	value = value || 0;
-	if (state.moveDistance == value) {
-		return;
-	}
-	state.moveDistance = value;
-	_setTransform('translateY(' + value + 'px)', instance, animate);
+	if (state.moveDis == value) return;
+	state.moveDis = value;
+	_setTransform('translateY(' + value + 'px)', ins, animate, '');
 }
 
-function _setTransform(transform, instance, animate) {
+function _setTransform(transform, ins, animate, transition) {
 	if (transform == 'translateY(0px)') {
 		transform = 'none';
 	}
-	instance.requestAnimationFrame(function() {
+	ins.requestAnimationFrame(function() {
+		var stl = { 'transform': transform };
 		if (animate) {
-			instance.setStyle({
-				'transform': transform,
-				'transition': 'transform .1s linear',
-			})
-		} else {
-			instance.setStyle({
-				'transform': transform
-			})
+			stl['transition'] = 'transform .1s linear';
 		}
+		if (transition.length) {
+			stl['transition'] = transition;
+		}
+		ins.setStyle(stl);
 	})
 }
 
-function _getMoveDistance(e, instance) {
-	var state = instance.getState();
-	var refresherThreshold = instance.getDataset().refresherthreshold;
-	var refresherOutRate = instance.getDataset().refresheroutrate;
-	refresherThreshold = parseFloat(refresherThreshold);
-	refresherOutRate = parseFloat(refresherOutRate);
-	var touch = _getCommonTouch(e);
-	var moveDistance = touch.touchY - state.startY;
-	var oldMoveDistance = state.oldMoveDistance || 0;
-	state.oldMoveDistance = moveDistance;
-	var diffDis = moveDistance - oldMoveDistance;
+function _getMoveDis(e, ins) {
+	var state = ins.getState();
+	var refresherThreshold = parseFloat(ins.getDataset().refresherthreshold);
+	var refresherOutRate = parseFloat(ins.getDataset().refresheroutrate);
+	var touch = _getTouch(e);
+	var currentStartY = !state.startY || state.startY == 'NaN' ? startY : state.startY;
+	var moveDis = touch.touchY - currentStartY;
+	var oldMoveDis = state.oldMoveDis || 0;
+	state.oldMoveDis = moveDis;
+	var diffDis = moveDis - oldMoveDis;
 	if (diffDis > 0) {
 		diffDis = diffDis * 0.85;
-		if (currentMoveDistance > refresherThreshold) {
+		if (currentDis > refresherThreshold) {
 			diffDis = diffDis * (1 - refresherOutRate);
 		}
 	}
-	currentMoveDistance += diffDis;
-	if (currentMoveDistance < 0) {
-		currentMoveDistance = 0;
+	if (diffDis > 200) {
+		currentDis = 0;
+		diffDis = 0;
+	} else {
+		currentDis += diffDis;
+		currentDis = Math.max(0, currentDis);
 	}
 	return {
-		currentMoveDistance: currentMoveDistance,
+		currentDis: currentDis,
+		diffDis: diffDis,
 		isDown: diffDis > 0
 	};
 }
 
-function _getCommonTouch(e) {
-	var touch = null;
+function _getTouch(e) {
+	var touch = e;
 	if (e.touches && e.touches.length) {
 		touch = e.touches[0];
 	} else if (e.changedTouches && e.changedTouches.length) {
 		touch = e.changedTouches[0];
-	} else if (e.datail && e.datail !== {}) {
+	} else if (e.datail && e.datail != {}) {
 		touch = e.datail;
-	} else {
-		touch = e;
 	}
 	return {
 		touchX: touch.clientX,
@@ -245,9 +254,17 @@ function _getCommonTouch(e) {
 	};
 }
 
-function _getRefresherTouchDisabled(e, instance, processTag) {
-	var dataset = instance.getDataset();
-	var state = instance.getState();
+function _getIns(ownerIns) {
+	var ins = ownerIns.getState().currentIns;
+	if (!ins) {
+		ownerIns.callMethod('_handlePropUpdate');
+	}
+	return ins;
+}
+
+function _touchDisabled(e, ins, processTag) {
+	var dataset = ins.getDataset();
+	var state = ins.getState();
 	var loading = _getIsTrue(dataset.loading);
 	var useChatRecordMode = _getIsTrue(dataset.usechatrecordmode);
 	var refresherEnabled = _getIsTrue(dataset.refresherenabled);
@@ -277,50 +294,44 @@ function _getRefresherTouchDisabled(e, instance, processTag) {
 	if (!isIos && processTag === 2) {
 		fixedIsTop = true;
 	}
-	var res = loading || useChatRecordMode || !refresherEnabled || !useCustomRefresher || ((
-		usePageScroll && useCustomRefresher && pageScrollTop > 5) && !fixedIsTop) || ((
-		!usePageScroll && useCustomRefresher && scrollTop > 5) && !fixedIsTop);
+	var res = loading || useChatRecordMode || !refresherEnabled || !useCustomRefresher || ((usePageScroll && useCustomRefresher && pageScrollTop > 5) && !fixedIsTop) || 
+	((!usePageScroll && useCustomRefresher && scrollTop > 5) && !fixedIsTop);
 	return res;
 }
 
 function _getAngleIsInRange(e, touch, state, dataset) {
-	var refresherMaxAngle = dataset.refreshermaxangle;
+	var maxAngle = dataset.refreshermaxangle;
 	var refresherAecc = _getIsTrue(dataset.refresheraecc);
-	var lastRefresherTouchmove = state.lastRefresherTouchmove;
-	var refresherReachMaxAngle = state.refresherReachMaxAngle;
-	var moveDistance = state.oldMoveDistance;
-	if (!lastRefresherTouchmove) {
-		return true;
-	}
-	if (refresherMaxAngle >= 0 && refresherMaxAngle <= 90 && lastRefresherTouchmove) {
-		if ((!moveDistance || moveDistance < 1) && !refresherAecc && refresherReachMaxAngle != null && !
-			refresherReachMaxAngle) {
-			return false;
-		}
-		var x = Math.abs(touch.touchX - lastRefresherTouchmove.touchX);
-		var y = Math.abs(touch.touchY - lastRefresherTouchmove.touchY);
+	var lastTouch = state.lastTouch;
+	var reachMaxAngle = state.reachMaxAngle;
+	var moveDis = state.oldMoveDis;
+	if (!lastTouch) return true;
+	if (maxAngle >= 0 && maxAngle <= 90 && lastTouch) {
+		if ((!moveDis || moveDis < 1) && !refresherAecc && reachMaxAngle != null && !reachMaxAngle) return false;
+		var x = Math.abs(touch.touchX - lastTouch.touchX);
+		var y = Math.abs(touch.touchY - lastTouch.touchY);
 		var z = Math.sqrt(Math.pow(x, 2) + Math.pow(y, 2));
 		if ((x || y) && x > 1) {
 			var angle = Math.asin(y / z) / Math.PI * 180;
-			if (angle < refresherMaxAngle) {
+			if (angle < maxAngle) {
 				var hitReachMaxAngleCount = state.hitReachMaxAngleCount || 0;
 				state.hitReachMaxAngleCount = ++hitReachMaxAngleCount;
 				if (state.hitReachMaxAngleCount > 2) {
-					state.lastRefresherTouchmove = touch;
-					state.refresherReachMaxAngle = false;
+					state.lastTouch = touch;
+					state.reachMaxAngle = false;
 				}
 				return false;
 			}
 		}
 	}
-	state.lastRefresherTouchmove = touch;
+	state.lastTouch = touch;
 	return true;
 }
 
-function _handleTouchMovePullingDown(state, instance, onPullingDown) {
+function _handlePullingDown(state, ins, onPullingDown) {
 	var oldOnPullingDown = state.onPullingDown || false;
 	if (oldOnPullingDown != onPullingDown) {
-		instance.callMethod('_handleWxsOnPullingDown', onPullingDown);
+		ins.callMethod('_handleWxsPullingDownStatusChange', onPullingDown);
 	}
 	state.onPullingDown = onPullingDown;
 }

h5_web/uni_modules/z-paging/components/z-paging/z-paging.vue

@@ -4,300 +4,306 @@
   / /_____| |_) | (_| | (_| | | | | | (_| |
  /___|    | .__/ \__,_|\__, |_|_| |_|\__, |
           |_|          |___/         |___/ 
-V2.0.8
-by ZXLee 2021-10-08
-<!-- API文档地址：http://z-paging.com -->
+v2.3.2 (2022-06-21)
+by ZXLee
+-->
+<!-- API文档地址：https://z-paging.zxlee.cn -->
 <!-- github地址:https://github.com/SmileZXLee/uni-z-paging -->
 <!-- dcloud地址:https://ext.dcloud.net.cn/plugin?id=3935 -->
 <!-- 反馈QQ群：790460711 -->
 
 <template name="z-paging">
 	<!-- #ifndef APP-NVUE -->
-	<view :class="!usePageScroll&&fixed?'z-paging-content z-paging-content-fixed':'z-paging-content'"
-		:style="[finalPagingStyle]">
+	<view :class="!usePageScroll&&fixed?'z-paging-content z-paging-content-fixed':'z-paging-content'" :style="[finalPagingStyle]">
+		<!-- #ifndef APP-PLUS -->
+		<view v-if="cssSafeAreaInsetBottom===-1" class="zp-safe-area-inset-bottom"></view>
+		<!-- #endif -->
 		<!-- 顶部固定的slot -->
-		<slot v-if="!usePageScroll&&$slots.top" name="top"></slot>
-		<view class="zp-page-scroll-top" v-else-if="usePageScroll&&$slots.top" :style="[{'top':`${windowTop}px`,'z-index':topZIndex}]">
-			<slot name="top"></slot>
+		<slot v-if="!usePageScroll&&$slots.top" name="top" />
+		<view class="zp-page-top" v-else-if="usePageScroll&&$slots.top" :style="[{'top':`${windowTop}px`,'z-index':topZIndex}]">
+			<slot name="top" />
 		</view>
-		<view :class="{'zp-scroll-view-super':!usePageScroll}" :style="[finalScrollViewStyle]">
-			<scroll-view
-				:class="{'zp-scroll-view':true,'zp-scroll-view-absolute':!usePageScroll,'zp-scroll-view-hide-scrollbar':!showScrollbar}"
-				:scroll-top="scrollTop" :scroll-x="scrollX"
-				:scroll-y="scrollable&&!usePageScroll&&scrollEnable&&refresherStatus!==3" :enable-back-to-top="finalEnableBackToTop"
-				:show-scrollbar="showScrollbar" :scroll-with-animation="finalScrollWithAnimation"
-				:scroll-into-view="scrollIntoView" :lower-threshold="finalLowerThreshold" :upper-threshold="5"
-				:refresher-enabled="finalRefresherEnabled&&!useCustomRefresher" :refresher-threshold="finalRefresherThreshold"
-				:refresher-default-style="finalRefresherDefaultStyle" :refresher-background="refresherBackground"
-				:refresher-triggered="finalRefresherTriggered" @scroll="_scroll" @scrolltolower="_onLoadingMore('toBottom')"
-				@scrolltoupper="_scrollToUpper" @refresherrestore="_onRestore" @refresherrefresh="_onRefresh(true)"  
-				>	
-				<view class="zp-paging-touch-view"
-				<!-- #ifndef APP-VUE || MP-WEIXIN || MP-QQ  || H5 -->
-				@touchstart="_refresherTouchstart" @touchmove="_refresherTouchmove" @touchend="_refresherTouchend" @touchcancel="_refresherTouchend"
-				<!-- #endif -->
-				<!-- #ifdef APP-VUE || MP-WEIXIN || MP-QQ || H5 -->
-				@touchstart="pagingWxs.touchstart" @touchmove="pagingWxs.touchmove" @touchend="pagingWxs.touchend" @touchcancel="pagingWxs.touchend"
-				@mousedown="pagingWxs.mousedown" @mousemove="pagingWxs.mousemove" @mouseup="pagingWxs.mouseup" @mouseleave="pagingWxs.mouseleave"
-				<!-- #endif -->
-				>	
-					<view v-if="finalRefresherFixedBacHeight>0" class="zp-fixed-bac-view" :style="[{'background': refresherFixedBackground,'height': `${finalRefresherFixedBacHeight}px`}]"></view>
-					<view class="zp-paging-main" :style="[scrollViewInStyle,{'transform': finalRefresherTransform,'transition': refresherTransition}]"
-					<!-- #ifdef APP-VUE || MP-WEIXIN || MP-QQ || H5 -->
-					:change:prop="pagingWxs.propObserver" :prop="wxsPropType"
-					:data-refresherThreshold="finalRefresherThreshold" :data-isIos="isIos" :data-isIos13="isIos13"
-					:data-loading="loading||isRefresherInComplete" :data-useChatRecordMode="useChatRecordMode" 
-					:data-refresherEnabled="refresherEnabled" :data-useCustomRefresher="useCustomRefresher" :data-pageScrollTop="wxsPageScrollTop"
-					:data-scrollTop="wxsScrollTop" :data-refresherMaxAngle="refresherMaxAngle" 
-					:data-refresherAecc="refresherAngleEnableChangeContinued" :data-usePageScroll="usePageScroll"
-					:data-oldIsTouchmoving="isTouchmoving" :data-refresherOutRate="finalRefresherOutRate"
+		<view :class="{'zp-view-super':true,'zp-scroll-view-super':!usePageScroll}" :style="[finalScrollViewStyle]">
+			<view v-if="$slots.left" :class="{'zp-page-left':true,'zp-absoulte':finalIsOldWebView}">
+				<slot name="left" />
+			</view>
+			<view :class="{'zp-scroll-view-container':true,'zp-absoulte':finalIsOldWebView}" :style="[scrollViewContainerStyle]">
+				<scroll-view
+					ref="zp-scroll-view" :class="{'zp-scroll-view':true,'zp-scroll-view-absolute':!usePageScroll,'zp-scroll-view-hide-scrollbar':!showScrollbar}"
+					:scroll-top="scrollTop" :scroll-x="scrollX"
+					:scroll-y="scrollable&&!usePageScroll&&scrollEnable&&(refresherCompleteScrollable?true:refresherStatus!==3)" :enable-back-to-top="finalEnableBackToTop"
+					:show-scrollbar="showScrollbar" :scroll-with-animation="finalScrollWithAnimation"
+					:scroll-into-view="scrollIntoView" :lower-threshold="finalLowerThreshold" :upper-threshold="5"
+					:refresher-enabled="finalRefresherEnabled&&!useCustomRefresher" :refresher-threshold="finalRefresherThreshold"
+					:refresher-default-style="finalRefresherDefaultStyle" :refresher-background="refresherBackground"
+					:refresher-triggered="finalRefresherTriggered" @scroll="_scroll" @scrolltolower="_onLoadingMore('toBottom')"
+					@scrolltoupper="_scrollToUpper" @refresherrestore="_onRestore" @refresherrefresh="_onRefresh(true)">	
+					<view class="zp-paging-touch-view"
+					<!-- #ifndef APP-VUE || MP-WEIXIN || MP-QQ  || H5 -->
+					@touchstart="_refresherTouchstart" @touchmove="_refresherTouchmove" @touchend="_refresherTouchend" @touchcancel="_refresherTouchend"
 					<!-- #endif -->
-					<!-- #ifdef APP-VUE || H5 -->
-					:change:renderPropScrollTop="pagingRenderjs.renderPropScrollTopChange" :renderPropScrollTop="renderPropScrollTop"
-					:change:renderPropUsePageScroll="pagingRenderjs.renderPropUsePageScrollChange" :renderPropUsePageScroll="renderPropUsePageScroll"
+					<!-- #ifdef APP-VUE || MP-WEIXIN || MP-QQ || H5 -->
+					@touchstart="pagingWxs.touchstart" @touchmove="pagingWxs.touchmove" @touchend="pagingWxs.touchend" @touchcancel="pagingWxs.touchend"
+					@mousedown="pagingWxs.mousedown" @mousemove="pagingWxs.mousemove" @mouseup="pagingWxs.mouseup" @mouseleave="pagingWxs.mouseleave"
 					<!-- #endif -->
 					>	
-						<view v-if="showRefresher" class="zp-custom-refresher-view"
-							:style="[{'margin-top': `-${finalRefresherThreshold}px`,'background': refresherBackground}]">
-							<view class="zp-custom-refresher-container" :style="[{'height': `${finalRefresherThreshold}px`,'background': refresherBackground}]">
-								<!-- 下拉刷新view -->
-								<view class="zp-custom-refresher-slot-view">
-									<slot
-									<!-- #ifndef MP-QQ -->
-									:refresherStatus="refresherStatus"
-									<!-- #endif -->
-									name="refresher" />
+						<view v-if="finalRefresherFixedBacHeight>0" class="zp-fixed-bac-view" :style="[{'background': refresherFixedBackground,'height': `${finalRefresherFixedBacHeight}px`}]"></view>
+						<view class="zp-paging-main" :style="[scrollViewInStyle,{'transform': finalRefresherTransform,'transition': refresherTransition}]"
+						<!-- #ifdef APP-VUE || MP-WEIXIN || MP-QQ || H5 -->
+						:change:prop="pagingWxs.propObserver" :prop="wxsPropType"
+						:data-refresherThreshold="finalRefresherThreshold" :data-isIos="isIos"
+						:data-loading="loading||isRefresherInComplete" :data-useChatRecordMode="useChatRecordMode" 
+						:data-refresherEnabled="refresherEnabled" :data-useCustomRefresher="useCustomRefresher" :data-pageScrollTop="wxsPageScrollTop"
+						:data-scrollTop="wxsScrollTop" :data-refresherMaxAngle="refresherMaxAngle" 
+						:data-refresherAecc="refresherAngleEnableChangeContinued" :data-usePageScroll="usePageScroll" :data-watchTouchDirectionChange="watchTouchDirectionChange"
+						:data-oldIsTouchmoving="isTouchmoving" :data-refresherOutRate="finalRefresherOutRate" :data-hasTouchmove="hasTouchmove"
+						<!-- #endif -->
+						<!-- #ifdef APP-VUE || H5 -->
+						:change:renderPropScrollTop="pagingRenderjs.renderPropScrollTopChange" :renderPropScrollTop="renderPropScrollTop"
+						:change:renderPropUsePageScroll="pagingRenderjs.renderPropUsePageScrollChange" :renderPropUsePageScroll="renderPropUsePageScroll"
+						<!-- #endif -->
+						>	
+							<view v-if="showRefresher" class="zp-custom-refresher-view" :style="[{'margin-top': `-${finalRefresherThreshold}px`,'background': refresherBackground}]">
+								<view class="zp-custom-refresher-container" :style="[{'height': `${finalRefresherThreshold}px`,'background': refresherBackground}]">
+									<!-- 下拉刷新view -->
+									<view class="zp-custom-refresher-slot-view">
+										<slot v-if="!($slots.refresherComplete&&refresherStatus===3)" :refresherStatus="refresherStatus" name="refresher" />
+									</view>
+									<slot v-if="$slots.refresherComplete&&refresherStatus===3" name="refresherComplete" />
+									<z-paging-refresh ref="refresh" v-else-if="!showCustomRefresher" :style="[{'height': `${finalRefresherThreshold}px`}]" :status="refresherStatus"
+										:defaultThemeStyle="finalRefresherThemeStyle" :defaultText="finalRefresherDefaultText"
+										:pullingText="finalRefresherPullingText" :refreshingText="finalRefresherRefreshingText" :completeText="finalRefresherCompleteText"
+										:showUpdateTime="showRefresherUpdateTime" :updateTimeKey="refresherUpdateTimeKey"
+										:imgStyle="refresherImgStyle" :titleStyle="refresherTitleStyle" :updateTimeStyle="refresherUpdateTimeStyle" />
 								</view>
-								<z-paging-refresh ref="refresh" v-if="!showCustomRefresher" :style="[{'height': `${finalRefresherThreshold}px`}]" :status="refresherStatus"
-									:defaultThemeStyle="finalRefresherThemeStyle" :defaultText="finalRefresherDefaultText"
-									:pullingText="finalRefresherPullingText" :refreshingText="finalRefresherRefreshingText" :completeText="finalRefresherCompleteText"
-									:showUpdateTime="showRefresherUpdateTime" :updateTimeKey="refresherUpdateTimeKey"
-									:imgStyle="refresherImgStyle" :titleStyle="refresherTitleStyle" :updateTimeStyle="refresherUpdateTimeStyle"></z-paging-refresh>
-							</view>
-						</view>
-						<view class="zp-paging-container">
-							<slot v-if="useChatRecordMode&&$slots.chatLoading&&loadingStatus!==2&&realTotalData.length"
-								name="chatLoading" />
-							<view v-else-if="useChatRecordMode&&loadingStatus!==2&&realTotalData.length"
-								class="zp-chat-record-loading-container">
-								<text v-if="loadingStatus!==1" @click="_scrollToUpper()"
-									:class="defaultThemeStyle==='white'?'zp-loading-more-text zp-loading-more-text-white':'zp-loading-more-text zp-loading-more-text-black'">{{chatRecordLoadingMoreText}}</text>
-								<image v-else :src="base64Flower" class="zp-chat-record-loading-custom-image">
-								</image>
-							</view>
-							<!-- 全屏Loading -->
-							<slot v-if="$slots.loading&&showLoading" name="loading" />
-							<!-- 主体内容 -->
-							<view class="zp-paging-container-content" :style="[finalPagingContentStyle]">
-								<slot />
-								<!-- 上拉加载更多view -->
-								<!-- #ifndef MP-ALIPAY -->
-								<slot v-if="_shouldShowLoadingMore('loadingMoreDefault')" name="loadingMoreDefault" />
-								<slot v-else-if="_shouldShowLoadingMore('loadingMoreLoading')" name="loadingMoreLoading" />
-								<slot v-else-if="_shouldShowLoadingMore('loadingMoreNoMore')" name="loadingMoreNoMore" />
-								<slot v-else-if="_shouldShowLoadingMore('loadingMoreFail')" name="loadingMoreFail" />
-								<z-paging-load-more @click.native="_onLoadingMore('click')"
-									v-else-if="_shouldShowLoadingMore('loadingMoreCustom')" :zConfig="zPagingLoadMoreConfig">
-								</z-paging-load-more>
-								<!-- #endif -->
-								<!-- #ifdef MP-ALIPAY -->
-								<slot v-if="loadingStatus===0&&$slots.loadingMoreDefault&&showLoadingMore&&loadingMoreEnabled&&!useChatRecordMode"
-									name="loadingMoreDefault" />
-								<slot v-else-if="loadingStatus===1&&$slots.loadingMoreLoading&&showLoadingMore&&loadingMoreEnabled"
-									name="loadingMoreLoading" />
-								<slot v-else-if="loadingStatus===2&&$slots.loadingMoreNoMore&&showLoadingMore&&showLoadingMoreNoMoreView&&loadingMoreEnabled&&!useChatRecordMode"
-									name="loadingMoreNoMore" />
-								<slot v-else-if="loadingStatus===3&&$slots.loadingMoreFail&&showLoadingMore&&loadingMoreEnabled&&!useChatRecordMode"
-									name="loadingMoreFail" />
-								<z-paging-load-more @click.native="_onLoadingMore('click')" v-else-if="showLoadingMore&&showDefaultLoadingMoreText&&!(loadingStatus===2&&!showLoadingMoreNoMoreView)&&loadingMoreEnabled&&!useChatRecordMode" :zConfig="zPagingLoadMoreConfig">
-								</z-paging-load-more>
-								<!-- #endif -->
 							</view>
-							<!-- 空数据图 -->
-							<view :class="{'zp-empty-view':true,'zp-empty-view-center':emptyViewCenter}" v-if="showEmpty">
-								<slot v-if="$slots.empty" name="empty" />
-								<z-paging-empty-view v-else :emptyViewImg="finalEmptyViewImg" :emptyViewText="finalEmptyViewText" :showEmptyViewReload="finalShowEmptyViewReload" 
-								:emptyViewReloadText="finalEmptyViewReloadText" :isLoadFailed="isLoadFailed" :emptyViewStyle="emptyViewStyle" :emptyViewTitleStyle="emptyViewTitleStyle" 
-								:emptyViewImgStyle="emptyViewImgStyle" :emptyViewReloadStyle="emptyViewReloadStyle" :emptyViewZIndex="emptyViewZIndex" :emptyViewFixed="emptyViewFixed" 
-								@reload="_emptyViewReload">
-								</z-paging-empty-view>
+							<view class="zp-paging-container">
+								<slot v-if="useChatRecordMode&&$slots.chatLoading&&loadingStatus!==2&&realTotalData.length" name="chatLoading" />
+								<view v-else-if="useChatRecordMode&&loadingStatus!==2&&realTotalData.length" class="zp-chat-record-loading-container">
+									<text v-if="loadingStatus!==1" @click="_scrollToUpper()"
+										:class="defaultThemeStyle==='white'?'zp-loading-more-text zp-loading-more-text-white':'zp-loading-more-text zp-loading-more-text-black'">{{chatRecordLoadingMoreText}}</text>
+									<image v-else :src="base64Flower" class="zp-chat-record-loading-custom-image" />
+								</view>
+								<!-- 全屏Loading -->
+								<slot v-if="$slots.loading&&showLoading&&!loadingFullFixed" name="loading" />
+								<!-- 主体内容 -->
+								<view class="zp-paging-container-content" :style="[{transform:virtualPlaceholderTopHeight>0?`translateY(${virtualPlaceholderTopHeight}px)`:'none'},finalPagingContentStyle]">
+									<slot />
+									<!-- 内置列表&虚拟列表 -->
+									<template v-if="finalUseInnerList">
+										<slot name="header"/>
+										<view class="zp-list-container" :style="[innerListStyle]">
+											<template v-if="finalUseVirtualList">
+												<view class="zp-list-cell" :style="[innerCellStyle]" :id="`zp-${item['zp_index']}`" v-for="(item,index) in virtualList" :key="item['zp_unique_index']">
+													<slot name="cell" :item="item" :index="virtualTopRangeIndex+index"/>
+												</view>
+											</template>
+											<template v-else>
+												<view class="zp-list-cell" v-for="(item,index) in realTotalData" :key="index">
+													<slot name="cell" :item="item" :index="index"/>
+												</view>
+											</template>
+										</view>
+										<slot name="footer"/>
+									</template>
+									<view v-if="useVirtualList" class="zp-virtual-placeholder" :style="[{height:virtualPlaceholderBottomHeight+'px'}]"/>
+									<!-- 上拉加载更多view -->
+									<!-- #ifndef MP-ALIPAY -->
+									<slot v-if="showLoadingMoreDefault" name="loadingMoreDefault" />
+									<slot v-else-if="showLoadingMoreLoading" name="loadingMoreLoading" />
+									<slot v-else-if="showLoadingMoreNoMore" name="loadingMoreNoMore" />
+									<slot v-else-if="showLoadingMoreFail" name="loadingMoreFail" />
+									<z-paging-load-more @doClick="_onLoadingMore('click')" v-else-if="showLoadingMoreCustom" :zConfig="zPagingLoadMoreConfig" />
+									<!-- #endif -->
+									<!-- #ifdef MP-ALIPAY -->
+									<slot v-if="loadingStatus===0&&$slots.loadingMoreDefault&&showLoadingMore&&loadingMoreEnabled&&!useChatRecordMode" name="loadingMoreDefault" />
+									<slot v-else-if="loadingStatus===1&&$slots.loadingMoreLoading&&showLoadingMore&&loadingMoreEnabled" name="loadingMoreLoading" />
+									<slot v-else-if="loadingStatus===2&&$slots.loadingMoreNoMore&&showLoadingMore&&showLoadingMoreNoMoreView&&loadingMoreEnabled&&!useChatRecordMode" name="loadingMoreNoMore" />
+									<slot v-else-if="loadingStatus===3&&$slots.loadingMoreFail&&showLoadingMore&&loadingMoreEnabled&&!useChatRecordMode" name="loadingMoreFail" />
+									<z-paging-load-more @doClick="_onLoadingMore('click')" v-else-if="showLoadingMore&&showDefaultLoadingMoreText&&!(loadingStatus===2&&!showLoadingMoreNoMoreView)&&loadingMoreEnabled&&!useChatRecordMode" :zConfig="zPagingLoadMoreConfig" />
+									<!-- #endif -->
+									<view v-if="safeAreaInsetBottom && useSafeAreaPlaceholder" class="zp-safe-area-placeholder" :style="[{height:safeAreaBottom+'px'}]" />
+								</view>
+								<!-- 空数据图 -->
+								<view :class="{'zp-empty-view':true,'zp-empty-view-center':emptyViewCenter}" :style="[{emptyViewSuperStyle}]" v-if="showEmpty">
+									<slot v-if="$slots.empty" name="empty" />
+									<z-paging-empty-view v-else :emptyViewImg="finalEmptyViewImg" :emptyViewText="finalEmptyViewText" :showEmptyViewReload="finalShowEmptyViewReload" 
+									:emptyViewReloadText="finalEmptyViewReloadText" :isLoadFailed="isLoadFailed" :emptyViewStyle="emptyViewStyle" :emptyViewTitleStyle="emptyViewTitleStyle" 
+									:emptyViewImgStyle="emptyViewImgStyle" :emptyViewReloadStyle="emptyViewReloadStyle" :emptyViewZIndex="emptyViewZIndex" :emptyViewFixed="emptyViewFixed" 
+									@reload="_emptyViewReload" />
+								</view>
 							</view>
 						</view>
 					</view>
-				</view>
-			</scroll-view>
+				</scroll-view>
+			</view>
+			<view v-if="$slots.right" :class="{'zp-page-right':true,'zp-absoulte zp-right':finalIsOldWebView}">
+				<slot name="right" />
+			</view>
 		</view>
 		<!-- 底部固定的slot -->
-		<slot v-if="!usePageScroll&&$slots.bottom" name="bottom"></slot>
-		<view class="zp-page-scroll-bottom" v-else-if="usePageScroll&&$slots.bottom" :style="[{'bottom': `${windowBottom}px`}]">
-			<slot name="bottom"></slot>
+		<slot v-if="!usePageScroll&&$slots.bottom" name="bottom" />
+		<view class="zp-page-bottom" v-else-if="usePageScroll&&$slots.bottom" :style="[{'bottom': `${windowBottom}px`}]">
+			<slot name="bottom" />
 		</view>
 		<!-- 点击返回顶部view -->
 		<view v-if="showBackToTopClass" :class="backToTopClass" :style="[finalBackToTopStyle]" @click.stop="_backToTopClick">
 			<slot v-if="$slots.backToTop" name="backToTop" />
-			<image v-else class="zp-back-to-top-img" :src="backToTopImg.length?backToTopImg:base64BackToTop"></image>
-		</view>  
+			<image v-else class="zp-back-to-top-img" :src="backToTopImg.length?backToTopImg:base64BackToTop" />
+		</view>
+		<!-- 全屏Loading(铺满z-paging并固定) -->
+		<view v-if="$slots.loading&&showLoading&&loadingFullFixed" class="zp-loading-fixed">
+			<slot name="loading" />
+		</view>
 	</view>
 	<!-- #endif -->
 	<!-- #ifdef APP-NVUE -->
-	<view :is="finalNvueSuperListIs" :style="[finalPagingStyle]" :class="{'z-paging-content-fixed':fixed&&!usePageScroll}">
+	<view :is="finalNvueSuperListIs" :style="[finalPagingStyle]" :class="{'z-paging-content-fixed':fixed&&!usePageScroll}" :scrollable="false">
 		<!-- 顶部固定的slot -->
-		<view ref="zp-page-scroll-top" :is="nViewIs" class="zp-page-scroll-top" v-if="$slots.top" :style="[{'top':`${windowTop}px`,'z-index':topZIndex}]">
-			<slot name="top"></slot>
+		<view ref="zp-page-top" :is="nViewIs" class="zp-page-top" v-if="$slots.top" :style="[{'top':`${windowTop}px`,'z-index':topZIndex}]">
+			<slot name="top" />
 		</view>
-		<view ref="n-list" :id="nvueListId" :style="[{'flex': 1},scrollViewStyle,useChatRecordMode ? {transform: nIsFirstPageAndNoMore?'rotate(0deg)':'rotate(180deg)'}:{}]" :is="finalNvueListIs" alwaysScrollableVertical="true"
-			:fixFreezing="nFixFreezing" :show-scrollbar="showScrollbar&&!useChatRecordMode" :loadmoreoffset="finalLowerThreshold" :enable-back-to-top="enableBackToTop"
-			:scrollable="scrollable&&scrollEnable&&refresherStatus!==3" :bounce="nvueBounce" :column-count="nWaterfallColumnCount" :column-width="nWaterfallColumnWidth"
-			:column-gap="nWaterfallColumnGap" :left-gap="nWaterfallLeftGap" :right-gap="nWaterfallRightGap"
-			@loadmore="_nOnLoadmore" @scroll="_nOnScroll">
-			<refresh class="zp-n-refresh" :style="[nvueRefresherStyle]" v-if="finalNvueRefresherEnabled" :display="nRefresherLoading?'show':'hide'" @refresh="_nOnRrefresh"
-				@pullingdown="_nOnPullingdown">
-				<view ref="zp-n-refresh-container" class="zp-n-refresh-container">
+		<view :is="finalNvueSuperListIs" class="zp-n-list-container" :scrollable="false">
+			<view v-if="$slots.left" class="zp-page-left" :style="[{'marginTop':scrollViewStyle.marginTop,'marginBottom':scrollViewStyle.marginBottom}]">
+				<slot name="left" />
+			</view>
+			<view ref="zp-n-list" :id="nvueListId" :style="[{'flex': 1,'top':isIos?'0px':'-1px'},scrollViewStyle,useChatRecordMode ? {transform: nIsFirstPageAndNoMore?'rotate(0deg)':'rotate(180deg)'}:{}]" :is="finalNvueListIs" alwaysScrollableVertical="true"
+				:fixFreezing="nFixFreezing" :show-scrollbar="showScrollbar&&!useChatRecordMode" :loadmoreoffset="finalLowerThreshold" :enable-back-to-top="enableBackToTop"
+				:scrollable="scrollable&&scrollEnable&&(refresherCompleteScrollable?true:refresherStatus!==3)" :bounce="nvueBounce" :column-count="nWaterfallColumnCount" :column-width="nWaterfallColumnWidth"
+				:column-gap="nWaterfallColumnGap" :left-gap="nWaterfallLeftGap" :right-gap="nWaterfallRightGap" :pagingEnabled="nvuePagingEnabled"
+				@loadmore="_nOnLoadmore" @scroll="_nOnScroll">
+				<refresh class="zp-n-refresh" :style="[nvueRefresherStyle]" v-if="finalNvueRefresherEnabled" :display="nRefresherLoading?'show':'hide'" @refresh="_nOnRrefresh" @pullingdown="_nOnPullingdown">
+					<view ref="zp-n-refresh-container" class="zp-n-refresh-container" :style="[{background:refresherBackground,width:nRefresherWidth}]" id="zp-n-refresh-container">
+						<!-- 下拉刷新view -->
+						<slot v-if="zScopedSlots.refresherComplete&&refresherStatus===3" name="refresherComplete" />
+						<slot v-else-if="zScopedSlots.refresher" :refresherStatus="refresherStatus" name="refresher" />
+						<z-paging-refresh ref="refresh" v-else :status="refresherStatus" :defaultThemeStyle="finalRefresherThemeStyle"
+							:defaultText="finalRefresherDefaultText" :pullingText="finalRefresherPullingText" :refreshingText="finalRefresherRefreshingText" :completeText="finalRefresherCompleteText"
+							:showUpdateTime="showRefresherUpdateTime" :updateTimeKey="refresherUpdateTimeKey"
+							:imgStyle="refresherImgStyle" :titleStyle="refresherTitleStyle" :updateTimeStyle="refresherUpdateTimeStyle" />
+					</view>
+				</refresh>
+				<view ref="zp-n-list-top-tag" class="zp-n-list-top-tag" style="margin-top: -1rpx;" :style="[{height:finalNvueRefresherEnabled?'0px':'1px'}]" :is="nViewIs"></view>
+				<view v-if="nShowRefresherReveal" ref="zp-n-list-refresher-reveal" :style="[{transform:`translateY(-${nShowRefresherRevealHeight}px)`,height:'0px'},{background:refresherBackground}]" :is="nViewIs">
 					<!-- 下拉刷新view -->
-					<slot v-if="zScopedSlots.refresher" :refresherStatus="refresherStatus" name="refresher" />
+					<slot v-if="zScopedSlots.refresherComplete&&refresherStatus===3" name="refresherComplete" />
+					<slot v-else-if="zScopedSlots.refresher" :refresherStatus="refresherStatus" name="refresher" />
 					<z-paging-refresh ref="refresh" v-else :status="refresherStatus" :defaultThemeStyle="finalRefresherThemeStyle"
-						:defaultText="finalRefresherDefaultText" :pullingText="finalRefresherPullingText" :refreshingText="finalRefresherRefreshingText" :completeText="finalRefresherCompleteText"
+						:defaultText="finalRefresherDefaultText" :pullingText="finalRefresherPullingText" :refreshingText="finalRefresherRefreshingText" :completeText="finalRefresherCompleteText" 
 						:showUpdateTime="showRefresherUpdateTime" :updateTimeKey="refresherUpdateTimeKey"
-						:imgStyle="refresherImgStyle" :titleStyle="refresherTitleStyle" :updateTimeStyle="refresherUpdateTimeStyle"></z-paging-refresh>
+						:imgStyle="refresherImgStyle" :titleStyle="refresherTitleStyle" :updateTimeStyle="refresherUpdateTimeStyle" />
 				</view>
-			</refresh>
-			<view ref="zp-n-list-top-tag" class="zp-n-list-top-tag" :style="[{height:finalNvueRefresherEnabled&&isIos?'0px':'1px'}]" :is="nViewIs"></view>
-			<view v-if="nShowRefresherReveal" ref="zp-n-list-refresher-reveal" :style="[{transform:`translateY(-${nShowRefresherRevealHeight}px)`,height:'0px'}]" :is="nViewIs">
-				<slot v-if="zScopedSlots.refresher" :refresherStatus="refresherStatus" name="refresher" />
-				<z-paging-refresh ref="refresh" v-else :status="refresherStatus" :defaultThemeStyle="finalRefresherThemeStyle"
-					:defaultText="finalRefresherDefaultText" :pullingText="finalRefresherPullingText" :refreshingText="finalRefresherRefreshingText" :completeText="finalRefresherCompleteText" 
-					:showUpdateTime="showRefresherUpdateTime" :updateTimeKey="refresherUpdateTimeKey"
-					:imgStyle="refresherImgStyle" :titleStyle="refresherTitleStyle" :updateTimeStyle="refresherUpdateTimeStyle"></z-paging-refresh>
-			</view>
-			<slot />
-			<!-- 空数据图 -->
-			<view class="z-paging-empty-view" :class="{'z-paging-content-fixed':usePageScroll}" style="flex: 1;" :style="[scrollViewStyle,useChatRecordMode ? {transform: nIsFirstPageAndNoMore?'rotate(0deg)':'rotate(180deg)'}:{}]" v-if="showEmpty" :is="nViewIs">
-				<view :class="{'zp-empty-view':true,'zp-empty-view-center':emptyViewCenter}">
-					<slot v-if="$slots.empty" name="empty" />
-					<z-paging-empty-view v-else :emptyViewImg="finalEmptyViewImg" :emptyViewText="finalEmptyViewText" :showEmptyViewReload="finalShowEmptyViewReload" 
-					:emptyViewReloadText="finalEmptyViewReloadText" :isLoadFailed="isLoadFailed" :emptyViewStyle="emptyViewStyle" :emptyViewTitleStyle="emptyViewTitleStyle" 
-					:emptyViewImgStyle="emptyViewImgStyle" :emptyViewReloadStyle="emptyViewReloadStyle" :emptyViewZIndex="emptyViewZIndex" :emptyViewFixed="emptyViewFixed" 
-					@reload="_emptyViewReload">
-					</z-paging-empty-view>
+				<template v-if="finalUseInnerList">
+					<view :is="nViewIs">
+						<slot name="header"/>
+					</view>	
+					<view class="zp-list-cell" :is="nViewIs" v-for="(item,index) in realTotalData" :key="finalCellKeyName.length?item[finalCellKeyName]:index">
+						<slot name="cell" :item="item" :index="index"/>
+					</view>
+					<view :is="nViewIs">
+						<slot name="footer"/>
+					</view>	
+				</template>
+				<template v-else>
+					<slot />
+				</template>
+				<!-- 全屏Loading -->
+				<view :class="{'z-paging-content-fixed':usePageScroll}" style="flex: 1;" :style="[useChatRecordMode ? {transform: nIsFirstPageAndNoMore?'rotate(0deg)':'rotate(180deg)'}:{}]" v-if="$slots.loading&&showLoading&&!loadingFullFixed" :is="nViewIs">
+					<slot name="loading" />
 				</view>
-			</view>
-			<view v-if="!hideNvueBottomTag" ref="zp-n-list-bottom-tag" class="zp-n-list-bottom-tag" is="header"></view>
-			<!-- 全屏Loading -->
-			<view :class="{'z-paging-content-fixed':usePageScroll}" style="flex: 1;" :style="[scrollViewStyle,useChatRecordMode ? {transform: nIsFirstPageAndNoMore?'rotate(0deg)':'rotate(180deg)'}:{}]" v-if="$slots.loading&&showLoading" :is="nViewIs">
-				<slot name="loading" />
-			</view>
-			<!-- 上拉加载更多view -->
-			<view :is="nViewIs" v-if="!refresherOnly&&loadingMoreEnabled">
-				<view v-if="useChatRecordMode">
-					<view v-if="loadingStatus!==2&&realTotalData.length">
-						<slot v-if="$slots.chatLoading"
-							name="chatLoading" />
-						<view v-else class="zp-chat-record-loading-container">
-							<text v-if="loadingStatus!==1" @click="_scrollToUpper()"
-								:class="defaultThemeStyle==='white'?'zp-loading-more-text zp-loading-more-text-white':'zp-loading-more-text zp-loading-more-text-black'">{{chatRecordLoadingMoreText}}</text>
-							<view>
-								<loading-indicator v-if="loadingStatus===1" :animating="true"
-									class="zp-line-loading-image">
-								</loading-indicator>
+				<!-- 空数据图 -->
+				<view class="z-paging-empty-view" :class="{'z-paging-content-fixed':usePageScroll}" style="flex: 1;" :style="[emptyViewSuperStyle,useChatRecordMode ? {transform: nIsFirstPageAndNoMore?'rotate(0deg)':'rotate(180deg)'}:{}]" v-if="showEmpty" :is="nViewIs">
+					<view :class="{'zp-empty-view':true,'zp-empty-view-center':emptyViewCenter}">
+						<slot v-if="$slots.empty" name="empty" />
+						<z-paging-empty-view v-else :emptyViewImg="finalEmptyViewImg" :emptyViewText="finalEmptyViewText" :showEmptyViewReload="finalShowEmptyViewReload" 
+						:emptyViewReloadText="finalEmptyViewReloadText" :isLoadFailed="isLoadFailed" :emptyViewStyle="emptyViewStyle" :emptyViewTitleStyle="emptyViewTitleStyle" 
+						:emptyViewImgStyle="emptyViewImgStyle" :emptyViewReloadStyle="emptyViewReloadStyle" :emptyViewZIndex="emptyViewZIndex" :emptyViewFixed="emptyViewFixed" 
+						@reload="_emptyViewReload" />
+					</view>
+				</view>
+				<view v-if="!hideNvueBottomTag" ref="zp-n-list-bottom-tag" class="zp-n-list-bottom-tag" is="header"></view>
+				<!-- 上拉加载更多view -->
+				<view :is="nViewIs" v-if="!refresherOnly&&loadingMoreEnabled">
+					<view v-if="useChatRecordMode">
+						<view v-if="loadingStatus!==2&&realTotalData.length">
+							<slot v-if="$slots.chatLoading" name="chatLoading" />
+							<view v-else class="zp-chat-record-loading-container">
+								<text v-if="loadingStatus!==1" @click="_scrollToUpper()"
+									:class="defaultThemeStyle==='white'?'zp-loading-more-text zp-loading-more-text-white':'zp-loading-more-text zp-loading-more-text-black'">{{chatRecordLoadingMoreText}}</text>
+								<view>
+									<loading-indicator v-if="loadingStatus===1" class="zp-line-loading-image" animating />
+								</view>
 							</view>
 						</view>
 					</view>
+					<view :style="nLoadingMoreFixedHeight?{height:loadingMoreCustomStyle&&loadingMoreCustomStyle.height?loadingMoreCustomStyle.height:'80rpx'}:{}">
+						<slot v-if="showLoadingMoreDefault" name="loadingMoreDefault" />
+						<slot v-else-if="showLoadingMoreLoading" name="loadingMoreLoading" />
+						<slot v-else-if="showLoadingMoreNoMore" name="loadingMoreNoMore" />
+						<slot v-else-if="showLoadingMoreFail" name="loadingMoreFail" />
+						<z-paging-load-more @doClick="_onLoadingMore('click')" v-else-if="showLoadingMoreCustom" :zConfig="zPagingLoadMoreConfig" />
+						<view v-if="safeAreaInsetBottom && useSafeAreaPlaceholder" class="zp-safe-area-placeholder" :style="[{height:safeAreaBottom+'px'}]" />
+					</view>
 				</view>
-				<view :style="nLoadingMoreFixedHeight?{height:loadingMoreCustomStyle&&loadingMoreCustomStyle.height?loadingMoreCustomStyle.height:'80rpx'}:{}">
-					<slot v-if="_shouldShowLoadingMore('loadingMoreDefault')" name="loadingMoreDefault" />
-					<slot v-else-if="_shouldShowLoadingMore('loadingMoreLoading')" name="loadingMoreLoading" />
-					<slot v-else-if="_shouldShowLoadingMore('loadingMoreNoMore')" name="loadingMoreNoMore" />
-					<slot v-else-if="_shouldShowLoadingMore('loadingMoreFail')" name="loadingMoreFail" />
-					<z-paging-load-more @click.native="_onLoadingMore('click')"
-						v-else-if="_shouldShowLoadingMore('loadingMoreCustom')" :zConfig="zPagingLoadMoreConfig">
-					</z-paging-load-more>
-				</view>
+			</view>
+			<view v-if="$slots.right" class="zp-page-right">
+				<slot name="right" />
 			</view>
 		</view>
 		<!-- 底部固定的slot -->
-		<slot name="bottom"></slot>
+		<slot name="bottom" />
 		<!-- 点击返回顶部view -->
 		<view v-if="showBackToTopClass" :class="backToTopClass" :style="[finalBackToTopStyle]" @click.stop="_backToTopClick">
 			<slot v-if="$slots.backToTop" name="backToTop" />
-			<image v-else class="zp-back-to-top-img" :src="backToTopImg.length?backToTopImg:base64BackToTop"></image>
+			<image v-else class="zp-back-to-top-img" :src="backToTopImg.length?backToTopImg:base64BackToTop" />
+		</view>
+		<!-- 全屏Loading(铺满z-paging并固定) -->
+		<view v-if="$slots.loading&&showLoading&&loadingFullFixed" class="zp-loading-fixed">
+			<slot name="loading" />
 		</view>
 	</view>
 	<!-- #endif -->
 </template>
 <!-- #ifdef APP-VUE || MP-WEIXIN || MP-QQ || H5 -->
-<script
-    src="./wxs/z-paging-wxs.wxs"
-    module="pagingWxs"
-    lang="wxs"
-></script>
+<script src="./wxs/z-paging-wxs.wxs" module="pagingWxs" lang="wxs"></script>
 <!-- #endif -->
 <script module="pagingRenderjs" lang="renderjs">
 	import pagingRenderjs from './wxs/z-paging-renderjs.js';
 	/**
 	 * z-paging 分页组件
-	 * @description 【uni-app自动分页器】超简单，低耦合！仅需两步轻松完成完整分页逻辑(下拉刷新、上拉加载更多)，分页全自动处理。支持自定义加载更多的文字或整个view，自定义下拉刷新样式，自动管理空数据view等。
-	 * @tutorial http://z-paging.com
-	 * @property {Number|String} default-page-no 自定义pageNo，默认为1
+	 * @description 高性能，全平台兼容。支持虚拟列表，支持nvue、vue3
+	 * @tutorial https://z-paging.zxlee.cn
+	 * @notice 以下仅为部分常用属性、方法&事件，完整文档请查阅z-paging官网
+	 * @property {Number|String} default-page-no 自定义初始的pageNo，默认为1
 	 * @property {Number|String} default-page-size 自定义pageSize，默认为10
-	 * @property {Number|Object} data-key 为保证数据一致，设置当前tab切换时的标识key，并在complete中传递相同key，若二者不一致，则complete将不会生效
-	 * @property {String} autowire-list-name 【极简写法】自动注入的list名，可自动修改父view(包含ref="paging")中对应name的list值(z-paging标签必须设置`ref="paging"`)
-	 * @property {String} autowire-query-name 【极简写法】自动注入的query名，可自动调用父view(包含ref="paging")中的query方法(z-paging标签必须设置`ref="paging"`)
 	 * @property {Number|String} delay 调用complete后延迟处理的时间，单位为毫秒
 	 * @property {String} language i18n国际化设置语言，支持简体中文(zh-cn)、繁体中文(zh-hant-cn)和英文(en)
-	 * @property {Boolean} follow-system-language i18n国际化默认是否跟随系统语言，默认为是
 	 * @property {Object} paging-style 设置z-paging的style，部分平台(如微信小程序)无法直接修改组件的style，可使用此属性代替
 	 * @property {String} height z-paging的高度，优先级低于pagingStyle中设置的height，传字符串，如100px、100rpx、100%
 	 * @property {String} width z-paging的宽度，优先级低于pagingStyle中设置的width，传字符串，如100px、100rpx、100%
-	 * @property {String} bg-color z-paging的背景色，优先级低于pagingStyle中设置的background-color。传字符串，如"#ffffff"
-	 * @property {Object} paging-content-style 设置z-paging的容器(插槽的父view)的style
-	 * @property {Boolean} auto-height z-paging是否自动高度，若自动高度则会自动铺满屏幕，默认为否
-	 * @property {Number|String} auto-height-addition z-paging是否自动高度时，附加的高度，注意添加单位px或rpx，默认为px，若需要减少高度，请传负数
+	 * @property {String} bg-color z-paging的背景色，优先级低于pagingStyle中设置的background。传字符串，如"#ffffff"
 	 * @property {String} default-theme-style loading(下拉刷新、上拉加载更多)的主题样式，支持black，white，默认black
 	 * @property {String} refresher-theme-style 下拉刷新的主题样式，支持black，white，默认black
-	 * @property {Object} refresher-img-style 自定义下拉刷新中左侧图标的样式
-	 * @property {Object} refresher-title-style 自定义下拉刷新中右侧状态描述文字的样式
-	 * @property {Object} refresher-update-time-style 自定义下拉刷新中右侧最后更新时间文字的样式(show-refresher-update-time为true时有效)
-	 * @property {String} loading-more-theme-style 底部加载更多的主题样式，支持black，white，默认black
 	 * @property {Boolean} refresher-only 是否只使用下拉刷新，设置为true后将关闭mounted自动请求数据、关闭滚动到底部加载更多，强制隐藏空数据图。默认为否
-	 * @property {Number|String} refresher-complete-delay 自定义下拉刷新结束以后延迟回弹的时间，单位为毫秒，默认为0
-	 * @property {Number|String} refresher-complete-duration 自定义下拉刷新结束回弹动画时间，单位为毫秒，默认为300毫秒(refresherEndBounceEnabled为false时，refresherCompleteDuration为设定值的1/3)，nvue无效
 	 * @property {Boolean} use-page-scroll 使用页面滚动，默认为否，当设置为是时则使用页面的滚动而非此组件内部的scroll-view的滚动，使用页面滚动时z-paging无需设置确定的高度且对于长列表展示性能更高，但配置会略微繁琐
-	 * @property {Boolean} fixed z-paging是否使用fixed布局，若使用fixed布局，则z-paging的父view无需固定高度，z-paging高度默认为100%，默认为否(当使用内置scroll-view滚动时有效)
+	 * @property {Boolean} use-virtual-list 是否使用虚拟列表，默认为否
+	 * @property {Boolean} fixed z-paging是否使用fixed布局，若使用fixed布局，则z-paging的父view无需固定高度，z-paging高度默认为100%，默认为是(当使用内置scroll-view滚动时有效)
 	 * @property {Boolean} safe-area-inset-bottom 是否开启底部安全区域适配，默认为否
-	 * @property {Boolean} scrollable 是否可以滚动，使用内置scroll-view和nvue时有效，默认为是
 	 * @property {Boolean} auto [z-paging]mounted后是否自动调用reload方法(mounted后自动调用接口)，默认为是
 	 * @property {Boolean} auto-scroll-to-top-when-reload reload时是否自动滚动到顶部，默认为是
 	 * @property {Boolean} auto-clean-list-when-reload reload时是否立即自动清空原list，默认为是，若立即自动清空，则在reload之后、请求回调之前页面是空白的
-	 * @property {Boolean} show-refresher-when-reload 调用reload方法时是否自动显示下拉刷新view，默认为否
-	 * @property {Boolean} show-loading-more-when-reload 调用reload方法时自动显示加载更多view，且为加载中状态(仅初始设置有效，不可动态修改)
-	 * @property {Boolean} refresher-update-time-key 如果需要区别不同页面的最后更新时间，请为不同页面的z-paging的`refresher-update-time-key`设置不同的字符串
-	 * @property {Boolean} use-custom-refresher 是否使用自定义的下拉刷新，默认为是，即使用z-paging的下拉刷新。设置为false即代表使用uni scroll-view自带的下拉刷新，h5、App、微信小程序以外的平台不支持uni scroll-view自带的下拉刷新
-	 * @property {Number|String} refresher-fps 自定义下拉刷新下拉帧率，默认为40，过高可能会出现抖动问题
-	 * @property {Number|String} refresher-max-angle 自定义下拉刷新允许触发的最大下拉角度，默认为40度，当下拉角度小于设定值时，自定义下拉刷新动画不会被触发
-	 * @property {Boolean} refresher-angle-enable-change-continued 自定义下拉刷新的角度由未达到最大角度变到达到最大角度时，是否继续下拉刷新手势，默认为否
+	 * @property {Boolean} show-refresher-when-reload 列表刷新时是否自动显示下拉刷新view，默认为否
 	 * @property {String|Object} refresher-default-text 自定义下拉刷新默认状态下的文字
 	 * @property {String|Object} refresher-pulling-text 自定义下拉刷新松手立即刷新状态下的文字
 	 * @property {String|Object} refresher-refreshing-text 自定义下拉刷新刷新中状态下的文字
 	 * @property {String|Object} refresher-complete-text 自定义下拉刷新刷新结束状态下的文字
-	 * @property {Boolean} refresher-end-bounce-enabled 是否开启自定义下拉刷新刷新结束回弹效果，默认为是
 	 * @property {Object} loading-more-custom-style 自定义底部加载更多样式
-	 * @property {Object} loading-more-loading-icon-custom-style 自定义底部加载更多加载中动画样式
-	 * @property {String} loading-more-loading-icon-type 自定义底部加载更多加载中动画图标类型，可选circle或flower，默认为circle
-	 * @property {String} loading-more-loading-icon-custom-image 自定义底部加载更多加载中动画图标图片
-	 * @property {Boolean} loading-more-loading-animated 底部加载更多加载中view是否展示旋转动画(loading-more-loading-icon-custom-image有值时有效，nvue无效)
 	 * @property {Boolean} loading-more-enabled 是否启用加载更多数据(含滑动到底部加载更多数据和点击加载更多数据)，默认为是
-	 * @property {Boolean} to-bottom-loading-more-enabled 是否启用滑动到底部加载更多数据
 	 * @property {String|Object} loading-more-default-text 滑动到底部"默认"文字，默认为【点击加载更多】
 	 * @property {String|Object} loading-more-loading-text 滑动到底部"加载中"文字，默认为【正在加载...】
 	 * @property {String|Object} loading-more-no-more-text 滑动到底部"没有更多"文字，默认为【没有更多了】
 	 * @property {String|Object} loading-more-fail-text 滑动到底部"加载失败"文字，默认为【加载失败，点击重新加载】
-	 * @property {Boolean} hide-loading-more-when-no-more-and-inside-of-paging 当没有更多数据且分页内容未超出z-paging时是否隐藏没有更多数据的view，默认为是
-	 * @property {Boolean} hide-loading-more-when-no-more-and-inside-of-paging 当没有更多数据且分页内容未超出z-paging时是否隐藏没有更多数据的view，默认为是
 	 * @property {Boolean} inside-more 当分页未满一屏时，是否自动加载更多(nvue无效)，默认为否
-	 * @property {Boolean} show-default-loading-more-text 是否显示默认的加载更多text，默认为是
-	 * @property {Boolean} show-loading-more-no-more-line 是否显示没有更多数据的分割线，默认为是
-	 * @property {Object} loading-more-no-more-line-custom-style 自定义底部没有更多数据的分割线样式
 	 * @property {Boolean} hide-empty-view 是否强制隐藏空数据图，默认为否
 	 * @property {String|Object} empty-view-text 空数据图描述文字，默认为“没有数据哦~”
 	 * @property {Boolean} show-empty-view-reload 是否显示空数据图重新加载按钮(无数据时)，默认为否
@@ -307,58 +313,25 @@ by ZXLee 2021-10-08
 	 * @property {String|Object} empty-view-error-text 空数据图“加载失败”描述文字
 	 * @property {String} empty-view-error-img 空数据图“加载失败”图片，默认使用z-paging内置的图片(建议使用绝对路径)
 	 * @property {Object} empty-view-style 空数据图样式
-	 * @property {Object} empty-view-img-style 空数据图img样式
-	 * @property {Object} empty-view-title-style 空数据图描述文字样式
-	 * @property {Object} empty-view-reload-style 空数据图重新加载按钮样式
 	 * @property {Boolean} empty-view-fixed 空数据图片是否铺满z-paging，默认为是。若设置为否，则为填充满z-paging的剩余部分
 	 * @property {Boolean} empty-view-center 空数据图片是否垂直居中，默认为是。emptyViewFixed为false时有效
-	 * @property {Boolean} auto-hide-empty-view-when-loading 加载中时是否自动隐藏空数据图，默认为是
-	 * @property {Boolean} auto-hide-loading-after-first-loaded 第一次加载后是否自动隐藏loading slot，默认为是
 	 * @property {Boolean} auto-show-back-to-top 自动显示点击返回顶部按钮，默认为否
 	 * @property {Number|String} back-to-top-threshold 点击返回顶部按钮显示/隐藏的阈值(滚动距离)，单位为px，默认为400rpx
 	 * @property {String} back-to-top-img 点击返回顶部按钮的自定义图片地址，默认使用z-paging内置的图片
-	 * @property {Boolean} back-to-top-with-animate 点击返回顶部按钮返回到顶部时是否展示过渡动画，默认为是
-	 * @property {Number|String} back-to-top-bottom 点击返回顶部按钮与底部的距离，注意添加单位px或rpx，默认为160rpx
 	 * @property {Object} back-to-top-style 点击返回顶部按钮的自定义样式
 	 * @property {Boolean} show-scrollbar 控制是否出现滚动条，默认为是
-	 * @property {Boolean} scroll-x 是否允许横向滚动，默认为否
-	 * @property {Boolean} scroll-to-top-bounce-enabled iOS设备上滚动到顶部时是否允许回弹效果，默认为否。关闭回弹效果后可使滚动到顶部与下拉刷新更连贯，但是有吸顶view时滚动到顶部时可能出现抖动。
-	 * @property {Boolean} scroll-with-animation 控制是否出现滚动条，默认为否
-	 * @property {String} scroll-into-view 值应为某子元素id（id不能以数字开头）。设置哪个方向可滚动，则在哪个方向滚动到该元素
 	 * @property {Number|String} lower-threshold 距底部/右边多远时（单位px），触发 scrolltolower 事件，默认为100rpx
-	 * @property {Boolean} enable-back-to-top iOS点击顶部状态栏、安卓双击标题栏时，滚动条返回顶部，只支持竖向，默认为是
 	 * @property {Boolean} refresher-enabled 是否开启自定义下拉刷新，默认为是
-	 * @property {Number|String} refresher-threshold 设置自定义下拉刷新阈值，默认为80rpx
-	 * @property {String} refresher-default-style 设置自定义下拉刷新默认样式，支持设置 black，white，none，none 表示不使用默认样式，默认为black
-	 * @property {String} refresher-background 设置自定义下拉刷新区域背景颜色
 	 * @property {Boolean} show-refresher-update-time 是否显示上次下拉刷新更新时间，默认为否
 	 * @property {String} refresher-update-time-key 上次下拉刷新更新时间的key，用于区别不同的上次更新时间
-	 * @property {Number|String} local-paging-loading-time 本地分页时上拉加载更多延迟时间，单位为毫秒，默认200毫秒
 	 * @property {Boolean} use-chat-record-mode 使用聊天记录模式，默认为否
-	 * @property {Number} top-z-index slot="top"的view的z-index，仅使用页面滚动时有效，默认为99
-	 * @property {Number} super-content-z-index z-paging内容容器父view的z-index，默认为1
-	 * @property {Number} content-z-index z-paging内容容器部分的z-index，默认为10
-	 * @property {Number} empty-view-z-index 空数据view的z-index，默认为9
-	 * @property {Boolean} auto-full-height 使用页面滚动时，是否在不满屏时自动填充满屏幕，默认为是
-	 * @property {Boolean} concat 自动拼接complete中传过来的数组(使用聊天记录模式时无效)，默认为是
 	 * @property {String} nvue-list-is nvue中修改列表类型，可选值有list、waterfall和scroller，默认为list
 	 * @property {Object} nvue-waterfall-config nvue waterfall配置，仅在nvue中且nvueListIs=waterfall时有效，配置参数详情参见：https://uniapp.dcloud.io/component/waterfall
-	 * @property {Boolean} nvue-bounce nvue 控制是否回弹效果，iOS不支持动态修改(若禁用回弹效果，下拉刷新将失效)，默认为是
-	 * @property {Boolean} nvue-fast-scroll nvue中通过代码滚动到顶部/底部时，是否加快动画效果(无滚动动画时无效)，默认为否
-	 * @property {String} nvue-list-id nvue中list的id
-	 * @property {Object} nvue-refresher-style nvue中refresh组件的样式
-	 * @property {Boolean} hide-nvue-bottom-tag 是否隐藏nvue列表底部的tagView，此view用于标识滚动到底部位置，若隐藏则滚动到底部功能将失效，在nvue中实现吸顶+swiper功能时需将最外层z-paging的此属性设置为true。默认为否
-	 * @property {Boolean} show-console-error 是否将错误信息打印至控制台，默认为是
 	 * @event {Function} query 下拉刷新或滚动到底部时会自动触发此方法。z-paging加载时也会触发(若要禁止，请设置:auto="false")。pageNo和pageSize会自动计算好，直接传给服务器即可。
-	 * @event {Function} refresherStatusChange 自定义下拉刷新状态改变(use-custom-refresher为true时生效)【注：通过`:refresher-status.sync`绑定当前data中的指定变量亦可】
+	 * @event {Function} refresherStatusChange 自定义下拉刷新状态改变(use-custom-refresher为true时生效)
 	 * @event {Function} loadingStatusChange 上拉加载更多状态改变
-	 * @event {Function} refresherTouchstart 自定义下拉刷新下拉开始(use-custom-refresher为true时生效)【注：当需要更细致定制自定义下拉刷新时使用，如果只需监听下拉刷新各个状态改变，使用`refresherStatusChange`即可】
-	 * @event {Function} refresherTouchmove 自定义下拉刷新下拉中开始(use-custom-refresher为true时生效)【注：当需要更细致定制自定义下拉刷新时使用，如果只需监听下拉刷新各个状态改变，使用`refresherStatusChange`即可】
-	 * @event {Function} refresherTouchend 自定义下拉刷新下拉结束(use-custom-refresher为true时生效)【注：当需要更细致定制自定义下拉刷新时使用，如果只需监听下拉刷新各个状态改变，使用`refresherStatusChange`即可】
 	 * @event {Function} onRefresh 自定义下拉刷新被触发
-	 * @event {Function} onRestore 自定义下拉刷新被复位
 	 * @event {Function} scroll `z-paging`内置的scroll-view滚动时触发
-	 * @event {Function} scrollTopChange scrollTop改变时触发，使用点击返回顶部时需要获取scrollTop时可使用此事件【注：通过`:scroll-top.sync`绑定当前data中的指定变量亦可】(@scrolltoupper触发时，也会自动触发此方法，且scrollTop=0)
 	 * @event {Function} scrolltolower `z-paging`内置的scroll-view滚动底部时触发
 	 * @event {Function} scrolltoupper `z-paging`内置的scroll-view滚动顶部时触发
 	 * @event {Function} listChange 分页渲染的数组改变时触发
@@ -370,132 +343,9 @@ by ZXLee 2021-10-08
 		// #ifdef APP-VUE || H5
 		mixins: [pagingRenderjs],
 		// #endif
-		// 以下代码是为了欺骗编译器使props的代码提示功能生效，不会被编译到项目中
-		// #ifdef QUICKAPP-WEBVIEW-UNION
-		props: {
-			defaultPageNo: {type: [Number, String]},
-			defaultPageSize: {type: [Number, String]},
-			dataKey: {type: [Number, Object]},
-			autowireListName: {type: String},
-			autowireQueryName: {type: String},
-			delay: {type: [Number, String]},
-			language: {type: String},
-			followSystemLanguage: {type: Boolean},
-			pagingStyle: {type: Object},
-			height: {type: String},
-			width: {type: String},
-			bgColor: {type: String},
-			pagingContentStyle: {type: Object},
-			autoHeight: {type: Boolean},
-			autoHeightAddition: {type: [Number, String]},
-			defaultThemeStyle: {type: String},
-			refresherThemeStyle: {type: String},
-			refresherImgStyle: {type: Object},
-			refresherTitleStyle: {type: Object},
-			refresherUpdateTimeStyle: {type: Object},
-			loadingMoreThemeStyle: {type: String},
-			refresherOnly: {type: Boolean},
-			refresherCompleteDelay: {type: [Number, String]},
-			refresherCompleteDuration: {type: [Number, String]},
-			usePageScroll: {type: Boolean},
-			fixed: {type: Boolean},
-			safeAreaInsetBottom: {type: Boolean},
-			scrollable: {type: Boolean},
-			mountedAutoCallReload: {type: Boolean},
-			auto: {type: Boolean},
-			autoScrollToTopWhenReload: {type: Boolean},
-			autoCleanListWhenReload: {type: Boolean},
-			showRefresherWhenReload: {type: Boolean},
-			showLoadingMoreWhenReload: {type: Boolean},
-			useCustomRefresher: {type: Boolean},
-			refresherFps: {type: [Number, String]},
-			refresherMaxAngle: {type: [Number, String]},
-			refresherAngleEnableChangeContinued: {type: Boolean},
-			refresherDefaultText: {type: [String, Object]},
-			refresherPullingText: {type: [String, Object]},
-			refresherRefreshingText: {type: [String, Object]},
-			refresherCompleteText: {type: [String, Object]},
-			refresherEndBounceEnabled: {type: Boolean},
-			loadingMoreCustomStyle: {type: Object},
-			loadingMoreLoadingIconCustomStyle: {type: Object},
-			loadingMoreLoadingIconType: {type: String},
-			loadingMoreLoadingIconCustomImage: {type: String},
-			loadingMoreLoadingAnimated: {type: Boolean},
-			loadingMoreEnabled: {type: Boolean},
-			toBottomLoadingMoreEnabled: {type: Boolean},
-			loadingMoreDefaultText: {type: [String, Object]},
-			loadingMoreLoadingText: {type: [String, Object]},
-			loadingMoreNoMoreText: {type: [String, Object]},
-			loadingMoreFailText: {type: [String, Object]},
-			hideLoadingMoreWhenNoMoreAndInsideOfPaging: {type: Boolean},
-			hideLoadingMoreWhenNoMoreByLimit: {type: Number},
-			insideMore: {type: Boolean},
-			showDefaultLoadingMoreText: {type: Boolean},
-			showLoadingMoreNoMoreView: {type: Boolean},
-			showLoadingMoreNoMoreLine: {type: Boolean},
-			loadingMoreNoMoreLineCustomStyle: {type: Object},
-			hideEmptyView: {type: Boolean},
-			emptyViewText: {type: [String, Object]},
-			showEmptyViewReload: {type: Boolean},
-			showEmptyViewReloadWhenError: {type: Boolean},
-			emptyViewReloadText: {type: [String, Object]},
-			emptyViewImg: {type: String},
-			emptyViewErrorText: {type: [String, Object]},
-			emptyViewErrorImg: {type: String},
-			emptyViewStyle: {type: Object},
-			emptyViewImgStyle: {type: Object},
-			emptyViewTitleStyle: {type: Object},
-			emptyViewReloadStyle: {type: Object},
-			emptyViewFixed: {type: Boolean},
-			emptyViewCenter: {type: Boolean},
-			autoHideEmptyViewWhenLoading: {type: Boolean},
-			autoHideLoadingAfterFirstLoaded: {type: Boolean},
-			autoShowBackToTop: {type: Boolean},
-			backToTopThreshold: {type: [Number, String]},
-			backToTopImg: {type: String},
-			backToTopWithAnimate: {type: Boolean},
-			backToTopBottom: {type: [Number, String]},
-			backToTopStyle: {type: Object},
-			showScrollbar: {type: Boolean},
-			scrollX: {type: Boolean},
-			scrollToTopBounceEnabled: {type: Boolean},
-			scrollToBottomBounceEnabled: {type: Boolean},
-			scrollWithAnimation: {type: Boolean},
-			scrollIntoView: {type: String},
-			lowerThreshold: {type: [Number, String]},
-			enableBackToTop: {type: Boolean},
-			refresherEnabled: {type: Boolean},
-			refresherThreshold: {type: [Number, String]},
-			refresherDefaultStyle: {type: String},
-			refresherBackground: {type: String},
-			refresherFixedBackground: {type: String},
-			refresherFixedBacHeight: {type: [Number, String]},
-			refresherOutRate: {type: Number},
-			showRefresherUpdateTime: {type: Boolean},
-			refresherUpdateTimeKey: {type: String},
-			localPagingLoadingTime: {type: [Number, String]},
-			useChatRecordMode: {type: Boolean},
-			topZIndex: {type: Number},
-			superContentZIndex: {type: Number},
-			contentZIndex: {type: Number},
-			emptyViewZIndex: {type: Number},
-			autoFullHeight: {type: Boolean},
-			concat: {type: Boolean},
-			nvueListIs: {type: String},
-			nvueWaterfallConfig: {type: Object},
-			nvueBounce: {type: Boolean},
-			nvueFastScroll: {type: Boolean},
-			nvueListId: {type: String},
-			nvueRefresherStyle: {type: Object},
-			hideNvueBottomTag: {type: Boolean},
-			showConsoleError: {type: Boolean},
-			value: {type: Array}
-		}
-		// #endif
 	}
 </script>
-<script
-    src="./js/z-paging-main.js"></script>
+<script src="./js/z-paging-main.js" />
 	
 <style scoped>
 	@import "./css/z-paging-main.css";

h5_web/uni_modules/z-paging/package.json

@@ -1,14 +1,15 @@
 {
   "id": "z-paging",
-  "displayName": "【z-paging下拉刷新、上拉加载更多】超简单、低耦合！仅需两步轻松完成完整分页逻辑",
-  "version": "2.0.8",
-  "description": "【支持nvue，使用wxs+renderjs实现】全平台兼容，支持自定义下拉刷新、上拉加载更多，支持自动管理空数据图、点击返回顶部，支持聊天分页、本地分页，支持展示最后更新时间，支持国际化等等",
+  "name": "z-paging",
+  "displayName": "【z-paging下拉刷新、上拉加载】高性能，全平台兼容。支持虚拟列表，支持nvue、vue3",
+  "version": "2.3.2",
+  "description": "超简单、低耦合！使用wxs+renderjs实现。支持长列表优化，支持自定义下拉刷新、上拉加载更多，支持自动管理空数据图、点击返回顶部，支持聊天分页、本地分页，支持国际化等100+项配置",
   "keywords": [
     "下拉刷新",
     "上拉加载",
     "分页器",
     "nvue",
-    "wxs"
+    "虚拟列表"
 ],
   "repository": "https://github.com/SmileZXLee/uni-z-paging",
   "engines": {
@@ -35,7 +36,7 @@
       "data": "无",
       "permissions": "无"
     },
-    "npmurl": ""
+    "npmurl": "https://www.npmjs.com/package/z-paging"
   },
   "uni_modules": {
     "dependencies": [],
@@ -71,12 +72,12 @@
           "QQ": "y"
         },
         "快应用": {
-          "华为": "u",
-          "联盟": "u"
+          "华为": "y",
+          "联盟": "y"
         },
         "Vue": {
             "vue2": "y",
-            "vue3": "u"
+            "vue3": "y"
         }
       }
     }

h5_web/uni_modules/z-paging/readme.md

@@ -1,13 +1,9 @@
 # z-paging
 
+[![version](https://img.shields.io/badge/version-2.3.2-blue)](https://github.com/SmileZXLee/uni-z-paging)
+[![license](https://img.shields.io/github/license/SmileZXLee/uni-z-paging)](https://en.wikipedia.org/wiki/MIT_License)
 
-***  
-
-## 【注意】由V1.9.0起，fixed属性默认值为true，z-paging默认会铺满屏幕。老项目更新请注意，使用侧滑滚动切换选项卡或需要局部使用z-paging请设置:fixed="false"。如果您希望fixed属性默认为false，请参考文档：z-paging.com，将fixed默认值设置为false。
-*** 
-
-### API文档地址：[https://z-paging.com](http://z-paging.com)
-### 备用API文档地址：[https://www.zxlee.cn/z-paging/index.html](https://www.zxlee.cn/z-paging/index.html) 
+### API文档地址：[https://z-paging.zxlee.cn](https://z-paging.zxlee.cn)
 
 ***  
 ### 功能&特点
@@ -15,15 +11,13 @@
 * 【低耦合，低侵入】分页自动管理。在page中无需处理任何分页相关逻辑，无需在data中定义任何分页相关变量，全由z-paging内部处理。
 * 【超灵活，支持各种类型自定义】支持自定义下拉刷新，自定义上拉加载更多，自带自定义下拉刷新效果，及其他数十种自定义属性。
 * 【功能丰富】支持国际化，支持自定义且自动管理空数据图，支持主题模式切换，支持本地分页，支持聊天分页模式，支持展示最后更新时间，支持吸顶效果，支持内部scroll-view滚动与页面滚动，支持一键滚动到顶部等诸多功能。
-* 【多平台兼容，细致，流畅】支持nvue，支持h5、app及各家小程序；在app-vue、h5、微信小程序、QQ小程序上使用wxs实现下拉刷新，大幅提升性能。多处细节优化，给您精致流畅的体验。
+* 【全平台兼容】支持nvue，vue3，支持h5、app及各家小程序。
+* 【高性能】在app-vue、h5、微信小程序、QQ小程序上使用wxs+renderjs从视图层实现下拉刷新；支持虚拟列表，轻松渲染万级数据！
 
 *** 
 ### 反馈qq群(点击加群)：[790460711](https://jq.qq.com/?_wv=1027&k=vU2fKZZH)
  
 *** 
-#### 关于自动引入组件
-
-> `z-paging` 支持[easycom组件规范](https://uniapp.dcloud.io/component/README?id=easycom组件规范)，无需引用和注册组件即可直接使用，在正在运行的项目中导入`z-paging`可能会提示：`Unknown custom element：<z-paging> - did you register the component corrently?... `，此时需要重新运行项目即可。
 
 ### 预览