From 33fa0e8f8b7cc51d172729138cb8faeb6264afd4 Mon Sep 17 00:00:00 2001
From: huajimang <782841784@qq.com>
Date: Fri, 21 Oct 2022 10:22:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.json             | 3 ---
 pages/index/index.js | 4 ++++
 pages/map/map.js     | 4 +---
 pages/map/map.wxml   | 8 ++++----
 pages/map/map.wxss   | 2 +-
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/app.json b/app.json
index 3db840e..8de0d06 100644
--- a/app.json
+++ b/app.json
@@ -5,9 +5,6 @@
     "pages/list/list",
     "pages/item/item",
     "pages/index/index"
-    
-   
-     
   ],
   "plugins": {
     "routePlan": {
diff --git a/pages/index/index.js b/pages/index/index.js
index d5d00de..5d32a3f 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -31,6 +31,10 @@ Page({
       //   canIUseGetUserProfile: true
       // })
     }
+    console.log(options,'options');
+    this.setData({
+      url: options.weburl //获取H5页面传递过来的weburl
+    });
   },
   getUserProfile(e) {
     // 推荐使用wx.getUserProfile获取用户信息，开发者每次通过该接口获取用户个人信息均需用户确认，开发者妥善保管用户快速填写的头像昵称，避免重复弹窗
diff --git a/pages/map/map.js b/pages/map/map.js
index 9fc4bdd..aece900 100644
--- a/pages/map/map.js
+++ b/pages/map/map.js
@@ -52,11 +52,9 @@ Page({
   },
   // 跳转列表
   handleRouter(){
-    console.log('aaaa');
-      wx.redirectTo({
+      wx.navigateTo({
         url:'/pages/list/list'
       })
-    
   },
   /**
    * 生命周期函数--监听页面加载
diff --git a/pages/map/map.wxml b/pages/map/map.wxml
index 03a21f2..3fc6830 100644
--- a/pages/map/map.wxml
+++ b/pages/map/map.wxml
@@ -24,17 +24,17 @@
             <van-icon name="arrow" style="font-size:14px;color:rgb(105, 131, 255);margin: 8rpx 0 0 5rpx;"/>
           </view>
         </view>
-        <view class="middle" style="font-size:12px;margin: 18rpx 0;">
-            (14+9*20)+(20+2*30+20)+(6*20+14)
+        <view class="middle" style="font-size:13px;margin: 18rpx 0; width: 100%;overflow: hidden;">
+          <span style="word-break: keep-all;white-space:nowrap; width: 100%;  ">(14+9*20)+(20+2*30+20)+(6*20+14)</span>
          </view>
          <view class="bottom">
            <span class="btn" style="width: 70rpx;">g15</span>
            <span class="btn" style="width: 120rpx;">kd+212</span>
-           <span class="btn" style="width: 150rpx;">预制空心板</span>
+           <span class="btn" style="width: 160rpx;">预制空心板</span>
          </view>
       </view>
     </view>
-    <view style="font-size: 12.5px;line-height: 20px;margin-top: 10rpx;">
+    <view style="font-size: 12.5px;line-height: 18px;margin-top: 20rpx;">
       最近一天桥梁结构监测统计信息：过车总量<span style="color: rgb(105, 131, 255);">12542</span>; 49吨以上车辆总数<span style="color: rgb(105, 131, 255);">289</span>;
       100吨以上车辆总数<span style="color: rgb(105, 131, 255);">214</span>；车辆效应与设计值最大比值<span style="color: rgb(105, 131, 255);">24/100</span>；监测预警数量<span>12</span>条；
       最大预警级别：红色预警。
diff --git a/pages/map/map.wxss b/pages/map/map.wxss
index 91c614b..9f08680 100644
--- a/pages/map/map.wxss
+++ b/pages/map/map.wxss
@@ -51,7 +51,7 @@
   justify-content: space-between;
 }
 .mapContent .info .top .image{
-  width: 260rpx;
+  width: 280rpx;
   height: 100%;
   background-color: blue;
 }