From 04fff338635e6db8207b39511a9c90dcde5e3995 Mon Sep 17 00:00:00 2001
From: zhangtianning <573515615@qq.com>
Date: Tue, 27 Feb 2024 17:04:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=88=86=E9=94=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/dealer/commission.vue      |  2 +-
 pages/news3/JoinDistribution.vue | 26 ++++++++++++++++++++++----
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/pages/dealer/commission.vue b/pages/dealer/commission.vue
index 33d00eb..760e647 100644
--- a/pages/dealer/commission.vue
+++ b/pages/dealer/commission.vue
@@ -14,7 +14,7 @@
           </view>
           <view class="detail__right dis-flex flex-dir-column flex-x-center flex-y-center">
             <view class="detail__status" :class="[ApplyStatusColor[item.apply_status]]">
-              <text>{{ ApplyStatusText[item.apply_status] }}</text>
+              <text style="">{{ ApplyStatusText[item.apply_status] }}已结算</text>
             </view>
             <block v-if="item.apply_status == ApplyStatusEnum.REJECT.value">
               <view class="detail__reason" @click="handleShowRejectReason(item)">驳回原因
diff --git a/pages/news3/JoinDistribution.vue b/pages/news3/JoinDistribution.vue
index fcab2c0..4e4d1e1 100644
--- a/pages/news3/JoinDistribution.vue
+++ b/pages/news3/JoinDistribution.vue
@@ -2,7 +2,7 @@
 	<view>
 		<view style="width:100%;position: fixed;top:var(--status-bar-height);z-index:99">
 			 <view class="navBarContent">
-					<u-icon name="arrow-left" style="position: absolute;top:50%;left:40rpx;transform: translateY(-50%);" color="#000" size="24"></u-icon>
+					<u-icon name="arrow-left" @click="goToPreviousPage" style="position: absolute;top:50%;left:40rpx;transform: translateY(-50%);" color="#000" size="24"></u-icon>
 					<text>加入分销</text>
 			 </view>
 			
@@ -12,18 +12,23 @@
 			<image :src="$picUrl+'/static/news3/join.png'" mode="widthFix"></image>
 			<view class="userContent">
 				<view v-if="user">
-					<image :src="user.avatar_url" mode="aspectFill" class="avatar"></image>
+					<image :src="$picUrl+'/static/default-logo.png'" v-if="!user.avatar_url" class="avatar" ></image>
+					<image :src="user.avatar_url" v-else mode="aspectFill" class="avatar"></image>
 				</view>
+				
+				<!-- <image :src="$picUrl+'/static/default-logo.png'" v-if="!isLogin || !userInfo.avatar_url" class="image_2"
+					@click="goLogin()"></image>
+				<image :src="userInfo.avatar_url" v-else class="image_2"></image> -->
 				<!-- <image src="/static/news/avater.png" mode="aspectFill" class="avatar"></image> -->
 				<view class="user">
 					<view class="userTop">
-						<text class="name">Deioio</text>
+						<text class="name">{{ user.nick_name }}</text>
 						<view class="flag">
 							分销商
 						</view>
 					</view>
 					<view class="userBottom">
-						<text>加入时间2024.01.21</text>
+						<text>加入时间{{dealer.update_time}}</text>
 						<view class="tixian" @click="$navTo('pages/dealer/withdraw/apply')">
 							提现
 						</view>
@@ -73,6 +78,8 @@
 </template>
 
 <script>
+	import AvatarImage from '@/components/avatar-image'
+	import * as Api from '@/api/dealer'
 	export default {
 		data() {
 			return {
@@ -93,7 +100,18 @@
 				}
 			};
 		},
+		/**
+		 * 生命周期函数--监听页面加载
+		 */
+		onLoad(options) {
+		  this.getCenter()
+		},
 		methods:{
+			goToPreviousPage() {
+			    uni.navigateBack({
+			        delta: 1 // 返回的页面数，这里设置为1表示返回上一页
+			    });
+			},
 			// 获取分销商中心数据
 			getCenter() {
 			  const app = this