Przeglądaj źródła

feat: 留资页面关于活动的修改

cuiyalong 3 lat temu
rodzic
commit
2174a3d9a5

+ 14 - 4
src/jfw/modules/app/src/web/templates/frontRouter/bigmember/free/perfect_info.html

@@ -1509,7 +1509,7 @@
           sessionStorage.removeItem('salesBackStatus')
           history.back()
         },
-        showMessage: function (msg) {
+        showMessage: function (msg, confirmText, callback) {
           var message = msg || '您的申请已提交,我们会尽快联系您并预约演示时间,请耐心等待~您将获得免费体验大会员全部功能!'
           this.$dialog.close()
           this.$dialog.confirm({
@@ -1518,10 +1518,14 @@
             overlayClass: 'z-2030',
             showCancelButton: false,
             getContainer: '.perfect-info-group',
-            confirmButtonText: '我知道了',
+            confirmButtonText: confirmText || '我知道了',
           }).then(function () {
-            sessionStorage.setItem('salesBackStatus', 'true')
-            history.back()
+            if (callback) {
+              callback()
+            } else {
+              sessionStorage.setItem('salesBackStatus', 'true')
+              history.back()
+            }
           }).catch(function () {
             sessionStorage.setItem('salesBackStatus', 'true')
             history.back()
@@ -1615,6 +1619,12 @@
                     }
                     break
                   }
+                  case 'activity_free_plan': {
+                    _this.showMessage('完善信息任务已完成,快去领取剑鱼币吧~', '去领取', function () {
+                      history.back()
+                    })
+                    break
+                  }
                   default: {
                     var message = ''
                     if (source) {

+ 25 - 2
src/web/staticres/common-module/vipsubscribe/css/vip-subscribe-set-template.css

@@ -100,9 +100,21 @@
   align-items: center;
   justify-content: space-between;
 }
-
+@keyframes breathingLamp {
+  0% {
+    opacity: 0.3;
+  }
+  70% {
+    opacity: 1;
+  }
+  100% {
+    opacity: 0.3;
+  }
+}
 .vip-body .body-item.blink {
   background: linear-gradient(90deg, rgba(143, 238, 244, 0.5) 0%, rgba(255, 255, 255, 0) 100%);
+  /* opacity: 0.3;
+  animation: breathingLamp 1.8s ease-out infinite; */
 }
 .vip-body .body-item.blink .item-r-text {
   color: #2cb7ca;
@@ -113,7 +125,7 @@
   bottom: 0;
   z-index: 5;
 }
-.step-container > img {
+.step-container img {
   display: block;
   width: 100%;
 }
@@ -132,6 +144,17 @@
 }
 .step-container.step-3 {
   bottom: -1.8rem;
+  display: flex;
+  align-items: center;
+  flex-direction: column;
+  justify-content: center;
+}
+.step-container.step-3 .close-icon {
+  position: absolute;
+  width: .6rem;
+  height: .6rem;
+  bottom: -0.32rem;
+  z-index: 1;
 }
 
 .vip-body .push-set{

BIN
src/web/staticres/common-module/vipsubscribe/image/activity/step-3-close@2x.png


+ 7 - 4
src/web/staticres/common-module/vipsubscribe/js/vip-subscribe-set-template.js

@@ -14,9 +14,9 @@ var subScribeTemplate = `
         </span>
       </div>
     </a>
-    <div class="step-container step-1" v-show="activity.blink === 1">
+    <a class="step-container step-1" :href="linkobj.area" v-show="activity.blink === 1">
       <img src="/common-module/vipsubscribe/image/activity/step-1@2x.png" />
-    </div>
+    </a>
     <div class="amendmentNum" v-show="vSwitch === 'f'">
       当<span v-show="userAreaAllNum === 0">年</span><span v-show="userAreaAllNum > 0">月</span>剩余可修改次数:<span class="numColor" v-show="userAreaNum != -1">{{userAreaNum}}&nbsp;</span><span v-show="userAreaNum != -1">次</span><span v-show="userAreaNum === -1">无限制</span>
       <i class="iconfont icon-bangzhu" @click="amendmentNumNotice"></i>
@@ -50,11 +50,14 @@ var subScribeTemplate = `
           </span>
         </div>
       </a>
-      <div class="step-container step-2" v-show="activity.blink === 2">
+      <a class="step-container step-2" :href="linkobj.keyword" v-show="activity.blink === 2">
         <img src="/common-module/vipsubscribe/image/activity/step-2@2x.png" />
-      </div>
+      </a>
       <div class="step-container step-3" id="active-step-3" v-show="activity.blink === 3" @click="goToActive">
         <img src="/common-module/vipsubscribe/image/activity/step-3@2x.png" />
+        <div class="close-icon" @click.stop="activity.blink = ''">
+          <img src="/common-module/vipsubscribe/image/activity/step-3-close@2x.png" />
+        </div>
       </div>
     </li>
     <li class="body-item match-way" @click="matchWay">

+ 1 - 0
src/web/staticres/frontRouter/pc/activity/js/task.js

@@ -384,6 +384,7 @@ var task = new Vue({
       })
     },
     onClickReceive: function (type, item) {
+      if (item.className === 'received') return
       var status = false
       if (type === 'schedule') {
         if (item.className === 'wait') {

Plik diff jest za duży
+ 1 - 1
src/web/staticres/js/pc-collect-user-info.js


+ 14 - 4
src/web/templates/frontRouter/wx/bigmember/free/perfect_info.html

@@ -1182,7 +1182,7 @@
         sessionStorage.removeItem('salesBackStatus')
         history.back()
       },
-        showMessage: function (msg) {
+        showMessage: function (msg, confirmText, callback) {
           var message = msg || '您的申请已提交,我们会尽快联系您并预约演示时间,请耐心等待~您将获得免费体验大会员全部功能!'
           this.$dialog.close()
           this.$dialog.confirm({
@@ -1191,10 +1191,14 @@
             overlayClass: 'z-2030',
             showCancelButton: false,
             getContainer: '.perfect-info-group',
-            confirmButtonText: '我知道了',
+            confirmButtonText: confirmText || '我知道了',
           }).then(function () {
-            sessionStorage.setItem('salesBackStatus', 'true')
-            history.back()
+            if (callback) {
+              callback()
+            } else {
+              sessionStorage.setItem('salesBackStatus', 'true')
+              history.back()
+            }
           }).catch(function () {
             sessionStorage.setItem('salesBackStatus', 'true')
             history.back()
@@ -1306,6 +1310,12 @@
                   }
                   break
                 }
+                case 'activity_free_plan': {
+                  _this.showMessage('完善信息任务已完成,快去领取剑鱼币吧~', '去领取', function () {
+                    history.back()
+                  })
+                  break
+                }
                 default: {
                   var message = ''
                   if (source) {

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików