feat: 合并冲突

apps/mobile/src/api/modules/bigmember.js

@@ -118,7 +118,6 @@ export function projectDetailApi(data) {
   })
 }
 
-<<<<<<< HEAD
 // 获取采购 buyer、 中标 winner 企业基础画像信息
 export function ajaxGetMiniEntInfo(type, id) {
   return request({
@@ -130,16 +129,3 @@ export function ajaxGetMiniEntInfo(type, id) {
     })
   })
 }
-=======
-// 检查是否关注了项目
-export function projectFollowCheck (data) {
-  data = qs.stringify(data)
-  return request({
-    url: '/bigmember/follow/project/check',
-    method: 'post',
-    data
-  })
-}
-
-
->>>>>>> main

apps/mobile/src/components/treasure-box/CommonUse.vue

@@ -1,39 +1,5 @@
 <template>
   <div>
-<<<<<<< HEAD
-    <template v-if="!isSettings">
-      <van-loading v-if="loading" style="text-align: center" />
-      <grid-text :list="commonList" :need-grid-bg="true" @openLink="openLink">
-        <template v-if="moreGrid && !loading" #more-grid>
-          <div
-            class="common-use-grid grid-bg-color clickable"
-            @click="settingCommonFeature"
-          >
-            <!-- <AppIcon name="add-01" color="#aaa" svg size="17" /> -->
-            <img
-              class="add-fun-icon"
-              src="@/assets/image/icon/add-function.png"
-            />
-            <span class="item-name">添加常用功能</span>
-          </div>
-        </template>
-      </grid-text>
-    </template>
-    <template v-if="isSettings && commonFunctions.length > 0">
-      <grid-text
-        :list="getList"
-        :need-badge="true"
-        :badge-handle="true"
-        @badgeHandle="badgeHandle"
-        :need-drag="true"
-        dragUniqueKey="settingsCommonUse"
-        @dragCallBack="dragCallBack"
-      ></grid-text>
-    </template>
-    <div class="no-data" v-if="noData && commonFunctions.length === 0">
-      暂未设置常用功能
-    </div>
-=======
       <template v-if="!isSettings">
         <van-loading v-if="loading" style="text-align: center" />
         <grid-text
@@ -60,7 +26,6 @@
           @dragCallBack="dragCallBack"></grid-text>
       </template>
     <div  class="no-data" v-if="noData && commonFunctions.length === 0">暂未设置常用功能</div>
->>>>>>> main
   </div>
 </template>
 
@@ -101,20 +66,12 @@ export default {
     }
   },
   computed: {
-<<<<<<< HEAD
-    ...mapGetters('treasureBox', ['commonFunctions']),
-    getList() {
-      return this.commonFunctions
-        ? JSON.parse(JSON.stringify(this.commonFunctions))
-        : []
-=======
     ...mapGetters('treasureBox', [
       'commonFunctions',
       'commonMaxNum'
     ]),
     getList () {
       return this.commonFunctions ? JSON.parse(JSON.stringify(this.commonFunctions)) : []
->>>>>>> main
     }
   },
   created() {
@@ -125,10 +82,6 @@ export default {
     getCommonUseList() {
       const _this = this
       this.loading = true
-<<<<<<< HEAD
-      workspaceCommonUse('list', {
-        platform: this.$env.platform?.toUpperCase()
-=======
       workspaceCommonUse('list', { platform: this.$env.platform?.toUpperCase() }).then(res => {
         const { data = [], error_code: code } = res
         if (code === 0 && data) {
@@ -152,7 +105,6 @@ export default {
         }
       }).finally(() => {
         this.loading = false
->>>>>>> main
       })
         .then((res) => {
           const { data = [], error_code: code } = res

apps/mobile/src/views/treasurebox/FeatureSettings.vue

@@ -45,9 +45,6 @@ export default {
     return {}
   },
   computed: {
-<<<<<<< HEAD
-    ...mapGetters('treasureBox', ['commonFunctions'])
-=======
     ...mapGetters('treasureBox', [
       'commonFunctions',
       'commonMaxNum'
@@ -56,9 +53,6 @@ export default {
       return this.commonFunctions?.length || 0
     }
   },
-  created () {
->>>>>>> main
-  },
   created() {},
   methods: {
     async saveCommonFunctions() {
@@ -121,9 +115,6 @@ $content-title-font-size: 18px;
       display: flex;
       //justify-content: space-between;
       align-items: center;
-<<<<<<< HEAD
-      margin-bottom: 10px;
-=======
       margin-bottom:10px;
       .content-count{
         font-size:14px;
@@ -131,7 +122,6 @@ $content-title-font-size: 18px;
           color:#2ABED1;
         }
       }
->>>>>>> main
     }
     .work-common-box {
       background-color: #fff;

apps/mobile/src/views/uersales/newuser/index.vue

@@ -5,13 +5,9 @@
       <div class="title-box">
         <div class="title_top">
           <h5 class="page-title">选择您的业务标签</h5>
-<<<<<<< HEAD
-          <div class="jumpto_btn" @click.stop="postNewUerData(false)">跳过</div>
-=======
           <div v-if="!urlSource" class="jumpto_btn" @click.stop="postNewUerData(false)">
             跳过
           </div>
->>>>>>> main
         </div>
         <h6 class="sub-text">{{ subtitle }}</h6>
       </div>
@@ -111,18 +107,8 @@
       </div>
     </div>
     <div class="j-button-group j-footer">
-<<<<<<< HEAD
-      <button
-        tag="button"
-        class="j-button-confirm"
-        @click.stop="postNewUerData(true)"
-      >
-        开启剑鱼之旅
-      </button>
-=======
       <button v-if="!urlSource" tag="button" class="j-button-confirm" @click.stop="postNewUerData(true)">开启剑鱼之旅</button>
       <button v-else tag="button" class="j-button-confirm" @click.stop="submitNewUerData">提交</button>
->>>>>>> main
     </div>
     <Dialog
       :title="dparam.setTitle"
@@ -577,16 +563,11 @@ export default {
      * 获取新用户数据
      * @param datas
      */
-<<<<<<< HEAD
-    getNewUerSales() {
-      ajaxGetIsNewUerSales({})
-=======
     getNewUerSales () {
       const data = {
         source: this.urlSource || ''
       }
       ajaxGetIsNewUerSales(data)
->>>>>>> main
         .then((res) => {
           if (res && res.data && res?.error_code === 0) {
             this.subtitle = res.data.intro
@@ -646,11 +627,7 @@ export default {
       })
     },
     // 提交跳过
-<<<<<<< HEAD
-    postNewUerData(type) {
-=======
     postNewUerData (type, callback) {
->>>>>>> main
       this.setPageTrack(`点击-${type ? '开启剑鱼之旅' : '跳过'}`)
       const msgSet = {}
       this.msgTypeContent.forEach((v) => {
@@ -692,18 +669,12 @@ export default {
               this.goHomePage()
             }
           }
-<<<<<<< HEAD
-        })
-        .catch((e) => {
-          this.goHomePage()
-=======
         }).catch((e) => {
           if(typeof callback === 'function') {
             callback()
           } else {
             this.goHomePage()
           }
->>>>>>> main
           console.warn('请求跳过信息异常:', e)
         })
     },

apps/work-bench/public/index.html.bak

@@ -4,11 +4,7 @@
     <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>
@@ -19,11 +15,7 @@
       <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') { %>