Merge branch 'feature/GFRS-717【0402】人力发展-活动量管理' into dev

src/api/ebiz/manpower/manpower.js

@@ -88,3 +88,21 @@ export function getTokenForUserModel(data = {}) {
     }
   })
 }
+
+// 新增分享记录
+export function saveShareRecord(data) {
+  return request({
+    url: getUrl('/agent/share/saveRecord', 1),
+    method: 'post',
+    data
+  })
+}
+
+// 获取分享记录的key
+export function getShareKey(data) {
+  return request({
+    url: getUrl('/agent/share/getKey', 1),
+    method: 'post',
+    data
+  })
+}

src/components/ebiz/manpower/ActivityLogItem.vue

@@ -5,7 +5,7 @@
         <van-icon slot="icon" :name="ActivityLogInfo.avatarUrl || defaultAcatarUrl" style="line-height: inherit;" size="22" />
         <span class="mr20">{{ ActivityLogInfo.age }}</span>
         <span>{{ ActivityLogInfo.type == 0 ? '同业' : '白板' }}</span>
-        <van-icon slot="right-icon" name="edit" style="line-height: inherit;" :color="isEdit ? '#1989fa' : 'transparent'" size="24" />
+        <van-icon slot="right-icon" name="edit" style="line-height: inherit;" :color="isEdit ? '#ee0a24' : 'transparent'" size="24" />
       </van-cell>
     </van-cell-group>
   </div>

src/components/ebiz/manpower/NavItem.vue

@@ -3,9 +3,9 @@
   <!-- <div class="nav-item"> -->
   <van-cell is-link class="relative" @click="rout(config)">
     <template slot="title">
-      <van-icon v-if="config.icon" class="t-cell-icon" size="6.4vw" :name="config.icon" />
+      <van-icon v-if="config.icon" color="#ee0a24" class="t-cell-icon" size="6.4vw" :name="config.icon" />
       <img v-else class="t-cell-icon" :src="config.src" alt="config" />
-      <span class="custom-title"> {{ config.title }}</span>
+      <span class="custom-title c-gray-base"> {{ config.title }}</span>
     </template>
   </van-cell>
   <!-- </div> -->

src/components/ebiz/manpower/TalentPoolItem.vue

@@ -1,8 +1,8 @@
 <template>
-  <van-cell :title="talentPoolInfo.name" title-class="ml10" is-link value-class="text-left">
+  <van-cell :title="talentPoolInfo.name" title-class="ml10" is-link value-class="text-left" @click="edit(talentPoolInfo.personnelCode)" >
     <van-icon slot="icon" :name="talentPoolInfo.avatarUrl || defaultAcatarUrl" style="line-height: inherit;" size="24" />
     <span>{{ talentPoolInfo.sameCompany }}</span>
-    <van-icon slot="right-icon" name="edit" style="line-height: inherit;" color="#1989fa" size="24" @click="edit(talentPoolInfo.personnelCode)" />
+    <van-icon slot="right-icon" name="edit" style="line-height: inherit;" color="#ee0a24" size="24" />
   </van-cell>
 </template>
 <script>

src/components/ebiz/manpower/UserInfoHeader.vue

@@ -1,10 +1,10 @@
 <!-- 头部用户信息 -->
 <template>
-  <div class="user-info flex align-items-c p15">
+  <div class="user-info flex p15 bg-head align-items-e">
     <img class="w40" src="../../../assets/images/bnf_avatar.png" />
     <div class="add-list flex1 ml10">
-      <p>{{ userInfo.name }}</p>
+      <p class="fs16 font-bold">{{ userInfo.name }}</p>
-      <div class="c-gray-base">工号 | {{ userInfo.jobNo }}</div>
+      <div class="">工号 | {{ userInfo.jobNo }}</div>
     </div>
   </div>
 </template>
@@ -46,13 +46,19 @@ export default {
 
 <style lang="scss" scoped>
 .user-info {
-  color: #666;
+  background-image: url('~@/assets/images/headerBg.png');
+  background-size: cover;
+  color: white;
+  height: 80px;
+
   .send-main {
     border-bottom: 10px solid #f5f5f5;
   }
   .add-list {
-    color: #333;
     line-height: 22px;
   }
+  .font-bold {
+    font-weight: bold;
+  }
 }
 </style>

src/views/ebiz/manpower/ActiveManagement.vue

@@ -27,7 +27,7 @@
           <van-cell-group>
             <TalentPoolItem v-for="talentPoolInfo in talentPoolList" :key="talentPoolInfo.personnelCode" :talentPoolInfo="talentPoolInfo"></TalentPoolItem>
           </van-cell-group>
-          <p v-if="showMoreTalentPool" class="p15 text-right blue" @click="toListTalentPool">查看全部>>></p>
+          <p v-if="showMoreTalentPool" class="p15 text-right red" @click="toListTalentPool">查看全部 >></p>
         </van-collapse-item>
       </van-collapse>
       <template v-else>
@@ -38,7 +38,7 @@
         </van-cell>
         <van-cell>
           <template slot="title">
-            <div class="text-center"><van-icon name="add-square" size="50" color="#1989fa" @click="addTalentPool" /></div>
+            <div class="text-center"><van-icon name="add-square" size="50" color="#ee0a24" @click="addTalentPool" /></div>
           </template>
         </van-cell>
       </template>
@@ -48,13 +48,13 @@
     <div class="bg-white">
       <div class="p15" v-if="recordList.length == 0">
         <p class="fs16 fwb">当日增员活动日志</p>
-        <div class="text-center van-hairline--top"><van-icon name="add-square" size="50" color="#1989fa" @click="toEdit" /></div>
+        <div class="text-center van-hairline--top"><van-icon name="add-square" size="50" color="#ee0a24" @click="toEdit" /></div>
       </div>
       <van-collapse v-model="recordNames" v-else>
         <van-collapse-item name="1" title-class="fs16 fwb">
           <div slot="title" class="flex justify-content-s align-items-c">当日增员活动日志 <van-icon class="mr10" name="plus" @click.stop="toEdit" /></div>
           <ActivityLogItem :ActivityLogInfo="info" v-for="(info, index) in recordList" :key="index"></ActivityLogItem>
-          <p v-if="showMore" class="p15 text-right blue" @click="toList">查看全部>>></p>
+          <p v-if="showMore" class="p15 text-right red" @click="toList">查看全部 >></p>
         </van-collapse-item>
       </van-collapse>
     </div>
@@ -218,4 +218,8 @@ export default {
   }
 }
 </script>
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.red {
+  color: #ee0a24 !important;
+}
+</style>

src/views/ebiz/manpower/increaseStaffTools/CompanyIntroduction.vue

@@ -47,6 +47,8 @@
 </template>
 <script>
 import { Image } from 'vant'
+import { getShareKey, saveShareRecord } from '@/api/ebiz/manpower/manpower'
+
 export default {
   components: {
     [Image.name]: Image
@@ -65,10 +67,14 @@ export default {
       img10: require('../image/10.png'),
       img11: require('../image/11.png'),
       img12: require('../image/12.png'),
-      img13: require('../image/13.png')
+      img13: require('../image/13.png'),
+      redisKey: ''
     }
   },
   mounted() {
+    this.redisKey = this.$route.query.redisKey
+    if (this.redisKey) this.saveShareRecord('1')
+    else this.getShareKey()
     setTimeout(() => {
       // 右上角的显示
       this.$jump({
@@ -87,17 +93,44 @@ export default {
   methods: {
     appCallBack(data) {
       if (data.trigger == 'right_button_click') {
+        this.saveShareRecord('0')
         // eslint-disable-next-line no-undef
         EWebBridge.webCallAppInJs('bridge', {
           flag: 'share',
           extra: {
             title: '国富人寿保险股份有限公司',
             content: '公司介绍',
-            url: '',
+            url: `${location.origin}/#/manpower/increaseStaffTools/CompanyIntroduction?redisKey=${this.redisKey}`,
-            img: ''
+            img: this.$assetsUrl + 'images/logo.png'
           }
         })
       }
+    },
+    getShareKey() {
+      let data = {
+        linkType: '0001',
+        url: `${location.origin}/#/manpower/increaseStaffTools/CompanyIntroduction`
+      }
+      getShareKey(data)
+        .then(res => {
+          console.log(res)
+          if (res.result == 0) {
+            this.redisKey = res.content
+          } else {
+            this.$toast(res.resultMessage)
+          }
+        })
+        .catch(err => {
+          console.log(err)
+        })
+    },
+    saveShareRecord(flag) {
+      let data = {
+        linkType: '0001',
+        flag: flag,
+        redisKey: this.redisKey
+      }
+      saveShareRecord(data)
     }
   }
 }

src/views/ebiz/manpower/increaseStaffTools/PdfShare.vue

@@ -5,13 +5,16 @@
 </template>
 
 <script>
+import { getShareKey, saveShareRecord } from '@/api/ebiz/manpower/manpower'
+
 export default {
   data() {
     return {
       // src: 'http://47.96.143.111/pdfjs/web/viewer.html?file=http://47.96.143.111:8000/app/images/jsSDK.pdf'
       pdfUrl: '',
       src: location.origin + '/pdfjs/web/viewer.html?file=',
-      shareContent: ''
+      shareContent: '',
+      redisKey: ''
     }
   },
   created() {
@@ -32,6 +35,9 @@ export default {
   },
   mounted() {
     this.init()
+    this.redisKey = this.$route.query.redisKey
+    if (this.redisKey) this.saveShareRecord('1')
+    else this.getShareKey()
   },
   methods: {
     init() {
@@ -50,17 +56,44 @@ export default {
     // 原生点击右上角按钮事件
     appCallBack(data) {
       if (data.trigger == 'right_button_click') {
+        this.saveShareRecord('0')
         // eslint-disable-next-line no-undef
         EWebBridge.webCallAppInJs('bridge', {
           flag: 'share',
           extra: {
             title: '国富人寿欢迎您！',
             content: this.shareContent,
-            url: '',
+            url: `${location.origin}/pdfjs/web/viewer.html?file=${this.pdfUrl}&redisKey=${this.redisKey}`,
-            img: ''
+            img: this.$assetsUrl + 'images/logo.png'
           }
         })
       }
+    },
+    getShareKey() {
+      let data = {
+        linkType: '0002',
+        url: `${location.origin}/pdfjs/web/viewer.html?file=${this.pdfUrl}`
+      }
+      getShareKey(data)
+        .then(res => {
+          console.log(res)
+          if (res.result == 0) {
+            this.redisKey = res.content
+          } else {
+            this.$toast(res.resultMessage)
+          }
+        })
+        .catch(err => {
+          console.log(err)
+        })
+    },
+    saveShareRecord(flag) {
+      let data = {
+        linkType: '0002',
+        flag: flag,
+        redisKey: this.redisKey
+      }
+      saveShareRecord(data)
     }
   }
 }

src/views/ebiz/manpower/talentPool/Edit.vue

@@ -1,6 +1,6 @@
 <!-- 人才库-修改人才 -->
 <template>
-  <div class="container">
+  <div class="container" v-show="show">
     <van-field v-model="formData.name" required clearable label="姓名" name="姓名" placeholder="请输入" v-validate="'required|name'" />
     <van-field v-model="formData.mobile" clearable label="手机号码" name="手机号码" placeholder="请输入" maxlength="11" type="tel" v-validate="'mobile'" />
     <select-radio :disabled="true" :radios="isSame" label="是否同业" name="是否同业" :value.sync="formData.isSame" :required="true"></select-radio>
@@ -71,6 +71,7 @@ export default {
   },
   data() {
     return {
+      show: false,
       selected: '',
       popupShow: false,
       formData: {
@@ -114,6 +115,7 @@ export default {
       .then(res => {
         if (res.result == 0) {
           this.formData = res.content.personnel
+          this.show = true
         } else {
           this.$toast(res.resultMessage)
         }