Merge branch 'main' into feature/v1.0.94

apps/bigmember_pc/src/views/vipsubscribe/components/Contrast.vue

@@ -2,33 +2,45 @@
   <div class="sub-contrast">
     <div class="contrast-header">
       <div class="line-flex">
-        <span class="split-box--before"></span>
-        <div class="second-desc">免费订阅</div>
-        <img class="text-vs" src="@/assets/images/sub-compare.png" alt="对比" />
-        <div class="second-desc">超级订阅</div>
-        <span class="split-box--after"></span>
+        <span class="split-box--before" />
+        <div class="second-desc">
+          免费订阅
+        </div>
+        <img class="text-vs" src="@/assets/images/sub-compare.png" alt="对比">
+        <div class="second-desc">
+          超级订阅
+        </div>
+        <span class="split-box--after" />
       </div>
     </div>
     <div class="contrast-main">
       <ul
-        class="contrast-main-header flex-r-c"
         ref="stickyHeader"
         v-stickyed="stickyed"
+        class="contrast-main-header flex-r-c"
       >
-        <li class="top-title modify-left">功能/产品</li>
-        <li class="top-title modify-center gray">免费订阅</li>
+        <li class="top-title modify-left">
+          功能/产品
+        </li>
+        <li class="top-title modify-center gray">
+          免费订阅
+        </li>
         <li class="top-title modify-right flex-r-c center">
           <img
             src="@/assets/images/subscribe/new-crown.png"
             style="width: 28px; position: relative"
-          />
-          <div style="margin-left: 8px">超级订阅</div>
+          >
+          <div style="margin-left: 8px">
+            超级订阅
+          </div>
         </li>
       </ul>
-      <div class="contrast-main-center" ref="main">
+      <div ref="main" class="contrast-main-center">
         <div class="center-left">
           <ul class="clearfix">
-            <li class="top-title modify-left">功能/产品</li>
+            <li class="top-title modify-left">
+              功能/产品
+            </li>
             <li class="double">
               <div style="display: flex; align-items: center">
                 <div>企业画像</div>
@@ -36,7 +48,7 @@
                   src="@/assets/images/subscribe/new-logo.png"
                   alt=""
                   style="margin-left: 8px; width: 40px"
-                />
+                >
               </div>
               <div>提供企业中标项目分析、重点客户等多维分析</div>
             </li>
@@ -47,7 +59,7 @@
                   src="@/assets/images/subscribe/new-logo.png"
                   alt=""
                   style="margin-left: 8px; width: 40px"
-                />
+                >
               </div>
               <div>提供重点供应商、采购预算/方式等分析</div>
             </li>
@@ -58,7 +70,7 @@
                   src="@/assets/images/subscribe/new-logo.png"
                   alt=""
                   style="margin-left: 8px; width: 40px"
-                />
+                >
               </div>
               <div>招标文件/采购清单一键下载</div>
             </li>
@@ -69,7 +81,7 @@
                   src="@/assets/images/subscribe/new-logo.png"
                   alt=""
                   style="margin-left: 8px; width: 40px"
-                />
+                >
               </div>
               <div>支持用户点击原文链接查看公告原地址，鉴别信息真伪</div>
             </li>
@@ -79,7 +91,7 @@
                 src="@/assets/images/subscribe/new-logo.png"
                 alt=""
                 style="margin-left: 8px; width: 40px"
-              />
+              >
             </li>
             <li>订阅关键词</li>
             <li>中标企业联系方式</li>
@@ -102,34 +114,64 @@
               <div>采购单位搜索</div>
               <div>按地区、采购单位类型等搜索采购单位信息，高效精准拓客</div>
             </li>
-            <li class="gray">月报/周报</li>
+            <li class="gray">
+              月报/周报
+            </li>
             <li class="double">
               <div>标讯收藏</div>
               <div>关注项目一键收藏，重要信息不遗漏</div>
             </li>
-            <li class="gray">专属资源社群对接</li>
+            <li class="gray">
+              专属资源社群对接
+            </li>
           </ul>
         </div>
         <div class="center-center">
           <ul class="clearfix">
-            <li class="top-title modify-center gray">免费订阅</li>
-            <li class="double"><i class="wrong"></i></li>
-            <li class="gray double"><i class="wrong"></i></li>
-            <li class="double"><i class="wrong"></i></li>
-            <li class="double"><i class="wrong"></i></li>
-            <li class="gray"><i class="wrong"></i></li>
+            <li class="top-title modify-center gray">
+              免费订阅
+            </li>
+            <li class="double">
+              <i class="wrong" />
+            </li>
+            <li class="gray double">
+              <i class="wrong" />
+            </li>
+            <li class="double">
+              <i class="wrong" />
+            </li>
+            <li class="double">
+              <i class="wrong" />
+            </li>
+            <li class="gray">
+              <i class="wrong" />
+            </li>
             <li>10组</li>
             <li>公告公示</li>
             <li>免费订阅1个省</li>
             <li>300条/天</li>
             <li>标题</li>
-            <li class="double"><i class="wrong"></i></li>
-            <li class="gray double"><i class="wrong"></i></li>
-            <li class="double">4条/次</li>
-            <li class="double"><i class="right"></i></li>
-            <li class="gray"><i class="wrong"></i></li>
-            <li class="double">100条</li>
-            <li class="gray"><i class="wrong"></i></li>
+            <li class="double">
+              <i class="wrong" />
+            </li>
+            <li class="gray double">
+              <i class="wrong" />
+            </li>
+            <li class="double">
+              <i class="right" />
+            </li>
+            <li class="double">
+              <i class="right" />
+            </li>
+            <li class="gray">
+              <i class="wrong" />
+            </li>
+            <li class="double">
+              100条
+            </li>
+            <li class="gray">
+              <i class="wrong" />
+            </li>
           </ul>
         </div>
         <div class="center-right">
@@ -139,38 +181,65 @@
                 src="@/assets/images/subscribe/new-crown.png"
                 alt=""
                 style="width: 28px; position: relative"
-              />
-              <div style="margin-left: 8px">超级订阅</div>
-            </li>
-            <li class="double">50个画像/省/月</li>
-            <li class="gold double">5个画像/省/月</li>
-            <li class="double">10个/月</li>
-            <li class="double"><i class="right"></i></li>
-            <li class="gold"><i class="right"></i></li>
+              >
+              <div style="margin-left: 8px">
+                超级订阅
+              </div>
+            </li>
+            <li class="double">
+              50个画像/省/月
+            </li>
+            <li class="gold double">
+              5个画像/省/月
+            </li>
+            <li class="double">
+              10个/月
+            </li>
+            <li class="double">
+              <i class="right" />
+            </li>
+            <li class="gold">
+              <i class="right" />
+            </li>
             <li>300组</li>
             <li>招标公告+国家企业公示</li>
             <li>根据套餐类型可选</li>
             <li>2000条/天</li>
             <li>标题+全文</li>
-            <li class="double">可选</li>
-            <li class="gold double"><i class="right"></i></li>
-            <li class="double">150条/次</li>
-            <li class="double"><i class="right"></i></li>
-            <li class="gold"><i class="right"></i></li>
-            <li class="double">5000条</li>
-            <li class="gold"><i class="right"></i></li>
+            <li class="double">
+              可选
+            </li>
+            <li class="gold double">
+              <i class="right" />
+            </li>
+            <li class="double">
+              <i class="right" />
+            </li>
+            <li class="double">
+              <i class="right" />
+            </li>
+            <li class="gold">
+              <i class="right" />
+            </li>
+            <li class="double">
+              5000条
+            </li>
+            <li class="gold">
+              <i class="right" />
+            </li>
           </ul>
         </div>
       </div>
     </div>
-    <div class="view-all" @click="viewAll">查看全部权益 <i class="iconfont icon-more"></i></div>
-
+    <div class="view-all" @click="viewAll">
+      查看全部权益 <i class="iconfont icon-more" />
+    </div>
   </div>
 </template>
 
 <script>
 export default {
-  name: 'contrast',
+  name: 'Contrast',
   data() {
     return {
       stickyed: {
@@ -182,8 +251,8 @@ export default {
   },
   mounted() {
     setTimeout(this.calcStickyNav, 100)
-    this.$refs.stickyHeader.windowScrollStickyEventCallback =
-      this.stickyCallback
+    this.$refs.stickyHeader.windowScrollStickyEventCallback
+      = this.stickyCallback
   },
   methods: {
     calcStickyNav() {
@@ -197,16 +266,16 @@ export default {
       // 表格顶部固定
       const tableDom = $(this.$refs.main)
       const tableHeaderChangeDom = $(this.$refs.stickyHeader)
-      const tableMaxHeight =
-        tableDom.height() +
-        this.stickyed.startFixedTop -
-        tableHeaderChangeDom.height()
-      const show =
-        $(window).scrollTop() > this.stickyed.startFixedTop &&
-        $(window).scrollTop() < tableMaxHeight
+      const tableMaxHeight
+        = tableDom.height()
+          + this.stickyed.startFixedTop
+          - tableHeaderChangeDom.height()
+      const show
+        = $(window).scrollTop() > this.stickyed.startFixedTop
+          && $(window).scrollTop() < tableMaxHeight
       this.stickyed.forbid = !show
     },
-    viewAll () {
+    viewAll() {
       window.open('/product/index?serviceType=0', '_blank')
     }
   }

apps/mobile/src/views/search/result/company/index.vue

@@ -246,12 +246,13 @@ export default {
     getScopeTags() {
       const list = this.scopeTags
       if (!this.isLogin) {
-        return list.filter((item) => !item.disabled)
+        return list.filter(item => !item.disabled)
       }
       list.forEach((v) => {
         if (this.freeUser && v.vip) {
           v.disabled = true
-        } else {
+        }
+        else {
           v.disabled = false
         }
       })
@@ -276,7 +277,7 @@ export default {
           address: v.company_address,
           zhiMa: v.zhima_labels
             ? v.zhima_labels
-                .map((v) => v.zhima_value || v.zhima_name)
+                .map(v => v.zhima_value || v.zhima_name)
                 .join('，')
             : ''
         }
@@ -285,7 +286,7 @@ export default {
     },
     // 分页尺寸
     getPageSize() {
-      return this.showUpdate || !this.isLogin ? 100 : 10
+      return this.showUpdate || !this.isLogin ? 150 : 10
     }
   },
   async beforeRouteLeave(to, from, next) {
@@ -399,7 +400,8 @@ export default {
         this.listInfo.loading = true
         this.listInfo.finished = false
         this.onLoad()
-      } catch (error) {
+      }
+      catch (error) {
         console.error(error)
       }
     },
@@ -412,7 +414,8 @@ export default {
         this.$refs[name]?.toggle(false)
         this.setFilterData(name, false)
         // 查询接口
-      } catch (error) {
+      }
+      catch (error) {
         console.error(error)
       }
     },
@@ -450,9 +453,11 @@ export default {
           let str = this.conditionStrMap[k].toString()
           if (str === 'all' || str === 'A,B,C,D') {
             str = ''
-          } else if (k === 'zhiMa') {
+          }
+          else if (k === 'zhiMa') {
             str = JSON.stringify(this.conditionStrMap[k])
-          } else {
+          }
+          else {
             str = this.conditionStrMap[k].toString()
           }
           params[k] = str
@@ -470,7 +475,8 @@ export default {
             this.listInfo.finished = true
             this.listInfo.entList = []
             this.hasData = false
-          } else {
+          }
+          else {
             this.hasData = true
             this.listInfo.entList.push(...data.list)
           }
@@ -478,11 +484,13 @@ export default {
           if (this.listInfo.entList.length >= this.listInfo.total) {
             this.listInfo.finished = true
           }
-        } else {
+        }
+        else {
           this.listInfo.finished = true
           this.hasData = false
         }
-      } else {
+      }
+      else {
         this.listInfo.finished = true
         this.hasData = false
       }

plugins/login-auth/src/lib/pluginLogin.ts

@@ -1,5 +1,5 @@
 import { doChangeTabActive } from '@/module-model/tab'
-import { openDialog, closeDialog, canShowDialog } from '@/module-model/dialog'
+import { canShowDialog, closeDialog, openDialog } from '@/module-model/dialog'
 import loginCookie from '@/module-model/loginCookies'
 import { ScanCodeLoginDetection } from '@/utils/Login'
 import { doSetPageShareId } from '@/module-model/wxQrcode'
@@ -31,7 +31,7 @@ class PluginLogin {
     this.emitter.$on('user-info-update', this.setState.bind(this))
   }
 
-  init(options) {
+  async init(options) {
     if (this.hasInited) {
       console.warn('pluginLogin hasInited')
       return
@@ -62,7 +62,7 @@ class PluginLogin {
 
     if (this.options.preloadLoginState) {
       this.initPoll()
-      this.poll.preload()
+      await this.poll.preload()
     }
 
     if (this.options.preloadWeChatImage) {
@@ -109,7 +109,8 @@ class PluginLogin {
   emit(type, data = null) {
     if (typeof this.options[type] === 'function') {
       this.options[type](data)
-    } else {
+    }
+    else {
       console.warn('[plugin-login]: not find emit function:', type)
     }
   }
@@ -235,6 +236,7 @@ class PluginLogin {
       cross: true
     })
   }
+
   /**
    * 广播用户设置密码事件(暂不设置、设置成功)
    * @param data
@@ -244,7 +246,8 @@ class PluginLogin {
     const { status } = data
     if (status === 1) {
       this.emitter.$emit('user-set-pass-success', data)
-    } else {
+    }
+    else {
       this.emitter.$emit('user-not-set-pass', data)
     }
   }
@@ -259,7 +262,7 @@ function addHook(hook) {
 }
 
 // 注入 hooks
-;['open', 'doSignOut', 'close', 'init', 'getState'].forEach((hook) =>
+;['open', 'doSignOut', 'close', 'init', 'getState'].forEach(hook =>
   addHook(hook)
 )
 

plugins/login-auth/src/utils/Login.ts

@@ -10,7 +10,7 @@
  *  3./front/ajaxPolling {reqType: 1,shareIds: pageshareid+"___"+kopshareid}
  */
 import { useWebSocket } from '@vueuse/core'
-import { ajaxGetUserInfo, ajaxGetLoginPolling, ajaxGetLoginNum } from '@/api'
+import { ajaxGetLoginNum, ajaxGetLoginPolling, ajaxGetUserInfo } from '@/api'
 
 /**
  * 获取 WebSocket URL
@@ -113,17 +113,18 @@ class ScanCodeLoginDetection {
   }
 
   createLoginStatusPoller() {
-    const shareIds = this.options.shareId + '___' + this.options.kopShareId
+    const shareIds = `${this.options.shareId}___${this.options.kopShareId}`
     return new LoginStatusPoller({
-      api: async function (count) {
+      async api(count) {
         let params = {}
 
         if (count === 0) {
           params = {
             reqType: 1,
-            shareIds: shareIds
+            shareIds
           }
-        } else {
+        }
+        else {
           params = {
             reqType: 2
           }
@@ -174,7 +175,12 @@ class ScanCodeLoginDetection {
         this.options.shareId = data.num
         this.options.kopShareId = data.numot
         this.saveShareId()
-
+        try {
+          // seo页面登录卡片赋值二维码id
+          ;(window as any).$shareidLoginCard(data.num)
+        }
+        catch (error) {
+        }
         this.update('shareId', {
           shareId: this.options.shareId,
           kopShareId: this.options.kopShareId
@@ -234,7 +240,8 @@ class LoginStatusPoller {
     this.stop()
     if (this.ws?.enable && this.supportsWebsockets()) {
       this.createWebsocket()
-    } else {
+    }
+    else {
       this.poll()
     }
   }
@@ -308,14 +315,15 @@ class LoginStatusPoller {
   }
 
   computeStep(count) {
-    let result = {
+    const result = {
       state: true,
       step: 3000
     }
     const maxCount = 10
     if (count <= maxCount) {
       result.step = 3000
-    } else {
+    }
+    else {
       result.step = Math.min(20000, (count - maxCount) * 1000 + 3000)
     }
     return result