对接会员接口

project.private.config.json

@@ -10,6 +10,27 @@
     "miniprogram": {
       "list": [
         {
+          "name": "pages/mineSub/login/index",
+          "pathName": "pages/mineSub/login/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "pages/searchList/index",
+          "pathName": "pages/indexSub/searchList/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "pages/search/index",
+          "pathName": "pages/search/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
           "name": "pages/memberSub/productManagement/index",
           "pathName": "pages/memberSub/productManagement/index",
           "query": "",
@@ -17,29 +38,29 @@
           "scene": null
         },
         {
-          "name": "pages/infoEdit/index",
-          "pathName": "pages/indexSub/productDetail/index",
-          "query": "id=100",
+          "name": "pages/memberSub/productClassify/index",
+          "pathName": "pages/memberSub/productClassify/index",
+          "query": "",
           "launchMode": "default",
           "scene": null
         },
         {
-          "name": "pages/productManagement/index",
-          "pathName": "pages/productManagement/index",
+          "name": "pages/mineSub/login/index",
+          "pathName": "pages/mineSub/login/index",
           "query": "",
           "launchMode": "default",
           "scene": null
         },
         {
-          "name": "pages/storeManagement/index",
-          "pathName": "pages/storeManagement/index",
-          "query": "isManager=true",
+          "name": "pages/infoEdit/index",
+          "pathName": "pages/indexSub/productDetail/index",
+          "query": "id=100",
           "launchMode": "default",
           "scene": null
         },
         {
           "name": "pages/productManagement/index",
-          "pathName": "pages/mine/index",
+          "pathName": "pages/productManagement/index",
           "query": "",
           "launchMode": "default",
           "scene": null

src/api/config.js

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

src/api/request.js

@@ -16,8 +16,14 @@ export default async (options = { method: 'GET', data: {} }) => {
   const request_data = {
     session_key: Taro.getStorageSync('session_key') || '', // 缓存取值
     appid: getAppId(),
+    channel_name:'WeChat'
   };
 
+  // 如果是登录接口，移除 session_key
+  if (options.url.includes('/user/login_applet')) {
+    delete request_data.session_key;
+  }
+
   try {
     const res = await Taro.request({
       url: baseUrl + options.url,
@@ -56,6 +62,16 @@ export default async (options = { method: 'GET', data: {} }) => {
           icon: 'none',
           mask: true,
         });
+        const app = Taro.getApp()
+        // 获取当前跳转到登录的页面路径
+        const currentPage = Taro.getCurrentPages();
+        // 储存当前页面路径
+        Taro.setStorageSync('currentPage', currentPage[currentPage.length - 1].route);// 存储页面路径
+        // 储存当前页面数据
+        app.updateOptionsData(currentPage[currentPage.length - 1].options);// 更新页面数据
+        Taro.reLaunch({
+          url: '/pages/mineSub/login/index',
+        });
         throw new Error('需要登录');
       default:
         Taro.showToast({

src/app.config.js

@@ -1,16 +1,17 @@
-
 export default defineAppConfig({
   pages: [
     'pages/index/index',
     'pages/member/index',
-    "pages/mine/index"
+    "pages/mine/index",
+    "pages/search/index",
   ],
   subpackages: [
     {
       root: "pages/indexSub",
       pages: [
         "productDetail/index",
-        "seckillIndex/index"
+        "seckillIndex/index",
+        "searchList/index"
       ]
     },
     {
@@ -32,6 +33,7 @@ export default defineAppConfig({
       pages: [
         "infoEdit/index",
         "userSpecification/index",
+        "login/index"
       ]
     },
   ],

src/app.js

@@ -4,6 +4,15 @@ import './app.less'
 import 'taro-ui/dist/style/index.scss'
 
 class App extends Component {
+  state = {
+    userInfo: Taro.getStorageSync('userInfo') || {},// 用户信息
+    optionsData: {},// 未登录页面跳转数据
+  }
+
+  // 新增方法：更新 optionsData
+  updateOptionsData = (data) => {
+    this.setState({ optionsData: data });
+  }
 
   componentDidMount () {
     // 存储导航栏高度

src/common/toParams.js

@@ -0,0 +1,20 @@
+// 转化字符串（key,value)
+export const objToParam = function (param) {
+    if (Object.prototype.toString.call(param) !== '[object Object]') {
+      return ''
+    }
+    let queryParam = ''
+    for (let key in param) {
+      if (param.hasOwnProperty(key)) {
+        let value = param[key]
+        queryParam += toQueryPair(key, value)
+      }
+    }
+    return queryParam
+  }
+  function toQueryPair(key, value) {
+    if (typeof value == 'undefined') {
+      return `${key}=&`
+    }
+    return `${key}=${value}&`
+  }

src/common/upLoadImg.js

@@ -0,0 +1,34 @@
+import Taro from '@tarojs/taro';
+export const chooseAndUploadImage = (url, user = 'test') => {
+  return new Promise((resolve, reject) => {
+    Taro.chooseImage({
+      success (chooseRes) {
+        const tempFilePaths = chooseRes.tempFilePaths;
+        
+        if (tempFilePaths.length === 0) {
+          reject(new Error('No image selected'));
+          return;
+        }
+
+        Taro.uploadFile({
+          url: url, // 上传的接口地址
+          filePath: tempFilePaths[0],
+          name: 'file',
+          formData: {
+            'user': user
+          },
+          success (uploadRes) {
+            const data = uploadRes.data;
+            resolve(data); // 成功上传后返回数据
+          },
+          fail (error) {
+            reject(error); // 上传失败时返回错误
+          }
+        });
+      },
+      fail (chooseError) {
+        reject(chooseError); // 选择图片失败时返回错误
+      }
+    });
+  });
+};

src/components/index/ProductList/index.jsx

@@ -33,6 +33,22 @@ const ProductList = forwardRef((props, ref) => {
     // 每当 selectedProducts 变化时，调用父组件的回调
     onDeleteProductSelect && onDeleteProductSelect(selectedProducts);
   }, [selectedProducts]);
+  // 监听 isSelectAll 的变化
+  useEffect(() => {
+    if (isSelectAll) {
+      // 如果 isSelectAll 为 true，选中所有商品
+      setSelectedProducts(productList.map((product) => product.id));
+    } else {
+      // 如果 isSelectAll 为 false，取消所有选中
+      setSelectedProducts([]);
+    }
+  }, [isSelectAll, productList]);
+  // 定义 clearSelectedItems 方法
+  useImperativeHandle(ref, () => ({
+    clearSelectedItems: () => {
+      setSelectedProducts([]);
+    }
+  }));
 
   // 跳转产品详情
   const toDetail = (id) => {
@@ -45,16 +61,6 @@ const ProductList = forwardRef((props, ref) => {
     }
   };
 
-  // 监听 isSelectAll 的变化
-  useEffect(() => {
-    if (isSelectAll) {
-      // 如果 isSelectAll 为 true，选中所有商品
-      setSelectedProducts(productList.map((product) => product.id));
-    } else {
-      // 如果 isSelectAll 为 false，取消所有选中
-      setSelectedProducts([]);
-    }
-  }, [isSelectAll]); // 依赖项是 isSelectAll
   // 单选
   const selectProduct = (productId) => {
     setSelectedProducts((prevSelected) => {
@@ -71,9 +77,9 @@ const ProductList = forwardRef((props, ref) => {
   // 添加商品
   const addProduct = (productId, is_collected) => {
     // 是否添加到我的商店（is_collected:为true已添加）
-    if(is_collected){
+    if (is_collected) {
       return;
-    }else{
+    } else {
       // 调用父组件的方法
       onAddProduct && onAddProduct(productId);
     }
@@ -122,11 +128,11 @@ const ProductList = forwardRef((props, ref) => {
                       </Text>
                     )}
                   </View>
-                  {!isSeckill && !isManagement && (
+                  {isProductClassify && (
                     <View
                       onClick={(e) => {
                         e.stopPropagation();
-                        addProduct(product.id,product.is_collected);
+                        addProduct(product.id, product.is_collected);
                       }}
                       className="add-btn"
                     >
@@ -178,6 +184,7 @@ const ProductList = forwardRef((props, ref) => {
       {loading && (
         <View className="loading">
           <AtActivityIndicator
+            content="加载中..."
             isOpened={loading}
             mode="center"
             color="#fdf764"

src/pages/index/index.jsx

@@ -2,7 +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 { getHomeData, getProductList } from "../../service";
 import "./index.less";
 import SearchBar from "../../components/index/SearchBar"; //搜索框
 import CategoryList from "../../components/index/CategoryList"; //分类列表
@@ -32,15 +32,19 @@ export default class Index extends Component {
     ],
     bannerList: [],
     productList: [], // 添加商品列表
-    page: 1,         // 添加页码
-    totalPages: 1,   // 添加总页数
-    loading: false   // 添加加载状态
+    page: 1, // 添加页码
+    totalPages: 1, // 添加总页数
+    loading: false, // 添加加载状态
   };
   // 获取首页数据
   getHomeData = async () => {
     const res = await getHomeData();
-    res.tags = res.tags.split(",").map((title) => ({ title }));
-    this.setState({ homeData: res });
+    res.tags = res.tags.map((item, index) => ({
+      title: item.name,
+    }));
+    this.setState({ homeData: res }, () => {
+      this.getProductList(true);
+    });
   };
   // 搜索框值改变
   handleChange(value) {
@@ -48,29 +52,32 @@ export default class Index extends Component {
   }
   // 修改 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  
+    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,
+              });
+              this.getProductList(true);
+            } else {
+              console.warn("未找到 .product-list-wrap 元素");
+            }
           });
-        } else {
-          console.warn('未找到 .product-list-wrap 元素');
-        }
-      });
-    });
+      }
+    );
   }
   componentDidShow() {
     this.getHomeData(); //获取首页数据
-    this.getProductList(true); //获取商品列表
   }
 
   // 添加回到顶部方法
@@ -86,7 +93,7 @@ export default class Index extends Component {
     const { page, totalPages, loading } = this.state;
     if (page < totalPages && !loading) {
       this.setState(
-        prevState => ({ page: prevState.page + 1 }),
+        (prevState) => ({ page: prevState.page + 1 }),
         () => this.getProductList()
       );
     }
@@ -96,17 +103,19 @@ export default class Index extends Component {
   getProductList = async (isRefresh) => {
     const { page } = this.state;
     this.setState({ loading: true });
-    
     const res = await getProductList({
-      tag_name: "",
+      // tag_name:  this.state.homeData.tags[this.state.current].title,
+      tag_name:'首页',
       page,
       page_size: 10,
     });
 
-    this.setState(prevState => ({
-      productList: isRefresh ? res.goods_list : [...prevState.productList, ...res.goods_list],
+    this.setState((prevState) => ({
+      productList: isRefresh
+        ? res.goods_list
+        : [...prevState.productList, ...res.goods_list],
       totalPages: res.total_pages,
-      loading: false
+      loading: false,
     }));
   };
 
@@ -125,12 +134,17 @@ export default class Index extends Component {
               src="https://video-img.fyshark.com/1731495433480WechatIMG674.jpg"
             />
           </View>
-          {/* 搜索框 */}
-          <SearchBar
-            value={this.state.value}
-            onChange={this.handleChange}
-            onSearch={this.handleSearch}
-          />
+          {/* 搜索框包裹盒子 */}
+          <View
+            className="search-bar-container"
+            onClick={() => Taro.navigateTo({ url: '/pages/search/index' })}
+          >
+            <SearchBar
+              value={this.state.value}
+              onChange={this.handleChange}
+              onSearch={this.handleSearch}
+            />
+          </View>
           {/* tab分类 */}
           <View className="tabs-list">
             {homeData.tags && (
@@ -177,14 +191,7 @@ export default class Index extends Component {
         {/* <RecommendList /> */}
         {/* 商品列表 */}
         <View className="product-list-wrap">
-          <ProductList
-          productList={productList}
-            loading={loading}
-          />
-          <ProductList
-          productList={productList}
-            loading={loading}
-          />
+          <ProductList productList={productList} loading={loading} />
         </View>
         {/* 添加浮动按钮 */}
         <View className="float-buttons">

src/pages/indexSub/productDetail/index.jsx

@@ -138,7 +138,7 @@ export default class Index extends Component {
 
           {/* 商品编号行 */}
           <View className="product-number-row">
-            <Text className="number-label">商品编号：123456</Text>
+            <Text className="number-label">商品编号：{productDetail.goods_number}</Text>
             <Text
               className="copy-btn"
               onClick={() => this.handleCopy("123456")}

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

@@ -0,0 +1,4 @@
+export default definePageConfig({
+  navigationBarTitleText: '搜索列表'
+})
+

src/pages/indexSub/searchList/index.jsx

@@ -0,0 +1,16 @@
+import { Component } from "react";
+import Taro from "@tarojs/taro";
+import { View } from "@tarojs/components";
+import "./index.less";
+import ProductList from "../../../components/index/ProductList";
+export default class Index extends Component {
+  state = {};
+  render() {
+    return (
+      <View className="index">
+        {/* 搜索列表 */}
+        <ProductList></ProductList>
+      </View>
+    );
+  }
+}

src/pages/indexSub/searchList/index.less

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

src/pages/indexSub/seckillIndex/index.jsx

@@ -3,15 +3,55 @@ import { View, Image } from "@tarojs/components";
 import "./index.less";
 import seckillImg from "../../../images/seckill/seckillTop.png";
 import ProductList from "../../../components/index/ProductList";
+import { getRecommendProductList } from "../../../service";
 export default class Index extends Component {
+  state = {
+    productList: [], //推荐商品列表
+    page: 1, //页数
+    loading: false, //加载状态
+    totalPages: 1, // 添加总页数
+  };
+  componentDidMount() {
+    this.getRecommendProductList();
+  }
+  // 获取推荐商品列表
+  getRecommendProductList = async () => {
+    const { page } = this.state;
+    this.setState({ loading: true });
+
+    const res = await getRecommendProductList({
+      tag_id: 120,
+      page,
+      page_size: 10,
+    });
 
+    this.setState((prevState) => ({
+      productList: [...prevState.productList, ...res.goods_list],
+      totalPages: res.total_pages,
+      loading: false,
+    }));
+  };
+  // 页面上拉触底
+  onReachBottom = () => {
+    const { page, totalPages, loading } = this.state;
+    if (page < totalPages && !loading) {
+      this.setState(
+        (prevState) => ({ page: prevState.page + 1 }),
+        () => this.getRecommendProductList()
+      );
+    }
+  };
   render() {
     return (
       <View className="index">
         <Image className="seckill" src={seckillImg} mode="aspectFill" />
         {/* 商品列表 */}
         <View className="product-list">
-          <ProductList isSeckill={true} />
+          <ProductList
+            isSeckill={true}
+            productList={this.state.productList}
+            loading={this.state.loading}
+          />
         </View>
       </View>
     );

src/pages/indexSub/seckillIndex/index.less

@@ -1,5 +1,7 @@
 .index{
     width: 100%;
+    padding-bottom: 40px;
+    box-sizing: border-box;
     .seckill{
         width: 100%;
         height: 300px;

src/pages/member/index.jsx

@@ -10,6 +10,7 @@ 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";
 export default class Index extends Component {
   state={
     vipInfo:{},//会员信息 
@@ -18,7 +19,12 @@ export default class Index extends Component {
   getVipInfo = async () =>{
     const res = await getVipInfo()
     this.setState({
-      vipInfo:res
+      vipInfo: res || {
+        users: { name: "未登录", icon: avatar },
+        earnings: { store_earnings_now: 0, store_earnings_all: 0 },
+        draw_money: { store_earnings_now: 0 },
+        order: { order_all: 0, order_promotion: 0, order_pay: 0 }
+      }
     })
   }
   componentDidShow() {
@@ -36,7 +42,7 @@ export default class Index extends Component {
             <View className="member-info-card-header">
               {vipInfo.users && <Image className="avatar" src={vipInfo.users.icon} mode="aspectFill" />}
               <View className="member-info-card-header-text">
-                {vipInfo.users && <Text className="user-name">{vipInfo.users.channel_name}</Text>}
+                {vipInfo.users && <Text className="user-name">{vipInfo.users.name}</Text>}
                 <View className="member-info-card-header-text-level">
                   <Text className="level-text">店长</Text>
                   <Image className="level-icon" src={vip} />

src/pages/memberSub/productClassify/index.jsx

@@ -50,7 +50,17 @@ export default class Index extends Component {
       goods_ids: [productId],
     }).then(res => {
       if(res.success==true){
-        this.getBrowseShopProductList(true);
+        // this.getBrowseShopProductList(true);
+        this.setState((prevState) => ({
+          productList: prevState.productList.map(item => {
+            if(item.id === productId){
+              return { ...item, is_collected: true };
+            }
+            return item;
+          })
+        }));
+        console.log(this.state.productList);
+        
         Taro.showToast({
           title: '添加成功',
           icon: 'none',

src/pages/memberSub/productClassify/index.less

@@ -1,7 +1,8 @@
 .index {
     background-color: #f9f9f9;
-    padding-bottom: 100px;
+    padding-bottom: 130px;
     padding-top: 80px;
+    box-sizing: border-box;
     .at-tabs__header{
         position: fixed;
         top: 0;

src/pages/memberSub/productManagement/index.jsx

@@ -1,9 +1,13 @@
-import { Component } from "react";
+import React, { Component, createRef } from "react";
 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 {
+  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";
@@ -12,12 +16,13 @@ import selectIcon from "../../../images/productManagement/selectIcon.png";
 import deleteIcon from "../../../images/productManagement/delete.png";
 import toTop from "../../../images/productManagement/toTop.png";
 export default class Index extends Component {
+  childComponentRef = React.createRef(); // 创建 ref
   state = {
     isManagementStatus: false, //是否是管理状态
     current: 0, //tabs坐标
     isSelectAll: false, //是否全选
     selectedOption: "全部商品", //商品默认名称
-    tabList: [{ title: "在售中 (20)" }], //tabs标题
+    tabList: [{ title: "在售中 (0)" }], //tabs标题
     options: ["全部商品", "选项2", "选项3"], //商品下拉选项
     checkedList: [""], //全选
     checkboxOption: [
@@ -46,11 +51,20 @@ export default class Index extends Component {
       page_size: 10,
     });
 
-    this.setState((prevState) => ({
-      productList: isDelete ? res.goods_list : [...prevState.productList, ...res.goods_list],
-      totalPages: res.total_pages,
-      loading: false,
-    }));
+    this.setState(
+      (prevState) => ({
+        productList: isDelete
+          ? res.goods_list
+          : [...prevState.productList, ...res.goods_list],
+        totalPages: res.total_pages,
+        loading: false,
+      }),
+      () => {
+        this.setState((prevState) => ({
+          tabList: [{ title: `在售中 (${res.total_count})` }],
+        }));
+      }
+    );
   };
   // tabs切换
   handleClick(value) {
@@ -70,9 +84,15 @@ export default class Index extends Component {
         isManagementStatus: true,
       });
     } else {
-      this.setState({
-        isManagementStatus: false,
-      });
+      this.setState(
+        {
+          isManagementStatus: false,
+        },
+        () => {
+          // 在清空后通过回调清除子组件中的选中状态
+          this.childComponentRef.current.clearSelectedItems();
+        }
+      );
     }
   };
   // 全选
@@ -83,51 +103,84 @@ export default class Index extends Component {
     });
   }
   // 删除商品
-  onDeleteProduct = async() => {
-    if(this.state.selectedProducts.length==0){
+  onDeleteProduct = async () => {
+    if (this.state.selectedProducts.length == 0) {
       Taro.showToast({
-        title: '请选择商品',
-        icon: 'none',
+        title: "请选择商品",
+        icon: "none",
       });
       return;
     }
-   const res = await deleteShopProduct({
+    const res = await deleteShopProduct({
       goods_ids: this.state.selectedProducts,
-    })
-    if(res.success==true){
-      this.getMyShopList(true);
+    });
+    if (res.success == true) {
+      this.setState((prevState) => ({
+          productList: prevState.productList.filter(
+            (item) => !this.state.selectedProducts.includes(item.id)
+          ),
+        }),
+        () => {
+          // 在清空后通过回调清除子组件中的选中状态
+          this.childComponentRef.current.clearSelectedItems();
+          this.setState((prevState) => ({
+            tabList: [{ title: `在售中 (${prevState.productList.length})` }],
+          }));
+        }
+      );
       Taro.showToast({
-        title: '删除成功',
-        icon: 'none',
+        title: "删除成功",
+        icon: "none",
       });
     }
   };
   // 更新商品排序
-  updateProductSort = async() => {
-    if(this.state.selectedProducts.length==0){
+  updateProductSort = async () => {
+    if (this.state.selectedProducts.length === 0) {
       Taro.showToast({
-        title: '请选择商品',
-        icon: 'none',
+        title: "请选择商品",
+        icon: "none",
       });
       return;
-    }else if(this.state.selectedProducts.length>1){
+    } else if (this.state.selectedProducts.length > 1) {
       Taro.showToast({
-        title: '只能选择一个商品',
-        icon: 'none',
+        title: "只能选择一个商品",
+        icon: "none",
       });
       return;
     }
     const res = await updateProductSort({
-      goods_id: this.state.selectedProducts.join(','),
-    })
-    if(res.success=='排序完成'){
-      this.getMyShopList(true);
+      goods_id: this.state.selectedProducts.join(","),
+    });
+
+    if (res.success === "排序完成") {
+      this.setState(
+        (prevState) => {
+          // 从 productList 中移除选中的商品
+          const remainingProducts = prevState.productList.filter(
+            (item) => !this.state.selectedProducts.includes(item.id)
+          );
+          // 将选中的商品添加到列表的开头
+          const sortedProducts = this.state.selectedProducts.map((id) =>
+            prevState.productList.find((item) => item.id === id)
+          );
+          return {
+            productList: [...sortedProducts, ...remainingProducts],
+            selectedProducts: [],
+          };
+        },
+        () => {
+          // 在清空后通过回调清除子组件中的选中状态
+          this.childComponentRef.current.clearSelectedItems();
+        }
+      );
+
       Taro.showToast({
-        title: '排序完成',
-        icon: 'none',
+        title: "排序完成",
+        icon: "none",
       });
     }
-  }
+  };
   // 页面上拉触底
   onReachBottom = () => {
     const { page, totalPages, loading } = this.state;
@@ -142,11 +195,14 @@ export default class Index extends Component {
   onDeleteProductSelect = (selectedProducts) => {
     // 可以将选中的商品保存到父组件的状态中
     this.setState({ selectedProducts });
-  }
-
+  };
   render() {
     return (
-      <View className="index">
+      <View
+        className={`index ${
+          this.state.isManagementStatus ? "management-active" : ""
+        }`}
+      >
         {/* tab分类 */}
         <View className="tabs-list">
           <AtTabs
@@ -180,6 +236,7 @@ export default class Index extends Component {
                 {/* 商品列表 */}
                 {this.state.productList && (
                   <ProductList
+                    ref={this.childComponentRef} // 将 ref 传递给子组件
                     productList={this.state.productList}
                     isSelectAll={this.state.isSelectAll}
                     isManagement={true}

src/pages/memberSub/productManagement/index.less

@@ -1,6 +1,11 @@
+.management-active{
+    padding-bottom: 190px !important;
+}
 .index {
     background-color: #f9f9f9;
+    padding-bottom: 170px;
     min-height: 100vh;
+    box-sizing: border-box;
     .tabs-list {
         box-sizing: border-box;
         box-sizing: border-box;

src/pages/memberSub/storeManagement/index.jsx

@@ -61,6 +61,12 @@ export default class Index extends Component {
       );
     }
   };
+  // 更换头像
+  handleChangeAvatar = () => {
+    Taro.navigateTo({
+      url: "/pages/mineSub/infoEdit/index",
+    });
+  };
 
   render() {
     const { shopDetail, productList } = this.state;
@@ -76,7 +82,7 @@ export default class Index extends Component {
           </View>
           {/* 个人信息 */}
           <View className="user-info">
-            <View className="avatar-wrapper">
+            <View onClick={this.handleChangeAvatar} className="avatar-wrapper">
               <Image
                 className="avatar"
                 mode="aspectFill"

src/pages/memberSub/storeManagement/index.less

@@ -35,7 +35,6 @@
                     width: 116px;
                     height: 116px;
                     border-radius: 50%;
-                    background-color: red;
                 }
 
                 .change-avatar-btn {

src/pages/mine/index.jsx

@@ -1,65 +1,101 @@
-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'
+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 {
+  state = {
+    userInfo: {}, //用户信息
+  };
+  // 退出登录
   handleLogout = () => {
     Taro.showModal({
-      title: '',
-      content: '退出后，请重新登录!',
-      cancelText: '暂不退出',
-      confirmText: '退出登录',
-      cancelColor: '#000000',
-      confirmColor: '#F6C71A',
+      title: "",
+      content: "退出后，请重新登录!",
+      cancelText: "暂不退出",
+      confirmText: "退出登录",
+      cancelColor: "#000000",
+      confirmColor: "#F6C71A",
       success: function (res) {
         if (res.confirm) {
-          console.log('用户点击退出登录')
+          Taro.removeStorageSync("session_key");
+          Taro.removeStorageSync("loginInfo");
+          Taro.removeStorageSync("userInfo");
+          console.log("用户点击退出登录");
         }
-      }
-    })
+      },
+    });
+  };
+  componentDidShow(){
+    const userInfo = Taro.getStorageSync('userInfo')
+    const session_key = Taro.getStorageSync('session_key')
+    if(!userInfo&&session_key){
+      this.getUserInfo()
+    }else{
+      this.setState({
+        userInfo: userInfo||{},
+      })
+    }
   }
+  // 获取用户信息
   getUserInfo = async () => {
     const res = await getUserInfo();
-    console.log(res);
+    Taro.setStorageSync("userInfo", res);
+    this.setState({
+      userInfo: res,
+    });
   };
-  componentDidMount(){
-    this.getUserInfo()
-  }
-  render () {
+  render() {
+    const { userInfo } = this.state;
     return (
-      <View className='index'>
+      <View className="index">
         {/* 个人信息 */}
         <View className="info">
-          <Image src={avatar} className="avatar" />
+          <Image src={userInfo.icon?userInfo.icon:avatar} className="avatar" />
           <View className="info-right">
-            <View className='user-info'>
-            <View className="name">张三</View>
-            <View className="account">138001</View>
+            <View className="user-info">
+              <View className="name">{userInfo.name?userInfo.name:'未登录'}</View>
+              <View className="account">{userInfo.id?userInfo.id:'XXXX'}</View>
             </View>
-            <Image onClick={() => Taro.navigateTo({ url: `/pages/mineSub/infoEdit/index` })} className='edit-icon' src={edit}></Image>
+            <Image
+              onClick={() =>
+                Taro.navigateTo({ url: `/pages/mineSub/infoEdit/index` })
+              }
+              className="edit-icon"
+              src={edit}
+            ></Image>
           </View>
         </View>
         {/* 功能 */}
-        <View className='function'>
+        <View className="function">
           <AtList hasBorder={false}>
-            <AtListItem hasBorder={false} onClick={() => Taro.navigateTo({ url: `/pages/mineSub/userSpecification/index` })} title='用户规范' arrow='right' thumb={norm}/>
-            <View className='line'></View>
-            <AtListItem 
+            <AtListItem
               hasBorder={false}
-              title='退出登录' 
-              arrow='right' 
+              onClick={() =>
+                Taro.navigateTo({
+                  url: `/pages/mineSub/userSpecification/index`,
+                })
+              }
+              title="用户规范"
+              arrow="right"
+              thumb={norm}
+            />
+            {/* <View className="line"></View> */}
+            {/* <AtListItem
+              hasBorder={false}
+              title="退出登录"
+              arrow="right"
               thumb={loginOut}
               onClick={this.handleLogout}
-            />
+            /> */}
           </AtList>
         </View>
       </View>
-    )
+    );
   }
 }

src/pages/mineSub/infoEdit/index.jsx

@@ -1,6 +1,9 @@
 import { Component } from "react";
-import { View, Text, Image } 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 "./index.less";
 
 export default class Index extends Component {
@@ -8,35 +11,85 @@ export default class Index extends Component {
     wxAccount: "",
     nickName: "",
     phone: "",
+    avatar: "",
   };
-  handleAccountChange (value) {
+  componentDidMount() {
+    this.getUserInfo();
+  }
+  // 获取用户信息
+  async getUserInfo() {
+    const res = await getUserInfo();
+    this.setState({
+      wxAccount: res.wechat_account,
+      nickName: res.name,
+      phone: res.phone,
+      avatar: res.icon,
+    });
+  }
+  // 微信账号
+  handleAccountChange(value) {
     this.setState({
       wxAccount: value,
     });
     return value;
   }
-  handleNickNameChange (value) {
+  // 昵称
+  handleNickNameChange(value) {
     this.setState({
       nickName: value,
     });
     return value;
   }
-  handlePhoneChange (value) {
+  // 手机号
+  handlePhoneChange(value) {
     this.setState({
       phone: value,
     });
     return value;
   }
+  // 选择头像
+  handleChooseAvatar = (e) => {
+    this.setState({
+      avatar: e.detail.avatarUrl,
+    });
+  }
+  // 提交
+  handleSubmit = async () => {
+    const phoneRegex = /^1[3-9]\d{9}$/; // 中国大陆手机号正则
+    if (!this.state.nickName || !this.state.phone) {
+      Taro.showToast({
+        title: "请输入完整信息",
+        icon: "none",
+      });
+      return;
+    } else if (!phoneRegex.test(this.state.phone)) {
+      Taro.showToast({
+        title: "请输入正确的手机号",
+        icon: "none",
+      });
+      return;
+    }
+    const res = await updateUserInfo({
+      icon: this.state.avatar,
+      name: this.state.nickName,
+      phone: this.state.phone,
+      wechat_account: this.state.wxAccount,
+    });
+    Taro.showToast({
+      title: '修改成功',
+      icon: "none",
+    });
+  };
   render() {
     return (
       <View className="index">
         {/* 头像 */}
         <View className="info-edit">
           <Image
-            src="https://video-img.fyshark.com/1731495433480WechatIMG674.jpg"
+            src={this.state.avatar||avatar}
             className="info-edit-img"
           />
-          <Text className="info-edit-title">更换头像</Text>
+          {/* <Button onChooseAvatar={this.handleChooseAvatar} open-type="chooseAvatar" className="info-edit-title">更换头像</Button> */}
         </View>
         {/* 内容 */}
         <View className="info-edit-content">
@@ -57,17 +110,17 @@ export default class Index extends Component {
             onChange={this.handleNickNameChange.bind(this)}
           />
           <AtInput
-          border={false}  
+            border={false}
             name="value"
             title="手机号"
-            type="text"
+            type="number"
             placeholder="请输入手机号"
             value={this.state.phone}
             onChange={this.handlePhoneChange.bind(this)}
           />
         </View>
         {/* 提交按钮 */}
-        <View className="info-edit-submit">
+        <View onClick={this.handleSubmit} className="info-edit-submit">
           <Text className="info-edit-submit-text">提交</Text>
         </View>
       </View>

src/pages/mineSub/infoEdit/index.less

@@ -2,6 +2,7 @@
     padding-top: 67px;
     background-color: #f5f5f5;
     min-height: 100vh;
+    box-sizing: border-box;
     // 头像
     .info-edit{
         display: flex;
@@ -19,6 +20,10 @@
             line-height: 41px;
             font-size: 28px;
             color: #F09A31;
+            background-color: #f5f5f5;
+            &::after{
+                border: none;
+            }
         }
     }
     // 内容

src/pages/mineSub/login/index.config.js

@@ -0,0 +1,3 @@
+export default definePageConfig({
+  navigationBarTitleText: '授权登录'
+})

src/pages/mineSub/login/index.jsx

@@ -0,0 +1,123 @@
+import { Component } from "react";
+import { View, Image, Button, Checkbox } from "@tarojs/components";
+import Taro from "@tarojs/taro";
+import { AtCheckbox } from "taro-ui";
+import { login,getUserInfo } 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,
+  };
+  // 同意协议
+  handleCheckboxChange = (value) => {
+    this.setState({
+      isChecked: value.length > 0,
+    });
+  };
+  // 同意协议
+  handleAgree = () => {
+    Taro.navigateTo({
+      url: "/pages/mineSub/userSpecification/index",
+    });
+  };
+
+  // handleGetPhoneNumber = (e) => {
+  //   if (e.detail.errMsg === "getPhoneNumber:ok") {
+  //     // 处理获取到的手机号信息
+  //     console.log("用户手机号信息：", e);
+  //     // 你可以在这里调用后端接口，将手机号信息发送到服务器
+  //   } else {
+  //     console.log("用户拒绝授权获取手机号");
+  //   }
+  // };
+  login = () => {
+    if (!this.state.isChecked) {
+      Taro.showToast({
+        title: "请先同意协议",
+        icon: "none",
+      });
+      return;
+    }
+    Taro.getUserProfile({
+      desc: "获取用户信息",
+      success: (userInfo) => {
+        Taro.login({
+          success: (res) => {
+            login({
+              code: res.code,
+              head_img:userInfo.avatarUrl,
+              name:userInfo.nickName,
+            }).then((res) => {
+              Taro.setStorageSync('session_key', res.session_key)
+              Taro.setStorageSync('loginInfo', res)
+              Taro.showToast({
+                title: '登录成功',
+                icon: 'none',
+              })
+              getUserInfo().then(res => {
+                Taro.setStorageSync('userInfo', res)
+              })
+              // let lastPage = Taro.getStorageSync('currentPage')
+              // if (lastPage == 'pages/mineSub/login/index') {
+              //   lastPage = 'pages/index/index'
+              // }
+              setTimeout(() => {
+                // Taro.reLaunch({
+                //   url: `/${lastPage}?${objToParam(Taro.getStorageSync('optionsData'))}`
+                // })
+                // Taro.removeStorageSync('currentPage')
+                Taro.reLaunch({
+                  url: '/pages/index/index',
+                })
+              }, 1000)
+            });
+          },
+        });
+      },
+    });
+  };
+
+  render() {
+    const checkboxOption = [
+      {
+        value: "agree",
+        label: "",
+      },
+    ];
+
+    return (
+      <View className="index">
+        <View className="login-content">
+          <Image src={logo1} className="logo" />
+          <View className="title">鱼市</View>
+          <View className="desc">
+            您暂时未获取微信授权，将无法正常使用小程序的功能。请先阅读且同意《鱼市平台用户协议》后再授权登录。
+          </View>
+          {/* <Button open-type="getPhoneNumber" onGetPhoneNumber={this.handleGetPhoneNumber} className="login-button">授权登录</Button> */}
+          <View className="checkbox-container">
+            <AtCheckbox
+              options={checkboxOption}
+              selectedList={this.state.isChecked ? ["agree"] : []}
+              onChange={this.handleCheckboxChange}
+            />
+            <View onClick={this.handleAgree} className="checkbox-text">
+              同意《鱼市平台用户协议》
+            </View>
+          </View>
+
+          <Button
+            className="login-button"
+            // openType={this.state.isChecked ? "getPhoneNumber" : null}
+            onClick={this.login}
+          >
+            授权登录
+          </Button>
+        </View>
+        <Image src={loginBg} className="login-bg" />
+      </View>
+    );
+  }
+}

src/pages/mineSub/login/index.less

@@ -0,0 +1,118 @@
+.index {
+    min-height: 100vh;
+    background-color: #f9f9f9;
+
+    .login-content {
+        padding: 101px 94px 0 94px;
+        box-sizing: border-box;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+    }
+
+    .logo {
+        width: 166px;
+        height: 166px;
+    }
+
+    .title {
+        font-size: 30px;
+        color: #000000;
+        line-height: 40px;
+        margin-top: 17px;
+    }
+
+    .desc {
+        margin-top: 56px;
+        font-size: 24px;
+        color: #919191;
+        line-height: 35px;
+        text-align: left;
+    }
+
+    .login-button {
+        margin-top: 22px;
+        width: 562px;
+        height: 100px;
+        background: #FEE30F;
+        font-size: 32px;
+        color: #000000;
+        line-height: 100px;
+        border-radius: 80px;
+
+        &::after {
+            border: none;
+        }
+    }
+
+    .login-bg {
+        position: fixed;
+        bottom: 0;
+        left: 0;
+        width: 100%;
+        height: 240px;
+    }
+}
+
+.checkbox-container {
+    width: 100%;
+    display: flex;
+    margin-top: 21px;
+}
+.checkbox-text{
+        font-size: 24px;
+        color: #F6C71A;
+        line-height: 35px;
+}
+.at-checkbox {
+    padding: 0;
+    background-color: #f9f9f9;
+    .at-checkbox__option-wrap{
+        padding: 0;
+    }
+    &::before {
+        content: none;
+    }
+
+    &::after {
+        content: none;
+    }
+
+    .at-checkbox__option--selected .at-checkbox__icon-cnt {
+        background-color: #f6c71a;
+        border: none;
+        width: 20px;
+        height: 20px;
+    }
+
+    &__option {
+        padding: 0;
+        margin-bottom: 0;
+    }
+    &__option:active {
+        background-color: transparent;
+    }
+
+    .at-icon-check {
+        height: 18px;
+        width: 18px;
+        font-size: 18px;
+    }
+
+    .at-checkbox__icon-cnt {
+        height: 20px;
+        width: 20px;
+        min-width: 20px;
+        border: 1px solid #919191;
+        box-sizing: border-box;
+        margin-right: 16px;
+        margin-top: 8px;
+    }
+
+
+}
+
+.at-checkbox__icon--checked {
+    box-shadow: none;
+    transition: none;
+}

src/pages/search/index.config.js

@@ -0,0 +1,3 @@
+export default definePageConfig({
+  navigationBarTitleText: '搜索'
+})

src/pages/search/index.jsx

@@ -0,0 +1,20 @@
+import { Component } from "react";
+import Taro from "@tarojs/taro";
+import { View } from "@tarojs/components";
+import SearchBar from "../../components/index/SearchBar"; //搜索框
+import "./index.less";
+export default class Index extends Component {
+  state = {};
+  render() {
+    return (
+      <View className="index">
+        {/* 搜索框 */}
+        <SearchBar
+          value={this.state.value}
+          onChange={this.handleChange}
+          onSearch={this.handleSearch}
+        />
+      </View>
+    );
+  }
+}

src/pages/search/index.less

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

src/service/index.js

@@ -29,13 +29,26 @@ export const getProductLikeList = data =>
     method: 'POST',
     data,
   })
-
+// 获取推荐商品列表   (包括鱼市商品 = 120;高佣专属 = 121)
+export const getRecommendProductList = data =>
+  Request({
+    url: '/api/get_goods_data_list_recommend',
+    method: 'POST',
+    data,
+  })
 
 // -----------------------用户
 // 获取用户详情
 export const getUserInfo = data =>
   Request({
-    url: '/user/user',
+    url: '/user/get_user_info',
+    method: 'POST',
+    data,
+  })
+// 更新用户信息
+export const updateUserInfo = data =>
+  Request({
+    url: '/user/update_user_info',
     method: 'POST',
     data,
   })
@@ -47,48 +60,56 @@ export const getVipInfo = data =>
     method: 'POST',
     data,
   })
-  // 获取我的店铺详情
-  export const getMyShopDetail = data =>
+// 获取我的店铺详情
+export const getMyShopDetail = data =>
   Request({
     url: '/vip/get_store_detail',
     method: 'POST',
     data,
   })
-  // 获取我的店铺数据
-  export const getMyShopList = data =>
+// 获取我的店铺数据
+export const getMyShopList = data =>
   Request({
     url: '/vip/get_store_data_list',
     method: 'POST',
     data,
   })
-  // 店铺添加指定商品
-  export const addShopProduct = data =>
+// 店铺添加指定商品
+export const addShopProduct = data =>
   Request({
     url: '/vip/add_store_goods',
     method: 'POST',
     data,
   })
-  // 删除店铺商品
-  export const deleteShopProduct = data =>
+// 删除店铺商品
+export const deleteShopProduct = data =>
   Request({
     url: '/vip/delete_store_goods',
     method: 'POST',
     data,
   })
-  // 获取浏览店铺的商品列表
-  export const getBrowseShopProductList = data =>
+// 获取浏览店铺的商品列表
+export const getBrowseShopProductList = data =>
   Request({
     url: '/vip/get_goods_data_list_store',
     method: 'POST',
     data,
   })
-  // 更新商品排序
-  export const updateProductSort = data =>
+// 更新商品排序
+export const updateProductSort = data =>
   Request({
     url: '/vip/update_goods_sort',
     method: 'POST',
     data,
   })
+// -----------------------登录
+// 登录
+export const login = data =>
+  Request({
+    url: '/user/login_applet',
+    method: 'POST',
+    data,
+  })