专项&&我的小店分享绑定

src/api/request.js

@@ -37,16 +37,18 @@ 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;
       case 400:
-        Taro.showToast({
-          title: msg,
-          icon: 'none',
-          mask: true,
-        });
+        if (msg) {
+          Taro.showToast({
+            title: msg,
+            icon: 'none',
+            mask: true,
+          });
+        }
         return Promise.reject(msg);
       case 422:
         return Promise.reject(msg);
@@ -56,7 +58,7 @@ export default async (options = { method: 'GET', data: {} }) => {
           icon: 'none',
           mask: true,
         });
-        
+
         // 获取当前跳转到登录的页面路径
         const currentPages = Taro.getCurrentPages();
         const currentPage = currentPages[currentPages.length - 1];
@@ -65,13 +67,13 @@ export default async (options = { method: 'GET', data: {} }) => {
           Taro.setStorageSync('currentPage', currentPage.route);
           global.globalData.optionsData = currentPage.options || {};
         }
-        
+
         Taro.reLaunch({
           url: '/pages/login/index',
         });
         return Promise.reject(msg);
       default:
-        if(msg){
+        if (msg) {
           Taro.showToast({
             title: `${msg}`,
             icon: 'none',

src/pages/indexSub/productDetail/index.jsx

@@ -68,7 +68,7 @@ export default class Index extends Component {
     Taro.hideShareMenu({
       menus: ["shareAppMessage", "shareTimeline"],
     });
-    const { id, isShare, isSeckill, shareJump, shareUserId,tagTitle } =
+    const { id, isShare, isSeckill, shareJump, shareUserId,tagTitle,shareType } =
       Taro.getCurrentInstance().router.params;
     let session_key = Taro.getStorageSync("session_key");
     let userInfo = Taro.getStorageSync("userInfo");
@@ -88,6 +88,11 @@ export default class Index extends Component {
             key: "shareJump",
             data: shareJump,
           });
+        shareType &&
+          Taro.setStorage({
+            key: "shareType",
+            data: shareType,
+          });
         this.fetchProductDetails(id); //获取产品详情
         this.getProductLikeList(); //获取猜你喜欢列表
         if (session_key && shareJump) {
@@ -191,6 +196,7 @@ export default class Index extends Component {
       share_unique_value: shareJump,
     });
     Taro.removeStorageSync("shareJump");
+    Taro.removeStorageSync("shareType");
   };
   // 设置分享标题
   handleShareTitleChange = (newTitle) => {
@@ -202,7 +208,7 @@ export default class Index extends Component {
   onShareAppMessage() {
     return {
       title: this.state.shareTitle || this.state.productDetail.item_title,
-      path: `/pages/indexSub/productDetail/index?id=${this.state.id}&&isShare=true&&isSeckill=${this.state.isSeckill}&&shareJump=${this.state.shareJump}&&tagTitle=${this.state.tagTitle}`,
+      path: `/pages/indexSub/productDetail/index?id=${this.state.id}&&isShare=true&&isSeckill=${this.state.isSeckill}&&shareJump=${this.state.shareJump}&&tagTitle=${this.state.tagTitle}&&shareType=1`,
       imageUrl: this.state.productDetail.images[0].img,
     };
   }

src/pages/indexSub/seckillIndex/index.jsx

@@ -3,7 +3,12 @@ import { View, Image } from "@tarojs/components";
 import "./index.less";
 import Taro from "@tarojs/taro";
 import ProductList from "../../../components/index/ProductList";
-import { getRecommendProductList, addLog } from "../../../service";
+import {
+  getRecommendProductList,
+  addLog,
+  getShareJump,
+  bindShareJump,
+} from "../../../service";
 import { formatDate } from "../../../common/time";
 import { getShareContent } from "../../../common/share";
 export default class Index extends Component {
@@ -22,8 +27,9 @@ export default class Index extends Component {
     img: "", // 图片
   };
   componentDidMount() {
-    const { isDirect, isBanner, isShare, shareUserId, title, id } =
+    const { isDirect, isBanner, isShare, shareUserId, title, id, shareJump,shareType } =
       Taro.getCurrentInstance().router.params || "";
+    let session_key = Taro.getStorageSync("session_key");
     this.setState(
       {
         isDirect: isDirect || false,
@@ -48,6 +54,20 @@ export default class Index extends Component {
             : `direct_to_${this.state.id}_${this.state.title}`
         );
         this.getRecommendProductList();
+        // 获取分享跳转标识
+        shareJump &&
+          Taro.setStorage({
+            key: "shareJump",
+            data: shareJump,
+          });
+        shareType &&
+          Taro.setStorage({
+            key: "shareType",
+            data: shareType,
+          });
+        if (session_key && shareJump) {
+          this.bindShareJump(); //绑定分享跳转标识
+        }
       }
     );
   }
@@ -70,6 +90,16 @@ export default class Index extends Component {
       img: res.img,
     }));
   };
+  // 绑定分享跳转标识
+  bindShareJump = async () => {
+    let shareJump = Taro.getStorageSync("shareJump");
+    await bindShareJump({
+      share_type: 3,
+      share_unique_value: shareJump,
+    });
+    Taro.removeStorageSync("shareJump");
+    Taro.removeStorageSync("shareType");
+  };
   // 埋点
   handleLog = (event_type) => {
     const dayid = formatDate(new Date(), "YYYY-MM-DD");
@@ -108,11 +138,16 @@ export default class Index extends Component {
       shareUserId = Taro.getStorageSync("loginInfo").id;
     }
     if (res.from == "menu") {
-      return {
-        title: `${this.state.title}`,
-        path: `/pages/indexSub/seckillIndex/index?isShare=true&shareUserId=${shareUserId}&title=${this.state.title}&id=${this.state.id}`,
-        imageUrl: "",
-      };
+      return getShareJump({
+        share_type: 3,
+        share_id: this.state.id,
+      }).then((res) => {
+        return {
+          title: `${this.state.title}`,
+          path: `/pages/indexSub/seckillIndex/index?isShare=true&shareUserId=${shareUserId}&title=${this.state.title}&id=${this.state.id}&&shareJump=${res.share_unique_value}&&shareType=3`,
+          imageUrl: "",
+        };
+      });
     } else {
       return getShareContent();
     }

src/pages/login/index.jsx

@@ -28,7 +28,7 @@ export default class Index extends Component {
       url: "/pages/mineSub/userSpecification/index",
     });
   };
-  
+
   // handleGetPhoneNumber = (e) => {
   //   if (e.detail.errMsg === "getPhoneNumber:ok") {
   //     // 处理获取到的手机号信息
@@ -67,34 +67,36 @@ export default class Index extends Component {
           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 = await getUserInfo();
         Taro.setStorageSync("userInfo", userInfoRes);
-
-        // 最后处理页面跳转
-        
-        let lastPage = Taro.getStorageSync("currentPage");
-        if (!lastPage || lastPage === "pages/mineSub/login/index") {
-          lastPage = "pages/index/index";
+        try {
+          // 先处理分享跳转
+          let shareJump = Taro.getStorageSync("shareJump");
+          let shareType = Taro.getStorageSync("shareType");
+          if (shareJump) {
+            await bindShareJump({
+              share_unique_value: shareJump,
+              share_type: shareType || 2,
+            });
+            Taro.removeStorageSync("shareJump");
+            Taro.removeStorageSync("shareType");
+            if (global.globalData.optionsData) {
+              delete global.globalData.optionsData.shareJump;
+            }
+          }
+        } finally {
+          // 最后处理页面跳转
+          let lastPage = Taro.getStorageSync("currentPage");
+          if (!lastPage || lastPage === "pages/mineSub/login/index") {
+            lastPage = "pages/index/index";
+          }
+          await Taro.reLaunch({
+            url: `/${lastPage}?${objToParam(global.globalData.optionsData)}`,
+          });
+          Taro.removeStorageSync("currentPage");
+          global.globalData.optionsData = {};
         }
-        await Taro.reLaunch({
-          url: `/${lastPage}?${objToParam(global.globalData.optionsData)}`,
-        });
-        Taro.removeStorageSync("currentPage");
-        global.globalData.optionsData = {};
       },
     });
   };

src/pages/memberSub/earningsDetail/index.jsx

@@ -13,8 +13,6 @@ export default class Index extends Component {
   // 获取收益详情
   getEarningsDetail = async () => {
     const res = await getEarningsDetail();
-    console.log(res);
-    
     this.setState({ earningsDetail: res });
   }
 

src/pages/memberSub/storeManagement/index.jsx

@@ -67,21 +67,45 @@ export default class Index extends Component {
   };
 
   componentDidShow() {
-    const { router } = Taro.getCurrentInstance();
-    const params = router.params;
-
+    const { isManager, shopId, isShare, shareJump,shareType } =
+      Taro.getCurrentInstance().router.params || "";
+    let session_key = Taro.getStorageSync("session_key");
     this.setState(
       {
-        isManager: JSON.parse(params.isManager), //是否是店长
-        isShare: params.isShare || false, // 是否是分享进入
-        shopId: params.shopId || "", // 店铺id
+        isManager: JSON.parse(isManager), //是否是店长
+        isShare: isShare || false, // 是否是分享进入
+        shopId: shopId || "", // 店铺id
       },
       () => {
         this.getMyShopDetail(); //获取店铺详情
         this.getMyShopList(true); //获取店铺数据
+        // 获取分享跳转标识
+        shareJump &&
+          Taro.setStorage({
+            key: "shareJump",
+            data: shareJump,
+          });
+        shareType &&
+          Taro.setStorage({
+            key: "shareType",
+            data: shareType,
+          });
+        if (session_key && shareJump) {
+          this.bindShareJump(); //绑定分享跳转标识
+        }
       }
     );
   }
+  // 绑定分享跳转标识
+  bindShareJump = async () => {
+    let shareJump = Taro.getStorageSync("shareJump");
+    await bindShareJump({
+      share_type: 2,
+      share_unique_value: shareJump,
+    });
+    Taro.removeStorageSync("shareJump");
+    Taro.removeStorageSync("shareType");
+  };
   // 页面上拉触底
   onReachBottom = () => {
     const { page, totalPages, loading } = this.state;
@@ -101,18 +125,13 @@ export default class Index extends Component {
   // 配置分享内容
   onShareAppMessage() {
     const name = Taro.getStorageSync("userInfo").name;
-    return {
-      title: `${name}的店铺`,
-      path: `/pages/memberSub/storeManagement/index?shopId=${this.state.shopDetail.id}&isShare=true&isManager=false`,
-      imageUrl: "",
-    };
     return getShareJump({
       share_type: 2,
       share_id: this.state.shopDetail.id,
     }).then((res) => {
       return {
-        title: "店铺",
-        path: `/pages/memberSub/storeManagement/index?shopId=${this.state.shopDetail.id}&isShare=true&isManager=false&&shareJump=${res.share_unique_value}`,
+        title: `${name||'分享者'}的店铺`,
+        path: `/pages/memberSub/storeManagement/index?shopId=${this.state.shopDetail.id}&isShare=true&isManager=false&&shareJump=${res.share_unique_value}&&shareType=2`,
         imageUrl: "",
       };
     });
@@ -124,7 +143,7 @@ export default class Index extends Component {
         {/* 头部卡片 */}
         <View className="header-card">
           <Image className="bg-image" src={storeManagement} mode="widthFix" />
-          {/* 分享���铺 */}
+          {/* 分享店铺 */}
           {!this.state.isShare && (
             <View className="share-shop">
               <Button onClick={this.handleShare} openType="share">
@@ -141,7 +160,7 @@ export default class Index extends Component {
                 mode="aspectFill"
                 src={shopDetail.img_icon}
               />
-              <View className="change-avatar-btn">更换头像</View>
+              {/* <View className="change-avatar-btn">更换头像</View> */}
             </View>
             <View className="info-content">
               <Text className="name">{shopDetail.store_name}</Text>
@@ -192,9 +211,9 @@ export default class Index extends Component {
           <View className="loading-container">
             <AtActivityIndicator
               content="加载中..."
-            isOpened={loading}
-            mode="center"
-            color="#fdf764"
+              isOpened={loading}
+              mode="center"
+              color="#fdf764"
             />
           </View>
         )}

src/service/index.js

@@ -86,7 +86,7 @@ export const getUserAgreement = data =>
     method: 'POST',
     data,
   })
-// 获取分享跳转标识
+// 获取分享跳转标识(1:商品;2:店铺 3:专题页)
 export const getShareJump = data =>
   Request({
     url: '/user/get_not_oneself_store_detail',