From 1e0ad375f8452b350f336d252a887121d4cb4a64 Mon Sep 17 00:00:00 2001
From: zhangtianning <573515615@qq.com>
Date: Tue, 27 Feb 2024 16:41:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=94=80=E4=B8=AD=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/news3/JoinDistribution.vue | 72 ++++++++++++++++++++++----------
 1 file changed, 50 insertions(+), 22 deletions(-)

diff --git a/pages/news3/JoinDistribution.vue b/pages/news3/JoinDistribution.vue
index b25e060..fcab2c0 100644
--- a/pages/news3/JoinDistribution.vue
+++ b/pages/news3/JoinDistribution.vue
@@ -1,8 +1,8 @@
 <template>
 	<view>
-		<view style="width:100%;position: fixed;top:0;z-index:99">
+		<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:40upx;transform: translateY(-50%);" color="#000" size="24"></u-icon>
+					<u-icon name="arrow-left" style="position: absolute;top:50%;left:40rpx;transform: translateY(-50%);" color="#000" size="24"></u-icon>
 					<text>加入分销</text>
 			 </view>
 			
@@ -11,13 +11,10 @@
 		<view class="userInfo">
 			<image :src="$picUrl+'/static/news3/join.png'" mode="widthFix"></image>
 			<view class="userContent">
-<<<<<<< HEAD
 				<view v-if="user">
 					<image :src="user.avatar_url" mode="aspectFill" class="avatar"></image>
 				</view>
-=======
-				<image src="/static/news/avater.png" mode="aspectFill" class="avatar"></image>
->>>>>>> 06ab086b9bfdee5d9498d86db2619b5857b42a76
+				<!-- <image src="/static/news/avater.png" mode="aspectFill" class="avatar"></image> -->
 				<view class="user">
 					<view class="userTop">
 						<text class="name">Deioio</text>
@@ -27,7 +24,7 @@
 					</view>
 					<view class="userBottom">
 						<text>加入时间2024.01.21</text>
-						<view class="tixian">
+						<view class="tixian" @click="$navTo('pages/dealer/withdraw/apply')">
 							提现
 						</view>
 					</view>
@@ -38,13 +35,13 @@
 		<view class="yongjinContent">
 			<view class="item">
 				<text class="num">
-					0.00
+					{{ dealer.money }}
 				</text>
 				<text class="text">已提现佣金</text>
 			</view>
 			<view class="item">
 				<text class="num">
-					0
+					{{ dealer.freeze_money }}
 				</text>
 				<text class="text">未结算佣金</text>
 			</view>
@@ -54,19 +51,19 @@
 				<image :src="$picUrl+'/static/news3/fx1.png'" mode="widthFix"></image>
 				<text>分销佣金</text>
 			</view>
-			<view class="gridItem">
+			<view class="gridItem" @click="$navTo('pages/dealer/order')">
 				<image :src="$picUrl+'/static/news3/fx2.png'" mode="widthFix"></image>
 				<text>分销订单</text>
 			</view>
-			<view class="gridItem">
+			<view class="gridItem" @click="$navTo('pages/dealer/withdraw/list')">
 				<image :src="$picUrl+'/static/news3/fx3.png'" mode="widthFix"></image>
 				<text>提现明细</text>
 			</view>
-			<view class="gridItem">
+			<view class="gridItem" @click="$navTo('pages/dealer/team')">
 				<image :src="$picUrl+'/static/news3/fx4.png'" mode="widthFix"></image>
 				<text>我的团队</text>
 			</view>
-			<view class="gridItem">
+			<view class="gridItem" @click="$navTo('pages/dealer/poster')">
 				<image :src="$picUrl+'/static/news3/fx5.png'" mode="widthFix"></image>
 				<text>推广二维码</text>
 			</view>
@@ -79,17 +76,48 @@
 	export default {
 		data() {
 			return {
-				
+				// 正在加载
+				isLoading: true,
+				// 当前用户信息
+				user: {},
+				// 当前是否为分销商
+				isDealer: false,
+				// 当前分销商信息
+				dealer: {},
+				// 推荐人昵称
+				refereeName: undefined,
+				// 分销设置
+				setting: {
+				  background: undefined,
+				  words: undefined
+				}
 			};
 		},
 		methods:{
-			/**
-			 * 售后点击
-			 */
-			onApplyAftersales(){
-				uni.navigateTo({
-					url: '/pages/AfterSaleType/AfterSaleType',
-				})
+			// 获取分销商中心数据
+			getCenter() {
+			  const app = this
+			  app.isLoading = true
+			  Api.center()
+			    .then(result => {
+			      // api数据赋值
+			      const data = result.data
+			      app.isDealer = data.isDealer
+			      app.user = data.user
+			      app.dealer = data.dealer
+			      app.refereeName = data.refereeName
+			      app.setting = data.setting
+			      // 设置当前页面标题
+			      app.setPageTitle()
+			      app.isLoading = false
+			    })
+			},
+			
+			// 设置当前页面标题
+			setPageTitle() {
+			  uni.setNavigationBarTitle({
+			    title: this.setting.words.index.title.value
+			  })
 			}
 		}
 	}
@@ -127,7 +155,7 @@ page{
 .userInfo{
 	position: relative;
 	z-index:3;
-	margin:0 30upx;
+	margin:180rpx 30upx 0;
 	image{
 		width:100%;
 		height:auto;