Merge branch 'master' of http://code.qutaovip.com/lihai/fish_app

* 'master' of http://code.qutaovip.com/lihai/fish_app:
  商品分类搜索框&我的-鱼市说明
  商品分享页修改上传
  处理商品分享页面逻辑
  分享页面&&处理埋点
  新春活动页面&&签约修改
  分享隐藏返回&&活动页面&&实名认证修改
  隐藏安卓滚动条&&上传头像
  增加商品描述&&更换本地图片
  隐藏微信号填写
  订阅消息&&banner跳转&&捡漏计算器bug修改
  捡漏计算器对接接口
  捡漏计算器页面&推广人展示&伙伴说明弹窗
  绑定关系重复展示隐藏&分享后页面按钮展示&订单类型展示
  专项&&我的小店分享绑定
  首页专项区域动态配置
  调整我的小店加载状态
  收益详情字段修改

src/api/request.js

@@ -37,16 +37,21 @@ export default async (options = { method: 'GET', data: {} }) => {
       },
       method: options.method.toUpperCase(),
     });
-    const { code,data, msg } = res.data;
+    const { code, data, msg } = res.data;
     switch (code) {
       case 200:
         return data;
       case 400:
-        Taro.showToast({
-          title: msg,
-          icon: 'none',
-          mask: true,
-        });
+        if (options.url.includes('/user/get_share_unique_value')) {
+        } else {
+          if (msg) {
+            Taro.showToast({
+              title: msg,
+              icon: 'none',
+              mask: true,
+            });
+          }
+        }
         return Promise.reject(msg);
       case 422:
         return Promise.reject(msg);
@@ -56,7 +61,7 @@ export default async (options = { method: 'GET', data: {} }) => {
           icon: 'none',
           mask: true,
         });
-        
+
         // 获取当前跳转到登录的页面路径
         const currentPages = Taro.getCurrentPages();
         const currentPage = currentPages[currentPages.length - 1];
@@ -65,13 +70,13 @@ export default async (options = { method: 'GET', data: {} }) => {
           Taro.setStorageSync('currentPage', currentPage.route);
           global.globalData.optionsData = currentPage.options || {};
         }
-        
+
         Taro.reLaunch({
           url: '/pages/login/index',
         });
         return Promise.reject(msg);
       default:
-        if(msg){
+        if (msg) {
           Taro.showToast({
             title: `${msg}`,
             icon: 'none',

src/app.config.js

@@ -13,7 +13,9 @@ export default defineAppConfig({
         "productDetail/index",
         "seckillIndex/index",
         "searchList/index",
-        "highCommission/index"
+        "highCommission/index",
+        "activity/index",
+        "sharePage/index"
       ]
     },
     {
@@ -36,7 +38,18 @@ export default defineAppConfig({
       root: "pages/mineSub",
       pages: [
         "infoEdit/index",
-        "userSpecification/index"
+        "userSpecification/index",
+        "explain/index"
+      ]
+    },
+    {
+      root: "pages/calculatorSub",
+      pages: [
+        "calculator/index",
+        "calculatorInventory/index",
+        "calculatorResult/index",
+        "calculatorWish/index",
+        "calculatorWishList/index",
       ]
     },
   ],

src/common/track.js

@@ -0,0 +1,25 @@
+import Taro from "@tarojs/taro";
+import { formatDate } from "./time";
+import { addLog } from "../service/index";
+import { isDebounce } from "./debounce";
+// 统计埋点
+export const handleLog = (data) => {
+  if (!isDebounce(500)) return; // 如果在500ms内重复触发，直接返回
+  const dayid = formatDate(new Date(), "YYYY-MM-DD");
+  const userId = Taro.getStorageSync("loginInfo")?.id || 0;
+  const ext = data.shareUserId ? JSON.stringify({ share_users_id: data.shareUserId }) : '';
+  const event_type = data.event_type;
+  const event_type_title = data.event_type_title;
+  const goods_id = data.goods_id || 0;
+  const params = {
+    dayid,
+    users_id:userId,
+    goods_id,
+    event_type,
+    event_type_title,
+    ext,
+  };
+  addLog(params);
+};
+
+

src/components/Modal/index.jsx

@@ -1,18 +1,12 @@
 import { AtModal, AtModalContent } from "taro-ui";
 import { View, Image, Text } from "@tarojs/components";
-import { addLog } from "../../service";
-import { formatDate } from "../../common/time";
-import { isDebounce } from "../../common/debounce";
+import { handleLog } from "../../common/track";
 import "./index.less";
 import Taro from "@tarojs/taro";
-import selectStep from "../../images/productDetail/selectStep.png";
-import xianyu from "../../images/productDetail/xianyu.png";
-import stepThree from "../../images/productDetail/stepThree.png";
 export default function Modal(props) {
-  const { productPromotion, isOpened, title, linkText, id, shareUserId,isHighCommission,isSeckill } =
+  const { productPromotion, isOpened, title, linkText, id, shareUserId,isSeckill } =
     props;
   const handleCopyLink = () => {
-    if (!isDebounce(500)) return; // 如果在300ms内重复触发，直接返回
     Taro.setClipboardData({
       data: productPromotion.short_tpwd,
     }).then(() => {
@@ -20,25 +14,12 @@ export default function Modal(props) {
         title: "口令已复制",
         icon: "success",
       });
-      if (isHighCommission || isSeckill) {
-        const dayid = formatDate(new Date(), "YYYY-MM-DD");
-        let userId = "";
-        if (Taro.getStorageSync("loginInfo")) {
-          userId = Taro.getStorageSync("loginInfo").id;
-        }
-        let ext = "";
-        if (shareUserId) {
-          ext = JSON.stringify({
-            share_users_id: shareUserId,
-          });
-        }
-        addLog({
+      if (isSeckill) {
+        handleLog({
+          shareUserId:shareUserId,
           event_type: "buy_product_link",
           event_type_title: "点击购买",
           goods_id: Number(id),
-          ext,
-          dayid,
-          users_id: userId||0,
         });
       }
     });
@@ -58,7 +39,7 @@ export default function Modal(props) {
                 </View>
                 <View className="step-box">
                   <View className="step-One">复制口令</View>
-                  <Image className="step-img-one" src={selectStep} />
+                  <Image className="step-img-one" src='https://yushi.tos-cn-beijing.volces.com/productDetail/selectStep.png'/>
                 </View>
               </View>
               <View className="step-item">
@@ -67,8 +48,8 @@ export default function Modal(props) {
                   <Text className="desc">打开闲鱼APP</Text>
                 </View>
                 <View className="step-box">
-                  <Image className="step-img-t" src={xianyu} />
-                  <Image className="step-img-two" src={selectStep} />
+                  <Image className="step-img-t" src='https://yushi.tos-cn-beijing.volces.com/productDetail/xianyu.png' />
+                  <Image className="step-img-two" src='https://yushi.tos-cn-beijing.volces.com/productDetail/selectStep.png' />
                 </View>
               </View>
               <View className="step-item">
@@ -80,7 +61,7 @@ export default function Modal(props) {
                   <Image
                     mode="heightFix"
                     className="step-img-three"
-                    src={stepThree}
+                    src='https://yushi.tos-cn-beijing.volces.com/productDetail/stepThree.png'
                   />
                 </View>
               </View>

src/components/ProductCard/index.jsx

@@ -2,9 +2,9 @@ import { View, Text, Image } from '@tarojs/components'
 import Taro from '@tarojs/taro'
 import './index.less'
 
-const ProductCard = ({ product }) => {
+const ProductCard = ({ product,isShare,isShowBack }) => {
   return (
-    <View onClick={() => Taro.navigateTo({ url: `/pages/indexSub/productDetail/index?id=${product.id}` })} className='product-card'>
+    <View onClick={() => Taro.navigateTo({ url: `/pages/indexSub/productDetail/index?id=${product.id}&isShare=${isShare}&isShowBack=${isShowBack}` })} className='product-card'>
       <Image className='product-img' src={product.image_url} mode='aspectFill' />
       <View className='product-content'>
         <Text className='title'>{product.item_title}</Text>

src/components/index/OperationArea/index.jsx

@@ -5,24 +5,17 @@ import "./index.less";
 const OperationArea = ({ recommend }) => {
   // 添加跳转方法
   const handleNavigate = (type) => {
-    if (type === "鱼市秒杀") {
-      Taro.navigateTo({
-        url: `/pages/indexSub/seckillIndex/index?isDirect=true`,
-      });
-    } else if (type === "高佣专项") {
-      Taro.navigateTo({
-        url: `/pages/indexSub/highCommission/index?isDirect=true`,
-      });
-    }
+    Taro.navigateTo({
+      url: `/pages/indexSub/seckillIndex/index?isDirect=true&title=${type.name}&id=${type.id}`,
+    });
   };
-
   return (
     <View className="operation-wrap">
       {recommend.map((item, index) => (
         <View
           key={index}
           className="operation-item"
-          onClick={() => handleNavigate(item.tag.name)}
+          onClick={() => handleNavigate(item.tag)}
         >
           <View className="title-wrap">
             <Text className="title">{item.tag.name}</Text>
@@ -53,13 +46,6 @@ const OperationArea = ({ recommend }) => {
           </View>
         </View>
       ))}
-
-      {/* <View className="operation-item" onClick={() => handleNavigate('highCommission')}>
-        <View className="title-wrap">
-          <Text className="title">高佣专项</Text>
-          <Text className="tag">高佣金必囤爆品</Text>
-        </View>
-      </View> */}
     </View>
   );
 };

src/components/index/OperationArea/index.less

@@ -2,14 +2,14 @@
     margin: 16px 16px 0;
     display: flex;
     justify-content: space-between;
-
+    flex-wrap: wrap;
     .operation-item {
         width: 350px;
         height: 256px;
         background: #FFFFFF;
         border-radius: 16px;
         border: 1px solid #FFFFFF;
-
+        margin-bottom: 16px;
         .title {
             font-size: 28px;
             font-weight: bold;

src/components/index/ProductList/index.jsx

@@ -7,8 +7,9 @@ import React, {
 import { View, Text, Image, Button } from "@tarojs/components";
 import { AtCheckbox, AtActivityIndicator } from "taro-ui";
 import { setShareContent } from "../../../common/share";
-import { formatDate } from "../../../common/time";
-import { getShareJump, addLog } from "../../../service";
+import { getShareJump } from "../../../service";
+import { handleLog } from "../../../common/track";
+import { isDebounce } from "../../../common/debounce";
 import Taro from "@tarojs/taro";
 import "./index.less";
 import ShareModal from "../../shareModal";
@@ -16,15 +17,15 @@ import joinStoreBg from "../../../images/index/jionStore.png";
 import joinStoreAc from "../../../images/index/joinStoreAc.png";
 import saveMoneyBg from "../../../images/index/save-money.png";
 import buy from "../../../images/index/buy.png";
+import shareBuy from "../../../images/index/shareBuy.png";
 import shareEarnBg from "../../../images/index/share-earn.png";
 import seckillIcon from "../../../images/seckill/seckillIcon.png";
-import { isDebounce } from "../../../common/debounce";
 const ProductList = forwardRef((props, ref) => {
   const {
     productList, // 商品列表数据
     loading, // 加载状态
-    isSeckill, // 是否秒杀页面使用
-    isHighCommission, // 是否高佣金��面使用
+    isSeckill, // 是否专项区域页面使用
+    tagTitle, //专项区域名称
     isManagement, // 是否管理页面使用
     isManagementStatus, // 是否管理状态
     isProductClassify, // 是否分类页面使用
@@ -34,6 +35,8 @@ const ProductList = forwardRef((props, ref) => {
     isNoMore, // 是否没有更多
     shareUserId, // 分享用户id
     isEmpty, // 是否为空
+    isShare, //是否是分享
+    isShowBack, //是否显示返回
   } = props;
 
   const [selectedProducts, setSelectedProducts] = useState([]); // 商品选择状态
@@ -69,7 +72,7 @@ const ProductList = forwardRef((props, ref) => {
       selectProduct(id);
     } else {
       Taro.navigateTo({
-        url: `/pages/indexSub/productDetail/index?id=${id}&&isHighCommission=${isHighCommission}&&isSeckill=${isSeckill}&&shareUserId=${shareUserId}`,
+        url: `/pages/indexSub/productDetail/index?id=${id}&&isSeckill=${isSeckill}&&shareUserId=${shareUserId}&&tagTitle=${tagTitle}&&isShare=${isShare}&&isShowBack=${isShowBack}`,
       });
     }
   };
@@ -97,76 +100,68 @@ 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 handleLog = (id) => {
-    if (!isDebounce(500)) return; // 如果在300ms内重复触发，直接返回
-    const dayid = formatDate(new Date(), "YYYY-MM-DD");
-    let userId = "";
-    if (Taro.getStorageSync("loginInfo")) {
-      userId = Taro.getStorageSync("loginInfo").id;
-    }
-    addLog({
-      event_type: "share_product_link",
-      event_type_title: "点击分享赚",
-      goods_id: Number(id),
-      ext: "",
-      dayid,
-      users_id: userId,
-    });
-  };
   // 分享商品
-  const shareProduct = (product, e) => {
+  const shareProduct = async (product, e) => {
+    if (!isDebounce(500)) return; // 如果在500ms内重复触发，直接返回
     e.stopPropagation(); // 防止事件穿透
     setCurrentShareProduct(product);
-    getShareJump({
-      share_type: 1,
-      share_id: product.id,
-    }).then((res) => {
-      // 打开分享弹窗
-      let shareUserId = "";
-      if (Taro.getStorageSync("loginInfo")) {
-        shareUserId = Taro.getStorageSync("loginInfo").id;
-      }
-      setShareContent({
-        title: shareTitle || product.item_title,
-        path: `/pages/indexSub/productDetail/index?id=${
-          product.id
-        }&&isShare=${true}&&shareJump=${
-          res.share_unique_value
-        }&&isHighCommission=${isHighCommission}&&isSeckill=${isSeckill}&&shareUserId=${shareUserId}`,
-        imageUrl: product.image_url,
-      });
-      setShareLink(res.share_unique_value);
-      setShareModalOpened(true);
-      if (isHighCommission || isSeckill) {
-        handleLog(product.id);
-      }
+    Taro.navigateTo({
+      url: `/pages/indexSub/sharePage/index?isSeckill=${isSeckill}&&tagTitle=${tagTitle}&&shareUserId=${shareUserId}&id=${product.id}`,
     });
+    // 埋点
+    if (isSeckill) {
+      handleLog({
+        event_type: "share_product_link",
+        event_type_title: "点击分享赚",
+        goods_id: product.id,
+      });
+    }
+    // getShareJump({
+    //   share_type: 1,
+    //   share_id: product.id,
+    // }).then((res) => {
+    //   // 打开分享弹窗
+    //   let shareUserId = "";
+    //   if (Taro.getStorageSync("loginInfo")) {
+    //     shareUserId = Taro.getStorageSync("loginInfo").id;
+    //   }
+    //   setShareContent({
+    //     title: shareTitle || product.item_title,
+    //     path: `/pages/indexSub/productDetail/index?id=${
+    //       product.id
+    //     }&&isShare=${true}&&shareJump=${
+    //       res.share_unique_value
+    //     }&&isSeckill=${isSeckill}&&shareUserId=${shareUserId}`,
+    //     imageUrl: product.image_url,
+    //   });
+    //   setShareLink(res.share_unique_value);
+    //   setShareModalOpened(true);
+    // });
   };
+  // 设置分享标题
+  // 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]);
   return (
     <View className="product-list-wrap">
-      {isSeckill && (
+      {/* {isSeckill && (
         <View className="seckill-icon">
           <Image src={seckillIcon} mode="aspectFit" />
           <Text>每日疯抢 限时秒杀</Text>
         </View>
-      )}
+      )} */}
       {productList.map((product, index) => (
         <View key={product.id}>
           <View onClick={() => toDetail(product.id)} className="product-item">
@@ -197,11 +192,7 @@ const ProductList = forwardRef((props, ref) => {
                   style={{ WebkitBoxOrient: "vertical" }}
                 >
                   <Text className="self-tag">
-                    {isSeckill
-                      ? "鱼市秒杀"
-                      : isHighCommission
-                      ? "高佣专项"
-                      : "自营"}
+                    {isSeckill ? tagTitle : "自营"}
                   </Text>
                   {product.item_title}
                 </View>
@@ -240,40 +231,55 @@ const ProductList = forwardRef((props, ref) => {
                     </View>
                   )}
                 </View>
-                <View className="profit-line">
-                  {Number(product.estimated_commission_buy) > 0 ? (
-                    <View className="save-money">
+                <View className={`profit-line ${isShare ? "flexEnd" : ""}`}>
+                  {!isShare ? (
+                    Number(product.estimated_commission_buy) > 0 ? (
+                      <View className="save-money">
+                        <Image
+                          className="bg"
+                          src={saveMoneyBg}
+                          mode="aspectFit"
+                        />
+                        <View className="content">
+                          <Text className="label">自购省</Text>
+                          <Text className="money">
+                            ¥{product.estimated_commission_buy}
+                          </Text>
+                        </View>
+                      </View>
+                    ) : (
+                      <View className="buy">
+                        <Image className="bg" src={buy} mode="aspectFit" />
+                        <View className="content">立 即 购 买</View>
+                      </View>
+                    )
+                  ) : (
+                    // 这里添加 isShare 为 true 时要显示的内容
+                    <View className="shareBuy">
+                      <Image className="bg" src={shareBuy} />
+                      <View className="content">立 即 购 买</View>
+                    </View>
+                  )}
+
+                  {!isShare && (
+                    <View className="share-earn">
                       <Image
                         className="bg"
-                        src={saveMoneyBg}
+                        src={shareEarnBg}
                         mode="aspectFit"
                       />
                       <View className="content">
-                        <Text className="label">自购省</Text>
-                        <Text className="money">
-                          ¥{product.estimated_commission_buy}
-                        </Text>
+                        <Button
+                          onClick={(e) => shareProduct(product, e)} // 传递事件对象
+                        >
+                          <Text className="label">分享赚</Text>
+                          <Text className="money">
+                            ¥{product.estimated_commission_promotion}
+                          </Text>
+                        </Button>
                       </View>
                     </View>
-                  ) : (
-                    <View className="buy">
-                      <Image className="bg" src={buy} mode="aspectFit" />
-                      <View className="content">立 即 购 买</View>
-                    </View>
                   )}
-                  <View className="share-earn">
-                    <Image className="bg" src={shareEarnBg} mode="aspectFit" />
-                    <View className="content">
-                      <Button
-                        onClick={(e) => shareProduct(product, e)} // 传递事件对象
-                      >
-                        <Text className="label">分享赚</Text>
-                        <Text className="money">
-                          ¥{product.estimated_commission_promotion}
-                        </Text>
-                      </Button>
-                    </View>
-                  </View>
                 </View>
               </View>
             </View>
@@ -295,7 +301,7 @@ const ProductList = forwardRef((props, ref) => {
       )}
       {isNoMore && !isEmpty && <View className="no-more">没有更多了~</View>}
       {/* 分享弹窗 */}
-      <ShareModal
+      {/* <ShareModal
         onClose={() => {
           setShareModalOpened(false);
           // 添加延时，等待关闭动画完成后再重置其他状态
@@ -308,14 +314,14 @@ const ProductList = forwardRef((props, ref) => {
         isOpened={shareModalOpened}
         product={currentShareProduct}
         onShareTitleChange={handleShareTitleChange}
-      />
+      /> */}
     </View>
   );
 });
 
 ProductList.defaultProps = {
   isSeckill: false,
-  isHighCommission: false,
+  tagTitle: "",
   productList: [],
   loading: false,
   isManagement: false,
@@ -325,6 +331,8 @@ ProductList.defaultProps = {
   isNoMore: false,
   shareUserId: "",
   isEmpty: false, // 是否为空
+  isShare: false, //分享
+  isShowBack: false, //是否显示返回
   onAddProduct: () => {}, // 添加商品方法
   onDeleteProductSelect: () => {}, // 删除商品选中id数组
 };

src/components/index/ProductList/index.less

@@ -126,11 +126,12 @@
           }
         }
       }
-
+      .flexEnd{
+        justify-content: flex-end;
+      }
       .profit-line {
         display: flex;
         gap: 20px;
-
         .save-money {
           color: #F6C71A;
           // color: #F6C71A;
@@ -145,7 +146,8 @@
           //   text-align: center;
           // }
         }
-        .buy{
+
+        .buy {
           color: #F6C71A;
           display: flex;
           align-items: center;
@@ -161,6 +163,7 @@
             top: 0;
             left: 0;
           }
+
           .content {
             width: 74px;
             height: 80px;
@@ -169,6 +172,33 @@
             text-align: center;
           }
         }
+
+        .shareBuy {
+          color: #F6C71A;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          position: relative;
+          width: 60%;
+          height: 84px;
+          .bg {
+            width: 100%;
+            height: 100%;
+            position: absolute;
+            top: 0;
+            left: 0;
+          }
+
+          .content {
+            width: 100%;
+            height: 80px;
+            font-size: 30px;
+            text-align: center;
+            line-height: 80px;
+            letter-spacing:8px;
+          }
+        }
+
         .share-earn {
           color: #fff;
         }

src/components/instructionModal/index.jsx

@@ -0,0 +1,39 @@
+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">
+              {/* 背景图 */}
+              <Image
+                mode="widthFix"
+                src="https://yushi.tos-cn-beijing.volces.com/member/instructionBg.png"
+                className="instruction-bg"
+              />
+            <View className="content-box">
+              <View className="instruction-title">{title}</View>
+              <View className="instruction-content">
+                <RichText nodes={content} />
+              </View>
+            </View>
+            <View className="instruction-button-box">
+              <View onClick={closeModal} className="instruction-button">
+                我知道了
+              </View>
+            </View>
+          </View>
+        </View>
+      )}
+    </>
+  );
+}

src/components/instructionModal/index.less

@@ -0,0 +1,108 @@
+.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;
+  max-height: 90vh;
+  overflow: hidden;
+
+  // 背景图
+  .instruction-bg {
+    width: 100%;
+    height: 100%;
+    position: absolute;
+    top: 0;
+    left: 0;
+    z-index: -1;
+  }
+
+  .content-box {
+    max-height: 70vh;
+    padding: 54px 32px 148px 32px;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: flex-start;
+    position: relative;
+    overflow-y: auto;
+
+
+    .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;
+      width: 100%;
+    }
+  }
+
+  .instruction-button-box {
+    position: absolute; // 绝对定位
+    bottom: 0; // 固定在底部
+    left: 0;
+    width: 100%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    height: 110px;
+    background: #fff;
+  }
+
+  .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;
+    margin: 0 auto;
+  }
+}
+
+@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,95 @@
+import { Component } from "react";
+import { View, Image, Text, Button } from "@tarojs/components";
+import { getCalculatorPartData } from "../../../service/activity";
+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 = {
+    calculatorPartData: {},// 捡漏计算器部分数据
+  };
+  componentDidMount() {
+    this.getCalculatorPartData();// 获取捡漏计算器部分数据
+  }
+  // 去TA的捡漏心愿
+  toWishList = (id) => {
+    Taro.navigateTo({
+      url: `/pages/calculatorSub/calculatorWishList/index?id=${id}`,
+    });
+  };
+  // 去捡漏清单
+  calculatorInventory = () => {
+    Taro.navigateTo({
+      url: `/pages/calculatorSub/calculatorInventory/index`,
+    });
+  };
+  // 获取捡漏计算器部分数据
+  async getCalculatorPartData() {
+    const res = await getCalculatorPartData();
+    this.setState({
+      calculatorPartData: res.jianlou_list,
+    });
+  };
+  // 配置分享内容
+  onShareAppMessage(res) {
+    return {
+      title: "捡漏计算器",
+      path: `/pages/calculatorSub/calculatorWish/index?isShare=true`,
+      imageUrl: 'https://yushi.tos-cn-beijing.volces.com/calculator/shareImg.png',
+    }
+  }
+  render() {
+    const { calculatorPartData } = this.state;
+    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">
+              {calculatorPartData.length > 0 && calculatorPartData.map((item, index) => (
+                <View key={index} className="list-item">
+                  <View className="list-item-left">
+                    <Image className="avatar" src={item.icon} />
+                  <View className="list-item-left-text">
+                    <Text className="name">{item.name}</Text>
+                    <Text className="wishNum">{item.activity_jianlou_cnt}次捡漏许愿</Text>
+                  </View>
+                </View>
+                <View onClick={() => this.toWishList(item.id)} 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,76 @@
+import { Component } from "react";
+import { View, Image, Text } from "@tarojs/components";
+import "./index.less";
+import Taro from "@tarojs/taro";
+import { getCalculatorList } from "../../../service/activity";
+export default class Index extends Component {
+  state = {
+    inventoryList: [],
+    page: 1, // 添加页码
+    totalPages: 1, // 添加总页数
+    loading: false, // 添加加载状态
+  };
+  componentDidMount() {
+    this.getCalculatorList(true); // 获取捡漏清单
+  }
+  // 获取捡漏清单
+  getCalculatorList = async (isRefresh) => {
+    this.setState({ loading: true });
+    const res = await getCalculatorList({
+      page: this.state.page,
+      page_size: 10,
+    });
+    this.setState({
+      inventoryList: isRefresh
+        ? res.jianlou_list
+        : [...this.state.inventoryList, ...res.jianlou_list],
+      totalPages: res.total_pages,
+      loading: false,
+    });
+  }
+  // 查看心愿列表
+  toWishList = (id) => {
+    Taro.navigateTo({
+      url: `/pages/calculatorSub/calculatorWishList/index?id=${id}`,
+    });
+  };
+  // 页面上拉触底
+  onReachBottom = () => {
+    const { page, totalPages, loading } = this.state;
+    if (page < totalPages && !loading) {
+      this.setState(
+        (prevState) => ({ page: prevState.page + 1 }),
+        () => this.getCalculatorList(false)
+      );
+    }
+  };
+  render() {
+    return (
+      <View className="index">
+        {/* 列表 */}
+        <View className="list-box">
+          {this.state.inventoryList.length > 0 &&
+            this.state.inventoryList.map((item, index) => (
+              <View key={index} className="list-item">
+                <View className="list-item-left">
+                  <Image className="avatar" src={item.icon} />
+                  <View className="list-item-left-text">
+                    <Text className="name">{item.name}</Text>
+                    <Text className="wishNum">
+                      {item.activity_jianlou_cnt}次捡漏许愿
+                    </Text>
+                  </View>
+                </View>
+                <View
+                  onClick={() => this.toWishList(item.id)}
+                  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,130 @@
+import { Component } from "react";
+import { View, Image, Text } from "@tarojs/components";
+import "./index.less";
+import Taro from "@tarojs/taro";
+export default class Index extends Component {
+  state = {
+    isSearch: 1,// 是否计算成功
+    list: [],// 列表
+    wish: '',// 心愿
+    price: '',// 价格
+  };
+  componentDidMount() {
+    let { isSearch, list, wish, price } = Taro.getCurrentInstance().router.params;
+    this.setState({
+      isSearch,
+      list: JSON.parse(decodeURIComponent(list)),
+      wish,
+      price,
+    });
+  }
+  // 再次捡漏
+  handleAgain = () => {
+    Taro.navigateBack();
+  }
+  // 去捡漏清单
+  toCalculatorInventory = (id) => {
+    Taro.navigateTo({
+      url: `/pages/calculatorSub/calculatorInventory/index?id=${id}&&isShare=true`,
+    });
+  }
+  // 精选推荐
+  handleGoodRecommend = (id) => {
+    Taro.navigateTo({
+      url: `/pages/indexSub/productDetail/index?id=${id}&&isShare=true`,
+    });
+  }
+  render() {
+    const { isSearch, list, wish, price } = this.state;
+    return (
+      <View className="index">
+        {/* 顶部盒子 */}
+        <View className="top-box">
+          <Image
+            className="top-img"
+            src={isSearch == 1 ? "https://yushi.tos-cn-beijing.volces.com/calculator/resultImg.png" : "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">{wish}</Text>
+            </View>
+            <View className="title-box">
+              <Text className="title-text-left">期望花费:</Text>
+              <Text className="title-text">{price}元</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">
+              {list.length > 0 && (
+                <View className="product-info" onClick={() => this.handleGoodRecommend(list[0].id)}>
+                  <Image
+                    className="product-avatar"
+                    mode="aspectFill"
+                    src={list[0].image_url}
+                  />
+                  <View className="product-detail">
+                    <Text className="product-title">{list[0].item_title}</Text>
+                    <View className="price-box">
+                      <Text className="current-price">{list[0].reserve_price}</Text>
+                      {list[0].original_price != 0 && (
+                        <Text className="original-price">¥{list[0].original_price}</Text>
+                      )}
+                    </View>
+                  </View>
+                </View>
+              )}
+            </View>
+            {/* 再次捡漏 */}
+            <View onClick={this.handleAgain} 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">
+            {list.length > 1 && list.slice(1, 7).map((item, index) => (
+              <View onClick={() => this.handleGoodRecommend(item.id)} key={index} className="good-recommend-list-item">
+                <Image
+                  mode="aspectFill"
+                  className="item-image"
+                  src={item.image_url}
+                />
+                <Text className="item-title">{item.item_title}</Text>
+                <View className="item-price">
+                  <Text className="price-symbol">¥</Text>
+                  <Text className="current-price">{item.reserve_price}</Text>
+                  {item.original_price != 0 && (
+                    <Text className="original-price">¥{item.original_price}</Text>
+                  )}
+                </View>
+              </View>
+            ))}
+          </View>
+        </View>
+      </View>
+    );
+  }
+}

src/pages/calculatorSub/calculatorResult/index.less

@@ -0,0 +1,273 @@
+.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;
+                }
+
+                .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;
+                }
+
+                .item-title {
+                    font-size: 18px;
+                    color: #000000;
+                    line-height: 33px;
+                    height: 60px;
+                    display: -webkit-box;
+                    -webkit-box-orient: vertical;
+                    -webkit-line-clamp: 2;
+                    overflow: hidden;
+                    text-overflow: ellipsis;
+                }
+
+                .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,159 @@
+import { Component } from "react";
+import { View, Image, Text, Input } from "@tarojs/components";
+import Taro from "@tarojs/taro";
+import "./index.less";
+import iconOne from "../../../images/calculator/iconOne.png";
+import iconTwo from "../../../images/calculator/iconTwo.png";
+import iconThree from "../../../images/calculator/iconThree.png";
+import {
+  getCalculatorData,
+  getCalculatorSearch,
+} from "../../../service/activity";
+export default class Index extends Component {
+  state = {
+    wishList: [],
+    wish: "", // 心愿
+    price: "", // 价格
+  };
+  componentDidMount() {
+    this.getCalculator(); // 计算捡漏
+  }
+  // 计算捡漏
+  getCalculator = async () => {
+    const res = await getCalculatorData();
+    this.setState({
+      wishList: res,
+    });
+  };
+  // 搜索捡漏
+  getCalculatorSearch = async () => {
+    if (!this.state.wish.trim()) {
+      Taro.showToast({
+        title: "请输入您想要捡漏的物品或服务",
+        icon: "none",
+      });
+      return;
+    }
+    if (!this.state.price.trim()) {
+      Taro.showToast({
+        title: "请输入您预期的价格",
+        icon: "none",
+      });
+      return;
+    }
+    Taro.showLoading({
+      title: "正在计算...",
+    });
+    try {
+      const res = await getCalculatorSearch({
+        keyword: this.state.wish,
+        money: this.state.price,
+      });
+      Taro.navigateTo({
+        url: `/pages/calculatorSub/calculatorResult/index?isSearch=${
+          res.is_search
+        }&&list=${encodeURIComponent(JSON.stringify(res.goods_list))}&&wish=${this.state.wish}&&price=${this.state.price}`,
+      });
+    } finally {
+      Taro.hideLoading();
+    }
+  };
+  // 心愿输入框改变
+  handleWishChange = (e) => {
+    this.setState({
+      wish: e.detail.value,
+    });
+  };
+  // 价格输入框改变
+  handlePriceChange = (e) => {
+    if (e.detail.value < 1 && e.detail.value.trim() !== "") {
+      e.detail.value = 1;
+    }
+    this.setState({
+      price: e.detail.value,
+    });
+  };
+  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
+                  value={this.state.wish}
+                  onInput={this.handleWishChange}
+                  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
+                  value={this.state.price}
+                  onInput={this.handlePriceChange}
+                  type="number"
+                  min="1"
+                  className="input-box-content-input"
+                  placeholder="价格最低不能少于1元"
+                />
+              </View>
+              <View className="input-box-content-text">
+                注意：我们是认真的！
+              </View>
+            </View>
+          </View>
+          <View onClick={this.getCalculatorSearch} 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">
+              {this.state.wishList.length > 0 &&
+                this.state.wishList.map((item, index) => (
+                  <View key={index} className="bottom-list-box-content-item">
+                    TA想要“{item.jianlou_title}”，捡漏{item.reserve_price}元
+                  </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% !important;
+            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,47 @@
+import { Component } from "react";
+import Taro from "@tarojs/taro";
+import { View } from "@tarojs/components";
+import "./index.less";
+import { getCalculatorDetail } from "../../../service/activity";
+export default class Index extends Component {
+  state = {
+    wishList: [],
+  };
+  componentDidMount() {
+    const { id } = Taro.getCurrentInstance().router.params;
+    this.getCalculatorDetail(id); // 获取心愿列表
+  }
+  // 获取心愿列表
+  async getCalculatorDetail(id) {
+    const res = await getCalculatorDetail({
+      user_id: id,
+    });
+    this.setState({
+      wishList: res,
+    });
+  }
+  render() {
+    return (
+      <View className="index">
+        {/* 心愿列表 */}
+        <View className="wish-list">
+          {this.state.wishList.length > 0 &&
+            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.jianlou_title}</View>
+                    <View className="price">
+                      预算&emsp;{item.reserve_price}元
+                    </View>
+                  </View>
+                  <View className="right-text">{item.time}</View>
+                </View>
+              </View>
+            ))}
+        </View>
+      </View>
+    );
+  }
+}

src/pages/calculatorSub/calculatorWishList/index.less

@@ -0,0 +1,68 @@
+.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 {
+                        width: 300px;
+                        font-weight: 500;
+                        font-size: 30px;
+                        color: #333333;
+                        white-space: nowrap;
+                        overflow: hidden;
+                        text-overflow: ellipsis;
+                    }
+
+                    .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

@@ -7,6 +7,7 @@ import {
   SwiperItem,
   Text,
   Button,
+  ScrollView,
 } from "@tarojs/components";
 import { AtTabs } from "taro-ui";
 import { getHomeData, getProductList } from "../../service";
@@ -42,10 +43,11 @@ export default class Index extends Component {
   };
   // 轮播图点击
   handleBannerClick = (item) => {
-    if(item.type_jpath==1){
+    if (item.type_jpath == 1) {
+      const connector = item.jpath.includes("?") ? "&" : "?";
       Taro.navigateTo({
-        url: `${item.jpath}?isBanner=true`
-      })
+        url: `${item.jpath}${connector}isBanner=true`,
+      });
     }
   };
   // 修改 tab 切换处理函数
@@ -66,9 +68,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 元素");
@@ -78,7 +80,16 @@ export default class Index extends Component {
     );
   }
   componentDidShow() {
-    this.getHomeData(); //获取首页数据
+    this.setState(
+      {
+        page: 1,
+        totalPages: 1,
+        loading: false,
+      },
+      () => {
+        this.getHomeData(); //获取首页数据
+      }
+    );
   }
   // 添加回到顶部方法
   handleBackTop = () => {
@@ -165,16 +176,21 @@ 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}
-                      mode="aspectFill"
+                      mode="widthFix"
                     />
                   </SwiperItem>
                 ))}

src/pages/index/index.less

@@ -61,7 +61,13 @@
       .at-tabs__header::-webkit-scrollbar {
         display: none; /* 隐藏滚动条 */
       }
-
+      scroll-view ::-webkit-scrollbar {
+        appearance: none;
+        color: transparent;
+        display: none;
+        width: 0;
+        height: 0;
+      }
       .at-tabs__item {
         color: #000;
         font-size: 26px;
@@ -132,7 +138,10 @@
       }
     }
   }
-
+  // 商品列表
+  .product-list-wrap {
+    margin-top: 0;
+  }
   // 添加浮动按钮样式
   .float-buttons {
     position: fixed;

src/pages/indexSub/activity/index.config.js

@@ -0,0 +1,4 @@
+export default definePageConfig({
+  navigationBarTitleText: '',
+  navigationStyle: 'custom',
+})

src/pages/indexSub/activity/index.jsx

@@ -0,0 +1,320 @@
+import { Component } from "react";
+import { View, Image, Text, ScrollView } from "@tarojs/components";
+import { AtTabs, AtActivityIndicator } from "taro-ui";
+import "./index.less";
+import Taro from "@tarojs/taro";
+import {
+  getNewYearTab,
+  getNewYearProductList,
+} from "../../../service/activity";
+import { handleLog } from "../../../common/track";
+export default class Index extends Component {
+  state = {
+    current: 0,
+    page: 1, //页数
+    loading: false, //加载状态
+    totalPages: 1, // 添加总页数
+    tabList: [], //tab列表
+    productList: [], //商品列表
+    isShare: false, // 是否是分享跳转
+    isShowBack: false, // 是否显示返回按钮
+  };
+  componentDidMount() {
+    const { isShare, isShowBack, shareUserId } =
+      Taro.getCurrentInstance().router.params || "";
+    this.setState(
+      {
+        isShare: isShare || false,
+        isShowBack: isShowBack || false,
+        shareUserId: shareUserId || "",
+      },
+      () => {
+        if (isShare) {
+          Taro.hideHomeButton(); //隐藏返回首页
+        }
+        this.getTab(); //获取tab
+        handleLog({
+          event_type: this.state.isShare
+            ? "share_to_activity"
+            : "click_to_activity",
+          event_type_title: this.state.isShare
+            ? "从分享链接进入春节活动页"
+            : "直接点击进入春节活动页",
+          goods_id: 0,
+        }); //埋点
+      }
+    );
+  }
+  // 获取tab
+  getTab = async () => {
+    const res = await getNewYearTab();
+    const arr = [];
+    res.forEach((item) => {
+      arr.push({ title: item.title, id: item.id, name: item.name });
+    });
+    this.setState({ tabList: arr }, () => {
+      this.getProductList(true);
+    });
+  };
+  // 获取商品列表
+  getProductList = async (isRefresh = false) => {
+    const { page } = this.state;
+    this.setState({ loading: true });
+
+    const res = await getNewYearProductList({
+      tag_id: this.state.tabList[this.state.current].id,
+      page,
+      page_size: 10,
+    });
+
+    this.setState((prevState) => ({
+      productList: isRefresh
+        ? res.goods_list
+        : [...prevState.productList, ...res.goods_list],
+      totalPages: res.total_pages,
+      loading: false,
+    }));
+  };
+  // 返回
+  handleBack = () => {
+    Taro.navigateBack();
+  };
+  // 专场点击
+  siteClick = (title, index) => {
+    const item = this.state.tabList.find((item) => item.name === title);
+    const id = item ? item.id : "";
+    Taro.navigateTo({
+      url: `/pages/indexSub/seckillIndex/index?id=${id}&&title=${title}&&isShowBack=${this.state.isShowBack}&&isShare=${this.state.isShare}&&isDirect=true`,
+    });
+  };
+  // 切换tab
+  tabClick = (index) => {
+    this.setState(
+      {
+        current: index,
+        page: 1,
+        productList: [],
+        isLoading: false,
+      },
+      () => {
+        this.getProductList(true);
+      }
+    );
+  };
+  // 商品详情
+  handleProductDetail = (product) => {
+    Taro.navigateTo({
+      url: `/pages/indexSub/productDetail/index?id=${product.id}&&isShare=${this.state.isShare}&&isShowBack=${this.state.isShowBack}`,
+    });
+  };
+  // 滚动到底部
+  handleScrollToLower = () => {
+    const { page, totalPages, loading } = this.state;
+    if (page < totalPages && !loading) {
+      this.setState(
+        (prevState) => ({ page: prevState.page + 1 }),
+        () => this.getProductList()
+      );
+    }
+  };
+  // 配置分享内容
+  onShareAppMessage() {
+    let shareUserId = "";
+    if (Taro.getStorageSync("loginInfo")) {
+      shareUserId = Taro.getStorageSync("loginInfo").id;
+    }
+    return {
+      title: "新春活动",
+      path: `/pages/indexSub/activity/index?isShare=true&&isShowBack=true&&shareUserId=${shareUserId}`,
+      imageUrl: "",
+    };
+  }
+  render() {
+    return (
+      <View className="index">
+        {/* 返回按钮 */}
+        {!this.state.isShare && (
+          <Image
+            onClick={this.handleBack}
+            style={{ top: Taro.navigationBarHeight + "px" }}
+            className="top-back"
+            src="https://yushi.tos-cn-beijing.volces.com/activity/back.png"
+            mode="widthFix"
+          />
+        )}
+        {/* 顶部图片包裹盒子 */}
+        <View className="top-img-wrap">
+          <Image
+            className="top-img"
+            src="https://yushi.tos-cn-beijing.volces.com/activity/topImg.png"
+            mode="widthFix"
+          />
+          <Image
+            className="top-title-img"
+            src="https://yushi.tos-cn-beijing.volces.com/activity/titleImgOne.png"
+            mode="widthFix"
+          />
+        </View>
+        {/* 专场 */}
+        {this.state.tabList.length > 0 && (
+          <View className="activity-wrap">
+            <View className="topBox">
+              <View
+                className="item"
+                onClick={() => {
+                  this.siteClick("下午茶专场", "0");
+                }}
+              >
+                <View className="item-title">下午茶专场</View>
+                <Image
+                  className="item-img"
+                  src="https://yushi.tos-cn-beijing.volces.com/activity/topOne.png"
+                  mode="widthFix"
+                />
+                <View className="item-text">点击进入</View>
+              </View>
+              <View
+                className="item"
+                onClick={() => {
+                  this.siteClick("餐饮美食专场", "1");
+                }}
+              >
+                <View className="item-title">餐饮美食专场</View>
+                <Image
+                  className="item-img"
+                  src="https://yushi.tos-cn-beijing.volces.com/activity/topTwo.png"
+                  mode="widthFix"
+                />
+                <View className="item-text">点击进入</View>
+              </View>
+            </View>
+            <View className="centerBox">
+              <View
+                className="item"
+                onClick={() => {
+                  this.siteClick("酒店出行专场", "2");
+                }}
+              >
+                <View className="item-title">酒店出行专场</View>
+                <Image
+                  className="item-img"
+                  src="https://yushi.tos-cn-beijing.volces.com/activity/centerOne.png"
+                  mode="widthFix"
+                />
+                <View className="item-text">点击进入</View>
+              </View>
+              <View
+                className="item"
+                onClick={() => {
+                  this.siteClick("清洗服务专场", "3");
+                }}
+              >
+                <View className="item-title">清洗服务专场</View>
+                <Image
+                  className="item-img"
+                  src="https://yushi.tos-cn-beijing.volces.com/activity/centerTwo.png"
+                  mode="widthFix"
+                />
+                <View className="item-text">点击进入</View>
+              </View>
+              <View
+                className="item"
+                onClick={() => {
+                  this.siteClick("游玩娱乐专场", "4");
+                }}
+              >
+                <View className="item-title">游玩娱乐专场</View>
+                <Image
+                  className="item-img"
+                  src="https://yushi.tos-cn-beijing.volces.com/activity/centerThree.png"
+                  mode="widthFix"
+                />
+                <View className="item-text">点击进入</View>
+              </View>
+            </View>
+            <View className="bottomBox">
+              <View
+                className="item"
+                onClick={() => {
+                  this.siteClick("咖啡专场", "5");
+                }}
+              >
+                <View className="item-title">咖啡专场</View>
+                <Image
+                  className="item-img"
+                  src="https://yushi.tos-cn-beijing.volces.com/activity/bottom.png"
+                  mode="widthFix"
+                />
+                <View className="item-text">点击进入</View>
+              </View>
+            </View>
+          </View>
+        )}
+        <Image
+          className="bottom-title-img"
+          src="https://yushi.tos-cn-beijing.volces.com/activity/titleImgTwo.png"
+          mode="widthFix"
+        />
+        {/* 商品列表盒子 */}
+        <View className="product-list-wrap">
+          {/* tab分类 */}
+          <View className="tabs-list">
+            <AtTabs
+              current={this.state.current}
+              scroll
+              tabList={this.state.tabList}
+              onClick={this.tabClick}
+            />
+          </View>
+          <ScrollView
+            onScrollToLower={this.handleScrollToLower}
+            className="product-list"
+            scrollY
+          >
+            <View className="product-list-container">
+              {this.state.productList.map((product) => (
+                <View
+                  onClick={() => this.handleProductDetail(product)}
+                  key={product.id}
+                  className="product-list-item"
+                >
+                  <Image
+                    className="product-img"
+                    src={product.image_url}
+                    mode="aspectFill"
+                  />
+                  <View className="product-content">
+                    <Text className="product-title">{product.item_title}</Text>
+                    <View className="product-price">
+                      <View className="product-price-left">
+                        <Text className="product-price-text">到手价</Text>
+                        <Text className="product-price-text-price">
+                          ¥{product.reserve_price}
+                        </Text>
+                      </View>
+                      <View className="product-commission">
+                        <Text className="product-commission-text">
+                          赚¥{product.estimated_commission_promotion}
+                        </Text>
+                      </View>
+                    </View>
+                  </View>
+                </View>
+              ))}
+              {this.state.loading && (
+                <View className="loading">
+                  <AtActivityIndicator
+                    content="加载中..."
+                    isOpened={this.state.loading}
+                    mode="center"
+                    color="#fff"
+                  />
+                </View>
+              )}
+            </View>
+          </ScrollView>
+        </View>
+      </View>
+    );
+  }
+}

src/pages/indexSub/activity/index.less

@@ -0,0 +1,287 @@
+.index {
+    width: 100%;
+    min-height: 100vh;
+    background: linear-gradient(90deg, #FE5F3B 0%, #F51C1C 52%, #FE5F3B 99%);
+    padding-bottom: 33px;
+
+    .top-back {
+        position: fixed;
+        left: 22px;
+        width: 64px;
+        height: 64px;
+        z-index: 1000;
+    }
+
+    // 顶部图片包裹盒子
+    .top-img-wrap {
+        position: relative;
+
+        .top-img {
+            width: 100%;
+        }
+
+        .top-title-img {
+            position: absolute;
+            bottom: 0;
+            left: 50%;
+            transform: translateX(-50%);
+            width: 542px;
+            height: 105px;
+        }
+    }
+
+    // 专场盒子
+    .activity-wrap {
+        margin: 0 13px;
+        width: 724px;
+        height: 1007px;
+        background: url('https://yushi.tos-cn-beijing.volces.com/activity/activeWrap.png') no-repeat center center;
+        background-size: 100% 100%;
+        padding: 44px 30px 0 36px;
+        box-sizing: border-box;
+
+        .topBox,
+        .centerBox,
+        .bottomBox {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+
+            .item {
+                position: relative;
+                width: 320px;
+                height: 276px;
+
+                .item-title {
+                    font-weight: 700;
+                    font-size: 24px;
+                    color: #FF4A00;
+                    position: absolute;
+                    top: 24px;
+                    left: 50%;
+                    transform: translateX(-50%);
+                    white-space: nowrap;
+                }
+
+                .item-img {
+                    width: 100%;
+                }
+
+                .item-text {
+                    position: absolute;
+                    font-size: 20px;
+                    color: #FFFFFF;
+                    line-height: 29px;
+                    bottom: 11px;
+                    left: 50%;
+                    transform: translateX(-50%);
+                }
+            }
+        }
+
+        .centerBox {
+            margin-top: 20px;
+
+            .item {
+                width: 206px;
+                height: 298px;
+            }
+
+            .item-text {
+                bottom: 10px !important;
+            }
+        }
+
+        .bottomBox {
+            margin-top: 24px;
+
+            .item {
+                width: 100%;
+                height: 274px;
+            }
+
+            .item-text {
+                bottom: 5px;
+            }
+        }
+    }
+
+    .bottom-title-img {
+        width: 542px;
+        height: 105px;
+        margin: 24px 104px 0 104px;
+    }
+
+    // 商品列表盒子
+    .product-list-wrap {
+        margin: 0 16px;
+        width: 718px;
+        min-height: 1110px;
+        background: url('https://yushi.tos-cn-beijing.volces.com/activity/productListBg.png') no-repeat center center;
+        background-size: 100% 100%;
+        padding: 30px 20px 47px 27px;
+        box-sizing: border-box;
+
+        // tab分类
+        .tabs-list {
+            box-sizing: border-box;
+            padding: 0 34px;
+            display: flex;
+            overflow: hidden;
+
+            .at-tabs__header {
+                background-color: transparent;
+                height: 100%;
+                text-align: left;
+            }
+
+            .at-tabs__header::-webkit-scrollbar {
+                display: none;
+                /* 隐藏滚动条 */
+            }
+
+            scroll-view ::-webkit-scrollbar {
+                appearance: none;
+                color: transparent;
+                display: none;
+                width: 0;
+                height: 0;
+            }
+
+            .at-tabs__item {
+                color: #FFE1BA;
+                font-size: 26px;
+                padding: 0;
+                min-width: auto;
+                width: auto;
+                margin-right: 34px;
+                padding-bottom: 12px;
+                height: 100%;
+                line-height: 41px;
+
+                &--active {
+                    color: #fff;
+                    font-size: 28px;
+                    font-weight: bold;
+
+                    .at-tabs__item-underline {
+                        display: block;
+                        background-color: #fdd315;
+                        height: 8px;
+                        border-radius: 8px 8px 0 0;
+                        bottom: 0;
+                        width: 42px;
+                        left: 50%;
+                        transform: translateX(-50%);
+                    }
+                }
+
+                &:last-child {
+                    margin-right: 0;
+                }
+            }
+
+            .at-tabs__item-underline {
+                display: none;
+            }
+
+            .at-tabs__underline {
+                width: auto;
+            }
+        }
+
+        // 商品列表
+        .product-list {
+            margin-top: 24px;
+            height: 1000px;
+
+            .product-list-container {
+                display: flex;
+                flex-wrap: wrap;
+                justify-content: space-between;
+
+                .product-list-item {
+                    width: 331px;
+                    height: 493px;
+                    background: url('https://yushi.tos-cn-beijing.volces.com/activity/productImg.png') no-repeat center center;
+                    background-size: contain;
+                    margin-bottom: 7px;
+                    padding: 6px 20px 52px 11px;
+                    box-sizing: border-box;
+                    display: flex;
+                    flex-direction: column;
+
+                    .product-img {
+                        width: 100%;
+                        height: 262px;
+                        border-radius: 38px;
+                    }
+
+                    .product-content {
+                        margin-top: 10px;
+                        flex: 1;
+                        padding: 0 6px 0 25px;
+                        box-sizing: border-box;
+                        display: flex;
+                        flex-direction: column;
+                        justify-content: space-between;
+
+                        .product-title {
+                            font-weight: 700;
+                            font-size: 26px;
+                            color: #000000;
+                            line-height: 38px;
+                            height: 72px;
+                            display: -webkit-box;
+                            -webkit-box-orient: vertical;
+                            -webkit-line-clamp: 2;
+                            overflow: hidden;
+                            text-overflow: ellipsis;
+                        }
+
+                        .product-price {
+                            display: flex;
+                            align-items: center;
+                            justify-content: space-between;
+                            align-items: flex-end;
+
+                            .product-price-left {
+                                display: flex;
+                                flex-direction: column;
+                                font-weight: 700;
+                                font-size: 16px;
+                                color: #FD5608;
+                                line-height: 21px;
+
+                                .product-price-text-price {
+                                    font-size: 30px;
+                                    margin-top: 12px;
+                                }
+                            }
+                            .product-commission {
+                                text-align: center;
+                                line-height: 52px;
+                                width: 125px;
+                                height: 52px;
+                                border-radius: 30px;
+                                font-size: 26px;
+                                color: #FFFFFF;
+                                background: url('https://yushi.tos-cn-beijing.volces.com/activity/btn.png') no-repeat center center;
+                                background-size: 100% 100%;
+                            }
+                        }
+                    }
+                }
+                .loading {
+                    width: 100%;
+                    position: relative;
+                    height: 60px;
+                    .at-activity-indicator__content{
+                        color: #fff;
+                    }
+                  }
+            }
+
+        }
+    }
+}

src/pages/indexSub/highCommission/index.jsx

@@ -2,7 +2,6 @@ import { Component } from "react";
 import { View, Image } from "@tarojs/components";
 import "./index.less";
 import Taro from "@tarojs/taro";
-import seckillImg from "../../../images/seckill/heighTop.jpg";
 import ProductList from "../../../components/index/ProductList";
 import { getRecommendProductList, addLog } from "../../../service";
 import { getShareContent } from "../../../common/share";
@@ -121,7 +120,7 @@ export default class Index extends Component {
   render() {
     return (
       <View className="index">
-        <Image className="seckill" src={seckillImg} mode="aspectFill" />
+        {/* <Image className="seckill" src={seckillImg} mode="aspectFill" /> */}
         {/* 商品列表 */}
         <View className="product-list">
           <ProductList

src/pages/indexSub/productDetail/index.jsx

@@ -7,9 +7,8 @@ import {
   getProductPromotion,
   getShareJump,
   bindShareJump,
-  addLog,
 } from "../../../service";
-import { formatDate } from "../../../common/time";
+import { handleLog } from "../../../common/track";
 import { isDebounce } from "../../../common/debounce";
 import "./index.less";
 import Taro from "@tarojs/taro";
@@ -30,11 +29,12 @@ export default class Index extends Component {
     productDetail: [], //商品详情
     productLikeList: [], //推荐商品列表
     productPromotion: [], //商品推广转链
-    isHighCommission: false, //是否是高佣金页面
-    isSeckill: false, //是否是秒杀页面
+    isSeckill: false, //是否是专项区域页面
+    tagTitle: "", //专项跳转标题
     shareJump: "", //分享跳转标识
     shareTitle: "", //分享标题
     shareUserId: "", //分享用户id
+    isShowBack: false, //是否显示返回
   };
   // 获取产品详情的方法
   fetchProductDetails = async (id) => {
@@ -68,18 +68,29 @@ export default class Index extends Component {
     Taro.hideShareMenu({
       menus: ["shareAppMessage", "shareTimeline"],
     });
-    const { id, isShare, isHighCommission, isSeckill, shareJump, shareUserId } =
-      Taro.getCurrentInstance().router.params;
+    let {
+      id,
+      isShare,
+      isSeckill,
+      shareJump,
+      shareUserId,
+      tagTitle,
+      shareType,
+      isShowBack,
+      share_unique_value
+    } = Taro.getCurrentInstance().router.params;
+    shareJump = shareJump || share_unique_value
     let session_key = Taro.getStorageSync("session_key");
     let userInfo = Taro.getStorageSync("userInfo");
     let isShowSign = Taro.getStorageSync("isShowSign");
     this.setState(
       {
         id,
-        isShare,
-        isHighCommission: isHighCommission === "true",
+        isShare: isShare === "true",
         isSeckill: isSeckill === "true",
         shareUserId: shareUserId,
+        tagTitle: tagTitle,
+        isShowBack: isShowBack === "true" || false,
       },
       () => {
         // 获取分享跳转标识
@@ -88,27 +99,39 @@ export default class Index extends Component {
             key: "shareJump",
             data: shareJump,
           });
+        shareType &&
+          Taro.setStorage({
+            key: "shareType",
+            data: shareType,
+          });
         this.fetchProductDetails(id); //获取产品详情
         this.getProductLikeList(); //获取猜你喜欢列表
         if (session_key && shareJump) {
           this.bindShareJump(); //绑定分享跳转标识
         }
-        if (this.state.isHighCommission || this.state.isSeckill) {
-          this.handleLog("direct_to_product"); //埋点
+        // 埋点
+        if (this.state.isSeckill) {
+          handleLog({
+            event_type: "direct_to_product",
+            event_type_title: "进入商品详情页",
+            goods_id: Number(this.state.id),
+            shareUserId: this.state.shareUserId,
+          }); //埋点
+        }
+        // 判断是否显示签约弹窗
+        if (
+          session_key &&
+          isShowSign !== false &&
+          userInfo &&
+          userInfo.user_identity == 0 &&
+          !this.state.isShare
+        ) {
+          this.setState({
+            isOpened: "sign",
+          });
         }
       }
     );
-    // 判断是否显示签约弹窗
-    if (
-      session_key &&
-      isShowSign !== false &&
-      userInfo &&
-      userInfo.user_identity == 0
-    ) {
-      this.setState({
-        isOpened: "sign",
-      });
-    }
   }
   // 复制商品编号
   handleCopy = (text) => {
@@ -139,50 +162,6 @@ export default class Index extends Component {
       isOpened: "self",
     });
   };
-  // 埋点
-  handleLog = (event_type) => {
-    if (!isDebounce(500)) return; // 如果在300ms内重复触发，直接返回
-    if (this.state.isHighCommission || this.state.isSeckill) {
-      const dayid = formatDate(new Date(), "YYYY-MM-DD");
-      const event_type_title =
-        event_type == "share_product_link"
-          ? "点击分享赚"
-          : event_type == "direct_to_product"
-          ? "进入商品详情页"
-          : "进入商品详情页";
-      let userId = "";
-      if (Taro.getStorageSync("loginInfo")) {
-        userId = Taro.getStorageSync("loginInfo").id;
-      }
-      // 构建ext对象，包含share_id
-      let ext = "";
-      if (this.state.shareUserId) {
-        ext = JSON.stringify({
-          share_users_id: this.state.shareUserId,
-        });
-      }
-      addLog({
-        users_id: userId || 0,
-        goods_id: Number(this.state.id),
-        event_type_title,
-        event_type,
-        dayid,
-        ext,
-      });
-    }
-  };
-  // 分享
-  openSharePopup = async () => {
-    const res = await getShareJump({
-      share_type: 1,
-      share_id: this.state.id,
-    });
-    this.setState({
-      shareJump: res.share_unique_value,
-      isOpened: "share",
-    });
-    this.handleLog("share_product_link"); //埋点
-  };
   // 绑定分享跳转标识
   bindShareJump = async () => {
     let shareJump = Taro.getStorageSync("shareJump");
@@ -191,21 +170,56 @@ export default class Index extends Component {
       share_unique_value: shareJump,
     });
     Taro.removeStorageSync("shareJump");
+    Taro.removeStorageSync("shareType");
   };
-  // 设置分享标题
-  handleShareTitleChange = (newTitle) => {
-    this.setState({
-      shareTitle: newTitle,
+  // 分享
+  openSharePopup = async () => {
+    if (!isDebounce(500)) return; // 如果在500ms内重复触发，直接返回
+    let shareUserId = "";
+    if (Taro.getStorageSync("loginInfo")) {
+      shareUserId = Taro.getStorageSync("loginInfo").id;
+    }
+    // 使用 encodeURIComponent 编码商品详情数据
+    const encodedProductDetail = encodeURIComponent(
+      JSON.stringify(this.state.productDetail)
+    );
+    Taro.navigateTo({
+      url: `/pages/indexSub/sharePage/index?isSeckill=${this.state.isSeckill}&tagTitle=${this.state.tagTitle}&productDetail=${encodedProductDetail}&shareUserId=${shareUserId}`,
     });
+    // 埋点
+    if (this.state.isSeckill) {
+      handleLog({
+        event_type: "share_product_link",
+        event_type_title: "点击分享赚",
+        goods_id: Number(this.state.id),
+        shareUserId: this.state.shareUserId,
+      });
+    }
+    // return
+    // const res = await getShareJump({
+    //   share_type: 1,
+    //   share_id: this.state.id,
+    // });
+    // this.setState({
+    //   shareJump: res.share_unique_value,
+    //   isOpened: "share",
+    // });
+    // 埋点
   };
+  // 设置分享标题
+  // handleShareTitleChange = (newTitle) => {
+  //   this.setState({
+  //     shareTitle: newTitle,
+  //   });
+  // };
   // 配置分享内容
-  onShareAppMessage() {
-    return {
-      title: this.state.shareTitle || this.state.productDetail.item_title,
-      path: `/pages/indexSub/productDetail/index?id=${this.state.id}&&isShare=true&&isHighCommission=${this.state.isHighCommission}&&isSeckill=${this.state.isSeckill}&&shareJump=${this.state.shareJump}`,
-      imageUrl: this.state.productDetail.images[0].img,
-    };
-  }
+  // onShareAppMessage() {
+  //   return {
+  //     title: this.state.shareTitle || this.state.productDetail.item_title,
+  //     path: `/pages/indexSub/productDetail/index?id=${this.state.id}&&isShare=true&&isSeckill=${this.state.isSeckill}&&shareJump=${this.state.shareJump}&&tagTitle=${this.state.tagTitle}&&shareType=1`,
+  //     imageUrl: this.state.productDetail.images[0].img,
+  //   };
+  // }
   // 添加返回方法
   handleBack = () => {
     const pages = Taro.getCurrentPages();
@@ -218,7 +232,7 @@ export default class Index extends Component {
     }
   };
   render() {
-    const { productDetail } = this.state;
+    const { productDetail, tagTitle } = this.state;
     return (
       <View
         className="index"
@@ -229,6 +243,11 @@ export default class Index extends Component {
             <AtIcon value="chevron-left" size="24" color="#999999"></AtIcon>
           </View>
         )}
+        {this.state.isShowBack && (
+          <View className="back-btn" onClick={this.handleBack}>
+            <AtIcon value="chevron-left" size="24" color="#999999"></AtIcon>
+          </View>
+        )}
         {/* 轮播图 */}
         <Swiper className="swiper" autoplay circular>
           {productDetail.images &&
@@ -247,11 +266,7 @@ export default class Index extends Component {
           {/* 商品名称 */}
           <Text className="product-name">
             <Text className="self-tag">
-              {this.state.isHighCommission
-                ? "高佣专项"
-                : this.state.isSeckill
-                ? "鱼市秒杀"
-                : "自营"}
+              {this.state.isSeckill ? tagTitle : "自营"}
             </Text>
             {productDetail.item_title}
           </Text>
@@ -271,11 +286,13 @@ export default class Index extends Component {
               )}
             </View>
             {/* 标签区域 */}
-            <View className="tag-box">
-              <Text className="tag">
-                分享赚￥{productDetail.estimated_commission}
-              </Text>
-            </View>
+            {!this.state.isShare && (
+              <View className="tag-box">
+                <Text className="tag">
+                  分享赚￥{productDetail.estimated_commission_promotion}
+                </Text>
+              </View>
+            )}
           </View>
 
           {/* 分割线 */}
@@ -288,7 +305,7 @@ export default class Index extends Component {
             </Text>
             <Text
               className="copy-btn"
-              onClick={() => this.handleCopy("123456")}
+              onClick={() => this.handleCopy(productDetail.goods_number)}
             >
               复制
             </Text>
@@ -309,6 +326,13 @@ export default class Index extends Component {
             <Text className="tag-text">无忧售后</Text>
           </View>
         </View>
+        {/* 产品详情 */}
+        <View className="product-detail">
+          <View className="title">商品描述</View>
+          {productDetail.item_desc && (
+            <Text className="content">{productDetail.item_desc}</Text>
+          )}
+        </View>
         {/* 猜你喜欢 */}
         <View className="guess-you-like">
           <Image src={like} mode="aspectFit" />
@@ -317,15 +341,24 @@ export default class Index extends Component {
         {/* 猜你喜欢产品列表 */}
         <View className="product-card-list">
           {this.state.productLikeList.map((product) => (
-            <ProductCard key={product.id} product={product} />
+            <ProductCard
+              key={product.id}
+              product={product}
+              isShowBack={this.state.isShowBack}
+              isShare={this.state.isShare}
+            />
           ))}
         </View>
         {/* 底部购买模块 */}
-        <View className="bottom-buy">
-          <View onClick={this.handleToHome} className="bottom-buy-left">
-            <Image src={home} mode="aspectFit" />
-            <Text className="bottom-buy-text">首页</Text>
-          </View>
+        <View
+          className={`bottom-buy ${this.state.isShare ? "share-active" : ""}`}
+        >
+          {!this.state.isShare && (
+            <View onClick={this.handleToHome} className="bottom-buy-left">
+              <Image src={home} mode="aspectFit" />
+              <Text className="bottom-buy-text">首页</Text>
+            </View>
+          )}
           <View className="bottom-buy-right">
             {!this.state.isShare ? (
               <>
@@ -368,11 +401,10 @@ export default class Index extends Component {
           linkText={this.state.productPromotion.short_tpwd}
           id={this.state.id}
           shareUserId={this.state.shareUserId}
-          isHighCommission={this.state.isHighCommission}
           isSeckill={this.state.isSeckill}
         />
         {/* 分享弹窗 */}
-        {this.state.isOpened == "share" && (
+        {/* {this.state.isOpened == "share" && (
           <ShareModal
             onClose={() => {
               this.setState({
@@ -384,7 +416,7 @@ export default class Index extends Component {
             product={this.state.productDetail}
             onShareTitleChange={this.handleShareTitleChange}
           />
-        )}
+        )} */}
         {/* 签约弹窗 */}
         <SignModal
           isOpened={this.state.isOpened == "sign"}

src/pages/indexSub/productDetail/index.less

@@ -126,7 +126,22 @@
             }
         }
     }
-
+    // 产品详情
+    .product-detail {
+        margin: 20px 16px 0 16px;
+        padding: 22px 17px;
+        box-sizing: border-box;
+        background-color: #fff;
+        border-radius: 20px;
+        .title {
+            font-size: 32px;
+            line-height: 40px;
+            color: #000000;
+            font-weight: 700;
+            text-align: center;
+            width: 100%;
+        }
+    }
     //   猜你喜欢
     .guess-you-like {
         display: flex;
@@ -150,7 +165,10 @@
             font-weight: 500;
         }
     }
-
+    .share-active{
+        justify-content: center !important;
+        align-items: center !important;
+    }
     // 底部购买模块
     .bottom-buy {
         width: 100%;

src/pages/indexSub/seckillIndex/index.config.js

@@ -1,3 +1,3 @@
 export default definePageConfig({
-  navigationBarTitleText: '鱼市秒杀'
+  navigationBarTitleText: '鱼市专项'
 })

src/pages/indexSub/seckillIndex/index.jsx

@@ -2,13 +2,18 @@ import { Component } from "react";
 import { View, Image } from "@tarojs/components";
 import "./index.less";
 import Taro from "@tarojs/taro";
-import seckillImg from "../../../images/seckill/seckillTop.jpg";
 import ProductList from "../../../components/index/ProductList";
-import { getRecommendProductList, addLog } from "../../../service";
-import { formatDate } from "../../../common/time";
+import {
+  getRecommendProductList,
+  getShareJump,
+  bindShareJump,
+} from "../../../service";
+import { handleLog } from "../../../common/track";
 import { getShareContent } from "../../../common/share";
 export default class Index extends Component {
   state = {
+    title: "", // 页面标题
+    id: "", // 页面类型id
     productList: [], //推荐商品列表
     page: 1, //页数
     loading: false, //加载状态
@@ -18,30 +23,66 @@ export default class Index extends Component {
     isBanner: false, // 是否是banner跳转
     isShare: false, // 是否是分享跳转
     shareUserId: "", // 分享用户id
+    img: "", // 图片
+    isShowBack: false, // 是否显示返回
   };
   componentDidMount() {
-    const { isDirect, isBanner, isShare, shareUserId } =
+    const { isDirect, isBanner, isShare, shareUserId, title, id, shareJump,shareType,isShowBack } =
       Taro.getCurrentInstance().router.params || "";
+    let session_key = Taro.getStorageSync("session_key");
     this.setState(
       {
         isDirect: isDirect || false,
         isBanner: isBanner || false,
-        isShare: isShare || false,
+        isShare: isShare === "true" || false,
         shareUserId: shareUserId || "",
+        title: title || "",
+        id: id || "",
+        isShowBack: isShowBack === "true" || false,
       },
       () => {
-        this.handleLog(
-          isDirect
-            ? "direct_to_fish_seckill"
+        // 设置页面标题
+        Taro.setNavigationBarTitle({
+          title: this.state.title || "鱼市",
+        });
+        if (isShare) {
+          Taro.hideHomeButton();//隐藏返回首页
+        }
+        handleLog({
+          event_type: isDirect
+            ? `direct_to_${this.state.id}_${this.state.title}`
             : isBanner
-            ? "banner_to_fish_seckill"
+            ? `banner_to_${this.state.id}_${this.state.title}`
             : isShare
-            ? "share_to_fish_seckill"
-            : "direct_to_fish_seckill"
-        );
+            ? `share_to_${this.state.id}_${this.state.title}`
+            : `direct_to_${this.state.id}_${this.state.title}`,
+          event_type_title: isDirect
+            ? `直接点击进入${this.state.title}`
+            : isBanner
+            ? `从banner 跳转到${this.state.title}`
+            : isShare
+            ? `从分享链接跳转到${this.state.title}`
+            : `直接点击进入${this.state.title}`,
+          goods_id: 0,
+          shareUserId: this.state.shareUserId,
+        });
+        this.getRecommendProductList();
+        // 获取分享跳转标识
+        shareJump &&
+          Taro.setStorage({
+            key: "shareJump",
+            data: shareJump,
+          });
+        shareType &&
+          Taro.setStorage({
+            key: "shareType",
+            data: shareType,
+          });
+        if (session_key && shareJump) {
+          this.bindShareJump(); //绑定分享跳转标识
+        }
       }
     );
-    this.getRecommendProductList();
   }
   // 获取推荐商品列表
   getRecommendProductList = async () => {
@@ -49,7 +90,7 @@ export default class Index extends Component {
     this.setState({ loading: true });
 
     const res = await getRecommendProductList({
-      tag_id: 120,
+      tag_id: this.state.id,
       page,
       page_size: 10,
     });
@@ -59,38 +100,18 @@ export default class Index extends Component {
       totalPages: res.total_pages,
       loading: false,
       isNoMore: res.total_pages <= page,
+      img: res.img,
     }));
   };
-  // 埋点
-  handleLog = (event_type) => {
-    const dayid = formatDate(new Date(), "YYYY-MM-DD");
-    const event_type_title =
-      event_type == "banner_to_fish_seckill"
-        ? "从banner 跳转到鱼市秒杀"
-        : event_type == "share_to_fish_seckill"
-        ? "从分享链接跳转到鱼市秒杀"
-        : event_type == "direct_to_fish_seckill"
-        ? "直接点击进入鱼市秒杀"
-        : "直接点击进入鱼市秒杀";
-    let userId = "";
-    if (Taro.getStorageSync("loginInfo")) {
-      userId = Taro.getStorageSync("loginInfo").id;
-    }
-    // 构建ext对象，包含share_id
-    let ext = "";
-    if (this.state.shareUserId) {
-      ext = JSON.stringify({
-        share_users_id: this.state.shareUserId,
-      });
-    }
-    addLog({
-      users_id: userId||0,
-      goods_id: 0,
-      event_type_title,
-      event_type,
-      dayid,
-      ext,
+  // 绑定分享跳转标识
+  bindShareJump = async () => {
+    let shareJump = Taro.getStorageSync("shareJump");
+    await bindShareJump({
+      share_type: 3,
+      share_unique_value: shareJump,
     });
+    Taro.removeStorageSync("shareJump");
+    Taro.removeStorageSync("shareType");
   };
   // 配置分享内容
   onShareAppMessage(res) {
@@ -98,13 +119,17 @@ export default class Index extends Component {
     if (Taro.getStorageSync("loginInfo")) {
       shareUserId = Taro.getStorageSync("loginInfo").id;
     }
-    const shareConfig = getShareContent();
     if (res.from == "menu") {
-      return {
-        title: "鱼市秒杀",
-        path: `/pages/indexSub/seckillIndex/index?isShare=true&shareUserId=${shareUserId}`,
-        imageUrl: "",
-      };
+      return getShareJump({
+        share_type: 3,
+        share_id: this.state.id,
+      }).then((res) => {
+        return {
+          title: `${this.state.title}`,
+          path: `/pages/indexSub/seckillIndex/index?isShare=true&shareUserId=${shareUserId}&title=${this.state.title}&id=${this.state.id}&&shareJump=${res.share_unique_value}&&shareType=3&&isShowBack=true`,
+          imageUrl: "",
+        };
+      });
     } else {
       return getShareContent();
     }
@@ -122,7 +147,7 @@ export default class Index extends Component {
   render() {
     return (
       <View className="index">
-        <Image className="seckill" src={seckillImg} mode="aspectFill" />
+        <Image className="seckill" src={this.state.img} mode="widthFix" />
         {/* 商品列表 */}
         <View className="product-list">
           <ProductList
@@ -131,6 +156,9 @@ export default class Index extends Component {
             loading={this.state.loading}
             isNoMore={this.state.isNoMore}
             shareUserId={this.state.shareUserId}
+            tagTitle={this.state.title}
+            isShare={this.state.isShare}
+            isShowBack={this.state.isShowBack}
           />
         </View>
       </View>

src/pages/indexSub/seckillIndex/index.less

@@ -2,12 +2,12 @@
     width: 100%;
     padding-bottom: 40px;
     box-sizing: border-box;
+    background-color: #f9f9f9;
     .seckill{
         width: 100%;
         height: 300px;
-        background-color: yellow;
     }
     .product-list{
-        margin-top: -71px;
+        margin-top: -196px;
     }
 }

src/pages/indexSub/sharePage/index.config.js

@@ -0,0 +1,3 @@
+export default definePageConfig({
+  navigationBarTitleText: '编辑分享内容',
+})

src/pages/indexSub/sharePage/index.jsx

@@ -0,0 +1,279 @@
+import { Component } from "react";
+import { View, Image, Button, Input } from "@tarojs/components";
+import { getShareJump, getProductDetail } from "../../../service/index";
+import Taro from "@tarojs/taro";
+import "./index.less";
+
+export default class Index extends Component {
+  state = {
+    id: "", //商品id(专题列表分享过来的)
+    shareTitle: "", //分享标题
+    productDetail: {}, //商品详情
+    isSeckill: false, //是否是秒杀商品
+    shareJump: "", //分享链接
+    tagTitle: "", //标签标题
+    shareUserId: "", //分享用户id
+    share_scheme_link: "", //分享方案链接
+  };
+  componentDidMount() {
+    Taro.hideShareMenu({
+      menus: ["shareAppMessage", "shareTimeline"],
+    });
+    const { isSeckill, tagTitle, productDetail, shareUserId, id } =
+      Taro.getCurrentInstance().router.params;
+    this.setState(
+      {
+        isSeckill: isSeckill === "true",
+        tagTitle,
+        productDetail: productDetail ? JSON.parse(decodeURIComponent(productDetail)) : {},
+        shareTitle: productDetail ? JSON.parse(decodeURIComponent(productDetail)).item_title : "",
+        shareUserId,
+        id: id,
+      },
+      async () => {
+        Taro.showLoading({
+          title: "加载中...",
+        });
+        try {
+          await Promise.all([
+            this.getProductDetail(id),
+            this.getShareJump(id)
+          ]);
+        } finally {
+          Taro.hideLoading();
+        }
+      }
+    );
+  }
+  // 获取商品详情
+  getProductDetail = async (id='') => {
+    const res = await getProductDetail({
+      goods_id: id||this.state.productDetail.id,
+    });
+    this.setState({
+      productDetail: res,
+      shareTitle: res.item_title,
+    });
+  }
+  // 获取分享跳转标识
+  getShareJump = async (id='') => {
+    // 设置分享路径
+    const share_extend = JSON.stringify({
+      path: `pages/indexSub/productDetail/index?id=${ id||this.state.productDetail.id}&isShare=true&isSeckill=${this.state.isSeckill}&shareType=11&&shareUserId=${this.state.shareUserId}`,
+    });
+    const res = await getShareJump({
+      share_type: 11,
+      share_id: id||this.state.productDetail.id,
+      share_extend,
+    });
+    this.setState({
+      shareJump: res.share_unique_value,
+      share_scheme_link: res.share_scheme_link,
+    });
+  };
+  // 设置分享标题
+  handleShareTitleChange = (newTitle) => {
+    this.setState({
+      shareTitle: newTitle.detail.value,
+    });
+  };
+  // 保存图片到手机
+  handleSaveImage = () => {
+    Taro.getSetting({
+      success: (res) => {
+        if (!res.authSetting["scope.writePhotosAlbum"]) {
+          Taro.authorize({
+            scope: "scope.writePhotosAlbum",
+            success: () => {
+              this.saveImage();
+            },
+            fail: () => {
+              Taro.showModal({
+                title: "提示",
+                content: "需要您授权保存图片到相册",
+                success: (modalRes) => {
+                  if (modalRes.confirm) {
+                    Taro.openSetting();
+                  }
+                },
+              });
+            },
+          });
+        } else {
+          this.saveImage();
+        }
+      },
+    });
+  };
+
+  saveImage = async () => {
+    Taro.showLoading({
+      title: "保存中...",
+    });
+    const { images } = this.state.productDetail;
+    try {
+      for (const image of images) {
+        // 转换图片链接从 http 到 https
+        const imgUrl = image.img.startsWith("http:")
+          ? image.img.replace("http:", "https:")
+          : image.img;
+        // 先获取图片信息
+        const imageInfo = await Taro.getImageInfo({
+          src: imgUrl,
+        });
+        // 使用图片路径保存
+        await Taro.saveImageToPhotosAlbum({
+          filePath: imageInfo.path,
+        });
+      }
+      // 全部保存成功后提示
+      Taro.showToast({
+        title: "所有图片保存成功",
+        icon: "success",
+        duration: 2000,
+      });
+    } catch (error) {
+      Taro.showToast({
+        title: "保存失败",
+        icon: "none",
+        duration: 2000,
+      });
+    }
+  };
+  // 复制全部内容
+  handleCopyAll = () => {
+    Taro.setClipboardData({
+      data: `${this.state.shareTitle}\n${this.state.share_scheme_link}`,
+    });
+  };
+  // 复制标题
+  handleCopyTitle = () => {
+    Taro.setClipboardData({
+      data: this.state.shareTitle,
+      success: () => {
+        Taro.showToast({
+          title: "标题复制成功",
+          icon: "none",
+          duration: 1500,
+        });
+      },
+    });
+  };
+  // 复制链接
+  handleCopyLink = () => {
+    Taro.setClipboardData({
+      data: this.state.share_scheme_link,
+      success: () => {
+        Taro.showToast({
+          title: "链接复制成功",
+          icon: "none",
+          duration: 1500,
+        });
+      },
+    });
+  };
+  // 配置分享内容
+  onShareAppMessage() {
+    return {
+      title: this.state.shareTitle || this.state.productDetail.item_title,
+      path: `/pages/indexSub/productDetail/index?id=${this.state.productDetail.id}&&isShare=true&&isSeckill=${this.state.isSeckill}&&shareJump=${this.state.shareJump}&&tagTitle=${this.state.tagTitle}&&shareType=11&&shareUserId=${this.state.shareUserId}`,
+      imageUrl: this.state.productDetail.images[0].img,
+    };
+  }
+  render() {
+    const { productDetail } = this.state;
+    return (
+      <View className="index">
+        {/* 图片素材盒子 */}
+        <View className="image-box">
+          <View className="image-box-top">
+            <View className="image-box-title">图片素材</View>
+            <View className="image-box-save" onClick={this.handleSaveImage}>
+              保存图片
+            </View>
+          </View>
+          {productDetail.images && (
+            <View className="image-box-content">
+              {this.state.productDetail.images.map((item, index) => (
+                <Image
+                  className="image-box-content-item"
+                  key={index}
+                  src={item.img}
+                  mode="aspectFill"
+                />
+              ))}
+            </View>
+          )}
+        </View>
+        {/* 文案素材盒子 */}
+        <View className="text-box">
+          <View className="text-box-top">
+            <View className="text-box-title">文案素材</View>
+            <View onClick={this.handleCopyAll} className="text-box-save">
+              复制全部内容
+            </View>
+          </View>
+          <View className="text-box-content">
+            {/* 商品标题盒子 */}
+            <View className="text-box-content-title">
+              <View className="text-box-content-title-top">
+                <View className="text-box-content-title-top-title">
+                  商品标题
+                </View>
+                <View
+                  onClick={this.handleCopyTitle}
+                  className="text-box-content-title-top-copy"
+                >
+                  复制标题
+                </View>
+              </View>
+              {/* 分享标题输入框 */}
+              <View className="text-box-content-title-input">
+                <Input
+                  onInput={this.handleShareTitleChange}
+                  className="input"
+                  value={this.state.shareTitle}
+                />
+              </View>
+            </View>
+            {/* 商品链接盒子 */}
+            <View className="text-box-content-link">
+              <View className="text-box-content-link-top">
+                <View className="text-box-content-link-top-title">
+                  商品链接
+                </View>
+              </View>
+              {/* 商品链接 */}
+              <View className="text-box-content-link-bottom">
+                <Input
+                  onInput={this.handleShareTitleChange}
+                  className="linkInput"
+                  value={this.state.share_scheme_link}
+                  disabled
+                />
+                <View className="copy-box">
+                  <View className="copy-box-line"></View>
+                  <Image
+                    onClick={this.handleCopyLink}
+                    className="copy-box-icon"
+                    src="https://yushi.tos-cn-beijing.volces.com/productDetail/copy.png"
+                  />
+                </View>
+              </View>
+            </View>
+          </View>
+        </View>
+        {/* 分享按钮 */}
+        {this.state.shareJump && (
+          <Button
+            className="share-button"
+            openType="share"
+            onClick={this.handleShare}
+          >
+            直接分享商品卡片到聊天框
+          </Button>
+        )}
+      </View>
+    );
+  }
+}

src/pages/indexSub/sharePage/index.less

@@ -0,0 +1,232 @@
+.index {
+    // background: linear-gradient(180deg, #faeb5d 0%, rgba(250, 238, 116, 0) 573px);
+    background-color: #f9f9f9;
+    min-height: 100vh;
+    padding: 30px 16px 0 16px;
+    box-sizing: border-box;
+
+    // 图片素材盒子
+    .image-box {
+        padding: 21px 0 43px 20px;
+        box-sizing: border-box;
+        background-color: #fff;
+        border-radius: 34px;
+
+        // 图片素材盒子顶部
+        .image-box-top {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            margin-bottom: 24px;
+            padding-right: 20px;
+
+            .image-box-title {
+                font-weight: 700;
+                font-size: 32px;
+                color: #000000;
+            }
+
+            .image-box-save {
+                width: 156px;
+                height: 60px;
+                border-radius: 70px;
+                background-color: #FFECCA;
+                color: #F48106;
+                font-size: 24px;
+                line-height: 60px;
+                text-align: center;
+            }
+        }
+
+        // 图片素材盒子内容
+        .image-box-content {
+            display: flex;
+            flex-wrap: nowrap;
+            overflow-x: scroll;
+
+            .image-box-content-item {
+                width: 240px;
+                height: 240px;
+                border-radius: 40px;
+                margin-right: 20px;
+                background-color: #f7f8fa;
+                flex-shrink: 0;
+            }
+        }
+    }
+
+    // 文案素材盒子
+    .text-box {
+        margin-top: 40px;
+
+        .text-box-top {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            margin-bottom: 24px;
+            padding: 0 20px;
+
+            .text-box-title {
+                font-weight: 700;
+                font-size: 32px;
+                color: #000000;
+            }
+
+            .text-box-save {
+                width: 198px;
+                height: 60px;
+                line-height: 60px;
+                text-align: center;
+                border-radius: 70px;
+                background-color: #FFECCA;
+                color: #FF8400;
+                font-size: 26px;
+            }
+        }
+
+        // 文案素材盒子内容
+        .text-box-content {
+            padding: 31px 20px;
+            box-sizing: border-box;
+            background-color: #fff;
+            border-radius: 34px;
+
+            // 商品标题
+            .text-box-content-title {
+                display: flex;
+                flex-direction: column;
+                justify-content: space-between;
+                margin-bottom: 24px;
+
+                .text-box-content-title-top {
+                    width: 100%;
+                    display: flex;
+                    justify-content: space-between;
+                    align-items: center;
+                    padding: 0 22px 0 10px;
+                    box-sizing: border-box;
+
+                    .text-box-content-title-top-title {
+                        font-size: 30px;
+                        color: #333;
+                    }
+
+                    .text-box-content-title-top-copy {
+                        font-size: 24px;
+                        color: #F48106;
+                    }
+                }
+
+                .text-box-content-title-input {
+                    margin-top: 30px;
+                    border: 4px solid #F6C71A;
+                    border-radius: 34px;
+                    overflow: hidden;
+                    .input {
+                        width: 100%;
+                        height: 94px;
+                        border-radius: 34px;
+                        padding-left: 24px;
+                        padding-right: 24px;
+                        font-size: 28px;
+                        color: #999999;
+                        box-sizing: border-box;
+                    }
+                }
+            }
+
+            // 商品链接
+            .text-box-content-link {
+                display: flex;
+                flex-direction: column;
+                justify-content: space-between;
+
+                .text-box-content-link-top {
+                    padding-left: 10px;
+
+                    .text-box-content-link-top-title {
+                        font-size: 30px;
+                        color: #333;
+                    }
+                }
+
+                .text-box-content-link-bottom {
+                    position: relative;
+                    margin-top: 30px;
+
+                    .copy-box {
+                        position: absolute;
+                        right: 19px;
+                        top: 50%;
+                        transform: translateY(-50%);
+                        display: flex;
+                        align-items: center;
+
+                        .copy-box-line {
+                            width: 1px;
+                            height: 54px;
+                            background-color: #FF8119;
+                            margin-right: 39px;
+                        }
+
+                        .copy-box-icon {
+                            width: 34px;
+                            height: 34px;
+                        }
+                    }
+                }
+
+                .linkInput {
+                    width: 100%;
+                    height: 94px;
+                    border-radius: 34px;
+                    border: none;
+                    padding-left: 24px;
+                    padding-right: 110px;
+                    font-size: 28px;
+                    box-sizing: border-box;
+                    color: #999999;
+                    background-color: #f7f8fa;
+                }
+            }
+        }
+    }
+
+    // 清除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;
+        }
+    }
+
+    .share-button {
+        position: fixed;
+        bottom: 30px;
+        left: 50%;
+        transform: translateX(-50%);
+        width: calc(100% - 44px);
+        height: 88px;
+        border-radius: 160px;
+        background-color: #F6C71A;
+        font-weight: 700;
+        font-size: 30px;
+        color: #3D3D3D;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+    }
+}

src/pages/login/index.jsx

@@ -6,7 +6,6 @@ import { login, getUserInfo, bindShareJump } from "../../service";
 import { objToParam } from "../../common/toParams";
 import "./index.less";
 import logo1 from "../../images/logo1.png";
-import loginBg from "../../images/loginBg.png";
 export default class Index extends Component {
   state = {
     isChecked: false,
@@ -28,7 +27,7 @@ export default class Index extends Component {
       url: "/pages/mineSub/userSpecification/index",
     });
   };
-  
+
   // handleGetPhoneNumber = (e) => {
   //   if (e.detail.errMsg === "getPhoneNumber:ok") {
   //     // 处理获取到的手机号信息
@@ -67,34 +66,38 @@ export default class Index extends Component {
           icon: "none",
         });
 
-        // 先处理分享跳转
-        let shareJump = Taro.getStorageSync("shareJump");
-        if (shareJump) {
-          await bindShareJump({
-            share_unique_value: shareJump,
-            share_type: 1,
-          });
-          Taro.removeStorageSync("shareJump");
-          if (global.globalData.optionsData) {
-            delete global.globalData.optionsData.shareJump;
+        // 获取用户信息
+        getUserInfo().then(userInfoRes => {
+          Taro.setStorageSync("userInfo", userInfoRes);
+        });
+        try {
+          // 先处理分享跳转
+          let shareJump = Taro.getStorageSync("shareJump");
+          let shareType = Taro.getStorageSync("shareType");
+          if (shareJump) {
+            await bindShareJump({
+              share_unique_value: shareJump,
+              share_type: shareType || 2,
+            });
+            Taro.removeStorageSync("shareJump");
+            Taro.removeStorageSync("shareType");
+            if (global.globalData.optionsData) {
+              delete global.globalData.optionsData.shareJump;
+              delete global.globalData.optionsData.share_unique_value;
+            }
           }
+        } finally {
+          // 最后处理页面跳转
+          let lastPage = Taro.getStorageSync("currentPage");
+          if (!lastPage || lastPage === "pages/mineSub/login/index") {
+            lastPage = "pages/index/index";
+          }
+          await Taro.reLaunch({
+            url: `/${lastPage}?${objToParam(global.globalData.optionsData)}`,
+          });
+          Taro.removeStorageSync("currentPage");
+          global.globalData.optionsData = {};
         }
-
-        // 再获取用户信息
-        const userInfoRes = await getUserInfo();
-        Taro.setStorageSync("userInfo", userInfoRes);
-
-        // 最后处理页面跳转
-        
-        let lastPage = Taro.getStorageSync("currentPage");
-        if (!lastPage || lastPage === "pages/mineSub/login/index") {
-          lastPage = "pages/index/index";
-        }
-        await Taro.reLaunch({
-          url: `/${lastPage}?${objToParam(global.globalData.optionsData)}`,
-        });
-        Taro.removeStorageSync("currentPage");
-        global.globalData.optionsData = {};
       },
     });
   };
@@ -134,7 +137,7 @@ export default class Index extends Component {
             授权登录
           </Button>
         </View>
-        <Image src={loginBg} className="login-bg" />
+        <Image src='https://yushi.tos-cn-beijing.volces.com/login/loginBg.png' className="login-bg" />
       </View>
     );
   }

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";
@@ -11,18 +11,28 @@ import toDetail from "../../images/member/toDetail.png";
 import warning from "../../images/member/warning.png";
 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: {
-      users: { name: "去登录", icon: avatar },
+      users: { name: "去登录", icon: 'https://yushi.tos-cn-beijing.volces.com/mine/avatar.png',user_identity_translate:0 },//user_identity_translate 0：默认未认证，1：已认证成功，2：认证失败,3：认证中
       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 +40,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 +52,22 @@ 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 +76,44 @@ export default class Index extends Component {
       });
     }
   };
-  componentDidShow () {
+  componentDidShow() {
     if (Taro.getStorageSync("session_key")) {
       this.getVipInfo(); //获取会员首页数据
       this.getWorkerInfo(); //获取签约信息
     }
+    this.getUserAgreement(); //获取会员规则
   }
+  // 我的小店
+  handleShopClick = () => {
+    Taro.navigateTo({
+      url: `/pages/memberSub/storeManagement/index?isManager=${true}`,
+    });
+    Taro.requestSubscribeMessage({
+      tmplIds: ["vAYG7hbNbsD75YHpmGvF8O_Pve_1Q5AvnLBd-2JF9ys"],
+      success: function (res) {
+        console.log(res);
+      },
+    });
+  };
+  // 去我的伙伴
+  handlePartnerClick = () => {
+    Taro.navigateTo({
+      url: `/pages/memberSub/myPartner/index`,
+    });
+    Taro.requestSubscribeMessage({
+      tmplIds: ["vAYG7hbNbsD75YHpmGvF8O_Pve_1Q5AvnLBd-2JF9ys"],
+      success: function (res) {
+        console.log(res);
+      },
+    });
+  };
   // 去订单列表
   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 +129,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 +139,27 @@ 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={() => this.handleShopClick()}
+                className="my-shop"
+              >
+                <Image className="my-shop-icon" src={home} />
+                <View className="my-shop-text">我的小店</View>
+              </View>
             </View>
           </View>
           {/* 预估收益 */}
@@ -116,7 +181,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 +205,21 @@ export default class Index extends Component {
                 <Text className="amount">
                   {`¥ ${vipInfo.draw_money.store_earnings_now}`}
                 </Text>
-                {
-                  !this.state.isAlipay &&
+                {(!this.state.isAlipay || vipInfo.users.user_identity_translate != 1) && (
                   <View className="warning-icon-box">
                     <Image className="warning-icon" src={warning} />
-                    <Text className="warning-text">未完成提现认证</Text>
+                    <Text className="warning-text">{vipInfo.users.user_identity_translate == 2 ? '认证失败' : vipInfo.users.user_identity_translate == 0 ? '未完成提现认证' : '认证中'}</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 +229,36 @@ 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={() => this.handlePartnerClick()}
+                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 +273,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 +291,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> */}
+              <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;
                 }
+
             }
         }
     }   
@@ -354,7 +370,7 @@
             padding: 27px 20px 0 20px;
             box-sizing: border-box;
             display: flex;
-            justify-content: space-between;
+            // justify-content: space-between;
             align-items: center;
             flex-wrap: wrap;
             .order-item {

src/pages/memberSub/Alipay/index.jsx

@@ -21,7 +21,11 @@ export default class Index extends Component {
     isLoading: false, // 是否加载中
     isAlipay: false, // 是否已绑定支付宝
     isBank: false, // 是否已绑定银行卡
-    signImg: "https://video-img.fyshark.com/1735033624483%E5%B7%B2%E7%AD%BE%E7%BA%A6.png", // 签约码
+    status_text: '', // 状态文案
+    status: 0, // 状态 0：默认未认证，1：已认证成功，2：认证失败,3：认证中
+    signImg: "https://yushi.tos-cn-beijing.volces.com/mine/shenhezhong.png", // 审核中签约
+    singnImgFail:'https://yushi.tos-cn-beijing.volces.com/mine/shenheshibai.png',// 审核失败签约
+    signImgSuccess: "https://video-img.fyshark.com/1735033624483%E5%B7%B2%E7%AD%BE%E7%BA%A6.png", // 审核成功签约
   };
 
   componentDidMount () {
@@ -41,7 +45,9 @@ export default class Index extends Component {
             idCardFront: item.portrait_page,
             idCardBack: item.national_emblem_page,
             account: item.bank_no,
-            isAlipay: true
+            isAlipay: true,
+            status_text: item.status_text,
+            status: item.status
           });
         } else {
           this.setState({
@@ -51,7 +57,9 @@ export default class Index extends Component {
             idCardFront: item.portrait_page,
             idCardBack: item.national_emblem_page,
             bankCard: item.bank_no,
-            isBank: true
+            isBank: true,
+            status_text: item.status_text,
+            status: item.status
           });
         }
       });
@@ -227,7 +235,7 @@ export default class Index extends Component {
   }
   // 是否已绑定
   isBind () {
-    return (this.state.isAlipay && this.state.type === 'alipay') || (this.state.isBank && this.state.type === 'bank')
+    return (this.state.isAlipay && this.state.type === 'alipay') || (this.state.isBank && this.state.type === 'bank'&&this.state.status != 2)
   }
   render () {
     return (
@@ -312,12 +320,13 @@ export default class Index extends Component {
           }
         </View>
         {
-          this.isBind() &&
+          (this.isBind() || this.state.status == 2) &&
           <View className="alipay-info-tips">
             <View className="alipay-info-tips-item">
-              <Image src={this.state.signImg} className="alipay-info-tips-item-icon" />
+              <Image src={this.state.status == '1' ? this.state.signImgSuccess : this.state.status == '2' ? this.state.singnImgFail : this.state.signImg} className="alipay-info-tips-item-icon" />
               <View className="alipay-info-tips-item-text">
-                如需更改，请联系客服
+                {/* 如需更改，请联系客服 */}
+                {this.state.status_text}
               </View>
             </View>
           </View>

src/pages/memberSub/earningsDetail/index.jsx

@@ -28,54 +28,61 @@ export default class Index extends Component {
           <View className='earnings-list-item'>
             <View className='item-line title-one'>
               <Text className='title'>今天预估总收益</Text>
-              <Text className='money'>￥{today_data.assess_amount || '0.00'}</Text>
+              <Text className='money'>￥{Number(today_data.assess_amount_text_all)/100 || '0.00'}</Text>
             </View>
             <View className='dotted-line'></View>
             <View className='item-line title-two'>
               <Text className='title'>预估推广收益</Text>
-              <Text className='money'>￥{today_data.assess_amount || '0.00'}</Text>
+              <Text className='money'>￥{Number(today_data.assess_amount_text_promotion)/100 || '0.00'}</Text>
+            </View>
+            <View className='item-line title-two'>
+              <Text className='title'>预估自购收益</Text>
+              <Text className='money'>￥{Number(today_data.assess_amount_text_buy)/100 || '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>
+              <Text className='money'>￥{Number(this_month_data.assess_amount_text_all)/100 || '0.00'}</Text>
             </View>
             <View className='dotted-line'></View>
             <View className='item-line title-two'>
               <Text className='title'>预估推广收益</Text>
-              <Text className='money'>￥{this_month_data.assess_amount || '0.00'}</Text>
+              <Text className='money'>￥{Number(this_month_data.assess_amount_text_promotion)/100 || '0.00'}</Text>
             </View>
-            {/* <View className='line'></View>
             <View className='item-line title-two'>
-              <Text className='title'>预估推广收益</Text>
-              <Text className='money'>￥70.00</Text>
+              <Text className='title'>预估自购收益</Text>
+              <Text className='money'>￥{Number(this_month_data.assess_amount_text_buy)/100 || '0.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>
+              <Text className='money'>￥{Number(last_month_data.assess_amount_text_all)/100 || '0.00'}</Text>
             </View>
             <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>
+              <Text className='money'>￥{Number(last_month_data.assess_amount_text_promotion)/100 || '0.00'}</Text>
+            </View>
+            <View className='item-line title-two'>
+              <Text className='title'>预估自购收益</Text>
+              <Text className='money'>￥{Number(last_month_data.assess_amount_text_buy)/100 || '0.00'}</Text>
             </View>
           </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>
+              <Text className='money'>￥{Number(historical_month_data.assess_amount_text_all)/100 || '0.00'}</Text>
             </View>
             <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>
+              <Text className='money'>￥{Number(historical_month_data.assess_amount_text_promotion)/100 || '0.00'}</Text>
+            </View>
+            <View className='item-line title-two'>
+              <Text className='title'>预估自购收益</Text>
+              <Text className='money'>￥{Number(historical_month_data.assess_amount_text_buy)/100 || '0.00'}</Text>
             </View>
           </View>
         </View>

src/pages/memberSub/earningsOrder/index.jsx

@@ -15,7 +15,7 @@ export default class Index extends Component {
     page: 1, //页数
     loading: false, //加载状态
     totalPages: 1, // 添加总页数
-    isNoMore: false,
+    isNoMore: false, // 是否没有更多
     orderList: [], //订单列表
     userInfo: {}, //个人信息
   };
@@ -193,16 +193,23 @@ export default class Index extends Component {
               <View className="order-info">
                 <View className="order-details">
                   <View className="detail-item">
-                    <Text className="label">订单编号:</Text>
-                    <Text className="value">{item.order_number}</Text>
-                    <Text
-                      className="copy-text"
-                      onClick={() => this.handleCopy(item.order_number)}
-                    >
-                      复制
-                    </Text>
+                    <View className="left">
+                      <Text className="label">订单编号:</Text>
+                      <Text className="value">{item.order_number}</Text>
+                      <Text
+                        className="copy-text"
+                        onClick={() => this.handleCopy(item.order_number)}
+                      >
+                        复制
+                      </Text>
+                    </View>
+                    <View className="right">
+                      <Text className="order-status">
+                        {tabList[item.state + 1].title}
+                      </Text>
+                    </View>
                   </View>
-                  <View className="detail-item">
+                  <View className="detail-item fixWidth">
                     <Text className="label">下单时间:</Text>
                     <Text className="value">{item.pay_time}</Text>
                   </View>
@@ -222,16 +229,17 @@ export default class Index extends Component {
                 />
                 <View className="product-details">
                   <Text className="product-name">{item.item_title}</Text>
-                  <View className="promotion-info">
-                    <View className="tag">预估收入</View>
-                    <Text className="amount">
-                      ¥
-                      {orderType == 2
-                        ? item.assess_amount_text_promotion_yuan
-                        : item.assess_amount_text_buy_yuan}
-                    </Text>
-                  </View>
-                  <View className="payment-info"></View>
+                  {item.state_code != 3 && (
+                    <View className="promotion-info">
+                      <View className="tag">预估收入</View>
+                      <Text className="amount">
+                        ¥
+                        {orderType == 2
+                          ? item.assess_amount_text_promotion_yuan
+                          : item.assess_amount_text_buy_yuan}
+                      </Text>
+                    </View>
+                  )}
                   <View className="payment-info">
                     <Text className="label">实付金额:</Text>
                     <Text className="amount">¥{item.actual_paid_fee}</Text>

src/pages/memberSub/earningsOrder/index.less

@@ -2,6 +2,7 @@
     background-color: #f9f9f9; // ... 其他样式 ...
     min-height: 100vh;
 }
+
 // 订单类型切换
 .order-type-switch {
     display: flex;
@@ -10,6 +11,7 @@
     padding: 20px 134px 10px 134px;
     align-items: center;
     box-sizing: border-box;
+
     .order-type-item {
         font-size: 30px;
         color: #999999;
@@ -18,11 +20,13 @@
         box-sizing: border-box;
         border-radius: 40px;
     }
+
     .order-type-item.active {
         color: #fff;
         background-color: #fa9703;
     }
 }
+
 // tab切换
 .tab-container {
     display: flex;
@@ -31,6 +35,7 @@
     padding: 22px 34px;
     box-sizing: border-box;
     align-items: center;
+
     .tab-item {
         font-size: 26px;
         color: #000000;
@@ -68,7 +73,7 @@
         display: flex;
         align-items: center;
         border-radius: 14px;
-        padding:18px;
+        padding: 18px;
         background-color: #f6f6f6;
 
         .search-icon {
@@ -142,32 +147,40 @@
             justify-content: space-between;
             padding-bottom: 24px;
             padding-top: 24px;
+
             .order-details {
+                width: 100%;
                 .detail-item {
                     display: flex;
                     align-items: center;
+                    justify-content: space-between;
                     margin-bottom: 8px;
-
-                    .label {
-                        color: #999;
-                        font-size: 22px;
-                        margin-right: 12px;
-                        line-height: 32px;
+                    color: #999;
+                    font-size: 22px;
+                    line-height: 32px;
+                    .left{
+                        display: flex;
+                        align-items: center;
+                        .label {
+                            margin-right: 12px;
+                        }
+                        .copy-text {
+                            color: #F6C71A;
+                            margin-left: 30px;
+                        }
                     }
-
-                    .value {
-                        color: #999;
-                        font-size: 22px;
-                        line-height: 32px;
-                    }
-
-                    .copy-text {
-                        color: #F6C71A;
-                        font-size: 22px;
-                        margin-left: 30px;
-                        line-height: 32px;
+                    .right{
+                        display: flex;
+                        align-items: center;
+                        .order-status {
+                            font-size: 24px;
+                            color: #F6C71A;
+                        }
                     }
                 }
+                .fixWidth{
+                    width: fit-content;
+                }
             }
 
             .member-info {
@@ -210,6 +223,7 @@
                 justify-content: space-between;
 
                 .product-name {
+                    height: 80px;
                     font-size: 28px;
                     color: #000000;
                     line-height: 41px;
@@ -271,17 +285,20 @@
         }
     }
 }
+
 // 加载中
 .loading {
     width: 100%;
     position: relative;
     height: 60px;
-  }
+}
+
 // 没有更多
 .no-more {
-    padding:0 33px;
+    padding: 0 33px;
     box-sizing: border-box;
-    .at-divider__content{
+
+    .at-divider__content {
         background-color: #f9f9f9;
     }
 }

src/pages/memberSub/productClassify/index.jsx

@@ -1,6 +1,6 @@
 import { Component } from "react";
-import { View } from "@tarojs/components";
-import { AtTabs, AtTabsPane } from "taro-ui";
+import { View, Input } from "@tarojs/components";
+import { AtTabs, AtIcon } from "taro-ui";
 import "./index.less";
 import Taro from "@tarojs/taro";
 import ProductList from "../../../components/index/ProductList";
@@ -19,12 +19,14 @@ export default class Index extends Component {
     loading: false, //加载状态
     totalPages: 1, // 添加总页数
     tabList: [], // 所有闲鱼tags
+    value: "", // 搜索
   };
   handleClick(value) {
     this.setState(
       {
         current: value,
         page: 1,
+        value: "",
       },
       () => {
         Taro.pageScrollTo({
@@ -47,6 +49,7 @@ export default class Index extends Component {
       tag_name: this.state.tabList[this.state.current].title,
       page,
       page_size: 10,
+      search_name: this.state.value,
     });
 
     this.setState((prevState) => ({
@@ -72,6 +75,14 @@ export default class Index extends Component {
       }
     );
   };
+  // 输入
+  handleChange = (e) => {
+    this.setState({ value: e.target.value });
+  };
+  // 搜索
+  handleSearch = () => {
+    this.getBrowseShopProductList(true);
+  };
   // 添加商品
   onAddProduct = (productId, index) => {
     addShopProduct({
@@ -107,12 +118,37 @@ export default class Index extends Component {
   render() {
     return (
       <View className="index">
-        <AtTabs
-          scroll
-          current={this.state.current}
-          tabList={this.state.tabList}
-          onClick={this.handleClick.bind(this)}
-        ></AtTabs>
+        {/* 顶部固定 */}
+        <View className="top-fixed">
+          <AtTabs
+            scroll
+            current={this.state.current}
+            tabList={this.state.tabList}
+            onClick={this.handleClick.bind(this)}
+          ></AtTabs>
+          {/* 搜索 */}
+          <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={this.state.value}
+                onInput={this.handleChange}
+              />
+              <View onClick={this.handleSearch} className="search-button">
+                搜索
+              </View>
+            </View>
+          </View>
+        </View>
+        {/* 商品列表 */}
         <ProductList
           loading={this.state.loading}
           productList={this.state.productList}

src/pages/memberSub/productClassify/index.less

@@ -1,14 +1,27 @@
 .index {
     background-color: #f9f9f9;
     padding-bottom: 160px;
-    padding-top: 80px;
+    padding-top: 204px;
     box-sizing: border-box;
-    .at-tabs__header{
+
+    .top-fixed {
         position: fixed;
         top: 0;
         width: 100%;
-        z-index: 1;
+        z-index: 999;
+        background-color: #fff;
+        // .at-tabs__header {
+        // }
+    }
+
+    scroll-view ::-webkit-scrollbar {
+        appearance: none;
+        color: transparent;
+        display: none;
+        width: 0;
+        height: 0;
     }
+
     .at-tabs__item {
         color: #787878;
     }
@@ -21,6 +34,43 @@
         background-color: #f3e801;
     }
 
+    // 搜索
+    .search-container {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        position: relative;
+        background-color: #fff;
+        padding: 20px 34px;
+
+        .search-bar {
+            width: 90%;
+            display: flex;
+            align-items: center;
+            border-radius: 14px;
+            padding: 18px;
+            background-color: #f6f6f6;
+
+            .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;
+            }
+        }
+
+    }
+
     .bottom-button {
         width: 100%;
         height: 88px;

src/pages/memberSub/productManagement/index.less

@@ -17,7 +17,13 @@
         padding-left: 22px;
 
         }
-  
+        scroll-view ::-webkit-scrollbar {
+            appearance: none;
+            color: transparent;
+            display: none;
+            width: 0;
+            height: 0;
+          }
         .at-tabs__item {
           color: #000;
           font-size: 26px;

src/pages/memberSub/storeManagement/index.jsx

@@ -1,8 +1,15 @@
 import { Component } from "react";
 import { View, Text, Image, Button } from "@tarojs/components";
-import { AtIcon } from "taro-ui";
+import { AtIcon, AtActivityIndicator } from "taro-ui";
 import "./index.less";
-import { getMyShopList, getMyShopDetail, getShareShopDetail, getShareShopProductList, getShareJump,bindShareJump } from "../../../service";
+import {
+  getMyShopList,
+  getMyShopDetail,
+  getShareShopDetail,
+  getShareShopProductList,
+  getShareJump,
+  bindShareJump,
+} from "../../../service";
 import storeManagement from "../../../images/storeManagement/storeManagement.png";
 import storeManagementIcon from "../../../images/storeManagement/storeManagementIcon.png";
 import ProductCard from "../../../components/ProductCard"; //卡片模块
@@ -17,13 +24,17 @@ export default class Index extends Component {
     loading: false, //加载状态
     totalPages: 1, // 添加总页数
     isShare: false, // 是否是分享进入
-    shopId: '', // 店铺id
+    shopId: "", // 店铺id
+    isNoMore: false, // 是否没有更多
+    isShowBack: false, // 是否显示返回
   };
   // 获取店铺详情
   getMyShopDetail = async () => {
-    const res = this.state.isShare ? await getShareShopDetail({
-      store_id: this.state.shopId
-    }) :  await getMyShopDetail();
+    const res = this.state.isShare
+      ? await getShareShopDetail({
+          store_id: this.state.shopId,
+        })
+      : await getMyShopDetail();
     this.setState({
       shopDetail: res,
     });
@@ -33,37 +44,74 @@ export default class Index extends Component {
     const { page } = this.state;
     this.setState({ loading: true });
 
-    const res = this.state.isShare ? await getShareShopProductList({
-      store_id: this.state.shopId,
-      page,
-      page_size: 10,
-      tag_name:'全部'
-    }) : await getMyShopList({
-      page,
-      page_size: 10,
-      tag_name:'全部'
-    });
+    const res = this.state.isShare
+      ? await getShareShopProductList({
+          store_id: this.state.shopId,
+          page,
+          page_size: 10,
+          tag_name: "全部",
+        })
+      : await getMyShopList({
+          page,
+          page_size: 10,
+          tag_name: "全部",
+        });
 
     this.setState((prevState) => ({
-      productList: isBack ? res.goods_list : [...prevState.productList, ...res.goods_list],
+      productList: isBack
+        ? res.goods_list
+        : [...prevState.productList, ...res.goods_list],
       totalPages: res.total_pages,
       loading: false,
+      isNoMore: res.total_pages <= page,
     }));
   };
 
   componentDidShow() {
-    const { router } = Taro.getCurrentInstance();
-    const params = router.params;
-    
-    this.setState({
-      isManager: JSON.parse(params.isManager), //是否是店长
-      isShare: params.isShare||false, // 是否是分享进入
-      shopId: params.shopId||'', // 店铺id
-    },()=>{
-      this.getMyShopDetail(); //获取店铺详情
-      this.getMyShopList(true); //获取店铺数据
-    });
+    const { isManager, shopId, isShare, shareJump,shareType,isShowBack } =
+      Taro.getCurrentInstance().router.params || "";
+    let session_key = Taro.getStorageSync("session_key");
+    this.setState(
+      {
+        isManager: JSON.parse(isManager), //是否是店长
+        isShare: isShare || false, // 是否是分享进入
+        shopId: shopId || "", // 店铺id
+        isShowBack: isShowBack || false, // 是否显示返回
+      },
+      () => {
+        this.getMyShopDetail(); //获取店铺详情
+        this.getMyShopList(true); //获取店铺数据
+        if (isShare) {
+          // 分享隐藏返回首页
+          Taro.hideHomeButton();
+        }
+        // 获取分享跳转标识
+        shareJump &&
+          Taro.setStorage({
+            key: "shareJump",
+            data: shareJump,
+          });
+        shareType &&
+          Taro.setStorage({
+            key: "shareType",
+            data: shareType,
+          });
+        if (session_key && shareJump) {
+          this.bindShareJump(); //绑定分享跳转标识
+        }
+      }
+    );
   }
+  // 绑定分享跳转标识
+  bindShareJump = async () => {
+    let shareJump = Taro.getStorageSync("shareJump");
+    await bindShareJump({
+      share_type: 2,
+      share_unique_value: shareJump,
+    });
+    Taro.removeStorageSync("shareJump");
+    Taro.removeStorageSync("shareType");
+  };
   // 页面上拉触底
   onReachBottom = () => {
     const { page, totalPages, loading } = this.state;
@@ -82,25 +130,20 @@ export default class Index extends Component {
   };
   // 配置分享内容
   onShareAppMessage() {
-    const name = Taro.getStorageSync('userInfo').name;
-    return {
-      title: `${name}的店铺`,
-      path: `/pages/memberSub/storeManagement/index?shopId=${this.state.shopDetail.id}&isShare=true&isManager=false`,
-      imageUrl: ''
-    }
+    const name = Taro.getStorageSync("userInfo").name;
     return getShareJump({
-      share_type:2,
-      share_id: this.state.shopDetail.id
-    }).then(res=>{
+      share_type: 2,
+      share_id: this.state.shopDetail.id,
+    }).then((res) => {
       return {
-        title: "店铺",
-        path: `/pages/memberSub/storeManagement/index?shopId=${this.state.shopDetail.id}&isShare=true&isManager=false&&shareJump=${res.share_unique_value}`,
-        imageUrl: ''
-      }
-    })
+        title: `${name||'分享者'}的店铺`,
+        path: `/pages/memberSub/storeManagement/index?shopId=${this.state.shopDetail.id}&isShare=true&isManager=false&&shareJump=${res.share_unique_value}&&shareType=2&&isShowBack=true`,
+        imageUrl: "",
+      };
+    });
   }
   render() {
-    const { shopDetail, productList } = this.state;
+    const { shopDetail, productList, loading, isNoMore,isShare } = this.state;
     return (
       <View className="index">
         {/* 头部卡片 */}
@@ -108,12 +151,12 @@ export default class Index extends Component {
           <Image className="bg-image" src={storeManagement} mode="widthFix" />
           {/* 分享店铺 */}
           {!this.state.isShare && (
-          <View className="share-shop">
-            <Button onClick={this.handleShare} openType="share">
-            <Text>分享店铺</Text>
-            <AtIcon value="chevron-right" size="10" color="#fff"></AtIcon>
-            </Button>
-          </View>
+            <View className="share-shop">
+              <Button openType="share">
+                <Text>分享店铺</Text>
+                <AtIcon value="chevron-right" size="10" color="#fff"></AtIcon>
+              </Button>
+            </View>
           )}
           {/* 个人信息 */}
           <View className="user-info">
@@ -123,7 +166,7 @@ export default class Index extends Component {
                 mode="aspectFill"
                 src={shopDetail.img_icon}
               />
-              <View className="change-avatar-btn">更换头像</View>
+              {/* <View className="change-avatar-btn">更换头像</View> */}
             </View>
             <View className="info-content">
               <Text className="name">{shopDetail.store_name}</Text>
@@ -140,7 +183,7 @@ export default class Index extends Component {
           {productList && (
             <View className="product-card-list">
               {productList.map((product) => (
-                <ProductCard key={product.id} product={product} />
+                <ProductCard isShowBack={this.state.isShowBack} key={product.id} product={product} isShare={isShare}/>
               ))}
             </View>
           )}
@@ -169,6 +212,25 @@ export default class Index extends Component {
             </View>
           )}
         </View>
+        {/* 加载中 */}
+        {loading && (
+          <View className="loading-container">
+            <AtActivityIndicator
+              content="加载中..."
+              isOpened={loading}
+              mode="center"
+              color="#fdf764"
+            />
+          </View>
+        )}
+        {/* 没有更多 */}
+        {isNoMore && (
+          <View className="no-more">
+            <View className="no-more-line">
+              <Text className="no-more-text">我是有底线的</Text>
+            </View>
+          </View>
+        )}
       </View>
     );
   }

src/pages/memberSub/storeManagement/index.less

@@ -4,6 +4,7 @@
     min-height: 100vh;
     background-color: #f9f9f9;
     padding-bottom: 150px;
+
     .header-card {
         width: 100%;
         height: 256px;
@@ -84,7 +85,7 @@
                 font-size: 22px;
                 line-height: 40px;
                 margin-right: 7px;
-            color: #FFFFFF;
+                color: #FFFFFF;
             }
         }
     }
@@ -98,6 +99,7 @@
         box-sizing: border-box;
         position: relative;
         z-index: 1;
+
         .product-list-title {
             display: flex;
             flex-direction: column;
@@ -122,59 +124,67 @@
             }
         }
     }
-        // 底部购买模块
-        .bottom-buy {
-            width: 100%;
-            background-color: #fff;
-            height: 126px;
-            padding: 19px 35px 19px 44px;
-            box-sizing: border-box;
-            position: fixed;
-            bottom: 0;
+
+    // 底部购买模块
+    .bottom-buy {
+        width: 100%;
+        background-color: #fff;
+        height: 126px;
+        padding: 19px 35px 19px 44px;
+        box-sizing: border-box;
+        position: fixed;
+        bottom: 0;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        .bottom-buy-left {
             display: flex;
-            justify-content: space-between;
+            flex-direction: column;
             align-items: center;
-            .bottom-buy-left {
+
+            image {
+                width: 36px;
+                height: 36px;
+                margin-bottom: 7px;
+            }
+
+            .bottom-buy-text {
+                font-size: 22px;
+                line-height: 32px;
+                color: #000000;
+            }
+        }
+
+        .bottom-buy-right {
+            width: 100%;
+            height: 100%;
+            display: flex;
+            border-radius: 60px;
+            overflow: hidden;
+
+            .bottom-buy-right-self,
+            .bottom-buy-right-share {
+                line-height: 43px;
+                font-size: 30px;
+                width: 100%;
                 display: flex;
-                flex-direction: column;
+                justify-content: center;
                 align-items: center;
+
                 image {
-                    width: 36px;
-                    height: 36px;
-                    margin-bottom: 7px;
-                }
-    
-                .bottom-buy-text {
-                    font-size: 22px;
-                    line-height: 32px;
-                    color: #000000;
+                    margin-right: 9px;
                 }
             }
-            .bottom-buy-right {
-                width: 100%;
-                height: 100%;
-                display: flex;
-                border-radius: 60px;
-                overflow: hidden;
-                .bottom-buy-right-self,.bottom-buy-right-share{
-                    line-height: 43px;
-                    font-size: 30px;
-                    width: 100%;
-                    display: flex;
-                    justify-content: center;
-                    align-items: center;
-                    image{
-                        margin-right: 9px;
-                    }
-                }
-                .bottom-buy-right-self{
-                    background-color: #fbe00f;
-                    color: #000000;
-                }
-                .bottom-buy-right-share{
-                    background-color: #ff1c14;
-                    color: #fff;
-                }
+
+            .bottom-buy-right-self {
+                background-color: #fbe00f;
+                color: #000000;
+            }
+
+            .bottom-buy-right-share {
+                background-color: #ff1c14;
+                color: #fff;
+            }
         }
     }
 }
@@ -191,11 +201,55 @@ Button {
     display: flex;
     justify-content: center;
     align-items: center;
+
     &::after {
-      border: none;
+        border: none;
+    }
+}
+
+.button-hover {
+    background-color: transparent !important;
+    /* 移除背景高亮 */
+    box-shadow: none !important;
+    /* 移除可能的阴影 */
+}
+// 加载中
+.loading-container {
+    width: 100%;
+    position: relative;
+    height: 60px;
+}
+// 没有更多
+.no-more {
+    padding: 20px 0;
+    
+    &-line {
+        position: relative;
+        text-align: center;
+        
+        &::before,
+        &::after {
+            content: '';
+            position: absolute;
+            top: 50%;
+            width: 30%;
+            height: 1px;
+            background-color: #e5e5e5;
+        }
+        
+        &::before {
+            left: 10%;
+        }
+        
+        &::after {
+            right: 10%;
+        }
+    }
+    
+    &-text {
+        display: inline-block;
+        padding: 0 15px;
+        font-size: 24px;
+        color: #949494;
     }
-  }
-  .button-hover {
-    background-color: transparent !important; /* 移除背景高亮 */
-    box-shadow: none !important;             /* 移除可能的阴影 */
-  }
+}

src/pages/mine/index.jsx

@@ -1,13 +1,12 @@
 import { Component } from "react";
 import Taro from "@tarojs/taro";
-import { View, Text, Image } from "@tarojs/components";
+import { View, Text, Image, Button } 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";
 import norm from "../../images/mine/norm.png";
-import avatar from "../../images/mine/avatar.png";
 import sign from "../../images/mine/sign.png";
 import SignModal from "../../components/signModal";
 import levelOne from "../../images/mine/levelOne.png";
@@ -18,6 +17,7 @@ import levelFive from "../../images/mine/levelFive.png";
 export default class Index extends Component {
   state = {
     userInfo: {}, //用户信息
+    mineData: {}, //我的页面数据
     isOpened: false, //是否打开弹窗
   };
   // 退出登录
@@ -43,6 +43,7 @@ export default class Index extends Component {
     const session_key = Taro.getStorageSync("session_key");
     if (session_key) {
       this.getUserInfo();
+      this.getMineData();
     }
   }
   // 获取用户信息
@@ -53,6 +54,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,13 +84,13 @@ export default class Index extends Component {
     }
   };
   render() {
-    const { userInfo, isOpened } = this.state;
+    const { userInfo, isOpened, mineData } = this.state;
     return (
       <View className="index">
         {/* 个人信息 */}
         <View className="info">
           <Image
-            src={userInfo.icon ? userInfo.icon : avatar}
+            src={userInfo.icon ? userInfo.icon : 'https://yushi.tos-cn-beijing.volces.com/mine/avatar.png'}
             className="avatar"
           />
           <View className="info-right">
@@ -107,20 +115,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 +148,32 @@ export default class Index extends Component {
             ></Image>
           </View>
         </View>
+        {/* <Button onClick={() => Taro.navigateTo({ url: '/pages/indexSub/activity/index' })}>
+          活动页面
+        </Button> */}
+        {/* 我的推荐人 */}
+        {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}>
@@ -160,6 +195,17 @@ export default class Index extends Component {
               arrow="right"
               thumb={norm}
             />
+            <AtListItem
+              hasBorder={false}
+              onClick={() =>
+                Taro.navigateTo({
+                  url: `/pages/mineSub/explain/index`,
+                })
+              }
+              title="鱼市说明"
+              arrow="right"
+              thumb='https://yushi.tos-cn-beijing.volces.com/mine/explain.png'
+            />
             {/* <View className="line"></View> */}
             {/* <AtListItem
               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/pages/mineSub/explain/index.config.js

@@ -0,0 +1,3 @@
+export default definePageConfig({
+  navigationBarTitleText: '鱼市说明'
+})

src/pages/mineSub/explain/index.jsx

@@ -0,0 +1,28 @@
+import { Component } from 'react'
+import { View, RichText } from '@tarojs/components'
+import './index.less'
+import { getUserAgreement } from '../../../service'
+export default class Index extends Component {
+  state = {
+    agreement: ''
+  }
+  componentDidMount () { 
+    this.getUserAgreement()
+  }
+  // 获取用户协议
+  getUserAgreement = async () => {
+    const res = await getUserAgreement({
+      type:2
+    })
+    this.setState({
+      agreement: res.content
+    })
+  }
+  render () {
+    return (
+      <View className='index'>
+        {this.state.agreement && <RichText nodes={this.state.agreement} />}
+      </View>
+    )
+  }
+}

src/pages/mineSub/explain/index.less

@@ -0,0 +1,6 @@
+.index {
+  padding: 20rpx;
+  background-color: #f5f5f5;
+  min-height: 100vh;
+  box-sizing: border-box;
+}

src/pages/mineSub/infoEdit/index.jsx

@@ -1,9 +1,9 @@
 import { Component } from "react";
-import { View, Text, Image,Input, Button } from "@tarojs/components";
+import { View, Text, Image, Input, Button } from "@tarojs/components";
 import { AtInput } from "taro-ui";
 import Taro from "@tarojs/taro";
-import { updateUserInfo,getUserInfo } from "../../../service";
-import avatar from "../../../images/mine/avatar.png";
+import { updateUserInfo, getUserInfo } from "../../../service";
+import { baseUrl } from "../../../api/config";
 import "./index.less";
 
 export default class Index extends Component {
@@ -34,11 +34,11 @@ export default class Index extends Component {
     return value;
   }
   // 昵称
-  handleNickNameChange(value) {
+  handleNickNameChange(res) {
     this.setState({
-      nickName: value,
+      nickName: res.detail.value,
     });
-    return value;
+    return res.detail.value;
   }
   // 手机号
   handlePhoneChange(value) {
@@ -48,11 +48,32 @@ export default class Index extends Component {
     return value;
   }
   // 选择头像
-  handleChooseAvatar = (e) => {
-    this.setState({
-      avatar: e.detail.avatarUrl,
+  handleChooseAvatar = async (e) => {
+    Taro.showLoading({
+      title: '上传中...',
+      mask: true
     });
-  }
+    Taro.uploadFile({
+      url: baseUrl + '/user/tos_upload_file', // 上传的接口地址
+      filePath: e.detail.avatarUrl,
+      name: 'file',
+      success: (uploadRes) => {
+        const data = uploadRes.data;
+        Taro.hideLoading();
+        this.setState({
+          avatar: JSON.parse(data).data.file_url,
+        });
+      },
+      fail: (error) => {
+        Taro.hideLoading();
+        Taro.showToast({
+          title: '上传失败',
+          icon: 'none',
+        });
+        console.log(error, 'error');
+      }
+    });
+  };
   // 提交
   handleSubmit = async () => {
     const phoneRegex = /^1[3-9]\d{9}$/; // 中国大陆手机号正则
@@ -76,15 +97,15 @@ export default class Index extends Component {
       wechat_account: this.state.wxAccount,
     });
     Taro.showToast({
-      title: '修改成功',
-      icon: 'none',
+      title: "修改成功",
+      icon: "none",
       duration: 1000, // 显示持续时间，单位毫秒
       success: () => {
         // 等待 toast 显示完成后再返回上一页
         setTimeout(() => {
           Taro.navigateBack();
         }, 1000);
-      }
+      },
     });
   };
   render() {
@@ -92,36 +113,48 @@ export default class Index extends Component {
       <View className="index">
         {/* 头像 */}
         <View className="info-edit">
-          <Image
-            src={this.state.avatar||avatar}
-            className="info-edit-img"
-          />
-          {/* <Button onChooseAvatar={this.handleChooseAvatar} open-type="chooseAvatar" className="info-edit-title">更换头像</Button> */}
+          <Image src={this.state.avatar || 'https://yushi.tos-cn-beijing.volces.com/mine/avatar.png'} className="info-edit-img" />
+          <Button
+            onChooseAvatar={this.handleChooseAvatar}
+            open-type="chooseAvatar"
+            className="info-edit-title"
+          >
+            更换头像
+          </Button>
         </View>
         {/* 内容 */}
         <View className="info-edit-content">
-          <AtInput
+          {/* <AtInput
             name="value"
             title="微信账号"
             type="text"
             placeholder="请输入微信账号"
             value={this.state.wxAccount}
             onChange={this.handleAccountChange.bind(this)}
-          />
+          /> */}
           <AtInput
+            className="info-edit-input"
             name="value"
             title="鱼市昵称"
             type="text"
             placeholder="请输入鱼市昵称"
-            value={this.state.nickName}
-            onChange={this.handleNickNameChange.bind(this)}
-          />
+          >
+            <Input
+              name="value"
+              title="鱼市昵称"
+              type="nickname"
+              placeholder="请输入鱼市昵称"
+              value={this.state.nickName}
+              onInput={this.handleNickNameChange.bind(this)}
+            />
+          </AtInput>
           <AtInput
             border={false}
             name="value"
             title="手机号"
             type="number"
             placeholder="请输入手机号"
+            placeholderStyle="color: #828282;"
             value={this.state.phone}
             onChange={this.handlePhoneChange.bind(this)}
           />

src/pages/mineSub/infoEdit/index.less

@@ -55,4 +55,13 @@
         justify-content: center;
         align-items: center;
     }
+    // 隐藏输入框
+    .info-edit-input{
+        .at-input__input{
+            display: none;
+        }
+        .at-input__children::after{
+            border-left-width: 0;
+        }
+    }
 }

src/pages/mineSub/userSpecification/index.less

@@ -1,4 +1,6 @@
 .index {
   padding: 20rpx;
   background-color: #f5f5f5;
+  min-height: 100vh;
+  box-sizing: border-box;
 }

src/service/activity.js

@@ -0,0 +1,54 @@
+import Request from '../api/request';
+// -----------------------------------------------------------捡漏计算器
+// 获取捡漏计算机数据展示
+export const getCalculatorData = data =>
+  Request({
+    url: '/activity/get_jianlou_data_show',
+    method: 'POST',
+    data,
+  });
+//   获取用户捡漏清单详情
+export const getCalculatorDetail = data =>
+  Request({
+    url: '/activity/get_jianlou_detail',
+    method: 'POST',
+    data,
+  });
+//   用户捡漏清单列表
+export const getCalculatorList = data =>
+  Request({
+    url: '/activity/get_jianlou_list',
+    method: 'POST',
+    data,
+  });
+//   搜索捡漏计算器
+export const getCalculatorSearch = data =>
+  Request({
+    url: '/activity/search_jianlou_calculator',
+    method: 'POST',
+    data,
+  });
+//   捡漏计算器部分数据
+export const getCalculatorPartData = data =>
+  Request({
+    url: '/activity/get_jianlou_calculator',
+    method: 'POST',
+    data,
+  });
+//----------------------------------------------活动
+// 获取新春专题tab
+export const getNewYearTab = data =>
+  Request({
+    url: '/activity/get_category_tab_data_spring_festival',
+    method: 'POST',
+    data,
+  });
+  // 新春商品列表
+  export const getNewYearProductList = data =>
+  Request({
+    url: '/api/get_goods_data_list_recommend_is_index',
+    method: 'POST',
+    data,
+  });
+
+

src/service/index.js

@@ -36,7 +36,7 @@ export const getProductLikeList = data =>
     method: 'POST',
     data,
   })
-// 获取推荐商品列表   (包括鱼市商品 = 120;高佣专属 = 121)
+// 获取推荐商品列表
 export const getRecommendProductList = data =>
   Request({
     url: '/api/get_goods_data_list_recommend',
@@ -86,7 +86,7 @@ export const getUserAgreement = data =>
     method: 'POST',
     data,
   })
-// 获取分享跳转标识
+// 获取分享跳转标识(1:商品;2:店铺 3:专题页)
 export const getShareJump = data =>
   Request({
     url: '/user/get_not_oneself_store_detail',
@@ -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 =>