Browse Source

Merge branch '3.0' of http://git.ycjcjy.com/shigongli/miniapp-v2 into 3.0

Baozhangchao 3 years ago
parent
commit
f5c6d361f7

+ 1
- 1
config/prod.js View File

5
   defineConstants: {
5
   defineConstants: {
6
     HOST: '"https://sgl-v2-test.njyunzhi.com"',
6
     HOST: '"https://sgl-v2-test.njyunzhi.com"',
7
     OSS: '"yz-shigongli.oss-accelerate.aliyuncs.com"',
7
     OSS: '"yz-shigongli.oss-accelerate.aliyuncs.com"',
8
-    VERSION: '"2.0.35_2021-10-11 19:39:20"',
8
+    VERSION: '"3.0.1_2021-11-10"',
9
   },
9
   },
10
   mini: {},
10
   mini: {},
11
   h5: {
11
   h5: {

+ 4
- 0
src/layouts/index.jsx View File

5
 import { getQueryString } from '@/utils'
5
 import { getQueryString } from '@/utils'
6
 import useRouter from '@/utils/hooks/useRouter'
6
 import useRouter from '@/utils/hooks/useRouter'
7
 import useTrackPage from '@/utils/hooks/useTrackPage'
7
 import useTrackPage from '@/utils/hooks/useTrackPage'
8
+import useShareOpen from '@/utils/hooks/useShareOpen'
8
 import Loading from './Loading'
9
 import Loading from './Loading'
9
 import { getPageBy, getIndexPageOf } from '../routes'
10
 import { getPageBy, getIndexPageOf } from '../routes'
10
 
11
 
22
   }
23
   }
23
   useTrackPage(trackPageData)
24
   useTrackPage(trackPageData)
24
 
25
 
26
+  // 打开分享
27
+  useShareOpen(person?.personId, router.params.shareId)
28
+
25
   // 确保人员信息到位, 确保二维码解析结束
29
   // 确保人员信息到位, 确保二维码解析结束
26
   const loading = !person?.personRole || (router.params.scene && !router.params.parseQRFinished);
30
   const loading = !person?.personRole || (router.params.scene && !router.params.parseQRFinished);
27
 
31
 

+ 2
- 1
src/pages/RandomItinerary/ResultOver/index.jsx View File

4
 
4
 
5
 import CustomNav from '@/components/CustomNav'
5
 import CustomNav from '@/components/CustomNav'
6
 import withLayout from '@/layouts'
6
 import withLayout from '@/layouts'
7
-import { getTravelDestiny, share } from "@/services/travel"
7
+import { getTravelDestiny } from "@/services/travel"
8
+import { share } from "@/services/share"
8
 import ShareCard from "@/components/foodCards/ShareCard"
9
 import ShareCard from "@/components/foodCards/ShareCard"
9
 import './style.less'
10
 import './style.less'
10
 
11
 

+ 16
- 0
src/services/share.js View File

1
+import request from '@/utils/request'
2
+
3
+/**
4
+ * 分享
5
+ * @returns 
6
+ * params 
7
+ */
8
+export const share = (data) => request('/share', { method: 'post', data })
9
+
10
+
11
+/**
12
+ * 打开分享
13
+ * @returns 
14
+ * params 
15
+ */
16
+export const openShare = (id) => request(`/share/${id}/open`, { method: 'post' })

+ 0
- 10
src/services/travel.js View File

87
  */
87
  */
88
 export const getRecommendList = (params) => request('/resource/recommend', { params })
88
 export const getRecommendList = (params) => request('/resource/recommend', { params })
89
 
89
 
90
-
91
-/**
92
- * 分享
93
- * @returns 
94
- * params 
95
- */
96
-export const share = (data) => request('/share', { method: 'post', data })
97
-
98
-
99
-

+ 10
- 0
src/utils/hooks/useShareOpen.js View File

1
+import { openShare } from "@/services/share";
2
+import { useEffect } from "react";
3
+
4
+export default function useShareOpen(personId, shareId) {
5
+  useEffect(() => {
6
+    if (personId && shareId) {
7
+      openShare(shareId)
8
+    }
9
+  }, [personId, shareId])
10
+}