Browse Source

Merge branch 'main' of http://git.ycjcjy.com/marketing/miniapp into main

1002884655 3 years ago
parent
commit
31257d006c
3 changed files with 5 additions and 3 deletions
  1. 1
    1
      config/prod.js
  2. 2
    2
      src/pages/video/components/VideoListItem/index.jsx
  3. 2
    0
      src/routes.js

+ 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.75-20211101"'
13
+    Version: '"V0.0.78-20211104"'
14
   },
14
   },
15
   mini: {},
15
   mini: {},
16
   h5: {
16
   h5: {

+ 2
- 2
src/pages/video/components/VideoListItem/index.jsx View File

8
 
8
 
9
   const toDetail=()=>{
9
   const toDetail=()=>{
10
     if(Data.type=='video'){
10
     if(Data.type=='video'){
11
-      Taro.navigateTo({ url: `/pages/video/videoDetail/index?id=${Data.id}` })
11
+      Taro.navigateTo({ url: `/pages/video/videoDetail/index?id=${Data.id}&type=${Data.type}` })
12
     }else{
12
     }else{
13
-      Taro.navigateTo({ url: `/pages/video/liveDetail/index?id=${Data.id}` })
13
+      Taro.navigateTo({ url: `/pages/video/liveDetail/index?id=${Data.id}&type=${Data.type}` })
14
     }
14
     }
15
     // 
15
     // 
16
   }
16
   }

+ 2
- 0
src/routes.js View File

244
     page: 'pages/video/liveDetail/index',
244
     page: 'pages/video/liveDetail/index',
245
     pkg: 'main',
245
     pkg: 'main',
246
     type: 'live',
246
     type: 'live',
247
+    auth: ['phone'],
247
   },
248
   },
248
   {
249
   {
249
     name: '视频详情',
250
     name: '视频详情',
250
     page: 'pages/video/videoDetail/index',
251
     page: 'pages/video/videoDetail/index',
251
     pkg: 'main',
252
     pkg: 'main',
252
     type: 'live',
253
     type: 'live',
254
+    auth: ['phone'],
253
   },
255
   },
254
 
256
 
255
   // 我的
257
   // 我的