捡漏计算器页面&推广人展示&伙伴说明弹窗

project.private.config.json

@@ -10,6 +10,55 @@
     "miniprogram": {
       "list": [
         {
+          "name": "pages/member/index",
+          "pathName": "pages/member/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "pages/mine/index",
+          "pathName": "pages/mine/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "pages/calculatorSub/calculatorResult/index",
+          "pathName": "pages/calculatorSub/calculatorResult/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "pages/calculatorSub/calculatorWish/index",
+          "pathName": "pages/calculatorSub/calculatorWish/index",
+          "query": "isShare=true",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "pages/calculatorSub/calculatorInventory/index",
+          "pathName": "pages/calculatorSub/calculatorInventory/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "pages/calculatorSub/calculatorWishList/index",
+          "pathName": "pages/calculatorSub/calculatorWishList/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "pages/calculatorSub/calculator/index",
+          "pathName": "pages/calculatorSub/calculator/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
           "name": "pages/memberSub/earningsOrder/index",
           "pathName": "pages/memberSub/earningsOrder/index",
           "query": "type=2",

src/app.config.js

@@ -39,6 +39,16 @@ export default defineAppConfig({
         "userSpecification/index"
       ]
     },
+    {
+      root: "pages/calculatorSub",
+      pages: [
+        "calculator/index",
+        "calculatorInventory/index",
+        "calculatorResult/index",
+        "calculatorWish/index",
+        "calculatorWishList/index",
+      ]
+    },
   ],
   navigateToMiniProgramAppIdList: [
     "ttf31985a46c214faf"

src/components/instructionModal/index.jsx

@@ -0,0 +1,35 @@
+import { View, Image, RichText } from "@tarojs/components";
+import "./index.less";
+
+// 签约模态框组件
+export default function instructionModal(props) {
+  const { isOpened, onClose, title, content} = props;
+  // 关闭弹窗
+  const closeModal = () => {
+    onClose();
+  };
+  return (
+    <>
+      {isOpened && (
+        <View className="modal-container">
+          <View className="modal-mask" />
+          <View className="modal-content">
+          <View className="content-box">
+            {/* 背景图 */}
+              <Image src='https://yushi.tos-cn-beijing.volces.com/member/instructionBg.png' className="instruction-bg" />
+              <View className="instruction-title">
+                {title}
+              </View>
+              <View className="instruction-content">
+                <RichText nodes={content} />
+              </View>
+              <View onClick={closeModal} className="instruction-button">
+                我知道了
+              </View>
+            </View>
+          </View>
+        </View>
+      )}
+    </>
+  );
+}

src/components/instructionModal/index.less

@@ -0,0 +1,87 @@
+.modal-container {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  z-index: 1000;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.modal-mask {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background-color: rgba(0, 0, 0, 0.6);
+}
+
+.modal-content {
+  position: relative;
+  background-color: #fff;
+  border-radius: 40px;
+  width: 80%;
+  max-width: 600px;
+  z-index: 1001;
+  animation: modalFadeIn 0.3s ease;
+
+  .content-box {
+    min-height: 400px;
+    padding: 54px 32px 38px 32px;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    position: relative;
+
+    // 背景图
+    .instruction-bg {
+      width: 100%;
+      height: 100%;
+      position: absolute;
+      top: 0;
+      left: 0;
+      z-index: -1;
+    }
+    .instruction-title {
+      font-weight: 700;
+      font-size: 32px;
+      color: #000000;
+    }
+    .instruction-content {
+      font-size: 28px;
+      color: #3D3D3D;
+      line-height: 41px;
+      margin-top: 28px;
+      padding: 0 39px;
+      box-sizing: border-box;
+    }
+    .instruction-button {
+      width: 272px;
+      height: 76px;
+      background: linear-gradient(270deg, #FF6E39 0%, #FF891B 100%);
+      border-radius: 121px 121px 121px 121px;
+      font-size: 30px;
+      color: #FFFFFF;
+      margin-top: 44px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+    }
+  }
+}
+
+@keyframes modalFadeIn {
+  from {
+    opacity: 0;
+    transform: scale(0.9);
+  }
+
+  to {
+    opacity: 1;
+    transform: scale(1);
+  }
+}

src/components/signModal/index.jsx

@@ -3,7 +3,6 @@ import { getSign, getUserAgreement } from "../../service";
 import { AtCheckbox } from "taro-ui";
 import "./index.less";
 import Taro from "@tarojs/taro";
-import sign from "../../images/productDetail/sign.png";
 import close from "../../images/productDetail/close.png";
 import { useState, useEffect } from "react";
 
@@ -60,7 +59,7 @@ export default function signModal(props) {
           <View className="modal-content">
             <Image onClick={closeModal} src={close} className="close-icon" />
             <View className="content-box">
-              <Image src={sign} className="sign-icon" />
+              <Image src='https://yushi.tos-cn-beijing.volces.com/calculator/sign.png' className="sign-icon" />
               <View className="sign-title">
                 鱼市招募推广者！自购享折扣，省钱多多；分享有佣金，赚钱轻松。速来开启共赢之旅!
               </View>

src/pages/calculatorSub/calculator/index.config.js

@@ -0,0 +1,3 @@
+export default definePageConfig({
+  navigationBarTitleText: '捡漏计算器'
+})

src/pages/calculatorSub/calculator/index.jsx

@@ -0,0 +1,80 @@
+import { Component } from "react";
+import { View, Image, Text, Button } from "@tarojs/components";
+import "./index.less";
+import Taro from "@tarojs/taro";
+import more from "../../../images/calculator/more.png";
+import toShare from "../../../images/calculator/toShare.png";
+import wish from "../../../images/calculator/wish.png";
+export default class Index extends Component {
+  state = {};
+  componentDidMount() {}
+  // 去TA的捡漏心愿
+  toWishList = () => {
+    Taro.navigateTo({
+      url: `/pages/calculatorSub/calculatorWishList/index`,
+    });
+  };
+  // 去捡漏清单
+  calculatorInventory = () => {
+    Taro.navigateTo({
+      url: `/pages/calculatorSub/calculatorInventory/index`,
+    });
+  };
+  // 配置分享内容
+  onShareAppMessage(res) {
+    return {
+      title: "捡漏计算器",
+      path: `/pages/calculatorSub/calculatorWish/index?isShare=true`,
+      imageUrl: '',
+    }
+  }
+  render() {
+    return (
+      <View className="index">
+        {/* 顶部 */}
+        <View className="top-box">
+          <Image className="top-img" src='https://yushi.tos-cn-beijing.volces.com/calculator/topImg.png' />
+          <View className="button-box">
+            <Image className="button-icon" src='https://yushi.tos-cn-beijing.volces.com/calculator/button.png' />
+            <View className="button-text-box">
+              <Button openType="share">
+                <Text className="button-text">去分享</Text>
+                <Image className="to-share-icon" src={toShare} />
+              </Button>
+            </View>
+          </View>
+        </View>
+        {/* 底部 */}
+        <View className="bottom-box">
+          <Image mode="heightFix" className="bg-img" src='https://yushi.tos-cn-beijing.volces.com/calculator/bottomImg.png' />
+          <View className="content-box">
+            <View className="content-title">
+              <Image className="wish-icon" src={wish} />
+              <Text className="title-text">计算结果</Text>
+            </View>
+            {/* 列表 */}
+            <View className="list-box">
+              <View className="list-item">
+                <View className="list-item-left">
+                  <Image className="avatar" src={wish} />
+                  <View className="list-item-left-text">
+                    <Text className="name">按时打卡上课的急啊离开就</Text>
+                    <Text className="wishNum">15次捡漏许愿</Text>
+                  </View>
+                </View>
+                <View onClick={this.toWishList} className="list-item-right">
+                  查看
+                </View>
+              </View>
+            </View>
+          </View>
+          {/* 查看全部 */}
+          <View onClick={this.calculatorInventory} className="all-box">
+            <Text className="all-text">查看全部</Text>
+            <Image className="all-icon" src={more} />
+          </View>
+        </View>
+      </View>
+    );
+  }
+}

src/pages/calculatorSub/calculator/index.less

@@ -0,0 +1,203 @@
+.index {
+    // 顶部
+    .top-box {
+        position: relative;
+
+        // 顶部图片
+        .top-img {
+            width: 100%;
+            height: 492px;
+        }
+
+        // 按钮
+        .button-box {
+            position: absolute;
+            top: 316px;
+            left: 50%;
+            transform: translateX(-50%);
+
+            .button-icon {
+                width: 324px;
+                height: 107px;
+            }
+
+            .button-text-box {
+                position: absolute;
+                top: 26px;
+                left: 50%;
+                transform: translateX(-50%);
+                font-weight: 700;
+                font-size: 32px;
+                color: #fff;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                width: 100%;
+                z-index: 999;
+                .button-text {
+                    margin-right: 10px;
+                }
+
+                .to-share-icon {
+                    width: 44px;
+                    height: 30px;
+                }
+            }
+        }
+    }
+
+    // 底部
+    .bottom-box {
+        width: 100%;
+        min-height: calc(100vh - 442px);
+        margin-top: -50px;
+        border-radius: 30px 30px 0 0;
+        z-index: 100;
+        position: relative;
+        overflow: hidden;
+        padding: 52px 0;
+        box-sizing: border-box;
+
+        .bg-img {
+            width: 100% !important;
+            height: 100%;
+            position: absolute;
+            top: 0;
+            left: 0;
+            z-index: -1;
+        }
+
+        .content-box {
+            width: 100%;
+            height: 100%;
+
+            .content-title {
+                display: flex;
+                align-items: center;
+                justify-content: center;
+
+                .wish-icon {
+                    width: 34px;
+                    height: 34px;
+                    margin-right: 10px;
+                }
+
+                .title-text {
+                    font-weight: 700;
+                    font-size: 32px;
+                    color: #000000;
+                }
+            }
+
+            // 列表
+            .list-box {
+                width: 100%;
+                height: 100%;
+                margin-top: 36px;
+                padding: 0 51px;
+                box-sizing: border-box;
+
+                .list-item {
+                    width: 100%;
+                    display: flex;
+                    align-items: center;
+                    justify-content: space-between;
+                    margin-bottom: 20px;
+
+                    .list-item-left {
+                        display: flex;
+                        align-items: center;
+
+                        .avatar {
+                            width: 130px;
+                            height: 130px;
+                            border-radius: 50%;
+                            margin-right: 20px;
+                        }
+
+                        .list-item-left-text {
+                            display: flex;
+                            flex-direction: column;
+
+                            .name {
+                                font-weight: 700;
+                                font-size: 28px;
+                                color: #000000;
+                                width: 380px;
+                                overflow: hidden;
+                                text-overflow: ellipsis;
+                                white-space: nowrap;
+                            }
+
+                            .wishNum {
+                                font-weight: 500;
+                                font-size: 24px;
+                                color: #FC8C31;
+                                margin-top: 16px;
+                            }
+                        }
+                    }
+
+                    .list-item-right {
+                        display: flex;
+                        align-items: center;
+                        justify-content: center;
+                        width: 112px;
+                        height: 64px;
+                        background: linear-gradient(270deg, #FFBD4B 0%, #F3802E 100%);
+                        border-radius: 62px 62px 62px 62px;
+                        font-weight: 700;
+                        font-size: 28px;
+                        color: #FFFFFF;
+                    }
+                }
+            }
+        }
+    }
+
+    // 查看全部
+    .all-box {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        margin-top: 34px;
+
+        .all-text {
+            font-weight: 500;
+            font-size: 24px;
+            color: #999999;
+        }
+
+        .all-icon {
+            width: 25px;
+            height: 21px;
+            margin-left: 10px;
+        }
+    }
+
+    // 清除Button默认样式
+    Button {
+        padding: 0;
+        margin: 0;
+        background: none;
+        border: none;
+        line-height: normal;
+        height: 100%;
+        width: 100%;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        font-size: 32px;
+        color: #FFFFFF;
+        &::after {
+            border: none;
+        }
+    }
+
+    .button-hover {
+        background-color: transparent !important;
+        /* 移除背景高亮 */
+        box-shadow: none !important;
+        /* 移除可能的阴影 */
+    }
+}

src/pages/calculatorSub/calculatorInventory/index.config.js

@@ -0,0 +1,3 @@
+export default definePageConfig({
+  navigationBarTitleText: '捡漏清单'
+})

src/pages/calculatorSub/calculatorInventory/index.jsx

@@ -0,0 +1,30 @@
+import { Component } from "react";
+import { View, Image, Text } from "@tarojs/components";
+import "./index.less";
+import wish from "../../../images/calculator/wish.png";
+
+export default class Index extends Component {
+  state = {};
+  componentDidMount() {}
+  render() {
+    return (
+      <View className="index">
+        {/* 列表 */}
+        <View className="list-box">
+          <View className="list-item">
+            <View className="list-item-left">
+              <Image className="avatar" src={wish} />
+              <View className="list-item-left-text">
+                <Text className="name">按时打卡上课的急啊离开就</Text>
+                <Text className="wishNum">15次捡漏许愿</Text>
+              </View>
+            </View>
+            <View onClick={this.toWishList} className="list-item-right">
+              查看
+            </View>
+          </View>
+        </View>
+      </View>
+    );
+  }
+}

src/pages/calculatorSub/calculatorInventory/index.less

@@ -0,0 +1,68 @@
+.index {
+    padding-top: 58px;
+    box-sizing: border-box;
+
+    // 列表
+    .list-box {
+        width: 100%;
+        height: 100%;
+        margin-top: 36px;
+        padding: 0 51px;
+        box-sizing: border-box;
+
+        .list-item {
+            width: 100%;
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+            margin-bottom: 20px;
+
+            .list-item-left {
+                display: flex;
+                align-items: center;
+
+                .avatar {
+                    width: 130px;
+                    height: 130px;
+                    border-radius: 50%;
+                    margin-right: 20px;
+                }
+
+                .list-item-left-text {
+                    display: flex;
+                    flex-direction: column;
+
+                    .name {
+                        font-weight: 700;
+                        font-size: 28px;
+                        color: #000000;
+                        width: 380px;
+                        overflow: hidden;
+                        text-overflow: ellipsis;
+                        white-space: nowrap;
+                    }
+
+                    .wishNum {
+                        font-weight: 500;
+                        font-size: 24px;
+                        color: #FC8C31;
+                        margin-top: 16px;
+                    }
+                }
+            }
+
+            .list-item-right {
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                width: 112px;
+                height: 64px;
+                background: linear-gradient(270deg, #FFBD4B 0%, #F3802E 100%);
+                border-radius: 62px 62px 62px 62px;
+                font-weight: 700;
+                font-size: 28px;
+                color: #FFFFFF;
+            }
+        }
+    }
+}

src/pages/calculatorSub/calculatorResult/index.config.js

@@ -0,0 +1,3 @@
+export default definePageConfig({
+  navigationBarTitleText: '捡漏计算器'
+})

src/pages/calculatorSub/calculatorResult/index.jsx

@@ -0,0 +1,74 @@
+import { Component } from "react";
+import { View, Image, Text } from "@tarojs/components";
+import "./index.less";
+export default class Index extends Component {
+  state = {
+  };
+  componentDidMount() {
+  }
+  render() {
+    return (
+      <View className="index">
+        {/* 顶部盒子 */}
+        <View className="top-box">
+          <Image className="top-img" src='https://yushi.tos-cn-beijing.volces.com/calculator/resultImg.png' />
+          {/* <Image className="top-img" src='https://yushi.tos-cn-beijing.volces.com/calculator/failResult.png' /> */}
+          {/* 捡漏产品 */}
+          <View className="calculator-info">
+              <View className="title-box">
+                <Text className="title-text-left">您想要的:</Text>
+                <Text className="title-text">购买北京到深圳的机票</Text>
+              </View>
+              <View className="title-box">
+                <Text className="title-text-left">期望花费:</Text>
+                <Text className="title-text">1000元</Text>
+              </View>
+          </View>
+          {/* 首选推荐产品 */}
+          <View className="first-recommend">
+            <View className="first-recommend-title">
+              <Image className="first-recommend-title-img" src='https://yushi.tos-cn-beijing.volces.com/calculator/recommend.png' />
+              <Text className="first-recommend-title-text">首选推荐</Text>
+            </View>
+            <View className="first-recommend-content">
+              <View className="product-info">
+                <Image className="product-avatar" src='https://yushi.tos-cn-beijing.volces.com/calculator/default-avatar.png' />
+                <View className="product-detail">
+                  <Text className="product-title">深圳往返北京机票</Text>
+                  <View className="price-box">
+                    <Text className="current-price">899</Text>
+                    <Text className="original-price">¥1299</Text>
+                  </View>
+                </View>
+              </View>
+            </View>
+            {/* 再次捡漏 */}
+            <View className="first-recommend-button">
+              <Image className="first-recommend-button-img" src='https://yushi.tos-cn-beijing.volces.com/calculator/resultButton.png' />
+              <Text className="first-recommend-button-text">再次捡漏</Text>
+            </View>
+          </View>
+        </View>
+          {/* 精选推荐列表 */}
+          <View className="good-recommend-content">
+            <View className="good-recommend-list-title">
+              <Image className="good-recommend-list-title-img" src='https://yushi.tos-cn-beijing.volces.com/calculator/recommendIcon.png' />
+              <Text className="good-recommend-list-title-text">精选推荐</Text>
+            </View>
+            {/* 精选推荐列表内容 */}
+              <View className="good-recommend-list">
+                <View className="good-recommend-list-item">
+                  <Image className="item-image" src='https://yushi.tos-cn-beijing.volces.com/calculator/default-avatar.png' />
+                  <Text className="item-title">深圳往返北京机票</Text>
+                  <View className="item-price">
+                    <Text className="price-symbol">¥</Text>
+                    <Text className="current-price">899</Text>
+                    <Text className="original-price">¥1299</Text>
+                  </View>
+                </View>
+              </View>
+          </View>
+      </View>
+    );
+  }
+}

src/pages/calculatorSub/calculatorResult/index.less

@@ -0,0 +1,269 @@
+.index {
+    padding-top: 28px;
+    box-sizing: border-box;
+    background-color: #f4f4f4;
+    min-height: 100vh;
+
+    .top-box {
+        margin: 0 24px;
+        box-sizing: border-box;
+        position: relative;
+        background: #fff;
+        border-radius: 40px;
+        background-color: #faefe2;
+
+        &::before {
+            content: '';
+            position: absolute;
+            inset: 0;
+            padding: 10px;
+            background: linear-gradient(45deg, #f6dc65, #e87d3a);
+            border-radius: 40px;
+            -webkit-mask:
+                linear-gradient(#fff 0 0) content-box,
+                linear-gradient(#fff 0 0);
+            -webkit-mask-composite: xor;
+            mask-composite: exclude;
+            pointer-events: none;
+        }
+
+        .top-img {
+            width: 682px;
+            height: 608px;
+        }
+
+        // 期望花费
+        .calculator-info {
+            position: absolute;
+            top: 93px;
+            left: 266px;
+
+            .title-box {
+                display: flex;
+                align-items: center;
+
+                .title-text-left {
+                    font-size: 22px;
+                    color: #444444;
+                    margin-right: 6px;
+                }
+
+                .title-text {
+                    font-weight: 700;
+                    font-size: 30px;
+                    color: #000;
+                    width: 340px;
+                    overflow: hidden;
+                    text-overflow: ellipsis;
+                    display: -webkit-box;
+                    -webkit-box-orient: vertical;
+                    -webkit-line-clamp: 2;
+                    word-break: break-all;
+                }
+            }
+        }
+
+        // 首选推荐产品
+        .first-recommend {
+            position: absolute;
+            top: 210px;
+            left: 50%;
+            transform: translateX(-50%);
+            width: 642px;
+            height: 378px;
+            background-color: #fcdcb6;
+            border-radius: 40px;
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            padding: 20px 40px 0 24px;
+            box-sizing: border-box;
+
+            .first-recommend-title {
+                display: flex;
+                align-items: center;
+                font-weight: 700;
+                font-size: 30px;
+                color: #000000;
+
+                .first-recommend-title-img {
+                    width: 43px;
+                    height: 30px;
+                }
+            }
+        }
+
+        // 产品信息
+
+        .first-recommend-content {
+            width: 100%;
+
+            .product-info {
+                display: flex;
+                padding: 20px;
+                align-items: center;
+                width: 100%;
+                height: 146px;
+
+                .product-avatar {
+                    width: 146px;
+                    height: 146px;
+                    border-radius: 20px;
+                    margin-right: 12px;
+                    background-color: red;
+                }
+
+                .product-detail {
+                    flex: 1;
+                    height: 100%;
+                    display: flex;
+                    flex-direction: column;
+                    justify-content: space-between;
+                    padding-bottom: 13px;
+                    box-sizing: border-box;
+
+                    .product-title {
+                        font-size: 28px;
+                        color: #000000;
+                        margin-bottom: 16px;
+                        display: -webkit-box;
+                        -webkit-box-orient: vertical;
+                        -webkit-line-clamp: 2;
+                        overflow: hidden;
+                        text-overflow: ellipsis;
+                    }
+
+                    .price-box {
+                        display: flex;
+                        align-items: center;
+
+                        .current-price {
+                            font-size: 32px;
+                            color: #FF4B4B;
+                            font-weight: bold;
+                            margin-right: 16px;
+
+                            &::before {
+                                content: '¥';
+                                font-size: 22px;
+                            }
+                        }
+
+                        .original-price {
+                            font-size: 22px;
+                            color: #ABABAB;
+                            line-height: 32px;
+                            text-decoration: line-through;
+                        }
+                    }
+                }
+            }
+        }
+
+        // 再次捡漏
+        .first-recommend-button {
+            width: 273px;
+            height: 111px;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            margin-top: 11px;
+            position: relative;
+
+            .first-recommend-button-img {
+                position: absolute;
+                top: 0;
+                left: 0;
+                width: 100%;
+                height: 100%;
+                z-index: 1;
+            }
+
+            .first-recommend-button-text {
+                font-weight: 700;
+                font-size: 28px;
+                color: #FFFFFF;
+                z-index: 2;
+                margin-bottom: 18px;
+            }
+        }
+    }
+
+    // 精选推荐
+    .good-recommend-content {
+        margin-top: 32px;
+        padding: 40px 26px 0 26px;
+        box-sizing: border-box;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        background-color: #fff;
+        border-radius: 30px 30px 0 0;
+
+        .good-recommend-list-title {
+            display: flex;
+            align-items: center;
+            font-weight: 700;
+            font-size: 36px;
+            color: #000000;
+            margin-bottom: 30px;
+
+            .good-recommend-list-title-img {
+                width: 34px;
+                height: 34px;
+                margin-right: 12px;
+            }
+        }
+        // 列表
+        .good-recommend-list {
+            display: flex;
+            flex-wrap: wrap;
+            gap: 19px;
+            padding: 0 16px;
+            width: 100%;
+            .good-recommend-list-item {
+                width: calc((100% - 38px) / 3); // 确保一行显示3个商品，中间间隔19px
+                display: flex;
+                flex-direction: column;
+                margin-bottom: 40px;
+                .item-image {
+                    width: 220px;
+                    height: 213px;
+                    border-radius: 20px 20px 0 0;
+                    background-color: red;
+                }
+
+                .item-title {
+                    font-size: 18px;
+                    color: #000000;
+                    line-height: 33px;
+                }
+
+                .item-price {
+                    margin-top: 4px;
+                    display: flex;
+                    align-items: baseline;
+
+                    .price-symbol {
+                        font-size: 20px;
+                        color: #FF1D17;
+                    }
+
+                    .current-price {
+                        font-size: 30px;
+                        font-weight: bold;
+                        color: #FF1D17;
+                        margin-right: 4px;
+                    }
+
+                    .original-price {
+                        font-size: 14px;
+                        color: #ABABAB;
+                        line-height: 20px;
+                        text-decoration: line-through;
+                    }
+                }
+            }
+        }
+    }
+}

src/pages/calculatorSub/calculatorWish/index.config.js

@@ -0,0 +1,3 @@
+export default definePageConfig({
+  navigationBarTitleText: '捡漏计算器'
+})

src/pages/calculatorSub/calculatorWish/index.jsx

@@ -0,0 +1,89 @@
+import { Component } from "react";
+import { View, Image, Text, Input } from "@tarojs/components";
+import "./index.less";
+import iconOne from "../../../images/calculator/iconOne.png";
+import iconTwo from "../../../images/calculator/iconTwo.png";
+import iconThree from "../../../images/calculator/iconThree.png";
+export default class Index extends Component {
+  state = {};
+  componentDidMount() {}
+  render() {
+    return (
+      <View className="index">
+        <Image className="top-img" src='https://yushi.tos-cn-beijing.volces.com/calculator/wishTopImg.png' />
+        {/* 底部 */}
+        <View className="bottom-box">
+          <Image mode="heightFix" className="bg-img" src='https://yushi.tos-cn-beijing.volces.com/calculator/bottomImg.png' />
+          {/* 输入内容区域 */}
+          <View className="input-box">
+            <View className="input-box-title">
+              <Image className="title-icon" src={iconOne} />
+              <Text className="title-text">您想要的物品或服务</Text>
+            </View>
+            <View className="input-box-content">
+              <View className="input-box-content-box">
+                <Input
+                  className="input-box-content-input"
+                  placeholder="请输入你的心愿"
+                />
+              </View>
+              <View className="input-box-content-text">
+                例: 输入机票不如输入从深圳到北京的机票
+              </View>
+            </View>
+          </View>
+          <View className="input-box">
+            <View className="input-box-title">
+              <Image className="title-icon" src={iconTwo} />
+              <Text className="title-text">您预期的价格</Text>
+            </View>
+            <View className="input-box-content">
+            <View className="input-box-content-box">
+                <Input
+                  className="input-box-content-input"
+                  placeholder="请输入你的心愿"
+                />
+              </View>
+              <View className="input-box-content-text">
+                注意：我们是认真的！
+              </View>
+            </View>
+          </View>
+          <View className="button-box">
+            <Image className="button-icon" src='https://yushi.tos-cn-beijing.volces.com/calculator/buttonTwo.png' />
+            <View className="button-text-box">
+                <Text className="button-text">捡漏计算</Text>
+            </View>
+          </View>
+          {/* 底部捡漏列表 */}
+          <View className="bottom-list-box">  
+            <View className="bottom-list-box-title">
+              <Image className="title-icon" src={iconThree} />
+              <Text className="title-text">TA们捡了哪些漏</Text>
+            </View>
+            <View className="bottom-list-box-content">  
+              <View className="bottom-list-box-content-item"> 
+              TA想要“从北京到深圳的机票”，捡漏200元
+              </View>
+              <View className="bottom-list-box-content-item"> 
+              TA想要“从北京到深圳的机票”，捡漏200元
+              </View>
+              <View className="bottom-list-box-content-item"> 
+              TA想要“从北京到深圳的机票”，捡漏200元
+              </View>
+              <View className="bottom-list-box-content-item"> 
+              TA想要“从北京到深圳的机票”，捡漏200元
+              </View>
+              <View className="bottom-list-box-content-item"> 
+              TA想要“从北京到深圳的机票”，捡漏200元
+              </View>
+              <View className="bottom-list-box-content-item"> 
+              TA想要“从北京到深圳的机票”，捡漏200元
+              </View>
+            </View>
+          </View>
+        </View>
+      </View>
+    );
+  }
+}

src/pages/calculatorSub/calculatorWish/index.less

@@ -0,0 +1,172 @@
+.index {
+    .top-img {
+        width: 100%;
+        height: 668px;
+    }
+
+    // 底部
+    .bottom-box {
+        width: 100%;
+        min-height: calc(100vh - 550px);
+        margin-top: -118px;
+        border-radius: 30px 30px 0 0;
+        z-index: 100;
+        position: relative;
+        overflow: hidden;
+        padding: 41px 0;
+        box-sizing: border-box;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+
+        .bg-img {
+            width: 100%;
+            height: 100%;
+            position: absolute;
+            top: 0;
+            left: 0;
+            z-index: -1;
+        }
+
+        // 输入内容区域
+        .input-box {
+            width: 100%;
+            height: 100%;
+            padding: 0 96px;
+            box-sizing: border-box;
+            margin-bottom: 20px;
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            justify-content: center;
+
+            .input-box-title {
+                width: 100%;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                margin-bottom: 13px;
+
+                .title-icon {
+                    width: 50px;
+                    height: 48px;
+                    margin-right: 10px;
+                }
+
+                .title-text {
+                    font-weight: 600;
+                    font-size: 32px;
+                    color: #D2202B;
+                }
+            }
+
+            // 输入内容
+            .input-box-content {
+                width: 100%;
+
+                .input-box-content-box {
+                    border: 10px solid #e87d3a;
+                    box-sizing: border-box;
+                    border-radius: 30px;
+                    overflow: hidden;
+                }
+
+                .input-box-content-input {
+                    width: 100%;
+                    height: 80px;
+                    background: #FFFFFF;
+                    text-align: center;
+                    font-weight: 350;
+                    font-size: 26px;
+                    padding: 0 20px;
+                    box-sizing: border-box;
+                }
+
+                .input-box-content-text {
+                    font-weight: 500;
+                    font-size: 22px;
+                    color: #444444;
+                    margin-top: 12px;
+                }
+            }
+        }
+
+        // 按钮
+        .button-box {
+            width: 452px;
+            height: 156px;
+            margin-top: 30px;
+            position: relative;
+
+            .button-icon {
+                position: absolute;
+                top: 0;
+                left: 0;
+                width: 100%;
+                height: 100%;
+            }
+
+            .button-text-box {
+                position: absolute;
+                top: 34px;
+                left: 50%;
+                transform: translateX(-50%);
+                font-weight: 700;
+                font-size: 32px;
+                color: #FFFFFF;
+                line-height: 46px;
+            }
+        }
+
+        // 底部捡漏列表
+        .bottom-list-box {
+            width: 100%;
+            height: 100%;
+            padding: 0 50px;
+            box-sizing: border-box;
+            margin-top: 44px;
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+
+            .bottom-list-box-title {
+                width: 100%;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                margin-bottom: 30px;
+
+                .title-icon {
+                    width: 46px;
+                    height: 46px;
+                }
+
+                .title-text {
+                    font-weight: 700;
+                    font-size: 36px;
+                    color: #000000;
+                }
+            }
+
+            // 捡漏列表
+            .bottom-list-box-content {
+                width: 100%;
+                height: 100%;
+
+                .bottom-list-box-content-item {
+                    width: 100%;
+                    border-radius: 18px;
+                    font-weight: 500;
+                    font-size: 24px;
+                    color: #444444;
+                    margin-bottom: 30px;
+                    display: flex;
+                    align-items: center;
+                    padding: 17px 18px;
+                    background: linear-gradient(to right, #F9CA2E, #F1AF2C);
+                    box-sizing: border-box;
+                }
+            }
+        }
+    }
+}

src/pages/calculatorSub/calculatorWishList/index.config.js

@@ -0,0 +1,3 @@
+export default definePageConfig({
+  navigationBarTitleText: 'TA的捡漏心愿'
+})

src/pages/calculatorSub/calculatorWishList/index.jsx

@@ -0,0 +1,56 @@
+import { Component } from "react";
+import { View} from "@tarojs/components";
+import "./index.less";
+export default class Index extends Component {
+  state = {
+    wishList: [
+      {
+        title: "iPhone 15 Pro",
+        price: "¥8999",
+        time: "2024-03-20"
+      },
+      {
+        title: "机械键盘",
+        price: "¥599",
+        time: "2024-03-21"
+      },
+      {
+        title: "显示器",
+        price: "¥2399",
+        time: "2024-03-22"
+      },
+      {
+        title: "耳机",
+        price: "¥999",
+        time: "2024-03-23"
+      }
+    ]
+  };
+  componentDidMount() {
+  }
+  render() {
+    return (
+      <View className="index">
+        {/* 心愿列表 */}
+        <View className="wish-list">
+          {this.state.wishList.map((item, index) => (
+            <View key={index} className="item">
+              <View className="left">
+                {index+1}
+            </View>
+            <View className="right">
+              <View className="left-text">
+                <View className="title">{item.title}</View>
+                <View className="price">预算&emsp;{item.price}元</View>
+              </View>
+              <View className="right-text">
+                {item.time}
+              </View>
+            </View>
+            </View>
+          ))}
+        </View>
+      </View>
+    );
+  }
+}

src/pages/calculatorSub/calculatorWishList/index.less

@@ -0,0 +1,64 @@
+.index {
+    .wish-list {
+        padding-top: 82px;
+        box-sizing: border-box;
+        padding-right: 40px;
+
+        .item {
+            display: flex;
+
+
+            .left {
+                width: 160px;
+                height: 100%;
+                font-weight: 500;
+                font-size: 60px;
+                color: #FF6200;
+                text-align: center;
+                padding-top: 20px;
+                box-sizing: border-box;
+            }
+
+            .right {
+                flex: 1;
+                display: flex;
+                justify-content: space-between;
+                align-items: center;
+                border-bottom: 1px solid #D8D8D8;
+                height: 100%;
+                padding: 30px 0;
+                box-sizing: border-box;
+
+                .left-text {
+                    display: flex;
+                    flex-direction: column;
+
+                    .title {
+                        font-weight: 500;
+                        font-size: 30px;
+                        color: #333333;
+                    }
+
+                    .price {
+                        font-weight: 500;
+                        font-size: 26px;
+                        color: #FC8C31;
+                        margin-top: 10px;
+                    }
+                }
+
+                .right-text {
+                    font-weight: 350;
+                    font-size: 24px;
+                    color: #999999;
+                }
+            }
+
+            &:last-child {
+                .right {
+                    border-bottom: none;
+                }
+            }
+        }
+    }
+}

src/pages/index/index.jsx

@@ -42,10 +42,10 @@ export default class Index extends Component {
   };
   // 轮播图点击
   handleBannerClick = (item) => {
-    if(item.type_jpath==1){
+    if (item.type_jpath == 1) {
       Taro.navigateTo({
-        url: `${item.jpath}&isBanner=true`
-      })
+        url: `${item.jpath}&isBanner=true`,
+      });
     }
   };
   // 修改 tab 切换处理函数
@@ -66,9 +66,9 @@ export default class Index extends Component {
               Taro.pageScrollTo({
                 scrollTop: top - 40,
                 duration: 300,
-                complete:()=>{
+                complete: () => {
                   this.getProductList(true);
-                }
+                },
               });
             } else {
               console.warn("未找到 .product-list-wrap 元素");
@@ -121,6 +121,14 @@ export default class Index extends Component {
   onShareAppMessage() {
     return getShareContent();
   }
+  // ooo = () => {
+  //   Taro.requestSubscribeMessage({
+  //     tmplIds: ["vAYG7hbNbsD75YHpmGvF8O_Pve_1Q5AvnLBd-2JF9ys"],
+  //     success: function (res) {
+  //       console.log(res);
+  //     },
+  //   });
+  // };
   render() {
     const { homeData, productList, loading } = this.state;
     return (
@@ -165,12 +173,17 @@ export default class Index extends Component {
               circular
               autoplay
               indicatorDots
-              indicatorColor="#e8e8e8"banner
+              indicatorColor="#e8e8e8"
+              banner
               indicatorActiveColor="#ffffff"
             >
               {homeData.banner &&
                 homeData.banner.map((item) => (
-                  <SwiperItem onClick={() => this.handleBannerClick(item)} className="banner-item" key={item.id}>
+                  <SwiperItem
+                    onClick={() => this.handleBannerClick(item)}
+                    className="banner-item"
+                    key={item.id}
+                  >
                     <Image
                       className="banner-img"
                       src={item.img}
@@ -181,6 +194,7 @@ export default class Index extends Component {
             </Swiper>
           </View>
         </View>
+        {/* <Button onClick={this.ooo}>订阅</Button> */}
         {/* 骨架屏 */}
         <Skeleton
           isSkeletonShow={!homeData.banner && !productList.length > 0}

src/pages/member/index.jsx

@@ -1,7 +1,7 @@
 import { Component } from "react";
 import { View, Text, Image } from "@tarojs/components";
 import { AtIcon } from "taro-ui";
-import { getVipInfo } from "../../service";
+import { getVipInfo,getUserAgreement } from "../../service";
 import { get_my_worker_info } from "../../service/money_api";
 import Taro from "@tarojs/taro";
 import "./index.less";
@@ -13,6 +13,8 @@ import withdrawable from "../../images/member/withdrawable.png";
 import order from "../../images/member/order.png";
 import avatar from "../../images/mine/avatar.png";
 import partner from "../../images/member/myPartner.png";
+import calculator from "../../images/member/calculator.png";
+import InstructionModal from "../../components/instructionModal";
 export default class Index extends Component {
   state = {
     vipInfo: {
@@ -20,9 +22,18 @@ export default class Index extends Component {
       earnings: { store_earnings_now: 0, store_earnings_all: 0 },
       draw_money: { store_earnings_now: 0 },
       partner: { partner_direct_cnt: 0 },
-      order: { order_all: 0, order_promotion: 0, order_pay: 0, unissued_order_cnt: 0, on_arrival_order_cnt: 0, dead_order_cnt: 0 },
+      order: {
+        order_all: 0,
+        order_promotion: 0,
+        order_pay: 0,
+        unissued_order_cnt: 0,
+        on_arrival_order_cnt: 0,
+        dead_order_cnt: 0,
+      },
     }, //会员信息
-    isAlipay: true,//是否签约
+    isAlipay: true, //是否签约
+    isInstructionModal: false, //是否显示伙伴说明弹窗
+    userAgreement: '', //会员规则
   };
 
   // 获取签约信息
@@ -30,10 +41,10 @@ export default class Index extends Component {
     const res = await get_my_worker_info();
     if (res.data.length == 0) {
       this.setState({
-        isAlipay: false
-      })
+        isAlipay: false,
+      });
     }
-  }
+  };
 
   // 获取会员首页数据
   getVipInfo = async () => {
@@ -42,6 +53,23 @@ export default class Index extends Component {
       vipInfo: res,
     });
   };
+  // 获取会员规则
+  getUserAgreement = async () => {
+    const res = await getUserAgreement({
+      type: 4,
+    });
+    this.setState({
+      userAgreement: res.content,
+    });
+  };
+  // 打开伙伴说明弹窗
+  handleInstructionModal = () => {
+    this.setState({
+      isInstructionModal: true,
+    });
+  };
+
+
   // 去登录
   Login = () => {
     if (!Taro.getStorageSync("session_key")) {
@@ -50,17 +78,20 @@ export default class Index extends Component {
       });
     }
   };
-  componentDidShow () {
+  componentDidShow() {
     if (Taro.getStorageSync("session_key")) {
       this.getVipInfo(); //获取会员首页数据
       this.getWorkerInfo(); //获取签约信息
     }
+    this.getUserAgreement(); //获取会员规则
   }
   // 去订单列表
   handleOrderClick = (type) => {
-    Taro.navigateTo({ url: `/pages/memberSub/earningsOrder/index?type=${type}` });
-  }
-  render () {
+    Taro.navigateTo({
+      url: `/pages/memberSub/earningsOrder/index?type=${type}`,
+    });
+  };
+  render() {
     const { vipInfo } = this.state;
     return (
       <View className="member">
@@ -76,7 +107,9 @@ export default class Index extends Component {
               />
 
               <View className="member-info-card-header-text">
-                <Text onClick={this.Login} className="user-name">{vipInfo.users.name}</Text>
+                <Text onClick={this.Login} className="user-name">
+                  {vipInfo.users.name}
+                </Text>
 
                 <View className="member-info-card-header-text-level">
                   <Text className="level-text">店长</Text>
@@ -84,17 +117,31 @@ export default class Index extends Component {
                 </View>
               </View>
             </View>
-            {/* 我的小店 */}
-            <View
-              onClick={() =>
-                Taro.navigateTo({
-                  url: `/pages/memberSub/storeManagement/index?isManager=${true}`,
-                })
-              }
-              className="my-shop"
-            >
-              <Image className="my-shop-icon" src={home} />
-              <View className="my-shop-text">我的小店</View>
+            <View className="member-info-card-content">
+              {/* 捡漏计算器 */}
+              <View
+                onClick={() =>
+                  Taro.navigateTo({
+                    url: "/pages/calculatorSub/calculator/index",
+                  })
+                }
+                className="my-shop"
+              >
+                <Image className="my-shop-icon" src={calculator} />
+                <View className="my-shop-text">捡漏计算器</View>
+              </View>
+              {/* 我的小店 */}
+              <View
+                onClick={() =>
+                  Taro.navigateTo({
+                    url: `/pages/memberSub/storeManagement/index?isManager=${true}`,
+                  })
+                }
+                className="my-shop"
+              >
+                <Image className="my-shop-icon" src={home} />
+                <View className="my-shop-text">我的小店</View>
+              </View>
             </View>
           </View>
           {/* 预估收益 */}
@@ -116,7 +163,14 @@ 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>
@@ -133,16 +187,21 @@ export default class Index extends Component {
                 <Text className="amount">
                   {`¥ ${vipInfo.draw_money.store_earnings_now}`}
                 </Text>
-                {
-                  !this.state.isAlipay &&
+                {!this.state.isAlipay && (
                   <View className="warning-icon-box">
                     <Image className="warning-icon" src={warning} />
                     <Text className="warning-text">未完成提现认证</Text>
                   </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>
           {/* 我的伙伴 */}
@@ -152,15 +211,38 @@ export default class Index extends Component {
                 <Image className="my-partner-icon" src={partner} />
                 <Text className="my-partner-title">我的伙伴</Text>
               </View>
-              <View onClick={() => Taro.navigateTo({ url: `/pages/memberSub/myPartner/index` })} className="my-partner-header-right">
+              <View
+                onClick={() =>
+                  Taro.navigateTo({ url: `/pages/memberSub/myPartner/index` })
+                }
+                className="my-partner-header-right"
+              >
                 查看更多
-                <AtIcon value='chevron-right' size='10' color='#A1A1A1'></AtIcon>
+                <AtIcon
+                  value="chevron-right"
+                  size="10"
+                  color="#A1A1A1"
+                ></AtIcon>
               </View>
             </View>
             <View className="my-partner-content">
-              <View onClick={() => Taro.navigateTo({ url: `/pages/memberSub/myPartner/index` })} className="my-partner-item">
+              {this.state.userAgreement && (
+                <Image
+                  onClick={() => this.handleInstructionModal()}
+                  className="partnerExplain"
+                  src="https://yushi.tos-cn-beijing.volces.com/calculator/partnerExplain.png"
+              />
+              )}
+              <View
+                onClick={() =>
+                  Taro.navigateTo({ url: `/pages/memberSub/myPartner/index` })
+                }
+                className="my-partner-item"
+              >
                 <Text className="label">直接伙伴</Text>
-                <Text className="number">{vipInfo.partner?.partner_direct_cnt || 0}</Text>
+                <Text className="number">
+                  {vipInfo.partner?.partner_direct_cnt || 0}
+                </Text>
               </View>
               {/* <View className="my-partner-item">
                 <Text className="label">间接伙伴</Text>
@@ -175,9 +257,16 @@ export default class Index extends Component {
                 <Image className="today-order-icon" src={order} />
                 <Text className="today-order-title">今日订单</Text>
               </View>
-              <View onClick={() => this.handleOrderClick(2)} className="today-order-header-right">
+              <View
+                onClick={() => this.handleOrderClick(2)}
+                className="today-order-header-right"
+              >
                 历史订单
-                <AtIcon value='chevron-right' size='10' color='#A1A1A1'></AtIcon>
+                <AtIcon
+                  value="chevron-right"
+                  size="10"
+                  color="#A1A1A1"
+                ></AtIcon>
               </View>
             </View>
 
@@ -186,29 +275,55 @@ export default class Index extends Component {
                 <Text className="label">订单总量</Text>
                 <Text className="amount">{vipInfo.order.order_all}</Text>
               </View>
-              <View className="order-item" onClick={() => this.handleOrderClick(2)}>
+              <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" onClick={() => this.handleOrderClick(2)}>
+              <View
+                className="order-item"
+                onClick={() => this.handleOrderClick(2)}
+              >
                 <Text className="label">已付款订单</Text>
-                <Text className="amount">{vipInfo.order.unissued_order_cnt}</Text>
+                <Text className="amount">
+                  {vipInfo.order.unissued_order_cnt}
+                </Text>
               </View>
-              <View className="order-item" onClick={() => this.handleOrderClick(2)}>
+              <View
+                className="order-item"
+                onClick={() => this.handleOrderClick(2)}
+              >
                 <Text className="label">已收货订单</Text>
-                <Text className="amount">{vipInfo.order.on_arrival_order_cnt}</Text>
+                <Text className="amount">
+                  {vipInfo.order.on_arrival_order_cnt}
+                </Text>
               </View>
-              <View className="order-item" onClick={() => this.handleOrderClick(2)}>
+              <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)}>
+              <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>
+        {/* 使用说明 */}
+        <InstructionModal
+          title="我的伙伴"
+          content={this.state.userAgreement}
+          isOpened={this.state.isInstructionModal}
+          onClose={() => this.setState({ isInstructionModal: false })}
+        />
       </View>
     );
   }

src/pages/member/index.less

@@ -81,29 +81,35 @@
                 }
             }
         }
-
-        // 我的小店
-        .my-shop {
+        .member-info-card-content{
+            display: flex;
             width: 100%;
-            height: 92px;
+            padding: 0 140px;
+            box-sizing: border-box;
             background-color: #fff5dc;
-            display: flex;
-            align-items: center;
-            justify-content: center;
 
-            image {
-                height: 30px;
-                width: 30px;
-                margin-right: 10px;
-            }
-
-            .my-shop-text {
-                font-size: 24px;
-                color: #000000;
-                height: 100%;
+            // 我的小店
+            .my-shop {
+                width: 100%;
+                height: 92px;
                 display: flex;
                 align-items: center;
-                padding-top: 10px;
+                justify-content: center;
+    
+                image {
+                    height: 30px;
+                    width: 30px;
+                    margin-right: 10px;
+                }
+    
+                .my-shop-text {
+                    font-size: 24px;
+                    color: #000000;
+                    height: 100%;
+                    display: flex;
+                    align-items: center;
+                    height: fit-content;
+                }
             }
         }
     }
@@ -293,6 +299,15 @@
             display: flex;
             justify-content: space-between;
             align-items: center;
+            position: relative;
+            .partnerExplain{
+                position: absolute;
+                width: 31px;
+                height: 40px;
+                right: 30px;
+                top: 50%;
+                transform: translateY(-50%);
+            }
             .my-partner-item{
                 flex: 1;
                 text-align: center;
@@ -311,6 +326,7 @@
                     color: #000000;
                     line-height: 40px;
                 }
+
             }
         }
     }   

src/pages/memberSub/storeManagement/index.jsx

@@ -146,7 +146,7 @@ export default class Index extends Component {
           {/* 分享店铺 */}
           {!this.state.isShare && (
             <View className="share-shop">
-              <Button onClick={this.handleShare} openType="share">
+              <Button openType="share">
                 <Text>分享店铺</Text>
                 <AtIcon value="chevron-right" size="10" color="#fff"></AtIcon>
               </Button>

src/pages/mine/index.jsx

@@ -2,7 +2,7 @@ import { Component } from "react";
 import Taro from "@tarojs/taro";
 import { View, Text, Image } from "@tarojs/components";
 import { AtList, AtListItem } from "taro-ui";
-import { getUserInfo } from "../../service";
+import { getUserInfo, getMineData } from "../../service";
 import "./index.less";
 import loginOut from "../../images/mine/loginOut.png";
 import edit from "../../images/mine/edit.png";
@@ -18,6 +18,7 @@ import levelFive from "../../images/mine/levelFive.png";
 export default class Index extends Component {
   state = {
     userInfo: {}, //用户信息
+    mineData: {}, //我的页面数据
     isOpened: false, //是否打开弹窗
   };
   // 退出登录
@@ -43,6 +44,7 @@ export default class Index extends Component {
     const session_key = Taro.getStorageSync("session_key");
     if (session_key) {
       this.getUserInfo();
+      this.getMineData();
     }
   }
   // 获取用户信息
@@ -53,6 +55,13 @@ export default class Index extends Component {
       userInfo: res,
     });
   };
+  // 获取我的页面数据
+  getMineData = async () => {
+    const res = await getMineData();
+    this.setState({
+      mineData: res,
+    });
+  };
   // 去登录
   Login = () => {
     if (!Taro.getStorageSync("session_key")) {
@@ -76,7 +85,7 @@ export default class Index extends Component {
     }
   };
   render() {
-    const { userInfo, isOpened } = this.state;
+    const { userInfo, isOpened, mineData } = this.state;
     return (
       <View className="index">
         {/* 个人信息 */}
@@ -107,20 +116,21 @@ export default class Index extends Component {
                       }
                       className="level-icon"
                     />
-                    <Text 
+                    <Text
                       className="level-text"
                       style={{
-                        color: userInfo.user_identity === 1 
-                          ? '#8AA6F1' 
-                          : userInfo.user_identity === 2 
-                          ? '#0077F6' 
-                          : userInfo.user_identity === 3 
-                          ? '#7D00E1' 
-                          : userInfo.user_identity === 4 
-                          ? '#FE585A' 
-                          : userInfo.user_identity === 5 
-                          ? '#E87D12' 
-                          : '#8AA6F1'
+                        color:
+                          userInfo.user_identity === 1
+                            ? "#8AA6F1"
+                            : userInfo.user_identity === 2
+                            ? "#0077F6"
+                            : userInfo.user_identity === 3
+                            ? "#7D00E1"
+                            : userInfo.user_identity === 4
+                            ? "#FE585A"
+                            : userInfo.user_identity === 5
+                            ? "#E87D12"
+                            : "#8AA6F1",
                       }}
                     >
                       Lv {userInfo.user_identity}
@@ -139,6 +149,29 @@ export default class Index extends Component {
             ></Image>
           </View>
         </View>
+        {/* 我的推荐人 */}
+        {mineData.user_relations?.id && (
+          <View className="recommend-box">
+            <View className="recommend-title">
+              <Text className="recommend-title-text">我的推荐人</Text>
+            </View>
+            <View className="line"></View>
+            <View className="recommend-content">
+              <Image
+                className="recommend-avatar"
+                src={mineData.user_relations.icon}
+              />
+              <View className="recommend-info">
+                <Text className="recommend-name">
+                  {mineData.user_relations.name}
+                </Text>
+                <Text className="recommend-id">
+                  ID: {mineData.user_relations.id}
+                </Text>
+              </View>
+            </View>
+          </View>
+        )}
         {/* 功能 */}
         <View className="function">
           <AtList hasBorder={false}>

src/pages/mine/index.less

@@ -74,6 +74,49 @@
         }
     }
 
+    // 我的推荐人
+    .recommend-box {
+        width: 100%;
+        background: #FFFFFF;
+        border-radius: 20px;
+        margin-bottom: 25px;
+        padding: 12px 17px 29px 17px;
+        box-sizing: border-box;
+        font-size: 28px;
+        color: #000000;
+        .recommend-content {
+            display: flex;
+            align-items: center;
+            .recommend-avatar {
+                width: 64px;
+                height: 64px;
+                border-radius: 50%;
+                margin-right: 19px;
+                background-color: red;
+            }
+            .recommend-info {
+                display: flex;
+                flex-direction: column;
+                justify-content: space-between;
+                .recommend-name {
+                    font-size: 24px;
+                    color: #000000;
+                    line-height: 35px;
+                }
+                .recommend-id {
+                    font-size: 20px;
+                    color: #999999;
+                    line-height: 29px;
+                }
+            }
+        }
+    }
+    .line {
+        margin: 17px 0;
+        width: 100%;
+        height: 1px;
+        background-color: #D8D8D8;
+    }
     // 功能
     .function {
         border-radius: 20px;

src/service/index.js

@@ -100,6 +100,13 @@ export const bindShareJump = data =>
     method: 'POST',
     data,
   })
+  // 获取我的页面数据
+  export const getMineData = data =>
+  Request({
+    url: '/user/get_my_page',
+    method: 'POST',
+    data,
+  })
 // -------------------------------------------------------会员
 // 获取会员详情
 export const getVipInfo = data =>