首页和商品接口对接

project.private.config.json

@@ -2,20 +2,28 @@
   "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
   "projectname": "%E9%B1%BC%E5%B8%82",
   "setting": {
-    "compileHotReLoad": false
+    "compileHotReLoad": false,
+    "urlCheck": false
   },
   "libVersion": "3.6.4",
   "condition": {
     "miniprogram": {
       "list": [
         {
-          "name": "pages/infoEdit/index",
-          "pathName": "pages/productSub/infoEdit/index",
+          "name": "pages/memberSub/productManagement/index",
+          "pathName": "pages/memberSub/productManagement/index",
           "query": "",
           "launchMode": "default",
           "scene": null
         },
         {
+          "name": "pages/infoEdit/index",
+          "pathName": "pages/indexSub/productDetail/index",
+          "query": "id=100",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
           "name": "pages/productManagement/index",
           "pathName": "pages/productManagement/index",
           "query": "",

src/api/config.js

@@ -1,6 +1,6 @@
 // 配置请求对象
 // 本地调试 dev 开发阶段
-// export const baseUrl = "https://test-openai.fyshark.com";//测试
-export const baseUrl = "https://openai.fyshark.com";//正式
+export const baseUrl = "http://101.126.135.47:8000";//测试
+// export const baseUrl = "https://openai.fyshark.com";//正式
 
 

src/api/request.js

@@ -1,47 +1,72 @@
 import Taro from '@tarojs/taro';
-import ttappid from '../../project.tt.json'//抖音
-import wxappid from '../../project.config.json'//微信
+import ttappid from '../../project.tt.json'; // 抖音
+import wxappid from '../../project.config.json'; // 微信
 import { baseUrl } from './config';
 
-
-export default (options = {
-  method: 'GET',
-  data: {}
-}) => {
-
-  // 必传参数
-  const request_data = {
-    session_key: Taro.getStorageSync('session_key') || ''//缓存取值
-  };
+const getAppId = () => {
   if (process.env.TARO_ENV === 'weapp') {
-    request_data['appid'] = wxappid.appid
+    return wxappid.appid;
   } else if (process.env.TARO_ENV === 'tt') {
-    request_data['appid'] = ttappid.appid
+    return ttappid.appid;
   }
-  return Taro.request({
-    url: baseUrl + options.url,
-    data: {
-      ...request_data,
-      ...options.data,
-    },
-    header: {
-      'Content-Type': 'application/json',
-      'accept': 'application/json'
-    },
-    method: options.method.toUpperCase(),
-  }).then(res => {
-    const {
-      code,
-      data
-    } = res;
-    if (code == 200) {
-      return data;
-    } else {
-      Taro.showToast({
-        title: `${res.msg}~`,
-        icon: 'none',
-        mask: true,
-      });
+  return '';
+};
+
+export default async (options = { method: 'GET', data: {} }) => {
+  const request_data = {
+    session_key: Taro.getStorageSync('session_key') || '', // 缓存取值
+    appid: getAppId(),
+  };
+
+  try {
+    const res = await Taro.request({
+      url: baseUrl + options.url,
+      data: {
+        ...request_data,
+        ...options.data,
+      },
+      header: {
+        'Content-Type': 'application/json',
+        accept: 'application/json',
+      },
+      method: options.method.toUpperCase(),
+    });
+
+    const { code, data, msg } = res.data;
+    switch (code) {
+      case 200:
+        return data;
+      case 400:
+        Taro.showToast({
+          title: '传参有误',
+          icon: 'none',
+          mask: true,
+        });
+        throw new Error('传参有误');
+      case 422:
+        Taro.showToast({
+          title: 'Validation Error',
+          icon: 'none',
+          mask: true,
+        });
+        throw new Error('Validation Error');
+      case 500:
+        Taro.showToast({
+          title: '需要登录',
+          icon: 'none',
+          mask: true,
+        });
+        throw new Error('需要登录');
+      default:
+        Taro.showToast({
+          title: `${msg || '请求失败'}`,
+          icon: 'none',
+          mask: true,
+        });
+        throw new Error(msg || '请求失败');
     }
-  });
-};
+  } catch (error) {
+    console.error('请求错误:', error);
+    return Promise.reject(error);
+  }
+};

src/components/ProductCard/index.jsx

@@ -5,15 +5,17 @@ import './index.less'
 const ProductCard = ({ product }) => {
   return (
     <View onClick={() => Taro.navigateTo({ url: `/pages/indexSub/productDetail/index?id=${product.id}` })} className='product-card'>
-      <Image className='product-img' src={product.imageUrl} mode='widthFix' />
+      <Image className='product-img' src={product.image_url} mode='aspectFill' />
       <View className='product-content'>
-        <Text className='title'>{product.name}</Text>
+        <Text className='title'>{product.item_title}</Text>
         <View className='price-row'>
           <Text className='price'>
             <Text className='currency'>¥</Text>
-            {product.price}
+            {product.reserve_price}
           </Text>
-          <Text className='original-price'>¥{product.originalPrice}</Text>
+          {
+            product.original_price!='0.00'&&<Text className='original-price'>¥{product.original_price}</Text>
+          }
         </View>
       </View>
     </View>

src/components/ProductCard/index.less

@@ -13,7 +13,6 @@
         .product-img {
             width: 100%;
             height: 324px;
-            background-color: red;
         }
 
         .product-content {

src/components/index/CategoryList/index.jsx

@@ -1,13 +1,14 @@
 import { View, Image, Text } from "@tarojs/components";
 import "./index.less";
 
-const CategoryList = ({ categoryList }) => {
+const CategoryList = (props) => {
+  const { categoryList } = props; //分类列表引用
   return (
     <View className="category-wrap">
       <View className="category-list">
         {categoryList.map(item => (
           <View key={item.id} className="category-item">
-            <Image className="category-icon" src={item.icon} mode="aspectFit" />
+            <Image className="category-icon" src={item.img} mode="aspectFit" />
             <Text className="category-name">{item.name}</Text>
           </View>
         ))}

src/components/index/CategoryList/index.less

@@ -10,7 +10,7 @@
     padding: 25px 17px 22px 17px;
     
     .category-item {
-      width: 20%;
+      width: 96px;
       display: flex;
       flex-direction: column;
       align-items: center;

src/components/index/OperationArea/index.jsx

@@ -2,71 +2,61 @@ import { View, Text, Image } from "@tarojs/components";
 import Taro from "@tarojs/taro";
 import "./index.less";
 
-const OperationArea = () => {
-  // 模拟商品数据
-  const seckillProducts = [
-    {
-      id: 1,
-      name: "商品1",
-      price: 20.20,
-      originalPrice: 30.00,
-      image: "商品图片地址1"
-    },
-    {
-      id: 2,
-      name: "商品2",
-      price: 25.50,
-      originalPrice: 35.00,
-      image: "商品图片地址2"
-    },
-    {
-      id: 3,
-      name: "商品3",
-      price: 15.80,
-      originalPrice: 28.00,
-      image: "商品图片地址3"
-    }
-  ];
-
+const OperationArea = ({ recommend }) => {
   // 添加跳转方法
   const handleNavigate = (type) => {
-    if (type === 'seckill') {
+    if (type === "鱼市秒杀") {
       Taro.navigateTo({
-        url: '/pages/indexSub/seckillIndex/index'
+        url: "/pages/indexSub/seckillIndex/index",
       });
-    } else if (type === 'highCommission') {
-
+    } else if (type === "高佣专项") {
     }
   };
 
   return (
-    <View className="operation-wrap" >
-      <View className="operation-item" onClick={() => handleNavigate('seckill')}>
-        <View className="title">限时秒杀</View>
-        <View className="product-list">
-          {seckillProducts.map(product => (
-            <View key={product.id} className="product-item">
-              <Image className="product-img" src={product.image} mode="aspectFill" />
-              <View className="price-wrap">
-                <View className="current-price">
-                  <Text className="symbol">¥</Text>
-                  <Text className="number">{product.price.toFixed(2)}</Text>
+    <View className="operation-wrap">
+      {recommend.map((item, index) => (
+        <View
+          key={index}
+          className="operation-item"
+          onClick={() => handleNavigate(item.tag.name)}
+        >
+          <View className="title-wrap">
+            <Text className="title">{item.tag.name}</Text>
+            {/* <Text className="tag">高佣金必囤爆品</Text> */}
+          </View>
+          <View className="product-list">
+            {item.goods &&
+              item.goods.map((product, productIndex) => (
+                <View key={productIndex} className="product-item">
+                  <Image
+                    className="product-img"
+                    src={product.image_url}
+                    mode="aspectFill"
+                  />
+                  <View className="price-wrap">
+                    <View className="current-price">
+                      <Text className="symbol">¥</Text>
+                      <Text className="number">{product.reserve_price}</Text>
+                    </View>
+                    <Text className="original-price">
+                      ¥{product.original_price}
+                    </Text>
+                  </View>
                 </View>
-                <Text className="original-price">¥{product.originalPrice.toFixed(2)}</Text>
-              </View>
-            </View>
-          ))}
+              ))}
+          </View>
         </View>
-      </View>
-      <View className="operation-item" onClick={() => handleNavigate('highCommission')}>
+      ))}
+
+      {/* <View className="operation-item" onClick={() => handleNavigate('highCommission')}>
         <View className="title-wrap">
           <Text className="title">高佣专项</Text>
           <Text className="tag">高佣金必囤爆品</Text>
         </View>
-        {/* 这里可以添加高佣专项的具体内容 */}
-      </View>
+      </View> */}
     </View>
   );
 };
 
-export default OperationArea; 
+export default OperationArea;

src/components/index/OperationArea/index.less

@@ -47,8 +47,7 @@
             justify-content: space-between;
 
             .product-item {
-                flex: 1;
-                margin-right: 10px;
+                width: 100px;
                 text-align: center;
 
                 &:last-child {
@@ -59,7 +58,6 @@
                     width: 100%;
                     height: 99px;
                     border-radius: 8px;
-                    background-color: red;
                 }
 
                 .price-wrap {

src/components/index/ProductList/index.jsx

@@ -1,69 +1,55 @@
-import React, { useState, useEffect } from "react";
+import React, {
+  useState,
+  useEffect,
+  forwardRef,
+  useImperativeHandle,
+} from "react";
 import { View, Text, Image } from "@tarojs/components";
-import { AtCheckbox } from "taro-ui";
+import { AtCheckbox, AtActivityIndicator } from "taro-ui";
 import Taro from "@tarojs/taro";
 import "./index.less";
 import joinStoreBg from "../../../images/index/jionStore.png";
+import joinStoreAc from "../../../images/index/joinStoreAc.png";
 import saveMoneyBg from "../../../images/index/save-money.png";
 import shareEarnBg from "../../../images/index/share-earn.png";
 import seckillIcon from "../../../images/seckill/seckillIcon.png";
-const ProductList = (props) => {
-  const { isSeckill } = props; //是否是秒杀产品引用
-  const { isManagement } = props; //是否是管理产品引用
-  const { isManagementStatus } = props; //是否是管理状态引用
-  const { isProductClassify } = props; //是否是分类产品引用
-  const { isSelectAll } = props; //是否是全选
-  const [selectedProducts, setSelectedProducts] = useState([]); // 管理选中的商品列表
-  // 模拟商品数据
-  const products = [
-    {
-      id: 1,
-      image:
-        "https://img-s-msn-com.akamaized.net/tenant/amp/entityid/AA1saL6x.img?w=768&h=411&m=6",
-      name: "这是一个商品名称这是一个商品名称这是一个商品名称这是一个商品名称这是一个商品名称",
-      price: 99.99,
-      originalPrice: 199.99,
-      saveMoney: 10,
-      shareEarn: 20,
-    },
-    {
-      id: 2,
-      image:
-        "https://img-s-msn-com.akamaized.net/tenant/amp/entityid/AA1saL6x.img?w=768&h=411&m=6",
-      name: "这是一个商品名称这是一个商品名称这是一个商品名称这是一个商品名称这是一个商品名称",
-      price: 99.99,
-      originalPrice: 199.99,
-      saveMoney: 10,
-      shareEarn: 20,
-    },
-    {
-      id: 3,
-      image:
-        "https://img-s-msn-com.akamaized.net/tenant/amp/entityid/AA1saL6x.img?w=768&h=411&m=6",
-      name: "这是一个商品名称这是一个商品名称这是一个商品名称这是一个商品名称这是一个商品名称",
-      price: 99.99,
-      originalPrice: 199.99,
-      saveMoney: 10,
-      shareEarn: 20,
-    },
-  ];
+const ProductList = forwardRef((props, ref) => {
+  const {
+    productList, // 商品列表数据
+    loading, // 加载状态
+    isSeckill, // 是否秒杀
+    isManagement, // 是否管理
+    isManagementStatus, // 是否管理状态
+    isProductClassify, // 是否分类
+    isSelectAll, // 是否全选
+    onAddProduct, // 添加商品方法
+    onDeleteProductSelect, // 删除商品选中id数组
+  } = props;
+
+  const [selectedProducts, setSelectedProducts] = useState([]); // 商品选择状态
+
+  // 监听选中状态变化
+  useEffect(() => {
+    // 每当 selectedProducts 变化时，调用父组件的回调
+    onDeleteProductSelect && onDeleteProductSelect(selectedProducts);
+  }, [selectedProducts]);
+
   // 跳转产品详情
   const toDetail = (id) => {
     if (isManagementStatus) {
       selectProduct(id);
-    } else if (isProductClassify) {
-      return;
     } else {
       Taro.navigateTo({
         url: `/pages/indexSub/productDetail/index?id=${id}`,
       });
     }
   };
+
   // 监听 isSelectAll 的变化
   useEffect(() => {
     if (isSelectAll) {
       // 如果 isSelectAll 为 true，选中所有商品
-      setSelectedProducts(products.map((product) => product.id));
+      setSelectedProducts(productList.map((product) => product.id));
     } else {
       // 如果 isSelectAll 为 false，取消所有选中
       setSelectedProducts([]);
@@ -82,6 +68,16 @@ const ProductList = (props) => {
       }
     });
   };
+  // 添加商品
+  const addProduct = (productId, is_collected) => {
+    // 是否添加到我的商店（is_collected:为true已添加）
+    if(is_collected){
+      return;
+    }else{
+      // 调用父组件的方法
+      onAddProduct && onAddProduct(productId);
+    }
+  };
   return (
     <View className="product-list-wrap">
       {isSeckill && (
@@ -90,7 +86,7 @@ const ProductList = (props) => {
           <Text>每日疯抢 限时秒杀</Text>
         </View>
       )}
-      {products.map((product, index) => (
+      {productList.map((product, index) => (
         <View key={product.id}>
           <View onClick={() => toDetail(product.id)} className="product-item">
             {isManagement && isManagementStatus && (
@@ -103,7 +99,7 @@ const ProductList = (props) => {
             <View className="right">
               <Image
                 className="product-img"
-                src={product.image}
+                src={product.image_url}
                 mode="aspectFill"
               />
               <View className="product-info">
@@ -114,23 +110,39 @@ const ProductList = (props) => {
                   <Text className="self-tag">
                     {!isSeckill ? "自营" : "鱼市秒杀"}
                   </Text>
-                  {product.name}
+                  {product.item_title}
                 </View>
                 <View className="price-line">
                   <View className="price-info">
                     <Text className="symbol">¥</Text>
-                    <Text className="price">{product.price}</Text>
-                    <Text className="original-price">
-                      ¥{product.originalPrice}
-                    </Text>
+                    <Text className="price">{product.reserve_price}</Text>
+                    {product.original_price != "0.00" && (
+                      <Text className="original-price">
+                        ¥{product.original_price}
+                      </Text>
+                    )}
                   </View>
                   {!isSeckill && !isManagement && (
-                    <View className="add-btn">
-                      <Image
-                        className="join-store-bg"
-                        src={joinStoreBg}
-                        mode="aspectFit"
-                      />
+                    <View
+                      onClick={(e) => {
+                        e.stopPropagation();
+                        addProduct(product.id,product.is_collected);
+                      }}
+                      className="add-btn"
+                    >
+                      {product.is_collected ? (
+                        <Image
+                          className="join-store-bg"
+                          src={joinStoreBg}
+                          mode="aspectFit"
+                        />
+                      ) : (
+                        <Image
+                          className="join-store-bg"
+                          src={joinStoreAc}
+                          mode="aspectFit"
+                        />
+                      )}
                       <Text className="btn-text">加入小店</Text>
                     </View>
                   )}
@@ -140,29 +152,52 @@ const ProductList = (props) => {
                     <Image className="bg" src={saveMoneyBg} mode="aspectFit" />
                     <View className="content">
                       <Text className="label">自购省</Text>
-                      <Text className="money">¥{product.saveMoney}</Text>
+                      <Text className="money">
+                        ¥{product.estimated_commission}
+                      </Text>
                     </View>
                   </View>
                   <View className="share-earn">
                     <Image className="bg" src={shareEarnBg} mode="aspectFit" />
                     <View className="content">
                       <Text className="label">分享赚</Text>
-                      <Text className="money">¥{product.shareEarn}</Text>
+                      <Text className="money">
+                        ¥{product.estimated_commission}
+                      </Text>
                     </View>
                   </View>
                 </View>
               </View>
             </View>
           </View>
-          {index !== products.length - 1 && <View className="divider"></View>}
+          {index !== productList.length - 1 && (
+            <View className="divider"></View>
+          )}
         </View>
       ))}
+      {loading && (
+        <View className="loading">
+          <AtActivityIndicator
+            isOpened={loading}
+            mode="center"
+            color="#fdf764"
+          />
+        </View>
+      )}
     </View>
   );
-};
+});
 
 ProductList.defaultProps = {
   isSeckill: false,
+  productList: [],
+  loading: false,
+  isManagement: false,
+  isManagementStatus: false,
+  isProductClassify: false,
+  isSelectAll: false,
+  onAddProduct: () => {}, // 添加商品方法
+  onDeleteProductSelect: () => {}, // 删除商品选中id数组
 };
 
 export default ProductList;

src/components/index/ProductList/index.less

@@ -189,4 +189,9 @@
       margin-right: 10px;
     }
   }
-}
+  .loading{
+    width: 100%;
+    position: relative;
+    height: 60px;  
+  }
+}

src/pages/index/index.jsx

@@ -2,6 +2,7 @@ import Taro from "@tarojs/taro"; // 导入 Taro
 import { Component } from "react";
 import { View, Image, Swiper, SwiperItem, Text } from "@tarojs/components";
 import { AtTabs } from "taro-ui";
+import { getHomeData,getProductList } from "../../service";
 import "./index.less";
 import SearchBar from "../../components/index/SearchBar"; //搜索框
 import CategoryList from "../../components/index/CategoryList"; //分类列表
@@ -15,6 +16,7 @@ export default class Index extends Component {
   state = {
     value: "",
     current: 0, // 添加当前选中的tab索引
+    homeData: {}, // 首页数据
     tabList: [
       // 添加模拟的tab数据
       { title: "推荐" },
@@ -28,50 +30,48 @@ export default class Index extends Component {
       { title: "食品" },
       { title: "母婴" },
     ],
-    bannerList: [
-      {
-        id: 1,
-        img: "https://img-s-msn-com.akamaized.net/tenant/amp/entityid/AA1saL6x.img?w=768&h=411&m=6",
-      },
-      {
-        id: 2,
-        img: "https://img-s-msn-com.akamaized.net/tenant/amp/entityid/AA1saL6x.img?w=768&h=411&m=6",
-      },
-      {
-        id: 3,
-        img: "https://img-s-msn-com.akamaized.net/tenant/amp/entityid/AA1saL6x.img?w=768&h=411&m=6",
-      },
-    ],
-    categoryList: [
-      { id: 1, icon: "购物袋图标URL", name: "超市" },
-      { id: 2, icon: "手机图标URL", name: "数码" },
-      { id: 3, icon: "衣服图标URL", name: "服饰" },
-      { id: 4, icon: "生鲜图标URL", name: "生鲜" },
-      { id: 5, icon: "美妆图标URL", name: "美妆" },
-      { id: 6, icon: "家电图标URL", name: "家电" },
-      { id: 7, icon: "餐具图标URL", name: "餐厨" },
-      { id: 8, icon: "书本图标URL", name: "图书" },
-      { id: 9, icon: "药品图标URL", name: "医药" },
-      { id: 10, icon: "更多图标URL", name: "更多" },
-    ],
+    bannerList: [],
+    productList: [], // 添加商品列表
+    page: 1,         // 添加页码
+    totalPages: 1,   // 添加总页数
+    loading: false   // 添加加载状态
   };
-
+  // 获取首页数据
+  getHomeData = async () => {
+    const res = await getHomeData();
+    res.tags = res.tags.split(",").map((title) => ({ title }));
+    this.setState({ homeData: res });
+  };
+  // 搜索框值改变
   handleChange(value) {
     this.setState({ value });
   }
-  // 添加tab切换处理函数
+  // 修改 tab 切换处理函数
   handleClick(value) {
     this.setState({
       current: value,
+    }, () => {
+      // 跳转到列表顶部
+      Taro.createSelectorQuery()
+      .select('.product-list-wrap') 
+      .boundingClientRect()
+      .exec(res => {
+        if (res[0]) {
+          const top = res[0].top;
+          Taro.pageScrollTo({
+            scrollTop: top-40, 
+            duration: 300  
+          });
+        } else {
+          console.warn('未找到 .product-list-wrap 元素');
+        }
+      });
     });
   }
-  componentDidMount() {}
-
-  componentWillUnmount() {}
-
-  componentDidShow() {}
-
-  componentDidHide() {}
+  componentDidShow() {
+    this.getHomeData(); //获取首页数据
+    this.getProductList(true); //获取商品列表
+  }
 
   // 添加回到顶部方法
   handleBackTop = () => {
@@ -81,15 +81,46 @@ export default class Index extends Component {
     });
   };
 
+  // 页面上拉触底
+  onReachBottom = () => {
+    const { page, totalPages, loading } = this.state;
+    if (page < totalPages && !loading) {
+      this.setState(
+        prevState => ({ page: prevState.page + 1 }),
+        () => this.getProductList()
+      );
+    }
+  };
+
+  // 获取商品列表
+  getProductList = async (isRefresh) => {
+    const { page } = this.state;
+    this.setState({ loading: true });
+    
+    const res = await getProductList({
+      tag_name: "",
+      page,
+      page_size: 10,
+    });
+
+    this.setState(prevState => ({
+      productList: isRefresh ? res.goods_list : [...prevState.productList, ...res.goods_list],
+      totalPages: res.total_pages,
+      loading: false
+    }));
+  };
+
   render() {
+    const { homeData, productList, loading } = this.state;
     return (
       <View className="index">
         <View
           className="header"
-          style={{ paddingTop: Taro.navigationBarHeight  + "px" }}
+          style={{ paddingTop: Taro.navigationBarHeight + "px" }}
         >
           <View className="header-content">
             <Image
+              mode="heightFix"
               className="header-img"
               src="https://video-img.fyshark.com/1731495433480WechatIMG674.jpg"
             />
@@ -102,12 +133,15 @@ export default class Index extends Component {
           />
           {/* tab分类 */}
           <View className="tabs-list">
-            <AtTabs
-              current={this.state.current}
-              scroll
-              tabList={this.state.tabList}
-              onClick={this.handleClick.bind(this)}
-            />
+            {homeData.tags && (
+              <AtTabs
+                current={this.state.current}
+                scroll
+                tabList={homeData.tags}
+                onClick={this.handleClick.bind(this)}
+              />
+            )}
+
             <View className="tab-more">
               <Image className="tab-more-img" />
             </View>
@@ -122,49 +156,51 @@ export default class Index extends Component {
               indicatorColor="#e8e8e8"
               indicatorActiveColor="#ffffff"
             >
-              {this.state.bannerList.map((item) => (
-                <SwiperItem className="banner-item" key={item.id}>
-                  <Image
-                    className="banner-img"
-                    src={item.img}
-                    mode="aspectFill"
-                  />
-                </SwiperItem>
-              ))}
+              {homeData.banner &&
+                homeData.banner.map((item) => (
+                  <SwiperItem className="banner-item" key={item.id}>
+                    <Image
+                      className="banner-img"
+                      src={item.img}
+                      mode="aspectFill"
+                    />
+                  </SwiperItem>
+                ))}
             </Swiper>
           </View>
         </View>
         {/* 分类列表组件 */}
-        <CategoryList categoryList={this.state.categoryList} />
+        {homeData.icon && <CategoryList categoryList={homeData.icon} />}
         {/* 运营区域 */}
-        <OperationArea />
+        {homeData.recommend && <OperationArea recommend={homeData.recommend} />}
         {/* 邀请人推荐 */}
-        <RecommendList />
+        {/* <RecommendList /> */}
         {/* 商品列表 */}
-        <ProductList />
-
+        <View className="product-list-wrap">
+          <ProductList
+          productList={productList}
+            loading={loading}
+          />
+          <ProductList
+          productList={productList}
+            loading={loading}
+          />
+        </View>
         {/* 添加浮动按钮 */}
         <View className="float-buttons">
           <View
             className="float-btn"
-            onClick={()=>Taro.navigateTo({url:"/pages/memberSub/storeManagement/index"})}
+            onClick={() =>
+              Taro.navigateTo({
+                url: `/pages/memberSub/storeManagement/index?isManager=${true}`,
+              })
+            }
           >
-            <Image
-              className="my-shop-bg"
-              src={myStoreIcon}
-              mode="aspectFit"
-            />
+            <Image className="my-shop-bg" src={myStoreIcon} mode="aspectFit" />
             <Text>我的{"\n"}小店</Text>
           </View>
-          <View
-            className="float-btn"
-            onClick={this.handleBackTop}
-          >
-            <Image
-              className="back-top"
-              src={backTopIcon}
-              mode="aspectFit"
-            />
+          <View className="float-btn" onClick={this.handleBackTop}>
+            <Image className="back-top" src={backTopIcon} mode="aspectFit" />
           </View>
         </View>
       </View>

src/pages/index/index.less

@@ -40,7 +40,7 @@
       margin-top: 24px;
       display: flex;
       height: 40px;
-
+      overflow: hidden;
       .tab-more {
         width: 90px;
         display: flex;
@@ -60,6 +60,9 @@
         height: 100%;
         text-align: left;
       }
+      .at-tabs__header::-webkit-scrollbar {
+        display: none; /* 隐藏滚动条 */
+      }
 
       .at-tabs__item {
         color: #000;

src/pages/indexSub/productDetail/index.jsx

@@ -1,6 +1,7 @@
 import { Component } from "react";
 import { View, Text, Swiper, SwiperItem, Image } from "@tarojs/components";
 import { AtIcon } from "taro-ui";
+import { getProductDetail, getProductLikeList } from "../../../service";
 import "./index.less";
 import Taro from "@tarojs/taro";
 import productDetailIcon from "../../../images/productDetail/productDetailIcon.png";
@@ -15,47 +16,30 @@ export default class Index extends Component {
   state = {
     isShare: false, //是否是分享
     isOpened: false, //是否打开弹窗
-    productList: [
-      {
-        id: 1,
-        name: "青岛大虾",
-        price: 99.9,
-        originalPrice: 159.9,
-        image: "https://example.com/img1.jpg",
-        sales: 1234,
-        tag: "热销",
-      },
-      {
-        id: 2,
-        name: "三文鱼刺身",
-        price: 158,
-        originalPrice: 198,
-        image: "https://example.com/img2.jpg",
-        sales: 856,
-        tag: "新品",
-      },
-      {
-        id: 3,
-        name: "帝王蟹",
-        price: 299,
-        originalPrice: 399,
-        image: "https://example.com/img3.jpg",
-        sales: 566,
-        tag: "限时",
-      },
-    ],
+    productDetail: [], //商品详情
+    productLikeList:[],//推荐商品列表
   };
-
-  componentWillMount() {}
-
-  componentDidMount() {}
-
-  componentWillUnmount() {}
-
-  componentDidShow() {}
-
-  componentDidHide() {}
-
+  // 获取产品详情的方法
+  fetchProductDetails = async (id) => {
+    const res = await getProductDetail({
+      goods_id: id,
+    });
+    this.setState({
+      productDetail: res,
+    });
+  };
+  // 获取猜你喜欢列表
+  getProductLikeList = async () => {
+    const res = await getProductLikeList();
+    this.setState({
+      productLikeList:res
+    })
+  };
+  componentDidMount() {
+    const { id } = Taro.getCurrentInstance().router.params;
+    this.fetchProductDetails(id); //获取产品详情
+    this.getProductLikeList(); //获取猜你喜欢列表
+  }
   // 复制商品编号
   handleCopy = (text) => {
     Taro.setClipboardData({
@@ -94,6 +78,7 @@ export default class Index extends Component {
   };
 
   render() {
+    const { productDetail } = this.state;
     return (
       <View
         className="index"
@@ -106,10 +91,16 @@ export default class Index extends Component {
         )}
         {/* 轮播图 */}
         <Swiper className="swiper" autoplay circular>
-          <SwiperItem>
-            <Image className="swiper-img" src="图片地址1" mode="aspectFill" />
-          </SwiperItem>
-          {/* 可以添加更多 SwiperItem */}
+          {productDetail.images &&
+            productDetail.images.map((imageObj, index) => (
+              <SwiperItem key={index}>
+                <Image
+                  className="swiper-img"
+                  src={imageObj.img}
+                  mode="aspectFill"
+                />
+              </SwiperItem>
+            ))}
         </Swiper>
 
         {/* 商品详情模块 */}
@@ -117,7 +108,7 @@ export default class Index extends Component {
           {/* 商品名称 */}
           <Text className="product-name">
             <Text className="self-tag">自营</Text>
-            商品名称
+            {productDetail.item_title}
           </Text>
 
           {/* 价格和标签行 */}
@@ -126,13 +117,19 @@ export default class Index extends Component {
             <View className="price-box">
               <Text className="current-price">
                 <Text className="currency">¥</Text>
-                299
+                {productDetail.reserve_price}
               </Text>
-              <Text className="original-price">¥399</Text>
+              {productDetail.original_price != "0.00" && (
+                <Text className="original-price">
+                  ¥{productDetail.original_price}
+                </Text>
+              )}
             </View>
             {/* 标签区域 */}
             <View className="tag-box">
-              <Text className="tag">分享赚￥1.51</Text>
+              <Text className="tag">
+                分享赚￥{productDetail.estimated_commission}
+              </Text>
             </View>
           </View>
 
@@ -172,7 +169,7 @@ export default class Index extends Component {
         </View>
         {/* 猜你喜欢产品列表 */}
         <View className="product-card-list">
-          {this.state.productList.map((product) => (
+          {this.state.productLikeList.map((product) => (
             <ProductCard key={product.id} product={product} />
           ))}
         </View>
@@ -189,7 +186,10 @@ export default class Index extends Component {
                   <Image src={share} mode="aspectFit" />
                   <Text className="bottom-buy-text">分享赚</Text>
                 </View>
-                <View className="bottom-buy-right-share">
+                <View
+                  onClick={this.handleBuy}
+                  className="bottom-buy-right-share"
+                >
                   <Image src={selfBuy} mode="aspectFit" />
                   <Text className="bottom-buy-text">自购省</Text>
                 </View>

src/pages/indexSub/productDetail/index.less

@@ -6,7 +6,6 @@
     .swiper {
         width: 100%;
         height: 730px;
-        background-color: red;
         .swiper-img {
             width: 100%;
             height: 100%;

src/pages/member/index.jsx

@@ -1,6 +1,7 @@
 import { Component } from "react";
 import { View, Text, Image } from "@tarojs/components";
 import { AtIcon } from "taro-ui";
+import {getVipInfo} from '../../service'
 import Taro from "@tarojs/taro";
 import "./index.less";
 import vip from "../../images/member/vip.png";
@@ -10,17 +11,22 @@ import warning from "../../images/member/warning.png";
 import withdrawable from "../../images/member/withdrawable.png";
 import order from "../../images/member/order.png";
 export default class Index extends Component {
-  componentWillMount() {}
-
-  componentDidMount() {}
-
-  componentWillUnmount() {}
-
-  componentDidShow() {}
-
-  componentDidHide() {}
+  state={
+    vipInfo:{},//会员信息 
+  }
+  // 获取会员首页数据
+  getVipInfo = async () =>{
+    const res = await getVipInfo()
+    this.setState({
+      vipInfo:res
+    })
+  }
+  componentDidShow() {
+    this.getVipInfo() //获取会员首页数据
+  }
 
   render() {
+    const {vipInfo} = this.state
     return (
       <View className="member">
         <View className="member-bg"></View>
@@ -28,9 +34,9 @@ export default class Index extends Component {
           {/* 会员信息卡 */}
           <View className="member-info-card">
             <View className="member-info-card-header">
-              <Image className="avatar" src="" />
+              {vipInfo.users && <Image className="avatar" src={vipInfo.users.icon} mode="aspectFill" />}
               <View className="member-info-card-header-text">
-                <Text className="user-name">会员</Text>
+                {vipInfo.users && <Text className="user-name">{vipInfo.users.channel_name}</Text>}
                 <View className="member-info-card-header-text-level">
                   <Text className="level-text">店长</Text>
                   <Image className="level-icon" src={vip} />
@@ -44,16 +50,16 @@ export default class Index extends Component {
             </View>
           </View>
           {/* 预估收益 */}
-          <View className="estimated-income">
+          {vipInfo.earnings && <View className="estimated-income">
             <Text className="estimated-income-title">预估收益</Text>
             <View className="estimated-income-content">
               <View className="income-item">
-                <Text className="amount">0.00</Text>
+                <Text className="amount">{vipInfo.earnings.store_earnings_now}</Text>
                 <Text className="label">今日预估收益</Text>
               </View>
               <View className="divider"></View>
               <View className="income-item">
-                <Text className="amount">0.00</Text>
+                <Text className="amount">{vipInfo.earnings.store_earnings_all}</Text>
                 <Text className="label">累计收益</Text>
               </View>
             </View>
@@ -61,7 +67,7 @@ export default class Index extends Component {
               收益详情
               <Image className="to-detail" src={toDetail} />
             </view>
-          </View>
+            </View>}
           {/* 可提现金额 */}
           <View className="withdrawable-amount">
             <View className="withdrawable-amount-header">
@@ -70,7 +76,7 @@ export default class Index extends Component {
             </View>
             <View className="withdrawable-amount-content">
               <View className="left">
-                <Text className="amount">¥0.00</Text>
+                {vipInfo.draw_money && <Text className="amount">¥{vipInfo.draw_money.store_earnings_now}</Text>}
                 <View className="warning-icon-box">
                   <Image className="warning-icon" src={warning} />
                   <Text className="warning-text">未完成提现认证</Text>
@@ -91,20 +97,20 @@ export default class Index extends Component {
                 <AtIcon value='chevron-right' size='10' color='#A1A1A1'></AtIcon>
               </View>
             </View>
-            <View className="today-order-content">
+            {vipInfo.order && <View className="today-order-content">
               <View className="order-item">
                 <Text className="label">订单总量</Text>
-                <Text className="amount">0</Text>
+                <Text className="amount">{vipInfo.order.order_all}</Text>
               </View>
               <View className="order-item">
                 <Text className="label">推广订单</Text>
-                <Text className="amount">0</Text>
+                <Text className="amount">{vipInfo.order.order_promotion}</Text>
               </View>
               <View className="order-item">
                 <Text className="label">购买历史</Text>
-                <Text className="amount">0</Text>
+                <Text className="amount">{vipInfo.order.order_pay}</Text>
               </View>
-            </View>
+            </View>}
           </View>
         </View>
       </View>

src/pages/member/index.less

@@ -38,7 +38,6 @@
                 width: 170px;
                 height: 170px;
                 border-radius: 50%;
-                background-color: red;
             }
 
             .member-info-card-header-text {

src/pages/memberSub/productClassify/index.jsx

@@ -3,8 +3,8 @@ import { View, Text } from "@tarojs/components";
 import { AtTabs, AtTabsPane } from "taro-ui";
 import "./index.less";
 import Taro from "@tarojs/taro";
-import ProductList from '../../../components/index/ProductList'
-
+import ProductList from "../../../components/index/ProductList";
+import { getBrowseShopProductList,addShopProduct } from "../../../service";
 export default class Index extends Component {
   state = {
     current: 0, // 当前选中的标签页索引
@@ -14,12 +14,60 @@ export default class Index extends Component {
       { title: "选项3" },
       { title: "选项4" },
     ], // 标签页列表
+    productList: [], // 商品列表
+    page: 1, //页数
+    loading: false, //加载状态
+    totalPages: 1, // 添加总页数
   };
   handleClick(value) {
     this.setState({
       current: value,
     });
   }
+  componentDidMount() {
+    this.getBrowseShopProductList();
+  }
+  // 获取商品列表
+  getBrowseShopProductList = async (isAdd=false) => {
+    const { page } = this.state;
+    this.setState({ loading: true });
+
+    const res = await getBrowseShopProductList({
+      tag_name: "",
+      page,
+      page_size: 10,
+    });
+
+    this.setState((prevState) => ({
+      productList:isAdd ?  res.goods_list: [...prevState.productList, ...res.goods_list],
+      totalPages: res.total_pages,
+      loading: false,
+    }));
+  };
+  // 添加商品
+  onAddProduct = (productId) => {
+    addShopProduct({
+      goods_ids: [productId],
+    }).then(res => {
+      if(res.success==true){
+        this.getBrowseShopProductList(true);
+        Taro.showToast({
+          title: '添加成功',
+          icon: 'none',
+        });
+      }
+    });
+  };
+  // 页面上拉触底
+  onReachBottom = () => {
+    const { page, totalPages, loading } = this.state;
+    if (page < totalPages && !loading) {
+      this.setState(
+        (prevState) => ({ page: prevState.page + 1 }),
+        () => this.getBrowseShopProductList()
+      );
+    }
+  };
   render() {
     return (
       <View className="index">
@@ -31,7 +79,7 @@ export default class Index extends Component {
           {this.state.tabList.map((tab, index) => (
             <AtTabsPane current={this.state.current} index={index} key={index}>
               <View className="tab-content">
-                <ProductList isProductClassify={true} />
+                <ProductList loading={this.state.loading} productList={this.state.productList} isProductClassify={true} onAddProduct={this.onAddProduct} />
               </View>
             </AtTabsPane>
           ))}

src/pages/memberSub/productClassify/index.less

@@ -1,5 +1,4 @@
 .index {
-    min-height: 100vh;
     background-color: #f9f9f9;
     padding-bottom: 100px;
     padding-top: 80px;

src/pages/memberSub/productManagement/index.jsx

@@ -3,6 +3,7 @@ import { View, Picker, Image, Text } from "@tarojs/components";
 import { AtTabs, AtTabsPane, AtCheckbox } from "taro-ui";
 import Taro from "@tarojs/taro";
 import "./index.less";
+import { getMyShopList,deleteShopProduct,updateProductSort } from "../../../service";
 import ProductList from "../../../components/index/ProductList"; //商品列表
 import add from "../../../images/productManagement/add.png";
 import back from "../../../images/productManagement/back.png";
@@ -25,6 +26,31 @@ export default class Index extends Component {
         label: "全选",
       },
     ], //全选
+    productList: [], // 商品列表
+    page: 1, //页数
+    loading: false, //加载状态
+    totalPages: 1, // 添加总页数
+    selectedProducts: [], // 删除商品选中id数组
+  };
+  componentDidShow() {
+    this.getMyShopList(true);
+  }
+  // 获取商品列表
+  getMyShopList = async (isDelete) => {
+    const { page } = this.state;
+    this.setState({ loading: true });
+
+    const res = await getMyShopList({
+      tag_name: "",
+      page,
+      page_size: 10,
+    });
+
+    this.setState((prevState) => ({
+      productList: isDelete ? res.goods_list : [...prevState.productList, ...res.goods_list],
+      totalPages: res.total_pages,
+      loading: false,
+    }));
   };
   // tabs切换
   handleClick(value) {
@@ -39,11 +65,11 @@ export default class Index extends Component {
   };
   // 切换管理状态
   changeManagement = (type) => {
-    if(type === 'management'){
+    if (type === "management") {
       this.setState({
         isManagementStatus: true,
       });
-    }else{
+    } else {
       this.setState({
         isManagementStatus: false,
       });
@@ -53,9 +79,71 @@ export default class Index extends Component {
   handleChange(value) {
     this.setState({
       checkedList: value,
-      isSelectAll:!this.state.isSelectAll
+      isSelectAll: !this.state.isSelectAll,
     });
   }
+  // 删除商品
+  onDeleteProduct = async() => {
+    if(this.state.selectedProducts.length==0){
+      Taro.showToast({
+        title: '请选择商品',
+        icon: 'none',
+      });
+      return;
+    }
+   const res = await deleteShopProduct({
+      goods_ids: this.state.selectedProducts,
+    })
+    if(res.success==true){
+      this.getMyShopList(true);
+      Taro.showToast({
+        title: '删除成功',
+        icon: 'none',
+      });
+    }
+  };
+  // 更新商品排序
+  updateProductSort = async() => {
+    if(this.state.selectedProducts.length==0){
+      Taro.showToast({
+        title: '请选择商品',
+        icon: 'none',
+      });
+      return;
+    }else if(this.state.selectedProducts.length>1){
+      Taro.showToast({
+        title: '只能选择一个商品',
+        icon: 'none',
+      });
+      return;
+    }
+    const res = await updateProductSort({
+      goods_id: this.state.selectedProducts.join(','),
+    })
+    if(res.success=='排序完成'){
+      this.getMyShopList(true);
+      Taro.showToast({
+        title: '排序完成',
+        icon: 'none',
+      });
+    }
+  }
+  // 页面上拉触底
+  onReachBottom = () => {
+    const { page, totalPages, loading } = this.state;
+    if (page < totalPages && !loading) {
+      this.setState(
+        (prevState) => ({ page: prevState.page + 1 }),
+        () => this.getMyShopList()
+      );
+    }
+  };
+  // 添加处理选中商品的方法
+  onDeleteProductSelect = (selectedProducts) => {
+    // 可以将选中的商品保存到父组件的状态中
+    this.setState({ selectedProducts });
+  }
+
   render() {
     return (
       <View className="index">
@@ -90,7 +178,16 @@ export default class Index extends Component {
                   </View>
                 </View>
                 {/* 商品列表 */}
-                <ProductList isSelectAll={this.state.isSelectAll} isManagement={true} isManagementStatus={this.state.isManagementStatus}/>
+                {this.state.productList && (
+                  <ProductList
+                    productList={this.state.productList}
+                    isSelectAll={this.state.isSelectAll}
+                    isManagement={true}
+                    isManagementStatus={this.state.isManagementStatus}
+                    loading={this.state.loading}
+                    onDeleteProductSelect={this.onDeleteProductSelect}
+                  />
+                )}
               </View>
             </AtTabsPane>
           </AtTabs>
@@ -98,16 +195,29 @@ export default class Index extends Component {
         {/* 底部购买模块 */}
         {!this.state.isManagementStatus ? (
           <View className="bottom-buy">
-            <View onClick={() => Taro.navigateBack()} className="bottom-buy-left">
-              <Image  src={back} mode="aspectFit" />
+            <View
+              onClick={() => Taro.navigateBack()}
+              className="bottom-buy-left"
+            >
+              <Image src={back} mode="aspectFit" />
               <Text className="bottom-buy-text">返回店铺</Text>
             </View>
             <View className="bottom-buy-right">
-              <View onClick={() => this.changeManagement('management')} className="bottom-buy-right-self">
+              <View
+                onClick={() => this.changeManagement("management")}
+                className="bottom-buy-right-self"
+              >
                 <Image src={manger} mode="aspectFit" />
                 <Text className="bottom-buy-text">批量管理</Text>
               </View>
-              <View onClick={() => Taro.navigateTo({ url: '/pages/memberSub/productClassify/index' })} className="bottom-buy-right-share">
+              <View
+                onClick={() =>
+                  Taro.navigateTo({
+                    url: "/pages/memberSub/productClassify/index",
+                  })
+                }
+                className="bottom-buy-right-share"
+              >
                 <Image src={add} mode="aspectFit" />
                 <Text className="bottom-buy-text">添加商品</Text>
               </View>
@@ -124,17 +234,22 @@ export default class Index extends Component {
                 />
               </View>
               <View className="right">
-                <View className="item">
+                <View className="item" onClick={this.updateProductSort}>
                   <Image src={toTop} mode="aspectFit" />
                   <Text>移至顶部</Text>
                 </View>
-                <View className="item">
+                <View onClick={this.onDeleteProduct} className="item">
                   <Image src={deleteIcon} mode="aspectFit" />
                   <Text>删除</Text>
                 </View>
               </View>
             </View>
-            <View onClick={() => this.changeManagement('finish')} className="operation-product-bottom">完成</View>
+            <View
+              onClick={() => this.changeManagement("finish")}
+              className="operation-product-bottom"
+            >
+              完成
+            </View>
           </View>
         )}
       </View>

src/pages/memberSub/storeManagement/index.jsx

@@ -2,6 +2,7 @@ import { Component } from "react";
 import { View, Text, Image } from "@tarojs/components";
 import { AtIcon } from "taro-ui";
 import "./index.less";
+import { getMyShopList, getMyShopDetail } from "../../../service";
 import storeManagement from "../../../images/storeManagement/storeManagement.png";
 import storeManagementIcon from "../../../images/storeManagement/storeManagementIcon.png";
 import ProductCard from "../../../components/ProductCard"; //卡片模块
@@ -10,54 +11,59 @@ import Taro from "@tarojs/taro";
 export default class Index extends Component {
   state = {
     isManager: true,
-    productList: [
-      {
-        id: 1,
-        name: "青岛大虾",
-        price: 99.9,
-        originalPrice: 159.9,
-        image: "https://example.com/img1.jpg",
-        sales: 1234,
-        tag: "热销",
-      },
-      {
-        id: 2,
-        name: "三文鱼刺身",
-        price: 158,
-        originalPrice: 198,
-        image: "https://example.com/img2.jpg",
-        sales: 856,
-        tag: "新品",
-      },
-      {
-        id: 3,
-        name: "帝王蟹",
-        price: 299,
-        originalPrice: 399,
-        image: "https://example.com/img3.jpg",
-        sales: 566,
-        tag: "限时",
-      },
-    ],
+    productList: [], //商品列表
+    shopDetail: {}, //店铺详情
+    page: 1, //页数
+    loading: false, //加载状态
+    totalPages: 1, // 添加总页数
   };
+  // 获取店铺详情
+  getMyShopDetail = async () => {
+    const res = await getMyShopDetail();
+    this.setState({
+      shopDetail: res,
+    });
+  };
+  // 获取商品列表
+  getMyShopList = async (isBack) => {
+    const { page } = this.state;
+    this.setState({ loading: true });
+
+    const res = await getMyShopList({
+      tag_name: "",
+      page,
+      page_size: 10,
+    });
 
-  componentWillMount() {}
+    this.setState((prevState) => ({
+      productList: isBack ? res.goods_list : [...prevState.productList, ...res.goods_list],
+      totalPages: res.total_pages,
+      loading: false,
+    }));
+  };
 
-  componentDidMount() {
+  componentDidShow() {
     const { router } = Taro.getCurrentInstance();
     const params = router.params;
     this.setState({
-      isManager: params.isManager,
+      isManager: params.isManager, //是否是店长
     });
+    this.getMyShopDetail(); //获取店铺详情
+    this.getMyShopList(true); //获取店铺数据
   }
-
-  componentWillUnmount() {}
-
-  componentDidShow() {}
-
-  componentDidHide() {}
+  // 页面上拉触底
+  onReachBottom = () => {
+    const { page, totalPages, loading } = this.state;
+    if (page < totalPages && !loading) {
+      this.setState(
+        (prevState) => ({ page: prevState.page + 1 }),
+        () => this.getMyShopList()
+      );
+    }
+  };
 
   render() {
+    const { shopDetail, productList } = this.state;
     return (
       <View className="index">
         {/* 头部卡片 */}
@@ -71,12 +77,16 @@ export default class Index extends Component {
           {/* 个人信息 */}
           <View className="user-info">
             <View className="avatar-wrapper">
-              <Image className="avatar" src="" />
+              <Image
+                className="avatar"
+                mode="aspectFill"
+                src={shopDetail.img_icon}
+              />
               <View className="change-avatar-btn">更换头像</View>
             </View>
             <View className="info-content">
-              <Text className="name">张三</Text>
-              <Text className="desc">这里是店铺介绍文字内容</Text>
+              <Text className="name">{shopDetail.store_name}</Text>
+              <Text className="desc">{shopDetail.store_intro}</Text>
             </View>
           </View>
         </View>
@@ -86,24 +96,33 @@ export default class Index extends Component {
             <Text className="title">店长推荐</Text>
             <Text className="icon"></Text>
           </View>
-          <View className="product-card-list">
-            {this.state.productList.map((product) => (
-              <ProductCard key={product.id} product={product} />
-            ))}
-          </View>
+          {productList && (
+            <View className="product-card-list">
+              {productList.map((product) => (
+                <ProductCard key={product.id} product={product} />
+              ))}
+            </View>
+          )}
           {/* 底部购买模块 */}
           {this.state.isManager && (
             <View className="bottom-buy">
-              <View className="bottom-buy-left">
+              {/* <View className="bottom-buy-left">
                 <Image src={storeManagementIcon} mode="aspectFit" />
                 <Text className="bottom-buy-text">浏览店铺</Text>
-              </View>
+              </View> */}
               <View className="bottom-buy-right">
-                <View className="bottom-buy-right-self">
+                {/* <View className="bottom-buy-right-self">
                   <Text className="bottom-buy-text">店铺模版</Text>
-                </View>
-                <View onClick={() => Taro.navigateTo({ url:'/pages/memberSub/productManagement/index' })} className="bottom-buy-right-share">
-                  <Text  className="bottom-buy-text">商品管理</Text>
+                </View> */}
+                <View
+                  onClick={() =>
+                    Taro.navigateTo({
+                      url: "/pages/memberSub/productManagement/index",
+                    })
+                  }
+                  className="bottom-buy-right-share"
+                >
+                  <Text className="bottom-buy-text">商品管理</Text>
                 </View>
               </View>
             </View>

src/pages/memberSub/storeManagement/index.less

@@ -1,6 +1,7 @@
 .index {
     padding: 18px 16px 0 16px;
     box-sizing: border-box;
+    min-height: 100vh;
     background-color: #f9f9f9;
     padding-bottom: 150px;
     .header-card {
@@ -155,7 +156,7 @@
                 }
             }
             .bottom-buy-right {
-                width: 550px;
+                width: 100%;
                 height: 100%;
                 display: flex;
                 border-radius: 60px;
@@ -163,7 +164,7 @@
                 .bottom-buy-right-self,.bottom-buy-right-share{
                     line-height: 43px;
                     font-size: 30px;
-                    width: 50%;
+                    width: 100%;
                     display: flex;
                     justify-content: center;
                     align-items: center;

src/pages/mine/index.jsx

@@ -2,10 +2,12 @@ import { Component } from 'react'
 import Taro from '@tarojs/taro'
 import { View, Text, Image } from '@tarojs/components'
 import { AtList, AtListItem } from "taro-ui"
+import {getUserInfo} from '../../service'
 import './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'
 export default class Index extends Component {
   handleLogout = () => {
     Taro.showModal({
@@ -22,13 +24,19 @@ export default class Index extends Component {
       }
     })
   }
-
+  getUserInfo = async () => {
+    const res = await getUserInfo();
+    console.log(res);
+  };
+  componentDidMount(){
+    this.getUserInfo()
+  }
   render () {
     return (
       <View className='index'>
         {/* 个人信息 */}
         <View className="info">
-          <Image src='' className="avatar" />
+          <Image src={avatar} className="avatar" />
           <View className="info-right">
             <View className='user-info'>
             <View className="name">张三</View>

src/pages/mine/index.less

@@ -17,7 +17,6 @@
             height: 116px;
             border-radius: 50%;
             margin-right: 18px;
-            background-color: red;
         }
 
         .info-right {

src/service/index.js

@@ -1,13 +1,94 @@
 //接口集成
 import Request from '../api/request';
-
-//接口请求
-export const login = data =>
+// ------------------------首页
+// 获取首页数据
+export const getHomeData = data =>
   Request({
-    url: '/api/login',
+    url: '/api/get_index_data',
     method: 'POST',
     data,
   });
+// 获取商品列表
+export const getProductList = data =>
+  Request({
+    url: '/api/get_goods_data_list',
+    method: 'POST',
+    data,
+  })
+// 获取商品详情
+export const getProductDetail = data =>
+  Request({
+    url: '/api/get_goods_data_detail',
+    method: 'POST',
+    data,
+  })
+// 获取猜你喜欢列表
+export const getProductLikeList = data =>
+  Request({
+    url: '/api/get_goods_data_list_like',
+    method: 'POST',
+    data,
+  })
+
+
+// -----------------------用户
+// 获取用户详情
+export const getUserInfo = data =>
+  Request({
+    url: '/user/user',
+    method: 'POST',
+    data,
+  })
+// ---------------------会员
+// 获取会员详情
+export const getVipInfo = data =>
+  Request({
+    url: '/vip/get_index_vip_data',
+    method: 'POST',
+    data,
+  })
+  // 获取我的店铺详情
+  export const getMyShopDetail = data =>
+  Request({
+    url: '/vip/get_store_detail',
+    method: 'POST',
+    data,
+  })
+  // 获取我的店铺数据
+  export const getMyShopList = data =>
+  Request({
+    url: '/vip/get_store_data_list',
+    method: 'POST',
+    data,
+  })
+  // 店铺添加指定商品
+  export const addShopProduct = data =>
+  Request({
+    url: '/vip/add_store_goods',
+    method: 'POST',
+    data,
+  })
+  // 删除店铺商品
+  export const deleteShopProduct = data =>
+  Request({
+    url: '/vip/delete_store_goods',
+    method: 'POST',
+    data,
+  })
+  // 获取浏览店铺的商品列表
+  export const getBrowseShopProductList = data =>
+  Request({
+    url: '/vip/get_goods_data_list_store',
+    method: 'POST',
+    data,
+  })
+  // 更新商品排序
+  export const updateProductSort = data =>
+  Request({
+    url: '/vip/update_goods_sort',
+    method: 'POST',
+    data,
+  })