Merge branch 'dev/1.0.45_zsy' of jianyu/web into feature/v1.0.45

apps/bigmember_pc/src/api/modules/index.js

@@ -29,9 +29,6 @@ export * from './crmApplication'
 export * from './pay'
 export * from './message'
 export * from './business'
-<<<<<<< HEAD
 export * from './docs'
-=======
 export * from './search'
 export * from './nzj'
->>>>>>> main

apps/bigmember_pc/src/assets/style/common.scss

@@ -192,11 +192,9 @@ input[type='number'] {
   }
 }
 
-<<<<<<< HEAD
 a{
   user-select: text!important;
 }
-=======
 
 .use-badge {
   position: relative;
@@ -267,4 +265,3 @@ a{
     color: #fff;
   }
 }
->>>>>>> main

apps/bigmember_pc/src/store/user.js

@@ -492,17 +492,14 @@ export default {
     bigMemberPower: (_, getters) => {
       return getters.power
     },
-<<<<<<< HEAD
     // 剑鱼文库会员信息
     docMemberInfo: (state) => state.info.docsInfo,
     // 是否是剑鱼文库会员
     isDocMember: (_, getters) => {
       const { docStatus } = getters.docMemberInfo
       return docStatus > 0
-    }
-=======
+    },
     // 是否登录
     loginFlag: (state) => state.loginFlag,
->>>>>>> main
   }
 }