Browse Source

Merge branch 'main' into feature/v1.0.56

lianbingjie 11 months ago
parent
commit
78e0473956
79 changed files with 768 additions and 1035 deletions
  1. 2 2
      apps/bigmember_pc/src/components/article-item/ArticleItem.vue
  2. 1 1
      apps/bigmember_pc/src/components/collect-info/CollectInfo.vue
  3. 3 3
      apps/bigmember_pc/src/components/common/BigMemberEmpty.vue
  4. 3 3
      apps/bigmember_pc/src/components/contact-info/ContactInfo.vue
  5. 3 3
      apps/bigmember_pc/src/components/custom-report/customReport.vue
  6. 1 1
      apps/bigmember_pc/src/components/forecast/ForLayout.vue
  7. 2 2
      apps/bigmember_pc/src/components/forecast/ForLimit.vue
  8. 2 2
      apps/bigmember_pc/src/components/forecast/ForeCast.vue
  9. 7 7
      apps/bigmember_pc/src/components/home/HomeList.vue
  10. 6 6
      apps/bigmember_pc/src/components/home/HomePotenList.vue
  11. 1 1
      apps/bigmember_pc/src/components/input/BaseInput.vue
  12. 1 1
      apps/bigmember_pc/src/components/input/SearchInput.vue
  13. 2 2
      apps/bigmember_pc/src/components/mask-card/MaskCard.vue
  14. 1 1
      apps/bigmember_pc/src/components/medical/FollowList.vue
  15. 2 2
      apps/bigmember_pc/src/components/report-data/ProjectTop.vue
  16. 2 2
      apps/bigmember_pc/src/components/report-data/SelectMonth.vue
  17. 1 0
      apps/bigmember_pc/src/components/selector-cascader/AreaCityCascader.vue
  18. 1 0
      apps/bigmember_pc/src/components/selector-cascader/BuyerClassCascader.vue
  19. 2 0
      apps/bigmember_pc/src/components/selector-cascader/IndustryCascader.vue
  20. 1 0
      apps/bigmember_pc/src/components/selector-cascader/SubscribeClassListCascader.vue
  21. 1 0
      apps/bigmember_pc/src/components/selector-cascader/searchrangeCascader.vue
  22. 3 4
      apps/bigmember_pc/src/components/selector/PopSelector.vue
  23. 1 1
      apps/bigmember_pc/src/components/subscribe-manager/components/List.vue
  24. 16 13
      apps/bigmember_pc/src/composables/attachment-download/component/AttachmentDownload.vue
  25. 5 1
      apps/bigmember_pc/src/utils/mixins/selector-cascader.js
  26. 1 1
      apps/bigmember_pc/src/views/Home.vue
  27. 1 1
      apps/bigmember_pc/src/views/article-content/components/ContentMask.vue
  28. 1 1
      apps/bigmember_pc/src/views/bid-forecast/BidForecast.vue
  29. 8 8
      apps/bigmember_pc/src/views/bid-forecast/BidForecastLimit.vue
  30. 1 1
      apps/bigmember_pc/src/views/business/detail.vue
  31. 3 3
      apps/bigmember_pc/src/views/customer/Buyer.vue
  32. 5 5
      apps/bigmember_pc/src/views/customer/components/BidInfoActive.vue
  33. 1 1
      apps/bigmember_pc/src/views/customer/components/SearchInput.vue
  34. 3 3
      apps/bigmember_pc/src/views/customer/components/UnitList.vue
  35. 2 2
      apps/bigmember_pc/src/views/download-pdf/components/EntForm.vue
  36. 1 1
      apps/bigmember_pc/src/views/medical-field/MedicalPortrait.vue
  37. 4 4
      apps/bigmember_pc/src/views/medical/DistributorSearch.vue
  38. 5 6
      apps/bigmember_pc/src/views/order/components/big-member/desc.vue
  39. 3 3
      apps/bigmember_pc/src/views/order/components/data-export/style/info.scss
  40. 5 5
      apps/bigmember_pc/src/views/portrayal/EntPortrayal.vue
  41. 1 1
      apps/bigmember_pc/src/views/portrayal/EntSearchPortrayal.vue
  42. 1 1
      apps/bigmember_pc/src/views/portrayal/UnitPortrayal.vue
  43. 6 6
      apps/bigmember_pc/src/views/portrayal/components/BidInfoActive.vue
  44. 3 3
      apps/bigmember_pc/src/views/portrayal/components/DynamicList.vue
  45. 2 2
      apps/bigmember_pc/src/views/portrayal/components/EntForm.vue
  46. 3 3
      apps/bigmember_pc/src/views/portrayal/components/EntHistoryForm.vue
  47. 7 7
      apps/bigmember_pc/src/views/portrayal/components/EntProActive.vue
  48. 1 1
      apps/bigmember_pc/src/views/portrayal/components/EntSubVipForm.vue
  49. 3 3
      apps/bigmember_pc/src/views/portrayal/components/FreeExpBanner.vue
  50. 3 3
      apps/bigmember_pc/src/views/portrayal/components/ProActive.vue
  51. 3 3
      apps/bigmember_pc/src/views/portrayal/components/UnitList.vue
  52. 3 3
      apps/bigmember_pc/src/views/potential-for/PotenSimilar.vue
  53. 4 6
      apps/bigmember_pc/src/views/search/bidding/components/recommend-card.vue
  54. 1 1
      apps/bigmember_pc/src/views/search/bidding/index.vue
  55. 1 3
      apps/bigmember_pc/src/views/search/bidding/model/base.js
  56. 7 7
      apps/bigmember_pc/src/views/subscribe/SubPush.vue
  57. 1 1
      apps/bigmember_pc/src/views/subscribe/components/key/List.vue
  58. 6 6
      apps/bigmember_pc/src/views/vipsubscribe/components/Contrast.vue
  59. 1 1
      apps/bigmember_pc/src/views/vipsubscribe/giftNotice.vue
  60. 3 3
      apps/bigmember_pc/src/views/work-desktop/WorkDesktop.vue
  61. 137 0
      apps/decrypt-js/.gitignore
  62. 2 0
      apps/decrypt-js/README.md
  63. 17 0
      apps/decrypt-js/index.html
  64. 15 0
      apps/decrypt-js/package.json
  65. 16 0
      apps/decrypt-js/rsa/rsa_private_key.pem
  66. 6 0
      apps/decrypt-js/rsa/rsa_public_key.pem
  67. 8 0
      apps/decrypt-js/src/decrypt-pre1.js
  68. 10 0
      apps/decrypt-js/src/decrypt-pre2.js
  69. 95 0
      apps/decrypt-js/src/main.js
  70. 71 0
      apps/decrypt-js/vite.config.js
  71. 20 17
      apps/mobile/src/composables/attachment-download/component/AttachmentDownload.vue
  72. 81 74
      apps/mobile/src/ui/sidebar-selector/index.vue
  73. 2 2
      apps/mobile/src/views/invoice/Invoicing.vue
  74. 5 0
      apps/mobile/vite.config.js
  75. 7 2
      configs/proxy/dev-proxy.js
  76. 2 0
      package.json
  77. 7 7
      packages/vue-anti/src/decrypt/decrypt-iframe.js
  78. 2 4
      packages/vue-anti/src/decrypt/register-decrypt-interceptors.js
  79. 91 762
      pnpm-lock.yaml

+ 2 - 2
apps/bigmember_pc/src/components/article-item/ArticleItem.vue

@@ -638,7 +638,7 @@ $border-color: #ececec;
       border: 1px solid #ececec;
       border-radius: 4px;
       font-size: 12px;
-      font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
       font-weight: 400;
       text-align: center;
       color: #686868;
@@ -718,7 +718,7 @@ $border-color: #ececec;
   .view-status {
     margin-right: 8px;
     margin-left: 14px;
-    font-family: 'Microsoft YaHei';
+
     font-style: normal;
     font-weight: 400;
     font-size: 14px;

+ 1 - 1
apps/bigmember_pc/src/components/collect-info/CollectInfo.vue

@@ -1469,7 +1469,7 @@ export default {
       // text-align: center;
       line-height: 30px;
       font-size: 14px;
-      font-family: Microsoft YaHei-Regular, Microsoft YaHei;
+
       font-weight: 400;
       color: #f56500;
       margin-left: 2px;

+ 3 - 3
apps/bigmember_pc/src/components/common/BigMemberEmpty.vue

@@ -89,7 +89,7 @@ export default {
       display: flex;
       flex-direction: column;
       align-items: flex-start;
-      font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
       margin-top: 13px;
       font-size: 14px;
       font-weight: 400;
@@ -111,7 +111,7 @@ export default {
         background: #2cb7ca;
         border-radius: 4px;
         font-size: 14px;
-        font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
         font-weight: 400;
         text-align: CENTER;
         color: #ffffff;
@@ -138,7 +138,7 @@ export default {
     }
     .empty-main {
       font-size: 14px;
-      font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
       font-weight: 400;
       text-align: center;
       color: #999999;

+ 3 - 3
apps/bigmember_pc/src/components/contact-info/ContactInfo.vue

@@ -264,7 +264,7 @@ export default {
     font-size: 18px;
     color: #1d1d1d;
     line-height: 28px;
-    font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
     .data_length {
       margin-left: 4px;
       color: #2cb7ca;
@@ -313,7 +313,7 @@ export default {
     margin-top: 8px;
 
     table {
-      font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
       border-right: 1px solid #ececec;
       border-bottom: 1px solid #ececec;
       margin: 0 auto;
@@ -378,7 +378,7 @@ export default {
             font-size: 12px;
             text-align: center;
             border-radius: 4px;
-            font-family: Microsoft YaHei-Regular, Microsoft YaHei;
+
             font-weight: 400;
             color: #2abed1;
             line-height: 18px;

+ 3 - 3
apps/bigmember_pc/src/components/custom-report/customReport.vue

@@ -224,7 +224,7 @@ export default {
       align-items: center;
       height: 100%;
       line-height: 21px;
-      font-family: 'Microsoft YaHei';
+
       font-style: normal;
       font-weight: 400;
     }
@@ -255,7 +255,7 @@ export default {
     justify-content: center;
     padding: 0 17px;
     height: 30px;
-    font-family: 'Microsoft YaHei';
+
     font-style: normal;
     font-weight: 400;
     font-size: 14px;
@@ -293,7 +293,7 @@ export default {
   }
   .chart-title {
     padding: 16px 0 12px 0;
-    font-family: 'Microsoft YaHei';
+
     font-style: normal;
     font-weight: 400;
     font-size: 16px;

+ 1 - 1
apps/bigmember_pc/src/components/forecast/ForLayout.vue

@@ -191,7 +191,7 @@ export default {
       height: 37px;
       .bidfor_text {
         font-size: 32px;
-        font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
         font-weight: 400;
         color: #ffffff;
         text-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.08),

+ 2 - 2
apps/bigmember_pc/src/components/forecast/ForLimit.vue

@@ -354,7 +354,7 @@ export default {
       background: #2cb7ca;
       border-radius: 4px;
       font-size: 14px;
-      font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
       font-weight: 400;
       text-align: CENTER;
       color: #ffffff;
@@ -567,7 +567,7 @@ export default {
         background: #2cb7ca;
         border-radius: 6px;
         font-size: 16px;
-        font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
         font-weight: 400;
         text-align: CENTER;
         color: #ffffff;

+ 2 - 2
apps/bigmember_pc/src/components/forecast/ForeCast.vue

@@ -1498,7 +1498,7 @@ export default {
 
         .list_name {
           font-size: 16px;
-          font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
           font-weight: 400;
           text-align: LEFT;
           color: #1d1d1d;
@@ -1745,7 +1745,7 @@ export default {
       background: #2cb7ca;
       border-radius: 6px;
       font-size: 16px;
-      font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
       font-weight: 400;
       text-align: CENTER;
       color: #ffffff;

+ 7 - 7
apps/bigmember_pc/src/components/home/HomeList.vue

@@ -279,7 +279,7 @@ export default {
   }
   .empty-tip {
     font-size: 14px;
-    font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
     font-weight: 400;
     text-align: LEFT;
     color: #999999;
@@ -292,7 +292,7 @@ export default {
     background: #2cb7ca;
     border-radius: 4px;
     font-size: 14px;
-    font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
     font-weight: 400;
     text-align: CENTER;
     color: #ffffff;
@@ -309,7 +309,7 @@ export default {
     border-bottom: 1px solid #ececec;
     .h-header-l {
       font-size: 18px;
-      font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
       font-weight: 400;
       text-align: LEFT;
       color: #1d1d1d;
@@ -330,7 +330,7 @@ export default {
       display: flex;
       align-items: center;
       font-size: 14px;
-      font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
       font-weight: 400;
       text-align: CENTER;
       color: #2cb7ca;
@@ -373,7 +373,7 @@ export default {
         text-overflow: ellipsis;
         overflow: hidden;
         font-size: 14px;
-        font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
         font-weight: 400;
         text-align: LEFT;
         color: #1d1d1d;
@@ -404,7 +404,7 @@ export default {
       }
       .h-time-r {
         font-size: 12px;
-        font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
         font-weight: 400;
         text-align: RIGHT;
         color: #999999;
@@ -421,7 +421,7 @@ export default {
     }
     .h-time-r {
       font-size: 14px;
-      font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
       font-weight: 400;
       text-align: RIGHT;
       color: #686868;

+ 6 - 6
apps/bigmember_pc/src/components/home/HomePotenList.vue

@@ -249,7 +249,7 @@ export default {
   }
   .empty-tip {
     font-size: 14px;
-    font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
     font-weight: 400;
     text-align: LEFT;
     color: #999999;
@@ -263,7 +263,7 @@ export default {
     background: #2cb7ca;
     border-radius: 4px;
     font-size: 14px;
-    font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
     font-weight: 400;
     text-align: CENTER;
     color: #ffffff;
@@ -279,7 +279,7 @@ export default {
     border-bottom: 1px solid #ececec;
     .h-header-l {
       font-size: 18px;
-      font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
       font-weight: 400;
       text-align: LEFT;
       color: #1d1d1d;
@@ -300,7 +300,7 @@ export default {
       display: flex;
       align-items: center;
       font-size: 14px;
-      font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
       font-weight: 400;
       text-align: CENTER;
       color: #2cb7ca;
@@ -370,7 +370,7 @@ export default {
       align-items: center;
       .h-title-l {
         font-size: 14px;
-        font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
         font-weight: 400;
         text-align: LEFT;
         color: #1d1d1d;
@@ -382,7 +382,7 @@ export default {
       }
       .h-time-r {
         font-size: 12px;
-        font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
         font-weight: 400;
         text-align: RIGHT;
         color: #999999;

+ 1 - 1
apps/bigmember_pc/src/components/input/BaseInput.vue

@@ -52,7 +52,7 @@ export default {
     border: 1px solid #e0e0e0;
     padding: 0 16px;
     color: #1d1d1d;
-    font-family: Microsoft YaHei;
+
     font-size: 14px;
     line-height: 24px;
     height: 36px;

+ 1 - 1
apps/bigmember_pc/src/components/input/SearchInput.vue

@@ -215,7 +215,7 @@ export default {
     border: 1px solid #e0e0e0;
     padding-left: 24px;
     color: #1d1d1d;
-    font-family: Microsoft YaHei;
+
     font-size: 16px;
     line-height: 24px;
     height: 42px;

+ 2 - 2
apps/bigmember_pc/src/components/mask-card/MaskCard.vue

@@ -179,7 +179,7 @@ export default {
     height: 128px;
     // background: url('~@/assets/images/vip/bg/bg.png') no-repeat;
     // background-size: 100% 100%;
-    font-family: Microsoft YaHei;
+
     font-style: normal;
     font-weight: normal;
     font-size: 16px;
@@ -190,7 +190,7 @@ export default {
     button {
       background: #2cb7ca;
       border-radius: 4px;
-      font-family: Microsoft YaHei;
+
       font-style: normal;
       font-weight: normal;
       font-size: 14px;

+ 1 - 1
apps/bigmember_pc/src/components/medical/FollowList.vue

@@ -573,7 +573,7 @@ export default {
       background: #2cb7ca;
       border-radius: 6px;
       font-size: 16px;
-      font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
       font-weight: 400;
       text-align: CENTER;
       color: #ffffff;

+ 2 - 2
apps/bigmember_pc/src/components/report-data/ProjectTop.vue

@@ -211,7 +211,7 @@ export default {
         .list_title {
           margin-left: 12px;
           font-size: 16px;
-          font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
           font-weight: 400;
           color: #1d1d1d;
           line-height: 24px;
@@ -219,7 +219,7 @@ export default {
       }
       .unit_label {
         font-size: 12px;
-        font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
         font-weight: 400;
         color: #999999;
         line-height: 20px;

+ 2 - 2
apps/bigmember_pc/src/components/report-data/SelectMonth.vue

@@ -200,7 +200,7 @@ export default {
     height: 24px;
     opacity: 1;
     font-size: 14px;
-    font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
     font-weight: 400;
     text-align: LEFT;
     color: #1d1d1d;
@@ -232,7 +232,7 @@ export default {
           .list_span {
             margin-right: 24px;
             font-size: 13px;
-            font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
             font-weight: 400;
             text-align: LEFT;
             color: #1d1d1d;

+ 1 - 0
apps/bigmember_pc/src/components/selector-cascader/AreaCityCascader.vue

@@ -20,6 +20,7 @@
     trigger="click"
   >
     <el-cascader-panel
+      v-if="popover.waitDelayRenderLoaded"
       v-model="value"
       :options="optionsList"
       :props="propsData"

+ 1 - 0
apps/bigmember_pc/src/components/selector-cascader/BuyerClassCascader.vue

@@ -20,6 +20,7 @@
     trigger="click"
   >
     <el-cascader-panel
+      v-if="popover.waitDelayRenderLoaded"
       v-model="value"
       :options="optionsList"
       :props="propsData"

+ 2 - 0
apps/bigmember_pc/src/components/selector-cascader/IndustryCascader.vue

@@ -20,11 +20,13 @@
     trigger="click"
   >
     <el-cascader-panel
+      v-if="popover.waitDelayRenderLoaded"
       v-model="value"
       :options="optionsList"
       :props="propsData"
       @change="onChange"
     ></el-cascader-panel>
+
     <div class="el-cascader virtual-cascader" slot="reference">
       <div
         class="el-input virtual-input el-input--suffix"

+ 1 - 0
apps/bigmember_pc/src/components/selector-cascader/SubscribeClassListCascader.vue

@@ -20,6 +20,7 @@
     trigger="click"
   >
     <el-cascader-panel
+      v-if="popover.waitDelayRenderLoaded"
       v-model="value"
       :options="optionsList"
       :props="propsData"

+ 1 - 0
apps/bigmember_pc/src/components/selector-cascader/searchrangeCascader.vue

@@ -20,6 +20,7 @@
     trigger="click"
   >
     <el-cascader-panel
+      v-if="popover.waitDelayRenderLoaded"
       v-model="value"
       :options="optionsList"
       :props="propsData"

+ 3 - 4
apps/bigmember_pc/src/components/selector/PopSelector.vue

@@ -478,9 +478,8 @@ export default {
 
   &item {
     font-size: 14px;
-    font-family: Microsoft YaHei, Microsoft YaHei-Bold;
     font-weight: 700;
-    text-align: CENTER;
+    text-align: center;
     color: #1d1d1d;
     line-height: 22px;
     background: transparent;
@@ -538,7 +537,7 @@ export default {
     background: #f5f6f7;
     border: 1px solid #ececec;
     font-size: 14px;
-    font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
     font-weight: 400;
     text-align: CENTER;
     color: #1d1d1d;
@@ -558,7 +557,7 @@ export default {
       width: 60px;
       height: 26px;
       font-size: 14px;
-      font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
       font-weight: 400;
       line-height: 22px;
       border-radius: 2px;

+ 1 - 1
apps/bigmember_pc/src/components/subscribe-manager/components/List.vue

@@ -635,7 +635,7 @@ export default {
   margin-bottom: 8px;
   .list-item-opened {
     font-size: 14px;
-    font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
     font-weight: 400;
     text-align: left;
     color: #686868;

+ 16 - 13
apps/bigmember_pc/src/composables/attachment-download/component/AttachmentDownload.vue

@@ -320,22 +320,25 @@ export default {
       this.attachment.file = file
       // downUrl: 原始url
       // fileUrl: 下载地址
-      const { downUrl, fileUrl } = await this.getAttachmentInfo(file)
+      const result = await this.getAttachmentInfo(file)
+      if (result) {
+        const { downUrl, fileUrl } = result
 
-      let skipRefresh = false
-      // 定制化用户不展示提示和留资
-      if (IsCustomTopNet.value) {
-        skipRefresh = true
-      }
+        let skipRefresh = false
+        // 定制化用户不展示提示和留资
+        if (IsCustomTopNet.value) {
+          skipRefresh = true
+        }
 
-      if (!skipRefresh) {
-        this.refreshResourcePackCount()
-      }
+        if (!skipRefresh) {
+          this.refreshResourcePackCount()
+        }
 
-      if (downUrl && fileUrl) {
-        location.href = fileUrl
-      } else {
-        console.log('获取附件fid失败')
+        if (downUrl && fileUrl) {
+          location.href = fileUrl
+        } else {
+          console.log('获取附件fid失败')
+        }
       }
     },
     async getAttachmentInfo(file) {

+ 5 - 1
apps/bigmember_pc/src/utils/mixins/selector-cascader.js

@@ -10,13 +10,17 @@ export const cascaderMixin = {
   data() {
     return {
       popover: {
-        show: false
+        show: false,
+        waitDelayRenderLoaded: false
       }
     }
   },
   methods: {
     onPopoverShow() {
       this.popover.show = true
+      this.$nextTick(() => {
+        this.popover.waitDelayRenderLoaded = true
+      })
       this.$emit('show')
     },
     onPopoverHide() {

+ 1 - 1
apps/bigmember_pc/src/views/Home.vue

@@ -439,7 +439,7 @@ export default {
         max-width: 6em;
         margin-top: 16px;
         font-size: 16px;
-        font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
         font-weight: 400;
         text-align: center;
         color: #1d1d1d;

+ 1 - 1
apps/bigmember_pc/src/views/article-content/components/ContentMask.vue

@@ -378,7 +378,7 @@ const nowActiveMaskType = computed(() => {
   }
   .tip-text {
     font-size: 16px;
-    font-family: Microsoft YaHei-Regular, Microsoft YaHei, sans-serif;
+
     font-weight: 400;
     color: #1d1d1d;
     line-height: 24px;

+ 1 - 1
apps/bigmember_pc/src/views/bid-forecast/BidForecast.vue

@@ -210,7 +210,7 @@ export default {
     top: 220px;
     width: 100%;
     font-size: 14px;
-    font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
     font-weight: 400;
     text-align: CENTER;
     color: #ffffff;

+ 8 - 8
apps/bigmember_pc/src/views/bid-forecast/BidForecastLimit.vue

@@ -389,7 +389,7 @@ export default {
     border-radius: 4px;
     .bid_abs_title {
       font-size: 18px;
-      font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
       font-weight: 400;
       text-align: LEFT;
       color: #1d1d1d;
@@ -407,7 +407,7 @@ export default {
           border-radius: 2px;
           background: #fef0e5;
           font-size: 13px;
-          font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
           font-weight: 400;
           text-align: LEFT;
           color: #f56500;
@@ -416,7 +416,7 @@ export default {
         .bid_unitname {
           margin-left: 16px;
           font-size: 18px;
-          font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
           font-weight: 400;
           text-align: LEFT;
           color: #1d1d1d;
@@ -430,7 +430,7 @@ export default {
           background: #2cb7ca;
           border-radius: 4px;
           font-size: 14px;
-          font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
           font-weight: 400;
           text-align: CENTER;
           color: #ffffff;
@@ -446,7 +446,7 @@ export default {
           align-items: center;
           .base_label {
             font-size: 13px;
-            font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
             font-weight: 400;
             text-align: LEFT;
             color: #999999;
@@ -469,7 +469,7 @@ export default {
       padding: 0;
       height: 28px;
       font-size: 18px;
-      font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
       font-weight: 400;
       color: #1d1d1d;
       line-height: 28px;
@@ -480,7 +480,7 @@ export default {
       align-items: center;
       padding: 20px 0 32px;
       font-size: 14px;
-      font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
       font-weight: 400;
       color: #5f5e64;
       line-height: 24px;
@@ -504,7 +504,7 @@ export default {
           height: 100%;
           background: #2cb7ca;
           font-size: 16px;
-          font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
           font-weight: 400;
           color: #ffffff;
         }

+ 1 - 1
apps/bigmember_pc/src/views/business/detail.vue

@@ -222,7 +222,7 @@ export default {
     .common-time {
       margin-left: 8px;
       font-size: 12px;
-      font-family: Microsoft YaHei-Regular, Microsoft YaHei;
+
       font-weight: 400;
       color: #999999;
       line-height: 18px;

+ 3 - 3
apps/bigmember_pc/src/views/customer/Buyer.vue

@@ -415,7 +415,7 @@ export default {
         padding: 32px;
         padding-top: 0;
         font-size: 14px;
-        font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
         font-weight: 400;
         text-align: CENTER;
         color: #686868;
@@ -423,7 +423,7 @@ export default {
       }
       .el-dialog__title {
         font-size: 18px;
-        font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
         font-weight: 400;
         color: #1d1d1d;
         line-height: 28px;
@@ -453,7 +453,7 @@ export default {
           align-items: center;
           justify-content: center;
           font-size: 16px;
-          font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
           font-weight: 400;
           text-align: CENTER;
           border-radius: 6px;

+ 5 - 5
apps/bigmember_pc/src/views/customer/components/BidInfoActive.vue

@@ -660,7 +660,7 @@ export default {
     margin-bottom: 16px;
     height: 28px;
     font-size: 18px;
-    font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
     font-weight: 400;
     text-align: LEFT;
     color: #1d1d1d;
@@ -689,7 +689,7 @@ export default {
     cursor: pointer;
     .pro_screen {
       font-size: 14px;
-      font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
       font-weight: 400;
       text-align: LEFT;
       color: #686868;
@@ -733,7 +733,7 @@ export default {
         margin-right: 16px;
         width: 70px;
         font-size: 14px;
-        font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
         font-weight: 400;
         color: #686868;
         text-align: right;
@@ -777,7 +777,7 @@ export default {
           .selector-card-header {
             min-width: 70px;
             font-size: 14px;
-            font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
             font-weight: 400;
             color: #686868;
             line-height: 22px;
@@ -810,7 +810,7 @@ export default {
         border-radius: 4px;
         background: #fff;
         font-size: 14px;
-        font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
         font-weight: 400;
         text-align: CENTER;
         color: #2cb7ca;

+ 1 - 1
apps/bigmember_pc/src/views/customer/components/SearchInput.vue

@@ -221,7 +221,7 @@ export default {
     border: 1px solid #e0e0e0;
     padding-left: 43px;
     color: #1d1d1d;
-    font-family: Microsoft YaHei;
+
     font-size: 16px;
   }
 

+ 3 - 3
apps/bigmember_pc/src/views/customer/components/UnitList.vue

@@ -235,7 +235,7 @@ export default {
         padding: 32px;
         padding-top: 0;
         font-size: 14px;
-        font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
         font-weight: 400;
         text-align: CENTER;
         color: #686868;
@@ -243,7 +243,7 @@ export default {
       }
       .el-dialog__title {
         font-size: 18px;
-        font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
         font-weight: 400;
         color: #1d1d1d;
         line-height: 28px;
@@ -273,7 +273,7 @@ export default {
           align-items: center;
           justify-content: center;
           font-size: 16px;
-          font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
           font-weight: 400;
           text-align: CENTER;
           border-radius: 6px;

+ 2 - 2
apps/bigmember_pc/src/views/download-pdf/components/EntForm.vue

@@ -54,7 +54,7 @@ export default {
   .ent_head {
     height: 28px;
     font-size: 18px;
-    font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
     font-weight: 400;
     text-align: LEFT;
     color: #171826;
@@ -92,7 +92,7 @@ export default {
         height: 100%;
         background: #f9fafb;
         font-size: 14px;
-        font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
         font-weight: 400;
         text-align: LEFT;
         color: #686868;

+ 1 - 1
apps/bigmember_pc/src/views/medical-field/MedicalPortrait.vue

@@ -299,7 +299,7 @@ export default {
     .follow_text {
       margin-left: 4px;
       font-size: 14px;
-      font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
       font-weight: 400;
       color: #686868;
       line-height: 22px;

+ 4 - 4
apps/bigmember_pc/src/views/medical/DistributorSearch.vue

@@ -479,7 +479,7 @@ export default {
     }
     p {
       font-size: 14px;
-      font-family: Microsoft YaHei-Regular, Microsoft YaHei;
+
       font-weight: 400;
       line-height: 40px;
       color: #686868;
@@ -505,7 +505,7 @@ export default {
     }
     p {
       font-size: 14px;
-      font-family: Microsoft YaHei-Regular, Microsoft YaHei;
+
       font-weight: 400;
       line-height: 40px;
       min-width: 81px;
@@ -531,7 +531,7 @@ export default {
     }
     p {
       font-size: 14px;
-      font-family: Microsoft YaHei-Regular, Microsoft YaHei;
+
       font-weight: 400;
       line-height: 40px;
       min-width: 81px;
@@ -560,7 +560,7 @@ export default {
   }
 
   .fontclass {
-    font-family: Microsoft YaHei-Regular, Microsoft YaHei;
+
     font-weight: 400;
     color: #686868;
     font-size: 14px;

+ 5 - 6
apps/bigmember_pc/src/views/order/components/big-member/desc.vue

@@ -281,7 +281,7 @@ export default {
     width: 100%;
     min-height: 48px;
     font-size: 14px;
-    font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
     font-weight: 400;
     text-align: CENTER;
     color: #1d1d1d;
@@ -412,7 +412,7 @@ export default {
     justify-content: center;
     align-items: center;
     font-size: 18px;
-    font-family: Microsoft YaHei-Regular, Microsoft YaHei, sans-serif;
+
     font-weight: 400;
     color: #1d1d1d;
     line-height: 28px;
@@ -444,14 +444,14 @@ export default {
   }
   #jy-table .buy-box .buy-title {
     font-size: 18px;
-    font-family: Microsoft YaHei-Regular, Microsoft YaHei, sans-serif;
+
     font-weight: 400;
     line-height: 28px;
   }
   .buy-money--old {
     margin-top: 8px;
     font-size: 14px;
-    font-family: Microsoft YaHei-Regular, Microsoft YaHei, sans-serif;
+
     font-weight: 400;
     color: rgba(255, 255, 255, 0.6000000238418579);
     line-height: 24px;
@@ -459,7 +459,6 @@ export default {
   }
   .buy-money--now {
     font-size: 24px;
-    font-family: Microsoft YaHei-Bold, Microsoft YaHei;
     font-weight: bold;
     color: #fff;
     line-height: 36px;
@@ -517,7 +516,7 @@ export default {
     background-size: contain;
     background-position: center;
     font-size: 24px;
-    font-family: Microsoft YaHei-Regular, Microsoft YaHei, sans-serif;
+
     font-weight: 400;
     color: #1d1d1d;
     line-height: 36px;

+ 3 - 3
apps/bigmember_pc/src/views/order/components/data-export/style/info.scss

@@ -936,7 +936,7 @@ button {
   flex-direction: row;
   align-items: center;
   font-size: 14px;
-  font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
   font-weight: 400;
   text-align: CENTER;
   color: #686868;
@@ -994,7 +994,7 @@ button {
 
 #select-ent-datapack .ent-card {
   font-size: 14px;
-  font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
   font-weight: 400;
   text-align: LEFT;
   color: #1d1d1d;
@@ -1023,7 +1023,7 @@ button {
   border: 1px solid #e0e0e0;
   border-radius: 6px;
   font-size: 16px;
-  font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
   font-weight: 400;
   text-align: CENTER;
   color: #686868;

+ 5 - 5
apps/bigmember_pc/src/views/portrayal/EntPortrayal.vue

@@ -1027,7 +1027,7 @@ export default {
 
       .follow_text {
         font-size: 13px;
-        font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
         font-weight: 400;
         color: #686868;
         line-height: 20px;
@@ -1130,7 +1130,7 @@ export default {
       .ent_his_head {
         height: 28px;
         font-size: 18px;
-        font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
         font-weight: 400;
         text-align: LEFT;
         color: #171826;
@@ -1177,7 +1177,7 @@ export default {
 
           .pro_li_con {
             font-size: 20px;
-            font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
             font-weight: 400;
             color: #2cb7ca;
             line-height: 32px;
@@ -1185,7 +1185,7 @@ export default {
 
           .pro_li_label {
             font-size: 14px;
-            font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
             font-weight: 400;
             color: #686868;
             line-height: 22px;
@@ -1219,7 +1219,7 @@ export default {
         width: 840px;
         height: 17px;
         font-size: 12px;
-        font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
         font-weight: 400;
         color: #999999;
       }

+ 1 - 1
apps/bigmember_pc/src/views/portrayal/EntSearchPortrayal.vue

@@ -1731,7 +1731,7 @@ export default {
         width: 840px;
         height: 17px;
         font-size: 12px;
-        font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
         font-weight: 400;
         color: #999999;
       }

+ 1 - 1
apps/bigmember_pc/src/views/portrayal/UnitPortrayal.vue

@@ -1845,7 +1845,7 @@ export default {
   .ent_his_head {
     height: 28px;
     font-size: 18px;
-    font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
     font-weight: 400;
     text-align: LEFT;
     color: #171826;

+ 6 - 6
apps/bigmember_pc/src/views/portrayal/components/BidInfoActive.vue

@@ -974,7 +974,7 @@ export default {
   border: 1px solid #2cb7ca;
   border-radius: 4px;
   font-size: 14px;
-  font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
   font-weight: 400;
   text-align: CENTER;
   line-height: 22px;
@@ -1033,7 +1033,7 @@ export default {
     margin-bottom: 16px;
     height: 28px;
     font-size: 18px;
-    font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
     font-weight: 400;
     text-align: LEFT;
     color: #1d1d1d;
@@ -1079,7 +1079,7 @@ export default {
 
     .pro_screen {
       font-size: 14px;
-      font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
       font-weight: 400;
       text-align: LEFT;
       color: #686868;
@@ -1133,7 +1133,7 @@ export default {
         margin-right: 16px;
         // width: 70px;
         font-size: 14px;
-        font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
         font-weight: 400;
         color: #686868;
         text-align: right;
@@ -1186,7 +1186,7 @@ export default {
           .selector-card-header {
             min-width: 70px;
             font-size: 14px;
-            font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
             font-weight: 400;
             color: #686868;
             line-height: 22px;
@@ -1224,7 +1224,7 @@ export default {
         border-radius: 4px;
         background: #fff;
         font-size: 14px;
-        font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
         font-weight: 400;
         text-align: CENTER;
         color: #2cb7ca;

+ 3 - 3
apps/bigmember_pc/src/views/portrayal/components/DynamicList.vue

@@ -2446,7 +2446,7 @@ export default {
     .el-dialog__body {
       padding: 32px;
       font-size: 14px;
-      font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
       font-weight: 400;
       text-align: CENTER;
       color: #686868;
@@ -2455,7 +2455,7 @@ export default {
 
     .el-dialog__title {
       font-size: 18px;
-      font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
       font-weight: 400;
       color: #1d1d1d;
       line-height: 28px;
@@ -2489,7 +2489,7 @@ export default {
         align-items: center;
         justify-content: center;
         font-size: 16px;
-        font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
         font-weight: 400;
         text-align: CENTER;
         border-radius: 6px;

+ 2 - 2
apps/bigmember_pc/src/views/portrayal/components/EntForm.vue

@@ -139,7 +139,7 @@ export default {
   .ent_head {
     height: 28px;
     font-size: 18px;
-    font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
     font-weight: 400;
     text-align: LEFT;
     color: #171826;
@@ -177,7 +177,7 @@ export default {
         height: 100%;
         background: #f9fafb;
         font-size: 14px;
-        font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
         font-weight: 400;
         text-align: LEFT;
         color: #686868;

+ 3 - 3
apps/bigmember_pc/src/views/portrayal/components/EntHistoryForm.vue

@@ -124,7 +124,7 @@ export default {
   .ent_his_head {
     height: 28px;
     font-size: 18px;
-    font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
     font-weight: 400;
     text-align: LEFT;
     color: #171826;
@@ -157,7 +157,7 @@ export default {
         height: 48px;
         background: #f9fafb;
         font-size: 14px;
-        font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
         font-weight: 400;
         color: #686868;
         border: 1px solid #ececec;
@@ -206,7 +206,7 @@ export default {
       width: 100%;
       min-height: 48px;
       font-size: 14px;
-      font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
       font-weight: 400;
       text-align: CENTER;
       color: #1d1d1d;

+ 7 - 7
apps/bigmember_pc/src/views/portrayal/components/EntProActive.vue

@@ -478,7 +478,7 @@ export default {
     margin-bottom: 16px;
     height: 28px;
     font-size: 18px;
-    font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
     font-weight: 400;
     text-align: LEFT;
     color: #1d1d1d;
@@ -497,7 +497,7 @@ export default {
     cursor: pointer;
     .pro_screen {
       font-size: 14px;
-      font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
       font-weight: 400;
       text-align: LEFT;
       color: #2cb7ca;
@@ -520,7 +520,7 @@ export default {
         margin-right: 16px;
         width: 70px;
         font-size: 14px;
-        font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
         font-weight: 400;
         color: #686868;
         line-height: 22px;
@@ -534,7 +534,7 @@ export default {
           .selector-card-header {
             min-width: 70px;
             font-size: 14px;
-            font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
             font-weight: 400;
             color: #686868;
             line-height: 22px;
@@ -562,7 +562,7 @@ export default {
         text-overflow: ellipsis;
         height: 24px;
         font-size: 16px;
-        font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
         font-weight: 400;
         text-align: LEFT;
         color: #1d1d1d;
@@ -586,7 +586,7 @@ export default {
             border-radius: 4px;
             box-shadow: 0px -1px 0px 0px rgba(0, 0, 0, 0.05) inset;
             font-size: 12px;
-            font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
             font-weight: 400;
             text-align: CENTER;
             color: #2cb7ca;
@@ -598,7 +598,7 @@ export default {
         }
         .li_right {
           font-size: 12px;
-          font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
           font-weight: 400;
           color: #999999;
           line-height: 20px;

+ 1 - 1
apps/bigmember_pc/src/views/portrayal/components/EntSubVipForm.vue

@@ -165,7 +165,7 @@ export default {
         height: 100%;
         background: #f9fafb;
         font-size: 14px;
-        font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
         font-weight: 400;
         text-align: LEFT;
         color: #686868;

+ 3 - 3
apps/bigmember_pc/src/views/portrayal/components/FreeExpBanner.vue

@@ -41,7 +41,7 @@ export default {
     height: 22px;
     font-size: 14px;
     padding-left: 8px;
-    font-family: Microsoft YaHei-Regular, Microsoft YaHei;
+
     font-weight: 400;
     color: #ffffff;
     line-height: 22px;
@@ -54,7 +54,7 @@ export default {
   width: 100%;
   padding: 10px 136px;
   font-size: 18px;
-  font-family: Microsoft YaHei-Regular, Microsoft YaHei;
+
   font-weight: 400;
   color: #663600;
   line-height: 28px;
@@ -71,7 +71,7 @@ export default {
     height: 30px;
     line-height: 30px;
     font-size: 16px;
-    font-family: Microsoft YaHei-Regular, Microsoft YaHei;
+
     font-weight: 400;
     color: #ffffff;
     background: linear-gradient(104deg, #d69c06 0%, #b16c05 100%);

+ 3 - 3
apps/bigmember_pc/src/views/portrayal/components/ProActive.vue

@@ -185,7 +185,7 @@ export default {
         text-overflow: ellipsis;
         height: 24px;
         font-size: 16px;
-        font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
         font-weight: 400;
         text-align: LEFT;
         color: #1d1d1d;
@@ -209,7 +209,7 @@ export default {
             border-radius: 4px;
             box-shadow: 0px -1px 0px 0px rgba(0, 0, 0, 0.05) inset;
             font-size: 12px;
-            font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
             font-weight: 400;
             text-align: CENTER;
             color: #2cb7ca;
@@ -221,7 +221,7 @@ export default {
         }
         .li_right {
           font-size: 12px;
-          font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
           font-weight: 400;
           color: #999999;
           line-height: 20px;

+ 3 - 3
apps/bigmember_pc/src/views/portrayal/components/UnitList.vue

@@ -378,7 +378,7 @@ export default {
         padding: 32px;
         padding-top: 0;
         font-size: 14px;
-        font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
         font-weight: 400;
         text-align: CENTER;
         color: #686868;
@@ -386,7 +386,7 @@ export default {
       }
       .el-dialog__title {
         font-size: 18px;
-        font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
         font-weight: 400;
         color: #1d1d1d;
         line-height: 28px;
@@ -416,7 +416,7 @@ export default {
           align-items: center;
           justify-content: center;
           font-size: 16px;
-          font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
           font-weight: 400;
           text-align: CENTER;
           border-radius: 6px;

+ 3 - 3
apps/bigmember_pc/src/views/potential-for/PotenSimilar.vue

@@ -170,7 +170,7 @@ export default {
           background: #2cb7ca;
           border-radius: 4px;
           font-size: 14px;
-          font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
           font-weight: 400;
           text-align: CENTER;
           color: #ffffff;
@@ -225,7 +225,7 @@ export default {
       .potencon_title {
         height: 28px;
         font-size: 18px;
-        font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
         font-weight: 400;
         text-align: LEFT;
         color: #1d1d1d;
@@ -237,7 +237,7 @@ export default {
         align-items: center;
         height: 22px;
         font-size: 14px;
-        font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
         font-weight: 400;
         text-align: left;
         color: #999999;

+ 4 - 6
apps/bigmember_pc/src/views/search/bidding/components/recommend-card.vue

@@ -341,7 +341,6 @@ const {
         align-items: center;
         height: 100%;
         line-height: 21px;
-        font-family: 'Microsoft YaHei';
         font-style: normal;
         font-weight: 400;
       }
@@ -376,7 +375,6 @@ const {
       justify-content: center;
       padding: 0 17px;
       height: 30px;
-      font-family: 'Microsoft YaHei';
       font-style: normal;
       font-weight: 400;
       font-size: 14px;
@@ -436,7 +434,7 @@ const {
 
     .chart-title {
       padding: 16px 0 12px 0;
-      font-family: 'Microsoft YaHei';
+
       font-style: normal;
       font-weight: 400;
       font-size: 16px;
@@ -460,7 +458,7 @@ const {
       align-items: center;
       height: 100%;
       line-height: 21px;
-      font-family: 'Microsoft YaHei';
+
       font-style: normal;
       font-weight: 400;
     }
@@ -495,7 +493,7 @@ const {
     justify-content: center;
     padding: 0 17px;
     height: 30px;
-    font-family: 'Microsoft YaHei';
+
     font-style: normal;
     font-weight: 400;
     font-size: 14px;
@@ -539,7 +537,7 @@ const {
 
   .chart-title {
     padding: 16px 0 12px 0;
-    font-family: 'Microsoft YaHei';
+
     font-style: normal;
     font-weight: 400;
     font-size: 16px;

+ 1 - 1
apps/bigmember_pc/src/views/search/bidding/index.vue

@@ -633,7 +633,7 @@ const articleRef = ref({
     //}
     .hasNoData_tiptext{
       font-size: 14px;
-      font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
       text-align: center;
       color: #999999;
       line-height: 22px;

+ 1 - 3
apps/bigmember_pc/src/views/search/bidding/model/base.js

@@ -872,9 +872,7 @@ export default function () {
         cancelButtonClass: 'btn-group cancel-btn',
       })
         .then(() => {
-          router.push({
-            path: '/common/order/create/svip'
-          })
+          window.open('/swordfish/page_big_pc/free/svip/buy', '_blank')
         })
         .catch(() => {
           // 之前是付费用户,现在变成普通用户了,需要重置一些vip选项!!!!

+ 7 - 7
apps/bigmember_pc/src/views/subscribe/SubPush.vue

@@ -55,7 +55,7 @@
           @onChange="changeTime"
           selectorType="line"
         >
-          <div 
+          <div
             class="filter-label"
             :class="{ 'label-width': showVipTag }"
             slot="header"
@@ -1455,7 +1455,7 @@ export default {
       align-items: center;
       height: 100%;
       line-height: 21px;
-      font-family: 'Microsoft YaHei';
+
       font-style: normal;
       font-weight: 400;
     }
@@ -1490,7 +1490,7 @@ export default {
     justify-content: center;
     padding: 0 17px;
     height: 30px;
-    font-family: 'Microsoft YaHei';
+
     font-style: normal;
     font-weight: 400;
     font-size: 14px;
@@ -1534,7 +1534,7 @@ export default {
 
   .chart-title {
     padding: 16px 0 12px 0;
-    font-family: 'Microsoft YaHei';
+
     font-style: normal;
     font-weight: 400;
     font-size: 16px;
@@ -1735,7 +1735,7 @@ export default {
           align-items: center;
           height: 100%;
           line-height: 21px;
-          font-family: 'Microsoft YaHei';
+
           font-style: normal;
           font-weight: 400;
         }
@@ -1770,7 +1770,7 @@ export default {
         justify-content: center;
         padding: 0 17px;
         height: 30px;
-        font-family: 'Microsoft YaHei';
+
         font-style: normal;
         font-weight: 400;
         font-size: 14px;
@@ -1830,7 +1830,7 @@ export default {
 
       .chart-title {
         padding: 16px 0 12px 0;
-        font-family: 'Microsoft YaHei';
+
         font-style: normal;
         font-weight: 400;
         font-size: 16px;

+ 1 - 1
apps/bigmember_pc/src/views/subscribe/components/key/List.vue

@@ -737,7 +737,7 @@ export default {
   margin-bottom: 8px;
   .list-item-opened {
     font-size: 14px;
-    font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
     font-weight: 400;
     text-align: left;
     color: #686868;

+ 6 - 6
apps/bigmember_pc/src/views/vipsubscribe/components/Contrast.vue

@@ -316,7 +316,7 @@ export default {
       transition: all 0.5s;
       line-height: 68px;
       font-size: 20px;
-      font-family: Microsoft YaHei;
+
       font-weight: 400;
       color: rgba(29, 29, 29, 1);
       opacity: 1;
@@ -391,7 +391,7 @@ export default {
             border-left: 1px solid #ececec;
             border-bottom: 1px solid $border-color;
             border-right: 1px solid $border-color;
-            font-family: Microsoft YaHei;
+
             &.double {
               height: 74px;
               font-size: 16px;
@@ -444,7 +444,7 @@ export default {
             width: 100%;
             text-align: center;
             font-size: 14px;
-            font-family: Microsoft YaHei;
+
             font-weight: 400;
             color: rgba(29, 29, 29, 1);
             opacity: 1;
@@ -478,7 +478,7 @@ export default {
                 opacity: 1;
                 border-radius: 4px;
                 font-size: 16px;
-                font-family: Microsoft YaHei;
+
                 font-weight: 400;
                 line-height: 26px;
                 color: rgba(104, 104, 104, 1);
@@ -537,7 +537,7 @@ export default {
             text-align: center;
             transition: all 0.5s;
             font-size: 14px;
-            font-family: Microsoft YaHei;
+
             font-weight: 400;
             color: #714402;
             background: rgba(255, 226, 193, 0.08);
@@ -643,7 +643,7 @@ export default {
 
         li > p {
           font-size: 14px;
-          font-family: Microsoft YaHei-Regular, Microsoft YaHei;
+
           font-weight: 400;
           color: #686868;
           line-height: 22px;

+ 1 - 1
apps/bigmember_pc/src/views/vipsubscribe/giftNotice.vue

@@ -48,7 +48,7 @@ export default {
     box-sizing: border-box;
     padding: 40px 60px;
     h1 {
-      font-family: Microsoft YaHei;
+
       font-size: 24px;
       font-weight: 400;
       line-height: 36px;

+ 3 - 3
apps/bigmember_pc/src/views/work-desktop/WorkDesktop.vue

@@ -647,7 +647,7 @@ export default {
   background: #2cb7ca;
   border-radius: 4px;
   font-size: 14px;
-  font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
   font-weight: 400;
   text-align: CENTER;
   color: #ffffff;
@@ -659,7 +659,7 @@ export default {
   border: 1px solid #2cb7ca;
   border-radius: 4px;
   font-size: 14px;
-  font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
   font-weight: 400;
   text-align: CENTER;
   color: #2cb7ca;
@@ -673,7 +673,7 @@ export default {
   align-items: center;
   padding: 4px 12px;
   font-size: 14px;
-  font-family: Microsoft YaHei, Microsoft YaHei-Regular;
+
   font-weight: 400;
   text-align: CENTER;
   color: #2cb7ca;

+ 137 - 0
apps/decrypt-js/.gitignore

@@ -0,0 +1,137 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+lerna-debug.log*
+.pnpm-debug.log*
+
+# Diagnostic reports (https://nodejs.org/api/report.html)
+report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+*.lcov
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (https://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# Snowpack dependency directory (https://snowpack.dev/)
+web_modules/
+
+# TypeScript cache
+*.tsbuildinfo
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Optional stylelint cache
+.stylelintcache
+
+# Microbundle cache
+.rpt2_cache/
+.rts2_cache_cjs/
+.rts2_cache_es/
+.rts2_cache_umd/
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variable files
+.env
+.env.development.local
+.env.test.local
+.env.production.local
+.env.local
+
+# parcel-bundler cache (https://parceljs.org/)
+.cache
+.parcel-cache
+
+# Next.js build output
+.next
+out
+
+# Nuxt.js build / generate output
+.nuxt
+dist
+
+# Gatsby files
+.cache/
+# Comment in the public line in if your project uses Gatsby and not Next.js
+# https://nextjs.org/blog/next-9-1#public-directory-support
+# public
+
+# vuepress build output
+.vuepress/dist
+
+# vuepress v2.x temp and cache directory
+.temp
+.cache
+
+# Docusaurus cache and generated files
+.docusaurus
+
+# Serverless directories
+.serverless/
+
+# FuseBox cache
+.fusebox/
+
+# DynamoDB Local files
+.dynamodb/
+
+# TernJS port file
+.tern-port
+
+# Stores VSCode versions used for testing VSCode extensions
+.vscode-test
+
+# yarn v2
+.yarn/cache
+.yarn/unplugged
+.yarn/build-state.yml
+.yarn/install-state.gz
+.pnp.*
+/test-results/
+/playwright-report/
+/blob-report/
+/playwright/.cache/
+
+
+.idea

+ 2 - 0
apps/decrypt-js/README.md

@@ -0,0 +1,2 @@
+# 前端解密页面
+

+ 17 - 0
apps/decrypt-js/index.html

@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title></title>
+</head>
+<body>
+  <script src='https://cdn-common.jianyu360.com/cdn/lib/jsencrypt/3.3.2/jsencrypt.min.js'></script>
+  <script type="module" src="/src/main.js"></script>
+  <script
+    src="https://jysentry.jydev.jianyu360.cn/js-sdk-loader/2f4bb88c2cc54b81855bb5e3c85f953f.min.js"
+    defer
+    crossorigin="anonymous"
+  ></script>
+</body>
+</html>

+ 15 - 0
apps/decrypt-js/package.json

@@ -0,0 +1,15 @@
+{
+  "name": "decrypt-js",
+  "private": true,
+  "version": "1.0.0",
+  "scripts": {
+    "dev": "vite build --watch",
+    "build": "vite build",
+    "preview": "vite preview"
+  },
+  "devDependencies": {
+    "@babel/core": "^7.12.16",
+    "@vitejs/plugin-legacy": "^4.0.4",
+    "rollup-obfuscator": "^4.1.1"
+  }
+}

+ 16 - 0
apps/decrypt-js/rsa/rsa_private_key.pem

@@ -0,0 +1,16 @@
+-----BEGIN PRIVATE KEY-----
+MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAOhM0pNOfGeiBr+t
+nunphCHReY3RiS4Fuc2nD3cbjKNdLezeViGmsZwHsb2SVUb6rpPHyX0+3xjXYn//
+n39/Q8uPjWRA332TtN8MDEkSR2HMbn8ufRRt2TnlfsFDFTgBywSP7cwd0CiEdvBX
+5w8Jifc9VbedwbeplBWyDeLLqjRjAgMBAAECgYB4es+EAuLWxNwHMb8Hxkr3VzNZ
+8GDbc7DIDmsg9TLdz4fwH+hAD7pyGDOBBJIh/AXrM2U3BhKjSaIWjLdmYtT/kzg8
+BxQDr9YoO7u2jvTcEE+/6p2YugYX/ngpinawFJqyM+N7Or8yRABaw6Aq8VuKtv6p
+980Y2BBVVYn+/KorYQJBAP+9lu8iolzKRzJrFt/rosdWkOpNg5ujcSCwbxhYnYC0
+UY85sPLsMvnLgegkpO8jocSAt586BmcsA+Q9o97qVCkCQQDoiSVegtOvG3U0mNlN
+rCVpPEL22s9Kkwps3ZCdTl3VtUtNiyfhE8rbw/qOGti3VxMCRhpKi9hTIgeq13UG
+67WrAkEA/WQ1c5XGd9f4eU1AKffInmf4SB8rgn+L7I7EVMQgstB3a0kHOXqs+3IX
+shL01PliJFhBF+QfSgSDipdEke9uGQJBAOcw46xxmhDw1bizdulYi+Fy/oj7xzi3
+tJfEObGMZpLBKtsvzThkOz4APS3n1yuBMO8Dz8PqAeu1W7YpfLqiwv0CQF68N244
+dFebDSoZLl1hbCExpbtC7SDBpYxlIVNVqwN7ymr+Z0rIcAMVv5Ldp/bJEWaXJs9C
+0sPCBpjDnyK9Z04=
+-----END PRIVATE KEY-----

+ 6 - 0
apps/decrypt-js/rsa/rsa_public_key.pem

@@ -0,0 +1,6 @@
+-----BEGIN PUBLIC KEY-----
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDoTNKTTnxnoga/rZ7p6YQh0XmN
+0YkuBbnNpw93G4yjXS3s3lYhprGcB7G9klVG+q6Tx8l9Pt8Y12J//59/f0PLj41k
+QN99k7TfDAxJEkdhzG5/Ln0Ubdk55X7BQxU4AcsEj+3MHdAohHbwV+cPCYn3PVW3
+ncG3qZQVsg3iy6o0YwIDAQAB
+-----END PUBLIC KEY-----

+ 8 - 0
apps/decrypt-js/src/decrypt-pre1.js

@@ -0,0 +1,8 @@
+;(function(){
+  window.__pkContent = `MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAOhM0pNOfGeiBr+t
+    nunphCHReY3RiS4Fuc2nD3cbjKNdLezeViGmsZwHsb2SVUb6rpPHyX0+3xjXYn//
+    n39/Q8uPjWRA332TtN8MDEkSR2HMbn8ufRRt2TnlfsFDFTgBywSP7cwd0CiEdvBX
+    5w8Jifc9VbedwbeplBWyDeLLqjRjAgMBAAECgYB4es+EAuLWxNwHMb8Hxkr3VzNZ
+    8GDbc7DIDmsg9TLdz4fwH+hAD7pyGDOBBJIh/AXrM2U3BhKjSaIWjLdmYtT/kzg8
+    BxQDr9YoO7u2jvTcEE+/6p2YugYX/ngpinawFJqyM+N7Or8yRABaw6Aq8VuKtv6p`
+})()

+ 10 - 0
apps/decrypt-js/src/decrypt-pre2.js

@@ -0,0 +1,10 @@
+;(function(){
+  window.__pkContent += `980Y2BBVVYn+/KorYQJBAP+9lu8iolzKRzJrFt/rosdWkOpNg5ujcSCwbxhYnYC0
+    UY85sPLsMvnLgegkpO8jocSAt586BmcsA+Q9o97qVCkCQQDoiSVegtOvG3U0mNlN
+    rCVpPEL22s9Kkwps3ZCdTl3VtUtNiyfhE8rbw/qOGti3VxMCRhpKi9hTIgeq13UG
+    67WrAkEA/WQ1c5XGd9f4eU1AKffInmf4SB8rgn+L7I7EVMQgstB3a0kHOXqs+3IX
+    shL01PliJFhBF+QfSgSDipdEke9uGQJBAOcw46xxmhDw1bizdulYi+Fy/oj7xzi3
+    tJfEObGMZpLBKtsvzThkOz4APS3n1yuBMO8Dz8PqAeu1W7YpfLqiwv0CQF68N244
+    dFebDSoZLl1hbCExpbtC7SDBpYxlIVNVqwN7ymr+Z0rIcAMVv5Ldp/bJEWaXJs9C
+    0sPCBpjDnyK9Z04=`
+})()

+ 95 - 0
apps/decrypt-js/src/main.js

@@ -0,0 +1,95 @@
+import './decrypt-pre1.js'
+import './decrypt-pre2.js'
+
+const config = {
+    plainKey: '', // rsa解密后的key
+    privateKey: `-----BEGIN PRIVATE KEY-----
+        ${window.__pkContent || ''}
+        -----END PRIVATE KEY-----`,
+    // privateKey: `-----BEGIN PRIVATE KEY-----
+    //     MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAOhM0pNOfGeiBr+t
+    //     nunphCHReY3RiS4Fuc2nD3cbjKNdLezeViGmsZwHsb2SVUb6rpPHyX0+3xjXYn//
+    //     n39/Q8uPjWRA332TtN8MDEkSR2HMbn8ufRRt2TnlfsFDFTgBywSP7cwd0CiEdvBX
+    //     5w8Jifc9VbedwbeplBWyDeLLqjRjAgMBAAECgYB4es+EAuLWxNwHMb8Hxkr3VzNZ
+    //     8GDbc7DIDmsg9TLdz4fwH+hAD7pyGDOBBJIh/AXrM2U3BhKjSaIWjLdmYtT/kzg8
+    //     BxQDr9YoO7u2jvTcEE+/6p2YugYX/ngpinawFJqyM+N7Or8yRABaw6Aq8VuKtv6p
+    //     980Y2BBVVYn+/KorYQJBAP+9lu8iolzKRzJrFt/rosdWkOpNg5ujcSCwbxhYnYC0
+    //     UY85sPLsMvnLgegkpO8jocSAt586BmcsA+Q9o97qVCkCQQDoiSVegtOvG3U0mNlN
+    //     rCVpPEL22s9Kkwps3ZCdTl3VtUtNiyfhE8rbw/qOGti3VxMCRhpKi9hTIgeq13UG
+    //     67WrAkEA/WQ1c5XGd9f4eU1AKffInmf4SB8rgn+L7I7EVMQgstB3a0kHOXqs+3IX
+    //     shL01PliJFhBF+QfSgSDipdEke9uGQJBAOcw46xxmhDw1bizdulYi+Fy/oj7xzi3
+    //     tJfEObGMZpLBKtsvzThkOz4APS3n1yuBMO8Dz8PqAeu1W7YpfLqiwv0CQF68N244
+    //     dFebDSoZLl1hbCExpbtC7SDBpYxlIVNVqwN7ymr+Z0rIcAMVv5Ldp/bJEWaXJs9C
+    //     0sPCBpjDnyK9Z04=
+    //     -----END PRIVATE KEY-----`
+}
+
+const decryptTools = {
+    // rsa解密
+    rsaDecrypt: function (cipherText, privateKey) {
+        // 解密
+        var decrypt = new JSEncrypt()//创建解密对象实例
+        decrypt.setPrivateKey(privateKey)//设置秘钥
+        var uncrypted = decrypt.decrypt(cipherText)//解密之前拿公钥加密的内容
+        return uncrypted
+    },
+    // AES解密
+    async AESDecrypt(content, base64Key) {
+        const key = new TextEncoder().encode(base64Key)
+        const encryptedBase64 = content;
+        const encryptedData = Uint8Array.from(window.atob(encryptedBase64), c => c.charCodeAt(0));
+
+        const decryptData = async () => {
+            const iv = encryptedData.slice(0, 16);
+            const ciphertext = encryptedData.slice(16);
+
+            const aesKey = await crypto.subtle.importKey("raw", key, {name: "AES-CTR"}, false, ["encrypt", "decrypt"]);
+
+            const decryptedData = await crypto.subtle.decrypt({name: "AES-CTR", counter: iv, length: 128}, aesKey, ciphertext);
+            const decryptedText = new TextDecoder().decode(decryptedData);
+
+            return {
+                value: decryptedText
+            }
+        };
+
+        const result = await decryptData()
+        return result
+    }
+}
+
+const message = {
+    sendPostMessage: function(e, result) {
+        const win = e.source
+        var payload = {
+            ...result,
+            type: 'after-decrypt'
+        }
+        window.parent.postMessage(payload, payload.fromOrigin)
+    }
+}
+
+window.addEventListener('message', async (e) => {
+    if (e.data.type !== 'decrypt') {
+        return
+    }
+    if (window === e.source) {
+        return
+    }
+
+    var base64Key = e.data.base64Key
+    var cipherText = e.data.cipherText
+    // 1. 先解密base64Key
+    var plainKey = decryptTools.rsaDecrypt(base64Key, config.privateKey)
+    config.plainKey = plainKey
+    // 2. 再用key解密cipherText
+    var plainText = await decryptTools.AESDecrypt(cipherText, plainKey)
+
+    const result = {
+        ...e.data,
+        plainKey: plainKey,
+        plainText: plainText.value,
+    }
+    message.sendPostMessage(e, result)
+})
+

+ 71 - 0
apps/decrypt-js/vite.config.js

@@ -0,0 +1,71 @@
+import { resolve } from 'path'
+import { defineConfig } from 'vite'
+import legacyPlugin from '@vitejs/plugin-legacy'
+import { obfuscator } from 'rollup-obfuscator'
+
+// https://vitejs.dev/config/
+export default defineConfig({
+  base: '/page_decrypt/',
+  build: {
+    minify: true,
+    target: 'es2015',
+    assetsDir: './',
+    outDir: '../../dist/page_decrypt',
+    emptyOutDir: true,
+    rollupOptions: {
+      input: {
+        main: resolve(__dirname, 'index.html'),
+        // decrypt: resolve(__dirname, 'decrypt-js/decrypt-js.html'),
+      },
+      output: {
+        manualChunks: {
+          'decrypt-pre1': [
+            'src/decrypt-pre1.js'
+          ],
+          'decrypt-pre2': [
+            'src/decrypt-pre2.js'
+          ]
+        }
+      },
+      plugins: [
+        // 代码混淆
+        // https://juejin.cn/post/7216915438297677882
+        // https://juejin.cn/post/7292692843415109641 有更详细的配置
+        obfuscator({
+          compact: true,
+          controlFlowFlattening: true,
+          controlFlowFlatteningThreshold: 1,
+          deadCodeInjection: true,
+          deadCodeInjectionThreshold: 1,
+          debugProtection: true,
+          debugProtectionInterval: 0,
+          disableConsoleOutput: true,
+          identifierNamesGenerator: 'hexadecimal',
+          log: false,
+          renameGlobals: false,
+          rotateStringArray: true,
+          selfDefending: true,
+          shuffleStringArray: true,
+          splitStrings: true,
+          splitStringsChunkLength: 10,
+          stringArray: true,
+          stringArrayEncoding: ['rc4'],
+          stringArrayThreshold: 1,
+          transformObjectKeys: true,
+          unicodeEscapeSequence: false,
+        }),
+      ]
+    },
+  },
+  plugins: [
+    // https://juejin.cn/post/7358306245349605402
+    legacyPlugin({
+      // 如果不设置targets,默认值为'last 2 versions and not dead, > 0.3%, Firefox ESR'
+      // 需要兼容的目标列表,可以设置多个
+      targets: ['chrome 52'],  
+    }),
+  ]
+})
+
+
+

+ 20 - 17
apps/mobile/src/composables/attachment-download/component/AttachmentDownload.vue

@@ -356,27 +356,30 @@ export default {
       } else {
         // downUrl: 原始url
         // fileUrl: 下载地址
-        const { downUrl, fileUrl } = await this.getAttachmentInfo(file)
-        this.refreshResourcePackCount()
+        const result = await this.getAttachmentInfo(file)
+        if (result) {
+          const { downUrl, fileUrl } = result
+          this.refreshResourcePackCount()
 
-        if (downUrl && fileUrl) {
-          if (platform === 'wx') {
-            if (this.beforeLeavePage) {
-              await this.beforeLeavePage()
-            }
-            // 跳转中转页
-            this.$router.push({
-              path: '/static/open_in_browser',
-              query: {
-                type: 'attachment',
-                target: encodeURIComponent(fileUrl)
+          if (downUrl && fileUrl) {
+            if (platform === 'wx') {
+              if (this.beforeLeavePage) {
+                await this.beforeLeavePage()
               }
-            })
+              // 跳转中转页
+              this.$router.push({
+                path: '/static/open_in_browser',
+                query: {
+                  type: 'attachment',
+                  target: encodeURIComponent(fileUrl)
+                }
+              })
+            } else {
+              location.href = fileUrl
+            }
           } else {
-            location.href = fileUrl
+            console.log('获取附件fid失败')
           }
-        } else {
-          console.log('获取附件fid失败')
         }
       }
     },

+ 81 - 74
apps/mobile/src/ui/sidebar-selector/index.vue

@@ -1,92 +1,94 @@
 <template>
-  <van-tabs
-    class="sidebar-container column"
-    type="card"
-    v-model="activeTab"
-    :style="{ height }"
-    :class="{
+  <div v-if="loaded">
+    <van-tabs
+      class="sidebar-container column"
+      type="card"
+      v-model="activeTab"
+      :style="{ height }"
+      :class="{
       'default-sidebar-height': !height
     }"
-    swipe-threshold="99999"
-    :lazy-render="lazyRender"
-    :before-change="tabBeforeChange"
-  >
-    <van-tab
-      v-for="(parent, index) in renderList"
-      class="title-list"
-      :class="{
+      swipe-threshold="99999"
+      :lazy-render="lazyRender"
+      :before-change="tabBeforeChange"
+    >
+      <van-tab
+        v-for="(parent, index) in renderList"
+        class="title-list"
+        :class="{
         all: parent.level === 0,
         parent: parent.level === 1
       }"
-      :key="index"
-    >
-      <template #title>
-        <div
-          class="title-list-item"
-          :class="{ all: parent.level === 0, level1: parent.level === 1 }"
-        >
-          <slot name="tab-item" :parent="parent">
-            <div class="title-name">{{ parent.name }}</div>
-            <div class="title-text">
-              <slot name="tab-tag" :parent="parent">
-                <van-tag
-                  round
-                  type="primary"
-                  v-if="index !== 0 && showParentCountTag(parent)"
-                  :class="{ visible: parent._children_selectedCount === 0 }"
-                >
-                  {{ parent._children_selectedCount }}/{{
-                    parent._children_count
-                  }}
-                </van-tag>
-              </slot>
-            </div>
-          </slot>
-        </div>
-      </template>
-      <slot name="tab-content" :parent="parent" v-if="!!parent.hasThree"></slot>
-      <template v-else>
-        <van-cell-group class="content-list" :border="false">
+        :key="index"
+      >
+        <template #title>
           <div
-            class="content-list-item-container border-line-b"
-            :class="{
+            class="title-list-item"
+            :class="{ all: parent.level === 0, level1: parent.level === 1 }"
+          >
+            <slot name="tab-item" :parent="parent">
+              <div class="title-name">{{ parent.name }}</div>
+              <div class="title-text">
+                <slot name="tab-tag" :parent="parent">
+                  <van-tag
+                    round
+                    type="primary"
+                    v-if="index !== 0 && showParentCountTag(parent)"
+                    :class="{ visible: parent._children_selectedCount === 0 }"
+                  >
+                    {{ parent._children_selectedCount }}/{{
+                      parent._children_count
+                    }}
+                  </van-tag>
+                </slot>
+              </div>
+            </slot>
+          </div>
+        </template>
+        <slot name="tab-content" :parent="parent" v-if="!!parent.hasThree"></slot>
+        <template v-else>
+          <van-cell-group class="content-list" :border="false">
+            <div
+              class="content-list-item-container border-line-b"
+              :class="{
               all: child.level === 0,
               child: child.level === 1 || child.level === 2
             }"
-            v-for="(child, index2) in parent.children"
-            @click="childCellClick(parent, child)"
-            v-show="showChildrenItem(parent, child, index2)"
-            :key="index2"
-          >
-            <slot name="tab-group-item" :parent="parent" :child="child">
-              <van-cell :class="{ 'active-cell': child._selected }" is-link>
-                <template #title>
-                  <slot
-                    name="tab-group-item-title"
-                    :parent="parent"
-                    :child="child"
+              v-for="(child, index2) in parent.children"
+              @click="childCellClick(parent, child)"
+              v-show="showChildrenItem(parent, child, index2)"
+              :key="index2"
+            >
+              <slot name="tab-group-item" :parent="parent" :child="child">
+                <van-cell :class="{ 'active-cell': child._selected }" is-link>
+                  <template #title>
+                    <slot
+                      name="tab-group-item-title"
+                      :parent="parent"
+                      :child="child"
                     >{{ child.name }}</slot
-                  >
-                </template>
-                <template #right-icon>
-                  <slot
-                    name="tab-group-item-right-icon"
-                    :parent="parent"
-                    :child="child"
-                  >
+                    >
+                  </template>
+                  <template #right-icon>
+                    <slot
+                      name="tab-group-item-right-icon"
+                      :parent="parent"
+                      :child="child"
+                    >
                     <span
                       class="j-icon checkbox"
                       :class="{ checked: child._selected }"
                     ></span>
-                  </slot>
-                </template>
-              </van-cell>
-            </slot>
-          </div>
-        </van-cell-group>
-      </template>
-    </van-tab>
-  </van-tabs>
+                    </slot>
+                  </template>
+                </van-cell>
+              </slot>
+            </div>
+          </van-cell-group>
+        </template>
+      </van-tab>
+    </van-tabs>
+  </div>
 </template>
 
 <script>
@@ -191,6 +193,7 @@ export default {
   },
   data() {
     return {
+      loaded: false,
       activeTab: 0,
       renderList: [],
       sourceTemplate: {
@@ -213,6 +216,7 @@ export default {
      * 初始化数据结构
      */
     initSourceList(list = []) {
+      this.loaded = false
       const uList = JSON.parse(JSON.stringify(list))
       this.renderList = uList.map((parent) => {
         // 一级菜单不需要 selected
@@ -254,6 +258,9 @@ export default {
         return parent
       })
       this.refreshAllChildrenState()
+      this.$nextTick(() => {
+        this.loaded = true
+      })
     },
     showParentCountTag(parent) {
       if (this.showParentWhenChildrenEmpty) {

+ 2 - 2
apps/mobile/src/views/invoice/Invoicing.vue

@@ -524,7 +524,7 @@ export default {
             this.infoMap.type = this.DigitstoChinese_type(
               res.data.invoice.invoice_variety
             )
-            this.infoMap.content = res.data.invoice.invoice_content
+            this.infoMap.content = res.data.invoice.invoice_content || ''
             this.selectList.forEach((item) => {
               if (this.infoMap.content.includes(item.title)) {
                 item.checked = true
@@ -604,7 +604,7 @@ export default {
             this.infoMap.code = data.order_code
           }
           this.infoMap.type = this.DigitstoChinese_type(data.invoice_variety)
-          this.infoMap.content = data.invoice_content
+          this.infoMap.content = data.invoice_content || ''
           this.onlyIdentifying = data.only_Identifying
           this.selectList.forEach((item) => {
             if (this.infoMap.content.includes(item.title)) {

+ 5 - 0
apps/mobile/vite.config.js

@@ -124,6 +124,11 @@ export default defineConfig(({ mode,command }) => {
       host: '0.0.0.0',
       port: 8080,
       proxy: {
+        // 接口解密iframe
+        '^/page_decrypt': {
+          target: 'https://jybx3-webtest.jydev.jianyu360.com',
+          changeOrigin: true
+        },
         '/jyapi': {
           target: 'https://app5-jytest.jydev.jianyu360.com',
           changeOrigin: true,

+ 7 - 2
configs/proxy/dev-proxy.js

@@ -5,7 +5,7 @@ const ProxyTargets = {
   web3: 'https://jybx3-webtest.jydev.jianyu360.com',
   web2: 'https://jybx2-webtest.jydev.jianyu360.com',
   web: 'https://jybx-webtest.jydev.jianyu360.com',
-  app5: 'https://app5-jytest.jydev.jianyu360.com/'
+  app5: 'https://app5-jytest.jydev.jianyu360.com'
 }
 
 
@@ -53,7 +53,12 @@ export function useServerProxy (domain, defaultProxy = {}) {
       changeOrigin: true,
       rewrite: (path) =>
         path.replace(/^\/dev-api/, '/')
-    }
+    },
+    // 接口解密iframe
+    '^/page_decrypt': {
+      target: ProxyTarget,
+      changeOrigin: true
+    },
   })
   const ProxyRules = ProxyPrefixes.reduce((a, b) => {
     a[b] = ProxyTarget

+ 2 - 0
package.json

@@ -15,6 +15,8 @@
     "preinstall": "npx only-allow pnpm",
     "dev:doc": "pnpm --filter docs run dev",
     "build:doc": "pnpm --filter docs run build",
+    "dev:decrypt": "pnpm --filter decrypt-js run dev",
+    "build:decrypt": "pnpm --filter decrypt-js run build",
     "dev:mobile": "pnpm --filter jy-mobile run dev",
     "build:mobile": "pnpm --filter jy-mobile run build",
     "dev:work": "pnpm --filter work-bench run serve",

+ 7 - 7
packages/vue-anti/src/decrypt/decrypt-iframe.js

@@ -5,7 +5,7 @@ class DecryptIframe {
 
   iframeOrigin = 'https://www.jianyu360.cn'
   // iframeOrigin = 'http://localhost'
-  iframePath = '/jy_mobile/decrypt-js.html'
+  iframePath = '/page_decrypt/index.html'
   iframeEl = null // iframe的dom引用
   iframeName = '' // iframe的name
   iframeReady = false // 子页面是否初始化完成
@@ -117,12 +117,12 @@ class DecryptIframe {
       console.log('iframe JavaScript loaded!');
     })
     iframe.addEventListener('error', (e) => {
-      console.log(e)
-      if (iframe.src.includes(this.iframeUrl)) {
-        iframe.src = this.iframeUrlBackup
-      } else {
-        throw new Error('解密iframe加载失败')
-      }
+      throw new Error('解密iframe加载失败')
+      // if (iframe.src.includes(this.iframeUrl)) {
+      //   iframe.src = this.iframeUrlBackup
+      // } else {
+      //   throw new Error('解密iframe加载失败')
+      // }
     })
   }
 

+ 2 - 4
packages/vue-anti/src/decrypt/register-decrypt-interceptors.js

@@ -2,10 +2,6 @@ import { createDecryptIframe } from './decrypt-iframe'
 
 let cacheIframe = null
 export default function registerDecryptInterceptor (service) {
-  const iframe = createDecryptIframe()
-  cacheIframe = iframe
-  window.cacheIframe = cacheIframe
-
   // 注册响应拦截器
   service.interceptors.response.use(async (response) => {
     const res = response.data
@@ -21,6 +17,8 @@ export default function registerDecryptInterceptor (service) {
     const needDecrypt2 = headers.antiEncrypt && res.data
     if (needDecrypt1 || needDecrypt2) {
       // 等待解密iframe加载完成
+      const iframe = createDecryptIframe()
+      cacheIframe = iframe
       const base64Key = res.secretKey
       const cipherText = res.data
       const result = await iframe.doDecrypt(base64Key, cipherText)

File diff suppressed because it is too large
+ 91 - 762
pnpm-lock.yaml


Some files were not shown because too many files changed in this diff