홈 탐색 도움말
로그인
jianyu
/
web
6
0
포크 0
파일 이슈 0 풀 리퀘스트 0 위키
소스 검색

merge: 处理合并冲突

zhangyuhan 1 년 전
부모
2d2775ec2c
커밋
8004e091b7
4개의 변경된 파일과 2개의 추가작업 그리고 61개의 파일을 삭제
분할 보기 변경상태 보기
  1. 1 4
      apps/bigmember_pc/src/router/router-interceptors.js
  2. 1 3
      apps/bigmember_pc/src/router/routers.js
  3. 0 5
      apps/bigmember_pc/src/views/workspace/components/SubscribeList.vue
  4. 0 49
      apps/work-bench/public/index.html.bak

+ 1 - 4
apps/bigmember_pc/src/router/router-interceptors.js
파일 보기 

@@ -40,11 +40,8 @@ const powerCheckWhiteList = [
 
   'unit_portrayal_id',
 
   'set-password',
 
   'portrayal_loading',
 
-<<<<<<< HEAD
 
-  'recommen-list'
 
-=======
 
+  'recommen-list',
 
   'business_detail'
 
->>>>>>> main
 
 ]
 
 
 const regListCheck = function (regList, path) {

+ 1 - 3
apps/bigmember_pc/src/router/routers.js
파일 보기 

@@ -246,18 +246,16 @@ export default [
 
     name: 'set-identity-info',
 
     component: () => import('@/views/accountInfo/SetIdentityInfo.vue')
 
   },
 
-<<<<<<< HEAD
 
   // 推荐标讯列表
 
   {
 
     path: '/recommen-list',
 
     name: 'recommen-list',
 
     component: () => import('@/views/recommen-list/recommenList.vue')
 
-=======
 
+  },
 
   // 商机情报-详情页
 
   {
 
     path: '/business_detail/:id',
 
     name: 'business_detail',
 
     component: () => import('@/views/business/detail.vue')
 
->>>>>>> main
 
   }
 
 ]

+ 0 - 5
apps/bigmember_pc/src/views/workspace/components/SubscribeList.vue
파일 보기 

@@ -65,17 +65,12 @@ export default {
 
       hasKey: (state) => state.workspace.subscribe.hasKey, // 是否有订阅关键词
 
       loading: (state) => state.workspace.subscribe.loading,
 
       loaded: (state) => state.workspace.subscribe.loaded,
 
-<<<<<<< HEAD
 
       subscribeList: (state) => state.workspace.subscribe.list.slice(0, 5),
 
       isRecommend: (state) => state.workspace.subscribe.isRecommend
 
     }),
 
     showRecommend() {
 
       return this.isRecommend === '2' || this.isRecommend === '3'
 
     }
 
-=======
 
-      subscribeList: (state) => state.workspace.subscribe.list.slice(0, 10)
 
-    })
 
->>>>>>> main
 
   },
 
   data() {
 
     return {

+ 0 - 49
apps/work-bench/public/index.html.bak
파일 보기 

@@ -1,49 +0,0 @@
 
-<!DOCTYPE html>
 
-<html>
 
-  <head>
 
-    <meta charset="utf-8">
 
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
 
-<<<<<<< HEAD
 
-    <link rel="stylesheet" href="https://cdn-common.jianyu360.com/cdn/assets/iconfont/pc/23.8.30/iconfont.css">
 
-=======
 
-    <link rel="stylesheet" href="https://cdn-common.jianyu360.com/cdn/assets/iconfont/pc/23.9.28/iconfont.css">
 
->>>>>>> main
 
-    <title>工作台</title>
 
-    <% if (process.env.NODE_ENV === 'production') { %>
 
-        <script src="/common-module/public/head.js?v=<%= htmlWebpackPlugin.options.assets.version %>"></script>
 
-    <% } %>
 
-  </head>
 
-  <body>
 
-    <noscript>
 
-      <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
 
-    </noscript>
 
-    <div id="app"></div>
 
-<<<<<<< HEAD
 
-    <script src="https://cdn-common.jianyu360.com/cdn/assets/iconfont/pc/23.8.30/iconfont.js"></script>
 
-=======
 
-    <script src="https://cdn-common.jianyu360.com/cdn/assets/iconfont/pc/23.9.28/iconfont.js"></script>
 
->>>>>>> main
 
-    <script src="//cdn-common.jianyu360.com/cdn/lib/jquery/3.5.1/jquery.min.js"></script>
 
-
 
-    <% if (process.env.NODE_ENV === 'production') { %>
 
-    <!--  临时处理 fotter 中覆盖 appendChild 导致的 qiankun 加载资源异常问题  -->
 
-    <!--  （后续可尝试从 qiankun 自定义资源拦截排查处理该问题）  -->
 
-    <script>
 
-        window._needInjectionTrackStatus = false
 
-    </script>
 
-    <script src="/common-module/public/fotter.js?v=<%= htmlWebpackPlugin.options.assets.version %>"></script>
 
-    <script src="/js/jyWebScoket.js?v=<%= htmlWebpackPlugin.options.assets.version %>"></script>
 
-    <script src="/common-module/ad/js/msgbuoy.js?v=<%= htmlWebpackPlugin.options.assets.version %>"></script>
 
-<!--    智能助手-->
 
-<!--    <script src="/common-module/chat/jy-chat.umd.js?auto=true&v=<%= htmlWebpackPlugin.options.assets.version %>"></script>-->
 
-    <% } %>
 
-
 
-    <% if (process.env.NODE_ENV === 'development') { %>
 
-    <!-- test--- msg加载 公共js方法 -->
 
-    <script src="/common-module/ad/js/msgbuoy.js?v=<%= htmlWebpackPlugin.options.assets.version %>"></script>
 
-    <% } %>
 
-
 
-    <!-- built files will be auto injected -->
 
-  </body>
 
-</html>