Explorar o código

chore: auto bump version and changelog [skip ci]

iwt hai 1 mes
pai
achega
8e2b6420c6

+ 12 - 28
cfc-frontend/pages/activity/activity-detail/activity-detail.vue

@@ -87,13 +87,9 @@
           <button
             v-if="activity.requireRegistration === 1 && !registrationStatus"
             class="btn-register"
-            :class="{ 'btn-register-loading': registrationLoading || paying }"
-            :disabled="registrationLoading || paying"
             @click="onRegister"
           >
-            <text v-if="registrationLoading">报名中...</text>
-            <text v-else-if="paying">支付中...</text>
-            <text v-else-if="activity.price > 0">¥{{ activity.price }} 立即报名</text>
+            <text v-if="activity.price > 0">¥{{ activity.price }} 立即报名</text>
             <text v-else>立即报名</text>
           </button>
 
@@ -270,7 +266,6 @@ export default {
       checkinPoints: 0,
       registrationStatus: null,
       registrationLoading: false,
-      paying: false,
       showPenaltyModal: false,
       penaltyAmount: 0,
       showFeedbackModal: false,
@@ -414,27 +409,6 @@ export default {
       self.registrants = []
       self.loadFamilyMembers()
     },
-    doRegister: function(childId) {
-      var self = this
-      self.registrationLoading = true
-      if (self.activity && self.activity.price > 0) {
-        self.paying = true
-      }
-      registerActivity({ id: self.activity.id, childId: childId }).then(function(res) {
-        self.registrationLoading = false
-        self.paying = false
-        if (res && res.code === 200) {
-          self.registrationStatus = 'pending'
-          uni.showToast({ title: '报名成功,请等待审核', icon: 'success' })
-        } else {
-          uni.showToast({ title: (res && res.message) || '报名失败', icon: 'none' })
-        }
-      }).catch(function(err) {
-        self.registrationLoading = false
-        self.paying = false
-        uni.showToast({ title: '网络异常', icon: 'none' })
-      })
-    },
     onCancelRegistration: function() {
       var self = this
       uni.showModal({
@@ -611,10 +585,20 @@ export default {
         return
       }
       for (var i = 0; i < self.registrants.length; i++) {
-        if (!self.registrants[i].name || self.registrants[i].name.trim() === '') {
+        var entry = self.registrants[i]
+        if (!entry.name || entry.name.trim() === '') {
           uni.showToast({ title: '请输入第 ' + (i + 1) + ' 个报名人的姓名', icon: 'none' })
           return
         }
+        var phone = (entry.phone || '').trim()
+        if (phone === '') {
+          uni.showToast({ title: '请输入第 ' + (i + 1) + ' 个报名人的手机号', icon: 'none' })
+          return
+        }
+        if (!/^1[3-9]\d{9}$/.test(phone)) {
+          uni.showToast({ title: '请输入第 ' + (i + 1) + ' 个报名人的正确手机号', icon: 'none' })
+          return
+        }
       }
 
       // 付费活动 → 先确认支付

+ 1 - 1
cfc-web/.last_build_commit

@@ -1 +1 @@
-5acccd069892a1e7e02449cfd0d2201afb4e5505
+e25de96a3b35e433c224fd593ee565b6eef9439d