许静 5 年之前
父節點
當前提交
d2e34d502e
共有 2 個文件被更改,包括 12 次插入11 次删除
  1. 1
    1
      src/pages/activity/detail/assemble.js
  2. 11
    10
      src/pages/activity/detail/assistance.js

+ 1
- 1
src/pages/activity/detail/assemble.js 查看文件

626
                   </View>
626
                   </View>
627
                 </View>
627
                 </View>
628
 
628
 
629
-                <View className="assistance-text"><Text className="acitivty-desc">活动说明</Text>-------------------------------------------------------------- </View>
629
+                <View className="assistance-text"><Text className="acitivty-desc">活动说明</Text>---------------------------------------------------------------------------------- </View>
630
                 <View style="padding:0 40rpx 180rpx 40rpx">
630
                 <View style="padding:0 40rpx 180rpx 40rpx">
631
                   <Image src={transferImage(detail.descImg)} mode="widthFix" style="width:100%;"></Image>
631
                   <Image src={transferImage(detail.descImg)} mode="widthFix" style="width:100%;"></Image>
632
                 </View>
632
                 </View>

+ 11
- 10
src/pages/activity/detail/assistance.js 查看文件

74
       if (this.toggleGrantPhone()) {
74
       if (this.toggleGrantPhone()) {
75
         this.toggleGrantAvatar()
75
         this.toggleGrantAvatar()
76
       }
76
       }
77
-      
77
+
78
       this.initPageData()
78
       this.initPageData()
79
     })
79
     })
80
   }
80
   }
127
   // 调起授权电话
127
   // 调起授权电话
128
   toggleGrantPhone = () => {
128
   toggleGrantPhone = () => {
129
     const { userInfo: { person: { phone, tel } } } = this.props
129
     const { userInfo: { person: { phone, tel } } } = this.props
130
-    
130
+
131
     if (!phone && !tel) {
131
     if (!phone && !tel) {
132
       this.setState({ grantPhoneVisible: true })
132
       this.setState({ grantPhoneVisible: true })
133
       return false
133
       return false
134
     }
134
     }
135
-    console.log('phone:',phone,'tel:',tel,'!!!!!')
136
-    console.log(this.props,'this.propsphone!!!!!')
135
+    console.log('phone:', phone, 'tel:', tel, '!!!!!')
136
+    console.log(this.props, 'this.propsphone!!!!!')
137
 
137
 
138
     return true
138
     return true
139
   }
139
   }
143
     const { userInfo: { person: { avatarurl } } } = this.props
143
     const { userInfo: { person: { avatarurl } } } = this.props
144
 
144
 
145
     if (!avatarurl || avatarurl.indexOf('wx.qlogo.cn') === -1) {
145
     if (!avatarurl || avatarurl.indexOf('wx.qlogo.cn') === -1) {
146
-      console.log(this.props.userInfo,"this.props")
146
+      console.log(this.props.userInfo, "this.props")
147
       this.setState({ grantAvatarVisible: true })
147
       this.setState({ grantAvatarVisible: true })
148
       return false
148
       return false
149
     }
149
     }
150
-    console.log(avatarurl,"avatarurl")
150
+    console.log(avatarurl, "avatarurl")
151
     return true
151
     return true
152
   }
152
   }
153
 
153
 
606
                   }
606
                   }
607
                   {
607
                   {
608
                     isStarter && actState === ActInProcess && helpState === HelpInProcess &&
608
                     isStarter && actState === ActInProcess && helpState === HelpInProcess &&
609
-                    (<View className="assistance-btn"><FormIdCollector><Button className="assistance-btn" onClick={this.askForHelp}>邀请好友助力</Button></FormIdCollector></View>)
609
+                    // (<Block>
610
+                    //   <View className="set-btn">生成海报</View>
611
+                      <View className="assistance-btn"><FormIdCollector><Button className="assistance-btn" onClick={this.askForHelp}>邀请好友助力</Button></FormIdCollector></View>
612
+                    // </Block>)
610
                   }
613
                   }
611
                   {
614
                   {
612
                     !isStarter && actState === ActInProcess &&
615
                     !isStarter && actState === ActInProcess &&
627
                     )
630
                     )
628
                   }
631
                   }
629
                 </View>
632
                 </View>
630
-                <View className="assistance-text"><Text className="acitivty-desc">活动说明</Text>-------------------------------------------------------------- </View>
633
+                <View className="assistance-text"><Text className="acitivty-desc">活动说明</Text>-------------------------------------------------------------------------- </View>
631
                 <View style="padding:0 40rpx">
634
                 <View style="padding:0 40rpx">
632
                   <Image src={transferImage(detail.activityInstructions)} mode="widthFix" style="width:100%;margin-bottom:20px;"></Image>
635
                   <Image src={transferImage(detail.activityInstructions)} mode="widthFix" style="width:100%;margin-bottom:20px;"></Image>
633
                 </View>
636
                 </View>
634
-
635
               </ScrollView>
637
               </ScrollView>
636
-
637
               <action-sheet hidden={!actionSheetVisible} bindchange={this.toggleActionVisible}>
638
               <action-sheet hidden={!actionSheetVisible} bindchange={this.toggleActionVisible}>
638
                 <action-sheet-item open-type="share">
639
                 <action-sheet-item open-type="share">
639
                   <Button open-type="share" className='share__friend' onClick={this.toggleActionVisible}>分享给好友</Button>
640
                   <Button open-type="share" className='share__friend' onClick={this.toggleActionVisible}>分享给好友</Button>