syyang 2 yıl önce
ebeveyn
işleme
602566afc0

+ 46 - 0
app.wxss

@@ -183,6 +183,16 @@ color: #666;
     color: rgb(125, 238, 163);
     width: 10%;
   }
+  .list_li3 .icon-cangkukucun{
+    font-size: 50rpx;
+    color: rgb(125, 196, 238);
+    width: 10%;
+  }
+  .list_li3 .icon-dangjian_duiwujianshe{
+    font-size: 50rpx;
+    color: rgb(238, 217, 125);
+    width: 10%;
+  }
   /* 暂无数据 */
 .zwsj{
   font-size: 260rpx!important;
@@ -234,4 +244,40 @@ color: #666;
 }
 .float_btn2:active{
   background-color: #f1c120;
+}
+
+/* 列表详情 */
+
+.notice_tit{
+  font-size: 32rpx;
+color: #181818;
+text-align: left;
+display: flex;
+flex-direction: column;
+}
+.notice_tit .tit{
+  color: #f94b0e;
+  list-style: circle;
+  font-size: 34rpx;
+  font-weight: 500;
+  height: 60rpx;
+  line-height: 60rpx;
+  margin-bottom: 30rpx;
+}
+
+.notice_tit .bor{
+  width: 92%;
+  padding: 3% 4%;
+  box-shadow: 0px 0px 10rpx #e9e9e9;
+  border-radius: 14rpx;
+  margin-bottom: 30rpx;
+}
+.notice_tit .icon-weibiaoti--{
+  font-size: 36rpx;
+  color: #ffaa8a;
+  margin-right: 14rpx;
+}
+.notice_tit .icon-dian{
+  font-size: 38rpx;
+  color: #f94b0e;
 }

+ 11 - 3
iconfont.wxss

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 3264694 */
-  src: url('//at.alicdn.com/t/c/font_3264694_kd4y155wj3e.woff2?t=1673319202747') format('woff2'),
-       url('//at.alicdn.com/t/c/font_3264694_kd4y155wj3e.woff?t=1673319202747') format('woff'),
-       url('//at.alicdn.com/t/c/font_3264694_kd4y155wj3e.ttf?t=1673319202747') format('truetype');
+  src: url('//at.alicdn.com/t/c/font_3264694_dnngszco0u.woff2?t=1673329063637') format('woff2'),
+       url('//at.alicdn.com/t/c/font_3264694_dnngszco0u.woff?t=1673329063637') format('woff'),
+       url('//at.alicdn.com/t/c/font_3264694_dnngszco0u.ttf?t=1673329063637') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,14 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-route-fill:before {
+  content: "\e680";
+}
+
+.icon-luxianchaxun:before {
+  content: "\e623";
+}
+
 .icon-weibiaoti--:before {
   content: "\e611";
 }

+ 15 - 17
pages/notice/notice_details.wxml

@@ -1,28 +1,26 @@
 <view class="container">
   <view class="notice_tit">
-        <view class="tit"><i class="iconfont icon-dian"></i>标题</view>
-        <view class="bor">
-          <i>{{noticeTitle}}</i>
-        </view>
-        <view class="tit"><i class="iconfont icon-dian"></i> 时间</view>
-        <view class="bor">
-        <i>{{noticeTime}}</i>
+        <i>{{noticeTitle}}</i>
       </view>
 
-        <view class="tit"><i class="iconfont icon-dian"></i>作者</view>
-        <view class="bor">
-        <i>{{noticeBy}}</i>
-      </view>
-      <view class="tit"><i class="iconfont icon-dian"></i>类型</view>
-        <view class="bor">
+      <view class="notice_tit_s">
+    
         <i>{{noticeType=='1'?'通知':'公告'}}</i>
+   
+
+        <i>{{noticeBy}}</i>
+     
+        <i>{{noticeTime}}</i>
+       
+
       </view>
-      <view class="tit"><i class="iconfont icon-dian"></i>内容</view>
-        <view class="bor">
+     
+
+      
+      <view class="notice_new">
+        <span>内容:</span>
         <i>{{noticeContent}}</i>
       </view>
-      </view>
-
 
 </view>
 

+ 17 - 28
pages/notice/notice_details.wxss

@@ -3,39 +3,28 @@
   margin: 30rpx 30rpx;
 }
 .notice_tit{
-  font-size: 32rpx;
+  font-size: 40rpx;
+font-weight: 500;
 color: #181818;
-text-align: left;
-display: flex;
-flex-direction: column;
-}
-.tit{
-  color: #f94b0e;
-  list-style: circle;
-  font-size: 34rpx;
-  font-weight: 500;
-  height: 60rpx;
-  line-height: 60rpx;
-  margin-bottom: 30rpx;
+text-align: center;
+margin-bottom: 30rpx;
+padding-top: 20rpx;
+line-height: 60rpx;
 }
+
 .notice_tit_s{
   display: flex;
-  flex-direction: column;
-  align-items: left;
+  flex-direction: row;
+  justify-content: space-around;
+  font-size: 30rpx;
+  color: #c9c9c9;
+  align-items: center;
   padding-bottom: 40rpx;
+  border-bottom: 1rpx solid rgb(240, 240, 240);
+  margin-bottom: 40rpx;
 }
-.notice_tit_s i{
+.notice_new{
   font-size: 32rpx;
   color: #181818;
-}
-.bor{
-  width: 92%;
-  padding: 3% 4%;
-  box-shadow: 0px 0px 10rpx #e9e9e9;
-  border-radius: 14rpx;
-  margin-bottom: 30rpx;
-}
-.icon-dian{
-  font-size: 38rpx;
-  color: #f94b0e;
-}
+  line-height: 66rpx;
+}

+ 37 - 40
pages/teamlist/details/team_details.wxml

@@ -1,59 +1,56 @@
 <!-- 队伍详情页面 -->
 <view class="container">
-<view class="map_view">
+  <view class="notice_tit">
 
-
-
-<view>
-  <span>队伍名称:</span>
+  <view class="tit"><i class="iconfont icon-dian"></i>队伍名称</view>
+    <view class="bor">
   <i>{{teamName}}</i>
-</view>
-<view>
-  <span>队伍分类:</span>
+  </view>
+  <view class="tit"><i class="iconfont icon-dian"></i>队伍分类</view>
+    <view class="bor">
   <i>{{teamCategory}}</i>
-</view>
-<view>
-  <span>队伍性质:</span>
+  </view>
+  <view class="tit"><i class="iconfont icon-dian"></i>队伍性质</view>
+    <view class="bor">
   <i>{{teamNature}}</i>
-</view>
- <!-- <view class="phone" bindtap="Call"></view>>
-  <span>联系电话:</span>
-  <i>{{connectorPhone}}</i>
-</view> -->
-<view>
-  <span>队伍人数:</span>
+  </view>
+  <view class="tit"><i class="iconfont icon-dian"></i>队伍人数</view>
+    <view class="bor">
   <i>{{teamPnum}}</i>
-</view>
-<view>
-  <span>核心装备及数量:</span>
+  </view>
+  <view class="tit"><i class="iconfont icon-dian"></i>核心装备及数量</view>
+    <view class="bor">
   <i>{{equipmentNum}}</i>
-</view>
-<view>
-  <span>部门名称:</span>
+  </view>
+  <view class="tit"><i class="iconfont icon-dian"></i>部门名称</view>
+    <view class="bor">
   <i>{{deptName}}</i>
-</view>
-<view>
-  <span>负责人:</span>
+  </view>
+  <view class="tit"><i class="iconfont icon-dian"></i>负责人</view>
+    <view class="bor">
   <i>{{charger}}</i>
-</view>
-<view>
-  <span>应急联系人及电话:</span>
+  </view>
+  <view class="tit"><i class="iconfont icon-dian"></i>应急联系人及电话</view>
+    <view class="bor">
   <i>{{emergencyPhone}}</i>
-</view>
-<view>
-  <span>所在地点:</span>
+  </view>
+  <view class="tit"><i class="iconfont icon-dian"></i>所在地点</view>
+    <view class="bor">
   <i>{{teamPos}}</i>
+  </view>
+  <view class="tit"><i class="iconfont icon-dian"></i>备注</view>
+    <view class="bor">
+  <i>{{remark}}</i>
+  </view>
+
+
 </view>
+</view>
+
+
 <!-- <view class="phone" bindtap="Call">
   <span>负责人电话:</span>
   <i>{{enterpriseDetails.mainPersonPhone}}</i>
 </view> -->
 
-<view>
-  <span>备注:</span>
-  <i>{{remark}}</i>
-</view>
-
-</view>
-</view>
 

+ 1 - 56
pages/teamlist/details/team_details.wxss

@@ -1,59 +1,4 @@
 /* pages/material/material_details.wxss */
-
-
-map{
-  height: 40vh;
-  width: 100vw;
-}
-.map{
-  height: 40vh;
-  width: 100vw;
-  position: relative;
-}
-.map canvas{
-  width:100%;
-  height: 100%;
-}
-.map_view{
+.container{
   margin: 30rpx 30rpx;
 }
-.map_view view{
-  display: flex;
-  flex-direction: row;
-  font-size: 34rpx;
-  line-height: 50rpx;
-  padding-bottom: 10rpx;
-}
-.map_view view span{
-  width: 240rpx;
-  text-align: right;
-  color: #181818;
-}
-.map_view view i{
- color: rgb(146, 146, 146);
- white-space:normal;
-word-break:break-all;
-word-wrap:break-word
-}
-.map_btn{
-  background: rgba(0, 0, 0, 0.479);
-  display: flex;
-  flex-direction: row;
-  width: 220rpx;
-  height: 70rpx;
-  position: absolute;
-  right:20rpx;
-  bottom:20rpx;
-  z-index: 99999;
-  border-radius: 50rpx;
-  justify-content: space-evenly;
-  align-items: center;
-}
-.map_btn .iconfont{
-  color: #fff;
-  font-size: 50rpx;
-}
-.logo-text{
-  display: none;
-}
-

+ 10 - 4
pages/teamlist/teamlist.wxml

@@ -11,12 +11,19 @@
     </button>
   </view>
   <!-- 列表 -->
-<view class="list_vi">
-    <view class="list_li" catchtap="bindViewDetails" wx:for="{{enterpriseList}}" wx:key="index" data-index="{{item}}">
+  <view class="list_vi">
+    <view class="list_li3" catchtap="bindViewDetails" wx:for="{{enterpriseList}}" wx:key="index" data-index="{{item}}">
       <!-- <i class="list_icon iconfont icon-queding" wx:if="{{item.riskCount == 0}}"></i>
       <i class="list_icon iconfont icon-yingjipingtai" wx:if="{{item.riskCount > 0}}"></i> -->
-      <text>{{item.teamName}}</text>
+      <i class="iconfont icon-dangjian_duiwujianshe"></i>
+      <view class="notice_li">
       
+      <view class="li_tit">{{item.teamName}}</view>
+      <view class="li_time">
+      <text>111111</text>
+      </view>
+      </view>
+  
       <i class="iconfont icon-xiangyou list_right"></i>
     </view>
 </view>
@@ -25,7 +32,6 @@
   </view>
     </view>
 
-    
 
 
 

+ 3 - 0
pages/warehouselist/details/warehouse_details.wxml

@@ -38,4 +38,7 @@
       
   </view>
   </view>
+
+  <view class="float_btn" style="bottom: 280rpx;" bindtap="bindViewXunJian"><i class="iconfont icon-route-fill"></i></view>
+
 </view>

+ 3 - 0
pages/warehouselist/details/warehouse_details.wxss

@@ -57,3 +57,6 @@ word-wrap:break-word
   display: none;
 }
 
+.icon-route-fill {
+  font-size: 50rpx;
+}

+ 9 - 3
pages/warehouselist/warehouselist.wxml

@@ -11,12 +11,18 @@
     </button>
   </view>
   <!-- 列表 -->
-<view class="list_vi">
-    <view class="list_li" catchtap="bindViewDetails" wx:for="{{enterpriseList}}" wx:key="index" data-index="{{item}}">
+  <view class="list_vi">
+    <view class="list_li3" catchtap="bindViewDetails" wx:for="{{enterpriseList}}" wx:key="index" data-index="{{item}}">
       <!-- <i class="list_icon iconfont icon-queding" wx:if="{{item.riskCount == 0}}"></i>
       <i class="list_icon iconfont icon-yingjipingtai" wx:if="{{item.riskCount > 0}}"></i> -->
-      <text>{{item.warehouseName}}</text>
+      <i class="iconfont icon-cangkukucun"></i>
+      <view class="notice_li">
       
+      <view class="li_tit">{{item.warehouseName}}</view>
+      <view class="li_time">
+      <text>111111</text>
+      </view>
+      </view>
       <i class="iconfont icon-xiangyou list_right"></i>
     </view>
 </view>