From 806cf4df1a28c92f446b16d98ca66b1e2d31eff4 Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Sat, 13 May 2023 12:30:27 +0800
Subject: [PATCH 1/2] =?UTF-8?q?improve:=20=E6=95=B0=E6=8D=AE=E4=BF=9D?=
 =?UTF-8?q?=E5=BA=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../uni-app/pages/users/user_vip/index.vue     | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/template/uni-app/pages/users/user_vip/index.vue b/template/uni-app/pages/users/user_vip/index.vue
index c71385f8e..5d56424aa 100644
--- a/template/uni-app/pages/users/user_vip/index.vue
+++ b/template/uni-app/pages/users/user_vip/index.vue
@@ -11,7 +11,7 @@
 								<view class="acea-row row-middle user-wrap">
 									<image class="image" :src="userInfo.avatar"></image>
 									<view class="text">
-										<view class="name">{{$t(userInfo.nickname)}}</view>
+										<view class="name">{{$t(userInfo.nickname || '')}}</view>
 										<view>{{$t(`商城购物可享`)}}<text class="num">{{item.discount}}</text>{{$t(`折`)}}
 										</view>
 									</view>
@@ -22,15 +22,15 @@
 								</view>
 								<template v-if="item.grade === levelInfo.grade">
 									<view class="grow-wrap">
-										<view>{{$t(`今日成长值`)}}<text class="num">{{levelInfo.today_exp}}</text>{{$t(`点`)}}
+										<view>{{$t(`今日成长值`)}}<text class="num">{{levelInfo.today_exp || ''}}</text>{{$t(`点`)}}
 										</view>
 										<view class="process">
 											<view
 												:style="{width: `${Math.floor((levelInfo.exp / item.next_exp_num) > 1 ? 100 : levelInfo.exp / item.next_exp_num * 100)}%`}"
 												class="fill"></view>
 										</view>
-										<view class="ratio"><text class="num">{{levelInfo.exp}}</text>/<text
-												class="num">{{item.next_exp_num}}</text></view>
+										<view class="ratio"><text class="num">{{levelInfo.exp || ''}}</text>/<text
+												class="num">{{item.next_exp_num || ''}}</text></view>
 									</view>
 									<navigator class="acea-row row-between-wrapper record-wrap"
 										url="/pages/users/user_vip_areer/index" hover-class="none">
@@ -49,7 +49,7 @@
 										</view>
 										<view class="ratio">
 											<text
-												class="num">{{$t(`当前`)}}<text>{{levelInfo.exp}}</text>{{$t(`点，需达到`)}}<text>{{item.exp_num}}</text>{{$t(`点解锁`)}}</text>
+												class="num">{{$t(`当前`)}}<text>{{levelInfo.exp || ''}}</text>{{$t(`点，需达到`)}}<text>{{item.exp_num || ''}}</text>{{$t(`点解锁`)}}</text>
 										</view>
 										<navigator class="acea-row row-between-wrapper record-wrap"
 											style="padding-left: 0;" url="/pages/users/user_vip_areer/index"
@@ -98,8 +98,8 @@
 					<view class="item acea-row row-middle">
 						<view class="text">
 							<view class="title">{{$t(`签到`)}}<text
-									class="mark">{{$t(`可获得`)}}{{taskInfo.sign}}{{$t(`点经验`)}}</text></view>
-							<view class="info">{{$t(`每日签到可获得经验值，已签到`)}}{{taskInfo.sign_count}}{{$t(`天`)}}</view>
+									class="mark">{{$t(`可获得`)}}{{taskInfo.sign || ''}}{{$t(`点经验`)}}</text></view>
+							<view class="info">{{$t(`每日签到可获得经验值，已签到`)}}{{taskInfo.sign_count || ''}}{{$t(`天`)}}</view>
 						</view>
 						<navigator class="link" url="/pages/users/user_sgin/index" hover-class="none">{{$t(`去签到`)}}
 						</navigator>
@@ -107,7 +107,7 @@
 					<view class="item acea-row row-middle">
 						<view class="text">
 							<view class="title">{{$t(`购买商品`)}}<text
-									class="mark">+{{taskInfo.order}}{{$t(`点经验/元`)}}</text></view>
+									class="mark">+{{taskInfo.order || ''}}{{$t(`点经验/元`)}}</text></view>
 							<view class="info">{{$t(`购买商品可获得对应的经验值`)}}</view>
 						</view>
 						<navigator class="link" open-type="switchTab" url="/pages/goods_cate/goods_cate"
@@ -116,7 +116,7 @@
 					<view class="item acea-row row-middle">
 						<view class="text">
 							<view class="title">{{$t(`邀请好友`)}}<text
-									class="mark">+{{taskInfo.invite}}{{$t(`点经验/人`)}}</text></view>
+									class="mark">+{{taskInfo.invite || ''}}{{$t(`点经验/人`)}}</text></view>
 							<view class="info">{{$t(`邀请好友注册商城可获得经验值`)}}</view>
 						</view>
 						<navigator class="link" url="/pages/users/user_spread_code/index" hover-class="none">

From 8e732b107502adc099e38a24d3adbf41422e4d78 Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Sat, 13 May 2023 17:03:53 +0800
Subject: [PATCH 2/2] =?UTF-8?q?improve:=20=E6=90=9C=E7=B4=A2=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=BB=91=E5=8A=A8=E5=9B=BE=E7=89=87=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/uni-app/pages/goods/goods_search/index.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/template/uni-app/pages/goods/goods_search/index.vue b/template/uni-app/pages/goods/goods_search/index.vue
index cbc446a18..0499f3fbc 100644
--- a/template/uni-app/pages/goods/goods_search/index.vue
+++ b/template/uni-app/pages/goods/goods_search/index.vue
@@ -100,7 +100,11 @@
 			} else {
 				this.getHostProduct();
 			}
-
+		},
+		// 滚动监听
+		onPageScroll(e) {
+			// 传入scrollTop值并触发所有easy-loadimage组件下的滚动监听事件
+			uni.$emit('scroll');
 		},
 		methods: {
 			searchList() {