Merge branch 'master' of https://github.com/dcloudio/unidocs-zh

docs/.vuepress/components/md/virtual.vue

@@ -20,10 +20,12 @@
 				[...contentChildren].forEach((child, index) => {
 					if (child.nodeName === 'UL') {
 						const ulHeight = child.clientHeight;
-						const isVisible = visibleHeight + window.scrollY > child.offsetTop - 500;
+						const ulOffsetTop = child.offsetTop;
+						const isVisible = visibleHeight + window.scrollY > ulOffsetTop - 500;
+						const isOver = window.scrollY > ulOffsetTop + ulHeight
 						child.style.height = `${ulHeight}px`;
 
-						if (!isVisible) {
+						if (!isVisible || isOver) {
 							const _ul = document.createDocumentFragment();
 							[...child.children].forEach(item => _ul.appendChild(item));
 							(!this.contentFrame[index] || !this.contentFrame[index].children.length) &&

docs/api/plugins/payment.md

@@ -287,7 +287,7 @@ uni.requestPayment({
 注意事项
 
 - 相同订单，重复调用 `restoreCompletedTransactions` 后 `transactionReceipt` 会发生变化，并非唯一值
-
+- 调用 `finishTransaction` 关闭订单可能不会立即生效，取决于苹果的服务器
 
 ### 订单丢失场景
 
@@ -449,8 +449,8 @@ uni.requestPayment({
           // await this.validatePaymentResult({
           //   orderId: orderId,
           //   username: username,
-          //   transactionReceipt: transaction.transactionReceipt,
-          //   transactionIdentifier: transaction.transactionIdentifier // 不可作为订单唯一标识
+          //   transactionReceipt: transaction.transactionReceipt, // 不可作为订单唯一标识
+          //   transactionIdentifier: transaction.transactionIdentifier
           // });
 
           // 验证成功后关闭订单