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

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,9 +29,12 @@
       :overlay="false"
       round
       position="bottom"
-      :style="{ height: '45%' }"
+      :style="{ height: dropdown.hinegh + 'px' }"
       style="z-index: 10"
     >
+      <div style="width: 100%" @touchmove="mousedown">
+        <div class="tzhz"></div>
+      </div>
       <van-sticky style="background-color: #fff; z-index: 99">
         <van-search
           v-model="value"
@@ -112,6 +115,8 @@ var control = null;
 var T = window.T;
 
 const dropdown = reactive({
+  value1: 0,
+  hinegh: 0,
   value1: 0,
   value2: 0,
   value3: 0,
@@ -270,6 +275,7 @@ const init = () => {
   map = new T.Map("mapDiv");
   // map.setMapType(window.TMAP_SATELLITE_MAP);
   map.centerAndZoom(new T.LngLat(121.88356, 29.45144), 13);
+  dropdown.hinegh = document.body.clientHeight * 0.45;
   control = new T.Control.Zoom();
   //添加缩放平移控件
   map.addControl(control);
@@ -288,6 +294,12 @@ const init = () => {
 const yxfwxz = (e) => {
   list.index = e.id;
 };
+const mousedown = (event) => {
+  if (document.body.clientHeight - event.touches[0].clientY >= 256) {
+    dropdown.hinegh = document.body.clientHeight - event.touches[0].clientY;
+  }
+};
+
 const yxf = () => {
   dropdown.rmyy.forEach((item, index) => {
     var icons = new T.Icon({
@@ -394,7 +406,7 @@ onMounted(() => {
 }
 .card {
   width: 100%;
-  height: calc(100% - 102px);
+  height: calc(100% - 122px);
   overflow: auto;
   padding-bottom: 80px;
   .cardlist {
@@ -471,4 +483,13 @@ 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 0;
+  background-color: #eaeaea;
+}
 </style>

src/views/test.vue

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