张延森 3 years ago
parent
commit
0021fe7bfd
4 changed files with 35 additions and 15 deletions
  1. 4
    4
      config/dev.js
  2. 1
    1
      config/prod.js
  3. 1
    1
      project.config.json
  4. 29
    9
      src/subpackages/pages/consultant/myHomepage/index.jsx

+ 4
- 4
config/dev.js View File

3
     NODE_ENV: '"development"'
3
     NODE_ENV: '"development"'
4
   },
4
   },
5
   defineConstants: {
5
   defineConstants: {
6
-    HOST: '"https://xlk.njyz.tech"',
7
-    // HOST: '"https://www.newhousehold.cn"',
6
+    // HOST: '"https://xlk.njyz.tech"',
7
+    HOST: '"https://www.newhousehold.cn"',
8
     // HOST: '"http://127.0.0.1:8567"',
8
     // HOST: '"http://127.0.0.1:8567"',
9
-    // WSS_HOST: '"wss://www.newhousehold.cn"',
10
-    WSS_HOST: '"wss://xlk.njyz.tech"',
9
+    WSS_HOST: '"wss://www.newhousehold.cn"',
10
+    // WSS_HOST: '"wss://xlk.njyz.tech"',
11
     OSS_PATH: '"https://xlk-assets.oss-cn-shanghai.aliyuncs.com/"',
11
     OSS_PATH: '"https://xlk-assets.oss-cn-shanghai.aliyuncs.com/"',
12
     OSS_FAST_PATH: '"https://xlk-assets.oss-cn-shanghai.aliyuncs.com/"',
12
     OSS_FAST_PATH: '"https://xlk-assets.oss-cn-shanghai.aliyuncs.com/"',
13
     ICON_FONT: '"https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/css/iconfont.ttf"',
13
     ICON_FONT: '"https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/css/iconfont.ttf"',

+ 1
- 1
config/prod.js View File

10
     OSS_PATH: '"https://xlk-assets.oss-cn-shanghai.aliyuncs.com/"',
10
     OSS_PATH: '"https://xlk-assets.oss-cn-shanghai.aliyuncs.com/"',
11
     OSS_FAST_PATH: '"https://xlk-assets.oss-cn-shanghai.aliyuncs.com/"',
11
     OSS_FAST_PATH: '"https://xlk-assets.oss-cn-shanghai.aliyuncs.com/"',
12
     ICON_FONT: '"https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/css/iconfont.ttf"',
12
     ICON_FONT: '"https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/css/iconfont.ttf"',
13
-    Version: '"V0.0.78-20211104"'
13
+    Version: '"V0.0.81-20211117"'
14
   },
14
   },
15
   mini: {},
15
   mini: {},
16
   h5: {
16
   h5: {

+ 1
- 1
project.config.json View File

2
 	"miniprogramRoot": "dist/",
2
 	"miniprogramRoot": "dist/",
3
 	"projectname": "miniapp",
3
 	"projectname": "miniapp",
4
 	"description": "",
4
 	"description": "",
5
-	"appid": "wxe44244d1a5ea3364",
5
+	"appid": "wxc96058d57e77f373",
6
 	"setting": {
6
 	"setting": {
7
 		"urlCheck": false,
7
 		"urlCheck": false,
8
 		"es6": false,
8
 		"es6": false,

+ 29
- 9
src/subpackages/pages/consultant/myHomepage/index.jsx View File

8
 import { API_CARDS_UV, API_ITEMS_DETAIL, API_CARDS_LIST } from '@/constants/api'
8
 import { API_CARDS_UV, API_ITEMS_DETAIL, API_CARDS_LIST } from '@/constants/api'
9
 import { getImgURL } from '@/utils/image'
9
 import { getImgURL } from '@/utils/image'
10
 import useLike from "@/utils/hooks/useLike";
10
 import useLike from "@/utils/hooks/useLike";
11
+import useShare from '@/utils/hooks/useShare'
12
+import useParams from '@/utils/hooks/useParams'
11
 import { savePoint } from '@/services/common'
13
 import { savePoint } from '@/services/common'
12
 import '@/assets/css/iconfont.css'
14
 import '@/assets/css/iconfont.css'
13
 import './index.scss'
15
 import './index.scss'
14
 
16
 
15
 export default withLayout((props) => {
17
 export default withLayout((props) => {
16
 
18
 
17
-  const { router, trackData } = props
19
+  const { router, shareContent, page, trackData } = props
18
   const { id } = router.params
20
   const { id } = router.params
19
   
21
   
20
   const [ShowPopup, setShowPopup] = useState(false)
22
   const [ShowPopup, setShowPopup] = useState(false)
21
   const [UserInfo, setUserInfo] = useState({})
23
   const [UserInfo, setUserInfo] = useState({})
22
   const [BuildingInfo, setBuildingInfo] = useState({})
24
   const [BuildingInfo, setBuildingInfo] = useState({})
23
-  const [LikeNum, setLikeNum] = useState(0)
25
+  // const [LikeNum, setLikeNum] = useState(0)
24
 
26
 
25
   const user = useSelector(state => state.user)
27
   const user = useSelector(state => state.user)
26
   const [PersonId, setPersonId] = useState(null)
28
   const [PersonId, setPersonId] = useState(null)
27
 
29
 
30
+  // 本页面分享或者海报参数
31
+  const paramsRef = useParams({
32
+    id: user.userInfo.person.personId,
33
+    buildingId: BuildingInfo?.buildingId,
34
+    person: user.userInfo.person,
35
+    from: `${page.type}_share`
36
+  })
37
+  const fullTrackData = { ...trackData, buildingId: BuildingInfo?.buildingId }
38
+
39
+  // 分享
40
+  useShare({
41
+      // title: shareContent.shareContentTitle || DetailInfo?.buildingName,
42
+      path: `${router.path}?${paramsRef.current}`,
43
+      // image: shareContent.shareContentImg,
44
+    },
45
+    fullTrackData,
46
+  )
47
+
28
   const [isSave, handleFavor] = useLike(UserInfo?.liked, {
48
   const [isSave, handleFavor] = useLike(UserInfo?.liked, {
29
     id: id || user.userInfo.person.personId,
49
     id: id || user.userInfo.person.personId,
30
     ...trackData,
50
     ...trackData,
33
     if(!isSave) {
53
     if(!isSave) {
34
       AddHotNum()
54
       AddHotNum()
35
     }
55
     }
36
-    const likeNum = isSave ? UserInfo.likeNum - 1 : UserInfo.likeNum + 1
37
-    setLikeNum(likeNum)
56
+    // const likeNum = isSave ? UserInfo.likeNum - 1 : UserInfo.likeNum + 1
57
+    // setLikeNum(likeNum)
38
   })
58
   })
39
 
59
 
40
-  useEffect(() => {
41
-    if(UserInfo.id) {
42
-      setLikeNum(UserInfo.likeNum)
43
-    }
44
-  }, [UserInfo])
60
+  // useEffect(() => {
61
+  //   if(UserInfo.id) {
62
+  //     setLikeNum(UserInfo.likeNum)
63
+  //   }
64
+  // }, [UserInfo])
45
 
65
 
46
   useEffect(() => {
66
   useEffect(() => {
47
     if (PersonId !== user.userInfo.person.personId) {
67
     if (PersonId !== user.userInfo.person.personId) {