完成分享

src/pages/details/index.tsx

@@ -11,21 +11,21 @@ import { useEffect, useMemo, useRef, useState } from 'react';
 import {formatHashTag, formatImgUrl} from '@/common/fotmat'
 import {GetProductDetailApi} from '@/api/material'
 import useLogin from '@/use/useLogin';
-import { useSelector } from '@/reducers/hooks';
-import { AnalysisShortCodeApi, GetShortCodeApi } from '@/api/share';
+import { AnalysisShortCodeApi, BindShortCodeApi, GetShortCodeApi } from '@/api/share';
 import { SHARE_SCENE } from '@/common/enum';
+import useUserInfo from '@/use/useUserInfo';
 
 type item = {title:string, img:string, url:string, id:number}
 
-type params = {
+type Params = {
   list?: item[]
   swiperOnClick?: (val: item) => void,
   style?: Object
 }
-export default (props:params) => {
+export default (props:Params) => {
   const {checkLogin, getPhoneNumber, userInfo} = useLogin()
 
-  //获取参数
+  //获取参数(有两种参数：1.商品id, 2.页面分享)
   const router = useRouter()
   const [params, setParams] = useState({id: '', share: null})
 
@@ -38,29 +38,24 @@ export default (props:params) => {
     }
   }
 
-  //解析短码参数（该请求不能校验token）
+  //解析短码参数
   const {fetchData: fetchDataAnalysisShortCode} = AnalysisShortCodeApi()
   const analysisShortCode = async () => {
     let res = await fetchDataAnalysisShortCode({md5_key: router.params.share})
-    setParams({id: res.data.id, share: res.data})
-    console.log('res::::&&', res.data)
+    setParams({id: res.data.product_id, share: res.data})
   }
 
   useDidShow(() => {
+    checkLogin()
     judgeParam()
   })
 
   useEffect(() => {
-    //先确保能拿到订单id才做其他请求
     if(params.id) {
-      checkLogin()
-      getShortCode()
       getProductDetail()
     }
   }, [params])
  
-
-
   //获取数据
   const [productInfo, setProductInfo] = useState<any>({})
   const {fetchData} = GetProductDetailApi()
@@ -70,6 +65,11 @@ export default (props:params) => {
     Taro.stopPullDownRefresh()
   }
 
+  useEffect(() => {
+    if(productInfo.code)  getShortCode()
+  }, [productInfo])
+
+
   //面料名称
   const productName = useMemo(() => {
     return formatHashTag(productInfo.code, productInfo.name)
@@ -103,37 +103,14 @@ export default (props:params) => {
     })
   }
 
-
-  const userObj = useSelector(state => state.userInfo)
-  //获取分享转码
+  const {setSortCode, userInfo : userObj } = useUserInfo()
+  //详情页获取分享短码
   const {ShareDetail} = SHARE_SCENE
   const {fetchData: fetchDataShortCode} = GetShortCodeApi()
-  const sortCode = useRef('')
   const getShortCode = async () => {
-      const {data: resDetail} = await fetchDataShortCode({"share_user_id": userObj.adminUserInfo.user_id, type:ShareDetail.value, id: params.id})
-      sortCode.current = resDetail.md5_key
+    const {data: resDetail} = await fetchDataShortCode({"share_user_id": userObj.adminUserInfo.user_id, type:ShareDetail.value, product_id: parseInt(params.id)})
+    setSortCode({... userObj.sort_code, shareShortDetail: {title: productName as string, code: resDetail.md5_key, img:''}})
   }
-  
-
-  //转发分享
-  useShareAppMessage(res => {
-    let path = ''
-    let title = ''
-    let imageUrl = ''
-    if (res.from === 'button') {
-      path = `/pages/details/index?share=${sortCode.current}`
-      title = productName as string
-      // imageUrl = 
-    } else {
-      path = `/pages/index/index?share=${sortCode.current}`
-      title = '陆盈电子商城'
-    }
-    return {
-      title,
-      path,
-      imageUrl,
-    }
-  })
 
   //开始下单
   const placeOrder = async (e:any) => {

src/pages/editOrder/index.config.ts

@@ -1,5 +1,6 @@
 export default {
   navigationBarTitleText: '修改地址',
   enablePullDownRefresh: true,
-  backgroundTextStyle: 'dark'
+  backgroundTextStyle: 'dark',
+  enableShareAppMessage: true,
 }

src/pages/index/index.tsx

@@ -8,10 +8,9 @@ import ShopCart from '@/components/shopCart'
 import { goLink } from '@/common/common'
 import styles  from './index.module.scss'
 import React, { useEffect, useMemo, useRef, useState } from 'react'
-import Taro, { Events, useDidShow, usePullDownRefresh, useRouter, useShareAppMessage } from '@tarojs/taro'
+import Taro, { Events, useDidShow, usePullDownRefresh} from '@tarojs/taro'
 import {GetProductKindListApi, GetProductListApi} from '@/api/material'
 import useLogin from '@/use/useLogin'
-import LoadingCard from '@/components/loadingCard'
 import { dataLoadingStatus } from '@/common/util'
 
 export default () => {

src/pages/order/comfirm.config.ts

@@ -1,3 +1,4 @@
 export default {
-  navigationBarTitleText: '确认订单'
+  navigationBarTitleText: '确认订单',
+  enableShareAppMessage: true,
 }

src/pages/order/index.config.ts

@@ -1,5 +1,6 @@
 export default {
   navigationBarTitleText: '订单详情',
   enablePullDownRefresh: true,
-  backgroundTextStyle: 'dark'
+  backgroundTextStyle: 'dark',
+  enableShareAppMessage: true,
 }

src/pages/orderList/index.config.ts

@@ -1,3 +1,4 @@
 export default {
   navigationBarTitleText: '订单列表',
+  enableShareAppMessage: true,
 }

src/pages/search/index.config.ts

@@ -1,3 +1,4 @@
 export default {
-  navigationBarTitleText: '搜索'
+  navigationBarTitleText: '搜索',
+  enableShareAppMessage: true,
 }

src/pages/searchList/search.config.ts

@@ -1,3 +1,4 @@
 export default {
   navigationBarTitleText: '搜索',
+  enableShareAppMessage: true,
 }

src/pages/searchList/search.tsx

@@ -8,7 +8,7 @@ import { useEffect, useRef, useState } from 'react';
 import {GetHotSearchApi, GetSearchHistoryApi, AddSearchHistoryApi} from "@/api/search"
 import { SCENE } from '@/common/constant';
 import useLogin from '@/use/useLogin';
-import Taro, { useDidShow } from '@tarojs/taro';
+import Taro, { useDidShow, useShareAppMessage } from '@tarojs/taro';
 
 type searchDataParam = {'search_key':''}
 export default () => {

src/pages/user/index.config.ts

@@ -1,4 +1,5 @@
 export default {
   navigationBarTitleText: '我的',
-  navigationStyle: 'custom'
+  navigationStyle: 'custom',
+  enableShareAppMessage: true,
 }