Merge branch 'master' of http://116.63.33.55/git/nazw

# Conflicts:
#	nnzwminiapp/pages/map/map.js

nnzwminiapp/pages/map/item-info.wxml

@@ -0,0 +1,31 @@
+
+  <view style="width: 92%;  background: #fff; margin: 20rpx auto 0 auto; border-radius: 20rpx; box-shadow: 0px 3px 6px 0px rgb(98 137 174 / 18%);">
+    <!-- 标题 -->
+    <view style="width: 90%; margin: auto; padding-top: 30rpx;">
+      <view class="item-title">重庆市医科大学</view>
+      <view class="item-introduce2" style="margin-bottom: 10rpx;">
+        <text class="item-text-size">1233333333333333333333333333333333ddddddddddddddddddddddd3333333333333333333331111111111233333333333333333333333333333333ddddddddddddddddddddddd333333333333333333333111111111</text>
+        <image src="https://maponline2.bdimg.com/tile/?qt=vtile&x=2896&y=834&z=14&styles=pl&scaler=2&udt=20230306&from=jsapi2_0"></image>
+      </view>
+      <view class="item-info">
+        <view>
+          <text class="item-text-size item-tag-text">地址:</text>
+          <text class="item-text-size item-text">1111111111111111</text>
+        </view>
+        <view>
+          <text class="item-text-size item-tag-text">办公时间:</text>
+          <text class="item-text-size item-text">11111111111111111</text>
+        </view>
+        <view>
+          <text class="item-text-size item-tag-text">办公电话:</text>
+          <text class="item-text-size item-text" style="display: -webkit-box;word-break: break-all;-webkit-box-orient: vertical; overflow: hidden;text-overflow: ellipsis;">
+            <text bindtap="callNumber" style="margin-left: 5rpx;">1111111111111111;</text>
+          </text>
+        </view>
+      </view>
+    </view>
+    <view class="item-btns">
+      <view class="item-bus">公交</view>
+      <view class="item-car">自驾</view>
+    </view>
+  </view>

nnzwminiapp/pages/map/item.wxml

@@ -1,26 +1,36 @@
-<view style="width: 92%; height: 400rpx; background: #fff; margin: 10rpx auto 0 auto; border-radius: 20rpx;">
-  <!-- 标题 -->
-  <view class="item-title">重庆市医科大学</view>
-  <view class="item-info">
-    <view>
-      <text class="item-tag-text">地址:</text>
-      <text class="item-text">1111111111111111</text>
-    </view>
-    <view>
-      <text class="item-tag-text">办公时间:</text>
-      <text class="item-text">11111111111111111</text>
-    </view>
-    <view>
-      <text class="item-tag-text">办公电话:</text>
-      <text class="item-text">1111111111111111</text>
-    </view>
+<!-- <scroll-view scroll-y="true"> -->
+  <view wx:for="{{10}}" style="width: 92%;  background: #fff; margin: 20rpx auto 0 auto; border-radius: 20rpx; box-shadow: 0px 3px 6px 0px rgb(98 137 174 / 18%);">
+    <!-- 标题 -->
+    <view style="width: 90%; margin: auto; padding-top: 30rpx;">
+      <view class="item-title">重庆市医科大学</view>
+      <view class="item-introduce" style="margin-bottom: 10rpx;">
+        <text class="item-text-size">1233333333333333333333333333333333ddddddddddddddddddddddd3333333333333333333331111111111233333333333333333333333333333333ddddddddddddddddddddddd333333333333333333333111111111</text>
+        <image src="https://maponline2.bdimg.com/tile/?qt=vtile&x=2896&y=834&z=14&styles=pl&scaler=2&udt=20230306&from=jsapi2_0"></image>
+      </view>
+      <view class="item-info">
+        <view>
+          <text class="item-text-size item-tag-text">地址:</text>
+          <text class="item-text-size item-text">1111111111111111</text>
+        </view>
+        <view>
+          <text class="item-text-size item-tag-text">办公时间:</text>
+          <text class="item-text-size item-text">11111111111111111</text>
+        </view>
+        <view>
+          <text class="item-text-size item-tag-text">办公电话:</text>
+          <text class="item-text-size item-text" style="display: -webkit-box;word-break: break-all;-webkit-box-orient: vertical; overflow: hidden;text-overflow: ellipsis;">
+            <text bindtap="callNumber" style="margin-left: 5rpx;">1111111111111111;</text>
+          </text>
+        </view>
 
-    <view>
-      点击查看详情
+        <view class="check-info">
+          点击查看详情
+        </view>
+      </view>
+    </view>
+    <view class="item-btns">
+      <view class="item-bus">公交</view>
+      <view class="item-car">自驾</view>
     </view>
   </view>
-  <view class="item-btns">
-    <view class="item-bus">公交</view>
-    <view class="item-car">自驾</view>
-  </view>
-</view>
+<!-- </scroll-view> -->

nnzwminiapp/pages/map/map.js

@@ -126,6 +126,10 @@ Page({
   changeInfo(e){
     console.log(e.currentTarget.dataset.name);
   },
+  // 电话拨打
+  callNumber(e){
+
+  },
 
     getSearchVal(e) {
         this.setData({

nnzwminiapp/pages/map/map.wxml

@@ -22,7 +22,7 @@
     <view class="right-map" id="right-map">
       <map id="map" longitude="{{longitude}}" latitude="{{latitude}}" scale="14" show-location="true" markers="{{markers}}" bindmarkertap="makertap" class="map"></map>
     </view>
-    <view wx:if="{{true}}">
+    <view wx:if="{{false}}">
       <view class="right-search" style="position: absolute; left: 22rpx; top: 257px; width: 708rpx; height: 300rpx; display: block; box-sizing: border-box; padding-top: 10rpx;">
         <t-tabs defaultValue="{{0}}" theme="tag" style="height: 292rpx; ">
           <t-tab-panel label="公交" value="0" style=" height: 180rpx; ">
@@ -49,11 +49,13 @@
             <button type="button" class="back_btn">返回</button>
           </view>
           <view class="pad_box">
-            <include src="./item"></include>
+            <include wx:if="{{fasle}}" src="./item"></include>
+            <include wx:else src="./item-info"></include>
           </view>
         </view>
     </view>
   </view>
+  <view style="height: 100rpx;"></view>
 </scroll-view>
 
 <view class="popup-box" wx:if="{{showIndex}}" bindtap="closePopup"></view>