From acb45c731c3ccd0a67061efb4e7bdf4f56005672 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Wed, 12 Jan 2022 08:52:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/school-web
---
src/components/mobilePopupOurAfter/index.vue | 123 +++++++++++++++++++++++++++++------------
1 files changed, 87 insertions(+), 36 deletions(-)
diff --git a/src/components/mobilePopupOurAfter/index.vue b/src/components/mobilePopupOurAfter/index.vue
index d5714e1..2209fc8 100644
--- a/src/components/mobilePopupOurAfter/index.vue
+++ b/src/components/mobilePopupOurAfter/index.vue
@@ -1,5 +1,9 @@
<template>
- <div id="mobilePopupOurAfter">
+ <div
+ class="mobilePopupOurAfter"
+ :class="{ ismBigPopupAfter: mBigPopupAfter }"
+ >
+ <!-- v-show="mBigPopupAfter" -->
<div class="m_p_a_heard">
<div><i class="el-icon-menu icon"></i></div>
<div @click="closeBigPopupAfter"><i class="el-icon-close icon"></i></div>
@@ -32,22 +36,29 @@
</template>
<script>
+import { mapGetters } from "vuex";
import { getList } from "@/api/mobile/orgnav/index"; //机构单位
-import { getChildNavList } from "@/api/mobile/public/arc"; //校园建筑
+import { getChildNavList } from "@/api/mobile/public/arc"; //社区建筑
import {
- getListlivingFacilitiesr,
- getListsupermarket,
- getListmedical,
- getListmail,
- getListbathroom,
- getListduplicate,
- getListnetwork,
- getListaed,
- getListsignal,
+ // getListlivingFacilitiesr,
+ // getListsupermarket,
+ // getListmedical,
+ // getListmail,
+ // getListbathroom,
+ // getListduplicate,
+ // getListnetwork,
+ // getListaed,
+ // getListsignal,
+ // getListtransference,
+ getListLifeOnce, //所有的
} from "@/api/mobile/livingFacilities/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",
+ computed: {
+ ...mapGetters(["mBigPopupAfter"]),
+ },
data() {
return {
choiceValue: "",
@@ -58,7 +69,7 @@
opendata: "openData1",
},
{
- name: "校园建筑",
+ name: "社区建筑",
opendata: "openData2",
icon: "el-icon-s-management",
},
@@ -95,31 +106,41 @@
openData2: [
{ name: "行政办公", type: 1, method: getChildNavList },
{ name: "教学科研", type: 2, method: getChildNavList },
- { name: "校内场馆", type: 3, method: getChildNavList },
+ { name: "社区场馆", type: 3, method: getChildNavList },
{ name: "宿舍公寓", type: 4, method: getChildNavList },
{ name: "文化风景", type: 5, method: getChildNavList },
{ 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:getListlivingFacilitiesr},
- { 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 },
],
- openData4: [
- { name: "文化风景", type: 1, method: getListlivingFacilitiesr },
- ],
- openData5: [
- { name: "出入口", type: 1, method: getListlivingFacilitiesr },
- ],
- openData6: [{ name: "停车场", type: 1, method: getListparking }],
+ openData6: [{ name: "停车场", type: 11, method: getListLifeOnce }],
+ openData5: [{ name: "出入口", type: 12, method: getListLifeOnce }],
+ openData4: [{ name: "文化风景", type: 5, method: getChildNavList }],
};
},
mounted() {},
@@ -145,13 +166,34 @@
align-items: center;
justify-content: center;
}
-#mobilePopupOurAfter {
+.mobilePopupOurAfter {
position: fixed;
top: 37.5%;
- left: 13.5%;
+ // left: 13.5%;
+ left: -1000px;
width: 75%;
height: 25%;
background-color: #fff;
+ box-shadow: 0px 0px 5px #29baf1;
+ transition: all 0.5s;
+ // background-image: linear-gradient(
+ // // 135deg,
+ // #28bbf06c 30px,
+ // #28bbf06c 30px,
+ // // #28bbf06c 50%,
+ // // transparent 50%
+ // #28bbf06c 100%,
+ // transparent 100%
+ // ),
+ // linear-gradient(
+ // // -45deg,
+ // transparent 30px,
+ // #28bbf06c 30px,
+ // // #28bbf06c 50.1%,
+ // // transparent 50%
+ // #28bbf06c 100%,
+ // transparent 100%
+ // );
z-index: 300;
.m_p_a_heard {
width: 100%;
@@ -160,7 +202,7 @@
padding: 5px 15px;
@extend .flexCenter;
justify-content: space-between;
- background-color: #a40000;
+ background-color: #29baf1;
div {
width: 35px;
height: 35px;
@@ -183,13 +225,22 @@
.m_p_a_center_once {
width: 30%;
height: 100%;
- background-color: #a40000;
+ // background-image: linear-gradient(#29baf1, #28bbf06c);
+ // background-color: #a40000;
+ background-color: #29baf1;
color: #fff;
+ // border: 2px solid rgba(105, 215, 255, 0.658);
border: 2px solid rgb(255, 255, 255);
@extend .flexCenter;
flex-direction: column;
+ // &:hover {
+ // background-image: linear-gradient(#09b7fc, #28bbf0a4);
+ // }
}
}
}
}
-</style>
\ No newline at end of file
+.ismBigPopupAfter {
+ left: 13.5%;
+}
+</style>
--
Gitblit v1.9.3