会员页面数据&&订单数据&&弹窗分享自定义

src/api/request.js

@@ -45,19 +45,21 @@ export default async (options = { method: 'GET', data: {} }) => {
       case 200:
         return data;
       case 400:
-        // Taro.showToast({
-        //   title: '传参有误',
-        //   icon: 'none',
-        //   mask: true,
-        // });
-        throw new Error('传参有误');
+        Taro.showToast({
+          title: msg,
+          icon: 'none',
+          mask: true,
+        });
+        // throw new Error('传参有误');
+        break;
       case 422:
         // Taro.showToast({
         //   title: 'Validation Error',
         //   icon: 'none',
         //   mask: true,
         // });
-        throw new Error('Validation Error');
+        // throw new Error('Validation Error');
+        break;
       case 500:
         Taro.showToast({
           title: '需要登录',
@@ -78,7 +80,7 @@ export default async (options = { method: 'GET', data: {} }) => {
           url: '/pages/login/index',
         });
         // throw new Error('需要登录');
-        return
+        break
       default:
         Taro.showToast({
           title: `${msg || '请求失败'}`,

src/components/index/ProductList/index.jsx

@@ -33,6 +33,9 @@ const ProductList = forwardRef((props, ref) => {
 
   const [selectedProducts, setSelectedProducts] = useState([]); // 商品选择状态
   const [shareModalOpened, setShareModalOpened] = useState(false); // 分享弹窗状态
+  const [currentShareProduct, setCurrentShareProduct] = useState(null); // 当前分享商品
+  const [shareTitle, setShareTitle] = useState(""); // 分享标题
+  const [shareLink, setShareLink] = useState(""); // 分享链接
   // 监听选中状态变化
   useEffect(() => {
     // 每当 selectedProducts 变化时，调用父组件的回调
@@ -89,22 +92,39 @@ const ProductList = forwardRef((props, ref) => {
       onAddProduct && onAddProduct(productId, index);
     }
   };
+  // 设置分享标题
+  const handleShareTitleChange = (newTitle) => {
+    setShareTitle(newTitle);
+  };
+  useEffect(() => {
+    if (shareModalOpened) {
+      // 设置分享内容
+      setShareContent({
+        title: shareTitle || currentShareProduct.item_title,
+        path: `/pages/indexSub/productDetail/index?id=${
+          currentShareProduct.id
+        }&&isShare=${true}&&shareJump=${shareLink}`,
+        imageUrl: currentShareProduct.image_url,
+      });
+    }
+  }, [shareTitle]);
   // 分享商品
   const shareProduct = (product, e) => {
     e.stopPropagation(); // 防止事件穿透
+    setCurrentShareProduct(product);
     getShareJump({
       share_type: 1,
       share_id: product.id,
     }).then((res) => {
-      // 设置分享内容
+      // 打开分享弹窗
       setShareContent({
-        title: product.item_title,
+        title: shareTitle || product.item_title,
         path: `/pages/indexSub/productDetail/index?id=${
           product.id
         }&&isShare=${true}&&shareJump=${res.share_unique_value}`,
         imageUrl: product.image_url,
       });
-      // 打开分享弹窗
+      setShareLink(res.share_unique_value);
       setShareModalOpened(true);
     });
   };
@@ -184,12 +204,7 @@ const ProductList = forwardRef((props, ref) => {
                 <View className="profit-line">
                   <View className="save-money">
                     <Image className="bg" src={saveMoneyBg} mode="aspectFit" />
-                    <View className="content">
-                      <Text className="label">自购省</Text>
-                      <Text className="money">
-                        ¥{product.estimated_commission}
-                      </Text>
-                    </View>
+                    <View className="content">立 即 购 买</View>
                   </View>
                   <View className="share-earn">
                     <Image className="bg" src={shareEarnBg} mode="aspectFit" />
@@ -226,9 +241,15 @@ const ProductList = forwardRef((props, ref) => {
       {isNoMore && <View className="no-more">没有更多了~</View>}
       {/* 分享弹窗 */}
       <ShareModal
-        onClose={() => setShareModalOpened(false)}
+        onClose={() => {
+          setShareModalOpened(false);
+          setCurrentShareProduct(null);
+          setShareTitle("");
+          setShareLink("");
+        }}
         isOpened={shareModalOpened}
-        title="分享赚"
+        product={currentShareProduct}
+        onShareTitleChange={handleShareTitleChange}
       />
     </View>
   );

src/components/index/ProductList/index.less

@@ -133,6 +133,16 @@
 
         .save-money {
           color: #F6C71A;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          .content {
+            width: 74px;
+            height: 88px;
+            font-size: 28px;
+            line-height: 41px;
+            text-align: center;
+          }
         }
 
         .share-earn {
@@ -178,13 +188,17 @@
               justify-content: center;
               font-size: 28px;
               color: #FFFFFF;
+
               &::after {
                 border: none;
               }
             }
+
             .button-hover {
-              background-color: transparent !important; /* 移除背景高亮 */
-              box-shadow: none !important;             /* 移除可能的阴影 */
+              background-color: transparent !important;
+              /* 移除背景高亮 */
+              box-shadow: none !important;
+              /* 移除可能的阴影 */
             }
 
             .label,

src/components/shareModal/index.jsx

@@ -1,17 +1,45 @@
 import { AtModal, AtModalContent } from "taro-ui";
-import { View, Image, Text, Button } from "@tarojs/components";
+import { View, Image, Text, Button, Input } from "@tarojs/components";
 import "./index.less";
+import { useState, useEffect } from "react";
 
 export default function shareModal(props) {
-  const { title, isOpened, onClose } = props;
+  const {  isOpened, onClose, product, onShareTitleChange } = props;
+  const [shareTitle, setShareTitle] = useState('');
+
+  useEffect(() => {
+    if (product?.item_title) {
+      setShareTitle(product.item_title);
+    }
+  }, [product]);
+  useEffect(() => {
+    if (!isOpened) {
+      setShareTitle('');
+    }
+  }, [isOpened]);
+  const handleInputChange = (e) => {
+    const newTitle = e.detail.value;
+    setShareTitle(newTitle);
+    onShareTitleChange?.(newTitle);
+  }
   return (
-    <AtModal isOpened={isOpened} closeOnClickOverlay={true} onClose={onClose}>
-      <AtModalContent>
-        <View className="container">
-          <View className="title">{title}</View>
-          <Button openType="share" onClick={onClose}>分享</Button>
-        </View>
+    <View className="share-modal">
+      <AtModal isOpened={isOpened} closeOnClickOverlay={true} onClose={onClose}>
+        <AtModalContent>
+          {product && (
+          <View className="container">
+            <Image className="product-image" src={product.image_url} mode="aspectFill" />
+            <View className="title">{product.item_title}</View>
+            <Input onInput={handleInputChange} className="input" value={shareTitle} />
+            <Button openType="share" onClick={onClose}>
+              <View className="share-button">
+                分享
+              </View>
+            </Button>
+          </View>
+        )}
       </AtModalContent>
     </AtModal>
+    </View>
   );
 }

src/components/shareModal/index.less

@@ -1,21 +1,88 @@
-  .at-modal__container {
-    width: 610px !important;
-  }
+  .share-modal{ 
+    .at-modal__container {
+      width: 610px !important;
+    }
+
   .at-modal__content {
-    max-height: none !important;  // 移除最大高度限制
-    min-height: auto !important;  // 移除最小高度限制
-    height: auto !important;      // 高度自适应
+    max-height: none !important; // 移除最大高度限制
+    min-height: auto !important; // 移除最小高度限制
+    height: auto !important; // 高度自适应
+  }
+  .at-modal__content{
+    padding-left: 0;
+    padding-right: 0;
   }
-.container{
+  .container {
     display: flex;
     flex-direction: column;
     align-items: center;
     justify-content: center;
-    .title{
-        color: #000000;
-        font-size: 32px;
-        font-weight: bold;
-        line-height: 46px;
-        margin-bottom: 20px;
+
+    .product-image {
+      width: 386px;
+      height: 385px;
+      border-radius: 16px;
+    }
+
+    .title {
+      width: 386px;
+      font-size: 24px;
+      color: #555555;
+      margin-top: 10px;
+      white-space: nowrap; // 文本不换行
+      overflow: hidden; // 溢出隐藏
+      text-overflow: ellipsis; // 显示省略号
+    }
+    .input{
+      margin-top: 30px;
+      width: 480px;
+      height: 72px;
+      border-radius: 20px;
+      border: 4px solid #FFE000;
+      padding-left: 16px;
+      font-weight: 700;
+      font-size: 28px;
+      color: #333333;
     }
+    .share-button {
+      text-align: center;
+      line-height: 80px;
+      width: 480px;
+      height: 80px;
+      background-color: #ffe000;
+      border-radius: 40px;
+      font-weight: 700;
+      font-size: 28px;
+      color: #000000;
+      margin-top: 50px;
+    }
+
+    // 清除Button默认样式
+    Button {
+      padding: 0;
+      margin: 0;
+      background: none;
+      border: none;
+      line-height: normal;
+      height: 100%;
+      width: 100%;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      justify-content: center;
+      font-size: 28px;
+      color: #FFFFFF;
+
+      &::after {
+        border: none;
+      }
+    }
+
+    .button-hover {
+      background-color: transparent !important;
+      /* 移除背景高亮 */
+      box-shadow: none !important;
+      /* 移除可能的阴影 */
+    }
+  }
 }

src/pages/index/index.jsx

@@ -40,6 +40,14 @@ export default class Index extends Component {
       this.getProductList(true);
     });
   };
+  // 轮播图点击
+  handleBannerClick = (item) => {
+    if(item.type_jpath==1){
+      Taro.navigateTo({
+        url: `${item.jpath}`
+      })
+    }
+  };
   // 修改 tab 切换处理函数
   handleClick(value) {
     this.setState(
@@ -155,12 +163,12 @@ export default class Index extends Component {
               circular
               autoplay
               indicatorDots
-              indicatorColor="#e8e8e8"
+              indicatorColor="#e8e8e8"banner
               indicatorActiveColor="#ffffff"
             >
               {homeData.banner &&
                 homeData.banner.map((item) => (
-                  <SwiperItem className="banner-item" key={item.id}>
+                  <SwiperItem onClick={() => this.handleBannerClick(item)} className="banner-item" key={item.id}>
                     <Image
                       className="banner-img"
                       src={item.img}

src/pages/indexSub/highCommission/index.jsx

@@ -1,7 +1,7 @@
 import { Component } from "react";
 import { View, Image } from "@tarojs/components";
 import "./index.less";
-import seckillImg from "../../../images/seckill/seckillTop.png";
+import seckillImg from "../../../images/seckill/heighTop.jpg";
 import ProductList from "../../../components/index/ProductList";
 import { getRecommendProductList } from "../../../service";
 import { getShareContent } from "../../../common/share";

src/pages/indexSub/productDetail/index.jsx

@@ -46,10 +46,10 @@ export default class Index extends Component {
         productDetail: res,
       },
       () => {
-        let session_key = Taro.getStorageSync("session_key");
-        if (session_key) {
-          this.getProductPromotion(); //获取商品推广转链
-        }
+        // let session_key = Taro.getStorageSync("session_key");
+        // if (session_key) {
+        //   this.getProductPromotion(); //获取商品推广转链
+        // }
       }
     );
   };
@@ -289,8 +289,8 @@ export default class Index extends Component {
                   onClick={this.handleBuy}
                   className="bottom-buy-right-share"
                 >
-                  <Image src={selfBuy} mode="aspectFit" />
-                  <Text className="bottom-buy-text">自购省</Text>
+                  {/* <Image src={selfBuy} mode="aspectFit" /> */}
+                  <Text className="bottom-buy-text">立即购买</Text>
                 </View>
               </>
             ) : (

src/pages/indexSub/seckillIndex/index.jsx

@@ -1,7 +1,7 @@
 import { Component } from "react";
 import { View, Image } from "@tarojs/components";
 import "./index.less";
-import seckillImg from "../../../images/seckill/seckillTop.png";
+import seckillImg from "../../../images/seckill/seckillTop.jpg";
 import ProductList from "../../../components/index/ProductList";
 import { getRecommendProductList } from "../../../service";
 import { getShareContent } from "../../../common/share";

src/pages/login/index.jsx

@@ -1,5 +1,5 @@
 import { Component } from "react";
-import { View, Image, Button } from "@tarojs/components";
+import { View, Image, Button, getCurrentInstance } from "@tarojs/components";
 import Taro from "@tarojs/taro";
 import { AtCheckbox } from "taro-ui";
 import { login, getUserInfo, bindShareJump } from "../../service";
@@ -11,6 +11,11 @@ export default class Index extends Component {
   state = {
     isChecked: false,
   };
+  // 页面卸载
+  componentWillUnmount() {
+    Taro.removeStorageSync("currentPage");
+    global.globalData.optionsData = {};
+  }
   // 同意协议
   handleCheckboxChange = (value) => {
     this.setState({
@@ -23,7 +28,7 @@ export default class Index extends Component {
       url: "/pages/mineSub/userSpecification/index",
     });
   };
-
+  
   // handleGetPhoneNumber = (e) => {
   //   if (e.detail.errMsg === "getPhoneNumber:ok") {
   //     // 处理获取到的手机号信息
@@ -76,12 +81,13 @@ export default class Index extends Component {
         }
 
         // 再获取用户信息
-        const userInfoRes = getUserInfo();
+        const userInfoRes = await getUserInfo();
         Taro.setStorageSync("userInfo", userInfoRes);
 
         // 最后处理页面跳转
+        
         let lastPage = Taro.getStorageSync("currentPage");
-        if (lastPage == "pages/mineSub/login/index") {
+        if (!lastPage || lastPage === "pages/mineSub/login/index") {
           lastPage = "pages/index/index";
         }
         await Taro.reLaunch({
@@ -92,7 +98,6 @@ export default class Index extends Component {
       },
     });
   };
-
   render() {
     const checkboxOption = [
       {

src/pages/member/index.jsx

@@ -40,7 +40,10 @@ export default class Index extends Component {
       this.getVipInfo(); //获取会员首页数据
     }
   }
-
+  // 去订单列表
+  handleOrderClick = (type) => {
+    Taro.navigateTo({ url: `/pages/memberSub/earningsOrder/index?type=${type}` });
+  }
   render() {
     const { vipInfo } = this.state;
     return (
@@ -97,10 +100,10 @@ export default class Index extends Component {
                 <Text className="label">累计收益</Text>
               </View>
             </View>
-            {/* <view onClick={() => Taro.navigateTo({ url: `/pages/memberSub/earningsDetail/index` })} className="estimated-income-detail">
+            <view onClick={() => Taro.navigateTo({ url: `/pages/memberSub/earningsDetail/index` })} className="estimated-income-detail">
               收益详情
               <Image className="to-detail" src={toDetail} />
-            </view> */}
+            </view>
           </View>
 
           {/* 可提现金额 */}
@@ -115,12 +118,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>
           {/* 今日订单 */}
@@ -130,10 +133,10 @@ export default class Index extends Component {
                 <Image className="today-order-icon" src={order} />
                 <Text className="today-order-title">今日订单</Text>
               </View>
-              {/* <View onClick={() => Taro.navigateTo({ url: `/pages/memberSub/earningsOrder/index` })} className="today-order-header-right">
+              <View onClick={() => this.handleOrderClick(2)} className="today-order-header-right">
                 历史订单
                 <AtIcon value='chevron-right' size='10' color='#A1A1A1'></AtIcon>
-              </View> */}
+              </View>
             </View>
 
             <View className="today-order-content">
@@ -141,14 +144,26 @@ export default class Index extends Component {
                 <Text className="label">订单总量</Text>
                 <Text className="amount">{vipInfo.order.order_all}</Text>
               </View>
-              <View className="order-item">
+              <View className="order-item" onClick={() => this.handleOrderClick(2)}>
                 <Text className="label">推广订单</Text>
                 <Text className="amount">{vipInfo.order.order_promotion}</Text>
               </View>
-              <View className="order-item">
-                <Text className="label">购买历史</Text>
+              <View className="order-item" onClick={() => this.handleOrderClick(2)}>
+                <Text className="label">已付款订单</Text>
+                <Text className="amount">{vipInfo.order.unissued_order_cnt}</Text>
+              </View>            
+              <View className="order-item" onClick={() => this.handleOrderClick(2)}>
+                <Text className="label">已收货订单</Text>
+                <Text className="amount">{vipInfo.order.on_arrival_order_cnt}</Text>
+              </View>
+              <View className="order-item" onClick={() => this.handleOrderClick(2)}>
+                <Text className="label">已结算订单</Text>
                 <Text className="amount">{vipInfo.order.order_pay}</Text>
               </View>
+              <View className="order-item" onClick={() => this.handleOrderClick(2)}>
+                <Text className="label">已失效订单</Text>
+                <Text className="amount">{vipInfo.order.dead_order_cnt}</Text>
+              </View>
             </View>
           </View>
         </View>

src/pages/member/index.less

@@ -2,7 +2,7 @@
     position: relative;
     min-height: 100vh;
     background-color: #f9f9f9;
-    padding-bottom: 30px;
+    // padding-bottom: 30px;
     .member-bg {
         position: absolute;
         top: 0;
@@ -28,12 +28,14 @@
         align-items: center;
         background-color: #fefaef;
         border-radius: 20px;
-
         .member-info-card-header {
             height: 385px;
             padding-top: 101px;
             box-sizing: border-box;
-
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            flex-direction: column;
             .avatar {
                 width: 170px;
                 height: 170px;
@@ -286,22 +288,21 @@
         }
         .today-order-content {
             width: 100%;
-            height: 142px;
             border-radius: 20px;
             background-color: #fff;
-            padding: 0 20px;
+            padding: 27px 20px 0 20px;
             box-sizing: border-box;
             display: flex;
             justify-content: space-between;
             align-items: center;
-
+            flex-wrap: wrap;
             .order-item {
-                flex: 1;
                 display: flex;
                 flex-direction: column;
                 align-items: center;
                 justify-content: space-between;
-
+                width: 33.33%;
+                margin-bottom: 35px;
                 .label {
                     font-size: 24px;
                     color: #A1A1A1;

src/pages/memberSub/earningsDetail/index.jsx

@@ -1,61 +1,81 @@
 import { Component } from 'react'
 import { View, Text } from '@tarojs/components'
+import { getEarningsDetail } from '../../../service'
 import './index.less'
 
 export default class Index extends Component {
-
-  componentWillMount () { }
-
-  componentDidMount () { }
-
-  componentWillUnmount () { }
-
-  componentDidShow () { }
-
-  componentDidHide () { }
+  state = {
+    earningsDetail: {},//收益详情
+  }
+  componentDidShow () {
+    this.getEarningsDetail();
+  }
+  // 获取收益详情
+  getEarningsDetail = async () => {
+    const res = await getEarningsDetail();
+    this.setState({ earningsDetail: res });
+  }
 
   render () {
+    const { earningsDetail } = this.state;
+    const today_data = earningsDetail.today_data || {}; 
+    const this_month_data = earningsDetail.this_month_data || {};
+    const last_month_data = earningsDetail.last_month_data || {}; 
+    const historical_month_data = earningsDetail.historical_month_data || {}; 
     return (
       <View className='index'>
         <View className='earnings-list'>
           <View className='earnings-list-item'>
             <View className='item-line title-one'>
               <Text className='title'>今天预估总收益</Text>
-              <Text className='money'>￥100.00</Text>
+              <Text className='money'>￥{today_data.assess_amount || '0.00'}</Text>
             </View>
             <View className='dotted-line'></View>
             <View className='item-line title-two'>
               <Text className='title'>预估推广收益</Text>
-              <Text className='money'>￥70.00</Text>
+              <Text className='money'>￥{today_data.assess_amount || '0.00'}</Text>
+            </View>
+          </View>
+          <View className='earnings-list-item'>
+            <View className='item-line title-one'>
+              <Text className='title'>本月预估总收益</Text>
+              <Text className='money'>￥{this_month_data.assess_amount || '0.00'}</Text>
             </View>
-            <View className='line'></View>
+            <View className='dotted-line'></View>
             <View className='item-line title-two'>
               <Text className='title'>预估推广收益</Text>
-              <Text className='money'>￥70.00</Text>
+              <Text className='money'>￥{this_month_data.assess_amount || '0.00'}</Text>
             </View>
-            <View className='item-line'>
-              <Text className='title'>惊喜红包</Text>
-              <Text className='money'>￥70.00</Text>
-            </View>
-            <View className='item-line'>
-              <Text className='title'>惊喜红包</Text>
+            {/* <View className='line'></View>
+            <View className='item-line title-two'>
+              <Text className='title'>预估推广收益</Text>
               <Text className='money'>￥70.00</Text>
             </View>
             <View className='item-line'>
               <Text className='title'>惊喜红包</Text>
               <Text className='money'>￥70.00</Text>
+            </View> */}
+          </View>
+          <View className='earnings-list-item'>
+            <View className='item-line title-one'>
+              <Text className='title'>上月预估总收益</Text>
+              <Text className='money'>￥{last_month_data.assess_amount || '0.00'}</Text>
             </View>
-            <View className='item-line'>
-              <Text className='title'>惊喜红包</Text>
-              <Text className='money'>￥70.00</Text>
+            <View className='dotted-line'></View>
+            <View className='item-line title-two'>
+              <Text className='title'>预估推广收益</Text>
+              <Text className='money'>￥{last_month_data.assess_amount || '0.00'}</Text>
             </View>
-            <View className='item-line'>
-              <Text className='title'>惊喜红包</Text>
-              <Text className='money'>￥70.00</Text>
+          </View>
+          <View className='earnings-list-item'>
+            <View className='item-line title-one'>
+              <Text className='title'>历史预估总收益</Text>
+              <Text className='money'>￥{historical_month_data.assess_amount || '0.00'}</Text>
             </View>
-            <View className='item-line'>
-              <Text className='title'>惊喜红包</Text>
-              <Text className='money'>￥70.00</Text>
+            <View className='dotted-line'></View>
+            <View className='item-line title-two'>
+              <Text className='title'>预估推广收益</Text>
+              <Text className='money'>￥{historical_month_data.assess_amount || '0.00'}</Text>
             </View>
           </View>
         </View>

src/pages/memberSub/earningsDetail/index.less

@@ -20,7 +20,7 @@
             box-sizing: border-box;
             background-color: #fff;
             border-radius: 20px;
-
+            margin-bottom: 20px;
             .item-line {
                 display: flex;
                 justify-content: space-between;

src/pages/memberSub/earningsOrder/index.jsx

@@ -1,40 +1,95 @@
 import { Component } from "react";
-import { View, Text, Image, Picker } from "@tarojs/components";
-import { AtDivider } from "taro-ui";
+import { View, Text, Image, Input } from "@tarojs/components";
+import { AtDivider, AtIcon, AtActivityIndicator } from "taro-ui";
 import "./index.less";
-import selectIcon from "../../../images/productManagement/selectIcon.png";
 import vip from "../../../images/earningsOrder/vip.png";
 import Taro from "@tarojs/taro";
+import { getEarningsOrderTab, getEarningsOrderList } from "../../../service";
 
 export default class Index extends Component {
   state = {
     current: 0,
-    productOptions: ["全部", "咸鱼商品", "自建商品"], //商品下拉选项
-    selectedProduct: "全部", //商品默认名称
-    timeOptions: ["全部时间", "一个月前", "一周前"], //下单时间下拉选项
-    selectTime: "下单时间", //下单时间
-    tabList: [
-      { title: "全部", num: 0 },
-      { title: "已付款", num: 0 },
-      { title: "已完成", num: 2 },
-      { title: "已结算", num: 10 },
-      { title: "无效", num: 0 },
-    ],
+    orderType: 2,//默认为推广订单
+    value: "", //搜索值
+    tabList: [{ title: "全部" }],
+    page: 1, //页数
+    loading: false, //加载状态
+    totalPages: 1, // 添加总页数
+    isNoMore: false,
+    orderList: [],//订单列表
+    userInfo: {},//个人信息
   };
+  componentDidShow() {
+    const { router } = Taro.getCurrentInstance();
+    const params = router.params;
+    this.setState({
+      orderType: params.type||2,
+    },()=>{
+      this.getEarningsOrderTab();
+    });
+  }
+  // 获取个人信息
+  getUserInfo = async () => {
+    const res = await getUserInfo();
+    this.setState({ userInfo: res });
+  }
+  // 获取收益订单列表
+  getEarningsOrderList = async (isRefresh) => {
+    const { page } = this.state;
+    this.setState({ loading: true });
+
+    const res = await getEarningsOrderList({
+      tab_name: this.state.tabList[this.state.current].title,
+      page,
+      page_size: 10,
+      search_name: this.state.value,
+      user_type:this.state.orderType
+    });
 
+    this.setState(
+      (prevState) => ({
+        orderList: isRefresh
+          ? res.income_list
+          : [...prevState.orderList, ...res.income_list],
+        totalPages: res.total_pages,
+        loading: false,
+        isNoMore: res.total_pages <= page,
+      }));
+  };
+  // 获取收益订单tab
+  getEarningsOrderTab = async () => {
+    const res = await getEarningsOrderTab();
+    const newTabList = res.tabs.map((item) => ({
+      title: item,
+    }));
+    this.setState({
+      tabList: newTabList,
+    },()=>{
+      this.getEarningsOrderList(true);
+    });
+  };
+  // 订单类型切换
+  handleOrderTypeClick = (type) => {
+    this.setState({ orderType: type, page: 1, value: '' },()=>{
+      this.getEarningsOrderList(true);
+    });
+  };
+  // tab切换
   handleTabClick = (index) => {
-    this.setState({ current: index });
+    this.setState({ current: index, page: 1, value: '' },()=>{
+      this.getEarningsOrderList(true);
+    });
   };
-  // 下单时间下拉选项
-  timeSelectOption = (e) => {
-    const selectTime = this.state.timeOptions[e.detail.value];
-    this.setState({ selectTime });
+  // 输入
+  handleChange = (e) => {
+    const value = e.detail.value;
+    this.setState({ value });
   };
-  // 商品下拉选项
-  productSelectOption = (e) => {
-    const selectedProduct = this.state.productOptions[e.detail.value];
-    this.setState({ selectedProduct });
+  // 搜索
+  handleSearch = () => {
+    this.getEarningsOrderList(true);
   };
+  // 复制
   handleCopy = async (text) => {
     try {
       await Taro.setClipboardData({
@@ -53,11 +108,29 @@ export default class Index extends Component {
       });
     }
   };
-
+  // 页面上拉触底
+  onReachBottom = () => {
+    const { page, totalPages, loading } = this.state;
+    if (page < totalPages && !loading) {
+      this.setState(
+        (prevState) => ({ page: prevState.page + 1 }),
+        () => this.getEarningsOrderList()
+      );
+    }
+  };
   render() {
-    const { current, tabList } = this.state;
+    const { current, tabList, value, orderList, loading, isNoMore, orderType } = this.state;
     return (
       <View className="index">
+        {/* 订单类型切换 */}
+        <View className="order-type-switch">
+          <View className={`order-type-item ${orderType == 2 ? "active" : ""}`} onClick={() => this.handleOrderTypeClick(2)}>
+            <Text>推广订单</Text>
+          </View>
+          <View className={`order-type-item ${orderType == 1 ? "active" : ""}`} onClick={() => this.handleOrderTypeClick(1)}>
+            <Text>购买订单</Text>
+          </View>
+        </View>
         {/* tab切换 */}
         <View className="tab-container">
           {tabList.map((tab, index) => (
@@ -67,65 +140,59 @@ export default class Index extends Component {
               onClick={() => this.handleTabClick(index)}
             >
               <Text>{tab.title}</Text>
-              {tab.num > 0 && <Text className="tag">{tab.num}</Text>}
+              {/* {tab.num > 0 && <Text className="tag">{tab.num}</Text>} */}
             </View>
           ))}
         </View>
-        {/* 下拉筛选 */}
-        <View className="filter-container">
-          <Picker
-            mode="selector"
-            range={this.state.timeOptions}
-            onChange={this.timeSelectOption}
-          >
-            <View className="filter-item">
-              <Text>{this.state.selectTime}</Text>
-              <Image src={selectIcon} className="select-icon" />
+        {/* 搜索 */}
+        <View className="search-container">
+          <View className="search-bar">
+            <AtIcon
+              className="search-icon"
+              value="search"
+              size="20"
+              color="#ACACAC"
+            ></AtIcon>
+            <Input
+              type="text"
+              className="search-input"
+              placeholder=""
+              value={value}
+              onInput={this.handleChange}
+            />
+            <View onClick={this.handleSearch} className="search-button">
+              搜索
             </View>
-          </Picker>
-          <Picker
-            mode="selector"
-            range={this.state.productOptions}
-            onChange={this.productSelectOption}
-          >
-            <View className="filter-item">
-              <Text>{this.state.selectedProduct}</Text>
-              <Image src={selectIcon} className="select-icon" />
-            </View>
-          </Picker>
+          </View>
         </View>
         {/* 订单列表 */}
         <View className="order-list">
-          <View className="order-item">
-            {/* 头部信息 */}
-            <View className="order-header">
+          {orderList.map((item, index) => (
+            <View className="order-item" key={index}>
+              {/* 头部信息 */}
+              {/* <View className="order-header">
               <View className="user-info">
                 <Image className="avatar" src="" />
                 <Text className="username">张三</Text>
               </View>
-              <Text className="pay-status">已付款</Text>
-            </View>
-            <AtDivider content="" />
+              <Text className="pay-status">{item.state_text}</Text>
+            </View> */}
             {/* 订单信息 */}
             <View className="order-info">
               <View className="order-details">
                 <View className="detail-item">
                   <Text className="label">订单编号:</Text>
-                  <Text className="value">2024031512345</Text>
+                  <Text className="value">{item.order_number}</Text>
                   <Text
                     className="copy-text"
-                    onClick={() => this.handleCopy("2024031512345")}
+                    onClick={() => this.handleCopy(item.order_number)}
                   >
                     复制
                   </Text>
                 </View>
                 <View className="detail-item">
                   <Text className="label">下单时间:</Text>
-                  <Text className="value">2024-03-15 12:34:56</Text>
-                </View>
-                <View className="detail-item">
-                  <Text className="label">订单类型:</Text>
-                  <Text className="value">普通订单</Text>
+                  <Text className="value">{item.pay_time}</Text>
                 </View>
               </View>
               <View className="member-info">
@@ -136,24 +203,47 @@ export default class Index extends Component {
 
             {/* 产品信息 */}
             <View className="product-info">
-              <Image className="product-image" src="" />
+              <Image mode="aspectFill" className="product-image" src={item.item_pic_url} />
               <View className="product-details">
                 <Text className="product-name">
-                  这是一个很长的产品名称这是一个很长的产品名称这是一个很长的产品名称
+                  {item.item_title}
                 </Text>
-                <View className="promotion-info">
-                  <View className="tag">推广收入</View>
-                  <Text className="amount">¥99.99</Text>
+                {orderType == 2 && (
+                  <View className="promotion-info">
+                    <View className="tag">推广收入</View>
+                    <Text className="amount">¥{item.assess_amount_text}</Text>
+                  </View>
+                )}
+                <View className="payment-info">
                 </View>
                 <View className="payment-info">
                   <Text className="label">实付金额:</Text>
-                  <Text className="amount">¥199.99</Text>
+                  <Text className="amount">¥{item.actual_paid_fee}</Text>
+                </View>
                 </View>
               </View>
             </View>
-          </View>
+          ))}
         </View>
+        {/* 加载中 */}
+        {loading && (
+          <View className="loading">
+            <AtActivityIndicator
+              content="加载中..."
+              isOpened={loading}
+              mode="center"
+              color="#fdf764"
+            />
+          </View>
+        )}
+        {/* 没有更多 */}
+        {isNoMore && (
+          <View className="no-more">
+            <AtDivider fontSize={18} fontColor="#949494" content="我是有底线的" />
+          </View>
+        )}
       </View>
     );
   }
 }
+

src/pages/memberSub/earningsOrder/index.less

@@ -2,7 +2,27 @@
     background-color: #f9f9f9; // ... 其他样式 ...
     min-height: 100vh;
 }
-
+// 订单类型切换
+.order-type-switch {
+    display: flex;
+    justify-content: space-between;
+    background-color: #fff;
+    padding: 20px 134px 10px 134px;
+    align-items: center;
+    box-sizing: border-box;
+    .order-type-item {
+        font-size: 30px;
+        color: #999999;
+        padding: 7px 26px;
+        line-height: 43px;
+        box-sizing: border-box;
+        border-radius: 40px;
+    }
+    .order-type-item.active {
+        color: #fff;
+        background-color: #fa9703;
+    }
+}
 // tab切换
 .tab-container {
     display: flex;
@@ -10,7 +30,7 @@
     background-color: #fff;
     padding: 22px 34px;
     box-sizing: border-box;
-
+    align-items: center;
     .tab-item {
         font-size: 26px;
         color: #000000;
@@ -34,28 +54,41 @@
     }
 }
 
-// 下拉筛选
-.filter-container {
-    border-top: 1px solid #F4F4F4;
-    background-color: #fff;
-    height: 70px;
-    padding: 0 134px;
+// 搜索
+.search-container {
     display: flex;
     align-items: center;
-    justify-content: space-between;
+    justify-content: center;
+    position: relative;
+    background-color: #fff;
+    padding: 20px 34px;
 
-    .filter-item {
+    .search-bar {
+        width: 90%;
         display: flex;
         align-items: center;
-        font-size: 26px;
-        color: #000000;
+        border-radius: 14px;
+        padding:18px;
+        background-color: #f6f6f6;
 
-        .select-icon {
-            width: 14px;
-            height: 14px;
-            margin-left: 4px;
+        .search-icon {
+            margin-right: 18px;
+        }
+
+        .search-input {
+            flex: 1;
+            border: none;
+            outline: none;
+            background-color: transparent;
+        }
+
+        .search-button {
+            font-weight: 500;
+            font-size: 28px;
+            color: #FAA803;
         }
     }
+
 }
 
 // 订单列表样式
@@ -108,7 +141,7 @@
             display: flex;
             justify-content: space-between;
             padding-bottom: 24px;
-
+            padding-top: 24px;
             .order-details {
                 .detail-item {
                     display: flex;
@@ -165,7 +198,6 @@
             .product-image {
                 width: 297px;
                 height: 168px;
-                background-color: red;
                 border-radius: 8px;
                 margin-right: 16px;
             }
@@ -238,4 +270,18 @@
             }
         }
     }
+}
+// 加载中
+.loading {
+    width: 100%;
+    position: relative;
+    height: 60px;
+  }
+// 没有更多
+.no-more {
+    padding:0 33px;
+    box-sizing: border-box;
+    .at-divider__content{
+        background-color: #f9f9f9;
+    }
 }

src/pages/memberSub/productManagement/index.less

@@ -86,6 +86,7 @@
         display: flex;
         justify-content: space-between;
         align-items: center;
+        z-index: 1;
         .bottom-buy-left {
             display: flex;
             align-items: center;
@@ -144,6 +145,7 @@
         width: 100%;
         height: 176px;
         background-color: #fff;
+        z-index: 1;
         .operation-product-top{
             height: 50%;
             display: flex;

src/pages/memberSub/storeManagement/index.jsx

@@ -37,9 +37,11 @@ export default class Index extends Component {
       store_id: this.state.shopId,
       page,
       page_size: 10,
+      tag_name:'全部'
     }) : await getMyShopList({
       page,
       page_size: 10,
+      tag_name:'全部'
     });
 
     this.setState((prevState) => ({
@@ -52,7 +54,6 @@ export default class Index extends Component {
   componentDidShow() {
     const { router } = Taro.getCurrentInstance();
     const params = router.params;
-    console.log(params,1111);
     
     this.setState({
       isManager: JSON.parse(params.isManager), //是否是店长
@@ -81,9 +82,10 @@ export default class Index extends Component {
   };
   // 配置分享内容
   onShareAppMessage() {
+    const name = Taro.getStorageSync('userInfo').name;
     return {
-      title: "店铺",
-      path: `/pages/memberSub/storeManagement/index?shopId=${this.state.shopDetail.id}&isShare=true&isManager=false&&shareJump=${res.share_unique_value}`,
+      title: `${name}的店铺`,
+      path: `/pages/memberSub/storeManagement/index?shopId=${this.state.shopDetail.id}&isShare=true&isManager=false`,
       imageUrl: ''
     }
     return getShareJump({

src/service/index.js

@@ -1,6 +1,6 @@
 //接口集成
 import Request from '../api/request';
-// ------------------------首页
+// -----------------------------------------------------------首页
 // 获取首页数据
 export const getHomeData = data =>
   Request({
@@ -57,7 +57,7 @@ export const getSearchProductList = data =>
     method: 'POST',
     data,
   })
-// -----------------------用户
+// -------------------------------------------------------------用户
 // 获取用户详情
 export const getUserInfo = data =>
   Request({
@@ -93,7 +93,7 @@ export const getShareJump = data =>
     method: 'POST',
     data,
   })
-// ---------------------会员
+// -------------------------------------------------------会员
 // 获取会员详情
 export const getVipInfo = data =>
   Request({
@@ -157,7 +157,28 @@ export const updateProductSort = data =>
     method: 'POST',
     data,
   })
-// -----------------------登录
+  // 收益订单tab
+  export const getEarningsOrderTab = data =>
+  Request({
+    url: '/vip/get_income_order_tabs',
+    method: 'POST',
+    data,
+  })
+  // 收益订单
+  export const getEarningsOrderList = data =>
+  Request({
+    url: '/vip/get_income_order_data',
+    method: 'POST',
+    data,
+  })
+  // 收益详情
+  export const getEarningsDetail = data =>
+  Request({
+    url: '/vip/get_income_order_detail',
+    method: 'POST',
+    data,
+  })
+// -----------------------------------------登录
 // 登录
 export const login = data =>
   Request({