Home Explore Help
Sign In
qmx
/
jy
14
0
Fork 0
Files Issues 2 Pull Requests 0 Wiki
Browse Source

fix: 活动页面完善

cuiyalong 3 years ago
parent
d6a98ad4d3
commit
5233cf000e
11 changed files with 233 additions and 94 deletions
Split View Show Diff Stats
  1. 12 1
      src/jfw/modules/app/src/web/templates/big-member/header.html
  2. 13 12
      src/jfw/modules/app/src/web/templates/frontRouter/activity/sess/task-202207.html
  3. 0 2
      src/jfw/modules/app/src/web/templates/frontRouter/activity/sess/task.html
  4. 10 7
      src/web/staticres/common-module/active/2022.7/task-202207.css
  5. 85 15
      src/web/staticres/common-module/active/2022.7/task-202207.js
  6. 4 0
      src/web/staticres/common-module/public/js/app-share.js
  7. 7 3
      src/web/staticres/frontRouter/pc/activity/css/task-202207.css
  8. 51 7
      src/web/staticres/frontRouter/pc/activity/js/task-202207.js
  9. 38 34
      src/web/staticres/js/monitor/new_monitor.js
  10. 6 6
      src/web/templates/frontRouter/pc/activity/sess/task-202207.html
  11. 7 7
      src/web/templates/frontRouter/wx/activity/sess/task-202207.html

+ 12 - 1
src/jfw/modules/app/src/web/templates/big-member/header.html
View File 

@@ -1,8 +1,19 @@
 
 <!--S-header-->
 
+<style>
 
+  .jy-app-header .icon-back-white {
 
+    display: none;
 
+  }
 
+  .jy-app-header.transparent-header .icon-back-white {
 
+    display: inline-block;
 
+  }
 
+  .jy-app-header.transparent-header .icon-back {
 
+    display: none;
 
+  }
 
+</style>
 
 <div class="j-header jy-app-header border-line-b">
 
     <span class="header-left">
 
         <span class="icon-back j-icon base-icon"></span>
 
-        <!-- <span class="icon-back-white j-icon base-icon"></span> -->
 
+        <span class="icon-back-white j-icon base-icon"></span>
 
     </span>
 
     <span class="header-title"></span>
 
     <span class="header-right"></span>

+ 13 - 12
src/jfw/modules/app/src/web/templates/frontRouter/activity/sess/task-202207.html
View File 

@@ -3,7 +3,7 @@
 
 
 <head>
 
   <!-- <title>投标人专属免费计划</title> -->
 
-    <title></title>
 
+    <title>剑鱼超级会员节</title>
 
     <!--引入公共资源头部-->
 
     {{include "/big-member/meta.html"}}
 
 
@@ -28,6 +28,9 @@
 
             font-display: swap;
 
             src:url('/jyapp/fonts/YouSheBiaoTiHei-2.ttf');
 
         }
 
+        .fixed-top {
 
+            top: 1.72rem;
 
+        }
 
     </style>
 
     <script>
 
         try {
 
@@ -94,7 +97,7 @@
 
                         </div>
 
                     </div>
 
                     <div class="section-footer">
 
-                        <button class="section-button button-middle" :disabled="couponList.length === 0" @click="receiveActiveCoupon(couponList)">一键领取</button>
 
+                        <button class="section-button button-middle" v-show="onKeyReceiveShow" :disabled="couponList.length === 0" @click="receiveActiveCoupon(couponList)">一键领取</button>
 
                     </div>
 
                 </div>
 
                 <!-- 福利二 -->
 
@@ -188,8 +191,8 @@
 
                             <div class="t-left">预热福利</div>
 
                             <div class="t-right">
 
                                 <div class="t-r-bottom">
 
-                                    <div class="t-r-b-l2">7.25-7.31</div>
 
-                                    <div class="t-r-b-r2">未开始</div>
 
+                                    <div class="t-r-b-l2" v-text="timeDuration.yure"></div>
 
+                                    <div class="t-r-b-r2" v-text="calcYuReTopText"></div>
 
                                 </div>
 
                             </div>
 
                         </div>
 
@@ -201,7 +204,7 @@
 
                                     <div class="t-r-b-r" v-text="lastTimeText"></div>
 
                                 </div>
 
                                 <div class="t-r-bottom" v-else>
 
-                                    <div class="t-r-b-l2">8.1-8.14</div>
 
+                                    <div class="t-r-b-l2" v-text="timeDuration.active"></div>
 
                                     <div class="t-r-b-r2" v-text="activeState === 'ended' ? '已结束' : '进行中'"></div>
 
                                 </div>
 
                             </div>
 
@@ -214,7 +217,7 @@
 
                                     <div class="t-r-b-r" v-text="lastTimeText"></div>
 
                                 </div>
 
                                 <div class="t-r-bottom" v-else>
 
-                                    <div class="t-r-b-l2">8.1-8.14</div>
 
+                                    <div class="t-r-b-l2" v-text="timeDuration.active"></div>
 
                                     <div class="t-r-b-r2" v-text="activeState === 'ended' ? '已结束' : '进行中'"></div>
 
                                 </div>
 
                             </div>
 
@@ -227,7 +230,7 @@
 
                                     <div class="t-r-b-r" v-text="lastTimeText"></div>
 
                                 </div>
 
                                 <div class="t-r-bottom" v-else>
 
-                                    <div class="t-r-b-l2">8.1-8.14</div>
 
+                                    <div class="t-r-b-l2" v-text="timeDuration.active"></div>
 
                                     <div class="t-r-b-r2" v-text="activeState === 'ended' ? '已结束' : '进行中'"></div>
 
                                 </div>
 
                             </div>
 
@@ -329,13 +332,11 @@
 
         $(function () {
 
             var header = $('.j-header.jy-app-header')
 
             header.addClass('transparent-header')
 
-                .find('.header-left .j-icon')
 
-                .removeClass('icon-back')
 
-                .addClass('icon-back-white')
 
-            header.find('.header-right')
 
-                .html('')
 
+                .find('.header-right')
 
+                .addClass('glyphicon-share')
 
         })
 
     </script>
 
+    <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/public/js/van-share.js?v={{Msg "seo" "version"}}'></script>
 
     <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/active/2022.7/task-202207.js?v={{Msg "seo" "version"}}'></script>
 
     {{include "/common/baiducc.html"}}
 
 </body>

+ 0 - 2
src/jfw/modules/app/src/web/templates/frontRouter/activity/sess/task.html
View File 

@@ -190,8 +190,6 @@
 
             $('.j-header.jy-app-header')
 
                 .addClass('transparent-header')
 
                 .find('.header-left .j-icon')
 
-                .removeClass('icon-back')
 
-                .addClass('icon-back-white')
 
         })
 
     </script>
 
     <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/active/2022.5.20/task.js?v={{Msg "seo" "version"}}'></script>

+ 10 - 7
src/web/staticres/common-module/active/2022.7/task-202207.css
View File 

@@ -149,6 +149,9 @@
 
   align-items: center;
 
   justify-content: center;
 
 }
 
+.m-list-item-text {
 
+  color: #fff;
 
+}
 
 
 .section-fuli2 .mission-list {
 
   /* background-color: pink; */
 
@@ -218,7 +221,7 @@
 
 
 .fixed-top {
 
   position: fixed;
 
-  top: 1.72rem;
 
+  top: 0.32rem;
 
   left: 0;
 
   width: 100%;
 
   z-index: 2;
 
@@ -235,8 +238,8 @@
 
   margin-bottom: .18rem;
 
   padding-right: 0.14rem;
 
   color: #fff;
 
-  width: 0.76rem;
 
-  height: 0.84rem;
 
+  width: 0.86rem;
 
+  height: 0.92rem;
 
   font-size: .24rem;
 
   line-height: .28rem;
 
   background-color: transparent;
 
@@ -314,8 +317,9 @@
 
 
 
 /* 我的奖励 */
 
-.reward-section {
 
-  height: 60vh;
 
+.reward-card-container {
 
+  max-height: 60vh;
 
+  min-height: 50vh;
 
 }
 
 .reward-section .van-popup__close-icon {
 
   background: #FF8411;
 
@@ -459,7 +463,7 @@
 
   color: #171826;
 
   line-height: .32rem;
 
   background: linear-gradient(135deg, #FFCC66 0%, #FFECC5 100%);
 
-  border-radius: .2rem 0 0 .2rem;
 
+  border-radius: .2rem;
 
   white-space: nowrap;
 
 }
 
 .reward-list-item  .receive-time {
 
@@ -469,7 +473,6 @@
 
 }
 
 
 
-
 
 .activity-rules-button {
 
   position: absolute;
 
   right: 0;

+ 85 - 15
src/web/staticres/common-module/active/2022.7/task-202207.js
View File 

@@ -129,9 +129,19 @@ function activeOverCheck (endTime, callback) {
 
   }
 
 }
 
 
+// 未定义兼容
 
+try {
 
+  var shareSheet = appShareSheet
 
+} catch (error) {
 
+  var shareSheet = {}
 
+  console.log(error)
 
+}
 
 var task = new Vue({
 
   el: '#main-app',
 
   delimiters: ['${', '}'],
 
+  components: {
 
+    appShareSheet: shareSheet
 
+  },
 
   data: {
 
     platform: 'app',
 
     conf: {
 
@@ -143,6 +153,10 @@ var task = new Vue({
 
     },
 
     activeState: '',
 
     lastTimestamp: 0, // 单位: ms
 
+    timeDuration: {
 
+      yure: '', // 预热活动时间7.25-7.31
 
+      active: '' // 活动时间8.1-8.14
 
+    },
 
     yureConf: {
 
       total: 0,
 
       got: false
 
@@ -313,6 +327,24 @@ var task = new Vue({
 
         return false
 
       }
 
     },
 
+    calcYuReTopText: function () {
 
+      if (this.activeState === 'yureing') {
 
+        return '进行中'
 
+      } else if (this.activeState === 'waiting') {
 
+        return '未开始'
 
+      } else {
 
+        return '已结束'
 
+      }
 
+    },
 
+    onKeyReceiveShow: function () {
 
+      var arr = []
 
+      this.couponList.forEach(function (item) {
 
+        if (item.IsReceive === false && item.IsUser) {
 
+          arr.push(item)
 
+        }
 
+      })
 
+      return arr.length !== this.couponList.length
 
+    },
 
     forbidClose: function () {
 
       return this.dialog.type === 'over'
 
     },
 
@@ -329,6 +361,7 @@ var task = new Vue({
 
   mounted: function () {
 
     // this.calcPointList()
 
     this.stickyTopEvents()
 
+    this.headerTransparent()
 
   },
 
   methods: {
 
     add0: function (t) {
 
@@ -384,9 +417,9 @@ var task = new Vue({
 
       if (!now) {
 
         now = Date.now()
 
       }
 
-      var before = this.conf.before * 1000
 
-      var start = this.conf.start * 1000
 
-      var end = this.conf.end * 1000
 
+      var before = this.conf.before * 1000 // 预热开始
 
+      var start = this.conf.start * 1000 // 活动开始
 
+      var end = this.conf.end * 1000 // 活动结束
 
       var stateArr = ['waiting', 'yureing', 'activating', 'ended']
 
       var state = 'waiting'
 
       if (now < before) {
 
@@ -399,6 +432,16 @@ var task = new Vue({
 
         state = stateArr[3] // 活动已结束
 
       }
 
       this.activeState = state
 
+
 
+      // 计算时间间隔
 
+      var beforeStr = moment(before).format('M.DD')
 
+      var beforeStrEnd = moment(start - 1000).format('M.DD')
 
+      var startStr = moment(start).format('M.DD')
 
+      var endStr = moment(end - 1000).format('M.DD')
 
+
 
+      this.timeDuration.yure = [beforeStr, beforeStrEnd].join('-')
 
+      this.timeDuration.active = [startStr, endStr].join('-')
 
+
 
       return state
 
     },
 
     // type=yure判断预热是否开始
 
@@ -453,7 +496,13 @@ var task = new Vue({
 
         if (diff > 0) {
 
           // 预热当天未开始抢券
 
           buttonDisabled = true
 
-          buttonText = '今日10点开抢'
 
+          // 计算小时
 
+          if (this.conf.clock) {
 
+            var clockArr = this.conf.clock.split(':')
 
+            buttonText = '今日'+ clockArr[0] +'点开抢'
 
+          } else {
 
+            buttonText = '今日10点开抢'
 
+          }
 
           // 创建定时器刷新倒计时
 
           this.yureInfo.timerId = setInterval(function () {
 
             var d = yureCouponStartStamp - Date.now()
 
@@ -531,8 +580,8 @@ var task = new Vue({
 
       if (this.yureInfo.buttonDisabled) {
 
         this.$toast('活动尚未开始，敬请期待')
 
       } else if (this.yureInfo.buttonText === '去查看') {
 
-        // 领过了
 
-        this.toBuyVip()
 
+        // 领过了，跳转订单列表
 
+        this.toOrderPage()
 
       } else {
 
         // 没领过
 
         this.receiveYuReCouponAjax()
 
@@ -547,6 +596,7 @@ var task = new Vue({
 
         success: function (res) {
 
           if (res.data) {
 
             _this.getYuReCouponCount()
 
+            _this.$toast('领取成功')
 
             // 刷新我的奖励列表
 
             _this.getMissionList()
 
           }
 
@@ -602,6 +652,7 @@ var task = new Vue({
 
                 item.IsReceive = false
 
               }
 
             })
 
+            _this.$toast('领取成功')
 
             // 刷新我的奖励列表
 
             _this.getMissionList()
 
           }
 
@@ -679,8 +730,6 @@ var task = new Vue({
 
       var baseX = -1.2 * rootFontSize
 
       var baseY = 0.6 * rootFontSize
 
 
-      console.log(baseX, baseY)
 
-
 
       // 终点坐标
 
       var current = {
 
         x: baseX + $('.progress-bar-content').width(),
 
@@ -695,11 +744,7 @@ var task = new Vue({
 
     },
 
     onClickListItem: function (item) {
 
       if (item.icon === 'jy-svip') {
 
-        if (utils.isWeiXinBrowser) {
 
-          location.href = '/weixin/pay/toMyWxOrder?active=0'
 
-        } else {
 
-          location.href = '/jyapp/front/myOrder/toMyOrder?active=0'
 
-        }
 
+        this.toOrderPage()
 
       } else if (item.icon === 'jy-coin') {
 
         location.href = '/page_points_mobile/list'
 
       } else {
 
@@ -920,7 +965,7 @@ var task = new Vue({
 
     },
 
     scrollTo: function (className) {
 
       setTimeout(function () {
 
-        var offsetTop = $(className)[0].offsetTop - $('.jy-app-header').outerHeight() * 2
 
+        var offsetTop = $(className)[0].offsetTop
 
         $('#main-app').scrollTop(offsetTop)
 
       }, 100)
 
     },
 
@@ -928,7 +973,7 @@ var task = new Vue({
 
       var _this = this
 
       var fixedTop = $('.fixed-top.top-timeline')
 
       var scrollDOM = $('#main-app')
 
-      var height = $('.header-banner').height() - $('.jy-app-header').outerHeight() * 2
 
+      var height = $('.header-banner').height()
 
       var showHide = function () {
 
         var scrollTop = scrollDOM.scrollTop()
 
         if (scrollTop > height) {
 
@@ -947,6 +992,31 @@ var task = new Vue({
 
         _this.scrollTo('.' + className)
 
       })
 
     },
 
+    headerTransparent: function () {
 
+      if (utils.isWeiXinBrowser) return
 
+      $('#main-app').on('scroll', function () {
 
+        var headerDOM = $('.j-header.jy-app-header')
 
+        var scrollTop = this.scrollTop
 
+
 
+        // 是否有header-transparent这个类名
 
+        var hasClassT = headerDOM.hasClass('transparent-header')
 
+
 
+        if (scrollTop >= 75) {
 
+          if (!hasClassT) return
 
+          headerDOM.removeClass('transparent-header')
 
+        }else {
 
+          if (hasClassT) return
 
+          headerDOM.addClass('transparent-header')
 
+        }
 
+      })
 
+    },
 
+    toOrderPage: function () {
 
+      if (utils.isWeiXinBrowser) {
 
+        location.href = '/weixin/pay/toMyWxOrder?active=0'
 
+      } else {
 
+        location.href = '/jyapp/front/myOrder/toMyOrder?active=0'
 
+      }
 
+    },
 
     toMemberPage: function () {
 
       if (utils.isWeiXinBrowser) {
 
         location.href = '/big/wx/page/landingPage'

+ 4 - 0
src/web/staticres/common-module/public/js/app-share.js
View File 

@@ -0,0 +1,4 @@
 
+// 基于van-share-sheet的封装
 
+var appShareSheet = {
 
+
 
+}

+ 7 - 3
src/web/staticres/frontRouter/pc/activity/css/task-202207.css
View File 

@@ -144,6 +144,10 @@
 
   align-items: center;
 
   justify-content: center;
 
 }
 
+.m-list-item-text {
 
+  font-size: 16px;
 
+  color: #fff;
 
+}
 
 
 .section-fuli2 .mission-list {
 
   /* background-color: pink; */
 
@@ -350,13 +354,13 @@
 
 }
 
 .reward-card .tr .td:nth-of-type(1),
 
 .reward-card .tr .td:nth-of-type(2) {
 
-  flex: 4;
 
+  flex: 5;
 
 }
 
 .reward-card .tr .td:nth-of-type(3) {
 
-  flex: 3;
 
+  flex: 4;
 
 }
 
 .reward-card .tr .td:nth-of-type(4) {
 
-  flex: 1;
 
+  flex: 2;
 
 }
 
 .reward-card .r-l-i-name .j-icon {
 
   margin-right: 4px;

+ 51 - 7
src/web/staticres/frontRouter/pc/activity/js/task-202207.js
View File 

@@ -181,6 +181,10 @@ var task = new Vue({
 
     },
 
     activeState: '',
 
     lastTimestamp: 0, // 单位: ms
 
+    timeDuration: {
 
+      yure: '', // 预热活动时间7.25-7.31
 
+      active: '' // 活动时间8.1-8.14
 
+    },
 
     yureConf: {
 
       total: 0,
 
       got: false
 
@@ -336,6 +340,24 @@ var task = new Vue({
 
         return ''
 
       }
 
     },
 
+    onKeyReceiveShow: function () {
 
+      var arr = []
 
+      this.couponList.forEach(function (item) {
 
+        if (item.IsReceive === false && item.IsUser) {
 
+          arr.push(item)
 
+        }
 
+      })
 
+      return arr.length !== this.couponList.length
 
+    },
 
+    calcYuReTopText: function () {
 
+      if (this.activeState === 'yureing') {
 
+        return '进行中'
 
+      } else if (this.activeState === 'waiting') {
 
+        return '未开始'
 
+      } else {
 
+        return '已结束'
 
+      }
 
+    },
 
     yureSectionShow: function () {
 
       return this.activeState === 'waiting' || this.activeState === 'yureing'
 
     },
 
@@ -408,9 +430,9 @@ var task = new Vue({
 
       if (!now) {
 
         now = Date.now()
 
       }
 
-      var before = this.conf.before * 1000
 
-      var start = this.conf.start * 1000
 
-      var end = this.conf.end * 1000
 
+      var before = this.conf.before * 1000 // 预热开始
 
+      var start = this.conf.start * 1000 // 活动开始
 
+      var end = this.conf.end * 1000 // 活动结束
 
       var stateArr = ['waiting', 'yureing', 'activating', 'ended']
 
       var state = 'waiting'
 
       if (now < before) {
 
@@ -423,6 +445,16 @@ var task = new Vue({
 
         state = stateArr[3] // 活动已结束
 
       }
 
       this.activeState = state
 
+
 
+      // 计算时间间隔
 
+      var beforeStr = moment(before).format('M.DD')
 
+      var beforeStrEnd = moment(start - 1000).format('M.DD')
 
+      var startStr = moment(start).format('M.DD')
 
+      var endStr = moment(end - 1000).format('M.DD')
 
+
 
+      this.timeDuration.yure = [beforeStr, beforeStrEnd].join('-')
 
+      this.timeDuration.active = [startStr, endStr].join('-')
 
+
 
       return state
 
     },
 
     // type=yure判断预热是否开始
 
@@ -477,7 +509,13 @@ var task = new Vue({
 
         if (diff > 0) {
 
           // 预热当天未开始抢券
 
           buttonDisabled = true
 
-          buttonText = '今日10点开抢'
 
+          // 计算小时
 
+          if (this.conf.clock) {
 
+            var clockArr = this.conf.clock.split(':')
 
+            buttonText = '今日'+ clockArr[0] +'点开抢'
 
+          } else {
 
+            buttonText = '今日10点开抢'
 
+          }
 
           // 创建定时器刷新倒计时
 
           this.yureInfo.timerId = setInterval(function () {
 
             var d = yureCouponStartStamp - Date.now()
 
@@ -551,7 +589,7 @@ var task = new Vue({
 
         toastFn('活动尚未开始，敬请期待')
 
       } else if (this.yureInfo.buttonText === '去查看') {
 
         // 领过了
 
-        this.toBuyVip()
 
+        this.toOrderPage()
 
       } else {
 
         // 没领过
 
         this.receiveYuReCouponAjax()
 
@@ -565,6 +603,7 @@ var task = new Vue({
 
         type: 'post',
 
         success: function (res) {
 
           if (res.data) {
 
+            toastFn('领取成功')
 
             _this.getYuReCouponCount()
 
             // 刷新我的奖励列表
 
             _this.ajaxList()
 
@@ -618,8 +657,10 @@ var task = new Vue({
 
             _this.couponList.forEach(function (item) {
 
               if (ids.indexOf(item.LotteryIdStr) !== -1) {
 
                 item.IsReceive = false
 
+                item.IsUser = true
 
               }
 
             })
 
+            toastFn('领取成功')
 
             // 刷新我的奖励列表
 
             _this.ajaxList()
 
           }
 
@@ -708,7 +749,7 @@ var task = new Vue({
 
     },
 
     onClickListItem: function (item) {
 
       if (item.icon === 'jy-svip') {
 
-        window.open('/front/swordfish/toMyOrder')
 
+        this.toOrderPage()
 
       } else if (item.icon === 'jy-coin') {
 
         window.open('/swordfish/integral/index/detail')
 
       } else {
 
@@ -897,7 +938,7 @@ var task = new Vue({
 
           type: 'post',
 
           success: function (res) {
 
             if (res.data) {
 
-              _this.$toast('复制成功')
 
+              toastFn('复制成功')
 
               _this.ajaxProgress()
 
             }
 
           }
 
@@ -943,6 +984,9 @@ var task = new Vue({
 
         _this.scrollTo('.' + className)
 
       })
 
     },
 
+    toOrderPage: function () {
 
+      window.open('/front/swordfish/toMyOrder')
 
+    },
 
     toMemberPage: function () {
 
       window.open('/big/page/index')
 
     },

+ 38 - 34
src/web/staticres/js/monitor/new_monitor.js
View File 

@@ -1,35 +1,39 @@
 
-MITO.init({
 
-  async beforeDataReport(event){
 
-    var filterList = [
 
-      window.location.pathname,
 
-      "huiju",
 
-      "thirdwx.qlogo.cn",
 
-      "baidu",
 
-      "cnzz",
 
-      "sobot"
 
-    ]
 
-    var msg = event.data.message;
 
-    for (k of filterList) {
 
-      if (msg.indexOf(k)>=0){
 
-        console.log(msg)
 
-        return false;
 
+try {
 
+  MITO.init({
 
+    async beforeDataReport(event){
 
+      var filterList = [
 
+        window.location.pathname,
 
+        "huiju",
 
+        "thirdwx.qlogo.cn",
 
+        "baidu",
 
+        "cnzz",
 
+        "sobot"
 
+      ]
 
+      var msg = event.data.message;
 
+      for (k of filterList) {
 
+        if (msg.indexOf(k)>=0){
 
+          console.log(msg)
 
+          return false;
 
+        }
 
       }
 
-    }
 
-		return event
 
-   },
 
-    // 服务器地址  线上改成线上地址
 
-    dsn: '/monitor/report',
 
-    // 项目对应apikey
 
-    apikey: 'jy-front',
 
-    debug: false,
 
-    maxDuplicateCount: 1,
 
-    silentXhr: true,
 
-    silentFetch: true,
 
-    silentConsole: true,
 
-    silentDom: true,
 
-    silentHistory: true,
 
-    silentUnhandledrejection: false,
 
-    silentHashchange: true,
 
-    silentVue: false,
 
-    maxBreadcrumbs:1,
 
-});
 
+      return event
 
+     },
 
+      // 服务器地址  线上改成线上地址
 
+      dsn: '/monitor/report',
 
+      // 项目对应apikey
 
+      apikey: 'jy-front',
 
+      debug: false,
 
+      maxDuplicateCount: 1,
 
+      silentXhr: true,
 
+      silentFetch: true,
 
+      silentConsole: true,
 
+      silentDom: true,
 
+      silentHistory: true,
 
+      silentUnhandledrejection: false,
 
+      silentHashchange: true,
 
+      silentVue: false,
 
+      maxBreadcrumbs:1,
 
+  });
 
+} catch (error) {
 
+  console.log(error)
 
+}

+ 6 - 6
src/web/templates/frontRouter/pc/activity/sess/task-202207.html
View File 

@@ -102,7 +102,7 @@
 
                 </div>
 
             </div>
 
             <div class="section-footer">
 
-                <button class="section-button button-middle" :disabled="couponList.length === 0" @click="receiveActiveCoupon(couponList)">一键领取</button>
 
+                <button class="section-button button-middle" v-show="onKeyReceiveShow" :disabled="couponList.length === 0" @click="receiveActiveCoupon(couponList)">一键领取</button>
 
             </div>
 
         </div>
 
         <!-- 福利二 -->
 
@@ -219,8 +219,8 @@
 
                     <div class="t-right">
 
                         <div class="t-r-top">7天超级订阅限量领</div>
 
                         <div class="t-r-bottom">
 
-                            <div class="t-r-b-l2">7.25-7.31</div>
 
-                            <div class="t-r-b-r2">未开始</div>
 
+                            <div class="t-r-b-l2" v-text="timeDuration.yure"></div>
 
+                            <div class="t-r-b-r2" v-text="calcYuReTopText"></div>
 
                         </div>
 
                     </div>
 
                 </div>
 
@@ -233,7 +233,7 @@
 
                             <div class="t-r-b-r" v-text="lastTimeText"></div>
 
                         </div>
 
                         <div class="t-r-bottom" v-else>
 
-                            <div class="t-r-b-l2">8.1-8.14</div>
 
+                            <div class="t-r-b-l2" v-text="timeDuration.active"></div>
 
                             <div class="t-r-b-r2" v-text="activeState === 'ended' ? '已结束' : '进行中'"></div>
 
                         </div>
 
                     </div>
 
@@ -247,7 +247,7 @@
 
                             <div class="t-r-b-r" v-text="lastTimeText"></div>
 
                         </div>
 
                         <div class="t-r-bottom" v-else>
 
-                            <div class="t-r-b-l2">8.1-8.14</div>
 
+                            <div class="t-r-b-l2" v-text="timeDuration.active"></div>
 
                             <div class="t-r-b-r2" v-text="activeState === 'ended' ? '已结束' : '进行中'"></div>
 
                         </div>
 
                     </div>
 
@@ -261,7 +261,7 @@
 
                             <div class="t-r-b-r" v-text="lastTimeText"></div>
 
                         </div>
 
                         <div class="t-r-bottom" v-else>
 
-                            <div class="t-r-b-l2">8.1-8.14</div>
 
+                            <div class="t-r-b-l2" v-text="timeDuration.active"></div>
 
                             <div class="t-r-b-r2" v-text="activeState === 'ended' ? '已结束' : '进行中'"></div>
 
                         </div>
 
                     </div>

+ 7 - 7
src/web/templates/frontRouter/wx/activity/sess/task-202207.html
View File 

@@ -2,7 +2,7 @@
 
 <html lang="zh-CN" style="font-size: 50px;">
 
 
 <head>
 
-    <title>投标人专属免费计划</title>
 
+    <title>剑鱼超级会员节</title>
 
 
     {{include "/big-member/wx/meta.html"}}
 
 
@@ -79,7 +79,7 @@
 
                         </div>
 
                     </div>
 
                     <div class="section-footer">
 
-                        <button class="section-button button-middle" :disabled="couponList.length === 0" @click="receiveActiveCoupon(couponList)">一键领取</button>
 
+                        <button class="section-button button-middle" v-show="onKeyReceiveShow" :disabled="couponList.length === 0" @click="receiveActiveCoupon(couponList)">一键领取</button>
 
                     </div>
 
                 </div>
 
                 <!-- 福利二 -->
 
@@ -173,8 +173,8 @@
 
                             <div class="t-left">预热福利</div>
 
                             <div class="t-right">
 
                                 <div class="t-r-bottom">
 
-                                    <div class="t-r-b-l2">7.25-7.31</div>
 
-                                    <div class="t-r-b-r2">未开始</div>
 
+                                    <div class="t-r-b-l2" v-text="timeDuration.yure"></div>
 
+                                    <div class="t-r-b-r2" v-text="calcYuReTopText"></div>
 
                                 </div>
 
                             </div>
 
                         </div>
 
@@ -186,7 +186,7 @@
 
                                     <div class="t-r-b-r" v-text="lastTimeText"></div>
 
                                 </div>
 
                                 <div class="t-r-bottom" v-else>
 
-                                    <div class="t-r-b-l2">8.1-8.14</div>
 
+                                    <div class="t-r-b-l2" v-text="timeDuration.active"></div>
 
                                     <div class="t-r-b-r2" v-text="activeState === 'ended' ? '已结束' : '进行中'"></div>
 
                                 </div>
 
                             </div>
 
@@ -199,7 +199,7 @@
 
                                     <div class="t-r-b-r" v-text="lastTimeText"></div>
 
                                 </div>
 
                                 <div class="t-r-bottom" v-else>
 
-                                    <div class="t-r-b-l2">8.1-8.14</div>
 
+                                    <div class="t-r-b-l2" v-text="timeDuration.active"></div>
 
                                     <div class="t-r-b-r2" v-text="activeState === 'ended' ? '已结束' : '进行中'"></div>
 
                                 </div>
 
                             </div>
 
@@ -212,7 +212,7 @@
 
                                     <div class="t-r-b-r" v-text="lastTimeText"></div>
 
                                 </div>
 
                                 <div class="t-r-bottom" v-else>
 
-                                    <div class="t-r-b-l2">8.1-8.14</div>
 
+                                    <div class="t-r-b-l2" timeDuration.active></div>
 
                                     <div class="t-r-b-r2" v-text="activeState === 'ended' ? '已结束' : '进行中'"></div>
 
                                 </div>
 
                             </div>