Merge branch 'main' of git.zdool.com:xs/yxdt/h5

This commit is contained in:
汪汇 2023-12-08 13:53:22 +08:00
commit 067201dbce
5 changed files with 52 additions and 37 deletions

View File

@ -4,7 +4,7 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<link rel="icon" href="/favicon.ico"> <link rel="icon" href="/favicon.ico">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Vite App</title> <title>优享地图</title>
</head> </head>
<script type="text/javascript" src="http://api.tianditu.gov.cn/api?v=4.0&tk=4e6d9067f64ad8101ca0f4ceb7cb4083"></script> <script type="text/javascript" src="http://api.tianditu.gov.cn/api?v=4.0&tk=4e6d9067f64ad8101ca0f4ceb7cb4083"></script>

View File

@ -1,8 +1,8 @@
import { createRouter, createWebHistory } from 'vue-router' import { createRouter, createWebHashHistory } from 'vue-router'
import HomeView from '../views/HomeView.vue' import HomeView from '../views/HomeView.vue'
const router = createRouter({ const router = createRouter({
history: createWebHistory(import.meta.env.BASE_URL), history: createWebHashHistory(import.meta.env.BASE_URL),
routes: [ routes: [
{ {
path: '/', path: '/',

View File

@ -11,7 +11,7 @@
</div> </div>
</div> </div>
</div> </div>
<div style="display: flex"> <div>
<!-- <div v-for="(item, i) in data" :key="item"> <!-- <div v-for="(item, i) in data" :key="item">
<div class="tabsList"> <div class="tabsList">
<span <span
@ -46,15 +46,10 @@
<div :class="[chooseId == item.id ? 'numa' : '']"> <div :class="[chooseId == item.id ? 'numa' : '']">
{{ item.title }} {{ item.title }}
</div> </div>
<img <img src="@/assets/xia.png" v-if="chooseId == item.id" />
src="@/assets/xia.png"
alt=""
style="width: 48px; height: 5px; margin-bottom: 10px"
v-if="chooseId == item.id"
/>
</div> </div>
</div> </div>
<img src="@/assets/list.png" alt="" /> <img src="@/assets/list.png"/>
</div> </div>
<div class="titles"> <div class="titles">
<span <span
@ -83,7 +78,11 @@
<img :src="f2" v-for="it in 5" /> <img :src="f2" v-for="it in 5" />
</div> </div>
</span> </span>
<span class="linetoprate">{{ data.rate }}</span> <div>
<span v-if="data.rate" class="linetoprate">{{
data.rate
}}</span>
</div>
</div> </div>
</div> </div>
<div class="linebot"> <div class="linebot">
@ -287,11 +286,11 @@ const data = reactive({
{ {
id: 2, id: 2,
imgurl: b2, imgurl: b2,
title: "象山老年大学", title: "丹西街道老年大学",
address: "宁波市象山县广场路39号", address: "宁波市象山县新华路340号",
Scoring: 1, Scoring: 4,
rate: "职业学校", rate: "",
comment: "老师非常耐心,课程也很丰富!", comment: "学校环境很好,氛围浓厚。",
}, },
// { // {
// id: 2, // id: 2,
@ -388,7 +387,7 @@ const clickFun = (index, name) => {
const chooseId = ref("1"); const chooseId = ref("1");
const choose = (index, name) => { const choose = (index, name) => {
console.log(index, name); console.log(index, name);
// data.mainLists = []; // data.mainLists = [];
// data.list = []; // data.list = [];
switch (name) { switch (name) {
case "老有康养": case "老有康养":
@ -476,8 +475,8 @@ const choose = (index, name) => {
.mian { .mian {
min-height: 100vh; min-height: 100vh;
color: #000; color: #000;
margin: 0 16px; // margin: 0 16px;
margin: 0 0 0 16px; // margin: 0 0 0 16px;
.title { .title {
// width: 72px; // width: 72px;
// height: 16px; // height: 16px;
@ -487,12 +486,14 @@ const choose = (index, name) => {
font-weight: 600; font-weight: 600;
color: #333333; color: #333333;
line-height: 16px; line-height: 16px;
margin-left: 16px;
} }
.List { .List {
display: flex; display: flex;
overflow-x: auto; /* 允许横向滚动 */ overflow-x: auto; /* 允许横向滚动 */
white-space: nowrap; /* 防止换行 */ white-space: nowrap; /* 防止换行 */
padding-left: 16px;
.listbox { .listbox {
position: relative; position: relative;
.imgList { .imgList {
@ -585,30 +586,39 @@ const choose = (index, name) => {
.main { .main {
box-sizing: border-box; box-sizing: border-box;
padding-top: 0; padding-top: 0;
height: 68vh; // height: 68vh;
margin-right: 16px;
margin-left: 16px;
.main-t { .main-t {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
padding-right: 16px; // padding-right: 16px;
.main-title { .main-title {
width: 85vw; // width: 85vw;
height: 50px; // height: 50px;
padding: 6px;
margin: 8px 0;
overflow-y: auto; overflow-y: auto;
display: flex; display: flex;
// border: 1px solid red; // border: 1px solid red;
align-items: center; align-items: center;
.main-list { .main-list {
flex-shrink: 0; flex-shrink: 0;
min-width: 56px; // min-width: 56px;
height: 14px; height: 20px;
font-size: 14px; font-size: 14px;
font-family: PingFang SC, PingFang SC; font-family: PingFang SC, PingFang SC;
font-weight: 400; font-weight: 400;
color: #666666; color: #666666;
line-height: 14px; line-height: 16px;
margin-right: 22px; margin-right: 22px;
// text-align: center; // text-align: center;
img {
width: 48px;
height: 5px;
margin-bottom: 10px;
}
} }
} }
img { img {
@ -620,7 +630,7 @@ const choose = (index, name) => {
display: flex; display: flex;
overflow-x: auto; /* 允许横向滚动 */ overflow-x: auto; /* 允许横向滚动 */
white-space: nowrap; /* 防止换行 */ white-space: nowrap; /* 防止换行 */
width: 89vw; // width: 90vw;
margin-bottom: 22px; margin-bottom: 22px;
margin-top: 8px; margin-top: 8px;
.tabtitle { .tabtitle {
@ -649,14 +659,16 @@ const choose = (index, name) => {
// height: 30vh; // height: 30vh;
// border: 1px solid red; // border: 1px solid red;
height: calc(100vh - 422px); height: calc(100vh - 422px);
width: 355px; // width: 355px;
box-sizing: border-box; box-sizing: border-box;
overflow-x: auto; /* 允许横向滚动 */ overflow-x: auto; /* 允许横向滚动 */
white-space: nowrap; /* 防止换行 */ white-space: nowrap; /* 防止换行 */
.line { .line {
margin-bottom: 20px; margin-bottom: 20px;
width: 355px; // width: 355px;
height: 132px; // height: 132px;
// width: 90vh;
// height: 12vh;
background: #ffffff; background: #ffffff;
box-shadow: 0px 2px 12px 0px #ebeef3; box-shadow: 0px 2px 12px 0px #ebeef3;
border-radius: 8px 8px 8px 8px; border-radius: 8px 8px 8px 8px;
@ -705,7 +717,7 @@ const choose = (index, name) => {
height: 16px; height: 16px;
border-radius: 2px 2px 2px 2px; border-radius: 2px 2px 2px 2px;
border: 1px solid #b8ccff; border: 1px solid #b8ccff;
padding: 1px 2px;
font-size: 10px; font-size: 10px;
font-family: PingFang SC, PingFang SC; font-family: PingFang SC, PingFang SC;
font-weight: 400; font-weight: 400;
@ -742,12 +754,12 @@ const choose = (index, name) => {
} }
} }
.numa { .numa {
width: 72px !important; // width: 72px !important;
font-size: 18px !important; font-size: 18px !important;
font-family: PingFang SC, PingFang SC; font-family: PingFang SC, PingFang SC;
font-weight: 600 !important; font-weight: 600 !important;
color: #333333 !important; color: #333333 !important;
line-height: 16px !important; // line-height: 16px !important;
} }
::-webkit-scrollbar { ::-webkit-scrollbar {
display: none; display: none;

View File

@ -23,6 +23,7 @@
messages: [ messages: [
{ id: 1, text: '你好', isMe: false }, { id: 1, text: '你好', isMe: false },
{ id: 2, text: 'Hi', isMe: true }, { id: 2, text: 'Hi', isMe: true },
], ],
}; };
}, },

View File

@ -56,6 +56,8 @@
import { ref, reactive } from "vue"; import { ref, reactive } from "vue";
import listRightImg from "@/components/list-right-img.vue"; import listRightImg from "@/components/list-right-img.vue";
import listNoImg from "@/components/list-no-img.vue"; import listNoImg from "@/components/list-no-img.vue";
import j1 from "../assets/cc4.png";
import j2 from "../assets/cc3.png";
const topContent = reactive([ const topContent = reactive([
{ {
content: "2024年养老金发放政策工龄30年内统一发放3200元可行吗", content: "2024年养老金发放政策工龄30年内统一发放3200元可行吗",
@ -106,7 +108,7 @@ const records = reactive({
display: 1, display: 1,
title: "“三问”个人养老金:是什么、怎么缴、如何领?", title: "“三问”个人养老金:是什么、怎么缴、如何领?",
createdAt: "11月27日", createdAt: "11月27日",
imgUrl: "/src/assets/cc4.png", imgUrl: j1,
eye: "8888", eye: "8888",
}, },
{ {
@ -114,7 +116,7 @@ const records = reactive({
display: 1, display: 1,
title: "100场社区活动——教你轻松玩转智能手机", title: "100场社区活动——教你轻松玩转智能手机",
createdAt: "11月27日", createdAt: "11月27日",
imgUrl: "/src/assets/cc3.png", imgUrl: j2,
eye: "8888", eye: "8888",
}, },
{ {
@ -129,7 +131,7 @@ const records = reactive({
display: 1, display: 1,
title: "100场社区活动——教你轻松玩转智能手机", title: "100场社区活动——教你轻松玩转智能手机",
createdAt: "11月27日", createdAt: "11月27日",
imgUrl: "/src/assets/cc3.png", imgUrl: j1,
eye: "8888", eye: "8888",
}, },
{ {