cuiyalong

apps/bigmember_pc/src/views/article-content/components/ContentHeader.vue

@@ -240,7 +240,7 @@ const {
         </div>
       </div>
     </div>
-    <div class="expands-actions" v-if="false">
+    <div class="expands-actions">
       <div class="expands-actions-l"></div>
       <div class="expands-actions-r">
         <el-button

apps/bigmember_pc/src/views/article-content/composables/useContentStore.js

@@ -151,8 +151,8 @@ function useRenMaiModel(ContentModel) {
     else {
       // 弹窗
       // showToast('暂无权限')
-      // 跳转大会员落地页
-      window.open('/big/page/index')
+      // 跳转人脉落地页
+      window.open('/swordfish/frontPage/declaration/free/relationship')
     }
   }
 

apps/bigmember_pc/src/views/order/components/big-member/info-data.js

@@ -187,6 +187,7 @@ export const serviceListData = [
     ]
   },
   {
+<<<<<<< HEAD
     阳光直采: [
       {
         two: '采购信息',
@@ -234,6 +235,36 @@ export const serviceListData = [
   //     },
   //   ]
   // },
+=======
+    人脉管理: [
+      {
+        two: '人脉维护',
+        three:
+          '添加您密切关联的人和企业，自动生成熟人的项目信息，不漏掉任何最大概率能成单的项目。',
+        four: '-',
+        five: '面议'
+      },
+      {
+        two: '潜客挖掘',
+        three: '通过密切关联的人和企业，自动生成能够快速对接上的潜在客户。',
+        four: '-',
+        five: '面议'
+      },
+      {
+        two: '商机挖掘',
+        three: '通过密切关联的人和企业，自动生成能够快速对接的项目信息。',
+        four: '-',
+        five: '面议'
+      },
+      {
+        two: '找人脉',
+        three: '添加项目名称，自动生成精准的联系人通讯录。',
+        four: '-',
+        five: '面议'
+      }
+    ]
+  },
+>>>>>>> main
   {
     营销分析: [
       {

apps/bigmember_pc/src/views/relationship/components/CollectionRelationList.vue

@@ -62,7 +62,11 @@
         </span>
       </div>
     </div>
-    <FindRelDrawer :id="drawer.id" :visible.sync="drawer.show" />
+    <FindRelDrawer
+      :id="drawer.id"
+      :buyer="drawer.buyer"
+      :visible.sync="drawer.show"
+    />
   </div>
 </template>
 
@@ -87,6 +91,7 @@ export default {
     return {
       drawer: {
         id: '',
+        buyer: '',
         show: false
       },
       jiankongInfo: {
@@ -169,8 +174,9 @@ export default {
       }
     },
     toFindRel(item) {
-      const { _id } = item
+      const { _id, buyer } = item
       this.drawer.id = _id
+      this.drawer.buyer = buyer
       this.drawer.show = true
     },
     async toDetail(item) {

apps/bigmember_pc/src/views/relationship/components/FindRelDrawer.vue

@@ -3,7 +3,7 @@
     title="推荐人脉列表"
     :visible="visible"
     @update:visible="onUpdateVisible"
-    size="70%"
+    size="50%"
     direction="rtl"
   >
     <div class="drawer-content">
@@ -26,6 +26,12 @@ export default {
     },
     id: {
       type: String,
+      required: true,
+      default: ''
+    },
+    buyer: {
+      type: String,
+      required: true,
       default: ''
     }
   },
@@ -37,7 +43,7 @@ export default {
   },
   computed: {
     src() {
-      return `${this.baseUrl}?I_project_id=${this.id}&is_succorjy=2`
+      return `${this.baseUrl}?I_project_id=${this.id}&is_succorjy=2&buyer=${this.buyer}`
     }
   },
   methods: {

apps/bigmember_pc/src/views/relationship/components/MonitorRelationList.vue

@@ -64,7 +64,11 @@
         </span>
       </div>
     </div>
-    <FindRelDrawer :id="drawer.id" :visible.sync="drawer.show" />
+    <FindRelDrawer
+      :id="drawer.id"
+      :buyer="drawer.buyer"
+      :visible.sync="drawer.show"
+    />
   </div>
 </template>
 
@@ -171,8 +175,9 @@ export default {
       }
     },
     toFindRel(item) {
-      const { _id } = item
+      const { _id, buyer } = item
       this.drawer.id = _id
+      this.drawer.buyer = buyer
       this.drawer.show = true
     },
     async toDetail(item) {

apps/mobile/src/data/links.js

@@ -190,6 +190,11 @@ export const LINKS = {
     h5: '/jyapp/big/page/landingPage',
     wx: '/big/wx/page/landingPage'
   },
+  人脉落地页面: {
+    app: '/jyapp/frontPage/declaration/free/relationship',
+    h5: '/jyapp/frontPage/declaration/free/relationship',
+    wx: '/weixin/frontPage/declaration/free/relationship'
+  },
   投标决策分析筛选页面: {
     app: '/jyapp/big/page/analysis_result',
     h5: '/jyapp/big/page/analysis_result',

apps/mobile/src/data/service-list.js

@@ -188,6 +188,7 @@ export const serviceListData = [
     ]
   },
   {
+<<<<<<< HEAD
     阳光直采: [
       {
         two: '采购信息',
@@ -235,6 +236,36 @@ export const serviceListData = [
   //     },
   //   ]
   // },
+=======
+    人脉管理: [
+      {
+        two: '人脉维护',
+        three:
+          '添加您密切关联的人和企业，自动生成熟人的项目信息，不漏掉任何最大概率能成单的项目。',
+        four: '-',
+        five: '面议'
+      },
+      {
+        two: '潜客挖掘',
+        three: '通过密切关联的人和企业，自动生成能够快速对接上的潜在客户。',
+        four: '-',
+        five: '面议'
+      },
+      {
+        two: '商机挖掘',
+        three: '通过密切关联的人和企业，自动生成能够快速对接的项目信息。',
+        four: '-',
+        five: '面议'
+      },
+      {
+        two: '找人脉',
+        three: '添加项目名称，自动生成精准的联系人通讯录。',
+        four: '-',
+        five: '面议'
+      }
+    ]
+  },
+>>>>>>> main
   {
     营销分析: [
       {

apps/mobile/src/views/article/components/ContentHeader.vue

@@ -38,7 +38,6 @@
       <!-- 无参标人和时间一行 -->
       <div
         v-else-if="showRenMaiButton"
-        v-show="false"
         class="relationship-button"
         @click="findRenMai"
       >
@@ -52,7 +51,6 @@
         <!-- 有参标人时候另起一行 -->
         <div
           v-if="cbPersonText && showRenMaiButton"
-          v-show="false"
           class="relationship-button"
           @click="findRenMai"
         >
@@ -154,7 +152,7 @@ export default {
         // 弹窗
         // this.$toast('暂无权限')
         // 跳转大会员落地页
-        openAppOrWxPage(LINKS.大会员落地页面)
+        openAppOrWxPage(LINKS.人脉落地页面)
       }
     }
   }

apps/mobile/src/views/common/vipsubscribeRights.vue

@@ -1123,6 +1123,7 @@ export default {
           ]
         },
         {
+<<<<<<< HEAD
           color: 'yellow',
           title: '阳光直采',
           head: ['服务项目', '大会员商机版2.0', '大会员专家版2.0'],
@@ -1166,6 +1167,34 @@ export default {
         //     },
         //   ]
         // },
+=======
+          color: 'yellowb',
+          title: '人脉管理',
+          head: ['服务项目', '大会员商机版2.0', '大会员专家版2.0'],
+          content: [
+            {
+              one: '人脉维护',
+              two: '-',
+              three: '面议'
+            },
+            {
+              one: '潜客挖掘',
+              two: '-',
+              three: '面议'
+            },
+            {
+              one: '商机挖掘',
+              two: '-',
+              three: '面议'
+            },
+            {
+              one: '找人脉',
+              two: '-',
+              three: '面议'
+            }
+          ]
+        },
+>>>>>>> main
         {
           color: 'yellowb',
           title: '营销分析',