syyang 2 years ago
parent
commit
41c239ebde

+ 52 - 0
app.wxss

@@ -130,7 +130,59 @@ page{
     margin-left: auto;
     font-size: 40rpx;
   }
+  .list_li3{
+    display: flex;
+    flex-direction: row;
+    height: auto;
+    line-height: 50rpx;
+    padding-bottom: 20rpx;
+    padding-top: 20rpx;
+    border-bottom: 1px solid #f2f2f2;
+  }
+  .list_li3:active{
+ background-color: rgb(255, 247, 243);
 
+  }
+  .list_li3 .li_tit{
+    overflow: hidden;
+white-space: nowrap;
+text-overflow: ellipsis;
+font-size: 34rpx;
+color: #181818;
+text-align: left;
+  }
+  .list_li3 .li_time{
+    font-size: 29rpx;
+color: #666;
+  }
+  .list_li3 .li_time text{
+    margin-right: 40rpx;
+  }
+  .list_li3 .notice_li{
+    width: 80%;
+    display: flex;
+    flex-direction: column;
+  }
+  .list_li3 .icon-tongzhigonggao{
+    font-size: 50rpx;
+    color: rgb(238, 148, 125);
+    width: 10%;
+  }
+  .list_li3  .list_right{
+    width: 10%;
+    text-align: right;
+    font-size:70rpx ;
+    line-height: 100rpx;
+    color:rgb(238, 238, 238);
+  }
+  .list_li3 .iconfont{
+    margin-right: 0px!important;
+  }
+  .list_li3 .icon-wuzichubei{
+    font-size: 50rpx;
+    color: rgb(125, 238, 163);
+    width: 10%;
+  }
   /* 暂无数据 */
 .zwsj{
   font-size: 260rpx!important;

+ 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_gxhod5vh9pc.woff2?t=1672883976549') format('woff2'),
-       url('//at.alicdn.com/t/c/font_3264694_gxhod5vh9pc.woff?t=1672883976549') format('woff'),
-       url('//at.alicdn.com/t/c/font_3264694_gxhod5vh9pc.ttf?t=1672883976549') format('truetype');
+  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');
 }
 
 .iconfont {
@@ -13,6 +13,14 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-weibiaoti--:before {
+  content: "\e611";
+}
+
+.icon-tongzhigonggao:before {
+  content: "\e65e";
+}
+
 .icon-yunongtongqingchuhuancun:before {
   content: "\e638";
 }

+ 1 - 1
pages/index/index.wxml

@@ -52,7 +52,7 @@
 
   <!-- 通知公告 -->
   <view class="tzgg">
-    <image class="img" src="{{host}}/images/xcx_lb.png" />
+  <view class="img"><image src="{{host}}/images/xcx_lb.png" /></view>
     <!-- <b>[待办]</b> -->
     <text>{{NoticeTitle}}</text>
     <view class="more" data-fun="bindViewGengDuo" bindtap="init_userInfo">更多></view>

+ 14 - 2
pages/index/index.wxss

@@ -167,23 +167,35 @@ background: none;
   border-bottom: 2px solid #eee;
 }
 .tzgg .img{
- width: 60rpx;
- height: 60rpx;
+ width: 10%;
  margin-right: 20rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
 }
+.tzgg .img image{
+  width: 60rpx;
+  height: 60rpx;
+ }
 .tzgg b{
   font-size: 32rpx;
   color: #181818;
   padding-right: 5rpx;
  }
 .tzgg text{
+  width: 75%;
   font-size: 32rpx;
   color: #181818;
+  overflow: hidden;
+white-space: nowrap;
+text-overflow: ellipsis;
  }
 .tzgg .more{
+  width: 15%;
   margin-left:auto;
   font-size: 28rpx;
   color: #7b7b7b;
+  text-align: right;
  }
  .con_banner .img{
    height: auto;

+ 9 - 2
pages/material/material.wxml

@@ -12,11 +12,18 @@
   </view>
   <!-- 列表 -->
 <view class="list_vi">
-    <view class="list_li" catchtap="bindViewDetails" wx:for="{{enterpriseList}}" wx:key="index" data-index="{{item}}">
+    <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.materialName}}</text>
+      <i class="iconfont icon-wuzichubei"></i>
+      <view class="notice_li">
+      
+      <view class="li_tit">{{item.materialName}}</view>
+      <view class="li_time">
       <text>{{item.connector}}</text>
+      </view>
+      </view>
+  
       <i class="iconfont icon-xiangyou list_right"></i>
     </view>
 </view>

+ 43 - 42
pages/material/material_details.wxml

@@ -1,61 +1,62 @@
 <!-- 物资详情页面 -->
 <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>{{materialName}}</i>
-</view>
-<view>
-  <span>所属仓库名称:</span>
+  </view>
+  <view class="tit"><i class="iconfont icon-dian"></i>所属仓库名称</view>
+    <view class="bor">
   <i>{{enterpriseDetails.warehouseName}}</i>
-</view>
-<view>
-  <span>负责人:</span>
+  </view>
+  <view class="tit"><i class="iconfont icon-dian"></i>负责人</view>
+    <view class="bor">
   <i>{{connector}}</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 class="iconfont icon-weibiaoti--"></i>
+  <i class="phone" bindtap="Call">{{connectorPhone}}</i>
+
+  </view>
+  <view class="tit"><i class="iconfont icon-dian"></i>创建人</view>
+    <view class="bor">
   <i>{{createBy}}</i>
-</view>
-<view>
-  <span>生产日期:</span>
+  </view>
+  <view class="tit"><i class="iconfont icon-dian"></i>生产日期</view>
+    <view class="bor">
   <i>{{productionDate}}</i>
-</view>
-<view>
-  <span>技术状况:</span>
+  </view>
+  <view class="tit"><i class="iconfont icon-dian"></i>技术状况</view>
+    <view class="bor">
   <i>{{technology}}</i>
-</view>
-<view>
-  <span>品牌、型号:</span>
+  </view>
+  <view class="tit"><i class="iconfont icon-dian"></i>品牌、型号</view>
+    <view class="bor">
   <i>{{materialParms}}</i>
-</view>
-<view>
-  <span>主要功能和用途:</span>
+  </view>
+  <view class="tit"><i class="iconfont icon-dian"></i>主要功能和用途</view>
+    <view class="bor">
   <i>{{purpose}}</i>
-</view>
-<view>
-  <span>物资类型:</span>
+  </view>
+  <view class="tit"><i class="iconfont icon-dian"></i>物资类型</view>
+    <view class="bor">
   <i>{{materialType}}</i>
-</view>
+  </view>
+  <view class="tit"><i class="iconfont icon-dian"></i>数量</view>
+    <view class="bor">
+  <i>{{num}}</i>
+  </view>
+  <view class="tit"><i class="iconfont icon-dian"></i>备注</view>
+    <view class="bor">
+  <i>{{remark}}</i>
+  </view>
 <!-- <view class="phone" bindtap="Call">
   <span>负责人电话:</span>
   <i>{{enterpriseDetails.mainPersonPhone}}</i>
 </view> -->
-<view>
-  <span>数量:</span>
-  <i>{{num}}</i>
-</view>
-<view>
-  <span>备注:</span>
-  <i>{{remark}}</i>
-</view>
 
 </view>
+</view>
 

+ 38 - 51
pages/material/material_details.wxss

@@ -1,59 +1,46 @@
 /* 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;
+.notice_tit{
+  font-size: 32rpx;
+color: #181818;
+text-align: left;
+display: flex;
+flex-direction: column;
 }
-.map_view view i{
- color: rgb(146, 146, 146);
- white-space:normal;
-word-break:break-all;
-word-wrap:break-word
+.tit{
+  color: #f94b0e;
+  list-style: circle;
+  font-size: 34rpx;
+  font-weight: 500;
+  height: 60rpx;
+  line-height: 60rpx;
+  margin-bottom: 30rpx;
 }
-.map_btn{
-  background: rgba(0, 0, 0, 0.479);
+.notice_tit_s{
   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;
+  flex-direction: column;
+  align-items: left;
+  padding-bottom: 40rpx;
 }
-.map_btn .iconfont{
-  color: #fff;
-  font-size: 50rpx;
-}
-.logo-text{
-  display: none;
+.notice_tit_s i{
+  font-size: 32rpx;
+  color: #181818;
 }
-
+.bor{
+  width: 92%;
+  padding: 3% 4%;
+  box-shadow: 0px 0px 10rpx #e9e9e9;
+  border-radius: 14rpx;
+  margin-bottom: 30rpx;
+}
+.icon-weibiaoti--{
+  font-size: 36rpx;
+  color: #ffaa8a;
+  margin-right: 14rpx;
+}
+.icon-dian{
+  font-size: 38rpx;
+  color: #f94b0e;
+}

+ 2 - 2
pages/me/me.wxss

@@ -22,8 +22,8 @@
   height: 100rpx;
 }
 .wd_img{
-  width: 160rpx;
-  height: 160rpx;
+  width: 130rpx;
+  height: 130rpx;
   border-radius: 50%;
   display: flex;
   align-items: center;

+ 11 - 2
pages/notice/notice.wxml

@@ -4,10 +4,19 @@
 
 <!-- 列表 -->
 <view class="list_vi">
-    <view class="list_li" catchtap="bindViewDetails" wx:for="{{enterpriseList}}" wx:key="index" data-index="{{item}}">
+    <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.noticeTitle}}</text>
+      <i class="iconfont icon-tongzhigonggao"></i>
+      <view class="notice_li">
+      
+      <view class="li_tit">{{item.noticeTitle}}</view>
+      <view class="li_time">
+      <text>发布者</text>
+      <text>2022年12月11日</text>
+      </view>
+      </view>
+  
       <i class="iconfont icon-xiangyou list_right"></i>
     </view>
     <view class='data-loading' hidden='{{hidden}}'>

+ 1 - 1
pages/notice/notice.wxss

@@ -44,4 +44,4 @@
   background-color: #fff;
   text-align: center;
   font-size: 14px;
-}
+}

+ 16 - 13
pages/notice/notice_details.wxml

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

+ 41 - 1
pages/notice/notice_details.wxss

@@ -1 +1,41 @@
-/* pages/notice/notice_details.wxss */
+/* pages/notice/notice_details.wxss */
+.container{
+  margin: 30rpx 30rpx;
+}
+.notice_tit{
+  font-size: 32rpx;
+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;
+}
+.notice_tit_s{
+  display: flex;
+  flex-direction: column;
+  align-items: left;
+  padding-bottom: 40rpx;
+}
+.notice_tit_s i{
+  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;
+}