Merge branch 'feature/GFRS-818【0410】人力发展-DISC性格分析' of http://112.124.100.131/GFRS/ebiz-h5 into feature/GFRS-818【0410】人力发展-DISC性格分析

# Conflicts:
#	src/api/ebiz/manpower/manpower.js
#	src/views/ebiz/manpower/discAnalysis/List.vue
#	src/views/ebiz/manpower/discAnalysis/Share.vue

src/api/ebiz/manpower/manpower.js

@@ -111,6 +111,15 @@ export function getShareKey(data) {
 export function answerDetail(data = {}) {
   return request({
     url: getUrl('/customer/answer/detailByQnCode', 1),
+    method: 'post',
+        data
+      })
+    }
+    
+//DISC性格分析列表
+export function discAnalysisList(data) {
+  return request({
+    url: getUrl('/customer/answer/queryList', 1),
     method: 'post',
     data
   })
@@ -123,4 +132,4 @@ export function answerSubmit(data) {
     method: 'post',
     data
   })
-}
+}

src/assets/js/utils/request.js

@@ -62,7 +62,10 @@ let survey = [
   //'/customer/question/getTableId', // id 查询 -- ok
   '/customer/question/getAgentInfo' // 代理人详情
 ]
-let whiteList = ['/customer/agent/getCustomersList', ...proposal, ...sale, ...agentEnter, ...claims, ...survey]
+let manpower = [
+  '/customer/answer/queryList' //DISC性格分析
+]
+let whiteList = ['/customer/agent/getCustomersList', ...proposal, ...sale, ...agentEnter, ...claims, ...survey, ...manpower]
 
 // 创建axios实例
 const service = axios.create({

src/views/ebiz/manpower/discAnalysis/Share.vue

@@ -1,6 +1,9 @@
 <!-- DISC性格分析 - 分享后打开图片展示页 -->
 <template>
-  <div></div>
+  <div style="position:relative">
+    <img style="width: 100%;" src="@/assets/images/DISCtop.png" />
+    <img style="width: 52%;position: absolute;bottom: 3.6%;left: 24%;" src="@/assets/images/DISCbtn.png" @click="toTest" />
+  </div>
 </template>
 
 <script>
@@ -17,7 +20,17 @@ export default {
   created() {},
   mounted() {},
   methods: {
-    init() {}
+    //去做测试，跳转到测试答题页面
+    toTest() {
+      let url = `/manpower/DiscAnalysis/Question`
+      this.$jump({
+        flag: 'h5',
+        extra: {
+          url: location.origin + `/#${url}`
+        },
+        routerInfo: { path: url }
+      })
+    }
   },
   components: {
     // [Field.name]: Field,