Merge branch 'dev' of https://git.1000my.com/project-chengduSKP/cd_SKP_H_base_daoshi_vue_ts into dev

3 years ago · d63902ba4b
6 changed files with 153 additions and 13 deletions
--- a/public/static/offline/JSON/getFacilityList.json
+++ b/public/static/offline/JSON/getFacilityList.json
@ -1 +1,123 @@
-{"code":200,"msg":"操作成功","data":[{"name":"地铁","nameEn":"","code":"DtZKU6ordgXcj8LPLrx4_","customFacilityName":"","customFacilityNameEn":""},{"name":"服务台","nameEn":"","code":"Q06WweVcR09F-fPHEmfPg","customFacilityName":"","customFacilityNameEn":""},{"name":"母婴室","nameEn":"","code":"MW_Iy4G6ggBTGADTUZzMD","customFacilityName":"","customFacilityNameEn":"","filePath":"/convert/Files/e42ea976-1acc-45fa-b00e-203213f5f5b6/mys.png"},{"name":"停车场","nameEn":"","code":"WeKtI9-Wig4BldTI4o7J8","customFacilityName":"","customFacilityNameEn":"","filePath":"/convert/Files/f4fe843e-63d9-460c-8cb0-c8fdf5c06c71/tcc.png"},{"name":"无障碍卫生间","nameEn":"无障碍卫生间","code":"CFfRtlLbYE9d38bv3VZy0","customFacilityName":"","customFacilityNameEn":"","filePath":"/convert/Files/abc22b61-3d10-42c2-a5c1-182c21da9147/cjr.png"},{"name":"扶梯","nameEn":"扶梯","code":"SWjFvak82y9lXc0rBXn2g","customFacilityName":"","customFacilityNameEn":"","filePath":"/convert/Files/ff5514af-a743-4823-a246-43de4b8d362f/ft.png"},{"name":"楼梯","nameEn":"","code":"XGgII8bTWzH2Lwy_iKtd1","customFacilityName":"","customFacilityNameEn":""},{"name":"男洗手间","nameEn":"","code":"gl9qD0UXBY991EpItqldQ","customFacilityName":"","customFacilityNameEn":""},{"name":"女洗手间","nameEn":"","code":"ncGrnPQ0R1wCrZGXgg6UT","customFacilityName":"","customFacilityNameEn":""},{"name":"直梯","nameEn":"","code":"_Lw1JgBlHcHmHIhDffWDX","customFacilityName":"","customFacilityNameEn":"","filePath":"/convert/Files/86b0e9ab-57bd-40b9-97c0-f1b6f1d0efd4/dt.png"}]}
+{
+    "code": 200,
+    "msg": "操作成功",
+    "data": [
+        {
+            "name": "扶梯",
+            "nameEn": "escalator",
+            "code": "wvbKjHPqqnbjxsXTlSfc1",
+            "customFacilityName": "",
+            "customFacilityNameEn": "",
+            "abbreviation": "ft",
+            "filePath": "/iotFile/2022/11/15/f3u4NjtZtlVfhoW-p3lqM.png"
+        },
+        {
+            "name": "上扶梯",
+            "nameEn": "",
+            "code": "NtFDFfDiTIQIWQ5UFqcbv",
+            "customFacilityName": "",
+            "customFacilityNameEn": "",
+            "abbreviation": "upft",
+            "filePath": "/iotFile/2022/11/15/RbX3fMJtHD12cie3ZWbhl.png"
+        },
+        {
+            "name": "下扶梯",
+            "nameEn": "xiafuti",
+            "code": "UPAo4Rr1B0SUonvpSW8kC",
+            "customFacilityName": "",
+            "customFacilityNameEn": "",
+            "abbreviation": "downft",
+            "filePath": "/iotFile/2022/11/15/KVRDjyi__OiTBK0wvTiab.png"
+        },
+        {
+            "name": "母婴室",
+            "nameEn": "",
+            "code": "D3i4vTd1k7NYlaC4kmeVP",
+            "customFacilityName": "",
+            "customFacilityNameEn": "",
+            "abbreviation": "mys",
+            "filePath": "/iotFile/2022/11/15/ASyeOlY20rCM0Y204kOXf.png"
+        },
+        {
+            "name": "洗手间",
+            "nameEn": "toilet",
+            "code": "ACgMk2fBoaIn268yyLnFG",
+            "customFacilityName": "",
+            "customFacilityNameEn": "",
+            "abbreviation": "xsj",
+            "filePath": "/iotFile/2022/11/15/R7GJWgwODBsGiM4A6ARzu.png"
+        },
+        {
+            "name": "直梯",
+            "nameEn": "",
+            "code": "DaNPxh6ilIIhd4gkri38j",
+            "customFacilityName": "",
+            "customFacilityNameEn": "",
+            "abbreviation": "dt",
+            "filePath": "/iotFile/2022/11/15/xOyk8yctB_D0KaD4jw6D-.png"
+        },
+        {
+            "name": "吸烟室",
+            "nameEn": "",
+            "code": "5Gp5PNrRVu7RBsrqGiJOi",
+            "customFacilityName": "",
+            "customFacilityNameEn": "",
+            "abbreviation": "xys",
+            "filePath": "/iotFile/2022/11/15/l-wKNIKm4SbRdalfC0adv.png"
+        },
+        {
+            "name": "人行通道",
+            "nameEn": "",
+            "code": "eOfA_xJ0yJ8BghGyuc3kw",
+            "customFacilityName": "",
+            "customFacilityNameEn": "",
+            "abbreviation": "td",
+            "filePath": "/iotFile/2022/11/15/-ZCv-lT1vGnozNj-hnYjW.png"
+        },
+        {
+            "name": "男洗手间",
+            "nameEn": "",
+            "code": "OMoEcFmqQCTTGPTPCRGzp",
+            "customFacilityName": "",
+            "customFacilityNameEn": "",
+            "abbreviation": "xsjn",
+            "filePath": "/iotFile/2022/11/15/RPLs01DqaHy-HUcOWFunN.png"
+        },
+        {
+            "name": "女洗手间",
+            "nameEn": "",
+            "code": "J9xwLN-PXnxcf5cxlVM5d",
+            "customFacilityName": "",
+            "customFacilityNameEn": "",
+            "abbreviation": "xsjv",
+            "filePath": "/iotFile/2022/11/15/7gt7rdAoCvH-Mz6afk7yu.png"
+        },
+        {
+            "name": "活动",
+            "nameEn": "",
+            "code": "Me3ww760_AGXnA49PefKm",
+            "customFacilityName": "",
+            "customFacilityNameEn": "",
+            "abbreviation": "hd",
+            "filePath": "/iotFile/2023/03/29/xiNzv4wixeghR6OIKWjad.png"
+        },
+        {
+            "name": "服务台",
+            "nameEn": "",
+            "code": "9_BitsfWpJbShoy74lu-5",
+            "customFacilityName": "",
+            "customFacilityNameEn": "",
+            "abbreviation": "fwt",
+            "filePath": "/iotFile/saas/20230602/mnj4iHDnTbxx7SaYu9naD.png"
+        },
+        {
+            "name": "停车场",
+            "nameEn": "",
+            "code": "5-dKYo0_dOe9AtuDESAH1",
+            "customFacilityName": "",
+            "customFacilityNameEn": "",
+            "abbreviation": "tcc",
+            "filePath": "/iotFile/saas/20230602/5YOnznceV6MoLMbjysHdG.png"
+        }
+    ]
+}
--- a/public/static/offline/JSON/getServeList.json
+++ b/public/static/offline/JSON/getServeList.json
@ -6,18 +6,19 @@
            "id": 108,
            "title": "服务1",
            "content": {
-                "name": "服务设施测试名称服务设施测试名称服务设施测试名称",
+                "name": "111服务设施测试名称服务设施测试名称服务设施测试名称",
                "nameEn": "ljgdsfl lsakjfdl\nlksadjflssadf lsadfj",
                "content": "借号阿斯蒂芬拉萨客服经理手打就发了水电费吉林省就发了独守空房蓝思科技烦死了地方\n离开时间弗利萨大姐夫ls索拉卡大飞机雷克萨戴假发\n\n索拉卡范德萨解放东路吉林省\n索拉卡党风建设两地分居\n索拉卡动静分离萨克大飞机\n离开时间弗利萨大姐夫ls索拉卡大飞机雷克萨戴假发\n\n索拉卡范德萨解放东路吉林省\n索拉卡党风建设两地分居\n索拉卡动静分离萨克大飞机\n离开时间弗利萨大姐夫ls索拉卡大飞机雷克萨戴假发\n\n索拉卡范德萨解放东路吉林省\n索拉卡党风建设两地分居\n索拉卡动静分离萨克大飞机\n离开时间弗利萨大姐夫ls索拉卡大飞机雷克萨戴假发\n\n索拉卡范德萨解放东路吉林省\n索拉卡党风建设两地分居\n索拉卡动静分离萨克大飞机\n离开时间弗利萨大姐夫ls索拉卡大飞机雷克萨戴假发\n\n索拉卡范德萨解放东路吉林省\n索拉卡党风建设两地分居\n索拉卡动静分离萨克大飞机",
                "contentEn": "sklf sldfj sdfds sdfjiofldsfdsl oijffsofsfspdsnfvs fsldfjsdfowefjsdlfds sdfsafds fowi jfsldfjldsa jfoisafwofdslf jlsfdjsaofjwlfdsjf lsadfoisafj lds jldsf jsoa ",
-                "point": "0_0_148",
+                
                "logo_code": [
                    "/iotFile/project-ey_fpaur6s6fkgvszywana/20230713/Fx_J5f4tCbxX-adqu1Pld.jpg"
                ],
                "file_code": [
                    "/iotFile/project-ey_fpaur6s6fkgvszywana/20230713/Ema4b9Ef8BIk_AFkGbrpU.jpg",
                    "/iotFile/project-ey_fpaur6s6fkgvszywana/20230713/69XuZLu78NcJNZ6Kuelna.jpg"
-                ]
+                ],
+                "facilityCode": "wvbKjHPqqnbjxsXTlSfc1"
            }
        },
        {
--- a/src/components/ActivityDetail/ActivityDetail.vue
+++ b/src/components/ActivityDetail/ActivityDetail.vue
@ -2,7 +2,7 @@
  <transition appear enter-active-class="animate__animated animate__fadeIn" leave-active-class="animate__animated animate__fadeOut">
    <masker @click="close">
      <transition appear enter-active-class="animate__animated animate__fadeInUp" leave-active-class="animate__animated animate__zoomOut">
-        <div class="act-info-container" :class="{ 'no-point': actInfo.point === '' }">
+        <div class="act-info-container" :class="{ 'no-point': isNoPoint }">
          <div class="carousel">
            <swiper
              :autoplay="{
@ -86,24 +86,28 @@ import masker from '@/base/Masker/Masker.vue'
 import MarqueesVue from '@/base/Marquees/Marquees.vue'
 // import { useQRCode } from '@/composables/useQRCode'
 import { useActivityNav } from '@/composables/useActivityNav'
-import { computed, ref, onMounted } from 'vue'
+import { computed, ref, toRaw, onMounted } from 'vue'
 import { useRootStore } from '@/store/root'
 import { useSwitchLanguage } from '@/composables/useSwitchLanguage'
 import { useStatisticsModel } from '@/composables/useStatistics'
+import { useFacilityNav } from '@/composables/useFacilityNav'
+
 const store = useRootStore()

 const { switchLanguage } = useSwitchLanguage()
 const qrDom = ref()
 const modules = [Autoplay, Pagination, EffectFade]
 const { nav } = useActivityNav()
+const { handleFacility } = useFacilityNav() //公共设施导航
+
 const getQRUrl = computed(() => {
-  return props.actInfo.qrFileUrl
+  return ''
 })
 const swiperList = computed(() => {
  return props.actInfo.fileUrl
 })
 const showGobtn = computed(() => {
-  if (props.actInfo.point !== -1) {
+  if (props.actInfo.point.length || props.actInfo.facilityCode?.length) {
    return true
  } else if (props.actInfo.shopCode) {
    const shop = store.shopList.find(item => item.shopCode === props.actInfo.shopCode)
@ -114,6 +118,9 @@ const showGobtn = computed(() => {
  }
  return false
 })
+const isNoPoint = computed(() => {
+  return !props.actInfo.point && !props.actInfo.facilityCode
+})
 interface AItem {
  actInfo: Activity
 }
@ -145,7 +152,14 @@ function close() {
  }, 20)
 }
 function handleGo() {
-  nav(props.actInfo)
+  if (props.actInfo.point.length) {
+    nav(props.actInfo)
+  } else if (props.actInfo.facilityCode?.length) {
+    const fac = store.facilityList.find(item => item.code === props.actInfo.facilityCode)
+    if (fac) {
+      handleFacility(toRaw(fac))
+    }
+  }
  store.SET_SHOW_SEARCH(false)
 }
 </script>
--- a/src/components/SearchResultList/SearchResultList.vue
+++ b/src/components/SearchResultList/SearchResultList.vue
@ -181,7 +181,7 @@ function handleActivity(item: Activity) {
          color: #615c59;

          &:last-child {
-            width: 110px;
+            width: 150px;
            height: 30px;
            padding: 0;
            margin-left: 0;
@ -205,7 +205,7 @@ function handleActivity(item: Activity) {
        position: relative;
        overflow: hidden;
        width: 822px;
-        height: 683px;
+        height: 680px;
        padding-right: 24px;
      }
      .results {
--- a/src/types/activity.d.ts
+++ b/src/types/activity.d.ts
@ -19,4 +19,6 @@ declare interface Activity {
  floorOrder?: number
  point: string // 导航点
  shopCode: string //关联店铺code
+  logoCode?: string //一些地方用到这个字段
+  facilityCode?: string //服务里需要这个字段
 }
--- a/src/views/Service/Service.vue
+++ b/src/views/Service/Service.vue
@ -89,14 +89,15 @@ function handleSwitch(index: number) {
 function getData() {
  getServeList().then(res => {
    for (let t = 0; t < res.data.length; t++) {
-      const { name, nameEn, content, contentEn, file_code, point, logo_code } = res.data[t].content
+      const { name, nameEn, content, contentEn, file_code, logo_code, facilityCode } = res.data[t].content
      serviceList.value.push({
        id: res.data[t].id,
        activityContent: content,
        activityContentEn: contentEn,
        activityName: name,
        activityNameEn: nameEn,
-        point,
+        point: '',
+        facilityCode,
        logo_code,
        fileUrl: file_code ?? [],
        shopCode: ''