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

src/components/list-right-img.vue

@@ -39,42 +39,6 @@ const quanwen = () => {
     min-height: 100%;
     display: flex;
     flex-direction: column;
-
-    .noDevelop {
-      display: inline-block;
-      width: 231px;
-      height: 44px;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      display: -webkit-box;
-      -webkit-line-clamp: 2;
-      -webkit-box-orient: vertical;
-      font-size: 15px;
-      font-weight: 500;
-      line-height: 22px;
-      position: relative;
-    }
-
-    a {
-      display: inline-block;
-      width: 35px;
-      position: absolute;
-      bottom: 0;
-      right: 0;
-      background-color: #fff;
-      color: #87ceeb;
-      font-size: 15px;
-    }
-
-    .noDevelop::after {
-      content: "...";
-      width: 16px;
-      position: absolute;
-      bottom: 0;
-      right: 35px;
-      background-color: #fff;
-    }
-
     .yesDevelop {
       display: inline-block;
       // width: 231px;
@@ -106,6 +70,7 @@ const quanwen = () => {
           width: 12px;
           height: 12px;
           margin-right: 4px;
+          margin-left: 8px;
         }
       }
     }

src/views/Dianping/comment.vue

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

src/views/HomeView.vue

@@ -29,12 +29,15 @@
       :overlay="false"
       round
       position="bottom"
-      :style="{ height: '45%' }"
+      :style="{ height: dropdown.hinegh + 'px' }"
       style="z-index: 10"
     >
+      <div style="width: 100%" @touchmove="touchmove">
+        <div class="tzhz"></div>
+      </div>
       <van-sticky style="background-color: #fff; z-index: 99">
         <van-search
-          v-model="value"
+          v-model="dropdown.sesh"
           shape="round"
           background="#4fc08d00"
           placeholder=""
@@ -72,11 +75,11 @@
             </div>
             <div class="bq">
               <van-tag
-                v-for="(item, index) in item.tag"
+                v-for="(items, index) in item.tag"
                 :key="index"
                 plain
                 type="primary"
-                >{{ item }}</van-tag
+                >{{ items }}</van-tag
               >
             </div>
           </div>
@@ -112,6 +115,9 @@ var control = null;
 var T = window.T;
 
 const dropdown = reactive({
+  sesh: "",
+  value1: 0,
+  hinegh: 256,
   value1: 0,
   value2: 0,
   value3: 0,
@@ -269,7 +275,7 @@ const list = reactive({
 const init = () => {
   map = new T.Map("mapDiv");
   // map.setMapType(window.TMAP_SATELLITE_MAP);
-  map.centerAndZoom(new T.LngLat(121.88356, 29.45144), 13);
+  map.centerAndZoom(new T.LngLat(121.89248, 29.47474), 12);
   control = new T.Control.Zoom();
   //添加缩放平移控件
   map.addControl(control);
@@ -287,7 +293,18 @@ const init = () => {
 
 const yxfwxz = (e) => {
   list.index = e.id;
+  // map.clearOverLays();
 };
+const touchmove = (event) => {
+  if (
+    document.body.clientHeight - event.touches[0].clientY >= 256 &&
+    document.body.clientHeight - event.touches[0].clientY <=
+      document.body.clientHeight
+  ) {
+    dropdown.hinegh = document.body.clientHeight - event.touches[0].clientY;
+  }
+};
+
 const yxf = () => {
   dropdown.rmyy.forEach((item, index) => {
     var icons = new T.Icon({
@@ -301,6 +318,7 @@ const yxf = () => {
     map.addOverLay(LngLats);
   });
 };
+
 onMounted(() => {
   init();
 });
@@ -313,7 +331,7 @@ onMounted(() => {
   margin: 0px;
   padding: 0px;
   width: 100%;
-  height: 100vh;
+  height: 80vh;
   z-index: 0;
 }
 .yxfw {
@@ -394,7 +412,7 @@ onMounted(() => {
 }
 .card {
   width: 100%;
-  height: calc(100% - 102px);
+  height: calc(100% - 132px);
   overflow: auto;
   padding-bottom: 80px;
   .cardlist {
@@ -471,4 +489,19 @@ onMounted(() => {
   box-shadow: 0 0px 0px rgba(100, 101, 102, 0.12);
   border-bottom: 1px solid #f1f1f1;
 }
+.tzhz {
+  width: 100px;
+  height: 6px;
+  border-radius: 6px 6px 6px 6px;
+  opacity: 1;
+  border: 1px solid #eaeaea;
+  margin: 10px auto 10px;
+  background-color: #eaeaea;
+}
+:deep(.tdt-bar a, .tdt-bar a:hover) {
+  color: #cacaca;
+}
+:deep(.van-search) {
+  padding: 0px 12px 10px;
+}
 </style>

src/views/znyt.vue

@@ -39,7 +39,13 @@
         <img src="@/assets/list.png" alt="" />
       </div>
       <div class="list">
-        <div class="list-item">
+        <van-pull-refresh v-model="loadingSx" @refresh="onRefresh">
+          <van-list
+            v-model:loading="loadings"
+            :finished="finished"
+            finished-text="没有更多了"
+            @load="onLoad"
+          >
             <div v-for="(data, index) in records.list" :key="data.id">
               <listNoImg v-if="data.display == 0" :newData="data" />
               <listRightImg v-if="data.display == 1" :newData="data" />
@@ -47,17 +53,22 @@
                 <div class="line"></div>
               </div>
             </div>
-        </div>
+          </van-list>
+        </van-pull-refresh>
       </div>
     </div>
   </div>
 </template>
 <script setup>
-import { ref, reactive } from "vue";
+import { ref, reactive, onMounted,nextTick } from "vue";
 import listRightImg from "@/components/list-right-img.vue";
 import listNoImg from "@/components/list-no-img.vue";
 import j1 from "../assets/cc4.png";
 import j2 from "../assets/cc3.png";
+import { showSuccessToast } from "vant";
+const loadingSx = ref(false);
+const loadings = ref(false);
+const finished = ref(false);
 const topContent = reactive([
   {
     content: "2024年养老金发放政策：工龄30年内统一发放3200元，可行吗？",
@@ -99,7 +110,7 @@ const mainList = reactive([
 const chooseId = ref("1");
 const choose = (id) => {
   chooseId.value = id;
-  //   console.log()
+
 };
 const records = reactive({
   list: [
@@ -143,6 +154,26 @@ const records = reactive({
     },
   ],
 });
+const onRefresh = () => {
+  setTimeout(() => {
+    showSuccessToast("刷新成功");
+    loadingSx.value = false;
+  }, 1000);
+};
+const onLoad = () => {
+  // 异步更新数据
+  // setTimeout 仅做示例，真实场景中一般为 ajax 请求
+  setTimeout(() => {
+    // 加载状态结束
+    loadings.value = false;
+    // 数据全部加载完成
+    finished.value = true;
+  }, 1000);
+};
+
+onMounted(() => {
+  // showToast("666")
+});
 </script>
 <style lang="scss" scoped>
 .body {