Merge remote-tracking branch 'origin/master'

src/router/routes/index.ts

@@ -36,6 +36,15 @@ export const LoginRoute: AppRouteRecordRaw = {
     title: t('routes.basic.login'),
   },
 };
+
+export const aaaFontLoginRoute: AppRouteRecordRaw = {
+  path: '/aaaFont/Login',
+  name: 'aaaFontLogin',
+  component: () => import('@/views/AAAFont/Login/index.vue'),
+  meta: {
+    title: '登录',
+  },
+};
 export const PCFontRoute: AppRouteRecordRaw = {
   path: '/aaaFont',
   name: 'AAAFont',
@@ -1446,6 +1455,7 @@ export const basicRoutes = [
   processCenterRoute,
   BenchmarkRoute,
   PCFontRoute,
+  aaaFontLoginRoute,
   ServicePlatformRoute,
   PersonalCenterRoute,
 ];

src/views/AAAFont/Login/index.vue

+<template>
+  <div id="login">
+    <el-container>
+      <el-header class="header">
+        <div @click="handleTitle" class="official-title"> 数据要素交易服务平台 </div>
+        <div class="分割线"></div>
+        <div class="title-right">登录</div>
+      </el-header>
+      <div class="login-box">
+        <div class="login-win">
+          <div class="login-title">
+            <span class="login-title-text">用户登录</span>
+          </div>
+          <LoginForm />
+        </div>
+      </div>
+    </el-container>
+  </div>
+</template>
+
+<script>
+  import Icon from '@/components/Icon/Icon.vue';
+  import LoginForm from '@/views/sys/login/LoginForm.vue';
+
+  export default {
+    name: 'Login',
+    components: { LoginForm, Icon },
+    data() {
+      return {};
+    },
+    methods: {
+      handleClick(tab, event) {
+        console.log(tab, event);
+      },
+      handleTitle() {
+        this.$router.replace('/aaaFont/font');
+      },
+    },
+  };
+</script>
+<style scoped lang="scss">
+  body {
+    margin: 0;
+  }
+  #login {
+    min-width: 1366px;
+    width: auto;
+    position: relative;
+    /*transform: translate(0, 0);*/
+  }
+  .header {
+    /*position: fixed;*/
+    z-index: 999;
+    width: 100%;
+    margin: auto;
+    height: 90px;
+    display: flex;
+    align-items: center;
+    top: 0;
+    background-color: #ffffff;
+
+    .title-right {
+      width: 36px;
+      height: 27px;
+      line-height: 27px;
+      color: #707070;
+      font-size: 18px;
+      margin-left: 40px;
+    }
+  }
+
+  /*标题样式*/
+  .official-title {
+    font-size: 24px;
+    font-weight: 600;
+    line-height: 28px;
+    padding: 0 40px;
+    margin-left: 22px;
+    /*display: flex;*/
+    /*justify-content: center;*/
+    position: relative;
+  }
+  .official-title::before {
+    content: '';
+    position: absolute;
+    right: 0;
+    top: 0;
+    bottom: 0;
+    width: 1px;
+    background-color: #dce7fb;
+  }
+
+  .login-box {
+    width: 100%;
+    aspect-ratio: 1920 / 863; /* 或者其他的宽高比 */
+    background-image: url('src/assets/images/mallHome/login_bg.png');
+    background-size: cover;
+    background-position: center;
+    background-repeat: no-repeat;
+    position: relative;
+
+    .login-win {
+      width: 427px;
+      height: 479px;
+      background: #fdfdfd;
+      outline: 10px solid rgba(255, 255, 255, 0.25);
+      border-radius: 8px;
+      position: absolute;
+      left: 60%;
+      top: 50%;
+      transform: translateY(-50%);
+
+      .login-title {
+        margin: 50px 0 30px 16px;
+
+
+        .login-title-text{
+          width: 128px;
+          height: 48px;
+          color: #3f3f3f;
+          font-size: 32px;
+          font-weight: 700;
+        }
+      }
+    }
+  }
+</style>

src/views/AAAFont/index.vue

@@ -3,7 +3,7 @@
     <el-container>
       <el-header class="header">
         <!--        <div >-->
-        <div class="official-title" style="width: 20%; padding-left: 40px">
+        <div class="official-title">
           <!--          <img-->
           <!--            :src="titleNameImage"-->
           <!--            width="390"-->
@@ -37,7 +37,7 @@
           </el-menu>
         </div>
         <div class="right-div">
-          <el-button plain class="long_btn">登录</el-button>
+          <el-button plain class="long_btn" @click="login">登录</el-button>
           <el-button
             class="long_btn"
             style="color: #486fe1; background-color: #dce5f9"
@@ -159,6 +159,9 @@
         this.$router.push({ path: '/commonProblem' });
       },
       login() {
+        // this.$router.push({ path: '/aaaFont/Login' });
+        this.$router.replace('/aaaFont/Login');
+
         // window.open('https://admin.fastice-tech.com/login')
       },
       register() {
@@ -208,7 +211,7 @@
     z-index: 999;
     width: 100%;
     margin: auto;
-    height: 60px;
+    height: 90px;
     display: flex;
     align-items: center;
     justify-content: space-around;
@@ -275,10 +278,11 @@
 
   /*标题样式*/
   .official-title {
-    width: 45%;
-    font-size: 20px;
+    width: 23%;
+    font-size: 24px;
     font-weight: 600;
     line-height: 28px;
+    padding-left: 40px;
     /*display: flex;*/
     /*justify-content: center;*/
   }
@@ -468,7 +472,6 @@
   .footer-item-por {
     height: 72px;
     width: 100%;
-    border: 1px dashed #eff3fa;
     display: flex;
     background-color: rgba(34, 36, 41, 1);
     justify-content: space-around;

src/views/servicePlatform/enterpriseCertification/enterpriseData.ts

@@ -5,7 +5,7 @@ export const enterprisesData: any[] = [
     leader: '张三',
     leaderNum: '12312312',
     license: ['src/assets/images/营业执照.jpg'],
-    logo: ['src/assets/images/测试图片1.jpg'],
+    logo: ['src/assets/images/logo.png'],
     buildTime: '2020-03-05',
     website: '2020-03-05',
     registerNum: '1000',
@@ -19,7 +19,7 @@ export const enterprisesData: any[] = [
     leader: '李四',
     leaderNum: '98765432',
     license: ['src/assets/images/营业执照.jpg'],
-    logo: ['src/assets/images/测试图片1.jpg'],
+    logo: ['src/assets/images/logo.png'],
     buildTime: '2019-02-20',
     website: '2020-03-05',
     registerNum: '1200',
@@ -33,7 +33,7 @@ export const enterprisesData: any[] = [
     leader: '王五',
     leaderNum: '23456789',
     license: ['src/assets/images/营业执照.jpg'],
-    logo: ['src/assets/images/测试图片1.jpg'],
+    logo: ['src/assets/images/logo.png'],
     buildTime: '2021-05-15',
     website: '2020-03-05',
     registerNum: '1500',
@@ -47,7 +47,7 @@ export const enterprisesData: any[] = [
     leader: '赵六',
     leaderNum: '34567890',
     license: ['src/assets/images/营业执照.jpg'],
-    logo: ['src/assets/images/测试图片1.jpg'],
+    logo: ['src/assets/images/logo.png'],
     buildTime: '2018-08-10',
     registerNum: '800',
     website: '2020-03-05',
@@ -61,7 +61,7 @@ export const enterprisesData: any[] = [
     leader: '钱七',
     leaderNum: '45678901',
     license: ['src/assets/images/营业执照.jpg'],
-    logo: ['src/assets/images/测试图片1.jpg'],
+    logo: ['src/assets/images/logo.png'],
     buildTime: '2020-07-30',
     website: '2020-03-05',
     registerNum: '2000',
@@ -75,7 +75,7 @@ export const enterprisesData: any[] = [
     leader: '孙八',
     leaderNum: '56789012',
     license: ['src/assets/images/营业执照.jpg'],
-    logo: ['src/assets/images/测试图片1.jpg'],
+    logo: ['src/assets/images/logo.png'],
     buildTime: '2021-01-25',
     registerNum: '950',
     website: '2020-03-05',
@@ -89,7 +89,7 @@ export const enterprisesData: any[] = [
     leader: '周九',
     leaderNum: '67890123',
     license: ['src/assets/images/营业执照.jpg'],
-    logo: ['src/assets/images/测试图片1.jpg'],
+    logo: ['src/assets/images/logo.png'],
     buildTime: '2017-06-14',
     website: '2020-03-05',
     registerNum: '1100',
@@ -103,7 +103,7 @@ export const enterprisesData: any[] = [
     leader: '吴十',
     leaderNum: '78901234',
     license: ['src/assets/images/营业执照.jpg'],
-    logo: ['src/assets/images/测试图片1.jpg'],
+    logo: ['src/assets/images/logo.png'],
     buildTime: '2020-09-01',
     website: '2020-03-05',
     registerNum: '1300',
@@ -117,7 +117,7 @@ export const enterprisesData: any[] = [
     leader: '郑十一',
     leaderNum: '89012345',
     license: ['src/assets/images/营业执照.jpg'],
-    logo: ['src/assets/images/测试图片1.jpg'],
+    logo: ['src/assets/images/logo.png'],
     buildTime: '2022-04-10',
     website: '2020-03-05',
     registerNum: '600',
@@ -131,7 +131,7 @@ export const enterprisesData: any[] = [
     leader: '冯十二',
     leaderNum: '90123456',
     license: ['src/assets/images/营业执照.jpg'],
-    logo: ['src/assets/images/测试图片1.jpg'],
+    logo: ['src/assets/images/logo.png'],
     buildTime: '2019-12-15',
     website: '2020-03-05',
     registerNum: '1400',
@@ -145,7 +145,7 @@ export const enterprisesData: any[] = [
     leader: '刘十三',
     leaderNum: '12345678',
     license: ['src/assets/images/营业执照.jpg'],
-    logo: ['src/assets/images/测试图片1.jpg'],
+    logo: ['src/assets/images/logo.png'],
     buildTime: '2021-03-25',
     website: '2020-03-05',
     registerNum: '1000',
@@ -165,6 +165,6 @@ export const mockData: Recordable = {
   businessRange: '科学研究和技术服务业',
   registerAddress: '天津市西青区中北镇中北科技产业业',
   detailAddress: '天津市西青区中北镇中北科技产业园',
-  license: ['src/assets/images/测试图片1.jpg'],
-  logo: '[src/assets/images/测试图片1.jpg]',
+  license: ['src/assets/images/营业执照.jpg'],
+  logo: '[src/assets/images/logo.png]',
 };