瀏覽代碼

易懂按钮

bding 2 年之前
父節點
當前提交
2f13373a37

+ 4 - 1
activityPages/activityDetail/manageMixin.js

@@ -172,7 +172,10 @@ export default {
     },
     // 我要报名
     wanttosignup() {
-      if ((this.detailData.IsLimitPeople && [1, 2, 3].includes(this.detailData.ActivityTypeId)) || (this.detailData.IsYidongConduct && this.detailData.IsCanOutboundCall)) {
+      if (
+        (!this.detailData.IsYidongConduct && this.detailData.IsLimitPeople && [1, 2, 3].includes(this.detailData.ActivityTypeId)) ||
+        (this.detailData.IsYidongConduct && this.detailData.IsCanOutboundCall)
+      ) {
         this.selectShow = true;
         this.selectYdong = this.detailData.IsYidongConduct;
       } else {

+ 1 - 1
components/ItemComponent/activityItem.vue

@@ -193,7 +193,7 @@ export default {
       if (item.YidongActivityId) {
         this.goDetail(item);
         return;
-      } else if ((item.IsLimitPeople == 1 && [1, 2, 3].includes(item.ActivityTypeId)) || (item.IsYidongConduct && item.IsCanOutboundCall)) {
+      } else if ((item.IsYidongConduct && item.IsCanOutboundCall)|| (!item.IsYidongConduct && item.IsLimitPeople == 1 && [1, 2, 3].includes(item.ActivityTypeId))) {
         this.selectShow = true;
         this.selectYdong = item.IsYidongConduct;
       } else {

+ 2 - 2
components/activity/indexActivity.js

@@ -48,7 +48,7 @@ export default {
       if (item.YidongActivityId) {
         this.goDetail(item);
         return;
-      } else if ((item.IsLimitPeople == 1 && [1, 2, 3].includes(item.ActivityTypeId)) || (item.IsYidongConduct && item.IsCanOutboundCall)) {
+      } else if ((item.IsYidongConduct && item.IsCanOutboundCall) || (!item.IsYidongConduct && item.IsLimitPeople == 1 && [1, 2, 3].includes(item.ActivityTypeId))) {
         this.selectShow = true;
         this.selectYdong = item.IsYidongConduct;
       } else {
@@ -57,7 +57,7 @@ export default {
       }
     },
 
-    //报名/取消报名 
+    //报名/取消报名
     signupIsAddOfCancel(item, type, valName = "") {
       let id = this.activityIdAdd || item.ActivityId;
       let itemData = item;