Prechádzať zdrojové kódy

Merge branch 'master' of http://git.cc-lotus.info/Information/technique_web3

lrf 1 rok pred
rodič
commit
9a6ed60301
94 zmenil súbory, kde vykonal 1305 pridanie a 1503 odobranie
  1. BIN
      public/favicon.ico
  2. BIN
      public/images/code.jpg
  3. BIN
      public/images/code.png
  4. BIN
      public/images/logo-jilin.png
  5. BIN
      public/images/logo-jilinbai.png
  6. BIN
      public/images/logo.jpg
  7. BIN
      public/images/map.jpg
  8. BIN
      public/images/map.png
  9. BIN
      public/images/unit.png
  10. 4 0
      src/App.vue
  11. 26 26
      src/assets/icon/iconfont.css
  12. 67 0
      src/components/AdaptiveView/index.vue
  13. 0 0
      src/components/dataV/mixin/autoResize.js
  14. 1 1
      src/views/main/elevenHatch/dataV/myMain.vue
  15. 0 0
      src/components/dataV/util/index.js
  16. 161 92
      src/layout/index.vue
  17. 103 34
      src/layout/site.js
  18. 13 0
      src/styles/variables.scss
  19. 22 22
      src/views/achievement/detail.vue
  20. 6 6
      src/views/achievement/index.vue
  21. 8 8
      src/views/brain/index.vue
  22. 6 6
      src/views/center/index.vue
  23. 2 2
      src/views/center/parts/association.vue
  24. 2 2
      src/views/center/parts/company.vue
  25. 2 2
      src/views/center/parts/competition.vue
  26. 2 2
      src/views/center/parts/expert.vue
  27. 2 2
      src/views/center/parts/incubator.vue
  28. 2 2
      src/views/center/parts/investment.vue
  29. 2 2
      src/views/center/parts/state.vue
  30. 2 2
      src/views/center/parts/unit.vue
  31. 13 13
      src/views/chat/index.vue
  32. 7 7
      src/views/chat/parts/chat.vue
  33. 11 11
      src/views/company/detail.vue
  34. 5 5
      src/views/company/index.vue
  35. 22 22
      src/views/demand/detail.vue
  36. 6 6
      src/views/demand/index.vue
  37. 11 11
      src/views/expert/detail.vue
  38. 8 8
      src/views/expert/index.vue
  39. 3 3
      src/views/help/index.vue
  40. 26 26
      src/views/home/index.vue
  41. 170 202
      src/views/index/index.vue
  42. 4 4
      src/views/industry/parts/four.vue
  43. 1 1
      src/views/industry/parts/one.vue
  44. 2 2
      src/views/industry/parts/two.vue
  45. 22 22
      src/views/innovation/detail.vue
  46. 10 10
      src/views/innovation/index.vue
  47. 3 3
      src/views/journal/detail.vue
  48. 1 1
      src/views/loading/index.vue
  49. 5 5
      src/views/login/index.vue
  50. 2 2
      src/views/main/eight.vue
  51. 88 91
      src/views/main/elevenHatch/index.vue
  52. 2 2
      src/views/main/four.vue
  53. 0 85
      src/views/main/hatch/dataV/mixin/autoResize.js
  54. 0 60
      src/views/main/hatch/dataV/myMain.vue
  55. 0 47
      src/views/main/hatch/dataV/util/index.js
  56. 16 16
      src/views/main/hatch/twelve_1.vue
  57. 102 105
      src/views/main/hatch/twelve_2.vue
  58. 14 14
      src/views/main/one.vue
  59. 1 1
      src/views/main/parts/demand.vue
  60. 1 1
      src/views/main/parts/supply.vue
  61. 4 4
      src/views/main/six.vue
  62. 2 2
      src/views/main/ten.vue
  63. 11 11
      src/views/main/thirteen.vue
  64. 4 4
      src/views/main/thr.vue
  65. 0 85
      src/views/main/twelveHatch/dataV/mixin/autoResize.js
  66. 0 60
      src/views/main/twelveHatch/dataV/myMain.vue
  67. 0 47
      src/views/main/twelveHatch/dataV/util/index.js
  68. BIN
      src/views/main/twelveHatch/images/twelvebBg.png
  69. 80 83
      src/views/main/twelveHatch/index.vue
  70. 3 3
      src/views/news/detail.vue
  71. 14 14
      src/views/news/index.vue
  72. 22 22
      src/views/platform/detail.vue
  73. 22 22
      src/views/project/detail.vue
  74. 10 10
      src/views/project/index.vue
  75. 5 5
      src/views/register/parts/association.vue
  76. 5 5
      src/views/register/parts/company.vue
  77. 5 5
      src/views/register/parts/competition.vue
  78. 5 5
      src/views/register/parts/expert.vue
  79. 5 5
      src/views/register/parts/incubator.vue
  80. 5 5
      src/views/register/parts/investment.vue
  81. 5 5
      src/views/register/parts/state.vue
  82. 5 5
      src/views/register/parts/unit.vue
  83. 3 3
      src/views/register/parts/user.vue
  84. 24 16
      src/views/register/parts/userCode.vue
  85. 2 2
      src/views/release/index.vue
  86. 5 5
      src/views/release/parts/parts/list.vue
  87. 1 1
      src/views/search/index.vue
  88. 5 5
      src/views/search/parts/list.vue
  89. 7 7
      src/views/search/parts/news.vue
  90. 22 22
      src/views/server/detail.vue
  91. 6 6
      src/views/sign/index.vue
  92. 22 22
      src/views/supply/detail.vue
  93. 6 6
      src/views/supply/index.vue
  94. 1 4
      vite.config.js

BIN
public/favicon.ico


BIN
public/images/code.jpg


BIN
public/images/code.png


BIN
public/images/logo-jilin.png


BIN
public/images/logo-jilinbai.png


BIN
public/images/logo.jpg


BIN
public/images/map.jpg


BIN
public/images/map.png


BIN
public/images/unit.png


+ 4 - 0
src/App.vue

@@ -1,10 +1,14 @@
 <script setup>
 import zhCN from 'ant-design-vue/es/locale/zh_CN'
+// import myMain from '@/components/dataV/myMain.vue'
+import AdaptiveView from '@/components/AdaptiveView/index.vue'
 </script>
 
 <template>
   <a-config-provider :locale="zhCN">
+    <!-- <AdaptiveView> -->
     <router-view />
+    <!-- </AdaptiveView> -->
   </a-config-provider>
 </template>
 

+ 26 - 26
src/assets/icon/iconfont.css

@@ -1,12 +1,13 @@
 @font-face {
-  font-family: "iconfont"; /* Project id 4079354 */
-  src: url('iconfont.woff2?t=1685509924120') format('woff2'),
-       url('iconfont.woff?t=1685509924120') format('woff'),
-       url('iconfont.ttf?t=1685509924120') format('truetype');
+  font-family: 'iconfont'; /* Project id 4079354 */
+  src:
+    url('iconfont.woff2?t=1685509924120') format('woff2'),
+    url('iconfont.woff?t=1685509924120') format('woff'),
+    url('iconfont.ttf?t=1685509924120') format('truetype');
 }
 
 .iconfont {
-  font-family: "iconfont" !important;
+  font-family: 'iconfont' !important;
   font-size: 16px;
   font-style: normal;
   -webkit-font-smoothing: antialiased;
@@ -14,82 +15,81 @@
 }
 
 .icon-dengji:before {
-  content: "\e610";
+  content: '\e610';
 }
 
 .icon-shenhezhong:before {
-  content: "\e682";
+  content: '\e682';
 }
 
 .icon-dkw_shenheweitongguo:before {
-  content: "\e604";
+  content: '\e604';
 }
 
 .icon-shenhetongguo:before {
-  content: "\e668";
+  content: '\e668';
 }
 
 .icon-hearts-fill:before {
-  content: "\e702";
+  content: '\e702';
 }
 
 .icon-xiaoyouhui:before {
-  content: "\e601";
+  content: '\e601';
 }
 
 .icon-youjiantou-copy:before {
-  content: "\e654";
+  content: '\e654';
 }
 
 .icon-6ruxueshijian:before {
-  content: "\e88a";
+  content: '\e88a';
 }
 
 .icon-zhuanyezhuanyeke:before {
-  content: "\e6a1";
+  content: '\e6a1';
 }
 
 .icon-commpany:before {
-  content: "\e612";
+  content: '\e612';
 }
 
 .icon-zhiwuguanli:before {
-  content: "\e60f";
+  content: '\e60f';
 }
 
 .icon-guanzhu:before {
-  content: "\e611";
+  content: '\e611';
 }
 
 .icon-guanzhu1:before {
-  content: "\e600";
+  content: '\e600';
 }
 
 .icon-edu-line:before {
-  content: "\e63a";
+  content: '\e63a';
 }
 
 .icon-gender:before {
-  content: "\e63e";
+  content: '\e63e';
 }
 
 .icon-xingming:before {
-  content: "\e640";
+  content: '\e640';
 }
 
 .icon-jibenxinxi:before {
-  content: "\e67c";
+  content: '\e67c';
 }
 
 .icon-iocn_be_concern:before {
-  content: "\e607";
+  content: '\e607';
 }
 
 .icon-tupianshangchuan:before {
-  content: "\e639";
+  content: '\e639';
 }
 
 .icon-wodeguanzhu:before {
-  content: "\e8bc";
+  content: '\e8bc';
 }
-

+ 67 - 0
src/components/AdaptiveView/index.vue

@@ -0,0 +1,67 @@
+<template>
+  <div class="ScreenAdapter" :style="style">
+    <slot></slot>
+  </div>
+</template>
+<script>
+import { onMounted, reactive } from 'vue'
+export default {
+  props: {
+    width: {
+      type: String,
+      default: window.innerWidth - 17
+    },
+    height: {
+      type: String,
+      default: window.innerHeight
+    }
+  },
+  setup(props) {
+    const style = reactive({
+      width: props.width + 'px',
+      height: props.height + 'px',
+      transform: 'scale(1) translate(-50%, -50%)'
+    })
+    const Debounce = (fn, t) => {
+      const delay = t || 500
+      let timer
+      return function () {
+        const args = arguments
+        if (timer) {
+          clearTimeout(timer)
+        }
+        timer = setTimeout(() => {
+          timer = null
+          fn.apply(args)
+        }, delay)
+      }
+    }
+    // 获取放大缩小比例
+    const getScale = () => {
+      const w = window.innerWidth / props.width
+      const h = window.innerHeight / props.height
+      return w < h ? w : h
+    }
+    // 设置比例
+    const setScale = () => {
+      style.transform = 'scale(' + getScale() + ') translate(-50%, -50%)'
+    }
+    onMounted(() => {
+      setScale()
+      window.onresize = Debounce(setScale, 1000)
+    })
+    return {
+      style
+    }
+  }
+}
+</script>
+<style scoped>
+.ScreenAdapter {
+  transform-origin: 0 0;
+  position: absolute;
+  left: 50%;
+  top: 50%;
+  transition: 0.3s;
+}
+</style>

src/views/main/elevenHatch/dataV/mixin/autoResize.js → src/components/dataV/mixin/autoResize.js


+ 1 - 1
src/views/main/elevenHatch/dataV/myMain.vue

@@ -40,7 +40,7 @@ export default {
       this.allWidth = width
       this.allHeight = height
 
-      dom.style.width = `${width - 17}px`
+      dom.style.width = `${width - 20}px`
       dom.style.height = `${height}px`
     },
     setAppScale() {

src/views/main/elevenHatch/dataV/util/index.js → src/components/dataV/util/index.js


+ 161 - 92
src/layout/index.vue

@@ -1,24 +1,19 @@
 <template>
-  <div class="common-layout">
+  <div class="layout">
     <div class="top">
       <div class="w_1200">
         <el-row :gutter="20" align="middle">
           <el-col :span="12" class="top_1">
-            <el-image
-              class="image"
-              v-if="configInfo && configInfo.logoUrl && configInfo.logoUrl.length > 0"
-              :src="configInfo.logoUrl[0].url"
-              fit="fill"
-            />
-            <el-image class="image" v-else :src="siteInfo.logoUrl" fit="fill" />
+            <!-- <el-image class="images" :src="logoUrl" fit="fill" /> -->
+            <el-image class="image" :src="siteInfo.logoUrl" fit="fill" />
             <div class="content">
-              <text class="title">{{ configInfo.zhTitle || siteInfo.zhTitle }}</text>
-              <text class="english">{{ siteInfo.zhBrief }}</text>
+              <text class="title">{{ siteInfo.zhTitle }}</text>
+              <!-- <text class="english">{{ siteInfo.zhBrief }}</text> -->
             </div>
           </el-col>
           <el-col :span="12" v-if="user && user.id" class="top_2">
             <el-dropdown>
-              <el-button size="small" :icon="User" type="primary">
+              <el-button size="medium" :icon="User" type="primary">
                 {{ user.nick_name || '游客' }}
               </el-button>
               <template #dropdown>
@@ -31,32 +26,29 @@
             </el-dropdown>
           </el-col>
           <el-col :span="12" v-else class="top_2">
-            <el-button @click="toLogin(2)" type="primary" size="small">注册</el-button>
-            <el-button @click="toLogin(1)" type="primary" size="small">登录</el-button>
+            <el-button @click="toLogin(2)" type="primary" size="medium">注册</el-button>
+            <el-button @click="toLogin(1)" type="primary" size="medium">登录</el-button>
           </el-col>
         </el-row>
       </div>
       <div class="w_1200">
         <el-col :span="24" class="top_3">
-          <el-menu :default-active="current" mode="horizontal" @select="selectMenu">
-            <template v-for="item in data" :key="item._id">
-              <template v-if="item.type === '0'">
-                <el-sub-menu :index="item._id" :class="[current == item.href ? 'current' : '']">
-                  <template #title>
-                    <span @click="selectMenu(item.href)">{{ item.title }}</span>
-                  </template>
-                  <el-menu-item v-for="tag in item.children" :key="tag._id" :index="tag.href">
-                    <template v-slot:default>
-                      {{ tag.title }}
-                    </template>
-                  </el-menu-item>
-                </el-sub-menu>
-              </template>
-              <template v-else-if="item.type === '1'">
-                <el-menu-item :index="item.href"> {{ item.title }}</el-menu-item>
-              </template>
-            </template>
-          </el-menu>
+          <el-col :span="24" class="list">
+            <span
+              class="text"
+              v-for="(item, index) in data"
+              :key="index"
+              @click="selectMenu(item.route)"
+              :style="{
+                backgroundColor: item.hover ? '#2374ff' : 'transparent',
+                color: item.hover ? '#ffffff' : ''
+              }"
+              @mouseover="handleMouseOver(index)"
+              @mouseleave="handleMouseLeave(index)"
+            >
+              {{ item.title }}
+            </span>
+          </el-col>
         </el-col>
       </div>
     </div>
@@ -67,57 +59,42 @@
     </div>
     <div class="bottom">
       <div class="w_1200 footflex">
-        <el-image
-          class="image"
-          v-if="foot && foot.Unit && foot.Unit.length > 0"
-          :src="foot.Unit[0].url"
-          fit="fill"
-        />
-        <el-image class="image" v-else :src="footInfo.Unit" fit="fill" />
-        <el-col :span="12" class="foot_1">
-          <div class="footTitle">
-            <span>业务洽谈:{{ foot.Phone || footInfo.Phone }}</span>
-            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-            <span>企业邮箱:{{ foot.Email || footInfo.Email }}</span>
-          </div>
-          <div class="footTitle">地 址:{{ foot.Address || footInfo.Address }}</div>
-          <div class="footTitle">版权所有:{{ foot.Copyright || footInfo.Copyright }}</div>
-          <div class="footTitle">技术支持:{{ foot.Company || footInfo.Company }}</div>
-        </el-col>
-        <el-col :span="3" class="foot_2">
-          <div class="footTop">关于我们</div>
-          <div class="footTitle footflex1">
-            <span class="footSpan" @click="toHelp('1')">关于我们</span>
-            <span class="footSpan" @click="toHelp('3')">联系我们</span>
-            <!-- <span class="footSpan" @click="toHelp('2')">意见反馈</span> -->
-          </div>
-          <!-- <div class="footTitle footflex1">
-            <span class="footSpan" @click="toHelp('3')">联系我们</span>
-            <span class="footSpan" @click="toHelp('4')">法律条款</span>
-          </div> -->
-        </el-col>
-        <el-col :span="4" class="foot_3 footflex">
-          <el-image
-            class="image"
-            v-if="foot && foot.Code && foot.Code.length > 0"
-            :src="foot.Code[0].url"
-            fit="fill"
-          />
-          <el-image class="image" v-else :src="footInfo.Code" fit="fill" />
-          <el-image
-            class="image"
-            v-if="foot && foot.Code && foot.Code.length > 0"
-            :src="foot.Code[0].url"
-            fit="fill"
-          />
-          <el-image class="image" v-else :src="footInfo.Code" fit="fill" />
-        </el-col>
+        <!-- <el-row :span="24" class="footflex_1">
+          <el-col :span="2" class="left"> 友情链接</el-col>
+          <el-col :span="22" class="right">
+            <span v-for="(item, index) in footInfo.linkList" :key="index" @click="toLink(item)">{{
+              item.name
+            }}</span>
+          </el-col>
+        </el-row> -->
+        <el-row :span="24" class="footflex_2">
+          <el-col :span="21" class="left">
+            <el-col :span="24" class="left_1">
+              <el-image class="images" :src="logoBottom" fit="fill" />
+            </el-col>
+            <el-col :span="24" class="left_2"> 电话:{{ footInfo.Phone }} </el-col>
+            <el-col :span="24" class="left_2"> 邮箱:{{ footInfo.Email }} </el-col>
+            <el-col :span="24" class="left_2"> 地址:{{ footInfo.Address }} </el-col>
+          </el-col>
+          <el-col :span="3" class="right">
+            <el-col :span="24" class="right_1">
+              <el-image class="images" :src="footInfo.Code" fit="fill" />
+            </el-col>
+            <el-col :span="24" class="right_2" @click="toHelp('1')">关于我们</el-col>
+          </el-col>
+        </el-row>
+        <el-row :span="24" class="footflex_3">
+          {{ footInfo.Copyright }}
+        </el-row>
       </div>
     </div>
   </div>
 </template>
 
 <script setup>
+// 图片引入
+import logoUrl from '/images/logo-jilin.png'
+import logoBottom from '/images/logo-jilinbai.png'
 import { siteInfo, footInfo, menuList } from '@/layout/site'
 // 接口
 import { TagsStore } from '@/store/api/system/tags'
@@ -126,7 +103,6 @@ import { DesignStore } from '@/store/api/platform/design'
 const designStore = DesignStore()
 const router = useRouter()
 const route = useRoute()
-const current = ref(route.name || 'one')
 import { UserStore } from '@/store/user'
 const userStore = UserStore()
 const user = computed(() => userStore.user)
@@ -142,6 +118,10 @@ const search = async () => {
   const res = await store.query({ is_use: '0' })
   // if (res.errcode == '0' && res.total > 0) data.value = res.data
   // else data.value = menuList
+  for (const val of menuList) {
+    if (route.name === val.route) val.hover = true
+    else val.hover = false
+  }
   data.value = menuList
   // 基础设置
   const result = await designStore.query({})
@@ -151,7 +131,10 @@ const search = async () => {
   }
 }
 const selectMenu = (item, query) => {
-  current.value = item
+  for (const val of data.value) {
+    if (route.name === val.route) val.hover = true
+    else val.hover = false
+  }
   router.push({ path: `/${item}`, query })
 }
 // 登录|注册
@@ -173,11 +156,27 @@ const toCommon = (type) => {
   else if (type == '2') router.push('/center')
   else if (type == '3') router.push('/sign')
 }
+const handleMouseOver = (index) => {
+  data.value[index].hover = true
+}
+const handleMouseLeave = (index) => {
+  data.value[index].hover = false
+  const arr = data.value.every((i) => i.hover === false)
+  if (arr) {
+    for (const val of data.value) {
+      if (route.name === val.route) val.hover = true
+      else val.hover = false
+    }
+  }
+}
 // 退出登录
 const toLogout = () => {
   userStore.logOut()
   router.push('/login')
 }
+const toLink = (item) => {
+  window.open(item.href, '_blank') // 在新标签页中打开URL
+}
 watch(
   route,
   (newVal) => {
@@ -195,10 +194,11 @@ provide('selectMenu', selectMenu)
 </script>
 
 <style scoped lang="scss">
-.common-layout {
+.layout {
   .top {
     position: sticky;
     top: 0;
+    padding: 5px 0;
     z-index: 100;
     background: #ffffff;
 
@@ -220,19 +220,23 @@ provide('selectMenu', selectMenu)
         width: 40px;
         margin: 0 5px 0 0;
       }
+      .images {
+        height: auto;
+        width: 335px;
+      }
 
       .content {
         margin: 0 0 0 5px;
 
         .title {
           margin: 0 0 5px 0;
-          font-size: 20px;
+          font-size: $global-font-size-22;
           font-weight: bold;
         }
 
         .english {
           margin: 0 0 0 5px;
-          font-size: 12px;
+          font-size: $global-font-size-14;
           opacity: 0.8;
           color: #1c66e7;
         }
@@ -263,6 +267,17 @@ provide('selectMenu', selectMenu)
     }
     .top_3 {
       margin: 5px 0 0 0;
+      .list {
+        padding: 10px 0;
+        .text {
+          margin: 0 2px 0 0;
+          padding: 10px;
+          font-family: Microsoft YaHei;
+          font-size: $global-font-size-18;
+          color: #333333;
+          cursor: pointer; /* 改变鼠标样式为手形 */
+        }
+      }
     }
   }
   .center {
@@ -271,7 +286,7 @@ provide('selectMenu', selectMenu)
   .bottom {
     width: 100%;
     padding: 7px 0;
-    font-size: 14px;
+    font-size: $global-font-size-20;
     background-color: #2e3546;
     color: #f0f2f5;
     font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial,
@@ -295,21 +310,75 @@ provide('selectMenu', selectMenu)
     }
 
     .footTop {
-      font-size: 18px;
+      font-size: $global-font-size-20;
       margin-bottom: 12px;
     }
   }
 
   .footflex {
-    display: flex;
-    align-items: center;
-    justify-content: space-evenly;
-  }
+    .footflex_1 {
+      display: flex;
+      align-items: flex-end;
+      padding: 30px 0;
+      border-bottom: 1px solid #444444;
+      .left {
+        font-size: $global-font-size-20;
+        font-family: 'Microsoft YaHei';
+        color: rgb(255, 255, 255);
+      }
+      .right {
+        color: #cccccc;
+        font-family: microsoft yahei;
+        font-size: $global-font-size-17;
+        font-weight: normal;
+        text-decoration: none;
+        span {
+          margin-right: 50px;
+        }
+        span:hover {
+          color: rgb(255, 255, 255);
+          cursor: pointer;
+        }
+      }
+    }
+    .footflex_2 {
+      display: flex;
+      padding: 10px 0;
+      border-bottom: 1px solid #444444;
+      .left {
+        font-family: 'Microsoft YaHei';
+        color: rgb(204, 204, 204);
+        font-size: $global-font-size-18;
+        .left_2 {
+          margin: 5px 0 0 0;
+        }
+      }
+      .right {
+        text-align: center;
 
-  .footflex1 {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
+        .right_1 {
+          .image {
+            width: 130px;
+            height: 130px;
+          }
+        }
+        .right_2 {
+          font-family: 'Microsoft YaHei';
+          font-size: $global-font-size-18;
+          color: rgb(204, 204, 204);
+        }
+        .right_2:hover {
+          color: rgb(255, 255, 255);
+          cursor: pointer;
+        }
+      }
+    }
+    .footflex_3 {
+      padding: 10px 0;
+      font-family: 'Microsoft YaHei';
+      font-size: $global-font-size-18;
+      color: rgb(204, 204, 204);
+    }
   }
 }
 </style>

+ 103 - 34
src/layout/site.js

@@ -1,64 +1,133 @@
 // 图片引入
-import logo from '/images/logo.png'
+import logo from '/images/logo.jpg'
 import home from '/images/home.jpg'
-import Code from '/images/code.png'
-import Unit from '/images/unit.png'
+import Code from '/images/code.jpg'
 // 网站基本设置
 export const siteInfo = {
   display: false,
-  zhTitle: '产学研用协同创新平台',
-  zhEnglish: 'Information Technology Incubation Platform',
+  zhTitle: '产学研用协同创新数字化平台',
+  zhEnglish:
+    'Collaborative Innovation Digital Platform for Industry University Research Application',
   zhBrief: '方寸心间 创新无限',
   logoUrl: logo,
-  videoUrl: home
+  vkeyeoUrl: home
 }
 // 网站底部信息
 export const footInfo = {
-  Phone: '0431-81165166',
-  Email: 'jlpstm@126.com',
-  Address: '吉林省长春市硅谷西街156号',
-  Copyright: 'Copyright©2007-2024 吉林省华欣数字科技股份有限公司 │ 吉ICP备14005689号',
-  Company: '吉林省华欣数字科技股份有限公司',
-  Code,
-  Unit
+  linkList: [
+    { name: '吉林省人民政府', href: 'https://www.jl.gov.cn/' },
+    { name: '长春市人民政府', href: 'http://www.changchun.gov.cn/' },
+    { name: '吉林省工信厅', href: 'http://gxt.jl.gov.cn/' },
+    { name: '吉林省国资委', href: 'http://gzw.jl.gov.cn/' },
+    { name: '吉林省财政厅', href: 'http://czt.jl.gov.cn/' },
+    { name: '吉林省金融监管局', href: 'http://jr.jl.gov.cn/' }
+  ],
+  Phone: '0431-81509921',
+  Email: 'gyyzhglb@jlitri.com',
+  Address: '吉林省长春市汽车经济技术开发区兴顺路1366号',
+  Copyright: 'Copyright ©2022  吉林省工业技术研究院集团有限公司  All Rights Reserved ',
+  Company: '吉林省工业技术研究院集团有限公司',
+  Code
 }
 // 目录设置
 export const menuList = [
-  { _id: '1', title: '首页', href: 'one', English: 'Home', type: '1' },
-  { _id: '2', title: '信息发布', href: 'two', English: 'Information Release', type: '1' },
-  { _id: '3', title: '创新中心', href: 'thr', English: 'News Information', type: '1' },
-  { _id: '4', title: '信息检索', href: 'four', English: 'Expert Tank', type: '1' },
-  { _id: '5', title: '双创活动', href: 'five', English: 'Authorized Operator', type: '1' },
-  { _id: '6', title: '中试平台', href: 'six', English: 'Project Selection', type: '1' },
-  { _id: '7', title: '服务支撑', href: 'seven', English: 'Innovation Competition', type: '1' },
-  { _id: '8', title: '产业集群', href: 'eight', English: 'Innovation Competition', type: '1' },
+  { key: '1', title: '首页', route: 'one', English: 'Home', label: '首页' },
+  { key: '2', title: '信息发布', route: 'two', English: 'Information Release', label: '信息发布' },
   {
-    _id: '9',
+    key: '3',
+    title: '创新中心',
+    route: 'thr',
+    English: 'News Information',
+    label: '创新中心',
+    children: [
+      {
+        key: '3-1',
+        title: '全部',
+        label: '全部',
+        route: 'thr'
+      },
+      {
+        key: '3-2',
+        title: '需求中心',
+        label: '需求中心',
+        children: [
+          { key: '3-2-1', route: 'demand', title: '技术需求', label: '技术需求', value: '0' },
+          { key: '3-2-2', route: 'demand', title: '人才需求', label: '人才需求', value: '1' },
+          { key: '3-2-3', route: 'demand', title: '资金需求', label: '资金需求', value: '2' },
+          { key: '3-2-4', route: 'demand', title: '合作伙伴', label: '合作伙伴', value: '3' },
+          { key: '3-2-5', route: 'demand', title: '知识产权', label: '知识产权', value: '4' },
+          { key: '3-2-6', route: 'demand', title: '市场需求', label: '市场需求', value: '5' },
+          { key: '3-2-7', route: 'demand', title: '政策支持', label: '政策支持', value: '6' },
+          { key: '3-2-8', route: 'demand', title: '其他', label: '其他', value: '7' }
+        ]
+      },
+      {
+        key: '3-3',
+        title: '供方中心',
+        label: '供方中心',
+        children: [
+          { key: '3-3-1', route: 'supply', title: '技术支持', label: '技术支持', value: '0' },
+          { key: '3-3-2', route: 'supply', title: '培训教育', label: '培训教育', value: '1' },
+          { key: '3-3-3', route: 'supply', title: '资金支持', label: '资金支持', value: '2' },
+          { key: '3-3-4', route: 'supply', title: '合作机会', label: '合作机会', value: '3' },
+          {
+            key: '3-3-5',
+            route: 'supply',
+            title: '知识产权管理',
+            label: '知识产权管理',
+            value: '4'
+          },
+          { key: '3-3-6', route: 'supply', title: '市场推广', label: '市场推广', value: '5' },
+          { key: '3-3-7', route: 'supply', title: '政策支持', label: '政策支持', value: '6' },
+          { key: '3-3-8', route: 'supply', title: '其他', label: '其他', value: '7' }
+        ]
+      }
+    ]
+  },
+  { key: '4', title: '信息检索', route: 'four', English: 'Expert Tank', label: '信息检索' },
+  { key: '5', title: '双创活动', route: 'five', English: 'Authorized Operator', label: '双创活动' },
+  { key: '6', title: '中试平台', route: 'six', English: 'Project Selection', label: '中试平台' },
+  {
+    key: '7',
+    title: '服务支撑',
+    route: 'seven',
+    English: 'Innovation Competition',
+    label: '服务支撑'
+  },
+  {
+    key: '8',
+    title: '产业集群',
+    route: 'eight',
+    English: 'Innovation Competition',
+    label: '产业集群'
+  },
+  {
+    key: '9',
     title: '成果展示',
-    href: 'nine',
+    route: 'nine',
     English: 'Innovation Competition',
-    type: '1'
+    label: '成果展示'
   },
   {
-    _id: '10',
+    key: '10',
     title: '信息库',
-    href: 'ten',
+    route: 'ten',
     English: 'Innovation Competition',
-    type: '1'
+    label: '信息库'
   },
-  { _id: '11', title: '孵化器', href: 'eleven', English: 'Achievement Display', type: '1' },
+  { key: '11', title: '孵化器', route: 'eleven', English: 'Achievement Display', label: '孵化器' },
   {
-    _id: '12',
+    key: '12',
     title: '产业孵化大脑',
-    href: 'twelve',
+    route: 'twelve',
     English: 'Achievement Display',
-    type: '1'
+    label: '产业孵化大脑'
   },
   {
-    _id: '13',
+    key: '13',
     title: '行研产研',
-    href: 'thirteen',
+    route: 'thirteen',
     English: 'Research Development',
-    type: '1'
+    label: '行研产研'
   }
 ]

+ 13 - 0
src/styles/variables.scss

@@ -0,0 +1,13 @@
+// 全局变量文件,比如命名为 _variables.scss
+$global-font-size-12: 12px;
+$global-font-size-14: 14px;
+$global-font-size-16: 16px;
+$global-font-size-17: 17px;
+$global-font-size-18: 18px;
+$global-font-size-19: 19px;
+$global-font-size-20: 20px;
+$global-font-size-22: 22px;
+$global-font-size-23: 23px;
+$global-font-size-24: 24px;
+$global-font-size-25: 25px;
+$global-font-size-26: 26px;

+ 22 - 22
src/views/achievement/detail.vue

@@ -251,11 +251,11 @@ const toChat = () => {
 }
 // 收藏
 const toCollection = async (status) => {
-  if (user.value._id) {
+  if (user.value.id) {
     let res
     let message
     const data = {
-      user: user.value._id,
+      user: user.value.id,
       source: info.value._id,
       type: 'achievement',
       time: moment().format('YYYY-MM-DD')
@@ -311,7 +311,7 @@ const sizeChange = (limits) => {
       margin: 0 0 10px 0;
 
       .title {
-        font-size: 18px;
+        font-size: $global-font-size-20;
         font-weight: 700;
         color: #383b40;
       }
@@ -321,7 +321,7 @@ const sizeChange = (limits) => {
         align-items: center;
         justify-content: end;
         font-family: PingFangSC-Regular;
-        font-size: 14px;
+        font-size: $global-font-size-16;
         color: #2374ff;
         text-align: right;
         span {
@@ -332,12 +332,12 @@ const sizeChange = (limits) => {
 
     .one_2 {
       display: inline-block;
-      font-size: 12px;
+      font-size: $global-font-size-14;
       background: rgba(18, 172, 117, 0.05);
       color: #12ac75;
       padding: 0 15px;
       height: 20px;
-      line-height: 20px;
+      line-height: $global-font-size-14;
       border-radius: 10px;
       margin-bottom: 2px;
     }
@@ -349,9 +349,9 @@ const sizeChange = (limits) => {
     padding: 30px;
     margin: 34px 0 20px;
     font-family: PingFangSC-Medium;
-    font-size: 14px;
+    font-size: $global-font-size-16;
     color: #383b40;
-    line-height: 14px;
+    line-height: $global-font-size-16;
   }
 
   .thr {
@@ -371,7 +371,7 @@ const sizeChange = (limits) => {
         height: 40px;
         border-bottom: 2px solid #2374ff;
         color: #fff;
-        font-size: 18px;
+        font-size: $global-font-size-20;
         background: #2374ff;
       }
     }
@@ -390,9 +390,9 @@ const sizeChange = (limits) => {
         .name {
           height: 20px;
           font-family: PingFangSC-Semibold;
-          font-size: 18px;
+          font-size: $global-font-size-20;
           color: #383b40;
-          line-height: 20px;
+          line-height: $global-font-size-20;
           font-weight: 700;
           margin-bottom: 8px;
         }
@@ -400,17 +400,17 @@ const sizeChange = (limits) => {
         .other {
           height: 14px;
           font-family: PingFangSC-Medium;
-          font-size: 14px;
+          font-size: $global-font-size-16;
           color: #383b40;
-          line-height: 14px;
+          line-height: $global-font-size-16;
           font-weight: 700;
 
           span {
             height: 14px;
             font-family: PingFangSC-Regular;
-            font-size: 14px;
+            font-size: $global-font-size-16;
             color: #7e8288;
-            line-height: 14px;
+            line-height: $global-font-size-16;
             font-weight: 400;
             margin-right: 16px;
           }
@@ -445,7 +445,7 @@ const sizeChange = (limits) => {
         height: 40px;
         border-bottom: 2px solid #2374ff;
         color: #fff;
-        font-size: 18px;
+        font-size: $global-font-size-20;
         background: #2374ff;
       }
     }
@@ -464,7 +464,7 @@ const sizeChange = (limits) => {
         transition: all 0.3s;
         padding: 15px;
         .name {
-          font-size: 16px;
+          font-size: $global-font-size-18;
           color: #121834;
           height: 16px;
           line-height: 13px;
@@ -477,9 +477,9 @@ const sizeChange = (limits) => {
         }
 
         .two_1 {
-          font-size: 12px;
+          font-size: $global-font-size-14;
           text-align: justify;
-          line-height: 12px;
+          line-height: $global-font-size-14;
           font-weight: 400;
           letter-spacing: 0;
           color: #8f97a3;
@@ -512,16 +512,16 @@ const sizeChange = (limits) => {
     align-items: center;
     justify-content: flex-end;
     font-family: PingFangSC-Regular;
-    font-size: 14px;
+    font-size: $global-font-size-16;
     color: #7e8288;
     margin: 10px 0 0 0;
     .money {
       margin: 0 10px 0 0;
       span {
         font-family: PingFangSC-Semibold;
-        font-size: 20px;
+        font-size: $global-font-size-20;
         color: #e94643;
-        line-height: 20px;
+        line-height: $global-font-size-20;
       }
     }
   }

+ 6 - 6
src/views/achievement/index.vue

@@ -552,7 +552,7 @@ const sizeChange = (limits) => {
             margin-right: 10px;
             background-color: #fff;
             padding: 5px;
-            font-size: 14px;
+            font-size: $global-font-size-16;
             .left {
               padding: 10px;
             }
@@ -611,7 +611,7 @@ const sizeChange = (limits) => {
         }
         .title {
           color: #666;
-          font-size: 14px;
+          font-size: $global-font-size-16;
           line-height: 15px;
           margin: 0 10px;
           display: inline-block;
@@ -625,7 +625,7 @@ const sizeChange = (limits) => {
       }
       .button {
         color: #2374ff;
-        font-size: 12px;
+        font-size: $global-font-size-14;
         cursor: pointer;
       }
     }
@@ -644,7 +644,7 @@ const sizeChange = (limits) => {
 
       .name {
         color: #337ab7;
-        font-size: 18px;
+        font-size: $global-font-size-20;
         font-weight: bold;
         display: inline-block;
         margin: 10px 0;
@@ -661,7 +661,7 @@ const sizeChange = (limits) => {
         .other_1 {
           font-family: 'PingFangSC-Light', 'Microsoft YaHei', 'WenQuanYi Micro Hei', arial,
             sans-serif;
-          font-size: 12px;
+          font-size: $global-font-size-14;
           font-weight: normal;
         }
 
@@ -674,7 +674,7 @@ const sizeChange = (limits) => {
       .brief {
         line-height: 30px;
         color: #666;
-        font-size: 14px;
+        font-size: $global-font-size-16;
         cursor: pointer;
       }
     }

+ 8 - 8
src/views/brain/index.vue

@@ -214,7 +214,7 @@ const sizeChange = (limits) => {
           margin: 0 0 0 10px;
           .right_1 {
             height: 24px;
-            font-size: 18px;
+            font-size: $global-font-size-20;
             font-family:
               PingFangSC-Medium,
               PingFang SC;
@@ -228,7 +228,7 @@ const sizeChange = (limits) => {
             margin-bottom: 20px;
             height: 48px;
             overflow: hidden;
-            font-size: 14px;
+            font-size: $global-font-size-16;
             font-family:
               PingFangSC-Regular,
               PingFang SC;
@@ -238,13 +238,13 @@ const sizeChange = (limits) => {
             cursor: pointer;
           }
           .right_3 {
-            font-size: 12px;
+            font-size: $global-font-size-14;
             font-family:
               PingFangSC-Regular,
               PingFang SC;
             font-weight: 400;
             color: #999;
-            line-height: 12px;
+            line-height: $global-font-size-14;
             cursor: pointer;
           }
           .right_1:hover {
@@ -266,7 +266,7 @@ const sizeChange = (limits) => {
         box-sizing: border-box;
         margin-bottom: 7px;
         .left {
-          font-size: 24px;
+          font-size: $global-font-size-26;
           font-family:
             PingFangSC-Medium,
             PingFang SC;
@@ -276,7 +276,7 @@ const sizeChange = (limits) => {
         }
         .right {
           text-align: right;
-          font-size: 14px;
+          font-size: $global-font-size-16;
           font-family:
             PingFangSC-Regular,
             PingFang SC;
@@ -289,7 +289,7 @@ const sizeChange = (limits) => {
         margin: 10px 0 0 0;
         .name {
           max-height: 48px;
-          font-size: 14px;
+          font-size: $global-font-size-16;
           font-family:
             PingFangSC-Medium,
             PingFang SC;
@@ -301,7 +301,7 @@ const sizeChange = (limits) => {
         }
         .time {
           margin-top: 8px;
-          font-size: 12px;
+          font-size: $global-font-size-14;
           font-family:
             PingFangSC-Medium,
             PingFang SC;

+ 6 - 6
src/views/center/index.vue

@@ -218,8 +218,8 @@ onMounted(async () => {
   loading.value = false
 })
 const search = async () => {
-  if (user.value._id) {
-    let res = await store.detail(user.value._id)
+  if (user.value.id) {
+    let res = await store.detail(user.value.id)
     if (res.errcode == '0') form.value = res.data
   }
 }
@@ -280,7 +280,7 @@ const submit = async (formEl) => {
       const data = cloneDeep(secondForm.value)
       const res = await loginStore.rp({
         type: 'User',
-        _id: user.value._id,
+        _id: user.value.id,
         password: data.password
       })
       if ($checkRes(res, true)) {
@@ -316,14 +316,14 @@ provide('contributionList', contributionList)
     padding: 20px;
     border-radius: 10px;
     .one_1 {
-      line-height: 20px;
-      font-size: 16px;
+      line-height: $global-font-size-18;
+      font-size: $global-font-size-18;
       font-weight: 500;
       border-bottom: 1px solid #f9f9f9;
       padding: 10px 0;
       span {
         color: red;
-        font-size: 12px;
+        font-size: $global-font-size-14;
       }
     }
     .one_2 {

+ 2 - 2
src/views/center/parts/association.vue

@@ -107,8 +107,8 @@ onMounted(async () => {
   await search()
 })
 const search = async () => {
-  if (user.value._id) {
-    let res = await associationStore.query({ user: user.value._id })
+  if (user.value.id) {
+    let res = await associationStore.query({ user: user.value.id })
     if (res.errcode == '0') form.value = res.data[0]
   }
 }

+ 2 - 2
src/views/center/parts/company.vue

@@ -214,8 +214,8 @@ onMounted(async () => {
   await search()
 })
 const search = async () => {
-  if (user.value._id) {
-    let res = await companyStore.query({ user: user.value._id })
+  if (user.value.id) {
+    let res = await companyStore.query({ user: user.value.id })
     if (res.errcode == '0') form.value = res.data[0]
   }
 }

+ 2 - 2
src/views/center/parts/competition.vue

@@ -107,8 +107,8 @@ onMounted(async () => {
   await search()
 })
 const search = async () => {
-  if (user.value._id) {
-    let res = await competitionStore.query({ user: user.value._id })
+  if (user.value.id) {
+    let res = await competitionStore.query({ user: user.value.id })
     if (res.errcode == '0') form.value = res.data[0]
   }
 }

+ 2 - 2
src/views/center/parts/expert.vue

@@ -204,8 +204,8 @@ onMounted(async () => {
   await search()
 })
 const search = async () => {
-  if (user.value._id) {
-    let res = await expertStore.query({ user: user.value._id })
+  if (user.value.id) {
+    let res = await expertStore.query({ user: user.value.id })
     if (res.errcode == '0') form.value = res.data[0]
   }
 }

+ 2 - 2
src/views/center/parts/incubator.vue

@@ -107,8 +107,8 @@ onMounted(async () => {
   await search()
 })
 const search = async () => {
-  if (user.value._id) {
-    let res = await incubatorStore.query({ user: user.value._id })
+  if (user.value.id) {
+    let res = await incubatorStore.query({ user: user.value.id })
     if (res.errcode == '0') form.value = res.data[0]
   }
 }

+ 2 - 2
src/views/center/parts/investment.vue

@@ -135,8 +135,8 @@ onMounted(async () => {
   await search()
 })
 const search = async () => {
-  if (user.value._id) {
-    let res = await investmentStore.query({ user: user.value._id })
+  if (user.value.id) {
+    let res = await investmentStore.query({ user: user.value.id })
     if (res.errcode == '0') form.value = res.data[0]
   }
 }

+ 2 - 2
src/views/center/parts/state.vue

@@ -121,8 +121,8 @@ onMounted(async () => {
   await search()
 })
 const search = async () => {
-  if (user.value._id) {
-    let res = await stateStore.query({ user: user.value._id })
+  if (user.value.id) {
+    let res = await stateStore.query({ user: user.value.id })
     if (res.errcode == '0') form.value = res.data[0]
   }
 }

+ 2 - 2
src/views/center/parts/unit.vue

@@ -107,8 +107,8 @@ onMounted(async () => {
   await search()
 })
 const search = async () => {
-  if (user.value._id) {
-    let res = await unitStore.query({ user: user.value._id })
+  if (user.value.id) {
+    let res = await unitStore.query({ user: user.value.id })
     if (res.errcode == '0') form.value = res.data[0]
   }
 }

+ 13 - 13
src/views/chat/index.vue

@@ -130,8 +130,8 @@ const wsMessage = async (data) => {
   const dataJson = data
   if (dataJson && dataJson._id) {
     if (
-      (dataJson.sender_id == user.value._id && dataJson.receiver_id == id.value) ||
-      (dataJson.sender_id == id.value && dataJson.receiver_id == user.value._id)
+      (dataJson.sender_id == user.value.id && dataJson.receiver_id == id.value) ||
+      (dataJson.sender_id == id.value && dataJson.receiver_id == user.value.id)
     ) {
       await searchList()
       list.value.push(dataJson)
@@ -164,7 +164,7 @@ const searchList = async () => {
 const toView = async (item) => {
   id.value = item._id
   info.value = item
-  await chatstore.read({ sender_id: user.value._id, receiver_id: id.value })
+  await chatstore.read({ sender_id: user.value.id, receiver_id: id.value })
   await searchList()
   await searchChat({ skip, limit })
 }
@@ -181,7 +181,7 @@ const searchChat = async (query = { skip: 0, limit }) => {
 }
 const toSend = async () => {
   const data = {
-    sender_id: user.value._id,
+    sender_id: user.value.id,
     receiver_id: id.value,
     type: '0',
     content: textarea.value,
@@ -224,7 +224,7 @@ provide('toSend', toSend)
           margin: 0 0 0 10px;
           white-space: nowrap;
           color: #fff;
-          font-size: 16px;
+          font-size: $global-font-size-18;
         }
       }
       .one_2 {
@@ -240,7 +240,7 @@ provide('toSend', toSend)
           position: relative;
           caret-color: #fff;
           color: #fff;
-          font-size: 14px;
+          font-size: $global-font-size-16;
           padding: 6px 0;
           border: none;
           outline: none;
@@ -267,7 +267,7 @@ provide('toSend', toSend)
             padding: 0 10px 10px 0;
             .name {
               color: #fff;
-              font-size: 14px;
+              font-size: $global-font-size-16;
             }
             .time {
               color: #51555e;
@@ -313,7 +313,7 @@ provide('toSend', toSend)
       flex-direction: row;
       align-items: center;
       justify-content: center;
-      font-size: 14px;
+      font-size: $global-font-size-16;
       color: rgba(0, 0, 0, 0.45);
     }
 
@@ -332,8 +332,8 @@ provide('toSend', toSend)
         position: relative;
         max-width: 330px;
         border-radius: 4px;
-        font-size: 14px;
-        line-height: 22px;
+        font-size: $global-font-size-16;
+        line-height: $global-font-size-24;
         box-sizing: border-box;
         color: rgba(0, 0, 0, 0.65);
         padding: 16px 11px 16px 16px;
@@ -359,8 +359,8 @@ provide('toSend', toSend)
       border: none;
       outline: none;
       background: transparent;
-      font-size: 14px;
-      line-height: 22px;
+      font-size: $global-font-size-16;
+      line-height: $global-font-size-24;
     }
 
     .button {
@@ -377,7 +377,7 @@ provide('toSend', toSend)
         border-radius: 4px;
         width: 64px;
         height: 32px;
-        font-size: 14px;
+        font-size: $global-font-size-16;
         display: flex;
         align-items: center;
         justify-content: center;

+ 7 - 7
src/views/chat/parts/chat.vue

@@ -82,7 +82,7 @@ const toSend = inject('toSend')
       white-space: nowrap;
       word-break: break-all;
       display: inline-block;
-      font-size: 16px;
+      font-size: $global-font-size-18;
       color: grey;
     }
     .Main {
@@ -90,7 +90,7 @@ const toSend = inject('toSend')
       .list {
         .time {
           width: 100%;
-          font-size: 12px;
+          font-size: $global-font-size-14;
           margin: 7px auto;
           text-align: center;
           color: #a3a7ae;
@@ -127,11 +127,11 @@ const toSend = inject('toSend')
               padding-bottom: 5px;
               color: #a3a7ae;
               display: inline-block;
-              font-size: 12px;
+              font-size: $global-font-size-14;
             }
             .content {
               width: fit-content;
-              font-size: 14px;
+              font-size: $global-font-size-16;
               color: #333;
               background: rgb(255, 255, 255);
               padding: 12px;
@@ -156,8 +156,8 @@ const toSend = inject('toSend')
           display: block;
           box-sizing: border-box;
           padding: 0 8px 0 17px;
-          font-size: 14px;
-          line-height: 22px;
+          font-size: $global-font-size-16;
+          line-height: $global-font-size-24;
           background: #eee;
           overflow: auto;
           border: none;
@@ -180,7 +180,7 @@ const toSend = inject('toSend')
     width: 100%;
     border-radius: 0 5px 5px 0;
     color: #a3a7ae;
-    font-size: 16px;
+    font-size: $global-font-size-18;
   }
 }
 </style>

+ 11 - 11
src/views/company/detail.vue

@@ -236,11 +236,11 @@ const toChat = () => {
 }
 // 收藏
 const toCollection = async (status) => {
-  if (user.value._id) {
+  if (user.value.id) {
     let res
     let message
     const data = {
-      user: user.value._id,
+      user: user.value.id,
       source: info.value._id,
       type: 'company',
       time: moment().format('YYYY-MM-DD')
@@ -314,7 +314,7 @@ const sizeChange = (limits) => {
           .name {
             margin: 0 10px 0 0;
             word-break: break-all;
-            font-size: 18px;
+            font-size: $global-font-size-20;
             font-family:
               PingFangSC-Regular,
               PingFang SC;
@@ -332,7 +332,7 @@ const sizeChange = (limits) => {
             display: flex;
           }
           .time {
-            font-size: 14px;
+            font-size: $global-font-size-16;
             font-family:
               PingFangSC-Regular,
               PingFang SC;
@@ -347,7 +347,7 @@ const sizeChange = (limits) => {
                 display: flex;
                 align-items: center;
                 font-family: PingFangSC-Regular;
-                font-size: 14px;
+                font-size: $global-font-size-16;
                 color: #2374ff;
                 span {
                   margin: 0 0 0 5px;
@@ -365,7 +365,7 @@ const sizeChange = (limits) => {
         .right_3 {
           display: flex;
           margin: 10px 0;
-          font-size: 14px;
+          font-size: $global-font-size-16;
           font-family:
             PingFangSC-Regular,
             PingFang SC;
@@ -385,10 +385,10 @@ const sizeChange = (limits) => {
       border: 1px solid #edeff2;
 
       .title {
-        font-size: 20px;
+        font-size: $global-font-size-20;
         color: #383b40;
         letter-spacing: 0;
-        line-height: 20px;
+        line-height: $global-font-size-20;
         font-weight: 600;
         margin-bottom: 30px;
       }
@@ -407,7 +407,7 @@ const sizeChange = (limits) => {
           transition: all 0.3s;
           padding: 15px;
           .name {
-            font-size: 16px;
+            font-size: $global-font-size-18;
             color: #121834;
             height: 16px;
             line-height: 13px;
@@ -420,9 +420,9 @@ const sizeChange = (limits) => {
           }
 
           .two_1 {
-            font-size: 12px;
+            font-size: $global-font-size-14;
             text-align: justify;
-            line-height: 12px;
+            line-height: $global-font-size-14;
             font-weight: 400;
             letter-spacing: 0;
             color: #8f97a3;

+ 5 - 5
src/views/company/index.vue

@@ -494,7 +494,7 @@ const sizeChange = (limits) => {
             margin-right: 10px;
             background-color: #fff;
             padding: 5px;
-            font-size: 14px;
+            font-size: $global-font-size-16;
             .left {
               padding: 10px;
             }
@@ -553,7 +553,7 @@ const sizeChange = (limits) => {
         }
         .title {
           color: #666;
-          font-size: 14px;
+          font-size: $global-font-size-16;
           line-height: 15px;
           margin: 0 10px;
           display: inline-block;
@@ -567,7 +567,7 @@ const sizeChange = (limits) => {
       }
       .button {
         color: #2374ff;
-        font-size: 12px;
+        font-size: $global-font-size-14;
         cursor: pointer;
       }
     }
@@ -601,7 +601,7 @@ const sizeChange = (limits) => {
           .name {
             margin: 0 10px 0 0;
             word-break: break-all;
-            font-size: 18px;
+            font-size: $global-font-size-20;
             font-family:
               PingFangSC-Regular,
               PingFang SC;
@@ -628,7 +628,7 @@ const sizeChange = (limits) => {
         .right_3 {
           display: flex;
           margin: 10px 0;
-          font-size: 14px;
+          font-size: $global-font-size-16;
           font-family:
             PingFangSC-Regular,
             PingFang SC;

+ 22 - 22
src/views/demand/detail.vue

@@ -233,11 +233,11 @@ const toDocking = () => {
 }
 // 收藏
 const toCollection = async (status) => {
-  if (user.value._id) {
+  if (user.value.id) {
     let res
     let message
     const data = {
-      user: user.value._id,
+      user: user.value.id,
       source: info.value._id,
       type: 'demand',
       time: moment().format('YYYY-MM-DD')
@@ -296,7 +296,7 @@ const sizeChange = (limits) => {
       margin: 0 0 10px 0;
 
       .title {
-        font-size: 18px;
+        font-size: $global-font-size-20;
         font-weight: 700;
         color: #383b40;
       }
@@ -306,7 +306,7 @@ const sizeChange = (limits) => {
         align-items: center;
         justify-content: flex-end;
         font-family: PingFangSC-Regular;
-        font-size: 14px;
+        font-size: $global-font-size-16;
         color: #2374ff;
         text-align: right;
         span {
@@ -317,12 +317,12 @@ const sizeChange = (limits) => {
 
     .one_2 {
       display: inline-block;
-      font-size: 12px;
+      font-size: $global-font-size-14;
       background: rgba(18, 172, 117, 0.05);
       color: #12ac75;
       padding: 0 15px;
       height: 20px;
-      line-height: 20px;
+      line-height: $global-font-size-14;
       border-radius: 10px;
       margin-bottom: 2px;
     }
@@ -334,9 +334,9 @@ const sizeChange = (limits) => {
     padding: 30px;
     margin: 34px 0 20px;
     font-family: PingFangSC-Medium;
-    font-size: 14px;
+    font-size: $global-font-size-16;
     color: #383b40;
-    line-height: 14px;
+    line-height: $global-font-size-16;
   }
 
   .thr {
@@ -356,7 +356,7 @@ const sizeChange = (limits) => {
         height: 40px;
         border-bottom: 2px solid #2374ff;
         color: #fff;
-        font-size: 18px;
+        font-size: $global-font-size-20;
         background: #2374ff;
       }
     }
@@ -375,9 +375,9 @@ const sizeChange = (limits) => {
         .name {
           height: 20px;
           font-family: PingFangSC-Semibold;
-          font-size: 18px;
+          font-size: $global-font-size-20;
           color: #383b40;
-          line-height: 20px;
+          line-height: $global-font-size-20;
           font-weight: 700;
           margin-bottom: 8px;
         }
@@ -385,17 +385,17 @@ const sizeChange = (limits) => {
         .other {
           height: 14px;
           font-family: PingFangSC-Medium;
-          font-size: 14px;
+          font-size: $global-font-size-16;
           color: #383b40;
-          line-height: 14px;
+          line-height: $global-font-size-16;
           font-weight: 700;
 
           span {
             height: 14px;
             font-family: PingFangSC-Regular;
-            font-size: 14px;
+            font-size: $global-font-size-16;
             color: #7e8288;
-            line-height: 14px;
+            line-height: $global-font-size-16;
             font-weight: 400;
             margin-right: 10px;
           }
@@ -426,7 +426,7 @@ const sizeChange = (limits) => {
         height: 40px;
         border-bottom: 2px solid #2374ff;
         color: #fff;
-        font-size: 18px;
+        font-size: $global-font-size-20;
         background: #2374ff;
       }
     }
@@ -445,7 +445,7 @@ const sizeChange = (limits) => {
         transition: all 0.3s;
         padding: 15px;
         .name {
-          font-size: 16px;
+          font-size: $global-font-size-18;
           color: #121834;
           height: 16px;
           line-height: 13px;
@@ -458,9 +458,9 @@ const sizeChange = (limits) => {
         }
 
         .two_1 {
-          font-size: 12px;
+          font-size: $global-font-size-14;
           text-align: justify;
-          line-height: 12px;
+          line-height: $global-font-size-14;
           font-weight: 400;
           letter-spacing: 0;
           color: #8f97a3;
@@ -493,16 +493,16 @@ const sizeChange = (limits) => {
     align-items: center;
     justify-content: flex-end;
     font-family: PingFangSC-Regular;
-    font-size: 14px;
+    font-size: $global-font-size-16;
     color: #7e8288;
     margin: 10px 0 0 0;
     .money {
       margin: 0 10px 0 0;
       span {
         font-family: PingFangSC-Semibold;
-        font-size: 20px;
+        font-size: $global-font-size-20;
         color: #e94643;
-        line-height: 20px;
+        line-height: $global-font-size-20;
       }
     }
   }

+ 6 - 6
src/views/demand/index.vue

@@ -428,7 +428,7 @@ const sizeChange = (limits) => {
             margin-right: 10px;
             background-color: #fff;
             padding: 5px;
-            font-size: 14px;
+            font-size: $global-font-size-16;
             .left {
               padding: 10px;
             }
@@ -484,7 +484,7 @@ const sizeChange = (limits) => {
         }
         .title {
           color: #666;
-          font-size: 14px;
+          font-size: $global-font-size-16;
           line-height: 15px;
           margin: 0 10px;
           display: inline-block;
@@ -498,7 +498,7 @@ const sizeChange = (limits) => {
       }
       .button {
         color: #2374ff;
-        font-size: 12px;
+        font-size: $global-font-size-14;
         cursor: pointer;
       }
     }
@@ -517,7 +517,7 @@ const sizeChange = (limits) => {
 
       .name {
         color: #337ab7;
-        font-size: 18px;
+        font-size: $global-font-size-20;
         font-weight: bold;
         display: inline-block;
         margin: 10px 0;
@@ -534,7 +534,7 @@ const sizeChange = (limits) => {
         .other_1 {
           font-family: 'PingFangSC-Light', 'Microsoft YaHei', 'WenQuanYi Micro Hei', arial,
             sans-serif;
-          font-size: 12px;
+          font-size: $global-font-size-14;
           font-weight: normal;
         }
 
@@ -547,7 +547,7 @@ const sizeChange = (limits) => {
       .brief {
         line-height: 30px;
         color: #666;
-        font-size: 14px;
+        font-size: $global-font-size-16;
         cursor: pointer;
       }
     }

+ 11 - 11
src/views/expert/detail.vue

@@ -201,11 +201,11 @@ const toChat = () => {
 }
 // 收藏
 const toCollection = async (status) => {
-  if (user.value._id) {
+  if (user.value.id) {
     let res
     let message
     const data = {
-      user: user.value._id,
+      user: user.value.id,
       source: info.value._id,
       type: 'expert',
       time: moment().format('YYYY-MM-DD')
@@ -275,7 +275,7 @@ const sizeChange = (limits) => {
         .name {
           display: flex;
           align-items: center;
-          font-size: 16px;
+          font-size: $global-font-size-18;
           color: #121834;
           font-weight: 500;
           margin: 5px 0 0 0;
@@ -291,9 +291,9 @@ const sizeChange = (limits) => {
           color: #2374ff;
         }
         .other {
-          font-size: 12px;
+          font-size: $global-font-size-14;
           text-align: justify;
-          line-height: 12px;
+          line-height: $global-font-size-14;
           font-weight: 400;
           letter-spacing: 0;
           color: #8f97a3;
@@ -313,7 +313,7 @@ const sizeChange = (limits) => {
           align-items: center;
           justify-content: center;
           font-family: PingFangSC-Regular;
-          font-size: 14px;
+          font-size: $global-font-size-16;
           color: #2374ff;
           span {
             margin: 0 0 0 5px;
@@ -327,10 +327,10 @@ const sizeChange = (limits) => {
       margin: 10px 0;
       border: 1px solid #edeff2;
       .title {
-        font-size: 20px;
+        font-size: $global-font-size-20;
         color: #383b40;
         letter-spacing: 0;
-        line-height: 20px;
+        line-height: $global-font-size-20;
         font-weight: 600;
         margin-bottom: 30px;
       }
@@ -349,7 +349,7 @@ const sizeChange = (limits) => {
           transition: all 0.3s;
           padding: 15px;
           .name {
-            font-size: 16px;
+            font-size: $global-font-size-18;
             color: #121834;
             height: 16px;
             line-height: 13px;
@@ -362,9 +362,9 @@ const sizeChange = (limits) => {
           }
 
           .two_1 {
-            font-size: 12px;
+            font-size: $global-font-size-14;
             text-align: justify;
-            line-height: 12px;
+            line-height: $global-font-size-14;
             font-weight: 400;
             letter-spacing: 0;
             color: #8f97a3;

+ 8 - 8
src/views/expert/index.vue

@@ -441,7 +441,7 @@ const sizeChange = (limits) => {
             margin-right: 10px;
             background-color: #fff;
             padding: 5px;
-            font-size: 14px;
+            font-size: $global-font-size-16;
             .left {
               padding: 10px;
             }
@@ -497,7 +497,7 @@ const sizeChange = (limits) => {
         }
         .title {
           color: #666;
-          font-size: 14px;
+          font-size: $global-font-size-16;
           line-height: 15px;
           margin: 0 10px;
           display: inline-block;
@@ -511,7 +511,7 @@ const sizeChange = (limits) => {
       }
       .button {
         color: #2374ff;
-        font-size: 12px;
+        font-size: $global-font-size-14;
         cursor: pointer;
       }
     }
@@ -533,7 +533,7 @@ const sizeChange = (limits) => {
       .name {
         display: flex;
         align-items: center;
-        font-size: 16px;
+        font-size: $global-font-size-18;
         color: #121834;
         font-weight: 500;
         margin: 5px 0 0 0;
@@ -550,9 +550,9 @@ const sizeChange = (limits) => {
       }
 
       .two_1 {
-        font-size: 12px;
+        font-size: $global-font-size-14;
         text-align: justify;
-        line-height: 12px;
+        line-height: $global-font-size-14;
         font-weight: 400;
         letter-spacing: 0;
         color: #8f97a3;
@@ -567,10 +567,10 @@ const sizeChange = (limits) => {
         margin: 10px;
         text-align: right;
         .button {
-          font-size: 12px;
+          font-size: $global-font-size-14;
           color: #fff;
           text-align: center;
-          line-height: 12px;
+          line-height: $global-font-size-14;
           font-weight: 500;
           padding: 5px 12px;
           background: #2374ff;

+ 3 - 3
src/views/help/index.vue

@@ -61,7 +61,7 @@ const $checkRes = inject('$checkRes')
 import { DesignStore } from '@/store/api/platform/design'
 const designStore = DesignStore()
 // 图片引入
-import map from '/images/map.jpg'
+import map from '/images/map.png'
 const route = useRoute()
 // 加载中
 const loading = ref(false)
@@ -132,13 +132,13 @@ const onOpenChange = (item) => {
       .other {
         margin-bottom: 10px;
         font-family: PingFangSC-Regular;
-        font-size: 14px;
+        font-size: $global-font-size-16;
         color: #7e8288;
         line-height: 25px;
 
         span {
           font-family: PingFangSC-Regular;
-          font-size: 14px;
+          font-size: $global-font-size-16;
           color: #383b40;
           line-height: 25px;
           margin: 0 5px;

+ 26 - 26
src/views/home/index.vue

@@ -681,7 +681,7 @@ const onSearch = (data) => {
         height: 45px;
         line-height: 45px;
         font-family: PingFangSC-Regular;
-        font-size: 16px;
+        font-size: $global-font-size-18;
         padding-right: 24px;
         color: #fff;
         border: none !important;
@@ -703,7 +703,7 @@ const onSearch = (data) => {
       justify-content: space-between;
       margin: 0 0 10px 0;
       .left {
-        font-size: 24px;
+        font-size: $global-font-size-26;
         font-family:
           PingFangSC-Semibold,
           PingFang SC;
@@ -713,13 +713,13 @@ const onSearch = (data) => {
       }
       .right {
         text-align: right;
-        font-size: 14px;
+        font-size: $global-font-size-16;
         font-family:
           PingFangSC-Regular,
           PingFang SC;
         font-weight: 400;
         color: #2280ff;
-        line-height: 14px;
+        line-height: $global-font-size-16;
         display: block;
         margin-top: 13px;
         margin-right: 34px;
@@ -742,13 +742,13 @@ const onSearch = (data) => {
             height: 20px;
           }
           .title {
-            font-size: 16px;
+            font-size: $global-font-size-18;
             font-family:
               PingFangSC-Regular,
               PingFang SC;
             font-weight: 400;
             color: #111;
-            line-height: 22px;
+            line-height: $global-font-size-24;
           }
         }
         .list:hover {
@@ -780,13 +780,13 @@ const onSearch = (data) => {
           .name {
             display: flex;
             align-items: center;
-            font-size: 16px;
+            font-size: $global-font-size-18;
             font-family:
               PingFangSC-Medium,
               PingFang SC;
             font-weight: 500;
             color: #111;
-            line-height: 16px;
+            line-height: $global-font-size-18;
             display: block;
             margin: 5px 0 12px 0;
           }
@@ -795,7 +795,7 @@ const onSearch = (data) => {
             cursor: pointer;
           }
           .brief {
-            font-size: 14px;
+            font-size: $global-font-size-16;
             font-family:
               PingFangSC-Regular,
               PingFang SC;
@@ -808,24 +808,24 @@ const onSearch = (data) => {
           .info {
             display: flex;
             justify-content: space-between;
-            font-size: 12px;
+            font-size: $global-font-size-14;
             font-family:
               PingFangSC-Regular,
               PingFang SC;
             font-weight: 400;
             color: #666;
-            line-height: 12px;
+            line-height: $global-font-size-14;
             margin-bottom: 15px;
             cursor: pointer;
           }
           .key {
-            font-size: 12px;
+            font-size: $global-font-size-14;
             font-family:
               PingFangSC-Regular,
               PingFang SC;
             font-weight: 400;
             color: #999990;
-            line-height: 20px;
+            line-height: $global-font-size-14;
             height: 22px;
             border-radius: 2px;
             border: 1px solid #dbdbdb;
@@ -852,7 +852,7 @@ const onSearch = (data) => {
         background-image: linear-gradient(90deg, #2171f6 0, #619bf5 100%);
         line-height: 50px;
         color: #ffffff;
-        font-size: 16px;
+        font-size: $global-font-size-18;
 
         .title {
           text-align: center;
@@ -871,7 +871,7 @@ const onSearch = (data) => {
           justify-content: center;
           height: 50px;
           line-height: 50px;
-          font-size: 16px;
+          font-size: $global-font-size-18;
           color: #666;
           background: #fff;
 
@@ -913,7 +913,7 @@ const onSearch = (data) => {
             .name {
               margin: 0 10px 0 0;
               word-break: break-all;
-              font-size: 18px;
+              font-size: $global-font-size-20;
               font-family:
                 PingFangSC-Regular,
                 PingFang SC;
@@ -935,7 +935,7 @@ const onSearch = (data) => {
           .right_3 {
             display: flex;
             margin: 10px 0;
-            font-size: 14px;
+            font-size: $global-font-size-16;
             font-family:
               PingFangSC-Regular,
               PingFang SC;
@@ -978,17 +978,17 @@ const onSearch = (data) => {
 
           .left {
             font-family: PingFangSC-Regular;
-            font-size: 12px;
+            font-size: $global-font-size-14;
             color: #2374ff;
-            line-height: 12px;
+            line-height: $global-font-size-14;
 
             .year {
               margin-bottom: 2px;
             }
 
             .date {
-              font-size: 22px;
-              line-height: 22px;
+              font-size: $global-font-size-24;
+              line-height: $global-font-size-24;
               margin-bottom: 10px;
             }
           }
@@ -996,15 +996,15 @@ const onSearch = (data) => {
           .right {
             .name {
               font-family: PingFangSC-Medium;
-              font-size: 16px;
+              font-size: $global-font-size-18;
               color: #121834;
-              line-height: 16px;
+              line-height: $global-font-size-18;
               font-weight: 700;
               margin-bottom: 8px;
             }
 
             .content {
-              font-size: 12px;
+              font-size: $global-font-size-14;
               color: #525a68;
               line-height: 19px;
               font-weight: 400;
@@ -1036,7 +1036,7 @@ const onSearch = (data) => {
           display: flex;
           align-items: center;
           height: 34px;
-          font-size: 14px;
+          font-size: $global-font-size-16;
           .i {
             display: inline-block;
             vertical-align: middle;
@@ -1053,7 +1053,7 @@ const onSearch = (data) => {
         }
       }
       .right {
-        font-size: 16px;
+        font-size: $global-font-size-18;
         .right_1 {
           padding: 10px 30px;
           span {

+ 170 - 202
src/views/index/index.vue

@@ -1,84 +1,79 @@
 <template>
-  <div id="index">
+  <div class="main">
     <el-row>
-      <el-col :span="24" class="main animate__animated animate__backInRight" v-loading="loading">
-        <el-image class="video" :src="siteInfo.videoUrl" fit="fill" />
-        <div class="content">
-          <div class="one">
-            <el-row>
-              <el-col :span="14" class="left">
-                <el-image class="image" :src="siteInfo.logoUrl" fit="fill" />
-                <div class="left_1">
-                  <div class="title">{{ siteInfo.zhTitle }}</div>
-                  <div class="English">{{ siteInfo.zhEnglish }}</div>
-                </div>
-              </el-col>
-              <el-col :span="10" class="right">
-                <el-row align="middle">
-                  <el-col :span="6" class="right_1" @click="toCommon(0)">帮助中心</el-col>
-                  <el-col :span="14" class="right_2">
-                    <a-input-search
-                      v-model:value="searchValue"
-                      placeholder="请输入您想要搜索的内容"
-                      style="width: 240px"
-                      enter-button
-                      @search="onSearch"
-                    />
-                  </el-col>
-                  <el-col :span="4" v-if="user && user.id" class="right_3">
-                    <el-dropdown>
-                      <el-button type="primary" size="mini">
-                        {{ user.nick_name || '游客' }}
-                      </el-button>
-                      <template #dropdown>
+      <el-col :span="24" class="animate__animated animate__backInRight" v-loading="loading">
+        <div class="one">
+          <el-row>
+            <el-col :span="14" class="left">
+              <el-image class="image" :src="siteInfo.logoUrl" fit="fill" />
+              <div class="content">
+                <text class="title">{{ siteInfo.zhTitle }}</text>
+                <!-- <text class="english">{{ siteInfo.zhBrief }}</text> -->
+              </div>
+            </el-col>
+            <el-col :span="10" class="right">
+              <el-row align="middle">
+                <el-col :span="6" class="right_1" @click="toCommon(0)">帮助中心</el-col>
+                <el-col :span="14" class="right_2">
+                  <a-input-search
+                    v-model:value="searchValue"
+                    placeholder="请输入您想要搜索的内容"
+                    style="width: 240px"
+                    enter-button
+                    @search="onSearch"
+                  />
+                </el-col>
+                <el-col :span="4" v-if="user && user.id" class="right_3">
+                  <el-dropdown>
+                    <el-button type="primary">
+                      {{ user.nick_name || '游客' }}
+                    </el-button>
+                    <template #dropdown>
+                      <el-dropdown-menu>
                         <el-dropdown-menu>
-                          <el-dropdown-menu>
-                            <el-dropdown-item @click="toOpen">管理中心</el-dropdown-item>
-                            <el-dropdown-item @click="toCenter">个人中心</el-dropdown-item>
-                            <el-dropdown-item @click="toLogout">注销</el-dropdown-item>
-                          </el-dropdown-menu>
+                          <el-dropdown-item @click="toOpen">管理中心</el-dropdown-item>
+                          <el-dropdown-item @click="toCenter">个人中心</el-dropdown-item>
+                          <el-dropdown-item @click="toLogout">注销</el-dropdown-item>
                         </el-dropdown-menu>
-                      </template>
-                    </el-dropdown>
-                  </el-col>
-                  <el-col :span="4" v-else class="right_3">
-                    <el-button @click="toCommon(1)" type="primary" size="small">登录</el-button>
-                    <el-button @click="toCommon(2)" type="primary" size="small">注册</el-button>
-                  </el-col>
-                </el-row>
-              </el-col>
-            </el-row>
+                      </el-dropdown-menu>
+                    </template>
+                  </el-dropdown>
+                </el-col>
+                <el-col :span="4" v-else class="right_3">
+                  <el-button @click="toCommon(1)" type="primary">登录</el-button>
+                  <el-button @click="toCommon(2)" type="primary">注册</el-button>
+                </el-col>
+              </el-row>
+            </el-col>
+          </el-row>
+        </div>
+        <div class="two" @click="switchMenu('one')">
+          <div class="two_1">
+            <el-image class="image" :src="homeBg" fit="fill" />
           </div>
-          <div class="two">
-            <el-row justify="center" align="middle">
-              <el-col class="list" :span="8" @click="switchMenu('one')">
-                <div class="bg"></div>
-                <div class="two_1">
-                  <text>{{ siteInfo.zhTitle }}</text>
-                </div>
-              </el-col>
-            </el-row>
+          <div class="two_2">
+            <text>{{ siteInfo.zhTitle }}</text>
           </div>
+        </div>
+        <div class="w_1200">
           <div class="thr">
-            <el-row justify="center" align="middle">
-              <el-col
-                class="list"
-                :span="4"
-                v-for="(item, index) in menu"
-                :key="index"
-                @click="switchMenu(item.href)"
-              >
-                <div class="thr_1">
-                  <div class="title">{{ item.title }}</div>
-                  <div class="English">{{ item.English }}</div>
-                </div>
-              </el-col>
-            </el-row>
-          </div>
-          <div class="four">
-            {{ footInfo.Copyright }}
+            <el-col
+              class="list"
+              :span="4"
+              v-for="(item, index) in menu"
+              :key="index"
+              @click="switchMenu(item.href)"
+            >
+              <div class="thr_1">
+                <div class="title">{{ item.title }}</div>
+                <div class="English">{{ item.English }}</div>
+              </div>
+            </el-col>
           </div>
         </div>
+        <div class="four">
+          {{ footInfo.Copyright }}
+        </div>
       </el-col>
     </el-row>
   </div>
@@ -86,6 +81,8 @@
 
 <script setup>
 // 基础
+import homeBg from '/images/homebg.png'
+
 import { siteInfo, footInfo, menuList } from '@/layout/site'
 import { UserStore } from '@/store/user'
 const userStore = UserStore()
@@ -105,7 +102,7 @@ onMounted(async () => {
 })
 const search = async () => {
   const menuList = menu.value.filter((item) => {
-    if (item.href != 'one') return item
+    if (item.route != 'one') return item
   })
   menu.value = menuList
 }
@@ -141,159 +138,130 @@ const toLogout = () => {
 <style scoped lang="scss">
 .main {
   height: 100vh;
-  min-width: 1200px;
+  width: 100%;
+  position: relative;
+  background: url('./images/home.jpg');
+  background-size: 100% 100%;
+  padding: 0px;
+  margin: 0px;
+  color: #fff;
+  font-family: '微软雅黑';
+  .one {
+    width: 1200px;
+    min-width: 1200px;
+    margin: 0 auto;
+    padding-top: 32px;
+    padding-bottom: 12px;
 
-  .video {
-    position: absolute;
-    top: 0px;
-    width: 100%;
-    height: 100%;
-    object-fit: cover;
-    z-index: 0;
-  }
-
-  .content {
-    position: absolute;
-    top: 0px;
-    width: 100%;
-    height: 100%;
-    z-index: 0;
-    color: #ffffff;
+    .left {
+      display: flex;
+      align-items: center;
 
-    .one {
-      width: 1200px;
-      min-width: 1200px;
-      margin: 0 auto;
-      padding-top: 32px;
-      padding-bottom: 12px;
-
-      .left {
-        display: flex;
-        align-items: center;
-
-        .image {
-          height: 45px;
-          width: 45px;
-          margin: 0 10px 0 0;
-        }
-
-        .left_1 {
-          margin: 0 0 0 5px;
-
-          .title {
-            margin: 0 0 5px 0;
-            font-size: 23px;
-            font-weight: bold;
-          }
+      .image {
+        height: 45px;
+        width: 45px;
+        margin: 0 10px 0 0;
+      }
 
-          .English {
-            font-size: 12px;
-            color: #fff;
-          }
-        }
+      .images {
+        height: auto;
+        width: 335px;
       }
+      .left_1 {
+        margin: 0 0 0 5px;
 
-      .right {
-        font-size: 16px;
-        letter-spacing: 0;
-        color: #fff;
-        font-weight: 500;
+        .title {
+          margin: 0 0 5px 0;
+          font-size: 23px;
+          font-weight: bold;
+        }
 
-        .right_3 {
-          display: flex;
-          justify-content: space-between;
-          .example-showcase .el-dropdown-link {
-            cursor: pointer;
-            color: #1c66e7;
-            display: flex;
-            align-items: center;
-          }
+        .English {
+          font-size: 12px;
+          color: #fff;
         }
       }
     }
 
-    .two {
-      width: 1200px;
-      min-width: 1200px;
-      margin: 0 auto;
-      width: 100%;
-      position: absolute;
-      left: 50%;
-      top: 45%;
-      transform: translate(-50%, -50%);
+    .right {
+      font-size: 16px;
+      letter-spacing: 0;
+      color: #fff;
+      font-weight: 500;
 
-      .list {
-        position: relative;
+      .right_3 {
         display: flex;
-        justify-content: center;
-
-        .bg {
-          margin: 10px;
-          width: 400px;
-          height: 400px;
-          z-index: 1;
-          background-image: url(/images/homebg.png);
-          background-position: center center;
-          background-repeat: no-repeat;
-          background-size: contain;
-          animation: animationName 5s linear infinite;
-        }
-
-        .two_1 {
-          position: absolute;
-          top: 45%;
-          left: 35%;
+        justify-content: space-between;
+        .example-showcase .el-dropdown-link {
+          cursor: pointer;
+          color: #1c66e7;
           display: flex;
-          flex-direction: column;
           align-items: center;
-          z-index: 999;
-          width: 200px;
-
-          text {
-            font-size: 20px;
-            color: #ffffff;
-            text-align: center;
-          }
         }
+      }
+    }
+  }
 
-        @keyframes animationName {
-          100% {
-            transform: rotate(1turn);
-          }
+  .two {
+    position: relative;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 1200px;
+    min-width: 1200px;
+    margin: 0 auto;
+    height: 60vh;
+    .two_1 {
+      .image {
+        width: 400px;
+        height: 400px;
+        animation: animationName 5s linear infinite;
+      }
+      @keyframes animationName {
+        100% {
+          transform: rotate(1turn);
         }
       }
     }
-    .thr {
+    .two_2 {
       position: absolute;
-      left: 10%;
-      bottom: 10%;
-      .list {
-        margin: 10px 0;
-        .thr_1 {
-          font-family: PingFangSC-Semibold;
-          color: #fff;
-          margin-left: 14px;
-          text-align: center;
-          .title {
-            font-size: 19px;
-            font-weight: 600;
-          }
-          .English {
-            font-size: 12px;
-            font-weight: 400;
-          }
+      left: 38%;
+      text {
+        font-size: 22px;
+        color: #ffffff;
+        text-align: center;
+      }
+    }
+  }
+  .thr {
+    display: flex;
+    flex-wrap: wrap;
+    .list {
+      margin: 10px 0;
+      .thr_1 {
+        font-family: PingFangSC-Semibold;
+        color: #fff;
+        margin-left: 14px;
+        text-align: center;
+        .title {
+          font-size: 20px;
+          font-weight: 600;
+          margin: 0 0 10px 0;
+        }
+        .English {
+          font-size: 14px;
+          font-weight: 400;
         }
       }
     }
+  }
 
-    .four {
-      width: 100%;
-      position: absolute;
-      bottom: 20px;
-      text-align: center;
-      font-size: 12px;
-      color: #fff;
-    }
+  .four {
+    margin: 100px 0 10px 0;
+    width: 100%;
+    text-align: center;
+    font-size: 12px;
+    color: #fff;
   }
 }
 </style>

+ 4 - 4
src/views/industry/parts/four.vue

@@ -152,7 +152,7 @@ const sizeChange = (limits) => {
         margin: 0 0 0 10px;
         .right_1 {
           height: 24px;
-          font-size: 18px;
+          font-size: $global-font-size-20;
           font-family:
             PingFangSC-Medium,
             PingFang SC;
@@ -166,7 +166,7 @@ const sizeChange = (limits) => {
           margin-bottom: 20px;
           height: 48px;
           overflow: hidden;
-          font-size: 14px;
+          font-size: $global-font-size-16;
           font-family:
             PingFangSC-Regular,
             PingFang SC;
@@ -176,13 +176,13 @@ const sizeChange = (limits) => {
           cursor: pointer;
         }
         .right_3 {
-          font-size: 12px;
+          font-size: $global-font-size-14;
           font-family:
             PingFangSC-Regular,
             PingFang SC;
           font-weight: 400;
           color: #999;
-          line-height: 12px;
+          line-height: $global-font-size-14;
           cursor: pointer;
         }
         .right_1:hover {

+ 1 - 1
src/views/industry/parts/one.vue

@@ -16,7 +16,7 @@ const info = inject('info')
 .one {
   .one_1 {
     margin: 10px 0;
-    font-size: 24px;
+    font-size: $global-font-size-26;
     font-weight: 700;
     text-align: center;
   }

+ 2 - 2
src/views/industry/parts/two.vue

@@ -29,7 +29,7 @@ const info = inject('info')
 .two {
   .two_1 {
     margin: 10px 0;
-    font-size: 24px;
+    font-size: $global-font-size-26;
     font-weight: 700;
     text-align: center;
   }
@@ -47,7 +47,7 @@ const info = inject('info')
         .name {
           text-align: center;
           background: #e8e8e8;
-          font-size: 14px;
+          font-size: $global-font-size-16;
           line-height: 1.5em;
           padding: 1em 0.5em;
           border-radius: 0 0 10px 10px;

+ 22 - 22
src/views/innovation/detail.vue

@@ -302,11 +302,11 @@ const toClose = () => {
 }
 // 收藏
 const toCollection = async (status) => {
-  if (user.value._id) {
+  if (user.value.id) {
     let res
     let message
     const data = {
-      user: user.value._id,
+      user: user.value.id,
       source: info.value._id,
       type: 'match',
       time: moment().format('YYYY-MM-DD')
@@ -340,7 +340,7 @@ const submitForm = async (formEl) => {
       const data = cloneDeep(form.value)
       const other = {
         match: info.value._id,
-        user: user.value._id,
+        user: user.value.id,
         time: moment().format('YYYY-MM-DD')
       }
       let res = await signStore.create({ ...data, ...other })
@@ -391,11 +391,11 @@ provide('submitForm', submitForm)
             padding-left: 4px;
             padding-right: 4px;
             height: 22px;
-            line-height: 20px;
+            line-height: $global-font-size-20;
             background: #f8f9fc;
             border-radius: 1px;
             border: 1px solid #dde2e7;
-            font-size: 12px;
+            font-size: $global-font-size-14;
             font-family:
               PingFangSC-Regular,
               PingFang SC;
@@ -412,18 +412,18 @@ provide('submitForm', submitForm)
             overflow: hidden;
             text-overflow: ellipsis;
             white-space: nowrap;
-            font-size: 16px;
+            font-size: $global-font-size-18;
             font-family:
               PingFangSC-Medium,
               PingFang SC;
             font-weight: 500;
             color: #222;
-            line-height: 22px;
+            line-height: $global-font-size-24;
           }
         }
         .right_2 {
           padding: 5px 0;
-          font-size: 12px;
+          font-size: $global-font-size-14;
           font-family:
             PingFangSC-Regular,
             PingFang SC;
@@ -435,7 +435,7 @@ provide('submitForm', submitForm)
           display: flex;
           justify-content: space-between;
           .right_3Left {
-            font-size: 12px;
+            font-size: $global-font-size-14;
             font-family:
               PingFangSC-Regular,
               PingFang SC;
@@ -444,7 +444,7 @@ provide('submitForm', submitForm)
           }
           .right_3Right {
             text-align: right;
-            font-size: 16px;
+            font-size: $global-font-size-18;
             font-family:
               PingFangSC-Semibold,
               PingFang SC;
@@ -462,7 +462,7 @@ provide('submitForm', submitForm)
         align-items: center;
         justify-content: center;
         font-family: PingFangSC-Regular;
-        font-size: 14px;
+        font-size: $global-font-size-16;
         color: #2374ff;
         span {
           margin: 0 0 0 5px;
@@ -472,7 +472,7 @@ provide('submitForm', submitForm)
         position: absolute;
         right: -23px;
         top: 10px;
-        font-size: 12px;
+        font-size: $global-font-size-14;
         font-family:
           PingFangSC-Normal,
           PingFang SC;
@@ -542,10 +542,10 @@ provide('submitForm', submitForm)
     .thr_1 {
       padding: 10px;
       font-family: PingFangSC-Semibold;
-      font-size: 18px;
+      font-size: $global-font-size-20;
       color: #383b40;
       letter-spacing: 0;
-      line-height: 18px;
+      line-height: $global-font-size-20;
       font-weight: 600;
     }
     .thr_2 {
@@ -578,11 +578,11 @@ provide('submitForm', submitForm)
               padding-left: 4px;
               padding-right: 4px;
               height: 22px;
-              line-height: 20px;
+              line-height: $global-font-size-14;
               background: #f8f9fc;
               border-radius: 1px;
               border: 1px solid #dde2e7;
-              font-size: 12px;
+              font-size: $global-font-size-14;
               font-family:
                 PingFangSC-Regular,
                 PingFang SC;
@@ -599,18 +599,18 @@ provide('submitForm', submitForm)
               overflow: hidden;
               text-overflow: ellipsis;
               white-space: nowrap;
-              font-size: 16px;
+              font-size: $global-font-size-18;
               font-family:
                 PingFangSC-Medium,
                 PingFang SC;
               font-weight: 500;
               color: #222;
-              line-height: 22px;
+              line-height: $global-font-size-24;
             }
           }
           .right_2 {
             padding: 5px 0;
-            font-size: 12px;
+            font-size: $global-font-size-14;
             font-family:
               PingFangSC-Regular,
               PingFang SC;
@@ -622,7 +622,7 @@ provide('submitForm', submitForm)
             display: flex;
             justify-content: space-between;
             .right_3Left {
-              font-size: 12px;
+              font-size: $global-font-size-14;
               font-family:
                 PingFangSC-Regular,
                 PingFang SC;
@@ -631,7 +631,7 @@ provide('submitForm', submitForm)
             }
             .right_3Right {
               text-align: right;
-              font-size: 16px;
+              font-size: $global-font-size-18;
               font-family:
                 PingFangSC-Semibold,
                 PingFang SC;
@@ -648,7 +648,7 @@ provide('submitForm', submitForm)
           position: absolute;
           right: -23px;
           top: 10px;
-          font-size: 12px;
+          font-size: $global-font-size-14;
           font-family:
             PingFangSC-Normal,
             PingFang SC;

+ 10 - 10
src/views/innovation/index.vue

@@ -343,7 +343,7 @@ const sizeChange = (limits) => {
         }
         .title {
           color: #666;
-          font-size: 14px;
+          font-size: $global-font-size-16;
           line-height: 15px;
           margin: 0 10px;
           display: inline-block;
@@ -357,7 +357,7 @@ const sizeChange = (limits) => {
       }
       .button {
         color: #2374ff;
-        font-size: 12px;
+        font-size: $global-font-size-14;
         cursor: pointer;
       }
     }
@@ -393,11 +393,11 @@ const sizeChange = (limits) => {
             padding-left: 4px;
             padding-right: 4px;
             height: 22px;
-            line-height: 20px;
+            line-height: $global-font-size-20;
             background: #f8f9fc;
             border-radius: 1px;
             border: 1px solid #dde2e7;
-            font-size: 12px;
+            font-size: $global-font-size-14;
             font-family:
               PingFangSC-Regular,
               PingFang SC;
@@ -414,18 +414,18 @@ const sizeChange = (limits) => {
             overflow: hidden;
             text-overflow: ellipsis;
             white-space: nowrap;
-            font-size: 16px;
+            font-size: $global-font-size-18;
             font-family:
               PingFangSC-Medium,
               PingFang SC;
             font-weight: 500;
             color: #222;
-            line-height: 22px;
+            line-height: $global-font-size-24;
           }
         }
         .right_2 {
           padding: 5px 0;
-          font-size: 12px;
+          font-size: $global-font-size-14;
           font-family:
             PingFangSC-Regular,
             PingFang SC;
@@ -437,7 +437,7 @@ const sizeChange = (limits) => {
           display: flex;
           justify-content: space-between;
           .right_3Left {
-            font-size: 12px;
+            font-size: $global-font-size-14;
             font-family:
               PingFangSC-Regular,
               PingFang SC;
@@ -446,7 +446,7 @@ const sizeChange = (limits) => {
           }
           .right_3Right {
             text-align: right;
-            font-size: 16px;
+            font-size: $global-font-size-18;
             font-family:
               PingFangSC-Semibold,
               PingFang SC;
@@ -463,7 +463,7 @@ const sizeChange = (limits) => {
         position: absolute;
         right: -23px;
         top: 10px;
-        font-size: 12px;
+        font-size: $global-font-size-14;
         font-family:
           PingFangSC-Normal,
           PingFang SC;

+ 3 - 3
src/views/journal/detail.vue

@@ -75,7 +75,7 @@ const searchOther = async () => {
 <style scoped lang="scss">
 .main {
   .one {
-    font-size: 24px;
+    font-size: $global-font-size-26;
     font-weight: 700;
     border-bottom: 2px solid #2374ff;
     text-align: center;
@@ -88,14 +88,14 @@ const searchOther = async () => {
 
   .two {
     display: flex;
-    font-size: 14px;
+    font-size: $global-font-size-16;
     color: #7e8288;
     margin: 20px 0;
   }
 
   .thr {
     font-family: PingFangSC-Regular;
-    font-size: 20px;
+    font-size: $global-font-size-22;
     color: #383b40;
     line-height: 24px;
   }

+ 1 - 1
src/views/loading/index.vue

@@ -18,7 +18,7 @@
   background: linear-gradient(135deg, #a1c4fd, #c2e9fb);
   .text {
     margin: 10px 0 0 0;
-    font-size: 18px;
+    font-size: $global-font-size-20;
   }
 }
 </style>

+ 5 - 5
src/views/login/index.vue

@@ -226,7 +226,7 @@ const toRegister = () => {
           text-align: center;
           margin: 0 40px;
           font-family: PingFangSC-Semibold !important;
-          font-size: 20px;
+          font-size: $global-font-size-22;
           letter-spacing: -0.14px;
           line-height: 32px;
           font-weight: bold;
@@ -255,7 +255,7 @@ const toRegister = () => {
           span {
             cursor: pointer;
             font-family: PingFangSC-Regular;
-            font-size: 14px;
+            font-size: $global-font-size-16;
             color: #333333;
             letter-spacing: -0.09px;
             text-align: right;
@@ -275,7 +275,7 @@ const toRegister = () => {
             height: 44px !important;
             border: 0 !important;
             color: #f8f8f8 !important;
-            font-size: 16px !important;
+            font-size: $global-font-size-18 !important;
             text-align: center !important;
             line-height: 40px !important;
             cursor: pointer !important;
@@ -287,7 +287,7 @@ const toRegister = () => {
         .agree {
           padding: 0 0 30px 0;
           color: #999;
-          font-size: 12px;
+          font-size: $global-font-size-14;
 
           span:last-child {
             color: #2374ff;
@@ -297,7 +297,7 @@ const toRegister = () => {
         .other {
           text-align: center;
           font-family: PingFangSC-Regular;
-          font-size: 14px;
+          font-size: $global-font-size-16;
           color: #333333;
 
           span:last-child {

+ 2 - 2
src/views/main/eight.vue

@@ -198,7 +198,7 @@ const toView = async (item) => {
         .title {
           margin: 10px 0;
           font-family: Tahoma, Geneva, sans-serif;
-          font-size: 18px;
+          font-size: $global-font-size-20;
           line-height: 1.75;
         }
         .title:hover {
@@ -206,7 +206,7 @@ const toView = async (item) => {
           cursor: pointer;
         }
         .other_1 {
-          font-size: 14px;
+          font-size: $global-font-size-16;
           margin: 5px 0;
         }
       }

+ 88 - 91
src/views/main/elevenHatch/index.vue

@@ -1,103 +1,100 @@
 <template>
-  <myMain>
-    <div class="main">
-      <el-row>
-        <el-col :span="24" class="animate__animated animate__backInRight" v-loading="loading">
-          <div class="head">
-            <div class="head_1">孵化器管理驾驶舱</div>
-            <div class="head_2" id="showTime">{{ formattedTime }}</div>
-          </div>
-          <div class="center">
-            <el-row :gutter="20">
-              <el-col :span="6">
-                <div class="center_1">
-                  <div class="boxall">
-                    <div class="alltitle">孵化进度</div>
-                    <echarts3></echarts3>
-                  </div>
-                  <div class="boxall">
-                    <div class="alltitle">孵化项目列表</div>
-                    <div class="wraptit">
-                      <span>项目名称</span><span>金额</span><span>风险概率</span><span>时间</span>
-                    </div>
-                    <div class="one">
-                      <vue3-seamless-scroll
-                        :list="oneList"
-                        :hover="true"
-                        :step="0.2"
-                        :wheel="true"
-                        :isWatch="true"
-                        class="scroll"
-                      >
-                        <div class="wrap" v-for="(item, index) in oneList" :key="index">
-                          <div class="other">{{ item.name }}</div>
-                          <div class="other">{{ item.money }}</div>
-                          <div class="other">{{ item.number }}</div>
-                          <div class="other">{{ item.time }}</div>
-                        </div>
-                      </vue3-seamless-scroll>
-                    </div>
+  <div class="main">
+    <el-row>
+      <el-col :span="24" class="animate__animated animate__backInRight" v-loading="loading">
+        <div class="head">
+          <div class="head_1">孵化器管理驾驶舱</div>
+          <div class="head_2" id="showTime">{{ formattedTime }}</div>
+        </div>
+        <div class="center">
+          <el-row :gutter="20">
+            <el-col :span="6">
+              <div class="center_1">
+                <div class="boxall">
+                  <div class="alltitle">孵化进度</div>
+                  <echarts3></echarts3>
+                </div>
+                <div class="boxall">
+                  <div class="alltitle">孵化项目列表</div>
+                  <div class="wraptit">
+                    <span>项目名称</span><span>金额</span><span>风险概率</span><span>时间</span>
                   </div>
-                  <div class="boxall">
-                    <div class="alltitle">行业领域占比情况</div>
-                    <echarts1></echarts1>
+                  <div class="one">
+                    <vue3-seamless-scroll
+                      :list="oneList"
+                      :hover="true"
+                      :step="0.2"
+                      :wheel="true"
+                      :isWatch="true"
+                      class="scroll"
+                    >
+                      <div class="wrap" v-for="(item, index) in oneList" :key="index">
+                        <div class="other">{{ item.name }}</div>
+                        <div class="other">{{ item.money }}</div>
+                        <div class="other">{{ item.number }}</div>
+                        <div class="other">{{ item.time }}</div>
+                      </div>
+                    </vue3-seamless-scroll>
                   </div>
                 </div>
-              </el-col>
-              <el-col :span="12">
-                <div class="center_1">
-                  <div class="boxall" style="height: 160px">
-                    <div class="clearfix navboxall" style="height: 100%">
-                      <div class="pulll_left num">
-                        <div class="numbt">总体情况<span>(单位:家)</span></div>
-                        <div class="numtxt">190</div>
+                <div class="boxall">
+                  <div class="alltitle">行业领域占比情况</div>
+                  <echarts1></echarts1>
+                </div>
+              </div>
+            </el-col>
+            <el-col :span="12">
+              <div class="center_1">
+                <div class="boxall" style="height: 160px">
+                  <div class="clearfix navboxall" style="height: 100%">
+                    <div class="pulll_left num">
+                      <div class="numbt">总体情况<span>(单位:家)</span></div>
+                      <div class="numtxt">190</div>
+                    </div>
+                    <div class="pulll_right zhibiao">
+                      <div class="zb1">
+                        <span>工研院运营</span>
+                        <echarts5></echarts5>
                       </div>
-                      <div class="pulll_right zhibiao">
-                        <div class="zb1">
-                          <span>工研院运营</span>
-                          <echarts5></echarts5>
-                        </div>
-                        <div class="zb2">
-                          <span>参股孵化器</span>
-                          <echarts6></echarts6>
-                        </div>
-                        <div class="zb3">
-                          <span>合作孵化器</span>
-                          <echarts7></echarts7>
-                        </div>
+                      <div class="zb2">
+                        <span>参股孵化器</span>
+                        <echarts6></echarts6>
+                      </div>
+                      <div class="zb3">
+                        <span>合作孵化器</span>
+                        <echarts7></echarts7>
                       </div>
                     </div>
                   </div>
-                  <div class="boxall">
-                    <div class="alltitle">年度项目完成对比</div>
-                    <echarts2></echarts2>
-                  </div>
-                  <div class="boxall">
-                    <div class="alltitle">投资收益对比</div>
-                    <echarts4></echarts4>
-                  </div>
                 </div>
-              </el-col>
-              <el-col :span="6">
-                <div class="center_1">
-                  <div class="boxall">
-                    <div class="alltitle">视频监控</div>
-                    <div v-for="(item, index) in twoList" :key="index">
-                      <el-image class="image" :src="item.url" fit="fill" />
-                    </div>
+                <div class="boxall">
+                  <div class="alltitle">年度项目完成对比</div>
+                  <echarts2></echarts2>
+                </div>
+                <div class="boxall">
+                  <div class="alltitle">投资收益对比</div>
+                  <echarts4></echarts4>
+                </div>
+              </div>
+            </el-col>
+            <el-col :span="6">
+              <div class="center_1">
+                <div class="boxall">
+                  <div class="alltitle">视频监控</div>
+                  <div v-for="(item, index) in twoList" :key="index">
+                    <el-image class="image" :src="item.url" fit="fill" />
                   </div>
                 </div>
-              </el-col>
-            </el-row>
-          </div>
-        </el-col>
-      </el-row>
-    </div>
-  </myMain>
+              </div>
+            </el-col>
+          </el-row>
+        </div>
+      </el-col>
+    </el-row>
+  </div>
 </template>
 
 <script setup>
-import myMain from './dataV/myMain.vue'
 import echarts1 from './path/echarts1.vue'
 import echarts2 from './path/echarts2.vue'
 import echarts3 from './path/echarts3.vue'
@@ -213,7 +210,7 @@ onBeforeUnmount(() => {
       }
 
       .alltitle {
-        font-size: 18px;
+        font-size: $global-font-size-20;
         color: #fff;
         position: relative;
         padding-left: 12px;
@@ -236,7 +233,7 @@ onBeforeUnmount(() => {
       }
       .wraptit span {
         display: inline-block;
-        font-size: 16px;
+        font-size: $global-font-size-18;
         color: rgba(255, 255, 255, 0.6);
       }
 
@@ -291,7 +288,7 @@ onBeforeUnmount(() => {
         display: block;
         text-align: center;
         color: #fff;
-        font-size: 16px;
+        font-size: $global-font-size-18;
       }
 
       .num {
@@ -299,13 +296,13 @@ onBeforeUnmount(() => {
       }
 
       .numbt {
-        font-size: 24px;
+        font-size: $global-font-size-26;
         color: #fff;
         padding-top: 14px;
       }
 
       .numbt span {
-        font-size: 18px;
+        font-size: $global-font-size-20;
         padding-left: 10px;
         color: #fff;
       }

+ 2 - 2
src/views/main/four.vue

@@ -82,13 +82,13 @@ const search = async () => {}
         .hot_2 {
           span {
             margin: 0 10px;
-            font-size: 14px;
+            font-size: $global-font-size-16;
             font-family:
               PingFangSC-Regular,
               PingFang SC;
             font-weight: 400;
             color: #666;
-            line-height: 16px;
+            line-height: $global-font-size-18;
             cursor: pointer;
           }
           span:hover {

+ 0 - 85
src/views/main/hatch/dataV/mixin/autoResize.js

@@ -1,85 +0,0 @@
-import { debounce, observerDomResize } from '../util/index'
-
-export default {
-  data () {
-    return {
-      dom: '',
-
-      width: 0,
-      height: 0,
-
-      debounceInitWHFun: '',
-
-      domObserver: ''
-    }
-  },
-  methods: {
-    async autoResizeMixinInit () {
-      const { initWH, getDebounceInitWHFun, bindDomResizeCallback, afterAutoResizeMixinInit } = this
-
-      await initWH(false)
-
-      getDebounceInitWHFun()
-
-      bindDomResizeCallback()
-
-      if (typeof afterAutoResizeMixinInit === 'function') afterAutoResizeMixinInit()
-    },
-    initWH (resize = true) {
-      const { $nextTick, $refs, ref, onResize } = this
-
-      return new Promise(resolve => {
-        $nextTick((_) => {
-          const dom = (this.dom = $refs[ref])
-          // this.width = dom ? dom.clientWidth : 0
-          // this.height = dom ? dom.clientHeight : 0
-          this.width = window.innerWidth
-          this.height = window.innerHeight
-
-          if (!dom) {
-            console.warn('DataV: Failed to get dom node, component rendering may be abnormal!')
-          } else if (!this.width || !this.height) {
-            console.warn('DataV: Component width or height is 0px, rendering abnormality may occur!')
-          }
-
-          if (typeof onResize === 'function' && resize) onResize()
-
-          resolve()
-        })
-      })
-    },
-    getDebounceInitWHFun () {
-      const { initWH } = this
-
-      this.debounceInitWHFun = debounce(100, initWH)
-    },
-    bindDomResizeCallback () {
-      const { dom, debounceInitWHFun } = this
-
-      this.domObserver = observerDomResize(dom, debounceInitWHFun)
-
-      window.addEventListener('resize', debounceInitWHFun)
-    },
-    unbindDomResizeCallback () {
-      let { domObserver, debounceInitWHFun } = this
-
-      if (!domObserver) return
-
-      domObserver.disconnect()
-      domObserver.takeRecords()
-      domObserver = null
-
-      window.removeEventListener('resize', debounceInitWHFun)
-    }
-  },
-  mounted () {
-    const { autoResizeMixinInit } = this
-
-    autoResizeMixinInit()
-  },
-  beforeDestroy () {
-    const { unbindDomResizeCallback } = this
-
-    unbindDomResizeCallback()
-  }
-}

+ 0 - 60
src/views/main/hatch/dataV/myMain.vue

@@ -1,60 +0,0 @@
-<template>
-  <div id="dv-full-screen-container" :ref="ref">
-    <template v-if="ready">
-      <slot></slot>
-    </template>
-  </div>
-</template>
-
-<script>
-import autoResize from './mixin/autoResize.js'
-
-export default {
-  name: 'DvFullScreenContainer',
-  mixins: [autoResize],
-  data() {
-    return {
-      ref: 'full-screen-container',
-      allWidth: 0,
-      allHeight: 0,
-      scale: 0,
-      datavRoot: '',
-      ready: false
-    }
-  },
-  methods: {
-    afterAutoResizeMixinInit() {
-      const { initConfig, setAppScale } = this
-
-      initConfig()
-
-      setAppScale()
-
-      this.ready = true
-    },
-    initConfig() {
-      const { dom } = this
-      // const { width } = screen
-      let width = window.innerWidth
-      let height = window.innerHeight
-      this.allWidth = width
-      this.allHeight = height
-
-      dom.style.width = `${width - 17}px`
-      dom.style.height = `${height}px`
-    },
-    setAppScale() {
-      const { allWidth, allHeight, dom } = this
-      const currentWidth = window.outerWidth
-      const currentHeight = window.innerHeight
-      // dom.style.transform = `scale(${currentWidth / allWidth})`
-      dom.style.transform = `scaleY(${currentHeight / allHeight}) scaleX(${currentWidth / allWidth})`
-    },
-    onResize() {
-      const { setAppScale } = this
-
-      setAppScale()
-    }
-  }
-}
-</script>

+ 0 - 47
src/views/main/hatch/dataV/util/index.js

@@ -1,47 +0,0 @@
-export function randomExtend(minNum, maxNum) {
-  if (arguments.length === 1) {
-    return parseInt(Math.random() * minNum + 1, 10)
-  } else {
-    return parseInt(Math.random() * (maxNum - minNum + 1) + minNum, 10)
-  }
-}
-
-export function debounce(delay, callback) {
-  let lastTime
-
-  return function () {
-    clearTimeout(lastTime)
-
-    const [that, args] = [this, arguments]
-
-    lastTime = setTimeout(() => {
-      callback.apply(that, args)
-    }, delay)
-  }
-}
-
-export function observerDomResize(dom, callback) {
-  const MutationObserver = window.MutationObserver || window.WebKitMutationObserver || window.MozMutationObserver
-
-  const observer = new MutationObserver(callback)
-
-  observer.observe(dom, { attributes: true, attributeFilter: ['style'], attributeOldValue: true })
-
-  return observer
-}
-
-export function getPointDistance(pointOne, pointTwo) {
-  const minusX = Math.abs(pointOne[0] - pointTwo[0])
-
-  const minusY = Math.abs(pointOne[1] - pointTwo[1])
-
-  return Math.sqrt(minusX * minusX + minusY * minusY)
-}
-
-export function uuid(hasHyphen) {
-  return (hasHyphen ? 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx' : 'xxxxxxxxxxxx4xxxyxxxxxxxxxxxxxxx').replace(/[xy]/g, function (c) {
-    const r = (Math.random() * 16) | 0
-    const v = c == 'x' ? r : (r & 0x3) | 0x8
-    return v.toString(16)
-  })
-}

+ 16 - 16
src/views/main/hatch/twelve_1.vue

@@ -175,15 +175,15 @@ const list = ref([
       .name {
         text-align: center;
         font-family: PingFangSC-Medium;
-        font-size: 20px;
+        font-size: $global-font-size-22;
         color: #121834;
-        line-height: 20px;
+        line-height: $global-font-size-22;
         font-weight: 700;
         margin-bottom: 8px;
       }
       .remark {
         text-align: center;
-        font-size: 14px;
+        font-size: $global-font-size-16;
       }
     }
     .left_2 {
@@ -197,9 +197,9 @@ const list = ref([
           display: flex;
           align-items: center;
           font-family: PingFangSC-Medium;
-          font-size: 18px;
+          font-size: $global-font-size-20;
           color: #121834;
-          line-height: 18px;
+          line-height: $global-font-size-20;
           font-weight: 700;
           margin-bottom: 8px;
           .image {
@@ -212,9 +212,9 @@ const list = ref([
           display: flex;
           justify-content: space-between;
           font-family: PingFangSC-Medium;
-          font-size: 14px;
+          font-size: $global-font-size-16;
           color: #63a9e2;
-          line-height: 14px;
+          line-height: $global-font-size-16;
           margin: 15px 0;
           .otherRight {
             text-align: right;
@@ -234,9 +234,9 @@ const list = ref([
         .title {
           text-align: center;
           font-family: PingFangSC-Medium;
-          font-size: 16px;
+          font-size: $global-font-size-18;
           color: #121834;
-          line-height: 16px;
+          line-height: $global-font-size-18;
           font-weight: 700;
           margin-bottom: 8px;
           padding: 10px;
@@ -246,7 +246,7 @@ const list = ref([
           overflow: hidden;
           .list {
             padding: 10px;
-            font-size: 14px;
+            font-size: $global-font-size-16;
             background: #fff;
             .name {
               display: flex;
@@ -277,9 +277,9 @@ const list = ref([
         .title {
           text-align: center;
           font-family: PingFangSC-Medium;
-          font-size: 16px;
+          font-size: $global-font-size-18;
           color: #121834;
-          line-height: 16px;
+          line-height: $global-font-size-18;
           font-weight: 700;
           margin-bottom: 8px;
           padding: 10px;
@@ -294,9 +294,9 @@ const list = ref([
         .title {
           text-align: center;
           font-family: PingFangSC-Medium;
-          font-size: 16px;
+          font-size: $global-font-size-18;
           color: #121834;
-          line-height: 16px;
+          line-height: $global-font-size-18;
           font-weight: 700;
           margin-bottom: 8px;
           padding: 10px;
@@ -312,9 +312,9 @@ const list = ref([
           .title {
             text-align: center;
             font-family: PingFangSC-Medium;
-            font-size: 16px;
+            font-size: $global-font-size-18;
             color: #121834;
-            line-height: 16px;
+            line-height: $global-font-size-18;
             font-weight: 700;
             margin-bottom: 8px;
             padding: 10px;

+ 102 - 105
src/views/main/hatch/twelve_2.vue

@@ -1,126 +1,123 @@
 <template>
-  <myMain>
-    <div class="hatch">
-      <el-row>
-        <el-col :span="24" class="animate__animated animate__backInRight" v-loading="loading">
-          <div class="head">
-            <div class="head_1">产学研用平台孵化大脑</div>
-            <div class="head_2" id="showTime">{{ formattedTime }}</div>
-          </div>
-          <div class="center">
-            <ul class="clearfix">
-              <li>
-                <div class="boxall">
-                  <div class="titleall">模块标题</div>
-                  <div class="list">
-                    <div class="list_1" v-for="i in listOne" :key="i.value">
-                      <h2>{{ i.value }}</h2>
-                      <span>{{ i.label }}</span>
-                    </div>
+  <div class="hatch">
+    <el-row>
+      <el-col :span="24" class="animate__animated animate__backInRight" v-loading="loading">
+        <div class="head">
+          <div class="head_1">产学研用平台孵化大脑</div>
+          <div class="head_2" id="showTime">{{ formattedTime }}</div>
+        </div>
+        <div class="center">
+          <ul class="clearfix">
+            <li>
+              <div class="boxall">
+                <div class="titleall">模块标题</div>
+                <div class="list">
+                  <div class="list_1" v-for="i in listOne" :key="i.value">
+                    <h2>{{ i.value }}</h2>
+                    <span>{{ i.label }}</span>
                   </div>
-                  <div class="boxfoot"></div>
                 </div>
-              </li>
-              <li>
-                <div class="barnav">
-                  <div class="top">
-                    <div class="list" v-for="i in listTwo" :key="i.value">
-                      <div class="value">{{ i.value }}</div>
-                    </div>
-                  </div>
-                  <div class="top">
-                    <div class="list" v-for="i in listTwo" :key="i.value">
-                      <div class="label">{{ i.label }}</div>
-                    </div>
+                <div class="boxfoot"></div>
+              </div>
+            </li>
+            <li>
+              <div class="barnav">
+                <div class="top">
+                  <div class="list" v-for="i in listTwo" :key="i.value">
+                    <div class="value">{{ i.value }}</div>
                   </div>
-                  <div class="boxfoot"></div>
-                </div>
-                <div class="mapbox">
-                  <map1 class="map"></map1>
                 </div>
-              </li>
-              <li>
-                <div class="boxall">
-                  <div class="titleall">模块标题</div>
-                  <div class="list">
-                    <div class="list_1" v-for="i in listOne" :key="i.value">
-                      <h2>{{ i.value }}</h2>
-                      <span>{{ i.label }}</span>
-                    </div>
+                <div class="top">
+                  <div class="list" v-for="i in listTwo" :key="i.value">
+                    <div class="label">{{ i.label }}</div>
                   </div>
-                  <div class="boxfoot"></div>
                 </div>
-              </li>
-            </ul>
-            <ul class="clearfix">
-              <li>
-                <div class="boxall">
-                  <div class="titleall">模块标题</div>
-                  <div class="list thr">
-                    <div class="list_1" v-for="i in listThr" :key="i.value">
-                      <h2>{{ i.value }}</h2>
-                      <span>{{ i.label }}</span>
-                    </div>
+                <div class="boxfoot"></div>
+              </div>
+              <div class="mapbox">
+                <map1 class="map"></map1>
+              </div>
+            </li>
+            <li>
+              <div class="boxall">
+                <div class="titleall">模块标题</div>
+                <div class="list">
+                  <div class="list_1" v-for="i in listOne" :key="i.value">
+                    <h2>{{ i.value }}</h2>
+                    <span>{{ i.label }}</span>
                   </div>
-                  <div class="boxfoot"></div>
                 </div>
-              </li>
-              <li></li>
-              <li>
-                <div class="boxall">
-                  <div class="titleall">优质企业</div>
-                  <div class="list four">
-                    <vue3-seamless-scroll
-                      :list="listFour"
-                      :hover="true"
-                      :step="0.2"
-                      :wheel="true"
-                      :isWatch="true"
-                      class="scroll"
-                    >
-                      <div class="wrap" v-for="(item, index) in listFour" :key="index">
-                        <div class="other">{{ item.name }}</div>
-                        <div class="other">{{ item.number }}人</div>
-                        <div class="other">{{ item.time }}</div>
-                      </div>
-                    </vue3-seamless-scroll>
+                <div class="boxfoot"></div>
+              </div>
+            </li>
+          </ul>
+          <ul class="clearfix">
+            <li>
+              <div class="boxall">
+                <div class="titleall">模块标题</div>
+                <div class="list thr">
+                  <div class="list_1" v-for="i in listThr" :key="i.value">
+                    <h2>{{ i.value }}</h2>
+                    <span>{{ i.label }}</span>
                   </div>
-                  <div class="boxfoot"></div>
                 </div>
-              </li>
-            </ul>
-            <ul class="clearfix" style="display: flex; justify-content: space-between">
-              <li style="width: 49.5%">
-                <div class="boxall">
-                  <div class="titleall">模块标题</div>
-                  <div class="five">
-                    <echarts1></echarts1>
-                  </div>
-                  <div class="boxfoot"></div>
+                <div class="boxfoot"></div>
+              </div>
+            </li>
+            <li></li>
+            <li>
+              <div class="boxall">
+                <div class="titleall">优质企业</div>
+                <div class="list four">
+                  <vue3-seamless-scroll
+                    :list="listFour"
+                    :hover="true"
+                    :step="0.2"
+                    :wheel="true"
+                    :isWatch="true"
+                    class="scroll"
+                  >
+                    <div class="wrap" v-for="(item, index) in listFour" :key="index">
+                      <div class="other">{{ item.name }}</div>
+                      <div class="other">{{ item.number }}人</div>
+                      <div class="other">{{ item.time }}</div>
+                    </div>
+                  </vue3-seamless-scroll>
                 </div>
-              </li>
-              <li style="width: 49.5%">
-                <div class="boxall">
-                  <div class="titleall">模块标题</div>
-                  <div class="six">
-                    <echarts2></echarts2>
-                  </div>
-                  <div class="boxfoot"></div>
+                <div class="boxfoot"></div>
+              </div>
+            </li>
+          </ul>
+          <ul class="clearfix" style="display: flex; justify-content: space-between">
+            <li style="width: 49.5%">
+              <div class="boxall">
+                <div class="titleall">模块标题</div>
+                <div class="five">
+                  <echarts1></echarts1>
+                </div>
+                <div class="boxfoot"></div>
+              </div>
+            </li>
+            <li style="width: 49.5%">
+              <div class="boxall">
+                <div class="titleall">模块标题</div>
+                <div class="six">
+                  <echarts2></echarts2>
                 </div>
-              </li>
-            </ul>
-          </div>
-        </el-col>
-      </el-row>
-      <!-- <div class="copyright">
+                <div class="boxfoot"></div>
+              </div>
+            </li>
+          </ul>
+        </div>
+      </el-col>
+    </el-row>
+    <!-- <div class="copyright">
       版权所有:Copyright©2007-2024 吉林省华欣数字科技股份有限公司 │ 吉ICP备14005689号
     </div> -->
-    </div>
-  </myMain>
+  </div>
 </template>
 
 <script setup>
-import myMain from './dataV/myMain.vue'
 import map1 from './path/map.vue'
 import echarts1 from './path/echarts1.vue'
 import echarts2 from './path/echarts2.vue'

+ 14 - 14
src/views/main/one.vue

@@ -253,7 +253,7 @@ const toMore = () => {
       justify-content: space-between;
       margin: 0 0 10px 0;
       .left {
-        font-size: 24px;
+        font-size: $global-font-size-26;
         font-family:
           PingFangSC-Semibold,
           PingFang SC;
@@ -263,13 +263,13 @@ const toMore = () => {
       }
       .right {
         text-align: right;
-        font-size: 14px;
+        font-size: $global-font-size-16;
         font-family:
           PingFangSC-Regular,
           PingFang SC;
         font-weight: 400;
         color: #2280ff;
-        line-height: 14px;
+        line-height: $global-font-size-16;
         display: block;
         margin-top: 13px;
         margin-right: 34px;
@@ -293,9 +293,9 @@ const toMore = () => {
 
         .left {
           font-family: PingFangSC-Regular;
-          font-size: 12px;
+          font-size: $global-font-size-14;
           color: #2374ff;
-          line-height: 12px;
+          line-height: $global-font-size-14;
           padding: 0 !important;
 
           .year {
@@ -303,8 +303,8 @@ const toMore = () => {
           }
 
           .date {
-            font-size: 22px;
-            line-height: 22px;
+            font-size: $global-font-size-24;
+            line-height: $global-font-size-24;
             margin-bottom: 10px;
           }
         }
@@ -313,15 +313,15 @@ const toMore = () => {
           padding: 0 !important;
           .name {
             font-family: PingFangSC-Medium;
-            font-size: 16px;
+            font-size: $global-font-size-18;
             color: #121834;
-            line-height: 16px;
+            line-height: $global-font-size-18;
             font-weight: 700;
             margin-bottom: 8px;
           }
 
           .content {
-            font-size: 12px;
+            font-size: $global-font-size-14;
             color: #525a68;
             line-height: 19px;
             font-weight: 400;
@@ -374,17 +374,17 @@ const toMore = () => {
       box-sizing: border-box;
       margin-bottom: 7px;
       .left {
-        font-size: 20px;
+        font-size: $global-font-size-22;
         font-family:
           PingFangSC-Medium,
           PingFang SC;
         font-weight: 500;
         color: #111;
-        line-height: 20px;
+        line-height: $global-font-size-20;
       }
       .right {
         text-align: right;
-        font-size: 14px;
+        font-size: $global-font-size-16;
         font-family:
           PingFangSC-Regular,
           PingFang SC;
@@ -409,7 +409,7 @@ const toMore = () => {
         }
         .name {
           padding: 10px;
-          font-size: 14px;
+          font-size: $global-font-size-16;
           font-family:
             PingFangSC-Medium,
             PingFang SC;

+ 1 - 1
src/views/main/parts/demand.vue

@@ -210,7 +210,7 @@ const submitForm = async (formEl) => {
   await formEl.validate(async (valid, fields) => {
     if (valid) {
       const data = cloneDeep(form.value)
-      const other = { status: '0', user: user.value._id }
+      const other = { status: '0', user: user.value.id }
       let res
       if (get(data, '_id')) res = await demandStore.update({ ...data, ...other })
       else await demandStore.create({ ...data, ...other })

+ 1 - 1
src/views/main/parts/supply.vue

@@ -212,7 +212,7 @@ const submitForm = async (formEl) => {
   await formEl.validate(async (valid, fields) => {
     if (valid) {
       const data = cloneDeep(form.value)
-      const other = { status: '0', user: user.value._id }
+      const other = { status: '0', user: user.value.id }
       let res
       if (get(data, '_id')) res = await supplyStore.update({ ...data, ...other })
       else res = await supplyStore.create({ ...data, ...other })

+ 4 - 4
src/views/main/six.vue

@@ -274,7 +274,7 @@ const sizeChange = (limits) => {
           }
           .title {
             color: #666;
-            font-size: 14px;
+            font-size: $global-font-size-16;
             line-height: 15px;
             margin: 0 10px;
             display: inline-block;
@@ -288,7 +288,7 @@ const sizeChange = (limits) => {
         }
         .button {
           color: #2374ff;
-          font-size: 12px;
+          font-size: $global-font-size-14;
           cursor: pointer;
         }
       }
@@ -313,7 +313,7 @@ const sizeChange = (limits) => {
         margin: 0 0 15px 0;
         .name {
           color: #337ab7;
-          font-size: 18px;
+          font-size: $global-font-size-20;
           font-weight: bold;
           display: inline-block;
           margin: 0 0 8px 0;
@@ -327,7 +327,7 @@ const sizeChange = (limits) => {
         .other_1 {
           font-family: 'PingFangSC-Light', 'Microsoft YaHei', 'WenQuanYi Micro Hei', arial,
             sans-serif;
-          font-size: 14px;
+          font-size: $global-font-size-16;
           font-weight: normal;
           color: #666;
         }

+ 2 - 2
src/views/main/ten.vue

@@ -101,7 +101,7 @@ const toView = (item) => {
       .list {
         margin: 20px 0;
         .name {
-          font-size: 25px;
+          font-size: $global-font-size-25;
           font-weight: bold;
           margin: 0 0 10px 0;
         }
@@ -118,7 +118,7 @@ const toView = (item) => {
           color: #ff4500;
         }
         .remark {
-          font-size: 18px;
+          font-size: $global-font-size-20;
           font-weight: bold;
         }
       }

+ 11 - 11
src/views/main/thirteen.vue

@@ -359,7 +359,7 @@ const toView = async (item) => {
           }
           .center1 {
             .title {
-              font-size: 16px;
+              font-size: $global-font-size-18;
               margin-bottom: 10px;
               color: #383838;
               font-weight: 600;
@@ -373,14 +373,14 @@ const toView = async (item) => {
               cursor: pointer;
             }
             .other_1 {
-              font-size: 14px;
+              font-size: $global-font-size-16;
               color: #9b9994;
               text-align: left;
               margin-bottom: 5px;
             }
             .other_2 {
               line-height: 24px;
-              font-size: 14px;
+              font-size: $global-font-size-16;
               height: 66px;
               overflow: hidden;
               color: #1d1e20;
@@ -406,7 +406,7 @@ const toView = async (item) => {
             }
             .other {
               .title {
-                font-size: 16px;
+                font-size: $global-font-size-18;
                 margin: 10px 0;
                 color: #383838;
                 white-space: nowrap;
@@ -418,7 +418,7 @@ const toView = async (item) => {
                 cursor: pointer;
               }
               .other_2 {
-                font-size: 14px;
+                font-size: $global-font-size-16;
                 overflow: hidden;
                 color: #1d1e20;
                 text-align: justify;
@@ -452,7 +452,7 @@ const toView = async (item) => {
             }
             .other {
               .title {
-                font-size: 16px;
+                font-size: $global-font-size-18;
                 margin: 10px 0;
                 color: #383838;
                 white-space: nowrap;
@@ -464,7 +464,7 @@ const toView = async (item) => {
                 cursor: pointer;
               }
               .other_2 {
-                font-size: 14px;
+                font-size: $global-font-size-16;
                 overflow: hidden;
                 color: #1d1e20;
                 text-align: justify;
@@ -504,7 +504,7 @@ const toView = async (item) => {
             .title {
               margin: 0;
               padding: 0;
-              font-size: 14px;
+              font-size: $global-font-size-16;
               color: #fff;
               text-align: center;
               font-weight: normal;
@@ -532,7 +532,7 @@ const toView = async (item) => {
             box-sizing: border-box;
             margin-bottom: 7px;
             .left {
-              font-size: 24px;
+              font-size: $global-font-size-26;
               font-family:
                 PingFangSC-Medium,
                 PingFang SC;
@@ -542,7 +542,7 @@ const toView = async (item) => {
             }
             .right {
               text-align: right;
-              font-size: 14px;
+              font-size: $global-font-size-16;
               font-family:
                 PingFangSC-Regular,
                 PingFang SC;
@@ -555,7 +555,7 @@ const toView = async (item) => {
             margin: 10px 0 0 0;
             .name {
               max-height: 48px;
-              font-size: 14px;
+              font-size: $global-font-size-16;
               font-family:
                 PingFangSC-Medium,
                 PingFang SC;

+ 4 - 4
src/views/main/thr.vue

@@ -109,7 +109,7 @@ const toSupply = async () => {
         padding: 20px;
         background: #337ab7;
         color: #ffff;
-        font-size: 16px;
+        font-size: $global-font-size-18;
         font-weight: bold;
         border-radius: 7px;
         margin: 0 0 10px 0;
@@ -118,7 +118,7 @@ const toSupply = async () => {
         padding: 20px;
         background: #337ab7;
         color: #ffff;
-        font-size: 16px;
+        font-size: $global-font-size-18;
         font-weight: bold;
         border-radius: 7px;
         margin: 0 0 10px 0;
@@ -130,7 +130,7 @@ const toSupply = async () => {
         padding: 20px;
         background: #337ab7;
         color: #ffff;
-        font-size: 16px;
+        font-size: $global-font-size-18;
         font-weight: bold;
         border-radius: 7px;
         margin: 0 0 10px 0;
@@ -139,7 +139,7 @@ const toSupply = async () => {
         padding: 20px;
         background: #337ab7;
         color: #ffff;
-        font-size: 16px;
+        font-size: $global-font-size-18;
         font-weight: bold;
         border-radius: 7px;
         margin: 0 0 10px 0;

+ 0 - 85
src/views/main/twelveHatch/dataV/mixin/autoResize.js

@@ -1,85 +0,0 @@
-import { debounce, observerDomResize } from '../util/index'
-
-export default {
-  data () {
-    return {
-      dom: '',
-
-      width: 0,
-      height: 0,
-
-      debounceInitWHFun: '',
-
-      domObserver: ''
-    }
-  },
-  methods: {
-    async autoResizeMixinInit () {
-      const { initWH, getDebounceInitWHFun, bindDomResizeCallback, afterAutoResizeMixinInit } = this
-
-      await initWH(false)
-
-      getDebounceInitWHFun()
-
-      bindDomResizeCallback()
-
-      if (typeof afterAutoResizeMixinInit === 'function') afterAutoResizeMixinInit()
-    },
-    initWH (resize = true) {
-      const { $nextTick, $refs, ref, onResize } = this
-
-      return new Promise(resolve => {
-        $nextTick((_) => {
-          const dom = (this.dom = $refs[ref])
-          // this.width = dom ? dom.clientWidth : 0
-          // this.height = dom ? dom.clientHeight : 0
-          this.width = window.innerWidth
-          this.height = window.innerHeight
-
-          if (!dom) {
-            console.warn('DataV: Failed to get dom node, component rendering may be abnormal!')
-          } else if (!this.width || !this.height) {
-            console.warn('DataV: Component width or height is 0px, rendering abnormality may occur!')
-          }
-
-          if (typeof onResize === 'function' && resize) onResize()
-
-          resolve()
-        })
-      })
-    },
-    getDebounceInitWHFun () {
-      const { initWH } = this
-
-      this.debounceInitWHFun = debounce(100, initWH)
-    },
-    bindDomResizeCallback () {
-      const { dom, debounceInitWHFun } = this
-
-      this.domObserver = observerDomResize(dom, debounceInitWHFun)
-
-      window.addEventListener('resize', debounceInitWHFun)
-    },
-    unbindDomResizeCallback () {
-      let { domObserver, debounceInitWHFun } = this
-
-      if (!domObserver) return
-
-      domObserver.disconnect()
-      domObserver.takeRecords()
-      domObserver = null
-
-      window.removeEventListener('resize', debounceInitWHFun)
-    }
-  },
-  mounted () {
-    const { autoResizeMixinInit } = this
-
-    autoResizeMixinInit()
-  },
-  beforeDestroy () {
-    const { unbindDomResizeCallback } = this
-
-    unbindDomResizeCallback()
-  }
-}

+ 0 - 60
src/views/main/twelveHatch/dataV/myMain.vue

@@ -1,60 +0,0 @@
-<template>
-  <div id="dv-full-screen-container" :ref="ref">
-    <template v-if="ready">
-      <slot></slot>
-    </template>
-  </div>
-</template>
-
-<script>
-import autoResize from './mixin/autoResize.js'
-
-export default {
-  name: 'DvFullScreenContainer',
-  mixins: [autoResize],
-  data() {
-    return {
-      ref: 'full-screen-container',
-      allWidth: 0,
-      allHeight: 0,
-      scale: 0,
-      datavRoot: '',
-      ready: false
-    }
-  },
-  methods: {
-    afterAutoResizeMixinInit() {
-      const { initConfig, setAppScale } = this
-
-      initConfig()
-
-      setAppScale()
-
-      this.ready = true
-    },
-    initConfig() {
-      const { dom } = this
-      // const { width } = screen
-      let width = window.innerWidth
-      let height = window.innerHeight
-      this.allWidth = width
-      this.allHeight = height
-
-      dom.style.width = `${width - 17}px`
-      dom.style.height = `${height}px`
-    },
-    setAppScale() {
-      const { allWidth, allHeight, dom } = this
-      const currentWidth = window.outerWidth
-      const currentHeight = window.innerHeight
-      // dom.style.transform = `scale(${currentWidth / allWidth})`
-      dom.style.transform = `scaleY(${currentHeight / allHeight}) scaleX(${currentWidth / allWidth})`
-    },
-    onResize() {
-      const { setAppScale } = this
-
-      setAppScale()
-    }
-  }
-}
-</script>

+ 0 - 47
src/views/main/twelveHatch/dataV/util/index.js

@@ -1,47 +0,0 @@
-export function randomExtend(minNum, maxNum) {
-  if (arguments.length === 1) {
-    return parseInt(Math.random() * minNum + 1, 10)
-  } else {
-    return parseInt(Math.random() * (maxNum - minNum + 1) + minNum, 10)
-  }
-}
-
-export function debounce(delay, callback) {
-  let lastTime
-
-  return function () {
-    clearTimeout(lastTime)
-
-    const [that, args] = [this, arguments]
-
-    lastTime = setTimeout(() => {
-      callback.apply(that, args)
-    }, delay)
-  }
-}
-
-export function observerDomResize(dom, callback) {
-  const MutationObserver = window.MutationObserver || window.WebKitMutationObserver || window.MozMutationObserver
-
-  const observer = new MutationObserver(callback)
-
-  observer.observe(dom, { attributes: true, attributeFilter: ['style'], attributeOldValue: true })
-
-  return observer
-}
-
-export function getPointDistance(pointOne, pointTwo) {
-  const minusX = Math.abs(pointOne[0] - pointTwo[0])
-
-  const minusY = Math.abs(pointOne[1] - pointTwo[1])
-
-  return Math.sqrt(minusX * minusX + minusY * minusY)
-}
-
-export function uuid(hasHyphen) {
-  return (hasHyphen ? 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx' : 'xxxxxxxxxxxx4xxxyxxxxxxxxxxxxxxx').replace(/[xy]/g, function (c) {
-    const r = (Math.random() * 16) | 0
-    const v = c == 'x' ? r : (r & 0x3) | 0x8
-    return v.toString(16)
-  })
-}

BIN
src/views/main/twelveHatch/images/twelvebBg.png


+ 80 - 83
src/views/main/twelveHatch/index.vue

@@ -1,95 +1,92 @@
 <template>
-  <myMain>
-    <div class="main">
-      <el-row>
-        <el-col :span="24" class="animate__animated animate__backInRight" v-loading="loading">
-          <div class="head clearfix">
-            <h1 class="pulll_left">产业孵化大脑</h1>
-            <div class="menu menu2 pulll_left">
-              <ul>
-                <li><a @click="toChange" href="#">返回</a></li>
-                <li><a @click="selectMenu('four')" href="#">信息检索</a></li>
-                <li><a @click="selectMenu('five')" href="#">双创活动</a></li>
-                <li><a @click="selectMenu('six')" href="#">中试平台</a></li>
-                <li><a @click="selectMenu('seven')" href="#">服务支撑</a></li>
-                <li><a @click="selectMenu('eight')" href="#">产业集群</a></li>
-                <li><a @click="selectMenu('nine')" href="#">成果展示</a></li>
-                <li><a @click="selectMenu('ten')" href="#">信息库</a></li>
-                <li><a @click="selectMenu('eleven')" href="#">孵化器</a></li>
-              </ul>
-            </div>
-            <div class="time">{{ formattedTime }}</div>
+  <div class="main">
+    <el-row>
+      <el-col :span="24" class="animate__animated animate__backInRight" v-loading="loading">
+        <div class="head clearfix">
+          <h1 class="pulll_left">产业孵化大脑</h1>
+          <div class="menu menu2 pulll_left">
+            <ul>
+              <li><a @click="toChange" href="#">返回</a></li>
+              <li><a @click="selectMenu('four')" href="#">信息检索</a></li>
+              <li><a @click="selectMenu('five')" href="#">双创活动</a></li>
+              <li><a @click="selectMenu('six')" href="#">中试平台</a></li>
+              <li><a @click="selectMenu('seven')" href="#">服务支撑</a></li>
+              <li><a @click="selectMenu('eight')" href="#">产业集群</a></li>
+              <li><a @click="selectMenu('nine')" href="#">成果展示</a></li>
+              <li><a @click="selectMenu('ten')" href="#">信息库</a></li>
+              <li><a @click="selectMenu('eleven')" href="#">孵化器</a></li>
+            </ul>
           </div>
-          <div class="mainbox">
-            <el-row :gutter="20">
-              <el-col :span="6">
-                <div class="center_1">
-                  <div class="box">
-                    <div class="tit">各类用户人数</div>
-                    <div class="boxnav" style="height: 340px">
-                      <div class="yqlist">
-                        <ul class="clearfix">
-                          <li>
-                            <div class="yq" id="yq">2634</div>
-                            <span>正在线人数(1)</span>
-                          </li>
-                          <li>
-                            <div class="yq">567</div>
-                            <span>对接人数(2)</span>
-                          </li>
-                          <li>
-                            <div class="yq">56345</div>
-                            <span>浏览人数(3)</span>
-                          </li>
-                          <li>
-                            <div class="yq">721</div>
-                            <span>用户总数(4)</span>
-                          </li>
-                        </ul>
-                      </div>
-                    </div>
-                  </div>
-                  <div class="box">
-                    <div class="tit">专家分布地区</div>
-                    <div class="boxnav">
-                      <echarts1></echarts1>
+          <div class="time">{{ formattedTime }}</div>
+        </div>
+        <div class="mainbox">
+          <el-row :gutter="20">
+            <el-col :span="6">
+              <div class="center_1">
+                <div class="box">
+                  <div class="tit">各类用户人数</div>
+                  <div class="boxnav" style="height: 340px">
+                    <div class="yqlist">
+                      <ul class="clearfix">
+                        <li>
+                          <div class="yq" id="yq">2634</div>
+                          <span>正在线人数(1)</span>
+                        </li>
+                        <li>
+                          <div class="yq">567</div>
+                          <span>对接人数(2)</span>
+                        </li>
+                        <li>
+                          <div class="yq">56345</div>
+                          <span>浏览人数(3)</span>
+                        </li>
+                        <li>
+                          <div class="yq">721</div>
+                          <span>用户总数(4)</span>
+                        </li>
+                      </ul>
                     </div>
                   </div>
                 </div>
-              </el-col>
-              <el-col :span="12">
-                <div class="center_1">
-                  <div class="box">
-                    <div class="boxnav mapc" style="position: relative">
-                      <map1 class="map"></map1>
-                    </div>
+                <div class="box">
+                  <div class="tit">专家分布地区</div>
+                  <div class="boxnav">
+                    <echarts1></echarts1>
                   </div>
                 </div>
-              </el-col>
-              <el-col :span="6">
-                <div class="center_1">
-                  <div class="box">
-                    <div class="tit">赛事总数及各阶段数量</div>
-                    <echarts3></echarts3>
-                  </div>
-                  <div class="box">
-                    <div class="tit">数据统计</div>
-                    <echarts4></echarts4>
+              </div>
+            </el-col>
+            <el-col :span="12">
+              <div class="center_1">
+                <div class="box">
+                  <div class="boxnav mapc" style="position: relative">
+                    <map1 class="map"></map1>
                   </div>
                 </div>
-              </el-col>
-            </el-row>
-          </div>
-        </el-col>
-      </el-row>
-    </div>
-  </myMain>
+              </div>
+            </el-col>
+            <el-col :span="6">
+              <div class="center_1">
+                <div class="box">
+                  <div class="tit">赛事总数及各阶段数量</div>
+                  <echarts3></echarts3>
+                </div>
+                <div class="box">
+                  <div class="tit">数据统计</div>
+                  <echarts4></echarts4>
+                </div>
+              </div>
+            </el-col>
+          </el-row>
+        </div>
+      </el-col>
+    </el-row>
+  </div>
 </template>
 
 <script setup>
 const toChange = inject('toChange')
 const selectMenu = inject('selectMenu')
-import myMain from './dataV/myMain.vue'
 import echarts1 from './path/echarts1.vue'
 // import echarts2 from './path/echarts2.vue'
 import map1 from './path/map.vue'
@@ -240,7 +237,7 @@ onBeforeUnmount(() => {
   }
   .head .menu li a {
     display: block;
-    font-size: 18px;
+    font-size: $global-font-size-20;
     color: #fff;
     line-height: 30px;
     padding: 0 10px;
@@ -321,7 +318,7 @@ onBeforeUnmount(() => {
   .tit {
     padding: 10px 10px 10px 25px;
     border-bottom: 1px solid rgba(7, 118, 181, 0.7);
-    font-size: 16px;
+    font-size: $global-font-size-18;
     font-weight: 500;
     position: relative;
   }
@@ -358,7 +355,7 @@ onBeforeUnmount(() => {
     padding: 0 10px;
   }
   .tit01 {
-    font-size: 16px;
+    font-size: $global-font-size-18;
     font-weight: 500;
     position: relative;
     padding-left: 15px;
@@ -398,13 +395,13 @@ onBeforeUnmount(() => {
     display: flex;
     justify-content: center;
     align-items: center;
-    font-size: 25px;
+    font-size: $global-font-size-25;
     font-family: electronicFont;
     color: #fff32b;
   }
   .yqlist li span {
     opacity: 0.6;
-    font-size: 14px;
+    font-size: $global-font-size-16;
   }
 
   .yq:before {

+ 3 - 3
src/views/news/detail.vue

@@ -63,7 +63,7 @@ const searchOther = async () => {
 <style scoped lang="scss">
 .main {
   .one {
-    font-size: 24px;
+    font-size: $global-font-size-26;
     font-weight: 700;
     border-bottom: 2px solid #2374ff;
     text-align: center;
@@ -76,14 +76,14 @@ const searchOther = async () => {
 
   .two {
     display: flex;
-    font-size: 14px;
+    font-size: $global-font-size-16;
     color: #7e8288;
     margin: 20px 0;
   }
 
   .thr {
     font-family: PingFangSC-Regular;
-    font-size: 20px;
+    font-size: $global-font-size-22;
     color: #383b40;
     line-height: 24px;
   }

+ 14 - 14
src/views/news/index.vue

@@ -201,8 +201,8 @@ const removeHtmlStyle = (html) => {
               align-items: center;
               justify-content: center;
               font-family: PingFangSC-Regular;
-              font-size: 12px;
-              line-height: 12px;
+              font-size: $global-font-size-14;
+              line-height: $global-font-size-14;
               width: 95px;
               height: 75px;
               background: #2374ff;
@@ -214,8 +214,8 @@ const removeHtmlStyle = (html) => {
               }
 
               .date {
-                font-size: 22px;
-                line-height: 22px;
+                font-size: $global-font-size-24;
+                line-height: $global-font-size-24;
                 margin-bottom: 10px;
               }
             }
@@ -223,15 +223,15 @@ const removeHtmlStyle = (html) => {
             .right {
               .name {
                 font-family: PingFangSC-Medium;
-                font-size: 16px;
+                font-size: $global-font-size-18;
                 color: #121834;
-                line-height: 16px;
+                line-height: $global-font-size-18;
                 font-weight: 700;
                 margin-bottom: 8px;
               }
 
               .content {
-                font-size: 12px;
+                font-size: $global-font-size-14;
                 color: #525a68;
                 line-height: 19px;
                 font-weight: 400;
@@ -277,8 +277,8 @@ const removeHtmlStyle = (html) => {
               align-items: center;
               justify-content: center;
               font-family: PingFangSC-Regular;
-              font-size: 12px;
-              line-height: 12px;
+              font-size: $global-font-size-14;
+              line-height: $global-font-size-14;
               width: 95px;
               height: 75px;
               background: #2374ff;
@@ -290,8 +290,8 @@ const removeHtmlStyle = (html) => {
               }
 
               .date {
-                font-size: 22px;
-                line-height: 22px;
+                font-size: $global-font-size-24;
+                line-height: $global-font-size-24;
                 margin-bottom: 10px;
               }
             }
@@ -299,15 +299,15 @@ const removeHtmlStyle = (html) => {
             .right {
               .name {
                 font-family: PingFangSC-Medium;
-                font-size: 16px;
+                font-size: $global-font-size-18;
                 color: #121834;
-                line-height: 16px;
+                line-height: $global-font-size-18;
                 font-weight: 700;
                 margin-bottom: 8px;
               }
 
               .content {
-                font-size: 12px;
+                font-size: $global-font-size-14;
                 color: #525a68;
                 line-height: 19px;
                 font-weight: 400;

+ 22 - 22
src/views/platform/detail.vue

@@ -233,11 +233,11 @@ const toDocking = () => {
 }
 // 收藏
 const toCollection = async (status) => {
-  if (user.value._id) {
+  if (user.value.id) {
     let res
     let message
     const data = {
-      user: user.value._id,
+      user: user.value.id,
       source: info.value._id,
       type: 'demand',
       time: moment().format('YYYY-MM-DD')
@@ -296,7 +296,7 @@ const sizeChange = (limits) => {
       margin: 0 0 10px 0;
 
       .title {
-        font-size: 18px;
+        font-size: $global-font-size-20;
         font-weight: 700;
         color: #383b40;
       }
@@ -306,7 +306,7 @@ const sizeChange = (limits) => {
         align-items: center;
         justify-content: flex-end;
         font-family: PingFangSC-Regular;
-        font-size: 14px;
+        font-size: $global-font-size-16;
         color: #2374ff;
         text-align: right;
         span {
@@ -317,12 +317,12 @@ const sizeChange = (limits) => {
 
     .one_2 {
       display: inline-block;
-      font-size: 12px;
+      font-size: $global-font-size-14;
       background: rgba(18, 172, 117, 0.05);
       color: #12ac75;
       padding: 0 15px;
       height: 20px;
-      line-height: 20px;
+      line-height: $global-font-size-20;
       border-radius: 10px;
       margin-bottom: 2px;
     }
@@ -334,9 +334,9 @@ const sizeChange = (limits) => {
     padding: 30px;
     margin: 34px 0 20px;
     font-family: PingFangSC-Medium;
-    font-size: 14px;
+    font-size: $global-font-size-16;
     color: #383b40;
-    line-height: 14px;
+    line-height: $global-font-size-16;
   }
 
   .thr {
@@ -356,7 +356,7 @@ const sizeChange = (limits) => {
         height: 40px;
         border-bottom: 2px solid #2374ff;
         color: #fff;
-        font-size: 18px;
+        font-size: $global-font-size-20;
         background: #2374ff;
       }
     }
@@ -375,9 +375,9 @@ const sizeChange = (limits) => {
         .name {
           height: 20px;
           font-family: PingFangSC-Semibold;
-          font-size: 18px;
+          font-size: $global-font-size-20;
           color: #383b40;
-          line-height: 20px;
+          line-height: $global-font-size-20;
           font-weight: 700;
           margin-bottom: 8px;
         }
@@ -385,17 +385,17 @@ const sizeChange = (limits) => {
         .other {
           height: 14px;
           font-family: PingFangSC-Medium;
-          font-size: 14px;
+          font-size: $global-font-size-16;
           color: #383b40;
-          line-height: 14px;
+          line-height: $global-font-size-16;
           font-weight: 700;
 
           span {
             height: 14px;
             font-family: PingFangSC-Regular;
-            font-size: 14px;
+            font-size: $global-font-size-16;
             color: #7e8288;
-            line-height: 14px;
+            line-height: $global-font-size-16;
             font-weight: 400;
             margin-right: 10px;
           }
@@ -426,7 +426,7 @@ const sizeChange = (limits) => {
         height: 40px;
         border-bottom: 2px solid #2374ff;
         color: #fff;
-        font-size: 18px;
+        font-size: $global-font-size-20;
         background: #2374ff;
       }
     }
@@ -445,7 +445,7 @@ const sizeChange = (limits) => {
         transition: all 0.3s;
         padding: 15px;
         .name {
-          font-size: 16px;
+          font-size: $global-font-size-18;
           color: #121834;
           height: 16px;
           line-height: 13px;
@@ -458,9 +458,9 @@ const sizeChange = (limits) => {
         }
 
         .two_1 {
-          font-size: 12px;
+          font-size: $global-font-size-14;
           text-align: justify;
-          line-height: 12px;
+          line-height: $global-font-size-14;
           font-weight: 400;
           letter-spacing: 0;
           color: #8f97a3;
@@ -493,16 +493,16 @@ const sizeChange = (limits) => {
     align-items: center;
     justify-content: flex-end;
     font-family: PingFangSC-Regular;
-    font-size: 14px;
+    font-size: $global-font-size-16;
     color: #7e8288;
     margin: 10px 0 0 0;
     .money {
       margin: 0 10px 0 0;
       span {
         font-family: PingFangSC-Semibold;
-        font-size: 20px;
+        font-size: $global-font-size-22;
         color: #e94643;
-        line-height: 20px;
+        line-height: $global-font-size-20;
       }
     }
   }

+ 22 - 22
src/views/project/detail.vue

@@ -242,11 +242,11 @@ const toDocking = () => {
 }
 // 收藏
 const toCollection = async (status) => {
-  if (user.value._id) {
+  if (user.value.id) {
     let res
     let message
     const data = {
-      user: user.value._id,
+      user: user.value.id,
       source: info.value._id,
       type: 'project',
       time: moment().format('YYYY-MM-DD')
@@ -302,7 +302,7 @@ const sizeChange = (limits) => {
       margin: 0 0 10px 0;
 
       .title {
-        font-size: 18px;
+        font-size: $global-font-size-20;
         font-weight: 700;
         color: #383b40;
       }
@@ -312,7 +312,7 @@ const sizeChange = (limits) => {
         align-items: center;
         justify-content: flex-end;
         font-family: PingFangSC-Regular;
-        font-size: 14px;
+        font-size: $global-font-size-16;
         color: #2374ff;
         span {
           margin: 0 0 0 5px;
@@ -322,12 +322,12 @@ const sizeChange = (limits) => {
 
     .one_2 {
       display: inline-block;
-      font-size: 12px;
+      font-size: $global-font-size-14;
       background: rgba(18, 172, 117, 0.05);
       color: #12ac75;
       padding: 0 15px;
       height: 20px;
-      line-height: 20px;
+      line-height: $global-font-size-20;
       border-radius: 10px;
       margin-bottom: 2px;
     }
@@ -339,9 +339,9 @@ const sizeChange = (limits) => {
     padding: 30px;
     margin: 34px 0 20px;
     font-family: PingFangSC-Medium;
-    font-size: 14px;
+    font-size: $global-font-size-16;
     color: #383b40;
-    line-height: 14px;
+    line-height: $global-font-size-16;
   }
 
   .thr {
@@ -361,7 +361,7 @@ const sizeChange = (limits) => {
         height: 40px;
         border-bottom: 2px solid #2374ff;
         color: #fff;
-        font-size: 18px;
+        font-size: $global-font-size-20;
         background: #2374ff;
       }
     }
@@ -380,9 +380,9 @@ const sizeChange = (limits) => {
         .name {
           height: 20px;
           font-family: PingFangSC-Semibold;
-          font-size: 18px;
+          font-size: $global-font-size-20;
           color: #383b40;
-          line-height: 20px;
+          line-height: $global-font-size-20;
           font-weight: 700;
           margin-bottom: 8px;
         }
@@ -390,17 +390,17 @@ const sizeChange = (limits) => {
         .other {
           height: 14px;
           font-family: PingFangSC-Medium;
-          font-size: 14px;
+          font-size: $global-font-size-16;
           color: #383b40;
-          line-height: 14px;
+          line-height: $global-font-size-16;
           font-weight: 700;
 
           span {
             height: 14px;
             font-family: PingFangSC-Regular;
-            font-size: 14px;
+            font-size: $global-font-size-16;
             color: #7e8288;
-            line-height: 14px;
+            line-height: $global-font-size-16;
             font-weight: 400;
             margin-right: 16px;
           }
@@ -431,7 +431,7 @@ const sizeChange = (limits) => {
         height: 40px;
         border-bottom: 2px solid #2374ff;
         color: #fff;
-        font-size: 18px;
+        font-size: $global-font-size-20;
         background: #2374ff;
       }
     }
@@ -450,7 +450,7 @@ const sizeChange = (limits) => {
         transition: all 0.3s;
         padding: 15px;
         .name {
-          font-size: 16px;
+          font-size: $global-font-size-18;
           color: #121834;
           height: 16px;
           line-height: 13px;
@@ -463,9 +463,9 @@ const sizeChange = (limits) => {
         }
 
         .two_1 {
-          font-size: 12px;
+          font-size: $global-font-size-14;
           text-align: justify;
-          line-height: 12px;
+          line-height: $global-font-size-14;
           font-weight: 400;
           letter-spacing: 0;
           color: #8f97a3;
@@ -498,16 +498,16 @@ const sizeChange = (limits) => {
     align-items: center;
     justify-content: flex-end;
     font-family: PingFangSC-Regular;
-    font-size: 14px;
+    font-size: $global-font-size-16;
     color: #7e8288;
     margin: 10px 0 0 0;
     .money {
       margin: 0 10px 0 0;
       span {
         font-family: PingFangSC-Semibold;
-        font-size: 20px;
+        font-size: $global-font-size-22;
         color: #e94643;
-        line-height: 20px;
+        line-height: $global-font-size-20;
       }
     }
   }

+ 10 - 10
src/views/project/index.vue

@@ -421,7 +421,7 @@ const sizeChange = (limits) => {
             margin-right: 10px;
             background-color: #fff;
             padding: 5px;
-            font-size: 14px;
+            font-size: $global-font-size-16;
             .left {
               padding: 10px;
             }
@@ -477,7 +477,7 @@ const sizeChange = (limits) => {
         }
         .title {
           color: #666;
-          font-size: 14px;
+          font-size: $global-font-size-16;
           line-height: 15px;
           margin: 0 10px;
           display: inline-block;
@@ -491,7 +491,7 @@ const sizeChange = (limits) => {
       }
       .button {
         color: #2374ff;
-        font-size: 12px;
+        font-size: $global-font-size-14;
         cursor: pointer;
       }
     }
@@ -511,7 +511,7 @@ const sizeChange = (limits) => {
       padding: 20px;
 
       .name {
-        font-size: 16px;
+        font-size: $global-font-size-18;
         color: #121834;
         height: 16px;
         line-height: 13px;
@@ -524,9 +524,9 @@ const sizeChange = (limits) => {
       }
 
       .two_1 {
-        font-size: 12px;
+        font-size: $global-font-size-14;
         text-align: justify;
-        line-height: 12px;
+        line-height: $global-font-size-14;
         font-weight: 400;
         letter-spacing: 0;
         color: #8f97a3;
@@ -545,19 +545,19 @@ const sizeChange = (limits) => {
 
         .status {
           padding: 5px 12px;
-          font-size: 12px;
+          font-size: $global-font-size-14;
           color: #2374ff;
-          line-height: 12px;
+          line-height: $global-font-size-14;
           font-weight: 400;
           background: rgba(35, 116, 255, 0.05);
           border-radius: 16px;
         }
 
         .button {
-          font-size: 12px;
+          font-size: $global-font-size-14;
           color: #fff;
           text-align: center;
-          line-height: 12px;
+          line-height: $global-font-size-14;
           font-weight: 500;
           padding: 5px 12px;
           background: #2374ff;

+ 5 - 5
src/views/register/parts/association.vue

@@ -256,10 +256,10 @@ const submitForm = async (formEl) => {
   .text {
     padding: 10px 0;
     font-family: PingFangSC-Semibold;
-    font-size: 18px;
+    font-size: $global-font-size-20;
     color: #383b40;
     letter-spacing: 0;
-    line-height: 18px;
+    line-height: $global-font-size-20;
     font-weight: 600;
   }
 
@@ -270,7 +270,7 @@ const submitForm = async (formEl) => {
     span {
       cursor: pointer;
       font-family: PingFangSC-Regular;
-      font-size: 14px;
+      font-size: $global-font-size-16;
       color: #333333;
       letter-spacing: -0.09px;
       text-align: right;
@@ -290,7 +290,7 @@ const submitForm = async (formEl) => {
       height: 44px !important;
       border: 0 !important;
       color: #f8f8f8 !important;
-      font-size: 16px !important;
+      font-size: $global-font-size-18 !important;
       text-align: center !important;
       line-height: 40px !important;
       cursor: pointer !important;
@@ -304,7 +304,7 @@ const submitForm = async (formEl) => {
     align-items: center;
     padding: 0 0 10px 0;
     color: #999;
-    font-size: 12px;
+    font-size: $global-font-size-14;
 
     span:last-child {
       color: #2374ff;

+ 5 - 5
src/views/register/parts/company.vue

@@ -392,10 +392,10 @@ const submitForm = async (formEl) => {
   .text {
     padding: 10px 0;
     font-family: PingFangSC-Semibold;
-    font-size: 18px;
+    font-size: $global-font-size-20;
     color: #383b40;
     letter-spacing: 0;
-    line-height: 18px;
+    line-height: $global-font-size-20;
     font-weight: 600;
   }
 
@@ -406,7 +406,7 @@ const submitForm = async (formEl) => {
     span {
       cursor: pointer;
       font-family: PingFangSC-Regular;
-      font-size: 14px;
+      font-size: $global-font-size-16;
       color: #333333;
       letter-spacing: -0.09px;
       text-align: right;
@@ -426,7 +426,7 @@ const submitForm = async (formEl) => {
       height: 44px !important;
       border: 0 !important;
       color: #f8f8f8 !important;
-      font-size: 16px !important;
+      font-size: $global-font-size-18 !important;
       text-align: center !important;
       line-height: 40px !important;
       cursor: pointer !important;
@@ -440,7 +440,7 @@ const submitForm = async (formEl) => {
     align-items: center;
     padding: 0 0 10px 0;
     color: #999;
-    font-size: 12px;
+    font-size: $global-font-size-14;
 
     span:last-child {
       color: #2374ff;

+ 5 - 5
src/views/register/parts/competition.vue

@@ -256,10 +256,10 @@ const submitForm = async (formEl) => {
   .text {
     padding: 10px 0;
     font-family: PingFangSC-Semibold;
-    font-size: 18px;
+    font-size: $global-font-size-20;
     color: #383b40;
     letter-spacing: 0;
-    line-height: 18px;
+    line-height: $global-font-size-20;
     font-weight: 600;
   }
 
@@ -270,7 +270,7 @@ const submitForm = async (formEl) => {
     span {
       cursor: pointer;
       font-family: PingFangSC-Regular;
-      font-size: 14px;
+      font-size: $global-font-size-16;
       color: #333333;
       letter-spacing: -0.09px;
       text-align: right;
@@ -290,7 +290,7 @@ const submitForm = async (formEl) => {
       height: 44px !important;
       border: 0 !important;
       color: #f8f8f8 !important;
-      font-size: 16px !important;
+      font-size: $global-font-size-18 !important;
       text-align: center !important;
       line-height: 40px !important;
       cursor: pointer !important;
@@ -304,7 +304,7 @@ const submitForm = async (formEl) => {
     align-items: center;
     padding: 0 0 10px 0;
     color: #999;
-    font-size: 12px;
+    font-size: $global-font-size-14;
 
     span:last-child {
       color: #2374ff;

+ 5 - 5
src/views/register/parts/expert.vue

@@ -362,10 +362,10 @@ const submitForm = async (formEl) => {
   .text {
     padding: 10px 0;
     font-family: PingFangSC-Semibold;
-    font-size: 18px;
+    font-size: $global-font-size-20;
     color: #383b40;
     letter-spacing: 0;
-    line-height: 18px;
+    line-height: $global-font-size-20;
     font-weight: 600;
   }
 
@@ -376,7 +376,7 @@ const submitForm = async (formEl) => {
     span {
       cursor: pointer;
       font-family: PingFangSC-Regular;
-      font-size: 14px;
+      font-size: $global-font-size-16;
       color: #333333;
       letter-spacing: -0.09px;
       text-align: right;
@@ -396,7 +396,7 @@ const submitForm = async (formEl) => {
       height: 44px !important;
       border: 0 !important;
       color: #f8f8f8 !important;
-      font-size: 16px !important;
+      font-size: $global-font-size-18 !important;
       text-align: center !important;
       line-height: 40px !important;
       cursor: pointer !important;
@@ -410,7 +410,7 @@ const submitForm = async (formEl) => {
     align-items: center;
     padding: 0 0 10px 0;
     color: #999;
-    font-size: 12px;
+    font-size: $global-font-size-14;
 
     span:last-child {
       color: #2374ff;

+ 5 - 5
src/views/register/parts/incubator.vue

@@ -256,10 +256,10 @@ const submitForm = async (formEl) => {
   .text {
     padding: 10px 0;
     font-family: PingFangSC-Semibold;
-    font-size: 18px;
+    font-size: $global-font-size-20;
     color: #383b40;
     letter-spacing: 0;
-    line-height: 18px;
+    line-height: $global-font-size-20;
     font-weight: 600;
   }
 
@@ -270,7 +270,7 @@ const submitForm = async (formEl) => {
     span {
       cursor: pointer;
       font-family: PingFangSC-Regular;
-      font-size: 14px;
+      font-size: $global-font-size-16;
       color: #333333;
       letter-spacing: -0.09px;
       text-align: right;
@@ -290,7 +290,7 @@ const submitForm = async (formEl) => {
       height: 44px !important;
       border: 0 !important;
       color: #f8f8f8 !important;
-      font-size: 16px !important;
+      font-size: $global-font-size-18 !important;
       text-align: center !important;
       line-height: 40px !important;
       cursor: pointer !important;
@@ -304,7 +304,7 @@ const submitForm = async (formEl) => {
     align-items: center;
     padding: 0 0 10px 0;
     color: #999;
-    font-size: 12px;
+    font-size: $global-font-size-14;
 
     span:last-child {
       color: #2374ff;

+ 5 - 5
src/views/register/parts/investment.vue

@@ -284,10 +284,10 @@ const submitForm = async (formEl) => {
   .text {
     padding: 10px 0;
     font-family: PingFangSC-Semibold;
-    font-size: 18px;
+    font-size: $global-font-size-20;
     color: #383b40;
     letter-spacing: 0;
-    line-height: 18px;
+    line-height: $global-font-size-20;
     font-weight: 600;
   }
 
@@ -298,7 +298,7 @@ const submitForm = async (formEl) => {
     span {
       cursor: pointer;
       font-family: PingFangSC-Regular;
-      font-size: 14px;
+      font-size: $global-font-size-16;
       color: #333333;
       letter-spacing: -0.09px;
       text-align: right;
@@ -318,7 +318,7 @@ const submitForm = async (formEl) => {
       height: 44px !important;
       border: 0 !important;
       color: #f8f8f8 !important;
-      font-size: 16px !important;
+      font-size: $global-font-size-18 !important;
       text-align: center !important;
       line-height: 40px !important;
       cursor: pointer !important;
@@ -332,7 +332,7 @@ const submitForm = async (formEl) => {
     align-items: center;
     padding: 0 0 10px 0;
     color: #999;
-    font-size: 12px;
+    font-size: $global-font-size-14;
 
     span:last-child {
       color: #2374ff;

+ 5 - 5
src/views/register/parts/state.vue

@@ -269,10 +269,10 @@ const submitForm = async (formEl) => {
   .text {
     padding: 10px 0;
     font-family: PingFangSC-Semibold;
-    font-size: 18px;
+    font-size: $global-font-size-20;
     color: #383b40;
     letter-spacing: 0;
-    line-height: 18px;
+    line-height: $global-font-size-20;
     font-weight: 600;
   }
 
@@ -283,7 +283,7 @@ const submitForm = async (formEl) => {
     span {
       cursor: pointer;
       font-family: PingFangSC-Regular;
-      font-size: 14px;
+      font-size: $global-font-size-16;
       color: #333333;
       letter-spacing: -0.09px;
       text-align: right;
@@ -303,7 +303,7 @@ const submitForm = async (formEl) => {
       height: 44px !important;
       border: 0 !important;
       color: #f8f8f8 !important;
-      font-size: 16px !important;
+      font-size: $global-font-size-18 !important;
       text-align: center !important;
       line-height: 40px !important;
       cursor: pointer !important;
@@ -317,7 +317,7 @@ const submitForm = async (formEl) => {
     align-items: center;
     padding: 0 0 10px 0;
     color: #999;
-    font-size: 12px;
+    font-size: $global-font-size-14;
 
     span:last-child {
       color: #2374ff;

+ 5 - 5
src/views/register/parts/unit.vue

@@ -256,10 +256,10 @@ const submitForm = async (formEl) => {
   .text {
     padding: 10px 0;
     font-family: PingFangSC-Semibold;
-    font-size: 18px;
+    font-size: $global-font-size-20;
     color: #383b40;
     letter-spacing: 0;
-    line-height: 18px;
+    line-height: $global-font-size-20;
     font-weight: 600;
   }
 
@@ -270,7 +270,7 @@ const submitForm = async (formEl) => {
     span {
       cursor: pointer;
       font-family: PingFangSC-Regular;
-      font-size: 14px;
+      font-size: $global-font-size-16;
       color: #333333;
       letter-spacing: -0.09px;
       text-align: right;
@@ -290,7 +290,7 @@ const submitForm = async (formEl) => {
       height: 44px !important;
       border: 0 !important;
       color: #f8f8f8 !important;
-      font-size: 16px !important;
+      font-size: $global-font-size-18 !important;
       text-align: center !important;
       line-height: 40px !important;
       cursor: pointer !important;
@@ -304,7 +304,7 @@ const submitForm = async (formEl) => {
     align-items: center;
     padding: 0 0 10px 0;
     color: #999;
-    font-size: 12px;
+    font-size: $global-font-size-14;
 
     span:last-child {
       color: #2374ff;

+ 3 - 3
src/views/register/parts/user.vue

@@ -173,7 +173,7 @@ const submitForm = async (formEl) => {
     span {
       cursor: pointer;
       font-family: PingFangSC-Regular;
-      font-size: 14px;
+      font-size: $global-font-size-16;
       color: #333333;
       letter-spacing: -0.09px;
       text-align: right;
@@ -193,7 +193,7 @@ const submitForm = async (formEl) => {
       height: 44px !important;
       border: 0 !important;
       color: #f8f8f8 !important;
-      font-size: 16px !important;
+      font-size: $global-font-size-18 !important;
       text-align: center !important;
       line-height: 40px !important;
       cursor: pointer !important;
@@ -207,7 +207,7 @@ const submitForm = async (formEl) => {
     align-items: center;
     padding: 0 0 10px 0;
     color: #999;
-    font-size: 12px;
+    font-size: $global-font-size-14;
 
     span:last-child {
       color: #2374ff;

+ 24 - 16
src/views/register/parts/userCode.vue

@@ -154,21 +154,29 @@ const submitForm = async (formEl) => {
   await formEl.validate(async (valid, fields) => {
     if (valid) {
       const data = cloneDeep(form.value)
-      data.account = data.nick_name
-      data.gender = '0'
-      if (data.role === 'User') data.role = [data.role]
-      else data.role = ['User', ...[data.role]]
-      delete data.refpassword
-      delete data.checkCode
-      delete data.plate
-      delete data.type
-      const res = await store.create(data)
-      if (res.errcode === 0) {
+      const user = await store.query({ account: data.nick_name })
+      if (user.total === 0) {
+        data.account = data.nick_name
+        data.gender = '0'
+        if (data.role === 'User') data.role = [data.role]
+        else data.role = ['User', ...[data.role]]
+        delete data.refpassword
+        delete data.checkCode
+        delete data.plate
+        delete data.type
+        const res = await store.create(data)
+        if (res.errcode === 0) {
+          ElMessage({
+            message: '注册用户成功,审核中请稍后登录',
+            type: 'success'
+          })
+          router.push({ path: '/login' })
+        }
+      } else {
         ElMessage({
-          message: '注册用户成功,审核中请稍后登录',
-          type: 'success'
+          message: '已有相同姓名或实验室名称 请重新输入!',
+          type: 'warning'
         })
-        router.push({ path: '/login' })
       }
     } else {
       console.log('error submit!', fields)
@@ -189,7 +197,7 @@ const submitForm = async (formEl) => {
     span {
       cursor: pointer;
       font-family: PingFangSC-Regular;
-      font-size: 14px;
+      font-size: $global-font-size-16;
       color: #333333;
       letter-spacing: -0.09px;
       text-align: right;
@@ -209,7 +217,7 @@ const submitForm = async (formEl) => {
       height: 44px !important;
       border: 0 !important;
       color: #f8f8f8 !important;
-      font-size: 16px !important;
+      font-size: $global-font-size-18 !important;
       text-align: center !important;
       line-height: 40px !important;
       cursor: pointer !important;
@@ -223,7 +231,7 @@ const submitForm = async (formEl) => {
     align-items: center;
     padding: 0 0 10px 0;
     color: #999;
-    font-size: 12px;
+    font-size: $global-font-size-14;
 
     span:last-child {
       color: #2374ff;

+ 2 - 2
src/views/release/index.vue

@@ -110,7 +110,7 @@ const search = async (query = { skip: 0, limit }) => {
   const info = {
     skip: query.skip,
     limit: query.limit,
-    user: user.value._id
+    user: user.value.id
   }
   let res
   if (routeType.value == 'achievement') res = await achieveStore.query(info)
@@ -207,7 +207,7 @@ const submitForm = async (formEl) => {
   await formEl.validate(async (valid, fields) => {
     if (valid) {
       const data = cloneDeep(form.value)
-      const other = { status: '0', user: user.value._id }
+      const other = { status: '0', user: user.value.id }
       let res
       if (get(data, '_id')) {
         if (routeType.value == 'achievement') res = await achieveStore.update({ ...data, ...other })

+ 5 - 5
src/views/release/parts/parts/list.vue

@@ -97,7 +97,7 @@ const sizeChange = inject('sizeChange')
       .name {
         display: flex;
         align-items: center;
-        font-size: 16px;
+        font-size: $global-font-size-18;
         color: #121834;
         font-weight: 500;
         margin: 5px 0 0 0;
@@ -114,9 +114,9 @@ const sizeChange = inject('sizeChange')
       }
 
       .other_1 {
-        font-size: 12px;
+        font-size: $global-font-size-14;
         text-align: justify;
-        line-height: 12px;
+        line-height: $global-font-size-14;
         font-weight: 400;
         letter-spacing: 0;
         color: #8f97a3;
@@ -134,10 +134,10 @@ const sizeChange = inject('sizeChange')
         margin: 10px;
         text-align: right;
         .button {
-          font-size: 12px;
+          font-size: $global-font-size-14;
           color: #fff;
           text-align: center;
-          line-height: 12px;
+          line-height: $global-font-size-14;
           font-weight: 500;
           padding: 5px 12px;
           background: #2374ff;

+ 1 - 1
src/views/search/index.vue

@@ -283,7 +283,7 @@ provide('changePage', changePage)
         height: 45px;
         line-height: 45px;
         font-family: PingFangSC-Regular;
-        font-size: 16px;
+        font-size: $global-font-size-18;
         padding-right: 24px;
         color: #fff;
         border: none !important;

+ 5 - 5
src/views/search/parts/list.vue

@@ -89,7 +89,7 @@ const sizeChange = inject('sizeChange')
       .name {
         display: flex;
         align-items: center;
-        font-size: 16px;
+        font-size: $global-font-size-18;
         color: #121834;
         font-weight: 500;
         margin: 5px 0 0 0;
@@ -106,9 +106,9 @@ const sizeChange = inject('sizeChange')
       }
 
       .other_1 {
-        font-size: 12px;
+        font-size: $global-font-size-14;
         text-align: justify;
-        line-height: 12px;
+        line-height: $global-font-size-14;
         font-weight: 400;
         letter-spacing: 0;
         color: #8f97a3;
@@ -123,10 +123,10 @@ const sizeChange = inject('sizeChange')
         margin: 10px;
         text-align: right;
         .button {
-          font-size: 12px;
+          font-size: $global-font-size-14;
           color: #fff;
           text-align: center;
-          line-height: 12px;
+          line-height: $global-font-size-14;
           font-weight: 500;
           padding: 5px 12px;
           background: #2374ff;

+ 7 - 7
src/views/search/parts/news.vue

@@ -82,17 +82,17 @@ const removeHtmlStyle = (html) => {
 
       .left {
         font-family: PingFangSC-Regular;
-        font-size: 12px;
+        font-size: $global-font-size-14;
         color: #2374ff;
-        line-height: 12px;
+        line-height: $global-font-size-14;
 
         .year {
           margin-bottom: 2px;
         }
 
         .date {
-          font-size: 22px;
-          line-height: 22px;
+          font-size: $global-font-size-24;
+          line-height: $global-font-size-24;
           margin-bottom: 10px;
         }
       }
@@ -100,15 +100,15 @@ const removeHtmlStyle = (html) => {
       .right {
         .name {
           font-family: PingFangSC-Medium;
-          font-size: 16px;
+          font-size: $global-font-size-18;
           color: #121834;
-          line-height: 16px;
+          line-height: $global-font-size-18;
           font-weight: 700;
           margin-bottom: 8px;
         }
 
         .content {
-          font-size: 12px;
+          font-size: $global-font-size-14;
           color: #525a68;
           line-height: 19px;
           font-weight: 400;

+ 22 - 22
src/views/server/detail.vue

@@ -218,11 +218,11 @@ const toDocking = () => {
 }
 // 收藏
 const toCollection = async (status) => {
-  if (user.value._id) {
+  if (user.value.id) {
     let res
     let message
     const data = {
-      user: user.value._id,
+      user: user.value.id,
       source: info.value._id,
       type: 'demand',
       time: moment().format('YYYY-MM-DD')
@@ -281,7 +281,7 @@ const sizeChange = (limits) => {
       margin: 0 0 10px 0;
 
       .title {
-        font-size: 18px;
+        font-size: $global-font-size-20;
         font-weight: 700;
         color: #383b40;
       }
@@ -291,7 +291,7 @@ const sizeChange = (limits) => {
         align-items: center;
         justify-content: flex-end;
         font-family: PingFangSC-Regular;
-        font-size: 14px;
+        font-size: $global-font-size-16;
         color: #2374ff;
         text-align: right;
         span {
@@ -302,12 +302,12 @@ const sizeChange = (limits) => {
 
     .one_2 {
       display: inline-block;
-      font-size: 12px;
+      font-size: $global-font-size-14;
       background: rgba(18, 172, 117, 0.05);
       color: #12ac75;
       padding: 0 15px;
       height: 20px;
-      line-height: 20px;
+      line-height: $global-font-size-20;
       border-radius: 10px;
       margin-bottom: 2px;
     }
@@ -319,9 +319,9 @@ const sizeChange = (limits) => {
     padding: 30px;
     margin: 34px 0 20px;
     font-family: PingFangSC-Medium;
-    font-size: 14px;
+    font-size: $global-font-size-16;
     color: #383b40;
-    line-height: 14px;
+    line-height: $global-font-size-16;
   }
 
   .thr {
@@ -341,7 +341,7 @@ const sizeChange = (limits) => {
         height: 40px;
         border-bottom: 2px solid #2374ff;
         color: #fff;
-        font-size: 18px;
+        font-size: $global-font-size-20;
         background: #2374ff;
       }
     }
@@ -360,9 +360,9 @@ const sizeChange = (limits) => {
         .name {
           height: 20px;
           font-family: PingFangSC-Semibold;
-          font-size: 18px;
+          font-size: $global-font-size-20;
           color: #383b40;
-          line-height: 20px;
+          line-height: $global-font-size-20;
           font-weight: 700;
           margin-bottom: 8px;
         }
@@ -370,17 +370,17 @@ const sizeChange = (limits) => {
         .other {
           height: 14px;
           font-family: PingFangSC-Medium;
-          font-size: 14px;
+          font-size: $global-font-size-16;
           color: #383b40;
-          line-height: 14px;
+          line-height: $global-font-size-16;
           font-weight: 700;
 
           span {
             height: 14px;
             font-family: PingFangSC-Regular;
-            font-size: 14px;
+            font-size: $global-font-size-16;
             color: #7e8288;
-            line-height: 14px;
+            line-height: $global-font-size-16;
             font-weight: 400;
             margin-right: 10px;
           }
@@ -411,7 +411,7 @@ const sizeChange = (limits) => {
         height: 40px;
         border-bottom: 2px solid #2374ff;
         color: #fff;
-        font-size: 18px;
+        font-size: $global-font-size-20;
         background: #2374ff;
       }
     }
@@ -430,7 +430,7 @@ const sizeChange = (limits) => {
         transition: all 0.3s;
         padding: 15px;
         .name {
-          font-size: 16px;
+          font-size: $global-font-size-18;
           color: #121834;
           height: 16px;
           line-height: 13px;
@@ -443,9 +443,9 @@ const sizeChange = (limits) => {
         }
 
         .two_1 {
-          font-size: 12px;
+          font-size: $global-font-size-14;
           text-align: justify;
-          line-height: 12px;
+          line-height: $global-font-size-14;
           font-weight: 400;
           letter-spacing: 0;
           color: #8f97a3;
@@ -478,16 +478,16 @@ const sizeChange = (limits) => {
     align-items: center;
     justify-content: flex-end;
     font-family: PingFangSC-Regular;
-    font-size: 14px;
+    font-size: $global-font-size-16;
     color: #7e8288;
     margin: 10px 0 0 0;
     .money {
       margin: 0 10px 0 0;
       span {
         font-family: PingFangSC-Semibold;
-        font-size: 20px;
+        font-size: $global-font-size-22;
         color: #e94643;
-        line-height: 20px;
+        line-height: $global-font-size-22;
       }
     }
   }

+ 6 - 6
src/views/sign/index.vue

@@ -102,7 +102,7 @@ const search = async (query = { skip: 0, limit }) => {
   const info = {
     skip: query.skip,
     limit: query.limit,
-    user: user.value._id
+    user: user.value.id
   }
   const res = await store.sign(info)
   if (res.errcode == '0') {
@@ -178,7 +178,7 @@ const sizeChange = (limits) => {
       .name {
         display: flex;
         align-items: center;
-        font-size: 16px;
+        font-size: $global-font-size-18;
         color: #121834;
         font-weight: 500;
         margin: 5px 0 0 0;
@@ -189,9 +189,9 @@ const sizeChange = (limits) => {
       }
 
       .two_1 {
-        font-size: 12px;
+        font-size: $global-font-size-14;
         text-align: justify;
-        line-height: 12px;
+        line-height: $global-font-size-14;
         font-weight: 400;
         letter-spacing: 0;
         color: #8f97a3;
@@ -209,10 +209,10 @@ const sizeChange = (limits) => {
         margin: 10px;
         text-align: right;
         .button {
-          font-size: 12px;
+          font-size: $global-font-size-14;
           color: #fff;
           text-align: center;
-          line-height: 12px;
+          line-height: $global-font-size-14;
           font-weight: 500;
           padding: 5px 12px;
           background: #2374ff;

+ 22 - 22
src/views/supply/detail.vue

@@ -233,11 +233,11 @@ const toDocking = () => {
 }
 // 收藏
 const toCollection = async (status) => {
-  if (user.value._id) {
+  if (user.value.id) {
     let res
     let message
     const data = {
-      user: user.value._id,
+      user: user.value.id,
       source: info.value._id,
       type: 'demand',
       time: moment().format('YYYY-MM-DD')
@@ -296,7 +296,7 @@ const sizeChange = (limits) => {
       margin: 0 0 10px 0;
 
       .title {
-        font-size: 18px;
+        font-size: $global-font-size-20;
         font-weight: 700;
         color: #383b40;
       }
@@ -306,7 +306,7 @@ const sizeChange = (limits) => {
         align-items: center;
         justify-content: flex-end;
         font-family: PingFangSC-Regular;
-        font-size: 14px;
+        font-size: $global-font-size-16;
         color: #2374ff;
         text-align: right;
         span {
@@ -317,12 +317,12 @@ const sizeChange = (limits) => {
 
     .one_2 {
       display: inline-block;
-      font-size: 12px;
+      font-size: $global-font-size-14;
       background: rgba(18, 172, 117, 0.05);
       color: #12ac75;
       padding: 0 15px;
       height: 20px;
-      line-height: 20px;
+      line-height: $global-font-size-20;
       border-radius: 10px;
       margin-bottom: 2px;
     }
@@ -334,9 +334,9 @@ const sizeChange = (limits) => {
     padding: 30px;
     margin: 34px 0 20px;
     font-family: PingFangSC-Medium;
-    font-size: 14px;
+    font-size: $global-font-size-16;
     color: #383b40;
-    line-height: 14px;
+    line-height: $global-font-size-16;
   }
 
   .thr {
@@ -356,7 +356,7 @@ const sizeChange = (limits) => {
         height: 40px;
         border-bottom: 2px solid #2374ff;
         color: #fff;
-        font-size: 18px;
+        font-size: $global-font-size-20;
         background: #2374ff;
       }
     }
@@ -375,9 +375,9 @@ const sizeChange = (limits) => {
         .name {
           height: 20px;
           font-family: PingFangSC-Semibold;
-          font-size: 18px;
+          font-size: $global-font-size-20;
           color: #383b40;
-          line-height: 20px;
+          line-height: $global-font-size-20;
           font-weight: 700;
           margin-bottom: 8px;
         }
@@ -385,17 +385,17 @@ const sizeChange = (limits) => {
         .other {
           height: 14px;
           font-family: PingFangSC-Medium;
-          font-size: 14px;
+          font-size: $global-font-size-16;
           color: #383b40;
-          line-height: 14px;
+          line-height: $global-font-size-16;
           font-weight: 700;
 
           span {
             height: 14px;
             font-family: PingFangSC-Regular;
-            font-size: 14px;
+            font-size: $global-font-size-16;
             color: #7e8288;
-            line-height: 14px;
+            line-height: $global-font-size-16;
             font-weight: 400;
             margin-right: 10px;
           }
@@ -426,7 +426,7 @@ const sizeChange = (limits) => {
         height: 40px;
         border-bottom: 2px solid #2374ff;
         color: #fff;
-        font-size: 18px;
+        font-size: $global-font-size-20;
         background: #2374ff;
       }
     }
@@ -445,7 +445,7 @@ const sizeChange = (limits) => {
         transition: all 0.3s;
         padding: 15px;
         .name {
-          font-size: 16px;
+          font-size: $global-font-size-18;
           color: #121834;
           height: 16px;
           line-height: 13px;
@@ -458,9 +458,9 @@ const sizeChange = (limits) => {
         }
 
         .two_1 {
-          font-size: 12px;
+          font-size: $global-font-size-14;
           text-align: justify;
-          line-height: 12px;
+          line-height: $global-font-size-14;
           font-weight: 400;
           letter-spacing: 0;
           color: #8f97a3;
@@ -493,16 +493,16 @@ const sizeChange = (limits) => {
     align-items: center;
     justify-content: flex-end;
     font-family: PingFangSC-Regular;
-    font-size: 14px;
+    font-size: $global-font-size-16;
     color: #7e8288;
     margin: 10px 0 0 0;
     .money {
       margin: 0 10px 0 0;
       span {
         font-family: PingFangSC-Semibold;
-        font-size: 20px;
+        font-size: $global-font-size-22;
         color: #e94643;
-        line-height: 20px;
+        line-height: $global-font-size-22;
       }
     }
   }

+ 6 - 6
src/views/supply/index.vue

@@ -428,7 +428,7 @@ const sizeChange = (limits) => {
             margin-right: 10px;
             background-color: #fff;
             padding: 5px;
-            font-size: 14px;
+            font-size: $global-font-size-16;
             .left {
               padding: 10px;
             }
@@ -484,7 +484,7 @@ const sizeChange = (limits) => {
         }
         .title {
           color: #666;
-          font-size: 14px;
+          font-size: $global-font-size-16;
           line-height: 15px;
           margin: 0 10px;
           display: inline-block;
@@ -498,7 +498,7 @@ const sizeChange = (limits) => {
       }
       .button {
         color: #2374ff;
-        font-size: 12px;
+        font-size: $global-font-size-14;
         cursor: pointer;
       }
     }
@@ -517,7 +517,7 @@ const sizeChange = (limits) => {
 
       .name {
         color: #337ab7;
-        font-size: 18px;
+        font-size: $global-font-size-20;
         font-weight: bold;
         display: inline-block;
         margin: 10px 0;
@@ -534,7 +534,7 @@ const sizeChange = (limits) => {
         .other_1 {
           font-family: 'PingFangSC-Light', 'Microsoft YaHei', 'WenQuanYi Micro Hei', arial,
             sans-serif;
-          font-size: 12px;
+          font-size: $global-font-size-14;
           font-weight: normal;
         }
 
@@ -547,7 +547,7 @@ const sizeChange = (limits) => {
       .brief {
         line-height: 30px;
         color: #666;
-        font-size: 14px;
+        font-size: $global-font-size-16;
         cursor: pointer;
       }
     }

+ 1 - 4
vite.config.js

@@ -52,10 +52,7 @@ export default defineConfig(({ mode }) => {
       preprocessorOptions: {
         // 定义全局 SCSS 变量
         scss: {
-          javascriptEnabled: true
-          // additionalData: `
-          //   @use "@/styles/variables.scss" as *;
-          // `
+          additionalData: `@import "@/styles/variables.scss";`
         }
       }
     },