浏览代码

fix: 活动页逻辑优化&微信分享logo默认值更换

cuiyalong 3 年之前
父节点
当前提交
ba4caac80e

+ 13 - 0
src/jfw/modules/app/src/web/staticres/jyapp/big-member/css/public.css

@@ -204,6 +204,19 @@ input::placeholder {
     background: #fff;
     z-index: 9;
 }
+.jy-app-header .icon-back::before,
+.jy-app-header .icon-back-white::before {
+   content: unset;
+}
+.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;
+}
 
 .j-header .header-left,
 .j-header .header-title,

+ 0 - 15
src/jfw/modules/app/src/web/templates/big-member/header.html

@@ -1,19 +1,4 @@
 <!--S-header-->
-<style>
-  .jy-app-header .icon-back::before,
-  .jy-app-header .icon-back-white::before {
-    content: unset;
-  }
-  .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>

+ 1 - 1
src/jfw/modules/app/src/web/templates/frontRouter/activity/sess/task-202207.html

@@ -353,7 +353,7 @@
                 .addClass('icon-mine_share')
         })
     </script>
-    <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/yearEndReport/js/share.js?v={{Msg "seo" "version"}}'></script>
+    <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/public/js/wx-sdk-share.js?v={{Msg "seo" "version"}}'></script>
     <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/public/js/app-share-sheet.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"}}

+ 3 - 0
src/jfw/modules/app/src/web/templates/frontRouter/bigmember/free/perfect_info.html

@@ -987,6 +987,7 @@
             buyer_portrait_firstShow_freeuser: freeBuyerText,
 
             activity_free_plan: '请完善信息,免费获取200剑鱼币',
+            super_membership_day: '请完善信息,免费获取200剑鱼币',
 
             ent_portrait_: '请留下联系方式,我们会尽快联系您!体验企业画像分析,帮你透视企业!',
             buyer_portrait_: '请留下联系方式,我们会尽快联系您!体验采购单位画像分析,为你挖掘客户!',
@@ -1049,6 +1050,7 @@
           // 标题
           var titleMap = {
             activity_free_plan: '完善信息',
+            super_membership_day: '完善信息',
             ent_portrait_freeuser: '欢迎体验企业中标分析',
             ent_portrait_contacts: '欢迎体验剑鱼大会员',
             ent_portrait_changeList: '欢迎体验剑鱼大会员',
@@ -1635,6 +1637,7 @@
                     }
                     break
                   }
+                  case 'super_membership_day':
                   case 'activity_free_plan': {
                     _this.showMessage('完善信息任务已完成,快去领取剑鱼币吧~', '去领取', function () {
                       history.back()

+ 45 - 16
src/web/staticres/common-module/active/2022.7/task-202207.js

@@ -188,6 +188,7 @@ var task = new Vue({
   },
   data: {
     platform: 'app',
+    power: {},
     conf: {
       before: 0, // 单位: s
       clock: '10:00:00',
@@ -432,7 +433,7 @@ var task = new Vue({
         disabled = true
       } else if (anchor1.className === 'received') {
         if (anchor2.className === 'unreceived') {
-          buttonText = '已领取1个月,继续任务,可再领个月超级订阅'
+          buttonText = '已领取1个月,继续任务,可再领1个月超级订阅'
           disabled = true
         }
       }
@@ -451,6 +452,7 @@ var task = new Vue({
   created: function () {
     this.platform = utils.isWeiXinBrowser ? 'wx' : 'app'
     this.ajaxActiveStatus()
+    this.getPower()
     this.ajaxProgress()
     this.getMissionList()
   },
@@ -461,6 +463,18 @@ var task = new Vue({
     this.stickyTopEvents()
   },
   methods: {
+    getPower: function () {
+      var _this = this
+      $.ajax({
+        type: 'post',
+        url: '/bigmember/use/isAdd',
+        success: function (res) {
+          if (res && res.data) {
+            Object.assign(_this.power, res.data)
+          }
+        }
+      })
+    },
     clickEvents: function () {
       var _this = this
       $('.j-header.jy-app-header').on('click', function () {
@@ -736,7 +750,7 @@ var task = new Vue({
       if (coupons.length === 1) {
         var item = coupons[0]
         if (!item.IsReceive && item.IsUser) {
-          return this.toBuyVip()
+          return this.toBuyVip(item.query)
         }
       }
       var idArr = []
@@ -778,19 +792,23 @@ var task = new Vue({
       var priceArr = [
         {
           price: 38,
-          text: '/月/省'
+          text: '/月/省',
+          query: 'cycle=0'
         },
         {
           price: 99,
-          text: '/季/省'
+          text: '/季/省',
+          query: 'cycle=1'
         },
         {
           price: 380,
-          text: '/年/省'
+          text: '/年/省',
+          query: 'cycle=2'
         },
         {
           price: 599,
-          text: '/月/全国'
+          text: '/月/全国',
+          query: 'cycle=0&count=-1'
         },
       ]
       var arr = list.sort(function (a, b) {
@@ -803,6 +821,7 @@ var task = new Vue({
           if (priceArr[i].price - full >= 0) {
             var pay = priceArr[i].price - reduce
             item.tipText = prefix + priceArr[i].text + ':券后<span class="num">' + pay + '</span>元'
+            item.query = priceArr[i].query
             break
           }
         }
@@ -921,6 +940,7 @@ var task = new Vue({
             } else {
               this.shareShow = true
             }
+            this.doShareAjax()
             break
           }
         }
@@ -1044,16 +1064,24 @@ var task = new Vue({
       })
     },
     receiveFuli3: function () {
-      if (this.activeState !== 'activating') {
-        return this.activeNotStartToast()
+      if (this.activeState === 'activating') {
+        if (this.power.memberStatus > 0) {
+          if (utils.isWeiXinBrowser) {
+            location.href = '/big/wx/page/landingPage'
+          } else {
+            location.href = '/jyapp/big/page/main_root'
+          }
+          return
+        }
       }
+
       if (utils.isWeiXinBrowser) {
         location.href = '/weixin/frontPage/bigmember/free/perfect_info?source=super_membership_day'
       } else {
         location.href = '/jyapp/frontPage/bigmember/free/perfect_info?source=super_membership_day'
       }
     },
-    doCopy: function () {
+    doShareAjax: function () {
       if (this.activeState === 'activating') {
         var _this = this
         $.ajax({
@@ -1061,16 +1089,12 @@ var task = new Vue({
           type: 'post',
           success: function (res) {
             if (res.data) {
-              _this.$toast('复制成功')
               _this.ajaxProgress()
             }
           }
         })
-      } else {
-        // this.$toast('活动尚未开始,敬请期待')
-        this.activeNotStartToast()
       }
-      this.copyText('快来和我一起参与吧!剑鱼超级会员节,百万补贴限量抢,快速获取商机信息》\n' + this.copyLinkText)
+      // this.copyText('快来和我一起参与吧!剑鱼超级会员节,百万补贴限量抢,快速获取商机信息》\n' + this.copyLinkText)
     },
     copyText: function (text) {
       const input = document.createElement('textarea') // js创建一个input输入框
@@ -1167,8 +1191,13 @@ var task = new Vue({
         location.href = '/jyapp/big/page/landingPage'
       }
     },
-    toBuyVip: function () {
-      location.href = '/jy_mobile/common/order/create/svip?type=buy'
+    toBuyVip: function (query) {
+      var baseUrl = '/jy_mobile/common/order/create/svip?type=buy'
+      if (query) {
+        location.href = baseUrl + '&' + query
+      } else {
+        location.href = baseUrl
+      }
     }
   }
 })

+ 11 - 7
src/web/staticres/common-module/public/css/app-share-sheet.css

@@ -1,15 +1,20 @@
-.icon-sheet-close {
+.share-icon {
+  display: inline-block;
   width: .36rem;
   height: .36rem;
-  background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACIAAAAiCAYAAAA6RwvCAAAACXBIWXMAABYlAAAWJQFJUiTwAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAJOSURBVHgBzZhvbtMwGMYfx+kn+NAbEG7QSP1ShCC+ATdgnGDaCTZOMHGDcQJ2A1sIqIQmtTfAN6AI8YUt8exkS5tF8b9I2R6paqrYzk9v/D5+3wJPRAQR4pvNHH/LIknxQiks2sUI2VVl9UdfCjxPtyzPd75rBoHwr1fvSIJjfVl4ThGE4uLtavnZNdALhP/QABXO9WWGOEkNdGYDsoKYV0D+lV/gHwG7CC5UQj+yVS77t4Yg1uuMlDOO+CgMSSpK2UMYMjHEIAx5BIg9zDXNGWsyK3l4l1Sz0wkgjDIyq/cfeiD8+88jKBxhOhXGEnogRCWnjolb/ZHwlYIJu7AN0b503gGpo2F/JaJ4vcwVvWaeMFKlNNdzzPitZVxmfKoF0dF4D7sWfL3J2GolPWDarDCbX/+e2xbWZnlcZw3n2rhm5W+41XnAQHb5jOmpiUh6s4Cf9MIlt0QmCmIPEmbhQzDREAcgZI4w9WDGQBilDQdCQQ5hWqse48oJnojGgHT2REBq20DUFmHqbUxHNnmCVEQGzBnKjmwMTANSUuE53pWi0TA1yF1NIDAOwgbjquZFu1lVhU+OwbsAn+jAwH7owVT6nQpNfLv65XiAgOlj/H1HoomG7QiR+oR+2UlfHZUT2FUEml/mgDDRODPfHRD2ZnmpH3SJqUT2zVfP0NR/+gERhhQhaXqc+x89EJNBse4YBOFqJ+41dYM1eNa0xzsqZwMdIKGe6V4mpOU8lCms7yr8DHHS+wEn7NVyMBHC/pZogEyRXXhOEcYo62x06BZIQ3Px0E+dyAAAAABJRU5ErkJggg==);
   background-repeat: no-repeat;
+}
+.icon-sheet-close {
+  background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACIAAAAiCAYAAAA6RwvCAAAACXBIWXMAABYlAAAWJQFJUiTwAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAJOSURBVHgBzZhvbtMwGMYfx+kn+NAbEG7QSP1ShCC+ATdgnGDaCTZOMHGDcQJ2A1sIqIQmtTfAN6AI8YUt8exkS5tF8b9I2R6paqrYzk9v/D5+3wJPRAQR4pvNHH/LIknxQiks2sUI2VVl9UdfCjxPtyzPd75rBoHwr1fvSIJjfVl4ThGE4uLtavnZNdALhP/QABXO9WWGOEkNdGYDsoKYV0D+lV/gHwG7CC5UQj+yVS77t4Yg1uuMlDOO+CgMSSpK2UMYMjHEIAx5BIg9zDXNGWsyK3l4l1Sz0wkgjDIyq/cfeiD8+88jKBxhOhXGEnogRCWnjolb/ZHwlYIJu7AN0b503gGpo2F/JaJ4vcwVvWaeMFKlNNdzzPitZVxmfKoF0dF4D7sWfL3J2GolPWDarDCbX/+e2xbWZnlcZw3n2rhm5W+41XnAQHb5jOmpiUh6s4Cf9MIlt0QmCmIPEmbhQzDREAcgZI4w9WDGQBilDQdCQQ5hWqse48oJnojGgHT2REBq20DUFmHqbUxHNnmCVEQGzBnKjmwMTANSUuE53pWi0TA1yF1NIDAOwgbjquZFu1lVhU+OwbsAn+jAwH7owVT6nQpNfLv65XiAgOlj/H1HoomG7QiR+oR+2UlfHZUT2FUEml/mgDDRODPfHRD2ZnmpH3SJqUT2zVfP0NR/+gERhhQhaXqc+x89EJNBse4YBOFqJ+41dYM1eNa0xzsqZwMdIKGe6V4mpOU8lCms7yr8DHHS+wEn7NVyMBHC/pZogEyRXXhOEcYo62x06BZIQ3Px0E+dyAAAAABJRU5ErkJggg==);
   background-size: 100% 100%;
   border-radius: 50%;
 }
+.icon-logo-mini {
+  background-color: transparent;
+  background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAoCAYAAACfKfiZAAAAAXNSR0IArs4c6QAAArVJREFUWEfFl0+IjWEUxn9PWcyCsqAsKEphhSQWClFGRoiijEwhyoayIBYmC2OFUhSFIgvKqFEzpYxSLCxmOcqCzEZmoyws1NHRe6fP7ftzvu/OjLdu3WbOeZ7nPefc854j/sMxsznAHmBSs8lvZvOBg8A54JGk/lkRYGaLgJPAGcBFXHZyv/yMCjCz5cBFoBfwsPuZIp8xAWa2GbgEbG9L8T/k0yogFdbhFOY1ObU1IOlC+987TkEqLM/vKWBpQVHfkHQ273+NBaT8HkvEXlhFp5C8UQrMbEMizRZWI/JaAhLxALAl2DtKb97CqExBKq6rqXkEuQmRV0bAzLqA50B3lBmYAJZJ+h3xKY2Amd1O+Y5gtWzGJK2NOhQKMLPVwFgUKGM3Kmlr1K9MwFPgQBQoYzckaXfUL1dAyv13YG4UKGPnr9yRqF+RgHXAhwyIF9R7YFMA+J6kEwG7vyZFAnYBQwlkNPOM+veqk9vzi5yKBPi0ct4/kt64s5ltA15VsSefawG70gh0SfqVBTEzFzUYAO6T9DBgVywgz9nM9gPPAsDdkkYCdrUFHAUeBIBXSvoYsKst4DRwKwA8T9LPgF1tAVfSmFWGPSFpSZS88GdYUAN3geMV4MOSds6UgNeBWaBWD6gbga/A4orb9Uh6Oe0RMLMFgL8NZcf7xsI6BRiOgJntAIYrBNR6BVtYlSOZG5pZ5BewV9KLOuGvE4F3wMYS8HFJq+qShwQEJ6NGt48KuA/0ldxuUNK+JrevFBC4/WdgvaTJaReQxjLPfd6i6XyffPuV9KUpeWkEzOwJcKgA3KelXkk/OiEvFGBm19MY1o7vS4dPSY87Jc7tAyns/uj44pk9nus7wM32SalTIVONKC2fTtLKuZP6DOhj2Eh01aorSGa2AuhJjWY8bUNvJX2rC9bE/g8sFuFlRa9w4QAAAABJRU5ErkJggg==);
+  background-size: contain
+}
 .icon-earth {
-  width: .36rem;
-  height: .36rem;
-  background-repeat: no-repeat;
   background: transparent url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAABVZJREFUWEetmW+on2MYx7/f8sILL7xYTSGTqRWyMiFHvCCEUCuTyYRMthCy5cgWQlbIlslkMplMJitkZS8mW1FEOS+IspXVkampvVCXPk/Xc7r32/N7/pyzu86L53ff93V/7/v6972uY81iRMRJki6SdLWkJZIWSTpN0qkp7rCkPyVNSfpW0h5J+23/N/Q4D9kQEQsl3S9phaR5Q/Ym4G2SXrF9sO/eXgAjgtd5XtJySbxeOXZI2ieJ1/lF0tEEvy6/z5e0oNjA/FZJ62wf6gLaCTAi7uLWI+qblsRrosZnJf2EKm3/m+p/FKC2XwVARFwoaVm+PJdlIONh2++1gRwLMCJOlvSapHsLu3pB0heSmHszgU1KOmT7SERcIukWSettH42I+eUrpcwH81LIYGyW9Ajrm4A2AkxBH0u6LjftztujkmslHUi1/S7poO3piECVT0taKmmX7ZsigrXTtr8rD4+Is1LNV+Xvn0u6tQnkcQAbwPFqT7V5YETcJml7HsZLbMlX4oKYB9+bbf9aA01TwK4fawPZBPB1SStzE4a8vs1GIgJV12bAUi6ETfLbGWmrR9Le3hp5yVMkvZ2vztQW2/eVa44BmA6Bh1UH2V7b5WUR8WFxQGVTth9INS5OM7nR9pnF650nCfXiYHXsrKdX2H6n/pgBmKHkxyK+EWSvt42dtY6IIGhje7zaBtsvFmDw2s/ydTblOb+lozXJJcifi10zWQIsVVtv/F7SxX0zQEQ8JOmT0UtFBKrm8tgb2YeQ0zZmVF0BjAgC6c9jbkWsquLZkJFefbokwhCpDudBpX0GQX8RTlUDfKnwplEBq2xv6iO1XJNeemWGp0vTdEbtrU0spvK4U9AfmeybNqy0/cYQgBmqcB4cAU+dzSDWng3AyyXtbZGwzfadfU9IcJ+mrfXdVq7DTjfkD0sASPQnsbeNSdvP9TktsweZYVbDNpjQKI41yQcpjfzZNQghe8psUG+ICNRIbj0ntTHKeLpkl/NknonkmTsBiPdCOLsG8YmXwasrmpTmQbJnP563KtNal6yuec4hTU4B8O+GaD5OAHxvCiKQAL9KR6jXA3Iur4ccMhkAye2HARhd12mYX2r7o4gguKN6Xo4cPCSMNB273fbtEXGzpJ0smC1A9iIACo/qYSnvSyLezWUsxMZHAQ5RcdPhZIhdULLMRqyBvaBuHKcmpn2A1wDvyMtPD3GSrgOwT2gWZQBh6y9J89OBNvZ0xBrgE2kylZP0DTNdAOv54zhkBm8SAiEE5j1uVMw6ywkKtB0AfHJAEu8CWRVTtv9pWhgRFFM4U5unQywoyAjUawBIoUPZeCLGXttXjBMUEXg5fzdkIIZ2tdnoRB+yMAQ4dnjBuAptVFBE3NMS2A/AwvvQrSEAWVvRpK5NmR6/bAlNVclRAySHQvHnmgXARXghHbZyyA6SQuhaQEotKf9oddb1CF3zy9u6BhHxbrZSmuRstL26yiT1bBYzEIe5pqta5JqyeCrOgflge3C+Jo0RRxfXhKSt7Ox6oa75ZbY/aHCMbzpS4jEv31S4nyhVT9j+ugSYVR/Betyoaupysk/ro+ulxs3Ps026gzcS62iPwB3Hxb3G/kzf5tFQkPtsX1bYHS28umPRJKt/86gQyk1fLvo0Q0Dutn1NOh6kto2x01haPaj9NmI3UB/sZkjLd6vtuyPimSzcmy4HjyRezvRhmhZ1dljThuivUP3Rm+7D76DrBH4YCYm/HARy1L227r+0qaYXwELtMAw6pACtW7l9VU8hDvBj+oRdmwcBLIASYGFBdXkIx8MEajMY/TcETvBD3yZUCfp/6g8SZFkY04sAAAAASUVORK5CYII=) no-repeat 50%;
   background-size: contain
 }
@@ -76,10 +81,9 @@
   display: flex;
   align-items: center;
   padding: 0 .28rem;
-  height: .72rem;
+  height: .8rem;
   color: #fff;
   font-size: .32rem;
-  font-weight: bold;
   line-height: .44rem;
   letter-spacing: 1px;
 }

+ 7 - 3
src/web/staticres/common-module/public/js/app-share-sheet.js

@@ -104,9 +104,12 @@ var wxShareGuide = {
         <img src='/common-module/public/image/arrow-top-rightx3@2x.png' alt="">
       </div>
       <div class="popup-tip-container">
-        <div class="popup-tip-text-container hexagon-radius" v-text="tip"></div>
+        <div class="popup-tip-text-container hexagon-radius">
+          <span class="share-icon icon-logo-mini"></span>
+          <span class="popup-tip-text" v-text="tip"></span>
+        </div>
         <div class="popup-open-in-browser" v-show="false">
-          <span class="j-icon icon-earth"></span>
+          <span class="share-icon icon-earth"></span>
           <span class="text">在浏览器中打开</span>
         </div>
       </div>
@@ -116,7 +119,7 @@ var wxShareGuide = {
     value: Boolean,
     tip: {
       type: String,
-      default: '点击右上角按钮分享'
+      default: '点击右上角,将活动分享给好友吧'
     },
   },
   methods: {
@@ -124,6 +127,7 @@ var wxShareGuide = {
       this.$emit('input', f)
     },
     onClickPopup: function () {
+      this.$emit('click-overlay')
       this.onInput(false)
     }
   }

+ 4 - 4
src/web/staticres/common-module/yearEndReport/js/share.js → src/web/staticres/common-module/public/js/wx-sdk-share.js

@@ -30,10 +30,10 @@ var shareFn = {
     openTagList: ['wx-open-launch-app']
   },
   shareInfo: {
-    title: '「我的剑鱼标讯2021」年度报告已经生成,请查收',
-    desc: '点击领取你的年度回忆',
-    link: sessionStorage.getItem('shareReportLink') || location.origin + '/active/yearEndReport',
-    imgUrl: 'https://cdn-ali.jianyu360.com/images/appext/share-icon.png'
+    title: '剑鱼标讯',
+    desc: '获取更多招投标信息',
+    link: location.href.split('?')[0],
+    imgUrl: 'https://cdn-ali.jianyu360.com/images/appext/fixed-sm.jpg'
   },
   init: function (shareInfo) {
     if (shareInfo) {

+ 22 - 12
src/web/staticres/frontRouter/pc/activity/js/task-202207.js

@@ -589,6 +589,7 @@ var task = new Vue({
     // 预热优惠券数量查询
     getYuReCouponCount: function () {
       var _this = this
+      if (_this.activeState !== 'yureing') return
       $.ajax({
         url: '/jyActivity/membershipDay/getDailyBoonDetail',
         type: 'post',
@@ -648,7 +649,7 @@ var task = new Vue({
       if (coupons.length === 1) {
         var item = coupons[0]
         if (!item.IsReceive && item.IsUser) {
-          return this.toBuyVip()
+          return this.toBuyVip(item.query)
         }
       }
       var idArr = []
@@ -690,19 +691,23 @@ var task = new Vue({
       var priceArr = [
         {
           price: 38,
-          text: '1个月+1个省'
+          text: '1个月+1个省',
+          query: 'cycle=0'
         },
         {
           price: 99,
-          text: '1个季+1个省'
+          text: '1个季+1个省',
+          query: 'cycle=1'
         },
         {
           price: 380,
-          text: '1年+1个省'
+          text: '1年+1个省',
+          query: 'cycle=2'
         },
         {
           price: 599,
-          text: '1个月+全国'
+          text: '1个月+全国',
+          query: 'cycle=0&count=-1'
         },
       ]
       var arr = list.sort(function (a, b) {
@@ -715,6 +720,7 @@ var task = new Vue({
           if (priceArr[i].price - full >= 0) {
             var pay = priceArr[i].price - reduce
             item.tipText = prefix + priceArr[i].text + ':券后<span class="num">' + pay + '</span>元'
+            item.query = priceArr[i].query
             break
           }
         }
@@ -941,8 +947,11 @@ var task = new Vue({
       })
     },
     receiveFuli3: function () {
-      if (this.activeState !== 'activating') {
-        return this.activeNotStartToast()
+      if (this.activeState === 'activating') {
+        if (window.memberStatus > 0) {
+          window.open('/swordfish/page_big_pc/')
+          return
+        }
       }
       vm.isNeedSubmit('super_membership_day',function(){
         vm.showSuccess = true
@@ -961,9 +970,6 @@ var task = new Vue({
             }
           }
         })
-      } else {
-        // toastFn('活动尚未开始,敬请期待')
-        this.activeNotStartToast()
       }
       this.copyText('快来和我一起参与吧!剑鱼超级会员节,百万补贴限量抢,快速获取商机信息》\n' + this.copyLinkText)
     },
@@ -1010,13 +1016,17 @@ var task = new Vue({
     toMemberPage: function () {
       window.open('/big/page/index')
     },
-    toBuyVip: function () {
+    toBuyVip: function (query) {
       if (window.vipStatus > 0) {
         // window.open('/swordfish/page_big_pc/free/svip/buy?type=upgrade')
         toastFn('请下载“剑鱼标讯”App或关注微信公众号使用满减券,进行超级订阅续费或升级', 2000)
       } else {
         // 去购买
-        window.open('/swordfish/page_big_pc/free/svip/buy?type=buy')
+        if (query) {
+          window.open('/swordfish/page_big_pc/free/svip/buy?type=buy&' + query)
+        } else {
+          window.open('/swordfish/page_big_pc/free/svip/buy?type=buy')
+        }
       }
     }
   }

+ 6 - 4
src/web/staticres/js/pc-collect-user-info.js

@@ -395,6 +395,7 @@ var vm = new Vue({
         'ent-manage-pc': '欢迎留下联系方式,我们的大客户经理会在24小时内联系您!',
         "jyarticle_see3_plus_pc":"请完善个人信息,获取更多免费查看公告权限",
         'activity_free_plan': '请完善信息,免费获取200剑鱼币',
+        super_membership_day: '请完善信息,免费获取200剑鱼币',
         peugeot_supplier_regist:'请完善您的个人信息,抢先对接采购单位'
       },
       isRefresh: false // 留完资是否需要刷新页面
@@ -418,7 +419,8 @@ var vm = new Vue({
     },
     // 提交成功,确定按钮文案
     successConfirmText: function () {
-      if (this.source.indexOf('activity_free_plan') !== -1) {
+      var passArr = ['activity_free_plan', 'super_membership_day']
+      if (passArr.indexOf(this.source) !== -1) {
         return '去领取'
       } else {
         return '我知道了'
@@ -445,7 +447,7 @@ var vm = new Vue({
         if (this.source.indexOf('jyarticle_see3_plus_pc') > -1) {
           return ''
         }
-        if (this.source === 'activity_free_plan') {
+        if (this.source === 'activity_free_plan' || this.source === 'super_membership_day') {
           return '完善信息任务已完成,快去领取剑鱼币吧~'
         }
         if (this.source === 'peugeot_supplier_regist') {
@@ -516,10 +518,10 @@ var vm = new Vue({
         } else if(source.indexOf('ent-manage') > -1){
           this.dialogTitle = text
           this.dialogTitleTop = '欢迎体验剑鱼标讯商机管理'
-        } else if(source.indexOf('jyarticle_see3_plus_pc') > -1){
+        } else if (source.indexOf('jyarticle_see3_plus_pc') > -1){
           this.dialogTitle = text
           this.dialogTitleTop = '完善信息'
-        } else if (source === 'activity_free_plan') {
+        } else if (source === 'activity_free_plan' || source === 'super_membership_day') {
           this.dialogTitle = text
           this.dialogTitleTop = '完善信息'
         }

+ 7 - 2
src/web/templates/active/yearEndReport/index.html

@@ -542,9 +542,14 @@
 <script src="https://cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js"></script>
 <script src="//res.wx.qq.com/open/js/jweixin-1.6.0.js"></script>
 <script src='{{Msg "seo" "cdn"}}/common-module/yearEndReport/js/index.js?v={{Msg "seo" "version"}}'></script>
-<script src='{{Msg "seo" "cdn"}}/common-module/yearEndReport/js/share.js?v={{Msg "seo" "version"}}'></script>
+<script src='{{Msg "seo" "cdn"}}/common-module/public/js/wx-sdk-share.js?v={{Msg "seo" "version"}}'></script>
 <script>
-  shareFn.init()
+  shareFn.init({
+    title: '「我的剑鱼标讯2021」年度报告已经生成,请查收',
+    desc: '点击领取你的年度回忆',
+    link: sessionStorage.getItem('shareReportLink') || location.origin + '/active/yearEndReport',
+    imgUrl: 'https://cdn-ali.jianyu360.com/images/appext/share-icon.png'
+  })
 </script>
 
 <!--S-提前需要预加载的资源-->

+ 9 - 1
src/web/templates/active/yearEndReport/result.html

@@ -151,7 +151,15 @@
   <script src="//res.wx.qq.com/open/js/jweixin-1.6.0.js"></script>
   <script src='{{Msg "seo" "cdn"}}/common-module/yearEndReport/js/qrcode.js?v={{Msg "seo" "version"}}'></script>
   <script src='{{Msg "seo" "cdn"}}/common-module/yearEndReport/js/common.js?v={{Msg "seo" "version"}}'></script>
-  <script src='{{Msg "seo" "cdn"}}/common-module/yearEndReport/js/share.js?v={{Msg "seo" "version"}}'></script>
+  <script src='{{Msg "seo" "cdn"}}/common-module/public/js/wx-sdk-share.js?v={{Msg "seo" "version"}}'></script>
+  <script>
+    shareFn.init({
+      title: '「我的剑鱼标讯2021」年度报告已经生成,请查收',
+      desc: '点击领取你的年度回忆',
+      link: sessionStorage.getItem('shareReportLink') || location.origin + '/active/yearEndReport',
+      imgUrl: 'https://cdn-ali.jianyu360.com/images/appext/share-icon.png'
+    })
+  </script>
   <script src='{{Msg "seo" "cdn"}}/common-module/yearEndReport/js/result.js?v={{Msg "seo" "version"}}'></script>
   <!-- 使用html2canvas 生成图片dom层不能使用背景图 否则生成的图片会模糊 且无法修复 -->
   <script src='{{Msg "seo" "cdn"}}/common-module/track/j-track.min.js?v={{Msg "seo" "version"}}'></script>

+ 2 - 2
src/web/templates/frontRouter/wx/activity/sess/task-202207.html

@@ -274,7 +274,7 @@
                 </section>
             </van-popup>
             <!-- 分享引导 -->
-            <wx-share-guide v-model="guideMask"></wx-share-guide>
+            <wx-share-guide v-model="guideMask" @click-overlay="doShareAjax"></wx-share-guide>
 
             <!--S-弹窗-->
             <van-popup id="active-tip-modal" v-model="dialog.show" :data-modal-type="dialog.type" :close-on-click-overlay="dialog.type !== 'over'">
@@ -327,7 +327,7 @@
     <script src=//res2.wx.qq.com/open/js/jweixin-1.6.0.js></script>
     {{include "/big-member/commonjs.html"}}
     <script src='{{Msg "seo" "cdn"}}/common-module/public/js/utils.js?v={{Msg "seo" "version"}}'></script>
-    <script src='{{Msg "seo" "cdn"}}/common-module/yearEndReport/js/share.js?v={{Msg "seo" "version"}}'></script>
+    <script src='{{Msg "seo" "cdn"}}/common-module/public/js/wx-sdk-share.js?v={{Msg "seo" "version"}}'></script>
     <script src='{{Msg "seo" "cdn"}}/common-module/public/js/app-share-sheet.js?v={{Msg "seo" "version"}}'></script>
     <script src='{{Msg "seo" "cdn"}}/common-module/active/2022.7/task-202207.js?v={{Msg "seo" "version"}}'></script>
     {{include "/common/baiducc.html"}}

+ 3 - 0
src/web/templates/frontRouter/wx/bigmember/free/perfect_info.html

@@ -641,6 +641,7 @@
           buyer_portrait_firstShow_freeuser: freeBuyerText,
 
           activity_free_plan: '请完善信息,免费获取200剑鱼币',
+          super_membership_day: '请完善信息,免费获取200剑鱼币',
 
           ent_portrait_: '请留下联系方式,我们会尽快联系您!体验企业画像分析,帮你透视企业!',
           buyer_portrait_: '请留下联系方式,我们会尽快联系您!体验采购单位画像分析,为你挖掘客户!',
@@ -702,6 +703,7 @@
           // 标题
           var titleMap = {
               activity_free_plan: '完善信息',
+              super_membership_day: '完善信息',
               ent_portrait_freeuser: '欢迎体验企业中标分析',
               ent_portrait_contacts: '欢迎体验剑鱼大会员',
               ent_portrait_changeList: '欢迎体验剑鱼大会员',
@@ -1349,6 +1351,7 @@
                   }
                   break
                 }
+                case 'super_membership_day':
                 case 'activity_free_plan': {
                   _this.showMessage('完善信息任务已完成,快去领取剑鱼币吧~', '去领取', function () {
                     history.back()