zhaoxiaohai 3 lat temu
rodzic
commit
b6cd95c90b

+ 5 - 0
pages/submission/details.js

@@ -12,6 +12,11 @@ Page({
      * 生命周期函数--监听页面加载
      */
     onLoad(options) {
+        const item = JSON.parse(options.item);
+        console.log(item)
+        this.setData({
+            detailsData: item
+        })
 
     },
 

+ 3 - 3
pages/submission/details.wxml

@@ -1,7 +1,7 @@
 <view class="box">
-    <view class="title multi-line">一事一报未填写</view>
-    <view class="time">时间:2022-01-01~2022-01-05</view>
-    <view class="time multi-line" style="margin-top: 10rpx;">提报要求:认真填写,计入考核</view>
+    <view class="title multi-line">{{detailsData.title}}</view>
+    <view class="time">有效期:{{detailsData.begdate}} ~ {{detailsData.enddate}}</view>
+    <view class="time multi-line" style="margin-top: 10rpx;">提报要求:{{detailsData.notes}}</view>
     <view class="title" style="margin-top: 30rpx;">附件下载</view>
     <My_accessory></My_accessory>
 </view>

+ 15 - 1
pages/submission/index.js

@@ -76,6 +76,10 @@ Page({
                 title: res.data,
                 icon: "none"
             })
+            for (let i = 0; i < res.data.length; i++) {
+                res.data[i].begdate = res.data[i].begdate.split(" ")[0];
+                res.data[i].enddate = res.data[i].enddate.split(" ")[0];
+            }
             this.setData({
                 list: (res.pageNumber == 1) ? res.data : this.data.list.concat(res.data),
                 ['content.pageNumber']: res.pageNumber + 1,
@@ -153,7 +157,17 @@ Page({
         this.setData({
             "content.where": this.data.whereType.list
         });
-        this.getList(true)
+        this.getList(true);
+        this.timeRangeClose();
+    },
+    /* 去详情 */
+    toDetails(e) {
+        const {
+            item
+        } = e.currentTarget.dataset;
+        wx.navigateTo({
+            url: './details?item=' + JSON.stringify(item),
+        })
     },
     /**
      * 生命周期函数--监听页面初次渲染完成

+ 8 - 16
pages/submission/index.scss

@@ -13,7 +13,7 @@ page {
 
         .line-1 {
             float: left;
-            width: 380rpx;
+            width: 530rpx;
             font-size: 28rpx;
             font-family: PingFang SC-Bold, PingFang SC;
             font-weight: bold;
@@ -34,7 +34,7 @@ page {
         justify-content: space-between;
         height: 78rpx;
         width: 100%;
-        margin-top: 20rpx;
+        margin-top: 16rpx;
 
         .explian {
             display: flex;
@@ -47,24 +47,16 @@ page {
 
         .but {
             display: flex;
-            align-items: flex-end;
+            align-items: center;
 
-            .but-base {
-                height: 40rpx !important;
-                border-radius: 8rpx !important;
+            .base {
+                width: 80rpx;
+                height: 40rpx;
+                border-radius: 20rpx;
                 padding: 0 !important;
                 font-size: 20rpx;
                 font-family: PingFang SC-Regular, PingFang SC;
-                color: #FFFFFF;
-            }
-
-            .state-but {
-                width: 100rpx !important;
-            }
-
-            .read-but {
-                width: 80rpx;
-                margin-right: 10rpx;
+                color: #999999;
             }
         }
     }

+ 5 - 6
pages/submission/index.wxml

@@ -1,7 +1,7 @@
 <van-tabs sticky color='var(--assist)' title-active-color='var(--assist)' bind:click="tabsClick" title-inactive-color='#999'>
     <van-tab title="一事一报" />
     <van-tab title="一事多报" />
-    <van-tab title="提报管理" />
+    <!-- <van-tab title="提报管理" /> -->
 </van-tabs>
 <van-dropdown-menu active-color='var(--assist)' class="dropdown">
     <van-dropdown-item value="{{ value1 }}" options="{{ option1 }}" bindchange='dropdownChange1' />
@@ -10,19 +10,18 @@
 <My_listBox id='ListBox' height="{{listHeight}}" bind:getlist='getList'>
     <view style="height: 10rpx;" />
     <view class="unread">总共{{total}}个,进行中10个,已过期5个</view>
-    <navigator url="/pages/submission/details" class="my-card item" wx:for="{{list}}">
+    <navigator url="#" class="my-card item" wx:for="{{list}}" data-item="{{item}}" bindtap="toDetails">
         <view class="first-line">
             <view class="line-1">{{item.title}}</view>
-            <text class="time">{{item.this.data.content}}</text>
+            <text class="time">已过期</text>
         </view>
         <view class="state">
             <view class="explian">
-                <view>应提报:20</view>
+                <view>有效期:{{item.begdate}} ~ {{item.enddate}}</view>
                 <view>已提报:2</view>
             </view>
             <view class="but">
-                <van-button wx:if="{{activeIndex!=2}}" custom-class='read-but but-base' color="#FF3B30">未读</van-button>
-                <van-button custom-class='state-but but-base' color="#FA8C16">进行中</van-button>
+                <van-button custom-class='read-but base'>未读</van-button>
             </view>
         </view>
     </navigator>