feat: 活动结束弹窗关闭按钮删除

src/web/staticres/common-module/active/2022.5.20/task.js

@@ -329,6 +329,9 @@ var task = new Vue({
     progressAnchorList: function () {
       return this.progress.anchorList
     },
+    forbidClose: function () {
+      return this.dialog.type === 'over'
+    },
     getScreenMax: function () {
       return document.body.clientHeight < 600
     }

src/web/staticres/frontRouter/pc/activity/js/task.js

@@ -148,8 +148,15 @@ function showDialogOfType (type) {
   // $('#active-tip-modal').attr('data-modal-type', 'success').modal('show')
   // $('#active-tip-modal').attr('data-modal-type', 'over').modal('show')
   // $('#active-tip-modal').attr('data-modal-type', 'code').modal('show')
-
-  $('#active-tip-modal').attr('data-modal-type', type).modal('show')
+  var modal = $('#active-tip-modal')
+  modal.attr('data-modal-type', type).modal('show')
+  if (type === 'over') {
+    modal.off('click')
+  } else {
+    modal.off('click').on('click', function () {
+      modal.modal('hide')
+    })
+  }
 }
 
 // 固定事件

src/web/templates/frontRouter/pc/activity/sess/task.html

@@ -163,7 +163,7 @@
     <img class="bg-image" src='{{Msg "seo" "cdn"}}/common-module/active/2022.5.20/qrCodeBg.png?v={{Msg "seo" "version"}}' alt="扫一扫">
   </div>
   <div class="modal-dialog active-tip--over">
-    <div class="close-dialog-icon" data-dismiss="modal" id="dialog-icon--over">
+    <div class="close-dialog-icon" data-dismiss="modal" id="dialog-icon--over" style="display: none">
       <img src='{{Msg "seo" "cdn"}}/common-module/active/2022.5.20/close.png?v={{Msg "seo" "version"}}' alt="x">
     </div>
     <h4>活动结束提醒</h4>

src/web/templates/frontRouter/wx/activity/sess/task.html

@@ -136,7 +136,7 @@
                 </section>
             </div>
             <!--S-弹窗-->
-            <van-popup id="active-tip-modal" v-model="dialog.show" :data-modal-type="dialog.type" :close-on-click-overlay="dialog.type !== 'over'">
+            <van-popup id="active-tip-modal" v-model="dialog.show" :data-modal-type="dialog.type" :close-on-click-overlay="!forbidClose">
               <div v-show="dialog.type === 'rule'" class="modal-dialog active-tip--rule" :class="{max: getScreenMax}">
                 <h5>活动规则</h5>
                 <div class="rule-content">
@@ -152,7 +152,7 @@
                 <img class="bg-image" src='{{Msg "seo" "cdn"}}/common-module/active/2022.5.20/guizeBG.png?v={{Msg "seo" "version"}}' alt="扫一扫">
               </div>
               <div v-show="dialog.type === 'over'" class="modal-dialog active-tip--over">
-                <div class="close-dialog-icon" @click="dialog.show = false" id="dialog-icon--over">
+                <div class="close-dialog-icon" @click="dialog.show = false" id="dialog-icon--over" v-if="!forbidClose">
                   <img src='{{Msg "seo" "cdn"}}/common-module/active/2022.5.20/close.png?v={{Msg "seo" "version"}}' alt="x">
                 </div>
                 <h4>活动结束提醒</h4>