xujing 5 yıl önce
ebeveyn
işleme
571a9d87c6

+ 47
- 4
src/onlineSelling/components/ScrollMessage/index.js Dosyayı Görüntüle

@@ -27,7 +27,41 @@ export default class ScrollMessage extends Component {
27 27
 
28 28
     return `${tip} ${useTK ? formateLeftTime(dt, 'min') : ''}`
29 29
   }
30
+  formateRaiseTM = (dt) => {
31
+    const now = dayjs(new Date);
32
+    const { raiseStartTime, raiseEndTime } = this.props.summary || {}
33
+    const raiseStart = dayjs(raiseStartTime)
34
+    const raiseEnd = dayjs(raiseEndTime)
35
+
36
+    let tip2 = ''
37
+    let useTK2 = true
38
+
39
+    if (now.isBefore(raiseStart)) {
40
+      tip2 = '距离认筹开始还有'
41
+    } else if (now.isBefore(raiseEnd)) {
42
+      tip2 = '距离认筹结束还有'
43
+    } else {
44
+      tip2 = '认筹已结束,请关注下轮认筹'
45
+      useTK2 = false
46
+    }
47
+
48
+    return `${tip2} ${useTK2 ? formateLeftTime(dt, 'min') : ''}`
49
+  }
50
+
51
+  computeRaiseDate = () => {
52
+    const now = dayjs(new Date);
53
+    const { raiseStartTime, raiseEndTime } = this.props.summary || {}
54
+    const raiseStart = dayjs(raiseStartTime)
55
+    const raiseEnd = dayjs(raiseEndTime)
30 56
 
57
+    if (now.isBefore(raiseStart)) {
58
+      return [now, raiseStart]
59
+    } else if (now.isBefore(raiseEnd)) {
60
+      return [now, raiseEnd]
61
+    } else {
62
+      return [now, now]
63
+    }
64
+  }
31 65
   computeDate = () => {
32 66
     const now = dayjs(new Date);
33 67
     const { preselectionStartTime, preselectionEndTime } = this.props.summary || {}
@@ -45,10 +79,13 @@ export default class ScrollMessage extends Component {
45 79
 
46 80
   render() {
47 81
     const [start, end] = this.computeDate()
48
-    const { salesNumber, preselectionNumber, heatNumber } = this.props.summary || {}
82
+    const [raiseStart, raiseEnd] = this.computeRaiseDate()
83
+    const { salesNumber, preselectionNumber, heatNumber, raiseNumber, raiseRealNumber, preselectionStartTime, preselectionEndTime, raiseStartTime, raiseEndTime } = this.props.summary || {}
49 84
     const personNum = heatNumber + preselectionNumber + 0
50
-  
85
+    const raisePersonNum = raiseNumber + raiseRealNumber + 0
86
+
51 87
     const notice = `当前 ${salesNumber} 套房源已有 ${personNum} 人成功预选`
88
+    const raiseNotice = `当前 ${salesNumber} 套房源已有 ${raisePersonNum} 人成功认筹`
52 89
 
53 90
     return (
54 91
       <View className="scrollmessage">
@@ -57,12 +94,18 @@ export default class ScrollMessage extends Component {
57 94
         </View>
58 95
         <View className="body">
59 96
           <Swiper vertical autoplay>
60
-            <SwiperItem>
97
+            {(preselectionStartTime || preselectionEndTime) && <SwiperItem>
61 98
               <TimeTicker startTime={start} endTime={end} translate={this.formateTM} />
62
-            </SwiperItem>
99
+            </SwiperItem>}
100
+            {(raiseStartTime || raiseEndTime) && <SwiperItem>
101
+              <TimeTicker startTime={raiseStart} endTime={raiseEnd} translate={this.formateRaiseTM} />
102
+            </SwiperItem>}
63 103
             {personNum > 0 && <SwiperItem>
64 104
               <View>{notice}</View>
65 105
             </SwiperItem>}
106
+            {raisePersonNum > 0 && <SwiperItem>
107
+              <View>{raiseNotice}</View>
108
+            </SwiperItem>}
66 109
           </Swiper>
67 110
         </View>
68 111
       </View>