小程序提交

测试小程序分包/miniprogram-2/app.json

@@ -1,7 +1,7 @@
 {
   "pages": [
-    "pages/login/login",
     "pages/home/home",
+    "pages/login/login",
     "pages/facility/facility",
     "pages/mine/mine",
     "pages/warning/warning",

测试小程序分包/miniprogram-2/packageA/pages/list_facility/facility_details/facility_details.js

@@ -16,7 +16,6 @@ Page({
     var id = options.id 
     var type = options.type
     var time = options.time
-    console.log(time)
     //判断是什么类型
     if (type == '2') {
       //杀虫灯
@@ -44,25 +43,21 @@ Page({
       typeA: typeA,
       id: id
     })
-    console.log(ctype)
-    console.log(typeA)
     
     var that = this;
     wx.getStorage({
       key: 'login',
       success(res) {
         wx.request({
-          url: 'https://wx.yfzhwlw.com/wechat_equip_detail',
+          url: 'https://wx.yfzhwlw.com/app_equip_list_detail',
           header: {
             "Content-Type": "application/x-www-form-urlencoded"
           },
           method: "post",
           data: {
-            etype: ctype,
             equip_id: id
           },
           success: function (res) {
-            // console.log(res.data)
             that.setData({
               redata: res.data,
               //res代表success函数的事件对，data是固定的，list是数组

测试小程序分包/miniprogram-2/packageA/pages/list_facility/facility_details/facility_details.wxml

@@ -8,7 +8,7 @@
       <image class="facility_details-list-img" src="https://wx.yfzhwlw.com/wechat_photo/index/ID_2.png"></image>
       <view class="facility_details-list-box">
         <view class="facility_details-list-box-tit">设备ID</view>
-        <text class="facility_details-list-box-txt">{{ redata.scd_status.imei }}</text>
+        <text class="facility_details-list-box-txt">{{ redata.equip_id }}</text>
       </view>
     </view>
     <!-- 设备用户 -->
@@ -16,7 +16,7 @@
       <image class="facility_details-list-img" src="https://wx.yfzhwlw.com/wechat_photo/index/user_2.png"></image>
       <view class="facility_details-list-box">
         <view class="facility_details-list-box-tit">设备用户</view>
-        <text class="facility_details-list-box-txt">{{redata.user_name}}</text>
+        <text class="facility_details-list-box-txt">{{redata.equip_user == '' ? '无' : redata.equip_user}}</text>
       </view>
     </view>
     <!-- 设备名称 -->
@@ -24,7 +24,7 @@
       <image class="facility_details-list-img" src="https://wx.yfzhwlw.com/wechat_photo/index/name_2.png"></image>
       <view class="facility_details-list-box">
         <view class="facility_details-list-box-tit">设备名称</view>
-        <text class="facility_details-list-box-txt">{{ redata.equip_name == '' ? '无' : redata.equip_name }}</text>
+        <text class="facility_details-list-box-txt">{{ redata.equip_name == '' ? '暂无名称' : redata.equip_name }}</text>
       </view>
     </view>
     <!-- 添加时间 -->
@@ -32,7 +32,7 @@
       <image class="facility_details-list-img" src="https://wx.yfzhwlw.com/wechat_photo/index/time_3.png"></image>
       <view class="facility_details-list-box">
         <view class="facility_details-list-box-tit">添加时间</view>
-        <text class="facility_details-list-box-txt">{{ redata.off_time }}</text>
+        <text class="facility_details-list-box-txt">{{ redata.equip_add_time }}</text>
       </view>
     </view>
     <!-- 设备类型 -->
@@ -48,7 +48,7 @@
       <image class="facility_details-list-img" src="https://wx.yfzhwlw.com/wechat_photo/index/lng_2.png"></image>
       <view class="facility_details-list-box">
         <view class="facility_details-list-box-tit">设备位置</view>
-        <text class="facility_details-list-box-txt">{{redata.equip_location == "" ? redata.scd_status.lat + "," + redata.scd_status.lng : redata.equip_location}}</text>
+        <text class="facility_details-list-box-txt">{{redata.equip_location == "" || redata.equp_location == undefined ? '暂无地址' : redata.equp_location}}</text>
       </view>
     </view>
 

测试小程序分包/miniprogram-2/packageA/pages/list_facility/list_facility/list_facility.js

@@ -6,8 +6,11 @@ Page({
    * 页面的初始数据 
    */
   data: {
+    // lists: [
+    //   "杀虫灯", "虫情测报", "气象站", "孢子仪", "监控"
+    // ],
     lists: [
-      "杀虫灯", "虫情测报", "气象站", "孢子仪", "监控"
+      "杀虫灯", "虫情测报", "气象站", "孢子仪"
     ],
     indexId: 0,
     list: [],
@@ -198,12 +201,70 @@ Page({
     });
   },
 
+  //判断当前账号、
+  ceshi: function () {
+    var that = this
+    wx.getStorage({
+      key: 'userName',
+      success(res) {
+        var name = res.data
+        wx.request({
+          url: 'https://wx.yfzhwlw.com/wechat_user_equip_list',
+          header: {
+            "Content-Type": "application/x-www-form-urlencoded"
+          },
+          method: 'post',
+          data: {
+            username: res.data
+          },
+          success: function (res) {
+            if (res.statusCode != 200) {
+              app.showError()
+            } else {
+              console.log(res.data.dat)
+              wx.hideLoading()
+              var data = res.data.dat
+              for (var i = 0; i < data.length; i++) {
+                if (data[i] == 2) {
+                  var scd = 'scd'
+                  //杀虫灯
+                } else if (data[i] == 3) {
+                  var cbd = 'cbd'
+                  //测报灯
+                } else if (data[i] == 5) {
+                  var qxz = 'qxz'
+                  //气象站
+                } else if (data[i] == 6) {
+                  //监控
+                  var jk = 'jk'
+                } else if (data[i] == 7) {
+                  var bzy = 'bzy'
+                  //孢子仪
+                }
+                // } else if (data[i] == 8) {
+                //   var xy = 'xy'
+                //   //性诱
+                //   console.log('性诱')
+                // }
+              }
+            }
+          }
+        })
+      }
+    })
+  },
+
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
     this.requestVideos(1)
+    //判断当前账号
+    this.ceshi()
+    wx.showLoading({
+      title: '加载中',
+    })
   },
 
   /**

测试小程序分包/miniprogram-2/packageA/pages/list_facility/list_facility/list_facility.wxml

@@ -61,8 +61,6 @@
 	</view>
 
 
-
-
 	<!-- 返回顶部 -->
 	<image src='https://wx.yfzhwlw.com/wechat_photo/index/xcx_138.png' class='goTop' hidden='{{!floorstatus}}' bindtap="goTop"></image>
 </view>

测试小程序分包/miniprogram-2/packageA/pages/list_facility/list_facility/list_facility.wxss

@@ -1,149 +1,165 @@
   /* 搜索框 */
-.list_facility-seek-box {
-  position: fixed;
-  width: 100%;
-  z-index: 200;
-  box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04);
-  background: #fff;
-}
-
-.list_facility-seek {
-  border-radius: 15px;
-  border: 1px solid #cecdcd;
-  width: 70%;
-  font-size: 14px;
-  padding: 10rpx 0 10rpx 25rpx;
-  margin: 20rpx 0 20rpx 60rpx;
-}
-
-/* 搜索图标 */
-.list_facility-seek-img {
-  width: 50rpx;
-  height: 50rpx;
-  float: right;
-  margin: -40rpx -90rpx 0 0;
-}
-
-.list_facility-box {
-  position: relative;
-}
-
-/* 左侧导航栏 */
-.under_line {
-  width: 100%;
-}
-
-.scrollY {
-  position: absolute;
-  left: 0;
-  top: 100rpx;
-  width: 200rpx;
-  /* position: fixed; */
-  border-right: 1rpx solid #efefef;
-  background: #f6f6f6;
-}
-
-.left {
-  border-top: 1rpx solid #efefef;
-  border-right: 1rpx solid #efefef;
-}
-
-.text-style {
-  width: 200rpx;
-  height: 140rpx;
-  line-height: 140rpx;
-  text-align: center;
-  font-size: 34rpx;
-  font-family: PingFangSC-Semibold;
-  color: #666666;
-}
-
-.active1 {
-  color: #1bce8a;
-  background: #fff;
-}
-
-.active {
-  display: block;
-  width: 50rpx;
-  height: 6rpx;
-  background: #1bce8a;
-  position: relative;
-  left: 75rpx;
-  bottom: 30rpx;
-}
-
-/* 右侧内容 */
-.container-right {
-  position: absolute;
-  top: 100rpx;
-  left: 188rpx;
-  width: 75%;
-  height: 600px;
-  padding: 10px;
-  box-sizing: border-box;
-  background: #fff;
-}
-
-.container-right-box {
-  border: 1px solid #fff;
-  display: flex;
-  justify-content: space-between;
-  border-radius: 15px;
-  box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04);
-  margin: 0 0 20rpx 0;
-}
-
-/* 图标 */
-.container-right-box-img {
-  width: 80rpx;
-  height: 80rpx;
-  padding: 35rpx 0 35rpx 20rpx;
-}
-
-/* 右箭头 */
-.container-right-box-right-img {
-  width: 40rpx;
-  height: 50rpx;
-  padding: 35rpx 20rpx 35rpx 0;
-  margin: 15rpx 0 0 0;
-}
-
-/* 信息 */
-.container-right-box-meg {
-  margin: 0 0 0 -45rpx;
-}
-
-.container-right-box-meg-id {
-  color: #666666;
-  font-size: 13px;
-  font-weight: 550;
-  padding: 35rpx 0 0 0;
-  text-align: left;
-}
-
-.container-right-box-meg-name {
-  color: #a8a8a8;
+  .list_facility-seek-box {
+    position: fixed;
+    width: 100%;
+    z-index: 200;
+    box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04);
+    background: #fff;
+  }
+
+  .list_facility-seek {
+    border-radius: 15px;
+    border: 1px solid #cecdcd;
+    width: 70%;
+    font-size: 14px;
+    padding: 10rpx 0 10rpx 25rpx;
+    margin: 20rpx 0 20rpx 60rpx;
+  }
+
+  /* 搜索图标 */
+  .list_facility-seek-img {
+    width: 50rpx;
+    height: 50rpx;
+    float: right;
+    margin: -40rpx -90rpx 0 0;
+  }
+
+  .list_facility-box {
+    position: relative;
+  }
+
+  /* 左侧导航栏 */
+  .under_line {
+    width: 100%;
+  }
+
+  .scrollY {
+    position: absolute;
+    left: 0;
+    top: 100rpx;
+    width: 200rpx;
+    /* position: fixed; */
+    border-right: 1rpx solid #efefef;
+    background: #f6f6f6;
+  }
+
+  .left {
+    border-top: 1rpx solid #efefef;
+    border-right: 1rpx solid #efefef;
+  }
+
+  .text-style {
+    width: 200rpx;
+    height: 140rpx;
+    line-height: 140rpx;
+    text-align: center;
+    font-size: 34rpx;
+    font-family: PingFangSC-Semibold;
+    color: #666666;
+  }
+
+  .active1 {
+    color: #1bce8a;
+    background: #fff;
+  }
+
+  .active {
+    display: block;
+    width: 50rpx;
+    height: 6rpx;
+    background: #1bce8a;
+    position: relative;
+    left: 75rpx;
+    bottom: 30rpx;
+  }
+
+  /* 右侧内容 */
+  .container-right {
+    position: absolute;
+    top: 100rpx;
+    left: 188rpx;
+    width: 75%;
+    height: 600px;
+    padding: 10px;
+    box-sizing: border-box;
+    background: #fff;
+  }
+
+  .container-right-box {
+    border: 1px solid #fff;
+    display: flex;
+    justify-content: space-between;
+    border-radius: 15px;
+    box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04);
+    margin: 0 0 20rpx 0;
+  }
+
+  /* 图标 */
+  .container-right-box-img {
+    width: 80rpx;
+    height: 80rpx;
+    padding: 35rpx 0 35rpx 20rpx;
+  }
+
+  /* 右箭头 */
+  .container-right-box-right-img {
+    width: 40rpx;
+    height: 50rpx;
+    padding: 35rpx 20rpx 35rpx 0;
+    margin: 15rpx 0 0 0;
+  }
+
+  /* 信息 */
+  .container-right-box-meg {
+    margin: 0 0 0 -45rpx;
+  }
+
+  .container-right-box-meg-id {
+    color: #666666;
+    font-size: 13px;
+    font-weight: 550;
+    padding: 35rpx 0 0 0;
+    text-align: left;
+  }
+
+  .container-right-box-meg-name {
+    /* color: #a8a8a8;
   font-size: 12px;
   font-weight: 500;
   line-height: 40rpx;
-  text-align: left;
-}
-
-/* 返回顶部 */
-.goTop {
-  height: 80rpx;
-  width: 80rpx;
-  position: fixed;
-  bottom: 50rpx;
-  right: 30rpx;
-  border-radius: 50%;
-}
-
-/* 底部提示 */
-.list_facility-ul-dowtxt {
-  height: 50rpx;
-  text-align: center;
-  font-size: 15px;
-  color: rgb(129, 129, 129);
-}
+  text-align: left; */
+
+    color: #a8a8a8;
+    font-size: 12px;
+    font-weight: 500;
+    line-height: 40rpx;
+    text-align: left;
+    width: 272rpx;
+    overflow: hidden;
+    /* text-overflow: ellipsis; */
+    white-space: nowrap;
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    /* autoprefixer: off */
+    -webkit-box-orient: vertical;
+    /* autoprefixer: on */
+    word-break: break-all;
+  }
+
+  /* 返回顶部 */
+  .goTop {
+    height: 80rpx;
+    width: 80rpx;
+    position: fixed;
+    bottom: 50rpx;
+    right: 30rpx;
+    border-radius: 50%;
+  }
+
+  /* 底部提示 */
+  .list_facility-ul-dowtxt {
+    height: 50rpx;
+    text-align: center;
+    font-size: 15px;
+    color: rgb(129, 129, 129);
+  }

测试小程序分包/miniprogram-2/packageB/pages/bzy_forms/bzbz_forms/bzbz_forms.wxss

@@ -10,7 +10,7 @@
 .bzbz_forms-seek {
   border-radius: 15px;
   border: 1px solid #f6f6f6;
-  width: 70%; 
+  width: 70%;
   font-size: 14px;
   padding: 10rpx 0 10rpx 25rpx;
   margin: 20rpx 0 0 60rpx;
@@ -55,7 +55,7 @@
 }
 
 /* 半圆 */
-.bzbz_forms-list::after  {
+.bzbz_forms-list::after {
   width: 20px;
   height: 12px;
   content: "";
@@ -63,10 +63,11 @@
   top: -2px;
   position: absolute;
   display: block;
-   border-radius: 0 0 10px 10px;
+  border-radius: 0 0 10px 10px;
   box-shadow: 0px 0px 2px 2px rgb(248, 247, 247) inset;
   background-color: #f9f9f9;
 }
+
 .bzbz_forms-list::before {
   width: 20px;
   height: 12px;
@@ -101,7 +102,8 @@
   margin: 0 0 0 -25rpx;
 }
 
-.bzbz_forms-list-id, .bzbz_forms-list-name {
+.bzbz_forms-list-id,
+.bzbz_forms-list-name {
   display: flex;
 }
 
@@ -112,12 +114,14 @@
   border-radius: 50px;
   margin: 15rpx 0 20rpx 0;
 }
+
 .bzbz_forms-list-id-tit {
   font-size: 14px;
   color: #636363;
   font-weight: 550;
   margin-left: 10rpx;
 }
+
 .bzbz_forms-list-id-txt {
   font-size: 14px;
   color: #636363;
@@ -132,21 +136,38 @@
   border-radius: 50px;
   margin: 15rpx 0 20rpx 0;
 }
+
 .bzbz_forms-list-name-tit {
   font-size: 14px;
   color: #636363;
   font-weight: 550;
   margin-left: 10rpx;
 }
+
 .bzbz_forms-list-name-txt {
-  font-size: 14px;
+  /* font-size: 14px;
   color: #636363;
-  font-weight: 550;
+  font-weight: 550; */
   margin-left: 10rpx;
+  color: #636363;
+  font-size: 12px;
+  font-weight: 500;
+  line-height: 40rpx;
+  text-align: left;
+  width: 272rpx;
+  overflow: hidden;
+  /* text-overflow: ellipsis; */
+  white-space: nowrap;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  /* autoprefixer: off */
+  -webkit-box-orient: vertical;
+  /* autoprefixer: on */
+  word-break: break-all;
 }
 
 /* 返回顶部 */
-.goTop{
+.goTop {
   height: 80rpx;
   width: 80rpx;
   position: fixed;

测试小程序分包/miniprogram-2/packageB/pages/bzy_list/bzbz_list/bzbz_list.wxss

@@ -112,8 +112,23 @@
 }
 
 .bzbz_list-list-name-txt {
+  /* color: #666;
+  font-weight: 550; */
   color: #666;
-  font-weight: 550;
+  font-size: 12px;
+  font-weight: 500;
+  line-height: 40rpx;
+  text-align: right;
+  width: 272rpx;
+  overflow: hidden;
+  /* text-overflow: ellipsis; */
+  white-space: nowrap;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  /* autoprefixer: off */
+  -webkit-box-orient: vertical;
+  /* autoprefixer: on */
+  word-break: break-all;
 }
 
 /* 上报时间 */

测试小程序分包/miniprogram-2/packageB/pages/cbd_forms/cbd_forms/cbd_forms.js

@@ -83,8 +83,9 @@ Page({
   cbdFormsDetails: function (e) {
     var id = e.currentTarget.dataset.id
     var name = e.currentTarget.dataset.name
+    var img = e.currentTarget.dataset.img
     wx.navigateTo({
-      url: '../cbd_forms_details/cbd_forms_details?id=' + id + '&name=' + name,
+      url: '../cbd_forms_details/cbd_forms_details?id=' + id + '&name=' + name + '&img=' + img,
     })
   },
 

测试小程序分包/miniprogram-2/packageB/pages/cbd_forms/cbd_forms/cbd_forms.wxml

@@ -11,7 +11,7 @@
 	<!-- 列表数据 -->
 	<view class="cbd_forms-ul">
 
-		<view bindtap="cbdFormsDetails" data-id="{{item.equip_id}}" data-name="{{item.equip_name}}" hidden="{{item == undefined}}" hidden="{{item == undefined}}" class="cbd_forms-list" wx:for="{{list}}" wx:key="list">
+		<view bindtap="cbdFormsDetails" data-id="{{item.equip_id}}" data-img="{{item.cbd_img}}" data-name="{{item.equip_name}}" hidden="{{item == undefined}}" hidden="{{item == undefined}}" class="cbd_forms-list" wx:for="{{list}}" wx:key="list">
 			<view class="cbd_forms-list-img-box">
 				<image class="cbd_forms-list-img" src="https://wx.yfzhwlw.com/wechat_photo/index/cbd_2.png"></image>
 				<view class="cbd_forms-list-line"></view>

测试小程序分包/miniprogram-2/packageB/pages/cbd_forms/cbd_forms/cbd_forms.wxss

@@ -139,10 +139,25 @@
   margin-left: 10rpx;
 }
 .cbd_forms-list-name-txt {
-  font-size: 14px;
+  /* font-size: 14px;
   color: #636363;
-  font-weight: 550;
+  font-weight: 550; */
   margin-left: 10rpx;
+  color: #636363;
+  font-size: 12px;
+  font-weight: 500;
+  line-height: 40rpx;
+  text-align: left;
+  width: 272rpx;
+  overflow: hidden;
+  /* text-overflow: ellipsis; */
+  white-space: nowrap;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  /* autoprefixer: off */
+  -webkit-box-orient: vertical;
+  /* autoprefixer: on */
+  word-break: break-all;
 }
 
 /* 返回顶部 */

测试小程序分包/miniprogram-2/packageB/pages/cbd_forms/cbd_forms_details/cbd_forms_details.js

@@ -424,10 +424,14 @@ Page({
     // var windowWidth = 320;
     var id = e.id
     var name = e.name
+    var img = e.img
     that.setData({
       name: name,
-      id: id
+      id: id,
+      img: img
     })
+
+
     that.lineData() //获取折线图数据
 
     that.redataData() //获取当前页面数据

测试小程序分包/miniprogram-2/packageB/pages/cbd_forms/cbd_forms_details/cbd_forms_details.wxml

@@ -160,7 +160,7 @@
 			</view>
 
 			<!-- 查看图片 -->
-			<view class="cbd_forms_detalis-form-list" bindtap="imgList" data-id='{{redata.imei}}'>
+			<view wx:if="{{img == 1}}" class="cbd_forms_detalis-form-list" bindtap="imgList" data-id='{{redata.imei}}'>
 				<image class="cbd_forms_detalis-form-list-img cktp" src="https://wx.yfzhwlw.com/wechat_photo/equip/image_5.png"></image>
 				<view class="cbd_forms_detalis-form-list-txt-box">
 					<view class="cbd_forms_detalis-form-list-txtA">

测试小程序分包/miniprogram-2/packageB/pages/cbd_list/cbd_list-details/cbd_list-details.js

@@ -212,6 +212,7 @@ Page({
     var that = this;
     var id = options.id
     var name = options.name
+    var img = options.img
     that.setData({
       name: name,
       id: id

测试小程序分包/miniprogram-2/packageB/pages/cbd_list/cbd_list/cbd_list.wxss

@@ -4,13 +4,13 @@
   width: 100%;
   z-index: 200;
   background: #fff;
-} 
+}
 
 .cbd_list-seek {
   border-radius: 15px;
-  border: 1px solid #f6f6f6; 
+  border: 1px solid #f6f6f6;
   width: 70%;
-  font-size: 14px; 
+  font-size: 14px;
   padding: 10rpx 0 10rpx 25rpx;
   margin: 20rpx 0 0 60rpx;
   background: #f6f6f6;
@@ -42,8 +42,9 @@
   position: relative;
   margin: 0 0 30rpx 0;
 }
+
 /* 圆 */
-.cbd_list-list::after  {
+.cbd_list-list::after {
   width: 12px;
   height: 18px;
   content: "";
@@ -54,8 +55,9 @@
   /* background: #fff; */
   border-radius: 50px 0 0 50px;
   box-shadow: 0px 0px 2px 2px rgb(248, 247, 247) inset;
-background-color: #f8f8f8;
+  background-color: #f8f8f8;
 }
+
 .cbd_list-list::before {
   width: 12px;
   height: 18px;
@@ -67,7 +69,7 @@ background-color: #f8f8f8;
   /* background: #fff; */
   border-radius: 0 50px 50px 0;
   box-shadow: 0px 0px 1px 1px rgb(248, 247, 247) inset;
-background-color: #f8f8f8;
+  background-color: #f8f8f8;
 }
 
 
@@ -109,8 +111,23 @@ background-color: #f8f8f8;
 }
 
 .cbd_list-list-name-txt {
+  /* color: #666;
+  font-weight: 550; */
   color: #666;
-  font-weight: 550;
+  font-size: 12px;
+  font-weight: 500;
+  line-height: 40rpx;
+  text-align: right;
+  width: 272rpx;
+  overflow: hidden;
+  /* text-overflow: ellipsis; */
+  white-space: nowrap;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  /* autoprefixer: off */
+  -webkit-box-orient: vertical;
+  /* autoprefixer: on */
+  word-break: break-all;
 }
 
 /* 上报时间 */
@@ -136,7 +153,7 @@ background-color: #f8f8f8;
 }
 
 /* 返回顶部 */
-.goTop{
+.goTop {
   height: 80rpx;
   width: 80rpx;
   position: fixed;
@@ -151,4 +168,4 @@ background-color: #f8f8f8;
   text-align: center;
   font-size: 15px;
   color: rgb(129, 129, 129);
-}
+}

测试小程序分包/miniprogram-2/packageB/pages/qxz_forms/weather-forms/weather-forms.wxss

@@ -9,7 +9,7 @@
 
 .weather-forms-seek {
   border-radius: 15px;
-  border: 1px solid #f6f6f6; 
+  border: 1px solid #f6f6f6;
   width: 70%;
   font-size: 14px;
   padding: 10rpx 0 10rpx 25rpx;
@@ -55,7 +55,7 @@
 }
 
 /* 半圆 */
-.weather-forms-list::after  {
+.weather-forms-list::after {
   width: 20px;
   height: 12px;
   content: "";
@@ -63,10 +63,11 @@
   top: -2px;
   position: absolute;
   display: block;
-   border-radius: 0 0 10px 10px;
+  border-radius: 0 0 10px 10px;
   box-shadow: 0px 0px 2px 2px rgb(248, 247, 247) inset;
   background-color: #f9f9f9;
 }
+
 .weather-forms-list::before {
   width: 20px;
   height: 12px;
@@ -102,7 +103,8 @@
   margin: 0 0 0 -25rpx;
 }
 
-.weather-forms-list-id, .weather-forms-list-name {
+.weather-forms-list-id,
+.weather-forms-list-name {
   display: flex;
 }
 
@@ -113,12 +115,14 @@
   border-radius: 50px;
   margin: 15rpx 0 20rpx 0;
 }
+
 .weather-forms-list-id-tit {
   font-size: 14px;
   color: #636363;
   font-weight: 550;
   margin-left: 10rpx;
 }
+
 .weather-forms-list-id-txt {
   font-size: 14px;
   color: #636363;
@@ -133,21 +137,38 @@
   border-radius: 50px;
   margin: 15rpx 0 20rpx 0;
 }
+
 .weather-forms-list-name-tit {
   font-size: 14px;
   color: #636363;
   font-weight: 550;
   margin-left: 10rpx;
 }
+
 .weather-forms-list-name-txt {
-  font-size: 14px;
+  /* font-size: 14px;
   color: #636363;
-  font-weight: 550;
+  font-weight: 550; */
   margin-left: 10rpx;
+  color: #636363;
+  font-size: 12px;
+  font-weight: 500;
+  line-height: 40rpx;
+  text-align: left;
+  width: 272rpx;
+  overflow: hidden;
+  /* text-overflow: ellipsis; */
+  white-space: nowrap;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  /* autoprefixer: off */
+  -webkit-box-orient: vertical;
+  /* autoprefixer: on */
+  word-break: break-all;
 }
 
 /* 返回顶部 */
-.goTop{
+.goTop {
   height: 80rpx;
   width: 80rpx;
   position: fixed;

测试小程序分包/miniprogram-2/packageB/pages/qxz_list/weather-list/weather-list.wxss

@@ -43,8 +43,9 @@
   margin: 0 0 30rpx 0;
   position: relative;
 }
+
 /* 圆 */
-.weather-list-list::after  {
+.weather-list-list::after {
   width: 12px;
   height: 18px;
   content: "";
@@ -57,6 +58,7 @@
   box-shadow: 0px 0px 2px 2px rgb(248, 247, 247) inset;
   background-color: #f8f8f8;
 }
+
 .weather-list-list::before {
   width: 12px;
   height: 18px;
@@ -110,8 +112,23 @@
 }
 
 .weather-list-list-name-txt {
+  /* color: #666;
+  font-weight: 550; */
   color: #666;
-  font-weight: 550;
+  font-size: 12px;
+  font-weight: 500;
+  line-height: 40rpx;
+  text-align: right;
+  width: 272rpx;
+  overflow: hidden;
+  /* text-overflow: ellipsis; */
+  white-space: nowrap;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  /* autoprefixer: off */
+  -webkit-box-orient: vertical;
+  /* autoprefixer: on */
+  word-break: break-all;
 }
 
 /* 上报时间 */
@@ -137,7 +154,7 @@
 }
 
 /* 返回顶部 */
-.goTop{
+.goTop {
   height: 80rpx;
   width: 80rpx;
   position: fixed;
@@ -153,4 +170,4 @@
   text-align: center;
   font-size: 15px;
   color: rgb(129, 129, 129);
-}
+}

测试小程序分包/miniprogram-2/packageB/pages/scd_forms/scd_forms/scd_forms.wxss

@@ -9,8 +9,8 @@
 
 .scd_forms-seek {
   border-radius: 15px;
-  border: 1px solid #f6f6f6; 
-  width: 70%; 
+  border: 1px solid #f6f6f6;
+  width: 70%;
   font-size: 14px;
   padding: 10rpx 0 10rpx 25rpx;
   margin: 20rpx 0 0 60rpx;
@@ -54,7 +54,7 @@
 }
 
 /* 半圆 */
-.scd_forms-list::after  {
+.scd_forms-list::after {
   width: 20px;
   height: 12px;
   content: "";
@@ -62,10 +62,11 @@
   top: -2px;
   position: absolute;
   display: block;
-   border-radius: 0 0 10px 10px;
+  border-radius: 0 0 10px 10px;
   box-shadow: 0px 0px 2px 2px rgb(248, 247, 247) inset;
   background-color: #f9f9f9;
 }
+
 .scd_forms-list::before {
   width: 20px;
   height: 12px;
@@ -79,8 +80,7 @@
   background-color: #f9f9f9;
 }
 
-.scd_forms-list-img-box {
-}
+.scd_forms-list-img-box {}
 
 .scd_forms-list-img {
   width: 80rpx;
@@ -99,7 +99,8 @@
   margin: 0 0 0 -25rpx;
 }
 
-.scd_forms-list-id, .scd_forms-list-name {
+.scd_forms-list-id,
+.scd_forms-list-name {
   display: flex;
 }
 
@@ -110,12 +111,14 @@
   border-radius: 50px;
   margin: 15rpx 0 20rpx 0;
 }
+
 .scd_forms-list-id-tit {
   font-size: 14px;
   color: #636363;
   font-weight: 550;
   margin-left: 10rpx;
 }
+
 .scd_forms-list-id-txt {
   font-size: 14px;
   color: #636363;
@@ -130,21 +133,38 @@
   border-radius: 50px;
   margin: 15rpx 0 20rpx 0;
 }
+
 .scd_forms-list-name-tit {
   font-size: 14px;
   color: #636363;
   font-weight: 550;
   margin-left: 10rpx;
 }
+
 .scd_forms-list-name-txt {
-  font-size: 14px;
+  /* font-size: 14px;
   color: #636363;
   font-weight: 550;
-  margin-left: 10rpx;
+  margin-left: 10rpx; */
+  color: #636363;
+  font-size: 12px;
+  font-weight: 500;
+  line-height: 40rpx;
+  text-align: left;
+  width: 272rpx;
+  overflow: hidden;
+  /* text-overflow: ellipsis; */
+  white-space: nowrap;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  /* autoprefixer: off */
+  -webkit-box-orient: vertical;
+  /* autoprefixer: on */
+  word-break: break-all;
 }
 
 /* 返回顶部 */
-.goTop{
+.goTop {
   height: 80rpx;
   width: 80rpx;
   position: fixed;

测试小程序分包/miniprogram-2/packageB/pages/scd_list/scd_list/scd_list.wxss

@@ -4,11 +4,11 @@
   width: 100%;
   z-index: 200;
   background: #fff;
-} 
+}
 
 .scd_list-seek {
   border-radius: 15px;
-  border: 1px solid #f6f6f6; 
+  border: 1px solid #f6f6f6;
   width: 70%;
   font-size: 14px;
   padding: 10rpx 0 10rpx 25rpx;
@@ -22,7 +22,7 @@
   width: 50rpx;
   height: 50rpx;
   float: right;
-  margin:  -52rpx 50rpx 0 0;
+  margin: -52rpx 50rpx 0 0;
 }
 
 /* 列表数据 */
@@ -40,8 +40,9 @@
   position: relative;
   margin: 0 0 30rpx 0;
 }
+
 /* 圆 */
-.scd_list-list::after  {
+.scd_list-list::after {
   width: 12px;
   height: 18px;
   content: "";
@@ -51,8 +52,9 @@
   display: block;
   border-radius: 50px 0 0 50px;
   box-shadow: 0px 0px 2px 2px rgb(248, 247, 247) inset;
-background-color: #f8f8f8;
+  background-color: #f8f8f8;
 }
+
 .scd_list-list::before {
   width: 12px;
   height: 18px;
@@ -63,7 +65,7 @@ background-color: #f8f8f8;
   display: block;
   border-radius: 0 50px 50px 0;
   box-shadow: 0px 0px 1px 1px rgb(248, 247, 247) inset;
-background-color: #f8f8f8;
+  background-color: #f8f8f8;
 }
 
 
@@ -104,8 +106,23 @@ background-color: #f8f8f8;
 }
 
 .scd_list-list-name-txt {
+  /* color: #666;
+  font-weight: 550; */
   color: #666;
-  font-weight: 550;
+  font-size: 12px;
+  font-weight: 500;
+  line-height: 40rpx;
+  text-align: right;
+  width: 272rpx;
+  overflow: hidden;
+  /* text-overflow: ellipsis; */
+  white-space: nowrap;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  /* autoprefixer: off */
+  -webkit-box-orient: vertical;
+  /* autoprefixer: on */
+  word-break: break-all;
 }
 
 /* 上报时间 */
@@ -130,7 +147,7 @@ background-color: #f8f8f8;
 }
 
 /* 返回顶部 */
-.goTop{
+.goTop {
   height: 80rpx;
   width: 80rpx;
   position: fixed;

测试小程序分包/miniprogram-2/packageB/pages/xyq_forms/xyq_forms/xyq_forms.wxss

@@ -9,8 +9,8 @@
 
 .xyq_forms-seek {
   border-radius: 15px;
-  border: 1px solid #f6f6f6; 
-  width: 70%; 
+  border: 1px solid #f6f6f6;
+  width: 70%;
   font-size: 14px;
   padding: 10rpx 0 10rpx 25rpx;
   margin: 20rpx 0 0 60rpx;
@@ -55,7 +55,7 @@
 }
 
 /* 半圆 */
-.xyq_forms-list::after  {
+.xyq_forms-list::after {
   width: 20px;
   height: 12px;
   content: "";
@@ -63,10 +63,11 @@
   top: -2px;
   position: absolute;
   display: block;
-   border-radius: 0 0 10px 10px;
+  border-radius: 0 0 10px 10px;
   box-shadow: 0px 0px 2px 2px rgb(248, 247, 247) inset;
   background-color: #f9f9f9;
 }
+
 .xyq_forms-list::before {
   width: 20px;
   height: 12px;
@@ -102,7 +103,8 @@
   margin: 0 0 0 -25rpx;
 }
 
-.xyq_forms-list-id, .xyq_forms-list-name {
+.xyq_forms-list-id,
+.xyq_forms-list-name {
   display: flex;
 }
 
@@ -113,12 +115,14 @@
   border-radius: 50px;
   margin: 15rpx 0 20rpx 0;
 }
+
 .xyq_forms-list-id-tit {
   font-size: 14px;
   color: #636363;
   font-weight: 550;
   margin-left: 10rpx;
 }
+
 .xyq_forms-list-id-txt {
   font-size: 14px;
   color: #636363;
@@ -133,21 +137,32 @@
   border-radius: 50px;
   margin: 15rpx 0 20rpx 0;
 }
+
 .xyq_forms-list-name-tit {
   font-size: 14px;
   color: #636363;
   font-weight: 550;
   margin-left: 10rpx;
 }
+
 .xyq_forms-list-name-txt {
   font-size: 14px;
   color: #636363;
   font-weight: 550;
-  margin-left: 10rpx;
+  text-align: left;
+  overflow: hidden;
+  /* text-overflow: ellipsis; */
+  white-space: nowrap;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  /* autoprefixer: off */
+  -webkit-box-orient: vertical;
+  /* autoprefixer: on */
+  word-break: break-all;
 }
 
 /* 返回顶部 */
-.goTop{
+.goTop {
   height: 80rpx;
   width: 80rpx;
   position: fixed;

测试小程序分包/miniprogram-2/pages/warning/warning.wxss

@@ -9,8 +9,8 @@
 
 .warnind-seek {
   border-radius: 15px;
-  border: 1px solid #f6f6f6; 
-  width: 70%; 
+  border: 1px solid #f6f6f6;
+  width: 70%;
   font-size: 14px;
   padding: 10rpx 0 10rpx 25rpx;
   margin: 20rpx 0 0 60rpx;
@@ -53,7 +53,7 @@
 }
 
 /* 半圆 */
-.warnind-list::after  {
+.warnind-list::after {
   width: 20px;
   height: 12px;
   content: "";
@@ -61,10 +61,11 @@
   top: -2px;
   position: absolute;
   display: block;
-   border-radius: 0 0 10px 10px;
+  border-radius: 0 0 10px 10px;
   box-shadow: 0px 0px 2px 2px rgb(248, 247, 247) inset;
   background-color: #f9f9f9;
 }
+
 .warnind-list::before {
   width: 20px;
   height: 12px;
@@ -100,7 +101,8 @@
   margin: 0 0 0 -25rpx;
 }
 
-.warnind-list-id, .warnind-list-name {
+.warnind-list-id,
+.warnind-list-name {
   display: flex;
 }
 
@@ -111,12 +113,14 @@
   border-radius: 50px;
   margin: 15rpx 0 20rpx 0;
 }
+
 .warnind-list-id-tit {
   font-size: 14px;
   color: #636363;
   font-weight: 550;
   margin-left: 10rpx;
 }
+
 .warnind-list-id-txt {
   font-size: 14px;
   color: #636363;
@@ -131,21 +135,38 @@
   border-radius: 50px;
   margin: 15rpx 0 20rpx 0;
 }
+
 .warnind-list-name-tit {
   font-size: 14px;
   color: #636363;
   font-weight: 550;
   margin-left: 10rpx;
 }
+
 .warnind-list-name-txt {
-  font-size: 14px;
+  /* font-size: 14px;
   color: #636363;
-  font-weight: 550;
+  font-weight: 550; */
   margin-left: 10rpx;
+  color: #636363;
+  font-size: 12px;
+  font-weight: 500;
+  line-height: 40rpx;
+  text-align: left;
+  width: 272rpx;
+  overflow: hidden;
+  /* text-overflow: ellipsis; */
+  white-space: nowrap;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  /* autoprefixer: off */
+  -webkit-box-orient: vertical;
+  /* autoprefixer: on */
+  word-break: break-all;
 }
 
 /* 返回顶部 */
-.goTop{
+.goTop {
   height: 80rpx;
   width: 80rpx;
   position: fixed;