Browse Source

静态页面

1002884655 4 years ago
parent
commit
497b6bd526
2 changed files with 17 additions and 11 deletions
  1. 7
    1
      src/pages/HuoDong/HuoDongDetail/index.jsx
  2. 10
    10
      src/pages/HuoDong/HuoDongSign/index.jsx

+ 7
- 1
src/pages/HuoDong/HuoDongDetail/index.jsx View File

@@ -143,7 +143,13 @@ export default function HuoDongDetail () {
143 143
   const ToJoin = () => { // 去报名
144 144
     if (DataLock || ActivityDetail === null || (Status - 0 !== 2 && Status - 0 !== 4)) return
145 145
     if (Status - 0 === 4) { // 去签到
146
-      Taro.navigateTo({ url: `/pages/HuoDong/HuoDongSign/index?id=${ActivityDetail.dynamicId}&from=detail` })
146
+      // Taro.navigateTo({ url: `/pages/HuoDong/HuoDongSign/index?id=${ActivityDetail.dynamicId}&from=detail` })
147
+      Taro.scanCode({
148
+        onlyFromCamera: true,
149
+        success (res) {
150
+          Taro.navigateTo({ url: `/${res.path}` })
151
+        }
152
+      })
147 153
     } else { // 去报名
148 154
       const { phone } = user
149 155
       if (!phone) { // 未授权手机号,唤起授权手机号弹窗

+ 10
- 10
src/pages/HuoDong/HuoDongSign/index.jsx View File

@@ -59,14 +59,14 @@ export default function HuoDongDetail () {
59 59
     })
60 60
   }
61 61
 
62
-  const QrCodeSign = () => {
63
-    Taro.scanCode({
64
-      onlyFromCamera: true,
65
-      success (res) {
66
-        Taro.navigateTo({ url: `/${res.path}` })
67
-      }
68
-    })
69
-  }
62
+  // const QrCodeSign = () => {
63
+  //   Taro.scanCode({
64
+  //     onlyFromCamera: true,
65
+  //     success (res) {
66
+  //       Taro.navigateTo({ url: `/${res.path}` })
67
+  //     }
68
+  //   })
69
+  // }
70 70
 
71 71
   const ToSign = () => {
72 72
     if (JoinInfo.enlist !== null) {
@@ -107,14 +107,14 @@ export default function HuoDongDetail () {
107 107
             </view>
108 108
           </view>
109 109
         }
110
-        {
110
+        {/* {
111 111
           !CurrnetSceneId &&
112 112
           <view className='SignBtn active'>
113 113
             <view>
114 114
               <text className='centerLabel' onClick={QrCodeSign}>扫码</text>
115 115
             </view>
116 116
           </view>
117
-        }
117
+        } */}
118 118
         {
119 119
           useRouter().params.from === 'detail' &&
120 120
           <view className='AlertPopup'>