fix: 采购单位画像跳转三级页问题&样式优化

src/jfw/modules/app/src/web/templates/big-member/page_free_buyer_project_news.html

@@ -317,7 +317,8 @@
                                 label="中标单位"
                                 width="230">
                           <template slot-scope="scope">
-                            <span @click="goEntInfo(scope.row.winner)">${scope.row.winner}</span>
+                            <!-- <span @click="goEntInfo(scope.row.winner)">${scope.row.winner}</span> -->
+                            <span @click="@click="goToDetail(scope.row)"">${scope.row.winner}</span>
                           </template>
                         </el-table-column>
                         <el-table-column

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

@@ -122,7 +122,7 @@
                                 <span class="text" v-text="item.unit"></span>
                                 <span class="button" :id="'bubble-button--' + item.id">${ item.complete ? '点击领取' : '去完成' }</span>
                             </div>
-                            <div class="m-list-item-text" v-text="item.name"></div>
+                            <div class="m-list-item-text text-gradient-whtie" v-text="item.name"></div>
                         </div>
                     </div>
                     <div class="section-footer">
@@ -298,7 +298,7 @@
                 </section>
             </van-popup>
             <!--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" get-container="body" v-model="dialog.show" :data-modal-type="dialog.type" :close-on-click-overlay="dialog.type !== 'over'">
               <div v-show="dialog.type === 'rule'" class="modal-dialog active-tip--rule" :class="{max: getScreenMax}">
                 <h5 class="text-gradient-red">活动规则</h5>
                 <div class="rule-content">
@@ -342,6 +342,7 @@
             <app-share-sheet
                 v-model="shareShow"
                 @share="doShareAjax"
+                popup-title="分享活动"
                 :share-title="shareConf.title"
                 :share-content="shareConf.content"
                 :share-link="shareConf.link"

src/jfw/modules/app/src/web/templates/frontRouter/bigmember/free/perfect_info.html

@@ -1637,7 +1637,6 @@
                     }
                     break
                   }
-                  case 'super_membership_day':
                   case 'activity_free_plan': {
                     _this.showMessage('完善信息任务已完成，快去领取剑鱼币吧~', '去领取', function () {
                       history.back()

src/web/staticres/common-module/active/2022.7/task-202207.css

@@ -46,7 +46,7 @@
   display: flex;
   align-items: center;
   justify-content: center;
-  font-size: .34rem;
+  font-size: .32rem;
   font-weight: bold;
   color: #E8100D;
   line-height: .46rem;
@@ -85,6 +85,13 @@
   flex-direction: column;
   align-items: center;
 }
+.text-shadow1 {
+  text-shadow: 2px 3px 0px #FE6E41;
+}
+.text-shadow2 {
+  text-shadow: 2px 3px 0px #CF1627;
+}
+
 .section-yure .c-info-text {
   display: flex;
   align-items: center;
@@ -163,7 +170,7 @@
   font-size: .32rem;
 }
 .section-fuli1 .section-footer {
-  margin: .8rem 0;
+  margin: .6rem 0 .8rem;
   display: flex;
   align-items: center;
   justify-content: center;
@@ -250,7 +257,7 @@
 
 .fixed-top {
   position: fixed;
-  top: 0.32rem;
+  top: 0.16rem;
   left: 0;
   width: 100%;
   z-index: 2;
@@ -263,6 +270,9 @@
   flex-direction: column;
   z-index: 2;
 }
+.wx .fixed-right {
+  top: 1.6rem;
+}
 .fixed-action-button {
   display: flex;
   flex-direction: column;
@@ -533,6 +543,7 @@
 }
 
 #active-tip-modal.van-popup {
+  top: 54%;
   background:transparent;
 }
 #active-tip-modal[data-modal-type='success'] .modal-dialog.active-tip--success,#active-tip-modal[data-modal-type='over'] .modal-dialog.active-tip--over,#active-tip-modal[data-modal-type='code'] .modal-dialog.active-tip--rule {
@@ -551,7 +562,7 @@
   overflow:hidden;
 }
 .active-tip--rule {
-  height: 11.6rem;
+  min-height: 11.6rem;
 }
 .active-tip--success button,.active-tip--over button,.active-tip--rule button {
   width:4.62rem;

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

@@ -222,6 +222,7 @@ var task = new Vue({
     },
     yureInfo: {
       timerId: null,
+      timerId2: null,
       tipText: '',
       tipFloat: false,
       buttonText: '点击免费领',
@@ -273,7 +274,7 @@ var task = new Vue({
         id: 'buyvip',
         className: '',
         x: 0.2,
-        y: 0.94, // rem
+        y: 0.58, // rem
         num: 800,
         unit: '剑鱼币',
         complete: false,
@@ -284,7 +285,7 @@ var task = new Vue({
         id: 'invite',
         className: '',
         x: 2.84,
-        y: 0.06,
+        y: -0.08,
         num: 500,
         unit: '剑鱼币',
         complete: false,
@@ -295,7 +296,7 @@ var task = new Vue({
         id: 'share',
         className: '',
         x: 4.8,
-        y: 0.82,
+        y: 0.68,
         num: 200,
         unit: '剑鱼币',
         complete: false,
@@ -543,6 +544,7 @@ var task = new Vue({
     initPageState: function () {
       var state = this.checkActiveState()
       var yureTextDOM = $('.timeline-item.yure .t-r-b-r')
+      this.calcTimer()
       if (state === 'yureing') {
         this.startTopTimer()
         yureTextDOM.text('进行中')
@@ -609,16 +611,16 @@ var task = new Vue({
         }
       }
     },
-    startTopTimer: function () {
-      var _this = this
+    calcTimer: function () {
       var start = this.conf.start * 1000
-      var timerId = setInterval(function () {
-        var current = Date.now()
-        if (_this.lastTimestamp < 0) {
-          clearInterval(timerId)
-        }
-        _this.lastTimestamp = start - current
-      }, 1000)
+      var current = Date.now()
+      if (this.lastTimestamp < 0) {
+        clearInterval(this.yureInfo.timerId2)
+      }
+      this.lastTimestamp = start - current
+    },
+    startTopTimer: function () {
+      this.yureInfo.timerId2 = setInterval(this.calcTimer, 1000)
     },
     calcYuReText: function () {
       var _this = this
@@ -679,10 +681,10 @@ var task = new Vue({
               if (obj.days < 1) {
                 this.yureConf.tipFloat = true
                 buttonText = '今天已抢完'
-                tipText = '<p class="shadow-none">今天已经抢完啦~</p><p class="shadow-none">更多福利明日即将开启</p>'
+                tipText = '<p class="text-shadow1">今天已经抢完啦~</p><p class="text-shadow2">更多福利明日即将开启</p>'
               } else {
                 buttonText = '今天已抢完'
-                tipText = '今天已经抢完啦~<br />明天再来吧'
+                tipText = '今天已经抢完啦~明天再来吧'
               }
             }
           }

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

@@ -83,6 +83,11 @@
   -webkit-background-clip: text;
   -webkit-text-fill-color: transparent;
 }
+.text-gradient-whtie {
+  background-image: linear-gradient(90deg, #FEFAF2 0%, #FFE0B4 100%);
+  -webkit-background-clip: text;
+  -webkit-text-fill-color: transparent;
+}
 
 .m-list-item-bg {
   display: flex;

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

@@ -34,6 +34,9 @@
   color: #171826;
   height: 1.28rem;
 }
+.app-share-sheet .van-share-sheet__option {
+  flex: 1;
+}
 .app-share-sheet .title-content .title-text {
   font-size: .4rem;
   color: #171826;

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

@@ -11,7 +11,11 @@ var appShareSheet = {
     @select="onSelect">
     <div class="title-container" slot="title">
       <div class="title-content">
-        <div class="title-text">分享有礼</div>
+        <div class="title-text" >
+          <slot name="title">
+            <div v-text="popupTitle"></div>
+          </slot>
+        </div>
         <div class="share-icon icon-sheet-close" @click="onCloseIconClick"></div>
       </div>
       <slot name="desc-info">
@@ -25,6 +29,10 @@ var appShareSheet = {
   `,
   props: {
     value: Boolean,
+    popupTitle: {
+      type: String,
+      default: '分享有礼'
+    },
     shareTitle: {
       type: String,
       default: ''

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

@@ -235,6 +235,9 @@
 .activity-rules {
   margin-bottom: 0;
 }
+.activity-rules .section-header {
+  margin-bottom: 0;
+}
 .activity-rules .section-header-text {
   width: 207px;
 }
@@ -246,7 +249,7 @@
   margin-bottom: 6px;
   font-size: 18px;
   color: #fff;
-  line-height: 28px;
+  line-height: 30px;
 }
 .rules-item:last-of-type {
   margin-bottom: 0;
@@ -294,6 +297,7 @@
   font-size: 14px;
   line-height: 22px;
   border-radius: 30px;
+  background-color: #CD332C;
   border: 1px solid #E3E4E5;
 }
 .copy-share-container .content-text {

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

@@ -30,6 +30,11 @@
   -webkit-background-clip: text;
   -webkit-text-fill-color: transparent;
 }
+.text-gradient-whtie {
+  background-image: linear-gradient(90deg, #FEFAF2 0%, #FFE0B4 100%);
+  -webkit-background-clip: text;
+  -webkit-text-fill-color: transparent;
+}
 
 @font-face {
   font-family:"YouSheBiaoTiHei";

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

@@ -204,6 +204,7 @@ var task = new Vue({
     },
     yureInfo: {
       timerId: null,
+      timerId2: null,
       tipText: '',
       buttonText: '点击免费领',
       buttonDisabled: false
@@ -250,7 +251,7 @@ var task = new Vue({
         id: 'buyvip',
         className: '',
         x: 190,
-        y: 120,
+        y: 30,
         num: 800,
         unit: '剑鱼币',
         complete: false,
@@ -261,7 +262,7 @@ var task = new Vue({
         id: 'invite',
         className: '',
         x: 380,
-        y: 0,
+        y: -66,
         num: 500,
         unit: '剑鱼币',
         complete: false,
@@ -272,7 +273,7 @@ var task = new Vue({
         id: 'share',
         className: '',
         x: 900,
-        y: 80,
+        y: 16,
         num: 200,
         unit: '剑鱼币',
         complete: false,
@@ -448,6 +449,7 @@ var task = new Vue({
     initPageState: function () {
       var state = this.checkActiveState()
       var yureTextDOM = $('.timeline-item.yure .t-r-b-r')
+      this.calcTimer()
       if (state === 'yureing') {
         this.startTopTimer()
         yureTextDOM.text('进行中')
@@ -514,16 +516,16 @@ var task = new Vue({
         }
       }
     },
-    startTopTimer: function () {
-      var _this = this
+    calcTimer: function () {
       var start = this.conf.start * 1000
-      var timerId = setInterval(function () {
-        var current = Date.now()
-        if (_this.lastTimestamp < 0) {
-          clearInterval(timerId)
-        }
-        _this.lastTimestamp = start - current
-      }, 1000)
+      var current = Date.now()
+      if (this.lastTimestamp < 0) {
+        clearInterval(this.yureInfo.timerId2)
+      }
+      this.lastTimestamp = start - current
+    },
+    startTopTimer: function () {
+      this.yureInfo.timerId2 = setInterval(this.calcTimer, 1000)
     },
     calcYuReText: function () {
       var _this = this

src/web/staticres/js/pc-collect-user-info.js

@@ -419,7 +419,7 @@ var vm = new Vue({
     },
     // 提交成功，确定按钮文案
     successConfirmText: function () {
-      var passArr = ['activity_free_plan', 'super_membership_day']
+      var passArr = ['activity_free_plan']
       if (passArr.indexOf(this.source) !== -1) {
         return '去领取'
       } else {
@@ -447,7 +447,7 @@ var vm = new Vue({
         if (this.source.indexOf('jyarticle_see3_plus_pc') > -1) {
           return ''
         }
-        if (this.source === 'activity_free_plan' || this.source === 'super_membership_day') {
+        if (this.source === 'activity_free_plan') {
           return '完善信息任务已完成，快去领取剑鱼币吧~'
         }
         if (this.source === 'peugeot_supplier_regist') {

src/web/templates/big-member/wx/page_free_buyer_project_news.html

@@ -312,7 +312,8 @@
               label="中标单位"
               width="230">
               <template slot-scope="scope">
-                <span @click="goEntInfo(scope.row.winner)">${scope.row.winner}</span>
+                <!-- <span @click="goEntInfo(scope.row.winner)">${scope.row.winner}</span> -->
+                <span @click="goToDetail(scope.row)">${scope.row.winner}</span>
               </template>
             </el-table-column>
             <el-table-column

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

@@ -128,7 +128,7 @@
                         <span class="text" v-text="item.unit"></span>
                         <span class="button">${ item.complete ? '点击领取' : '去完成' }</span>
                     </div>
-                    <div class="m-list-item-text" v-text="item.name"></div>
+                    <div class="m-list-item-text text-gradient-whtie" v-text="item.name"></div>
                 </div>
             </div>
             <div class="section-footer">
@@ -176,7 +176,7 @@
                     <button class="section-button button-middle" @click="receiveFuli3">立即体验</button>
                 </div>
                 <div class="text">
-                    <p>满足企业多人使用 多场景赋能业务增长</p>
+                    <p style="margin-bottom: 4px;">满足企业多人使用 多场景赋能业务增长</p>
                     <p>详情请致电咨询：400-108-6670</p>
                 </div>
             </div>

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

@@ -30,7 +30,7 @@
 </head>
 
 <body>
-    <div class="j-container app">
+    <div class="j-container wx">
         {{include "/big-member/header.html"}}
         <div class="j-main" id="main-app" v-cloak>
             <div class="activity-rules-button" id="activity-rules-button" v-show="false" @click="dialogShow('rule', true)">规则</div>
@@ -110,7 +110,7 @@
                                 <span class="text" v-text="item.unit"></span>
                                 <span class="button" :id="'bubble-button--' + item.id">${ item.complete ? '点击领取' : '去完成' }</span>
                             </div>
-                            <div class="m-list-item-text" v-text="item.name"></div>
+                            <div class="m-list-item-text text-gradient-whtie" v-text="item.name"></div>
                         </div>
                     </div>
                     <div class="section-footer">
@@ -289,7 +289,7 @@
             <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'">
+            <van-popup id="active-tip-modal" get-container="body" v-model="dialog.show" :data-modal-type="dialog.type" :close-on-click-overlay="dialog.type !== 'over'">
               <div v-show="dialog.type === 'rule'" class="modal-dialog active-tip--rule" :class="{max: getScreenMax}">
                 <h5 class="text-gradient-red">活动规则</h5>
                 <div class="rule-content">

src/web/templates/frontRouter/wx/bigmember/free/perfect_info.html

@@ -1351,7 +1351,6 @@
                   }
                   break
                 }
-                case 'super_membership_day':
                 case 'activity_free_plan': {
                   _this.showMessage('完善信息任务已完成，快去领取剑鱼币吧~', '去领取', function () {
                     history.back()
@@ -1372,7 +1371,6 @@
                     message = '我们会尽快联系您完成供应商报名，请耐心等待。'
                   }
 
-
                   // 免费用户体验
                   if (source.indexOf('_freeuser') > -1) {
                     var text = ''