处理分享和其他接口

project.private.config.json

@@ -10,6 +10,20 @@
     "miniprogram": {
       "list": [
         {
+          "name": "pages/productManagement/index",
+          "pathName": "pages/memberSub/storeManagement/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "pages/indexSub/productDetail/index",
+          "pathName": "pages/indexSub/productDetail/index",
+          "query": "id=3074",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
           "name": "pages/mineSub/userSpecification/index",
           "pathName": "pages/mineSub/userSpecification/index",
           "query": "",
@@ -78,13 +92,6 @@
           "query": "",
           "launchMode": "default",
           "scene": null
-        },
-        {
-          "name": "pages/productManagement/index",
-          "pathName": "pages/productManagement/index",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
         }
       ]
     }

src/app.config.js

@@ -46,8 +46,10 @@ export default defineAppConfig({
     navigationBarBackgroundColor: '#FFFFFF',
     navigationBarTitleText: '鱼市',
     navigationBarTextStyle: 'black',
-    backgroundColor: "#FFFFFF"
+    backgroundColor: "#FFFFFF",
+    onReachBottomDistance: 100
   },
+  lazyCodeLoading: "requiredComponents",
   tabBar: {
     color: "#000000",
     selectedColor: "#000000",

src/app.js

@@ -5,7 +5,7 @@ import 'taro-ui/dist/style/index.scss'
 
 // 在 App 类外定义全局变量
 global.globalData = {
-  optionsData: {}  // 存储页面参数
+  optionsData: {},  // 存储页面参数
 }
 
 class App extends Component {

src/components/Modal/index.jsx

@@ -1,10 +1,22 @@
 import { AtModal, AtModalContent } from "taro-ui";
 import { View, Image, Text } from "@tarojs/components";
 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 } = props;
+  const handleCopyLink = () => {
+    Taro.setClipboardData({
+      data: productPromotion.short_tpwd,
+    }).then(() => {
+      Taro.showToast({
+        title: '口令已复制',
+        icon: 'success',
+      });
+    });
+  }
   return (
     <AtModal isOpened={props.isOpened} closeOnClickOverlay={true}>
       <AtModalContent>
@@ -16,7 +28,7 @@ export default function Modal(props) {
               <View className="step-item">
                 <View className="step-title">
                   <Text className="number">1</Text>
-                  <Text className="desc">第一步说明文字</Text>
+                  <Text className="desc">点击复制口令</Text>
                 </View>
                 <View className="step-box">
                     <View className="step-One">
@@ -28,7 +40,7 @@ export default function Modal(props) {
               <View className="step-item">
                 <View className="step-title">
                   <Text className="number">2</Text>
-                  <Text className="desc">第二步说明文字</Text>
+                  <Text className="desc">打开咸鱼APP</Text>
                 </View>
                 <View className="step-box">
                   <Image className="step-img-t" src={xianyu} />
@@ -38,7 +50,7 @@ export default function Modal(props) {
               <View className="step-item">
                 <View className="step-title">
                   <Text className="number">3</Text>
-                  <Text className="desc">第三步说明文字</Text>
+                  <Text className="desc">自动识别口令</Text>
                 </View>
                 <View className="step-box">
                   <Image mode="heightFix" className="step-img-three" src={stepThree} />
@@ -46,7 +58,7 @@ export default function Modal(props) {
               </View>
             </View>
             {/* 复制口令 */}
-            <View className="copy-link">
+            <View className="copy-link" onClick={handleCopyLink}>
                 复制口令
             </View>
           </View>

src/components/index/CategoryList/index.less

@@ -4,11 +4,11 @@
   .category-list {
     display: flex;
     flex-wrap: wrap;
-    justify-content: space-between;
+    // justify-content: space-between;
     background: #FFFFFF;
     border-radius: 20px;
     padding: 25px 17px 22px 17px;
-    
+    gap: 50px;
     .category-item {
       width: 96px;
       display: flex;

src/components/index/ProductList/index.jsx

@@ -4,7 +4,7 @@ import React, {
   forwardRef,
   useImperativeHandle,
 } from "react";
-import { View, Text, Image } from "@tarojs/components";
+import { View, Text, Image, Button } from "@tarojs/components";
 import { AtCheckbox, AtActivityIndicator } from "taro-ui";
 import Taro from "@tarojs/taro";
 import "./index.less";
@@ -17,17 +17,18 @@ const ProductList = forwardRef((props, ref) => {
   const {
     productList, // 商品列表数据
     loading, // 加载状态
-    isSeckill, // 是否秒杀
-    isManagement, // 是否管理
+    isSeckill, // 是否秒杀页面使用
+    isManagement, // 是否管理页面使用
     isManagementStatus, // 是否管理状态
-    isProductClassify, // 是否分类
+    isProductClassify, // 是否分类页面使用
     isSelectAll, // 是否全选
     onAddProduct, // 添加商品方法
     onDeleteProductSelect, // 删除商品选中id数组
-  } = props;
+    isNoMore, // 是否没有更多
+    onShareProduct, // 分享商品方法
+    } = props;
 
   const [selectedProducts, setSelectedProducts] = useState([]); // 商品选择状态
-
   // 监听选中状态变化
   useEffect(() => {
     // 每当 selectedProducts 变化时，调用父组件的回调
@@ -42,12 +43,12 @@ const ProductList = forwardRef((props, ref) => {
       // 如果 isSelectAll 为 false，取消所有选中
       setSelectedProducts([]);
     }
-  }, [isSelectAll, productList]);
+  }, [isSelectAll]);
   // 定义 clearSelectedItems 方法
   useImperativeHandle(ref, () => ({
     clearSelectedItems: () => {
       setSelectedProducts([]);
-    }
+    },
   }));
 
   // 跳转产品详情
@@ -69,21 +70,27 @@ const ProductList = forwardRef((props, ref) => {
         // 如果已经选中，则取消选择
         return prevSelected.filter((id) => id !== productId);
       } else {
-        // 如果未选中，则添加到选中列表
+        // 如果未选中，则添加到选中列
         return [...prevSelected, productId];
       }
     });
   };
   // 添加商品
-  const addProduct = (productId, is_collected) => {
+  const addProduct = (productId, is_collected, index) => {
     // 是否添加到我的商店（is_collected:为true已添加）
     if (is_collected) {
       return;
     } else {
       // 调用父组件的方法
-      onAddProduct && onAddProduct(productId);
+      onAddProduct && onAddProduct(productId, index);
     }
   };
+  // 分享商品 
+  const shareProduct = (product, e) => {
+    e.stopPropagation(); // 防止事件穿透
+    // 调用父组件的回调函数，传递商品信息
+    props.onShareProduct && props.onShareProduct(product);
+  };
   return (
     <View className="product-list-wrap">
       {isSeckill && (
@@ -114,7 +121,7 @@ const ProductList = forwardRef((props, ref) => {
                   style={{ WebkitBoxOrient: "vertical" }}
                 >
                   <Text className="self-tag">
-                    {!isSeckill ? "自营" : "鱼市秒杀"}
+                    {!isSeckill ? "自营" : "鱼市��杀"}
                   </Text>
                   {product.item_title}
                 </View>
@@ -132,7 +139,7 @@ const ProductList = forwardRef((props, ref) => {
                     <View
                       onClick={(e) => {
                         e.stopPropagation();
-                        addProduct(product.id, product.is_collected);
+                        addProduct(product.id, product.is_collected, index);
                       }}
                       className="add-btn"
                     >
@@ -166,10 +173,15 @@ const ProductList = forwardRef((props, ref) => {
                   <View className="share-earn">
                     <Image className="bg" src={shareEarnBg} mode="aspectFit" />
                     <View className="content">
-                      <Text className="label">分享赚</Text>
-                      <Text className="money">
-                        ¥{product.estimated_commission}
-                      </Text>
+                      <Button
+                        openType="share"
+                        onClick={(e) => shareProduct(product, e)} // 传递事件对象
+                      >
+                        <Text className="label">分享赚</Text>
+                        <Text className="money">
+                          ¥{product.estimated_commission}
+                        </Text>
+                      </Button>
                     </View>
                   </View>
                 </View>
@@ -191,6 +203,7 @@ const ProductList = forwardRef((props, ref) => {
           />
         </View>
       )}
+      {isNoMore && <View className="no-more">没有更多了~</View>}
     </View>
   );
 });
@@ -203,8 +216,10 @@ ProductList.defaultProps = {
   isManagementStatus: false,
   isProductClassify: false,
   isSelectAll: false,
+  isNoMore: false,
   onAddProduct: () => {}, // 添加商品方法
   onDeleteProductSelect: () => {}, // 删除商品选中id数组
+  onShareProduct: () => {}, // 分享商品方法
 };
 
 export default ProductList;

src/components/index/ProductList/index.less

@@ -14,6 +14,7 @@
     .at-checkbox::before {
       content: none;
     }
+
     .at-checkbox__option-wrap {
       padding: 0 15px 0 0;
     }
@@ -162,6 +163,30 @@
             justify-content: center;
             font-size: 28px;
 
+            // 清除Button默认样式
+            Button {
+              padding: 0;
+              margin: 0;
+              background: none;
+              border: none;
+              line-height: normal;
+              height: 100%;
+              width: 100%;
+              display: flex;
+              flex-direction: column;
+              align-items: center;
+              justify-content: center;
+              font-size: 28px;
+              color: #FFFFFF;
+              &::after {
+                border: none;
+              }
+            }
+            .button-hover {
+              background-color: transparent !important; /* 移除背景高亮 */
+              box-shadow: none !important;             /* 移除可能的阴影 */
+            }
+
             .label,
             .money {
               line-height: 41px;
@@ -189,9 +214,20 @@
       margin-right: 10px;
     }
   }
-  .loading{
+
+  .loading {
     width: 100%;
     position: relative;
-    height: 60px;  
+    height: 60px;
+  }
+
+  .no-more {
+    width: 100%;
+    height: 60px;
+    text-align: center;
+    font-size: 20px;
+    line-height: 60px;
+    margin-top: 20px;
+    color: #999999;
   }
-}
+}

src/pages/index/index.config.js

@@ -1,3 +1,4 @@
 export default definePageConfig({
-  navigationStyle: 'custom'
+  navigationStyle: 'custom',
+  enableShareAppMessage: true
 })

src/pages/index/index.jsx

@@ -21,6 +21,7 @@ export default class Index extends Component {
     page: 1, // 添加页码
     totalPages: 1, // 添加总页数
     loading: false, // 添加加载状态
+    shareInfo: {}, // 分享信息
   };
   // 获取首页数据
   getHomeData = async () => {
@@ -87,7 +88,7 @@ export default class Index extends Component {
     const { page } = this.state;
     this.setState({ loading: true });
     const res = await getProductList({
-      tag_name:  this.state.homeData.tags[this.state.current].title,
+      tag_name: this.state.homeData.tags[this.state.current].title,
       page,
       page_size: 10,
     });
@@ -101,6 +102,24 @@ export default class Index extends Component {
     }));
   };
 
+  // 分享商品
+  handleShareProduct = (product) => {
+    this.setState({ shareInfo: product }, () => {
+      Taro.showShareMenu({
+        withShareTicket: true,
+        menus: ["shareAppMessage"],
+      });
+    });
+  };
+  // 配置分享内容
+  onShareAppMessage() {
+      let shareInfo = this.state.shareInfo;
+      return {
+        title: shareInfo.item_title,
+        path: `/pages/indexSub/productDetail/index?id=${shareInfo.id}&&isShare=${true}`,
+        imageUrl: shareInfo.image_url,
+      };
+  }
   render() {
     const { homeData, productList, loading } = this.state;
     return (
@@ -119,13 +138,9 @@ export default class Index extends Component {
           {/* 搜索框包裹盒子 */}
           <View
             className="search-bar-container"
-            onClick={() => Taro.navigateTo({ url: '/pages/search/index' })}
+            onClick={() => Taro.navigateTo({ url: "/pages/search/index" })}
           >
-            <SearchBar
-              value=""
-              disabled={true}
-              placeholder="点击搜索商品"
-            />
+            <SearchBar value="" disabled={true} placeholder="点击搜索商品" />
           </View>
           {/* tab分类 */}
           <View className="tabs-list">
@@ -173,7 +188,11 @@ export default class Index extends Component {
         {/* <RecommendList /> */}
         {/* 商品列表 */}
         <View className="product-list-wrap">
-          <ProductList productList={productList} loading={loading} />
+          <ProductList
+            productList={productList}
+            loading={loading}
+            onShareProduct={this.handleShareProduct}
+          />
         </View>
         {/* 添加浮动按钮 */}
         <View className="float-buttons">

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

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

src/pages/indexSub/productDetail/index.jsx

@@ -1,7 +1,7 @@
 import { Component } from "react";
-import { View, Text, Swiper, SwiperItem, Image } from "@tarojs/components";
+import { View, Text, Swiper, SwiperItem, Image, Button } from "@tarojs/components";
 import { AtIcon } from "taro-ui";
-import { getProductDetail, getProductLikeList } from "../../../service";
+import { getProductDetail, getProductLikeList,getProductPromotion } from "../../../service";
 import "./index.less";
 import Taro from "@tarojs/taro";
 import productDetailIcon from "../../../images/productDetail/productDetailIcon.png";
@@ -14,29 +14,47 @@ import Modal from "../../../components/Modal"; //弹窗
 
 export default class Index extends Component {
   state = {
+    id: "", //商品id
     isShare: false, //是否是分享
     isOpened: false, //是否打开弹窗
     productDetail: [], //商品详情
-    productLikeList:[],//推荐商品列表
+    productLikeList: [], //推荐商品列表
+    productPromotion: [], //商品推广转链
   };
   // 获取产品详情的方法
-  fetchProductDetails = async (id) => {
+  fetchProductDetails = async (id) => { 
     const res = await getProductDetail({
       goods_id: id,
     });
     this.setState({
       productDetail: res,
+    },() => {
+      this.getProductPromotion(); //获取商品推广转链
     });
   };
   // 获取猜你喜欢列表
   getProductLikeList = async () => {
     const res = await getProductLikeList();
     this.setState({
-      productLikeList:res
-    })
+      productLikeList: res,
+    });
+  };
+  // 获取商品推广转链
+  getProductPromotion = async () => {
+    const res = await getProductPromotion({
+      goods_id: [this.state.id],
+      item_id: [this.state.productDetail.item_id],
+    });
+    this.setState({
+      productPromotion: res.alibaba_idle_affiliate_general_link_convert_response.result.result,
+    });
   };
   componentDidMount() {
-    const { id } = Taro.getCurrentInstance().router.params;
+    const { id, isShare } = Taro.getCurrentInstance().router.params;
+    this.setState({
+      id,
+      isShare,
+    });
     this.fetchProductDetails(id); //获取产品详情
     this.getProductLikeList(); //获取猜你喜欢列表
   }
@@ -62,18 +80,35 @@ export default class Index extends Component {
 
   // 立即购买
   handleBuy = () => {
-    console.log(111);
-
     this.setState({
       isOpened: true,
     });
   };
-
+  // 分享
+  handleShare = () => {
+    // 只显示分享菜单
+    Taro.showShareMenu({
+      withShareTicket: true,
+      menus: ['shareAppMessage']
+    });
+  };
+  // 配置分享内容
+  onShareAppMessage() {
+    return {
+      title: this.state.productDetail.item_title,
+      path: `/pages/indexSub/productDetail/index?id=${this.state.id}&&isShare=${this.state.isShare}`,
+      imageUrl: this.state.productDetail.images[0].img
+    }
+  }
   // 添加返回方法
   handleBack = () => {
     const pages = Taro.getCurrentPages();
     if (pages.length > 1) {
       Taro.navigateBack();
+    } else {
+      Taro.switchTab({
+        url: "/pages/index/index",
+      });
     }
   };
 
@@ -102,7 +137,6 @@ export default class Index extends Component {
               </SwiperItem>
             ))}
         </Swiper>
-
         {/* 商品详情模块 */}
         <View className="product-info">
           {/* 商品名称 */}
@@ -138,7 +172,9 @@ export default class Index extends Component {
 
           {/* 商品编号行 */}
           <View className="product-number-row">
-            <Text className="number-label">商品编号：{productDetail.goods_number}</Text>
+            <Text className="number-label">
+              商品编号：{productDetail.goods_number}
+            </Text>
             <Text
               className="copy-btn"
               onClick={() => this.handleCopy("123456")}
@@ -182,9 +218,14 @@ export default class Index extends Component {
           <View className="bottom-buy-right">
             {!this.state.isShare ? (
               <>
-                <View className="bottom-buy-right-self">
+                <View
+                  onClick={this.handleShare}
+                  className="bottom-buy-right-self"
+                >
+                <Button openType="share" onClick={this.handleShare}>
                   <Image src={share} mode="aspectFit" />
                   <Text className="bottom-buy-text">分享赚</Text>
+                </Button>
                 </View>
                 <View
                   onClick={this.handleBuy}
@@ -203,9 +244,10 @@ export default class Index extends Component {
         </View>
         {/* 分享弹窗 */}
         <Modal
-          linkText="阿拉山口监督卡监督卡就"
+          linkText={this.state.productPromotion.short_tpwd}
           title="咸鱼口令已复制"
           isOpened={this.state.isOpened}
+          productPromotion={this.state.productPromotion}
         />
       </View>
     );

src/pages/indexSub/productDetail/index.less

@@ -6,6 +6,7 @@
     .swiper {
         width: 100%;
         height: 730px;
+
         .swiper-img {
             width: 100%;
             height: 100%;
@@ -162,6 +163,7 @@
         display: flex;
         justify-content: space-between;
         align-items: center;
+
         .bottom-buy-left {
             display: flex;
             flex-direction: column;
@@ -178,41 +180,50 @@
                 color: #000000;
             }
         }
+
         .bottom-buy-right {
             width: 576px;
             height: 100%;
             display: flex;
             border-radius: 60px;
             overflow: hidden;
-            .bottom-buy-right-self,.bottom-buy-right-share{
+
+            .bottom-buy-right-self,
+            .bottom-buy-right-share {
                 line-height: 43px;
                 font-size: 30px;
                 width: 50%;
                 display: flex;
                 justify-content: center;
                 align-items: center;
-                image{
+
+                image {
                     margin-right: 9px;
                 }
             }
-            .bottom-buy-right-self{
+
+            .bottom-buy-right-self {
                 background-color: #fbe00f;
                 color: #000000;
-                image{
+
+                image {
                     width: 47px;
                     height: 46px;
                 }
             }
-            .bottom-buy-right-share{
+
+            .bottom-buy-right-share {
                 background-color: #ff1c14;
                 color: #fff;
-                image{
+
+                image {
                     width: 45px;
                     height: 31px;
                 }
             }
         }
-        .bottom-buy-right-btn{
+
+        .bottom-buy-right-btn {
             width: 586px;
             height: 100%;
             background: linear-gradient(90deg, #ff881b 0%, #fe6234 100%);
@@ -220,7 +231,8 @@
             display: flex;
             justify-content: center;
             align-items: center;
-            .bottom-buy-text{
+
+            .bottom-buy-text {
                 color: #fff;
                 font-size: 28px;
                 line-height: 41px;
@@ -245,4 +257,26 @@
         justify-content: center;
         z-index: 100;
     }
-}
+}
+
+// 清除Button默认样式
+Button {
+    padding: 0;
+    margin: 0;
+    background: none;
+    border: none;
+    line-height: normal;
+    height: 100%;
+    width: 100%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    &::after {
+        border: none;
+    }
+}
+.button-hover {
+    background-color: transparent !important; /* 移除背景高亮 */
+    box-shadow: none !important;             /* 移除可能的阴影 */
+  }

src/pages/login/index.jsx

@@ -34,6 +34,9 @@ export default class Index extends Component {
   //   }
   // };
   login = () => {
+    Taro.showLoading({
+      title: '正在登录',
+    })
     if (!this.state.isChecked) {
       Taro.showToast({
         title: "请先同意协议",
@@ -53,6 +56,7 @@ export default class Index extends Component {
             }).then((res) => {
               Taro.setStorageSync('session_key', res.session_key)
               Taro.setStorageSync('loginInfo', res)
+              Taro.hideLoading()
               Taro.showToast({
                 title: '登录成功',
                 icon: 'none',
@@ -64,13 +68,11 @@ export default class Index extends Component {
               if (lastPage == 'pages/mineSub/login/index') {
                 lastPage = 'pages/index/index'
               }
-              setTimeout(() => {
                 Taro.reLaunch({
                   url: `/${lastPage}?${objToParam(Taro.getStorageSync('optionsData'))}`
                 })
                 Taro.removeStorageSync('currentPage')
                 global.globalData.optionsData = {}
-              }, 1000)
             });
           },
         });

src/pages/memberSub/productClassify/index.jsx

@@ -1,15 +1,18 @@
 import { Component } from "react";
-import { View, Text } from "@tarojs/components";
+import { View } from "@tarojs/components";
 import { AtTabs, AtTabsPane } from "taro-ui";
 import "./index.less";
 import Taro from "@tarojs/taro";
 import ProductList from "../../../components/index/ProductList";
-import { getBrowseShopProductList,addShopProduct,getAllTags } from "../../../service";
+import {
+  getBrowseShopProductList,
+  addShopProduct,
+  getAllTags,
+} from "../../../service";
 export default class Index extends Component {
   state = {
     current: 0, // 当前选中的标签页索引
-    tabList: [
-    ], // 标签页列表
+    tabList: [], // 标签页列表
     productList: [], // 商品列表
     page: 1, //页数
     loading: false, //加载状态
@@ -17,29 +20,38 @@ export default class Index extends Component {
     tabList: [], // 所有闲鱼tags
   };
   handleClick(value) {
-    this.setState({
-      current: value,
-      page: 1,
-    },()=>{
-      this.getBrowseShopProductList(true);
-    });
+    this.setState(
+      {
+        current: value,
+        page: 1,
+      },
+      () => {
+        Taro.pageScrollTo({
+          scrollTop: 0,
+          duration: 300
+        });
+        this.getBrowseShopProductList(true);
+      }
+    );
   }
   componentDidMount() {
     this.getAllTags();
   }
   // 获取商品列表
-  getBrowseShopProductList = async (isAdd=false) => {
+  getBrowseShopProductList = async (isAdd = false) => {
     const { page } = this.state;
     this.setState({ loading: true });
-    
+
     const res = await getBrowseShopProductList({
-      tag_name:this.state.tabList[this.state.current].title,
+      tag_name: this.state.tabList[this.state.current].title,
       page,
       page_size: 10,
     });
 
     this.setState((prevState) => ({
-      productList:isAdd ?  res.goods_list: [...prevState.productList, ...res.goods_list],
+      productList: isAdd
+        ? res.goods_list
+        : [...prevState.productList, ...res.goods_list],
       totalPages: res.total_pages,
       loading: false,
     }));
@@ -50,29 +62,29 @@ export default class Index extends Component {
     res = res.map((item, index) => ({
       title: item.name,
     }));
-    this.setState({
-      tabList: res,
-    },()=>{
-      this.getBrowseShopProductList(true);
-    });
-  }
+    this.setState(
+      {
+        tabList: res,
+      },
+      () => {
+        this.getBrowseShopProductList(true);
+      }
+    );
+  };
   // 添加商品
-  onAddProduct = (productId) => {
+  onAddProduct = (productId, index) => {
     addShopProduct({
       goods_ids: [productId],
-    }).then(res => {
-      if(res.success==true){
-        this.setState((prevState) => ({
-          productList: prevState.productList.map(item => {
-            if(item.id === productId){
-              return { ...item, is_collected: true };
-            }
-            return item;
-          })
-        }));
+    }).then((res) => {
+      if (res.success === true) {
+        this.setState((prevState) => {
+          const newList = [...prevState.productList];
+          newList[index] = { ...newList[index], is_collected: true };
+          return { productList: newList };
+        });
         Taro.showToast({
-          title: '添加成功',
-          icon: 'none',
+          title: "添加成功",
+          icon: "none",
         });
       }
     });
@@ -81,6 +93,7 @@ export default class Index extends Component {
   onReachBottom = () => {
     const { page, totalPages, loading } = this.state;
     if (page < totalPages && !loading) {
+      console.log("触底了");
       this.setState(
         (prevState) => ({ page: prevState.page + 1 }),
         () => this.getBrowseShopProductList()
@@ -95,15 +108,15 @@ export default class Index extends Component {
           current={this.state.current}
           tabList={this.state.tabList}
           onClick={this.handleClick.bind(this)}
-        >
-          {this.state.tabList.map((tab, index) => (
-            <AtTabsPane current={this.state.current} index={index} key={index}>
-              <View className="tab-content">
-                <ProductList loading={this.state.loading} productList={this.state.productList} isProductClassify={true} onAddProduct={this.onAddProduct} />
-              </View>
-            </AtTabsPane>
-          ))}
-        </AtTabs>
+        ></AtTabs>
+        <ProductList
+          loading={this.state.loading}
+          productList={this.state.productList}
+          isProductClassify={true}
+          onAddProduct={(productId, index) =>
+            this.onAddProduct(productId, index)
+          }
+        />
         {/* 底部按钮 */}
         <View onClick={() => Taro.navigateBack()} className="bottom-button">
           返回店铺首页

src/pages/memberSub/productClassify/index.less

@@ -1,6 +1,6 @@
 .index {
     background-color: #f9f9f9;
-    padding-bottom: 130px;
+    padding-bottom: 160px;
     padding-top: 80px;
     box-sizing: border-box;
     .at-tabs__header{
@@ -33,5 +33,6 @@
         justify-content: center;
         position: fixed;
         bottom: 0;
+        z-index: 1;
     }
 }

src/pages/memberSub/productManagement/index.jsx

@@ -38,6 +38,7 @@ export default class Index extends Component {
     totalPages: 1, // 添加总页数
     selectedProducts: [], // 删除商品选中id数组
     tags: [], // 所有闲鱼tags
+    isNoMore: false, // 是否没有更多
   };
   componentDidShow() {
     this.getAllTags();
@@ -70,6 +71,7 @@ export default class Index extends Component {
           : [...prevState.productList, ...res.goods_list],
         totalPages: res.total_pages,
         loading: false,
+        isNoMore: res.total_pages <= page,
       }),
       () => {
         this.setState((prevState) => ({
@@ -81,7 +83,11 @@ export default class Index extends Component {
   // 商品下拉选项
   handleSelectOption = (e) => {
     const selectedOption = this.state.options[e.detail.value];
-    this.setState({ selectedOption, page: 1 },()=>{
+    this.setState({ selectedOption, page: 1, isNoMore: false },()=>{
+      Taro.pageScrollTo({
+        scrollTop: 0,
+        duration: 300
+      });
       this.getMyShopList(true);
     });
   };
@@ -95,6 +101,8 @@ export default class Index extends Component {
       this.setState(
         {
           isManagementStatus: false,
+          isSelectAll: false, // 重置全选状态
+          checkedList: [], // 重置选中状态
         },
         () => {
           // 在清空后通过回调清除子组件中的选中状态
@@ -127,6 +135,8 @@ export default class Index extends Component {
           productList: prevState.productList.filter(
             (item) => !this.state.selectedProducts.includes(item.id)
           ),
+          isSelectAll: false, // 重置全选状态
+          checkedList: [], // 重置选中状态
         }),
         () => {
           // 在清空后通过回调清除子组件中的选中状态
@@ -251,6 +261,7 @@ export default class Index extends Component {
                     isManagementStatus={this.state.isManagementStatus}
                     loading={this.state.loading}
                     onDeleteProductSelect={this.onDeleteProductSelect}
+                    isNoMore={this.state.isNoMore}
                   />
                 )}
               </View>

src/pages/memberSub/storeManagement/index.jsx

@@ -1,8 +1,8 @@
 import { Component } from "react";
-import { View, Text, Image } from "@tarojs/components";
+import { View, Text, Image, Button } from "@tarojs/components";
 import { AtIcon } from "taro-ui";
 import "./index.less";
-import { getMyShopList, getMyShopDetail } from "../../../service";
+import { getMyShopList, getMyShopDetail, getShareShopDetail, getShareShopProductList } from "../../../service";
 import storeManagement from "../../../images/storeManagement/storeManagement.png";
 import storeManagementIcon from "../../../images/storeManagement/storeManagementIcon.png";
 import ProductCard from "../../../components/ProductCard"; //卡片模块
@@ -16,10 +16,14 @@ export default class Index extends Component {
     page: 1, //页数
     loading: false, //加载状态
     totalPages: 1, // 添加总页数
+    isShare: false, // 是否是分享进入
+    shopId: '', // 店铺id
   };
   // 获取店铺详情
   getMyShopDetail = async () => {
-    const res = await getMyShopDetail();
+    const res = this.state.isShare ? await getShareShopDetail({
+      store_id: this.state.shopId
+    }) :  await getMyShopDetail();
     this.setState({
       shopDetail: res,
     });
@@ -29,8 +33,11 @@ export default class Index extends Component {
     const { page } = this.state;
     this.setState({ loading: true });
 
-    const res = await getMyShopList({
-      tag_name: "",
+    const res = this.state.isShare ? await getShareShopProductList({
+      store_id: this.state.shopId,
+      page,
+      page_size: 10,
+    }) : await getMyShopList({
       page,
       page_size: 10,
     });
@@ -46,10 +53,13 @@ export default class Index extends Component {
     const { router } = Taro.getCurrentInstance();
     const params = router.params;
     this.setState({
-      isManager: params.isManager, //是否是店长
+      isManager: JSON.parse(params.isManager), //是否是店长
+      isShare: params.isShare||false, // 是否是分享进入
+      shopId: params.shopId||'', // 店铺id
+    },()=>{
+      this.getMyShopDetail(); //获取店铺详情
+      this.getMyShopList(true); //获取店铺数据
     });
-    this.getMyShopDetail(); //获取店铺详情
-    this.getMyShopList(true); //获取店铺数据
   }
   // 页面上拉触底
   onReachBottom = () => {
@@ -67,7 +77,21 @@ export default class Index extends Component {
       url: "/pages/mineSub/infoEdit/index",
     });
   };
-
+  // 分享店铺
+  handleShare = () => {
+    Taro.showShareMenu({
+      withShareTicket: true,
+      menus: ['shareAppMessage']
+    });
+  };
+  // 配置分享内容
+  onShareAppMessage() {
+    return {
+      title: "店铺",
+      path: `/pages/memberSub/storeManagement/index?shopId=${this.state.shopDetail.id}&isShare=true&isManager=false`,
+      imageUrl: ''
+    }
+  }
   render() {
     const { shopDetail, productList } = this.state;
     return (
@@ -76,10 +100,14 @@ export default class Index extends Component {
         <View className="header-card">
           <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="user-info">
             <View onClick={this.handleChangeAvatar} className="avatar-wrapper">

src/pages/memberSub/storeManagement/index.less

@@ -78,17 +78,13 @@
             top: 20px;
             right: 20px;
             z-index: 1;
-            display: flex;
-            align-items: center;
-            color: #FFFFFF;
             font-size: 14px;
-            justify-content: center;
-            align-items: center;
 
             Text {
                 font-size: 22px;
                 line-height: 40px;
                 margin-right: 7px;
+            color: #FFFFFF;
             }
         }
     }
@@ -181,4 +177,25 @@
                 }
         }
     }
-}
+}
+
+// 清除Button默认样式
+Button {
+    padding: 0;
+    margin: 0;
+    background: none;
+    border: none;
+    line-height: normal;
+    height: 100%;
+    width: 100%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    &::after {
+      border: none;
+    }
+  }
+  .button-hover {
+    background-color: transparent !important; /* 移除背景高亮 */
+    box-shadow: none !important;             /* 移除可能的阴影 */
+  }

src/service/index.js

@@ -22,6 +22,13 @@ export const getProductDetail = data =>
     method: 'POST',
     data,
   })
+// 咸鱼商品推广转链
+export const getProductPromotion = data =>
+  Request({
+    url: '/xianyu/xianyu_goods_link',
+    method: 'POST',
+    data,
+  })
 // 获取猜你喜欢列表
 export const getProductLikeList = data =>
   Request({
@@ -94,6 +101,20 @@ export const getMyShopList = data =>
     method: 'POST',
     data,
   })
+  // 非店长获取店铺详情
+export const getShareShopDetail = data =>
+  Request({
+    url: '/vip/get_not_oneself_store_detail',
+    method: 'POST',
+    data,
+  })
+  // 非店长获取店铺商品数据列表
+export const getShareShopProductList = data =>
+  Request({
+    url: '/vip/get_not_oneself_store_data_list',
+    method: 'POST',
+    data,
+  })
 // 店铺添加指定商品
 export const addShopProduct = data =>
   Request({