From 4102cd81b143bd83ef3c2e1f85311075e2e2d7e2 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Fri, 24 Dec 2021 11:49:16 +0800
Subject: [PATCH] +接口更改
---
src/api/mobile/livingFacilities/index.js | 163 +++++++++++++++++++++-------------------
src/components/mobilePopupOurAfter/index.vue | 63 +++++++++------
src/components/mobilePopupOur/index.vue | 3
3 files changed, 128 insertions(+), 101 deletions(-)
diff --git a/src/api/mobile/livingFacilities/index.js b/src/api/mobile/livingFacilities/index.js
index b1c6965..e1f65f0 100644
--- a/src/api/mobile/livingFacilities/index.js
+++ b/src/api/mobile/livingFacilities/index.js
@@ -2,98 +2,109 @@
* @Author: Morpheus
* @Date: 2021-05-09 15:17:44
* @Last Modified by: liu
- * @Last Modified time: 2021-12-22 11:12:21
+ * @Last Modified time: 2021-12-24 11:29:59
*/
// 生活设施
import request from '@/router/axios'
-//食堂餐厅
-export const getListlivingFacilitiesr = (params) => { //获取生活设施
+//换成了一个接口
+export const getListLifeOnce = (params) => { //获取生活设施
return request({
- url: 'blade-restaurant/restaurant/list',
- method: 'get',
- params: params
- })
-}
-//超市
-export const getListsupermarket = (params) => { //获取生活设施
- return request({
- url: 'blade-supermarket/supermarket/list',
+ url: 'blade-life/life/list',
method: 'get',
params: params
})
}
-//医疗
-export const getListmedical = (params) => { //获取生活设施
- return request({
- url: 'blade-medical/medical/list',
- method: 'get',
- params: params
- })
-}
-//快递
-export const getListmail = (params) => { //获取生活设施
- return request({
- url: 'blade-mail/mail/list',
- method: 'get',
- params: params
- })
-}
-//浴室
-export const getListbathroom = (params) => { //获取生活设施
- return request({
- url: 'blade-bathroom/bathroom/list',
- method: 'get',
- params: params
- })
-}
+// //食堂餐厅
+// export const getListlivingFacilitiesr = (params) => { //获取生活设施
+// return request({
+// url: 'blade-restaurant/restaurant/list',
+// method: 'get',
+// params: params
+// })
+// }
+// //超市
+// export const getListsupermarket = (params) => { //获取生活设施
+// return request({
+// url: 'blade-supermarket/supermarket/list',
+// method: 'get',
+// params: params
+// })
+// }
-//打字复印
-export const getListduplicate = (params) => { //获取生活设施
- return request({
- url: 'blade-duplicate/duplicate/list',
- method: 'get',
- params: params
- })
-}
+// //医疗
+// export const getListmedical = (params) => { //获取生活设施
+// return request({
+// url: 'blade-medical/medical/list',
+// method: 'get',
+// params: params
+// })
+// }
-//银行网点
-export const getListnetwork = (params) => { //获取生活设施
- return request({
- url: 'blade-network/network/list',
- method: 'get',
- params: params
- })
-}
+// //快递
+// export const getListmail = (params) => { //获取生活设施
+// return request({
+// url: 'blade-mail/mail/list',
+// method: 'get',
+// params: params
+// })
+// }
-//AED
-export const getListaed = (params) => { //获取生活设施
- return request({
- url: 'blade-aed/aed/list',
- method: 'get',
- params: params
- })
-}
+// //浴室
+// export const getListbathroom = (params) => { //获取生活设施
+// return request({
+// url: 'blade-bathroom/bathroom/list',
+// method: 'get',
+// params: params
+// })
+// }
-//通讯
-export const getListsignal = (params) => { //获取生活设施
- return request({
- url: 'blade-signal/signal/list',
- method: 'get',
- params: params
- })
-}
+// //打字复印
+// export const getListduplicate = (params) => { //获取生活设施
+// return request({
+// url: 'blade-duplicate/duplicate/list',
+// method: 'get',
+// params: params
+// })
+// }
-//圈存机
-export const getListtransference = (params) => { //获取生活设施
- return request({
- url: 'blade-transference/transference/list',
- method: 'get',
- params: params
- })
-}
+// //银行网点
+// export const getListnetwork = (params) => { //获取生活设施
+// return request({
+// url: 'blade-network/network/list',
+// method: 'get',
+// params: params
+// })
+// }
+
+// //AED
+// export const getListaed = (params) => { //获取生活设施
+// return request({
+// url: 'blade-aed/aed/list',
+// method: 'get',
+// params: params
+// })
+// }
+
+// //通讯
+// export const getListsignal = (params) => { //获取生活设施
+// return request({
+// url: 'blade-signal/signal/list',
+// method: 'get',
+// params: params
+// })
+// }
+
+// //圈存机
+// export const getListtransference = (params) => { //获取生活设施
+// return request({
+// url: 'blade-transference/transference/list',
+// method: 'get',
+// params: params
+// })
+// }
diff --git a/src/components/mobilePopupOur/index.vue b/src/components/mobilePopupOur/index.vue
index bf91d24..87571b6 100644
--- a/src/components/mobilePopupOur/index.vue
+++ b/src/components/mobilePopupOur/index.vue
@@ -174,9 +174,10 @@
this.choiceMain == "出入口" ||
this.choiceMain == "停车场"
) {
- // 不传头部下拉菜单，因为请求链接不同
+ // 改变传入属性
d = {
campus: campus,
+ lifetype: type,
};
} else {
d = {
diff --git a/src/components/mobilePopupOurAfter/index.vue b/src/components/mobilePopupOurAfter/index.vue
index 183fdfe..46abfb1 100644
--- a/src/components/mobilePopupOurAfter/index.vue
+++ b/src/components/mobilePopupOurAfter/index.vue
@@ -35,19 +35,20 @@
import { getList } from "@/api/mobile/orgnav/index"; //机构单位
import { getChildNavList } from "@/api/mobile/public/arc"; //校园建筑
import {
- getListlivingFacilitiesr,
- getListsupermarket,
- getListmedical,
- getListmail,
- getListbathroom,
- getListduplicate,
- getListnetwork,
- getListaed,
- getListsignal,
- getListtransference,
+ // getListlivingFacilitiesr,
+ // getListsupermarket,
+ // getListmedical,
+ // getListmail,
+ // getListbathroom,
+ // getListduplicate,
+ // getListnetwork,
+ // getListaed,
+ // getListsignal,
+ // getListtransference,
+ getListLifeOnce, //所有的
} from "@/api/mobile/livingFacilities/index"; //生活设施
-import { getListdoor } from "@/api/mobile/outIn/index"; //出入口
-import { getListparking } from "@/api/mobile/stop/index"; //停车场
+// import { getListdoor } from "@/api/mobile/outIn/index"; //出入口
+// import { getListparking } from "@/api/mobile/stop/index"; //停车场
export default {
name: "mobilePopupOurAfter",
data() {
@@ -103,21 +104,35 @@
{ name: "家属住宅", type: 6, method: getChildNavList },
{ name: "其他楼宇", type: 7, method: getChildNavList },
],
+ // openData3: [
+ // { name: "食堂餐厅", type: 1, method: getListlivingFacilitiesr },
+ // { name: "购物超市", type: 2, method: getListsupermarket },
+ // { name: "校内医疗", type: 3, method: getListmedical },
+ // { name: "邮寄快递", type: 4, method: getListmail },
+ // { name: "学生浴室", type: 5, method: getListbathroom },
+ // { name: "圈存机", type: 6, method: getListtransference },
+ // { name: "打字复印", type: 7, method: getListduplicate },
+ // { name: "AED", type: 8, method: getListaed },
+ // { name: "银行网点", type: 9, method: getListnetwork },
+ // { name: "通信营业厅", type: 10, method: getListsignal },
+ // ],
+ // openData6: [{ name: "停车场", type: 1, method: getListparking }],
+ // openData5: [{ name: "出入口", type: 1, method: getListdoor }],
openData3: [
- { name: "食堂餐厅", type: 1, method: getListlivingFacilitiesr },
- { name: "购物超市", type: 2, method: getListsupermarket },
- { name: "校内医疗", type: 3, method: getListmedical },
- { name: "邮寄快递", type: 4, method: getListmail },
- { name: "学生浴室", type: 5, method: getListbathroom },
- { name: "圈存机", type: 6, method: getListtransference },
- { name: "打字复印", type: 7, method: getListduplicate },
- { name: "AED", type: 8, method: getListaed },
- { name: "银行网点", type: 9, method: getListnetwork },
- { name: "通信营业厅", type: 10, method: getListsignal },
+ { name: "食堂餐厅", type: 1, method: getListLifeOnce },
+ { name: "购物超市", type: 2, method: getListLifeOnce },
+ { name: "校内医疗", type: 3, method: getListLifeOnce },
+ { name: "邮寄快递", type: 4, method: getListLifeOnce },
+ { name: "学生浴室", type: 5, method: getListLifeOnce },
+ { name: "圈存机", type: 6, method: getListLifeOnce },
+ { name: "打字复印", type: 7, method: getListLifeOnce },
+ { name: "银行网点", type: 8, method: getListLifeOnce },
+ { name: "AED", type: 9, method: getListLifeOnce },
+ { name: "通信营业厅", type: 10, method: getListLifeOnce },
],
+ openData6: [{ name: "停车场", type: 11, method: getListLifeOnce }],
+ openData5: [{ name: "出入口", type: 12, method: getListLifeOnce }],
openData4: [{ name: "文化风景", type: 5, method: getChildNavList }],
- openData5: [{ name: "出入口", type: 1, method: getListdoor }],
- openData6: [{ name: "停车场", type: 1, method: getListparking }],
};
},
mounted() {},
--
Gitblit v1.9.3