我的伙伴

project.private.config.json

@@ -19,7 +19,7 @@
         {
           "name": "pages/memberSub/partnerDetail/index",
           "pathName": "pages/memberSub/partnerDetail/index",
-          "query": "",
+          "query": "id=2818",
           "launchMode": "default",
           "scene": null
         },

src/pages/member/index.jsx

@@ -120,12 +120,12 @@ export default class Index extends Component {
                   ¥{vipInfo.draw_money.store_earnings_now}
                 </Text>
 
-                <View className="warning-icon-box">
+                {/* <View className="warning-icon-box">
                   <Image className="warning-icon" src={warning} />
                   <Text className="warning-text">未完成提现认证</Text>
-                </View>
+                </View> */}
               </View>
-              <View onClick={() => Taro.navigateTo({ url: `/pages/memberSub/cashOut/index` })} className="right">点击提现</View>
+              {/* <View onClick={() => Taro.navigateTo({ url: `/pages/memberSub/cashOut/index` })} className="right">点击提现</View> */}
             </View>
           </View>
           {/* 我的伙伴 */}

src/pages/memberSub/myPartner/index.jsx

@@ -42,36 +42,40 @@ export default class Index extends Component {
             <Text className="partner-number-count">{partnerList.all_partner_cnt}</Text>
         </View>
         <View className="partner-list">
-          <View className="partner-item">
-            <View className="partner-item-top">
-              <View className="partner-item-top-left">
-                <Image src="" className="partner-item-top-left-avatar" />
+          {partnerList.partner_list && partnerList.partner_list.map((item, index) => (
+            <View key={index} className="partner-item">
+              <View className="partner-item-top">
+                <View className="partner-item-top-left">
+                <Image src={item.icon} className="partner-item-top-left-avatar" />
               </View>
               <View className="partner-item-top-right">
-                <View className="name">张三</View>
+                <View className="name">{item.name}</View>
                 <View className="level">
                   <Image src={level} className="level-icon" />
                   <Text className="level-text">导购员</Text>
                 </View>
               </View>
-              <View onClick={() => Taro.navigateTo({ url: `/pages/memberSub/partnerDetail/index` })} className="detail">详情
+              <View onClick={() => Taro.navigateTo({ url: `/pages/memberSub/partnerDetail/index?id=${item.id}` })} className="detail">详情
                 <AtIcon value='chevron-right' size='10' color='#A1A1A1'></AtIcon>
               </View>
             </View>
             <View className="partner-item-bottom">
               <View className="item">
                 <Text className="item-text">绑定手机号</Text>
-                <View className="phone-container">
-                  <Text className="item-value">138****8888</Text>
-                  <Text className="copy-btn" onClick={() => this.copyPhone('138****8888')}>复制</Text>
-                </View>
+                {item.phone && (
+                  <View className="phone-container">
+                    <Text className="item-value">{item.phone}</Text>
+                    <Text className="copy-btn" onClick={() => this.copyPhone(item.phone)}>复制</Text>
+                  </View>
+                )}
               </View>
               <View className="item">
                 <Text className="item-text">推荐绑定时间</Text>
-                <Text className="item-value">2024-03-21 12:00:00</Text>
+                <Text className="item-value">{item.start_date}</Text>
               </View>
             </View>
           </View>
+          ))}
         </View>
       </View>
     );

src/pages/memberSub/myPartner/index.less

@@ -42,7 +42,7 @@
             background-color: #fff;
             padding: 17px;
             box-sizing: border-box;
-
+            margin-bottom: 20px;
             .partner-item-top {
                 position: relative;
                 display: flex;
@@ -52,7 +52,6 @@
                     width: 116px;
                     height: 116px;
                     border-radius: 50%;
-                    background-color: #ccc;
                     margin-right: 20px;
 
                     .partner-item-top-left-avatar {

src/pages/memberSub/partnerDetail/index.jsx

@@ -1,53 +1,33 @@
 import { Component } from "react";
 import { View, Text, Image } from "@tarojs/components";
 import "./index.less";
-import { AtDivider,AtActivityIndicator } from "taro-ui";
+import { AtDivider, AtActivityIndicator } from "taro-ui";
 import level from "../../../images/partner/level.png";
 import Taro from "@tarojs/taro";
 import vip from "../../../images/earningsOrder/vip.png";
 import { getPartnerDetail } from "../../../service";
 export default class Index extends Component {
   state = {
-    orderList: [
-      {
-        order_number: "XY202403210001",
-        pay_time: "2024-03-21 15:30:25",
-        item_pic_url: "https://example.com/product1.jpg",
-        item_title: "2024春季新款连衣裙",
-        assess_amount_text: "12.50",
-        actual_paid_fee: "299.00",
-      },
-      {
-        order_number: "XY202403200015",
-        pay_time: "2024-03-20 10:15:33",
-        item_pic_url: "https://example.com/product2.jpg",
-        item_title: "时尚百搭小白鞋",
-        assess_amount_text: "8.80",
-        actual_paid_fee: "219.00",
-      },
-      {
-        order_number: "XY202403190089",
-        pay_time: "2024-03-19 18:45:12",
-        item_pic_url: "https://example.com/product3.jpg",
-        item_title: "韩版宽松牛仔外套",
-        assess_amount_text: "15.00",
-        actual_paid_fee: "358.00",
-      },
-    ],
+    orderList: [],//订单列表
+    id: "",//伙伴id
     page: 1, //页数
     loading: false, //加载状态
     totalPages: 1, // 添加总页数
     isNoMore: false,
   };
   componentDidMount() {
-    this.getPartnerDetail(true);
+    const { id } = Taro.getCurrentInstance().router.params;
+    this.setState({ id }, () => {
+      this.getPartnerDetail(true);
+    });
   }
-  // 获取收益订单列表
-  getPartnerDetail = async (isRefresh=false) => {
+  // 获取伙伴详情
+  getPartnerDetail = async (isRefresh = false) => {
     const { page } = this.state;
     this.setState({ loading: true });
 
     const res = await getPartnerDetail({
+      partner_id: this.state.id,
       page,
       page_size: 10,
     });
@@ -56,6 +36,7 @@ export default class Index extends Component {
       orderList: isRefresh
         ? res.income_list
         : [...prevState.orderList, ...res.income_list],
+      partnerDetail: res.partner_user,
       totalPages: res.total_pages,
       loading: false,
       isNoMore: res.total_pages <= page,
@@ -91,53 +72,61 @@ export default class Index extends Component {
     }
   };
   render() {
-    const { orderList,loading,isNoMore } = this.state;
+    const { orderList, loading, isNoMore, partnerDetail } = this.state;
     return (
       <View className="index">
         <View className="container">
-          <View className="header">
-            <View className="header-left">
-              <Text className="name">张三</Text>
-              <View className="level">
-                <Image className="level-icon" src={level} />
-                <Text className="level-text">导购员</Text>
+          {partnerDetail && (
+            <View className="header">
+              <View className="header-left">
+                <Text className="name">{partnerDetail.name}</Text>
+                <View className="level">
+                  <Image className="level-icon" src={level} />
+                  <Text className="level-text">导购员</Text>
+                </View>
+              </View>
+              <View className="header-right">
+                <Image className="header-right-avatar" src={partnerDetail.icon} />
               </View>
             </View>
-            <View className="header-right">
-              <Image className="header-right-avatar" src="" />
-            </View>
-          </View>
+          )}
           {/* 个人资料 */}
-          <View className="personal-info">
-            <View className="info-top">
-              <View className="personal-info-item">
-                <Text className="personal-info-item-label">累计贡献返利</Text>
-                <Text className="personal-info-item-value">￥0.00</Text>
-              </View>
-              <View className="line"></View>
-              <View className="personal-info-item">
+          {partnerDetail && (
+            <View className="personal-info">
+              <View className="info-top">
+                <View className="personal-info-item">
+                  <Text className="personal-info-item-label">累计贡献返利</Text>
+                  <Text className="personal-info-item-value">￥{partnerDetail.all_income_rebate}</Text>
+                </View>
+                <View className="line"></View>
+                {/* <View className="personal-info-item">
                 <Text className="personal-info-item-label">累计贡献管理奖</Text>
                 <Text className="personal-info-item-value">￥0.00</Text>
+              </View> */}
+                <View className="personal-info-item">
+                  <Text className="personal-info-item-label">手机号</Text>
+                  <Text className="personal-info-item-value">{partnerDetail.phone}</Text>
+                </View>
               </View>
-            </View>
-            <View className="line-column"></View>
-            <View className="info-bottom">
-              <View className="personal-info-item">
-                <Text className="personal-info-item-label">手机号</Text>
-                <Text className="personal-info-item-value">138****8888</Text>
-              </View>
-              <View className="line"></View>
-              <View className="personal-info-item">
-                <Text className="personal-info-item-label">推荐绑定时间</Text>
-                <Text className="personal-info-item-value">
-                  2024-03-21 12:00:00
-                </Text>
+              <View className="line-column"></View>
+              <View className="info-bottom">
+                {/* <View className="personal-info-item">
+                  <Text className="personal-info-item-label">手机号</Text>
+                  <Text className="personal-info-item-value">{partnerDetail.phone}</Text>
+                </View> */}
+                <View style={{width: '46%'}} className="personal-info-item">
+                  <Text className="personal-info-item-label">推荐绑定时间</Text>
+                  <Text className="personal-info-item-value">
+                    {partnerDetail.start_date}
+                  </Text>
+                </View>
+                <View className="line"></View>
               </View>
             </View>
-          </View>
+          )}
           {/* 订单列表 */}
           <View className="order-list">
-            {orderList.map((item, index) => (
+            {orderList && orderList.map((item, index) => (
               <View className="order-item" key={index}>
                 {/* 订单信息 */}
                 <View className="order-info">
@@ -185,7 +174,7 @@ export default class Index extends Component {
               </View>
             ))}
           </View>
-          {orderList.length === 0 && (
+          {orderList && orderList.length === 0 && (
             <AtDivider
               content="暂无成交订单"
               fontColor="#B5B5B5"

src/pages/memberSub/partnerDetail/index.less

@@ -55,7 +55,6 @@
                     width: 144px;
                     height: 144px;
                     border-radius: 50%;
-                    background-color: red;
                 }
             }
         }
@@ -79,7 +78,8 @@
                 align-items: center;
 
                 .personal-info-item {
-                    flex: 1;
+                    width: 50%;
+                    // flex: 1;
                     display: flex;
                     flex-direction: column;
                     padding: 36px 0 33px 17px;