剩余接口对接&&第一版鱼市小程序

project.private.config.json

@@ -3,13 +3,41 @@
   "projectname": "%E9%B1%BC%E5%B8%82",
   "setting": {
     "compileHotReLoad": false,
-    "urlCheck": false
+    "urlCheck": true
   },
   "libVersion": "3.6.4",
   "condition": {
     "miniprogram": {
       "list": [
         {
+          "name": "pages/mineSub/userSpecification/index",
+          "pathName": "pages/mineSub/userSpecification/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "pages/indexSub/searchList/index",
+          "pathName": "pages/indexSub/searchList/index",
+          "query": "keyword=鞋",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "pages/search/index",
+          "pathName": "pages/search/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "pages/infoEdit/index",
+          "pathName": "pages/mineSub/infoEdit/index",
+          "query": "id=100",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
           "name": "pages/mineSub/login/index",
           "pathName": "pages/mineSub/login/index",
           "query": "",
@@ -52,13 +80,6 @@
           "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/request.js

@@ -16,7 +16,7 @@ export default async (options = { method: 'GET', data: {} }) => {
   const request_data = {
     session_key: Taro.getStorageSync('session_key') || '', // 缓存取值
     appid: getAppId(),
-    channel_name:'WeChat'
+    channel_name: 'WeChat'
   };
 
   // 如果是登录接口，移除 session_key
@@ -37,8 +37,7 @@ export default async (options = { method: 'GET', data: {} }) => {
       },
       method: options.method.toUpperCase(),
     });
-
-    const { code, data, msg } = res.data;
+    const { code,data, msg } = res.data;
     switch (code) {
       case 200:
         return data;
@@ -62,24 +61,27 @@ 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);// 更新页面数据
+        const currentPages = Taro.getCurrentPages();
+        const currentPage = currentPages[currentPages.length - 1];
+        if (currentPage) {
+          // 储存当前页面路径
+          Taro.setStorageSync('currentPage', currentPage.route);
+          global.globalData.optionsData = currentPage.options || {};
+        }
+        
         Taro.reLaunch({
-          url: '/pages/mineSub/login/index',
+          url: '/pages/login/index',
         });
-        throw new Error('需要登录');
+        // throw new Error('需要登录');
       default:
         Taro.showToast({
           title: `${msg || '请求失败'}`,
           icon: 'none',
           mask: true,
         });
-        throw new Error(msg || '请求失败');
+        // throw new Error(msg || '请求失败');
     }
   } catch (error) {
     console.error('请求错误:', error);

src/app.config.js

@@ -4,6 +4,7 @@ export default defineAppConfig({
     'pages/member/index',
     "pages/mine/index",
     "pages/search/index",
+    "pages/login/index"
   ],
   subpackages: [
     {
@@ -11,7 +12,8 @@ export default defineAppConfig({
       pages: [
         "productDetail/index",
         "seckillIndex/index",
-        "searchList/index"
+        "searchList/index",
+        "highCommission/index"
       ]
     },
     {
@@ -32,8 +34,7 @@ export default defineAppConfig({
       root: "pages/mineSub",
       pages: [
         "infoEdit/index",
-        "userSpecification/index",
-        "login/index"
+        "userSpecification/index"
       ]
     },
   ],

src/app.js

@@ -3,15 +3,14 @@ import Taro from '@tarojs/taro'
 import './app.less'
 import 'taro-ui/dist/style/index.scss'
 
+// 在 App 类外定义全局变量
+global.globalData = {
+  optionsData: {}  // 存储页面参数
+}
+
 class App extends Component {
   state = {
     userInfo: Taro.getStorageSync('userInfo') || {},// 用户信息
-    optionsData: {},// 未登录页面跳转数据
-  }
-
-  // 新增方法：更新 optionsData
-  updateOptionsData = (data) => {
-    this.setState({ optionsData: data });
   }
 
   componentDidMount () {

src/components/index/OperationArea/index.jsx

@@ -10,6 +10,9 @@ const OperationArea = ({ recommend }) => {
         url: "/pages/indexSub/seckillIndex/index",
       });
     } else if (type === "高佣专项") {
+      Taro.navigateTo({
+        url: "/pages/indexSub/highCommission/index",
+      });
     }
   };
 

src/components/index/SearchBar/index.jsx

@@ -2,14 +2,19 @@ import { View, Input } from '@tarojs/components'
 import { AtIcon } from 'taro-ui'
 import { Component } from 'react'
 import './index.less'
-
 export default class SearchBar extends Component {
   handleChange = (e) => {
-    this.props.onChange && this.props.onChange(e)
+    const value = e.detail.value;
+    this.props.onChange && this.props.onChange(value);
+  }
+  handleSearch = () => {
+    const searchValue = this.props.value || '';
+    // 触发父组件传入的 onSearch 方法
+    this.props.onSearch && this.props.onSearch(searchValue);
   }
 
   render () {
-    const { value, placeholder } = this.props
+    const { value = '', placeholder = '点击搜索商品', disabled } = this.props
 
     return (
         <View className="search-wrap">
@@ -26,8 +31,9 @@ export default class SearchBar extends Component {
             placeholder={placeholder}
             value={value}
             onInput={this.handleChange.bind(this)}
+            disabled={disabled}
           />
-          <View className="search-button">搜索</View>
+          <View onClick={this.handleSearch} className="search-button">搜索</View>
         </View>
       </View>
     )

src/pages/index/index.jsx

@@ -14,22 +14,8 @@ import backTopIcon from "../../images/index/back-top.png";
 
 export default class Index extends Component {
   state = {
-    value: "",
     current: 0, // 添加当前选中的tab索引
     homeData: {}, // 首页数据
-    tabList: [
-      // 添加模拟的tab数据
-      { title: "推荐" },
-      { title: "男装" },
-      { title: "女装" },
-      { title: "运动" },
-      { title: "数码" },
-      { title: "美妆" },
-      { title: "箱包" },
-      { title: "家居" },
-      { title: "食品" },
-      { title: "母婴" },
-    ],
     bannerList: [],
     productList: [], // 添加商品列表
     page: 1, // 添加页码
@@ -46,15 +32,12 @@ export default class Index extends Component {
       this.getProductList(true);
     });
   };
-  // 搜索框值改变
-  handleChange(value) {
-    this.setState({ value });
-  }
   // 修改 tab 切换处理函数
   handleClick(value) {
     this.setState(
       {
         current: value,
+        page: 1,
       },
       () => {
         // 跳转到列表顶部
@@ -104,8 +87,7 @@ export default class Index extends Component {
     const { page } = this.state;
     this.setState({ loading: true });
     const res = await getProductList({
-      // tag_name:  this.state.homeData.tags[this.state.current].title,
-      tag_name:'首页',
+      tag_name:  this.state.homeData.tags[this.state.current].title,
       page,
       page_size: 10,
     });
@@ -140,9 +122,9 @@ export default class Index extends Component {
             onClick={() => Taro.navigateTo({ url: '/pages/search/index' })}
           >
             <SearchBar
-              value={this.state.value}
-              onChange={this.handleChange}
-              onSearch={this.handleSearch}
+              value=""
+              disabled={true}
+              placeholder="点击搜索商品"
             />
           </View>
           {/* tab分类 */}

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

@@ -0,0 +1,3 @@
+export default definePageConfig({
+  navigationBarTitleText: '高佣专项'
+})

src/pages/indexSub/highCommission/index.jsx

@@ -0,0 +1,59 @@
+import { Component } from "react";
+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: 121,
+      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={this.state.productList}
+            loading={this.state.loading}
+          />
+        </View>
+      </View>
+    );
+  }
+}

src/pages/indexSub/highCommission/index.less

@@ -0,0 +1,13 @@
+.index{
+    width: 100%;
+    padding-bottom: 40px;
+    box-sizing: border-box;
+    .seckill{
+        width: 100%;
+        height: 300px;
+        background-color: yellow;
+    }
+    .product-list{
+        margin-top: -71px;
+    }
+}

src/pages/indexSub/searchList/index.jsx

@@ -3,13 +3,58 @@ import Taro from "@tarojs/taro";
 import { View } from "@tarojs/components";
 import "./index.less";
 import ProductList from "../../../components/index/ProductList";
+import { getSearchProductList } from "../../../service";
 export default class Index extends Component {
-  state = {};
+  state = {
+    productList: [],
+    page: 1,
+    totalPages: 1,
+    loading: false,
+    keyword: "",
+  };
+  componentDidMount() {
+    const { keyword }  = Taro.getCurrentInstance().router.params||"";
+    this.setState({ keyword }, () => {
+      this.getSearchProductList(true);
+    });
+  }
+  // 获取商品列表
+  getSearchProductList = async (isAdd = false) => {
+    const { page } = this.state;
+    this.setState({ loading: true });
+
+    const res = await getSearchProductList({
+      search_name: this.state.keyword,
+      page,
+      page_size: 10,
+    });
+
+    this.setState((prevState) => ({
+      productList: isAdd
+        ? res.goods_list
+        : [...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.getSearchProductList()
+      );
+    }
+  };
   render() {
     return (
       <View className="index">
         {/* 搜索列表 */}
-        <ProductList></ProductList>
+        <ProductList
+          productList={this.state.productList}
+          loading={this.state.loading}
+        ></ProductList>
       </View>
     );
   }

src/pages/mineSub/login/index.jsx

@@ -2,11 +2,11 @@ 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 { login,getUserInfo } from "../../service";
+import { objToParam } from "../../common/toParams";
 import "./index.less";
-import logo1 from "../../../images/logo1.png";
-import loginBg from "../../../images/loginBg.png";
+import logo1 from "../../images/logo1.png";
+import loginBg from "../../images/loginBg.png";
 export default class Index extends Component {
   state = {
     isChecked: false,
@@ -60,18 +60,16 @@ export default class Index extends Component {
               getUserInfo().then(res => {
                 Taro.setStorageSync('userInfo', res)
               })
-              // let lastPage = Taro.getStorageSync('currentPage')
-              // if (lastPage == 'pages/mineSub/login/index') {
-              //   lastPage = 'pages/index/index'
-              // }
+              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',
+                  url: `/${lastPage}?${objToParam(Taro.getStorageSync('optionsData'))}`
                 })
+                Taro.removeStorageSync('currentPage')
+                global.globalData.optionsData = {}
               }, 1000)
             });
           },

src/pages/member/index.jsx

@@ -1,7 +1,7 @@
 import { Component } from "react";
 import { View, Text, Image } from "@tarojs/components";
 import { AtIcon } from "taro-ui";
-import {getVipInfo} from '../../service'
+import { getVipInfo } from "../../service";
 import Taro from "@tarojs/taro";
 import "./index.less";
 import vip from "../../images/member/vip.png";
@@ -12,27 +12,37 @@ 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:{},//会员信息 
-  }
+  state = {
+    vipInfo: {
+      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 },
+    }, //会员信息
+  };
   // 获取会员首页数据
-  getVipInfo = async () =>{
-    const res = await getVipInfo()
+  getVipInfo = async () => {
+    const res = await getVipInfo();
     this.setState({
-      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 }
-      }
-    })
-  }
+      vipInfo: res,
+    });
+  };
+  // 去登录
+  Login = () => {
+    if (!Taro.getStorageSync("session_key")) {
+      Taro.reLaunch({
+        url: "/pages/login/index",
+      });
+    }
+  };
   componentDidShow() {
-    this.getVipInfo() //获取会员首页数据
+    if (Taro.getStorageSync("session_key")) {
+      this.getVipInfo(); //获取会员首页数据
+    }
   }
 
   render() {
-    const {vipInfo} = this.state
+    const { vipInfo } = this.state;
     return (
       <View className="member">
         <View className="member-bg"></View>
@@ -40,9 +50,15 @@ export default class Index extends Component {
           {/* 会员信息卡 */}
           <View className="member-info-card">
             <View className="member-info-card-header">
-              {vipInfo.users && <Image className="avatar" src={vipInfo.users.icon} mode="aspectFill" />}
+              <Image
+                className="avatar"
+                src={vipInfo.users.icon}
+                mode="aspectFill"
+              />
+
               <View className="member-info-card-header-text">
-                {vipInfo.users && <Text className="user-name">{vipInfo.users.name}</Text>}
+                <Text onClick={this.Login} className="user-name">{vipInfo.users.name}</Text>
+
                 <View className="member-info-card-header-text-level">
                   <Text className="level-text">店长</Text>
                   <Image className="level-icon" src={vip} />
@@ -50,30 +66,43 @@ export default class Index extends Component {
               </View>
             </View>
             {/* 我的小店 */}
-            <View onClick={() => Taro.navigateTo({ url: `/pages/memberSub/storeManagement/index?isManager=${true}` })} className="my-shop">
+            <View
+              onClick={() =>
+                Taro.navigateTo({
+                  url: `/pages/memberSub/storeManagement/index?isManager=${true}`,
+                })
+              }
+              className="my-shop"
+            >
               <Image className="my-shop-icon" src={home} />
               <View className="my-shop-text">我的小店</View>
             </View>
           </View>
           {/* 预估收益 */}
-          {vipInfo.earnings && <View className="estimated-income">
+
+          <View className="estimated-income">
             <Text className="estimated-income-title">预估收益</Text>
             <View className="estimated-income-content">
               <View className="income-item">
-                <Text className="amount">{vipInfo.earnings.store_earnings_now}</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">{vipInfo.earnings.store_earnings_all}</Text>
+                <Text className="amount">
+                  {vipInfo.earnings.store_earnings_all}
+                </Text>
                 <Text className="label">累计收益</Text>
               </View>
             </View>
-            <view onClick={() => Taro.navigateTo({ url: `/pages/memberSub/earningsDetail/index` })} className="estimated-income-detail">
+            {/* <view onClick={() => Taro.navigateTo({ url: `/pages/memberSub/earningsDetail/index` })} className="estimated-income-detail">
               收益详情
               <Image className="to-detail" src={toDetail} />
-            </view>
-            </View>}
+            </view> */}
+          </View>
+
           {/* 可提现金额 */}
           <View className="withdrawable-amount">
             <View className="withdrawable-amount-header">
@@ -82,13 +111,16 @@ export default class Index extends Component {
             </View>
             <View className="withdrawable-amount-content">
               <View className="left">
-                {vipInfo.draw_money && <Text className="amount">¥{vipInfo.draw_money.store_earnings_now}</Text>}
-                <View className="warning-icon-box">
+                <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>
-                </View>
+                </View> */}
               </View>
-              <View onClick={() => Taro.navigateTo({ url: `/pages/memberSub/cashOut/index` })} className="right">点击提现</View>
+              {/* <View onClick={() => Taro.navigateTo({ url: `/pages/memberSub/cashOut/index` })} className="right">点击提现</View> */}
             </View>
           </View>
           {/* 今日订单 */}
@@ -98,12 +130,13 @@ export default class Index extends Component {
                 <Image className="today-order-icon" src={order} />
                 <Text className="today-order-title">今日订单</Text>
               </View>
-              <View onClick={() => Taro.navigateTo({ url: `/pages/memberSub/earningsOrder/index` })} className="today-order-header-right">
+              {/* <View onClick={() => Taro.navigateTo({ url: `/pages/memberSub/earningsOrder/index` })} className="today-order-header-right">
                 历史订单
                 <AtIcon value='chevron-right' size='10' color='#A1A1A1'></AtIcon>
-              </View>
+              </View> */}
             </View>
-            {vipInfo.order && <View className="today-order-content">
+
+            <View className="today-order-content">
               <View className="order-item">
                 <Text className="label">订单总量</Text>
                 <Text className="amount">{vipInfo.order.order_all}</Text>
@@ -116,7 +149,7 @@ export default class Index extends Component {
                 <Text className="label">购买历史</Text>
                 <Text className="amount">{vipInfo.order.order_pay}</Text>
               </View>
-            </View>}
+            </View>
           </View>
         </View>
       </View>

src/pages/memberSub/productClassify/index.jsx

@@ -4,36 +4,36 @@ import { AtTabs, AtTabsPane } from "taro-ui";
 import "./index.less";
 import Taro from "@tarojs/taro";
 import ProductList from "../../../components/index/ProductList";
-import { getBrowseShopProductList,addShopProduct } from "../../../service";
+import { getBrowseShopProductList,addShopProduct,getAllTags } from "../../../service";
 export default class Index extends Component {
   state = {
     current: 0, // 当前选中的标签页索引
     tabList: [
-      { title: "全部商品" },
-      { title: "选项2" },
-      { title: "选项3" },
-      { title: "选项4" },
     ], // 标签页列表
     productList: [], // 商品列表
     page: 1, //页数
     loading: false, //加载状态
     totalPages: 1, // 添加总页数
+    tabList: [], // 所有闲鱼tags
   };
   handleClick(value) {
     this.setState({
       current: value,
+      page: 1,
+    },()=>{
+      this.getBrowseShopProductList(true);
     });
   }
   componentDidMount() {
-    this.getBrowseShopProductList();
+    this.getAllTags();
   }
   // 获取商品列表
   getBrowseShopProductList = async (isAdd=false) => {
     const { page } = this.state;
     this.setState({ loading: true });
-
+    
     const res = await getBrowseShopProductList({
-      tag_name: "",
+      tag_name:this.state.tabList[this.state.current].title,
       page,
       page_size: 10,
     });
@@ -44,13 +44,24 @@ export default class Index extends Component {
       loading: false,
     }));
   };
+  // 获取所有闲鱼tags
+  getAllTags = async () => {
+    let res = await getAllTags();
+    res = res.map((item, index) => ({
+      title: item.name,
+    }));
+    this.setState({
+      tabList: res,
+    },()=>{
+      this.getBrowseShopProductList(true);
+    });
+  }
   // 添加商品
   onAddProduct = (productId) => {
     addShopProduct({
       goods_ids: [productId],
     }).then(res => {
       if(res.success==true){
-        // this.getBrowseShopProductList(true);
         this.setState((prevState) => ({
           productList: prevState.productList.map(item => {
             if(item.id === productId){
@@ -59,8 +70,6 @@ export default class Index extends Component {
             return item;
           })
         }));
-        console.log(this.state.productList);
-        
         Taro.showToast({
           title: '添加成功',
           icon: 'none',
@@ -82,6 +91,7 @@ export default class Index extends Component {
     return (
       <View className="index">
         <AtTabs
+          scroll
           current={this.state.current}
           tabList={this.state.tabList}
           onClick={this.handleClick.bind(this)}

src/pages/memberSub/productManagement/index.jsx

@@ -7,6 +7,7 @@ import {
   getMyShopList,
   deleteShopProduct,
   updateProductSort,
+  getAllTags
 } from "../../../service";
 import ProductList from "../../../components/index/ProductList"; //商品列表
 import add from "../../../images/productManagement/add.png";
@@ -21,9 +22,9 @@ export default class Index extends Component {
     isManagementStatus: false, //是否是管理状态
     current: 0, //tabs坐标
     isSelectAll: false, //是否全选
-    selectedOption: "全部商品", //商品默认名称
+    selectedOption: "首页", //商品默认名称
     tabList: [{ title: "在售中 (0)" }], //tabs标题
-    options: ["全部商品", "选项2", "选项3"], //商品下拉选项
+    options: ["首页"], //商品下拉选项
     checkedList: [""], //全选
     checkboxOption: [
       {
@@ -36,9 +37,20 @@ export default class Index extends Component {
     loading: false, //加载状态
     totalPages: 1, // 添加总页数
     selectedProducts: [], // 删除商品选中id数组
+    tags: [], // 所有闲鱼tags
   };
   componentDidShow() {
-    this.getMyShopList(true);
+    this.getAllTags();
+  }
+  // 获取所有闲鱼tags
+  getAllTags = async () => {
+    const res = await getAllTags();
+    const arr = Object.values(res).map(item => item.name);
+    this.setState({
+      options: arr,
+    },()=>{
+      this.getMyShopList(true);
+    });
   }
   // 获取商品列表
   getMyShopList = async (isDelete) => {
@@ -46,7 +58,7 @@ export default class Index extends Component {
     this.setState({ loading: true });
 
     const res = await getMyShopList({
-      tag_name: "",
+      tag_name: this.state.selectedOption,
       page,
       page_size: 10,
     });
@@ -66,16 +78,12 @@ export default class Index extends Component {
       }
     );
   };
-  // tabs切换
-  handleClick(value) {
-    this.setState({
-      current: value,
-    });
-  }
   // 商品下拉选项
   handleSelectOption = (e) => {
     const selectedOption = this.state.options[e.detail.value];
-    this.setState({ selectedOption });
+    this.setState({ selectedOption, page: 1 },()=>{
+      this.getMyShopList(true);
+    });
   };
   // 切换管理状态
   changeManagement = (type) => {

src/pages/mine/index.jsx

@@ -50,6 +50,14 @@ export default class Index extends Component {
       userInfo: res,
     });
   };
+  // 去登录
+  Login = () => {   
+    if (!Taro.getStorageSync("session_key")) {
+      Taro.reLaunch({
+        url: "/pages/login/index",
+      });
+    }
+  };
   render() {
     const { userInfo } = this.state;
     return (
@@ -59,7 +67,7 @@ export default class Index extends Component {
           <Image src={userInfo.icon?userInfo.icon:avatar} className="avatar" />
           <View className="info-right">
             <View className="user-info">
-              <View className="name">{userInfo.name?userInfo.name:'未登录'}</View>
+              <View onClick={this.Login} className="name">{userInfo.name?userInfo.name:'去登录'}</View>
               <View className="account">{userInfo.id?userInfo.id:'XXXX'}</View>
             </View>
             <Image

src/pages/mineSub/userSpecification/index.jsx

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

src/pages/mineSub/userSpecification/index.less

@@ -0,0 +1,4 @@
+.index {
+  padding: 20rpx;
+  background-color: #f5f5f5;
+}

src/pages/search/index.jsx

@@ -5,6 +5,22 @@ import SearchBar from "../../components/index/SearchBar"; //搜索框
 import "./index.less";
 export default class Index extends Component {
   state = {};
+  handleSearch = (value) => {
+    if (value.trim() === '') {
+      Taro.showToast({
+        title: '请输入搜索内容',
+        icon: 'none'
+      })
+      return;
+    }else{
+      Taro.navigateTo({
+        url: `/pages/indexSub/searchList/index?keyword=${value}`
+      })
+    }
+  }
+  handleChange = (value) => {
+    this.setState({ value });  // 更新状态
+  }
   render() {
     return (
       <View className="index">
@@ -13,6 +29,8 @@ export default class Index extends Component {
           value={this.state.value}
           onChange={this.handleChange}
           onSearch={this.handleSearch}
+          placeholder="搜索商品"
+          disabled={false}
         />
       </View>
     );

src/service/index.js

@@ -36,7 +36,20 @@ export const getRecommendProductList = data =>
     method: 'POST',
     data,
   })
-
+// 获取所有闲鱼tags
+export const getAllTags = data =>
+  Request({
+    url: '/api/get_all_xianyu_tags',
+    method: 'POST',
+    data,
+  })
+// 获取搜索商品列表
+export const getSearchProductList = data =>
+  Request({
+    url: '/api/get_goods_search',
+    method: 'POST',
+    data,
+  })
 // -----------------------用户
 // 获取用户详情
 export const getUserInfo = data =>
@@ -52,6 +65,13 @@ export const updateUserInfo = data =>
     method: 'POST',
     data,
   })
+// 获取用户规范
+export const getUserAgreement = data =>
+  Request({
+    url: '/user/get_user_agreement',
+    method: 'POST',
+    data,
+  })
 // ---------------------会员
 // 获取会员详情
 export const getVipInfo = data =>