소스 검색

Merge branch 'dev/v1.0.28_yf' of jianyu/web into feature/v1.0.28

yangfeng 1 년 전
부모
커밋
5fbf4bc8f7

+ 1 - 0
apps/work-bench/.env.development

@@ -6,3 +6,4 @@ VUE_APP_BASE_URL='/home'
 VUE_APP_BASE_PUBLIC='/'
 VUE_APP_BASE_SITE='https://jybx3-webtest.jydev.jianyu360.com'
 VUE_APP_BASE_LOGO='https://cdn-ali.jianyu360.com/images/swordfish/sf_01_new.png?v=0928'
+VUE_APP_SIMPLE_LOGO='https://cdn-ali.jianyu360.com/common-module/public/image/logo_new.png?v=0928'

+ 1 - 0
apps/work-bench/.env.production

@@ -6,3 +6,4 @@ VUE_APP_BASE_URL='/page_workDesktop'
 VUE_APP_BASE_PUBLIC='/page_workDesktop/'
 VUE_APP_BASE_SITE=''
 VUE_APP_BASE_LOGO='https://cdn-ali.jianyu360.com/images/swordfish/sf_01_new.png?v=0928'
+VUE_APP_SIMPLE_LOGO='https://cdn-ali.jianyu360.com/common-module/public/image/logo_new.png?v=0928'

+ 2 - 1
apps/work-bench/src/register-app.js

@@ -106,7 +106,8 @@ export const subApps = {
     describe: '该应用包含大会员画像、推送、周报月报、个人桌面等功能',
     qiankun: {
       name: 'bigMemberSubApp',
-      entry: '/page_big_pc/index.html',
+      // entry: '/page_big_pc/index.html',
+      entry: 'http://localhost:8081/',
       rule: '/big',
       props: {
         inject: ({ Vue, router }) => {

+ 11 - 3
packages/work-bench-frame/packages/components/Navbar/index.vue

@@ -2,6 +2,7 @@
   <div class="navbar-group">
     <div class="logo">
       <img :src="logo" alt="logo" @click="goSiteHome">
+      <h1>剑鱼工作台</h1>
     </div>
     <div class="navbar-content-group">
       <div class="website-group">
@@ -107,7 +108,7 @@ export default {
   data () {
     return {
       home: process.env.VUE_APP_BASE_SITE,
-      logo: process.env.VUE_APP_BASE_LOGO,
+      logo: process.env.VUE_APP_SIMPLE_LOGO,
       navs: [
         // {
         //   label: '前往官网',
@@ -610,7 +611,7 @@ export default {
   justify-content: space-between;
   min-height: 64px;
   min-width: 800px;
-  padding: 0 36px;
+  padding: 0 24px;
   box-sizing: border-box;
   background-color: #ffffff;
   box-shadow: 0px 2px 8px -1px rgba(0, 0, 0, 0.0800);
@@ -625,7 +626,8 @@ export default {
   }
 
   .logo {
-    display: inline-block;
+    display: flex;
+    align-items: center;
     width: auto;
     height: 32px;
     cursor: pointer;
@@ -633,6 +635,12 @@ export default {
     img {
       height: 100%;
     }
+    h1{
+      margin-left: 8px;
+      font-size: 18px;
+      line-height: 24px;
+      color: #2ABED1;
+    }
   }
 
   .navbar-content-group {