xcx 4 лет назад
Родитель
Сommit
da0cd5a9e3

+ 65
- 0
src/pages/HuoDong/HuoDongDetail/index.css Просмотреть файл

@@ -45,6 +45,7 @@
45 45
   line-height: 40px;
46 46
   width: 100%;
47 47
   display: block;
48
+  padding-top: 20px;
48 49
   margin-top: 10px;
49 50
   position: relative;
50 51
   z-index: 1;
@@ -109,3 +110,67 @@
109 110
 .HuoDongDetail > .Info > .BottomBtn.active {
110 111
   background: #F35844;
111 112
 }
113
+.HuoDongDetail .JoinNumLayer {
114
+  width: 100%;
115
+  position: fixed;
116
+  z-index: 1000;
117
+  left: 0;
118
+  top: 0;
119
+  bottom: 0;
120
+  display: none;
121
+  background: rgba(0, 0, 0, 0.7);
122
+}
123
+.HuoDongDetail .JoinNumLayer.active {
124
+  display: block;
125
+}
126
+.HuoDongDetail .JoinNumLayer > view {
127
+  width: 80%;
128
+  background: #fff;
129
+  border-radius: 12px;
130
+  overflow: hidden;
131
+}
132
+.HuoDongDetail .JoinNumLayer > view > text {
133
+  display: block;
134
+  font-size: 28px;
135
+  color: #333;
136
+  line-height: 40px;
137
+  margin-top: 20px;
138
+  text-align: center;
139
+}
140
+.HuoDongDetail .JoinNumLayer > view > .Form {
141
+  align-items: center;
142
+  margin-top: 20px;
143
+  padding: 30px;
144
+}
145
+.HuoDongDetail .JoinNumLayer > view > .Form > view:first-child {
146
+  margin-right: 20px;
147
+}
148
+.HuoDongDetail .JoinNumLayer > view > .Form > view:first-child > text {
149
+  font-size: 26px;
150
+  color: #333;
151
+  line-height: 40px;
152
+  text-indent: 30px;
153
+  display: block;
154
+}
155
+.HuoDongDetail .JoinNumLayer > view > .Form > view.flex-item > input {
156
+  font-size: 26px;
157
+  color: #333;
158
+  line-height: 40px;
159
+  height: 40px;
160
+}
161
+.HuoDongDetail .JoinNumLayer > view > .Bottom {
162
+  align-items: center;
163
+  border-top: 2px solid rgba(0, 0, 0, 0.08);
164
+  margin-top: 20px;
165
+}
166
+.HuoDongDetail .JoinNumLayer > view > .Bottom > view:first-child {
167
+  border-right: 2px solid rgba(0, 0, 0, 0.08);
168
+}
169
+.HuoDongDetail .JoinNumLayer > view > .Bottom > view > text {
170
+  width: 100%;
171
+  display: block;
172
+  text-align: center;
173
+  font-size: 26px;
174
+  color: #666;
175
+  line-height: 80px;
176
+}

+ 6
- 1
src/pages/HuoDong/HuoDongDetail/index.jsx Просмотреть файл

@@ -61,15 +61,18 @@ export default function HuoDongDetail () {
61 61
 
62 62
   const ToSetJoinBtnText = () => {
63 63
     if (ActivityDetail.activityStatus - 0 === 2) {
64
+      setJoinBtnStatus(false)
64 65
       setJoinBtnText(`已结束`)
65 66
       return false
66 67
     } else {
67 68
       if (HasSign) {
69
+        setJoinBtnStatus(false)
68 70
         setJoinBtnText(`已签到`)
69 71
         return false
70 72
       } else {
71 73
         if (HasJoin) {
72 74
           if (ActivityDetail.activityStatus - 0 === 1) {
75
+            setJoinBtnStatus(false)
73 76
             setJoinBtnText(`已报名`)
74 77
           } else if (ActivityDetail.activityStatus - 0 === 0) {
75 78
             setJoinBtnStatus(true)
@@ -82,6 +85,7 @@ export default function HuoDongDetail () {
82 85
             setJoinBtnText(`去报名`)
83 86
             return false
84 87
           } else {
88
+            setJoinBtnStatus(false)
85 89
             setJoinBtnText(null)
86 90
             return false
87 91
           }
@@ -124,12 +128,13 @@ export default function HuoDongDetail () {
124 128
     if (DataLock || ActivityDetail === null || !JoinBtnStatus) return
125 129
     setDataLock(true)
126 130
     if (JoinBtnText === '去签到') {
131
+      setDataLock(false)
127 132
       Taro.navigateTo({ url: `/pages/HuoDong/HuoDongSign/index?id=${ActivityDetail.dynamicId}` })
128 133
     } else {
129 134
       const { phone } = user
135
+      setDataLock(false)
130 136
       if (!phone) { // 未授权手机号,唤起授权手机号弹窗
131 137
         setShowGetUserPhoneLayer(true)
132
-        setDataLock(false)
133 138
         return false
134 139
       }
135 140
       setShowJoinNumPopup(true)

+ 1
- 0
src/pages/HuoDong/HuoDongDetail/index.less Просмотреть файл

@@ -48,6 +48,7 @@
48 48
         line-height: 40px;
49 49
         width: 100%;
50 50
         display: block;
51
+        padding-top: 20px;
51 52
         margin-top: 10px;
52 53
         position: relative;
53 54
         z-index: 1;