处理分享和产品筛选

src/pages/login/index.jsx

@@ -2,7 +2,7 @@ import { Component } from "react";
 import { View, Image, Button } from "@tarojs/components";
 import Taro from "@tarojs/taro";
 import { AtCheckbox } from "taro-ui";
-import { login,getUserInfo,bindShareJump } from "../../service";
+import { login, getUserInfo, bindShareJump } from "../../service";
 import { objToParam } from "../../common/toParams";
 import "./index.less";
 import logo1 from "../../images/logo1.png";
@@ -35,8 +35,8 @@ export default class Index extends Component {
   // };
   login = () => {
     Taro.showLoading({
-      title: '正在登录',
-    })
+      title: "正在登录",
+    });
     if (!this.state.isChecked) {
       Taro.showToast({
         title: "请先同意协议",
@@ -46,50 +46,49 @@ export default class Index extends Component {
     }
     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.hideLoading()
-              Taro.showToast({
-                title: '登录成功',
-                icon: 'none',
-              })
-              // 获取个人信息
-              getUserInfo().then(res => {
-                Taro.setStorageSync('userInfo', res)
-              })
-              // 绑定分享跳转标识
-              let shareJump = Taro.getStorageSync('shareJump')
-              if(shareJump){
-                bindShareJump({
-                  share_unique_value: shareJump,
-                  share_type:1
-                }).then(res => {
-                  Taro.removeStorageSync('shareJump')
-                  if (global.globalData.optionsData) {
-                    delete global.globalData.optionsData.shareJump
-                  }
-                })
-              }
-              let lastPage = Taro.getStorageSync('currentPage')
-              if (lastPage == 'pages/mineSub/login/index') {
-                lastPage = 'pages/index/index'
-              }
-              Taro.reLaunch({
-                url: `/${lastPage}?${objToParam(global.globalData.optionsData)}`
-              })
-              Taro.removeStorageSync('currentPage')
-              global.globalData.optionsData = {}
-            });
-          },
+      success: async (userInfo) => {
+        const loginRes = await Taro.login();
+        const res = await login({
+          code: loginRes.code,
+          head_img: userInfo.avatarUrl,
+          name: userInfo.nickName,
+        });
+
+        Taro.setStorageSync("session_key", res.session_key);
+        Taro.setStorageSync("loginInfo", res);
+        Taro.hideLoading();
+        Taro.showToast({
+          title: "登录成功",
+          icon: "none",
+        });
+
+        // 先处理分享跳转
+        let shareJump = Taro.getStorageSync("shareJump");
+        if (shareJump) {
+          await bindShareJump({
+            share_unique_value: shareJump,
+            share_type: 1,
+          });
+          Taro.removeStorageSync("shareJump");
+          if (global.globalData.optionsData) {
+            delete global.globalData.optionsData.shareJump;
+          }
+        }
+
+        // 再获取用户信息
+        const userInfoRes = getUserInfo();
+        Taro.setStorageSync("userInfo", userInfoRes);
+
+        // 最后处理页面跳转
+        let lastPage = Taro.getStorageSync("currentPage");
+        if (lastPage == "pages/mineSub/login/index") {
+          lastPage = "pages/index/index";
+        }
+        await Taro.reLaunch({
+          url: `/${lastPage}?${objToParam(global.globalData.optionsData)}`,
         });
+        Taro.removeStorageSync("currentPage");
+        global.globalData.optionsData = {};
       },
     });
   };

src/pages/memberSub/productManagement/index.jsx

@@ -1,6 +1,6 @@
 import React, { Component, createRef } from "react";
 import { View, Picker, Image, Text } from "@tarojs/components";
-import { AtTabs, AtTabsPane, AtCheckbox } from "taro-ui";
+import { AtTabs, AtCheckbox } from "taro-ui";
 import Taro from "@tarojs/taro";
 import "./index.less";
 import {
@@ -23,9 +23,9 @@ export default class Index extends Component {
     isManagementStatus: false, //是否是管理状态
     current: 0, //tabs坐标
     isSelectAll: false, //是否全选
-    selectedOption: "首页", //商品默认名称
+    selectedOption: "", //商品默认名称
     tabList: [{ title: "在售中 (0)" }], //tabs标题
-    options: ["首页"], //商品下拉选项
+    options: [""], //商品下拉选项
     checkedList: [""], //全选
     checkboxOption: [
       {
@@ -51,6 +51,7 @@ export default class Index extends Component {
     this.setState(
       {
         options: arr,
+        selectedOption: res[0].name,
       },
       () => {
         this.getMyShopList(true);
@@ -236,46 +237,43 @@ export default class Index extends Component {
             tabList={this.state.tabList}
             current={this.state.current}
             scroll
-          >
-            <AtTabsPane current={this.state.current} index={0}>
-              {/* 内容 */}
-              <View className="tabs-content">
-                {/* 商品下拉分类 */}
-                <View className="product-category">
-                  <Picker
-                    mode="selector"
-                    range={this.state.options}
-                    onChange={this.handleSelectOption}
-                  >
-                    <View className="product-category-left">
-                      {this.state.selectedOption}
-                      <Image
-                        className="selectIcon"
-                        src={selectIcon}
-                        mode="aspectFit"
-                      />
-                    </View>
-                  </Picker>
-                  <View className="product-category-right">
-                    前6款商品将推荐给直属会员
-                  </View>
-                </View>
-                {/* 商品列表 */}
-                {this.state.productList && (
-                  <ProductList
-                    ref={this.childComponentRef} // 将 ref 传递给子组件
-                    productList={this.state.productList}
-                    isSelectAll={this.state.isSelectAll}
-                    isManagement={true}
-                    isManagementStatus={this.state.isManagementStatus}
-                    loading={this.state.loading}
-                    onDeleteProductSelect={this.onDeleteProductSelect}
-                    isNoMore={this.state.isNoMore}
+          ></AtTabs>
+          {/* 内容 */}
+          <View className="tabs-content">
+            {/* 商品下拉分类 */}
+            <View className="product-category">
+              <Picker
+                mode="selector"
+                range={this.state.options}
+                onChange={this.handleSelectOption}
+              >
+                <View className="product-category-left">
+                  {this.state.selectedOption}
+                  <Image
+                    className="selectIcon"
+                    src={selectIcon}
+                    mode="aspectFit"
                   />
-                )}
+                </View>
+              </Picker>
+              <View className="product-category-right">
+                前6款商品将推荐给直属会员
               </View>
-            </AtTabsPane>
-          </AtTabs>
+            </View>
+            {/* 商品列表 */}
+            {this.state.productList && (
+              <ProductList
+                ref={this.childComponentRef} // 将 ref 传递给子组件
+                productList={this.state.productList}
+                isSelectAll={this.state.isSelectAll}
+                isManagement={true}
+                isManagementStatus={this.state.isManagementStatus}
+                loading={this.state.loading}
+                onDeleteProductSelect={this.onDeleteProductSelect}
+                isNoMore={this.state.isNoMore}
+              />
+            )}
+          </View>
         </View>
         {/* 底部购买模块 */}
         {!this.state.isManagementStatus ? (