张延森 5 years ago
parent
commit
c51870a269
2 changed files with 16 additions and 6 deletions
  1. 5
    0
      src/app.js
  2. 11
    6
      src/pages/activity/detail/assemble.js

+ 5
- 0
src/app.js View File

142
   }
142
   }
143
   componentDidHide() {
143
   componentDidHide() {
144
     ready.close()
144
     ready.close()
145
+    // socket.closeSocket()
146
+  }
147
+
148
+  componentWillUnmount () {
145
     socket.closeSocket()
149
     socket.closeSocket()
146
   }
150
   }
151
+
147
   componentDidShow() {
152
   componentDidShow() {
148
     console.info('app componentDidShow')
153
     console.info('app componentDidShow')
149
     console.info('router1', this.$router.params)
154
     console.info('router1', this.$router.params)

+ 11
- 6
src/pages/activity/detail/assemble.js View File

58
     leftTime: 0,  // 剩余时间
58
     leftTime: 0,  // 剩余时间
59
     ltTicker: undefined,  // 剩余时间计时器
59
     ltTicker: undefined,  // 剩余时间计时器
60
     actState: ActBeforeStart,  // 活动本身状态
60
     actState: ActBeforeStart,  // 活动本身状态
61
-    groupState: GroupInProcess, // 发起拼团活动的状态
61
+    groupState: undefined, // 发起拼团活动的状态
62
     isStarter: true, // 是否发起人
62
     isStarter: true, // 是否发起人
63
     submitting: false, // 是否提交中
63
     submitting: false, // 是否提交中
64
     actionSheetVisible: false, // 底部分享好友
64
     actionSheetVisible: false, // 底部分享好友
243
       if (actState != ActFinished) {
243
       if (actState != ActFinished) {
244
         ltTicker = this.getLeftTimeTicker(res.taShareActivity.startTime, res.taShareActivity.endTime)
244
         ltTicker = this.getLeftTimeTicker(res.taShareActivity.startTime, res.taShareActivity.endTime)
245
       }
245
       }
246
-
246
+debugger
247
       Taro.hideLoading()
247
       Taro.hideLoading()
248
       this.setState({
248
       this.setState({
249
         detail: res.taShareActivity,
249
         detail: res.taShareActivity,
250
         recordDetail,
250
         recordDetail,
251
         recordId: recordDetail.recordId,
251
         recordId: recordDetail.recordId,
252
-        groupState: recordDetail.status === undefined ? GroupInProcess : recordDetail.status,
252
+        groupState: recordDetail.status,
253
         shares: res.shareContentList || [],
253
         shares: res.shareContentList || [],
254
         posters: res.postList || [],
254
         posters: res.postList || [],
255
         posterTpls: res.posterTemplateList || [],
255
         posterTpls: res.posterTemplateList || [],
256
         memberList: res.shareChildRecordList || [],
256
         memberList: res.shareChildRecordList || [],
257
         loaded: true,
257
         loaded: true,
258
-        isStarter: !recordDetail.personId || userInfo.person.personId === recordDetail.personId,
258
+        isStarter: userInfo.person.personId === recordDetail.personId,
259
         actState,
259
         actState,
260
         leftTime,
260
         leftTime,
261
         ltTicker
261
         ltTicker
353
           memberList,
353
           memberList,
354
           recordDetail: res.taShareRecord,
354
           recordDetail: res.taShareRecord,
355
           recordId: res.taShareRecord.recordId,
355
           recordId: res.taShareRecord.recordId,
356
-          groupState: res.taShareRecord.status === undefined ? GroupInProcess : res.taShareRecord.status,
356
+          groupState: res.taShareRecord.status,
357
         })
357
         })
358
 
358
 
359
         Taro.showToast({
359
         Taro.showToast({
392
           phone: person.tel || person.phone,
392
           phone: person.tel || person.phone,
393
           avatarurl: person.avatarurl,
393
           avatarurl: person.avatarurl,
394
         }).then(res => {
394
         }).then(res => {
395
+          debugger
395
           this.setState({
396
           this.setState({
396
             recordDetail: res.taShareRecord,
397
             recordDetail: res.taShareRecord,
397
             recordId: res.taShareRecord.recordId,
398
             recordId: res.taShareRecord.recordId,
398
             memberList: res.shareChildRecordList || [],
399
             memberList: res.shareChildRecordList || [],
399
             isStarter: true,
400
             isStarter: true,
400
-            groupState: res.taShareRecord.status === undefined ? GroupInProcess : res.taShareRecord.status,
401
+            groupState: res.taShareRecord.status,
401
           }, resolve)
402
           }, resolve)
402
         }).catch(err => {
403
         }).catch(err => {
404
+          debugger
403
           console.log('err:', err)
405
           console.log('err:', err)
404
           Taro.showToast({
406
           Taro.showToast({
405
             title: '发起失败: ' + err.message,
407
             title: '发起失败: ' + err.message,
496
     const posterConfigs = this.transTPLs2Configs(posterTpls, posterData)
498
     const posterConfigs = this.transTPLs2Configs(posterTpls, posterData)
497
 
499
 
498
     console.log('------posterConfigs------', posterConfigs)
500
     console.log('------posterConfigs------', posterConfigs)
501
+
502
+    console.log(isStarter, actState, groupState)
503
+
499
     return (
504
     return (
500
       <Block>
505
       <Block>
501
         {/* 生成海报 */}
506
         {/* 生成海报 */}