1002884655 hace 4 años
padre
commit
497b6bd526

+ 7
- 1
src/pages/HuoDong/HuoDongDetail/index.jsx Ver fichero

143
   const ToJoin = () => { // 去报名
143
   const ToJoin = () => { // 去报名
144
     if (DataLock || ActivityDetail === null || (Status - 0 !== 2 && Status - 0 !== 4)) return
144
     if (DataLock || ActivityDetail === null || (Status - 0 !== 2 && Status - 0 !== 4)) return
145
     if (Status - 0 === 4) { // 去签到
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
     } else { // 去报名
153
     } else { // 去报名
148
       const { phone } = user
154
       const { phone } = user
149
       if (!phone) { // 未授权手机号,唤起授权手机号弹窗
155
       if (!phone) { // 未授权手机号,唤起授权手机号弹窗

+ 10
- 10
src/pages/HuoDong/HuoDongSign/index.jsx Ver fichero

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
   const ToSign = () => {
71
   const ToSign = () => {
72
     if (JoinInfo.enlist !== null) {
72
     if (JoinInfo.enlist !== null) {
107
             </view>
107
             </view>
108
           </view>
108
           </view>
109
         }
109
         }
110
-        {
110
+        {/* {
111
           !CurrnetSceneId &&
111
           !CurrnetSceneId &&
112
           <view className='SignBtn active'>
112
           <view className='SignBtn active'>
113
             <view>
113
             <view>
114
               <text className='centerLabel' onClick={QrCodeSign}>扫码</text>
114
               <text className='centerLabel' onClick={QrCodeSign}>扫码</text>
115
             </view>
115
             </view>
116
           </view>
116
           </view>
117
-        }
117
+        } */}
118
         {
118
         {
119
           useRouter().params.from === 'detail' &&
119
           useRouter().params.from === 'detail' &&
120
           <view className='AlertPopup'>
120
           <view className='AlertPopup'>