Merge branch 'dev4.7.7' of http://192.168.3.207:8080/qmx/jy into dev4.7.7

src/jfw/modules/app/src/web/templates/frontRouter/activity/sess/task.html

@@ -31,20 +31,21 @@
     <div class="j-container app">
         {{include "/big-member/header.html"}}
         <div class="j-main" id="main-app" v-cloak>
-            <div class="activity-rules-button" @click="dialogShow('rule', true)">规则</div>
+            <div class="activity-rules-button" id="activity-rules-button" @click="dialogShow('rule', true)">规则</div>
             <div class="header-banner">
                 <img class="header-banner-img" src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/active/2022.5.20/header-banner.png" alt="">
                 <div class="mission-list" ref="missions">
                     <div
                         class="mission-list-item floating"
-                        :class="{ complete: item.complete, hide: item.hide, [item.id]: true }"
+                        :class="{ complete: item.complete, hide: item.hide, [item.id]: true, [item.className]: true }"
                         v-for="item in missionsList"
+                        :id="'bubble-' + item.id"
                         :style="{ left: item.x + 'rem', top: item.y + 'rem' }"
                         :key="item.id">
                         <div class="m-list-item-bg">
                             <span class="num"><span class="num-add">+</span>${ item.num }</span>
                             <span class="text" v-text="item.unit"></span>
-                            <span class="button" @click="onClickReceive('mission', item)">${ item.complete ? '点击领取' : '去完成' }</span>
+                            <span class="button" :id="'bubble-button--' + item.id" @click="onClickReceive('mission', item)">${ item.complete ? '点击领取' : '去完成' }</span>
                         </div>
                         <div class="m-list-item-text" v-text="item.name"></div>
                     </div>
@@ -83,8 +84,9 @@
                             :disabled="a.className !== 'wait'"
                             v-for="(a, index) in progressAnchorList"
                             v-if="a.tipText"
+                            :id="'progress-reward--' + a.id"
                             @click="onClickReceive('schedule', a)"
-                            :key="index">免费领${a.tipText}</button>
+                            :key="index">${a.className === 'received' ? '已' : '免费'}领${a.tipText}</button>
                     </div>
                 </section>
                 <section class="section no-select reward-section">
@@ -94,7 +96,7 @@
                                 <div
                                     class="reward-list-item"
                                     v-for="item in rewardList"
-                                    @click="onClickListItem"
+                                    @click="onClickListItem(item)"
                                     :key="item.id">
                                     <span class="r-l-i-l j-icon-bg" :class="'icon-bg-' + item.icon"></span>
                                     <div class="r-l-i-c">
@@ -118,18 +120,18 @@
                         <div class="tool-box-button-list">
                             <div
                                 class="tool-action-button"
-                                :id="item.id"
+                                :id="'tool-box-button--' + item.id"
                                 v-for="item in toolBoxList"
                                 v-text="item.text"
                                 @click="onToolBoxAction(item)"
                                 :key="item.id"></div>
                         </div>
-                        <div class="tool-button" @click="toToolBoxPage">一键开启</div>
+                        <div class="tool-button" id="tool-box-button--all" @click="toToolBoxPage">一键开启</div>
                     </div>
                 </section>
                 <section class="section helper-center-container">
                     <div class="helper-center">
-                        <div class="helper-button" @click="toHelpCenter">点击查看</div>
+                        <div class="helper-button" id="helper-center-button" @click="toHelpCenter">点击查看</div>
                     </div>
                 </section>
             </div>

src/jfw/modules/app/src/web/templates/weixin/search/mainSearch.html

@@ -840,6 +840,10 @@
       }
       if (AD.o_extend != undefined) {
         adv_within = AD.o_extend.linktype;
+        $('.pop-new').css({
+          "width": AD.o_extend.width ? (AD.o_extend.width + "px") : 'auto',
+          "height": AD.o_extend.height ? (AD.o_extend.height + "px") : 'auto'
+        })
       }
     }
   {{end}}

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

@@ -530,6 +530,12 @@
   animation: floating 1.3s ease-in-out 1.3s infinite alternate;
   transition: left,right,top,bottom 1.3s ease;
 }
+.floating.delay-100 {
+  animation-delay: 0.1s;
+}
+.floating.delay-300 {
+  animation-delay: 0.3s;
+}
 
 @keyframes floating {
   from {

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

@@ -156,6 +156,7 @@ var task = new Vue({
     missionsList: [
       {
         id: 'subscribe',
+        className: '',
         x: 0.2,
         y: 0.94, // rem
         num: 300,
@@ -166,6 +167,7 @@ var task = new Vue({
       },
       {
         id: 'invite',
+        className: 'delay-100',
         x: 2.84,
         y: 0.06,
         num: 500,
@@ -176,6 +178,7 @@ var task = new Vue({
       },
       {
         id: 'improveInfo',
+        className: 'delay-300',
         x: 4.8,
         y: 0.82,
         num: 200,
@@ -447,7 +450,7 @@ var task = new Vue({
     },
     onClickListItem: function (item) {
       if (item.icon === 'jy-svip') {
-        if (this.isWeiXinBrowser) {
+        if (utils.isWeiXinBrowser) {
           location.href = '/weixin/pay/toMyWxOrder?active=0'
         } else {
           location.href = '/jyapp/front/myOrder/toMyOrder?active=0'
@@ -542,7 +545,7 @@ var task = new Vue({
           }
           _this.ajaxActiveStatus()
           _this.ajaxProgress()
-          // _this.getMissionList()
+          _this.getMissionList()
         } else {
           _this.$toast(msg)
         }

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

@@ -53,7 +53,7 @@ var subScribeTemplate = `
       <div class="step-container step-2" v-show="activity.blink === 2">
         <img src="/common-module/vipsubscribe/image/activity/step-2@2x.png" />
       </div>
-      <div class="step-container step-3" v-show="activity.blink === 3" @click="goToActive">
+      <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>
     </li>
@@ -336,10 +336,26 @@ var subComponent = {
         // keys为空或者 keys数组长度为0
         this.activity.blink = 2
       } else if (this.activityActive) {
+        this.checkMissionSuccess()
         // 完成任务且未领取任务则，弹出3
-        this.activity.blink = 3
+        // this.activity.blink = 3
       }
     },
+    checkMissionSuccess: function () {
+      var _this = this
+      $.ajax({
+        type: 'POST',
+        url: '/jyActivity/bidderPlan/schedule',
+        success: function(res) {
+          if (res.error_code === 0 && res.data) {
+            var missions = res.data.missions
+            if (missions && missions.subscribe !== -1) {
+              _this.activity.blink = 3
+            }
+          }
+        }
+      })
+    },
     getStepActivityTime: function () {
       var _this = this
       $.ajax({

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

@@ -17,13 +17,14 @@
 .no-select {
   user-select: none;
 }
-.header-banner > img,
-.point-img > img {
+.header-banner img,
+.point-img img {
   display: block;
   width: 100%;
 }
-.section:not(:first-of-type, :last-of-type) {
-  margin-bottom: 26px;
+/* .section:not(:first-of-type, :last-of-type), */
+.section:not(:last-of-type) {
+  margin-bottom: 50px;
 }
 .section .section-card {
   padding: 18px 54px;
@@ -35,12 +36,13 @@
 }
 
 @media screen and (max-width: 1920px) {
-  .header-banner {
+  .header-banner-img {
     display: flex;
     align-items: center;
     justify-content: center;
+    overflow: hidden;
   }
-  .header-banner > img {
+  .header-banner-img img {
     width: unset;
   }
 }
@@ -130,7 +132,7 @@
 
 .content-container {
   margin-top: -120px;
-  padding-top: 120px;
+  padding: 120px 0;
   background: linear-gradient(180deg, #FF993B 0%, #D24A2A 90%);
 }
 .progress-bar-container {
@@ -530,6 +532,12 @@
   animation: floating 1.3s ease-in-out 1.3s infinite alternate;
   transition: all 1.3s ease;
 }
+.floating.delay-100 {
+  animation-delay: 0.1s;
+}
+.floating.delay-300 {
+  animation-delay: 0.3s;
+}
 
 @keyframes floating {
   from {

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

@@ -154,16 +154,6 @@ function showDialogOfType (type) {
 
 // 固定事件
 $(function () {
-  // 扫一扫 二维码
-  $.ajax({
-    url: '/publicapply/shareFission/info',
-    success: function (res) {
-      if (res.error_code === 0 && res.data) {
-        $('#active-tip-modal .active-tip--code .code-img').attr('src', 'data:image/png;base64,' + res.data.erUrl)
-      }
-    }
-  })
-
   // 弹窗按钮事件
   $('#dialog-button--over').on('click', function () {
     window.open('/swordfish/frontPage/share/sess/index')
@@ -214,6 +204,7 @@ var task = new Vue({
     missionsList: [
       {
         id: 'subscribe',
+        className: '',
         x: 190,
         y: 120,
         num: 300,
@@ -224,8 +215,9 @@ var task = new Vue({
       },
       {
         id: 'invite',
-        x: 470,
-        y: 20,
+        className: 'delay-100',
+        x: 380,
+        y: 0,
         num: 500,
         unit: '剑鱼币',
         complete: false,
@@ -234,6 +226,7 @@ var task = new Vue({
       },
       {
         id: 'improveInfo',
+        className: 'delay-300',
         x: 900,
         y: 80,
         num: 200,
@@ -246,38 +239,47 @@ var task = new Vue({
     rewardList: [],
     toolBoxList: [
       {
+        id: 'vip',
         text: '超级订阅',
         url: '/front/subscribe.html'
       },
       {
+        id: 'big-vip',
         text: '大会员',
         url: '/big/page/index'
       },
       {
+        id: 'manager',
         text: '企业商机管理',
         url: '/swordfish/frontPage/entpc/free/enptc_index'
       },
       {
+        id: 'structured',
         text: '数据定制服务',
         url: '/front/structed/pc_index.html'
       },
       {
+        id: 'export',
         text: '数据自助导出',
         url: '/front/dataExport/toSieve'
       },
       {
+        id: 'data-pack',
         text: '数据流量包',
         url: '/front/dataPack/createOrder'
       },
       {
+        id: 'dianxin-resolve',
         text: '电信行业解决方案',
         url: '/swordfish/frontPage/solution/free/index'
       },
       {
+        id: 'online-course',
         text: '中标必听课',
         url: '/jyxspc'
       },
       {
+        id: 'docs',
         text: '剑鱼文库',
         url: '/swordfish/docs'
       },

src/web/staticres/js/wxSupersearch.js

@@ -419,9 +419,9 @@ var SuperSearch = {
       if ($(this).text().trim() !== '搜索' || $("#search-header-input").val().trim() === '') {
         return
       }
-      if (vMainSearchComponent) {
-        vMainSearchComponent.toggleEntShow(true)
-      }
+      // if (vMainSearchComponent) {
+      //   vMainSearchComponent.toggleEntShow(true)
+      // }
       return;
       hideTab();
       SuperSearch.inputBlur();

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

@@ -44,11 +44,14 @@
 {{include "/common/pchead.html"}}
 <div class="w-box page-container" id="main-app" v-cloak>
     <div class="header-banner">
-        <img class="header-banner-img" src="{{Msg "seo" "cdn"}}/frontRouter/pc/activity/image/header-banner.png" alt="">
+        <div class="header-banner-img">
+            <img class="" src="{{Msg "seo" "cdn"}}/frontRouter/pc/activity/image/header-banner.png" alt="">
+        </div>
         <div class="mission-list" ref="missions">
             <div
                 class="mission-list-item floating"
-                :class="{ complete: item.complete, [item.id]: true}"
+                :id="'bubble-' + item.id"
+                :class="{ complete: item.complete, [item.id]: true, [item.className]: true }"
                 v-for="item in missionsList"
                 v-show="!item.hide"
                 :style="{ left: item.x + 'px', top: item.y + 'px' }"
@@ -56,7 +59,7 @@
                 <div class="m-list-item-bg">
                     <span class="num"><span class="num-add">+</span>${ item.num }</span>
                     <span class="text" v-text="item.unit"></span>
-                    <span @click="onClickReceive('mission', item)" class="button">${ item.complete ? '点击领取' : '去完成' }</span>
+                    <span :id="'bubble-button--' + item.id" @click="onClickReceive('mission', item)" class="button">${ item.complete ? '点击领取' : '去完成' }</span>
                 </div>
                 <div class="m-list-item-text" v-text="item.name"></div>
             </div>
@@ -77,7 +80,7 @@
                         <div class="point-img" v-if="a.pointImg">
                             <img :src="progress.pointImgMap[a.className]" alt="">
                         </div>
-                        <div class="anchor-tip-text" v-show="a.tipText" @click="onClickReceive('schedule', a)">
+                        <div class="anchor-tip-text" :id="'progress-reward--' + a.id" v-show="a.tipText" @click="onClickReceive('schedule', a)">
                             <p>${a.className === 'received' ? '已' : '免费'}领</p>
                             <p v-text="a.tipText"></p>
                         </div>
@@ -126,6 +129,7 @@
                     class="tool-button"
                     v-for="(item, index) in toolBoxList"
                     v-text="item.text"
+                    :id="'tool-box-button--' + item.id"
                     @click="onClickLink(item)"
                     :key="index"></div>
             </div>
@@ -150,7 +154,7 @@
     <div class="close-dialog-icon" data-dismiss="modal" id="dialog-close--code">
       <img src='{{Msg "seo" "cdn"}}/common-module/active/2022.5.20/close-red.png?v={{Msg "seo" "version"}}' alt="x">
     </div>
-    <img class="code-img" src='{{Msg "seo" "cdn"}}/front/downloadJyApp/qr?page=pc_bottom&source=pc_scan' alt="扫一扫">
+    <img class="code-img" src='{{Msg "seo" "cdn"}}/qr?url=%2fstl%2fmayActive' alt="扫一扫">
     <p>
       微信扫一扫，关注剑鱼标讯
       <br>

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

@@ -31,20 +31,21 @@
 <body>
     <div class="j-container app">
         <div class="j-main" id="main-app" v-cloak>
-            <div class="activity-rules-button" @click="dialogShow('rule', true)">规则</div>
+            <div class="activity-rules-button" id="activity-rules-button" @click="dialogShow('rule', true)">规则</div>
             <div class="header-banner">
                 <img class="header-banner-img" src="{{Msg "seo" "cdn"}}/common-module/active/2022.5.20/header-banner.png" alt="">
                 <div class="mission-list" ref="missions">
                     <div
                         class="mission-list-item floating"
-                        :class="{ complete: item.complete, hide: item.hide, [item.id]: true }"
+                        :class="{ complete: item.complete, hide: item.hide, [item.id]: true, [item.className]: true }"
                         v-for="item in missionsList"
+                        :id="'bubble-' + item.id"
                         :style="{ left: item.x + 'rem', top: item.y + 'rem' }"
                         :key="item.id">
                         <div class="m-list-item-bg">
                             <span class="num"><span class="num-add">+</span>${ item.num }</span>
                             <span class="text" v-text="item.unit"></span>
-                            <span class="button" @click="onClickReceive('mission', item)">${ item.complete ? '点击领取' : '去完成' }</span>
+                            <span class="button" :id="'bubble-button--' + item.id" @click="onClickReceive('mission', item)">${ item.complete ? '点击领取' : '去完成' }</span>
                         </div>
                         <div class="m-list-item-text" v-text="item.name"></div>
                     </div>
@@ -83,8 +84,9 @@
                             :disabled="a.className !== 'wait'"
                             v-for="(a, index) in progressAnchorList"
                             v-if="a.tipText"
+                            :id="'progress-reward--' + a.id"
                             @click="onClickReceive('schedule', a)"
-                            :key="index">免费领${a.tipText}</button>
+                            :key="index">${a.className === 'received' ? '已' : '免费'}领${a.tipText}</button>
                     </div>
                 </section>
                 <section class="section no-select reward-section">
@@ -94,7 +96,7 @@
                                 <div
                                     class="reward-list-item"
                                     v-for="item in rewardList"
-                                    @click="onClickListItem"
+                                    @click="onClickListItem(item)"
                                     :key="item.id">
                                     <span class="r-l-i-l j-icon-bg" :class="'icon-bg-' + item.icon"></span>
                                     <div class="r-l-i-c">
@@ -118,18 +120,18 @@
                         <div class="tool-box-button-list">
                             <div
                                 class="tool-action-button"
-                                :id="item.id"
+                                :id="'tool-box-button--' + item.id"
                                 v-for="item in toolBoxList"
                                 v-text="item.text"
                                 @click="onToolBoxAction(item)"
                                 :key="item.id"></div>
                         </div>
-                        <div class="tool-button" @click="toToolBoxPage">一键开启</div>
+                        <div class="tool-button" id="tool-box-button--all" @click="toToolBoxPage">一键开启</div>
                     </div>
                 </section>
                 <section class="section helper-center-container">
                     <div class="helper-center">
-                        <div class="helper-button" @click="toHelpCenter">点击查看</div>
+                        <div class="helper-button" id="helper-center-button" @click="toHelpCenter">点击查看</div>
                     </div>
                 </section>
             </div>

src/web/templates/weixin/search/mainSearch.html

@@ -565,7 +565,7 @@
       <div class="modal-body" style="padding:0px;">
       <div style="border-radius: 10px;position: relative;width:5.7rem;/*height: 7.5rem;*/margin-left: -2.85rem;left: 50%;">
 			<img onclick="tapClose(0)" src="/vipsubscribe/image/close.png" style="position: absolute;right: 0px;top: -1rem;width: .6rem;" >
-      <div id="wx-mainSearch-dialog--svga" onclick="gotoIntroducePage(this)" dataUrl="/front/vipsubscribe/introducePage"></div>
+      <div id="wx-mainSearch-dialog--svga" style="overflow: hidden" onclick="gotoIntroducePage(this)" dataUrl="/front/vipsubscribe/introducePage"></div>
       <img id="wx-mainSearch-dialog" style="border-radius: 8px;" src ="/vipsubscribe/image/vip_home.png?v={{Msg "seo" "version"}}" onclick="gotoIntroducePage(this)" dataUrl="/front/vipsubscribe/introducePage">
       {{$s_index:=(Ad "jy-wxsearch-index-tap" -1)}}
       <script src=//cdn-common.jianyu360.com/cdn/lib/svga-web/svga.min.js></script>
@@ -1176,20 +1176,26 @@
             window.event.returnValue = false;
 			//超级搜索
 			if(SuperSearch.isMyPage){
-			  if ($("#search-header-input").val().trim() === '') {
-			    return
+			  if ($("#search-header-input").val().trim() === '') { return }
+        var isNowIndex = $(".tabs-box .tabs-nav .active").index()
+        if (!$(".tabs-box").hasClass('hidden') && isNowIndex !== 0) {
+            // 供应搜索
+            var type = $(".tabs-nav .active").text()
+            var inputVal = $("#search-header-input").val().trim()
+            if (type === '供应搜索' && inputVal !== '') {
+              $("#supersearchPage input[name=super_searchinput]").blur()
+              goSupplyPage(inputVal, true)
+              return
+            }
+            if (isNowIndex === 1) {
+              $("#supersearchPage input[name=super_searchinput]").blur();
+              window.isKeyDownToEntSearch = true
+              if (vEntSearchComponent) {
+                vEntSearchComponent.toggleEntShow(true)
               }
-              var isNowIndex = $(".tabs-box .tabs-nav .active").index()
-                if (!$(".tabs-box").hasClass('hidden') && isNowIndex !== 0) {
-                    if (isNowIndex === 1) {
-                      $("#supersearchPage input[name=super_searchinput]").blur();
-                      window.isKeyDownToEntSearch = true
-                      if (vEntSearchComponent) {
-                        vEntSearchComponent.toggleEntShow(true)
-                      }
-                    }
-                    return
-                }
+            }
+            return
+        }
 				var max=$("#supersearchPage .maxMrice").val(),min=$("#supersearchPage .minMrice").val();
 		        if(Number(max)<Number(min)&&max!=""&&min!=""){
 		            $("#supersearchPage .maxMrice").val(min);

src/web/templates/weixin/search/tabSearch.html

@@ -1927,7 +1927,7 @@
         return outHtml
     }
 
-    function createSearchResultList () {
+    function createSearchResultList (page) {
 
         if (!window.isKeyDownToEntSearch) {
           if (vEntSearchComponent) {
@@ -1950,7 +1950,7 @@
         if (nowIndex <= 0) {
             return
         }
-      if (nowType === 'supply') {
+      if (nowType === 'supply' && typeof page !== 'string') {
         var recoverStatus =  sessionStorage.getItem('recover_supply_status') === 'true'
         if (vSupplySearch) {
           if (recoverStatus) {
@@ -2476,7 +2476,7 @@
         var isiOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/);
         window.addEventListener('pageshow', function () {
             if (isiOS) {
-              createSearchResultList ()
+              createSearchResultList('pageshow')
             }
         });
     })