From 1f4fac94aed7e7d28399db414948fa0f6c183726 Mon Sep 17 00:00:00 2001
From: ghusermoon <2673031505@qq.com>
Date: Fri, 14 Aug 2020 14:57:46 +0800
Subject: [PATCH] nickname 8.14

---
 pageE/order/Index.vue      | 2 +-
 pageE/tool/MineHistory.vue | 3 ++-
 pages/mine/index.vue       | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pageE/order/Index.vue b/pageE/order/Index.vue
index 8f3bcc0..415aeaf 100644
--- a/pageE/order/Index.vue
+++ b/pageE/order/Index.vue
@@ -14,7 +14,7 @@
 						</view>
 					</view>
 					<u-empty text="暂无订单" mode="order" color="#000000" v-if="!orderList[index] || !orderList[index].length"></u-empty>
-					<u-loadmore :status="loadStatus[index]" bgColor="#ECECEC" margin-bottom="20" v-if="current != 4 && (!orderList[index] || orderList[index].length>3)" class="order-loadmore"></u-loadmore>
+					<u-loadmore :status="loadStatus[index]" bgColor="#ECECEC" font-size="14" margin-bottom="20" v-if="current != 4 && (!orderList[index] || orderList[index].length>3)" class="order-loadmore"></u-loadmore>
 				</scroll-view>
 			</swiper-item>
 		</swiper>
diff --git a/pageE/tool/MineHistory.vue b/pageE/tool/MineHistory.vue
index 46b459e..b85e2f3 100644
--- a/pageE/tool/MineHistory.vue
+++ b/pageE/tool/MineHistory.vue
@@ -19,7 +19,7 @@
 			</view>
 			<u-action-sheet :list="actionList" v-model="showAction" :cancel-btn="true" @click="delHistory" border-radius="20"></u-action-sheet>
 			<u-empty text="暂无足迹" mode="list" color="#000" v-if="!historyList.length"></u-empty>
-			<u-loadmore :status="loadStatus" bgColor="#ECECEC" margin-bottom="20" v-if="historyList.length > 9"></u-loadmore>
+			<u-loadmore :status="loadStatus" bgColor="#ECECEC" margin-top="20" margin-bottom="20" v-if="historyList.length > pageSize" @loadmore="reachBottom"></u-loadmore>
 		</scroll-view>
     </view>
 </template>
@@ -28,6 +28,7 @@
 export default {
     data() {
         return {
+			pageSize: 12,
 			hid: '', // 选中的商品 id
 			historyList:  [],
 			page: 1, // 默认1
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index 07fee05..a195ef6 100644
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -192,14 +192,14 @@ export default {
 				.info-left {
 					margin-right: 15rpx;
 					.user-nickname {
-						width: 100rpx;
+						max-width: 200rpx;
 						font-size: 30rpx;
 						color: rgba(51,51,51,1);
 						margin-bottom: 19rpx;
 					}
 					.user-medal {
 						display: flex;
-						// width: 110rpx;
+						width: 110rpx;
 						// height: 25rpx;
 						background: linear-gradient(269deg,rgba(175,175,175,1) 0%,rgba(224,224,224,1) 100%);
 						border-radius: 13rpx;