From 43c80bb0c6fb876cc623e0d10dcb23400ac8a54b Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Fri, 19 Jul 2024 19:04:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=AF=E4=BA=AB=E6=9C=8D=E5=8A=A1=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8,=E5=8F=AF=E4=BA=AB=E6=9C=8D=E5=8A=A1=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/service.js                     |  44 +++++++++++
 src/api/user.js                        |   7 --
 src/views/Enjoyableservices/detail.vue | 100 ++++++++++++++++++-------
 src/views/Enjoyableservices/index.vue  |   7 +-
 vue.config.js                          |   2 +-
 5 files changed, 123 insertions(+), 37 deletions(-)
 create mode 100644 src/api/service.js

diff --git a/src/api/service.js b/src/api/service.js
new file mode 100644
index 0000000..2d7de37
--- /dev/null
+++ b/src/api/service.js
@@ -0,0 +1,44 @@
+// axios
+import request from '@/utils/request'
+
+//服务找人详情
+export function icServiceRecordV2(data) {
+  return request({
+    url: `/governance/icServiceRecordV2/detail`,
+    method: 'post',
+    data
+  })
+}
+//温暖找人详情
+export function icServiceWarmRecord(data) {
+    return request({
+      url: `/governance/icServiceWarmRecord/detail`,
+      method: 'post',
+      data
+    })
+}
+  //技能找人详情
+export function icServiceSkillRecord(data) {
+    return request({
+      url: `/governance/icServiceSkillRecord/detail`,
+      method: 'post',
+      data
+    })
+}
+  //岗位招人详情
+export function icServicePostRecord(data) {
+    return request({
+      url: `/governance/icServicePostRecord/detail`,
+      method: 'post',
+      data
+    })
+}
+//扫描二维码获取房屋信息
+export function policyDetail(id) {
+  return request({
+    url: `/governance/policy/policyDetail/${id}`,
+    method: 'get',
+  })
+}
+
+
diff --git a/src/api/user.js b/src/api/user.js
index 8cc813f..d25eef5 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -138,10 +138,3 @@ export function myCommonsService(data) {
     data
   })
 }
-//获取可享服务详情
-export function icServiceWarmRecord(id) {
-  return request({
-    url: `/governance/policy/policyDetail/${id}`,
-    method: 'get',
-  })
-}
diff --git a/src/views/Enjoyableservices/detail.vue b/src/views/Enjoyableservices/detail.vue
index dad18df..87a6569 100644
--- a/src/views/Enjoyableservices/detail.vue
+++ b/src/views/Enjoyableservices/detail.vue
@@ -1,64 +1,114 @@
 <template>
     <div>
-        <div class="container" :style="this.phone=='Phone'?'':'height: 85vh; overflow: auto;'">
+        <div class="container" :style="this.phone == 'Phone' ? '' : 'height: 85vh; overflow: auto;'">
             <div class="card">
                 <div class="font-size21 font-bold">{{ info.title }}</div>
                 <div class="flex flex-x  flex-center2 m-top10 m-bottom10">
-                    <van-tag :color="info.expiredFlag?'#EBF1FE':'#F5F5F5'" :text-color="info.expiredFlag?'#3974F6':'#AAAAAA'" size="large">{{
-                    info.expiredFlag ? "进行中" : "已结束" }}</van-tag>
+                    <van-tag :color="info.expiredFlag ? '#EBF1FE' : '#F5F5F5'"
+                        :text-color="info.expiredFlag ? '#3974F6' : '#AAAAAA'" size="large">{{
+                            info.expiredFlag ? "进行中" : "已结束" }}</van-tag>
                     <div class="font-size13 C1 m-left12">{{ info.data }}</div>
 
                 </div>
                 <div class="y66666 font-size15 m-bottom5">享受服务条件：{{ info.resiSearchTagName }}</div>
-                <div class="y66666 font-size15 m-bottom5">服务提供方：{{ info.assignText|| '--' }}</div>
+                <div class="y66666 font-size15 m-bottom5">服务提供方：{{ info.assignText || '--' }}</div>
                 <div class="flex flex-x ">
-                    <div class="y66666 font-size15 nowrap">服务时间：{{ info.assignInfo.serviceTimeStart }} 至</br>{{ info.assignInfo.serviceTimeEnd }} </div>
-                    <div class="y66666 font-size15">{{ info.serviceData  }} </div>
+                    <div class="y66666 font-size15 nowrap">服务时间：{{ info.assignInfo.serviceTimeStart }} 至</br>{{
+                        info.assignInfo.serviceTimeEnd }} </div>
+                    <div class="y66666 font-size15">{{ info.serviceData }} </div>
                 </div>
                 <van-divider />
-                <div  v-html="info.content"></div>
+                <div v-html="info.content"></div>
             </div>
         </div>
-        <Android @send-number="handleNumber"/>
+        <Android @send-number="handleNumber" />
     </div>
 </template>
 
 <script>
-import { icServiceWarmRecord } from '@/api/user'
+import { icServicePostRecord, icServiceSkillRecord, icServiceWarmRecord, icServiceRecordV2 } from '@/api/service'
 
 export default {
     data() {
         return {
             info: {
-                title: '鞠源社区为退役待就业的军人提供 就业岗位',
-                content: '<p>县级以上地方人民政府退役士兵安置工作主管部门组织自主就业的退役士兵参加职业教育</p><p>县级以上地方人民政府退役士兵安置工作主管部门组织自主就业的退役士兵参加职业教育</p>', data: '2024-05-08 09:30'
-                , status: 1, condition: '退役军人 40-60岁', provider: 'XXX就业指导中心', serviceData: "2024-05-08 13:00至2024-6-22 13:00"
+                title: '',
+                content: '',
+                data: '',
+                condition: '',
+                provider: '',
+                expiredFlag: false,
+                serviceData: ""
             },
-            phone:""
+            phone: ""
         }
     },
-    components:{Android},
+    components: {},
     created() {
     },
-    mounted(){
-        if(this.$route.query){
-            this.icServiceWarmRecord(this.$route.query.id)
+    mounted() {
+        if (this.$route.query) {
+            let type = this.$route.query.type;
+            let id = this.$route.query.id;
+            if (type === 'fw') {
+                this.icServiceRecordV2({ serviceRecordId: id })
+            } else if (type === 'wn') {
+                this.icServiceWarmRecord({ serviceRecordId: id })
+            } else if (type === 'jn') {
+                this.icServiceSkillRecord({ serviceRecordId: id })
+            } else if (type === 'gw') {
+                this.icServicePostRecord({ serviceRecordId: id })
+            }else if (type === 'zc') {
+                this.policyDetail(id)
+            }
         }
     },
     methods: {
-        handleNumber(value){
-            console.log(value,"wl kgnsl, ");
-            this.phone=value
+        async policyDetail(id) {
+            let res = await policyDetail(id)
+            if (res.code === 0) {
+                this.info = res.data;
+                if (res.data.assignFlag === 1) {
+                    this.info.assignText = res.data.assignInfo.serviceScopeList.map(item => item.objectName).join(',')
+                }
+            }
         },
-        async icServiceWarmRecord(id){
+        async icServiceRecordV2(id) {
+            let res = await icServiceRecordV2(id)
+            if (res.code === 0) {
+                this.info = res.data;
+                if (res.data.assignFlag === 1) {
+                    this.info.assignText = res.data.assignInfo.serviceScopeList.map(item => item.objectName).join(',')
+                }
+            }
+        },
+        async icServiceWarmRecord(id) {
             let res = await icServiceWarmRecord(id)
-            if(res.code === 0){
+            if (res.code === 0) {
                 this.info = res.data;
-                if(res.data.assignFlag === 1){
-                    this.info.assignText = res.data.assignInfo.serviceScopeList.map(item=>item.objectName).join(',')
+                if (res.data.assignFlag === 1) {
+                    this.info.assignText = res.data.assignInfo.serviceScopeList.map(item => item.objectName).join(',')
                 }
             }
-        }
+        },
+        async icServiceSkillRecord(id) {
+            let res = await icServiceSkillRecord(id)
+            if (res.code === 0) {
+                this.info = res.data;
+                if (res.data.assignFlag === 1) {
+                    this.info.assignText = res.data.assignInfo.serviceScopeList.map(item => item.objectName).join(',')
+                }
+            }
+        },
+        async icServicePostRecord(id) {
+            let res = await icServicePostRecord(id)
+            if (res.code === 0) {
+                this.info = res.data;
+                if (res.data.assignFlag === 1) {
+                    this.info.assignText = res.data.assignInfo.serviceScopeList.map(item => item.objectName).join(',')
+                }
+            }
+        },
     },
 }
 </script>
diff --git a/src/views/Enjoyableservices/index.vue b/src/views/Enjoyableservices/index.vue
index c6be001..21488dd 100644
--- a/src/views/Enjoyableservices/index.vue
+++ b/src/views/Enjoyableservices/index.vue
@@ -1,12 +1,11 @@
 <template>
     <div>
     <div class="container">
-        <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="myCommonsService" class="card"
+        <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="myCommonsService" class=""
             :offset="50">
-            <div class="card  m-bottom10" v-for="(item,index) in EnjoyableList" :key="index"  @click="$router.push({ path: `/detailServices`,query:{id:item.id} })"> 
+            <div class="card  m-bottom10" v-for="(item,index) in EnjoyableList" :key="index"  @click="$router.push({ path: `/detailServices`,query:{id:item.serviceId,type:item.serviceType} })"> 
             <div class="flex flex-x  flex-center2">
-                <van-tag v-if="item.status" color="#EBF1FE" text-color="#3974F6" size="large">{{ item.status? "进行中":"已结束" }}</van-tag> 
-                <van-tag v-if="!item.status" color="#F5F5F5" text-color="#AAAAAA" size="large">{{ item.status? "进行中":"已结束" }}</van-tag>
+                <van-tag  color="#EBF1FE" text-color="#3974F6" size="large">{{ item.expiredFlag? "进行中":"已结束" }}</van-tag> 
                 <div class="font-size13 C1 m-left12">{{ item.startDate }}</div>
             </div>
             <div class="m-top10">{{ item.title }}</div>
diff --git a/vue.config.js b/vue.config.js
index fa42ce3..8ab1bc8 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -31,7 +31,7 @@ module.exports = defineConfig({
     proxy: {
       //配置跨域
       '/api': {
-        target: `http://192.168.1.144`,//http://192.168.1.144
+        target: `https://epmet-preview.elinkservice.cn`,
         // target: `http://127.0.0.1:8080`,
         changeOrigin: true,
         ws: false,