From 3008a44b8eee0c21caaf0a37185d0948bc68a493 Mon Sep 17 00:00:00 2001
From: zhangtianning <573515615@qq.com>
Date: Mon, 26 Feb 2024 15:30:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=94=80=E4=B8=AD=E5=BF=83=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99=E4=BF=AE=E6=94=B9=E3=80=81=E6=A0=87=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E3=80=81=E5=8A=A0=E5=85=A5=E5=88=86=E9=94=80=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                       |  2 +-
 pages/news3/JoinDistribution.vue | 12 +++++++-----
 pages/user/index.vue             | 11 ++++++-----
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/pages.json b/pages.json
index 4de9488..610c063 100644
--- a/pages.json
+++ b/pages.json
@@ -1115,7 +1115,7 @@
 						// "enablePullDownRefresh": true,
 						"navigationStyle": "custom",
 						"navigationBarTextStyle": "black",
-						"navigationBarTitleText": "加入分销"
+						"navigationBarTitleText": "分销中心"
 					}
 				},
 				{
diff --git a/pages/news3/JoinDistribution.vue b/pages/news3/JoinDistribution.vue
index 0d549aa..38b3d00 100644
--- a/pages/news3/JoinDistribution.vue
+++ b/pages/news3/JoinDistribution.vue
@@ -12,10 +12,12 @@
 		<view class="userInfo">
 			<image :src="$picUrl+'/static/news3/join.png'" mode="widthFix"></image>
 			<view class="userContent">
-				<image :src="user.avatar_url" mode="aspectFill" class="avatar"></image>
+				<view v-if="user">
+					<image src="{{user.avatar_url?'/static/news3/walletBg.png':'/static/news3/walletBg.png'}}" mode="aspectFill" class="avatar"></image>
+				</view>
 				<view class="user">
 					<view class="userTop">
-						<text class="name">{{ user.nick_name }}</text>
+						<text class="name">{{ user.nick_name||'' }}</text>
 						<view class="flag">
 							分销商
 						</view>
@@ -81,11 +83,11 @@
 				// 正在加载
 				isLoading: true,
 				// 当前用户信息
-				user: undefined,
+				user: {},
 				// 当前是否为分销商
 				isDealer: false,
 				// 当前分销商信息
-				dealer: undefined,
+				dealer: {},
 				// 推荐人昵称
 				refereeName: undefined,
 				// 分销设置
@@ -119,7 +121,7 @@
 			      // api数据赋值
 			      const data = result.data
 			      app.isDealer = data.isDealer
-			      app.user = data.user
+			      app.user = data.user||{};
 			      app.dealer = data.dealer
 			      app.refereeName = data.refereeName
 			      app.setting = data.setting
diff --git a/pages/user/index.vue b/pages/user/index.vue
index c0d7880..98e96fa 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -537,11 +537,12 @@
 				if(type==30){
 					this.goJump('/pages/news3/JoinDistribution?dataType=all');
 				}else if(type==10 || type==20){
-					uni.showToast({
-						title: '请先购买分销会员',
-						icon: 'none',
-						duration: 2000
-					})
+					// uni.showToast({
+					// 	title: '请先购买分销会员',
+					// 	icon: 'none',
+					// 	duration: 2000
+					// })
+					this.goJump('/pages/member/index');
 				}
 			},
 			openScrollTo(){