From c79f4fea5045445c40cd417c3bdcf78c843f87ae Mon Sep 17 00:00:00 2001
From: liuwh <liuwh@hugeinfo.com.cn>
Date: Thu, 05 Mar 2020 17:38:01 +0800
Subject: [PATCH] 1
---
SunshineLnsMinApp/pages/fzpxInfo/fzpxInfo.wxml | 5 +
SunshineLnsMinApp/pages/zhgh/zhgh.wxml | 11 ++
SunshineLnsMinApp/pages/zhwj/zhwj.wxml | 146 ++++++++++++++++--------------------
SunshineLnsMinApp/pages/zhghInfo/zhghInfo.js | 3
SunshineIns/src/page/CareList.jsx | 28 +++---
SunshineLnsMinApp/pages/activityDetail/activityDetail.wxml | 2
SunshineLnsMinApp/pages/zhwj/zhwj.js | 39 ++++++++-
7 files changed, 134 insertions(+), 100 deletions(-)
diff --git a/SunshineIns/src/page/CareList.jsx b/SunshineIns/src/page/CareList.jsx
index 2f858bb..2b2fa4e 100644
--- a/SunshineIns/src/page/CareList.jsx
+++ b/SunshineIns/src/page/CareList.jsx
@@ -169,7 +169,7 @@
key: 'status',
render: text => (
text == 0 ?
- <Badge style={{ backgroundColor: '#6C757C' }} count={'已结束'} /> : text == 1 ? <Badge count={'进行中'} style={{ backgroundColor: '#6C757C' }} /> : text == 2 ? <Badge count={'进行中'} style={{ backgroundColor: '#6C757C' }} /> : <Badge count={'已结束'} style={{ backgroundColor: '#2ECC71' }} />
+ <Badge style={{ backgroundColor: '#6C757C' }} count={'未开始'} /> : text == 1 ? <Badge count={'进行中'} style={{ backgroundColor: '#6C757C' }} /> : text == 2 ? <Badge count={'已结束'} style={{ backgroundColor: '#6C757C' }} /> : <Badge count={'结束'} style={{ backgroundColor: '#2ECC71' }} />
)
}, {
title: '创建时间',
@@ -191,23 +191,25 @@
key: 'action',
render: (text, record) => (
<span>
- <a onClick={() => this.showModal(record.id)}>编辑</a>
- <Divider type="vertical" />
- <Popconfirm
- title="确认删除任务吗?"
- id={record.id}
- onConfirm={e => this.confirm(record.id)}
- okText="确定"
- cancelText="取消"
- >
- <a href="#">删除</a>
- </Popconfirm>
{
record.status == 1 ?
<React.Fragment>
<Divider type="vertical" />
<a onClick={() => this.showModal(record.id)}>结束任务</a>
- </React.Fragment> : ''
+ </React.Fragment> :
+ <React.Fragment>
+ <a onClick={() => this.showModal(record.id)}>编辑</a>
+ <Divider type="vertical" />
+ <Popconfirm
+ title="确认删除任务吗?"
+ id={record.id}
+ onConfirm={e => this.confirm(record.id)}
+ okText="确定"
+ cancelText="取消"
+ >
+ <a href="#">删除</a>
+ </Popconfirm>
+ </React.Fragment>
}
</span>
),
diff --git a/SunshineLnsMinApp/pages/activityDetail/activityDetail.wxml b/SunshineLnsMinApp/pages/activityDetail/activityDetail.wxml
index c3fbc98..f10f487 100644
--- a/SunshineLnsMinApp/pages/activityDetail/activityDetail.wxml
+++ b/SunshineLnsMinApp/pages/activityDetail/activityDetail.wxml
@@ -8,7 +8,7 @@
<view class="activityDetail-main">
<view class="headLineTitle">
- {{activity.activityTitle}}
+ {{activity.activityTitle||'暂无'}}
</view>
<view class="headLineInfo">
{{activity.startTime}}
diff --git a/SunshineLnsMinApp/pages/fzpxInfo/fzpxInfo.wxml b/SunshineLnsMinApp/pages/fzpxInfo/fzpxInfo.wxml
index 83b3115..08fa44b 100644
--- a/SunshineLnsMinApp/pages/fzpxInfo/fzpxInfo.wxml
+++ b/SunshineLnsMinApp/pages/fzpxInfo/fzpxInfo.wxml
@@ -33,6 +33,11 @@
<view class="fzpxInfo-main-group-title">报名要求</view>
<view class="fzpxInfo-main-group-around">{{activity.requirement}}</view>
</view>
+ <view class="fzpxInfo-main-group">
+ <view class="fzpxInfo-main-group-title">培训进程</view>
+ <view class="fzpxInfo-main-group-around">
+ <rich-text nodes="{{activity.course||'暂无'}}"></rich-text></view>
+ </view>
<view class="fzpxInfo-main-group" style="display:block;padding: 10rpx 30rpx;">
<view class="fzpxInfo-main-group-title">培训内容</view>
<view>
diff --git a/SunshineLnsMinApp/pages/zhgh/zhgh.wxml b/SunshineLnsMinApp/pages/zhgh/zhgh.wxml
index d9af5a8..b8725ae 100644
--- a/SunshineLnsMinApp/pages/zhgh/zhgh.wxml
+++ b/SunshineLnsMinApp/pages/zhgh/zhgh.wxml
@@ -31,6 +31,9 @@
<view class="zhgh-list-b-left-div">{{item.taskRequire}}</view>
<view class="text-grey">{{item.startTime}}~{{item.endTime}}</view>
</view>
+ <view class="zhgh-list-b-right">
+ <view class="round cu-tag margin-tb-sm lg {{item.status=='未开始'?bg-grey:item.status=='进行中'?bg-red:bg-blue}}">{{item.status}}</view>
+ </view>
</view>
</view>
</view>
@@ -43,6 +46,9 @@
<view class="zhgh-list-b-left-div">{{item.taskRequire}}</view>
<view class="text-grey">{{item.startTime}}~{{item.endTime}}</view>
</view>
+ <view class="zhgh-list-b-right">
+ <view class="round cu-tag margin-tb-sm lg {{item.status=='未开始'?bg-grey:item.status=='进行中'?bg-red:bg-blue}}">{{item.status}}</view>
+ </view>
</view>
</view>
</view>
@@ -54,6 +60,9 @@
<view class="zhgh-list-b-left-div font-lg">{{item.taskTitle}}</view>
<view class="zhgh-list-b-left-div">{{item.taskRequire}}</view>
<view class="text-grey">{{item.startTime}}~{{item.endTime}}</view>
+ </view>
+ <view class="zhgh-list-b-right">
+ <view class="round cu-tag margin-tb-sm lg {{item.status=='未开始'?bg-grey:item.status=='进行中'?bg-red:bg-blue}}">{{item.status}}</view>
</view>
</view>
</view>
@@ -68,7 +77,7 @@
<view class="text-grey">{{item.startTime}}~{{item.endTime}}</view>
</view>
<view class="zhgh-list-b-right">
- <view class="cu-btn bg-red margin-tb-sm lg">{{item.status}}</view>
+ <view class="round cu-tag margin-tb-sm lg {{item.status=='未开始'?bg-grey:item.status=='进行中'?bg-red:bg-blue}}">{{item.status}}</view>
</view>
</view>
</view>
diff --git a/SunshineLnsMinApp/pages/zhghInfo/zhghInfo.js b/SunshineLnsMinApp/pages/zhghInfo/zhghInfo.js
index 7f0e1b8..67cc594 100644
--- a/SunshineLnsMinApp/pages/zhghInfo/zhghInfo.js
+++ b/SunshineLnsMinApp/pages/zhghInfo/zhghInfo.js
@@ -161,6 +161,9 @@
icon: 'success',
duration: 2000
})
+ wx.navigateBack({
+ delta: 1
+ })
} else {
wx.showToast({
title: res.data.msg,
diff --git a/SunshineLnsMinApp/pages/zhwj/zhwj.js b/SunshineLnsMinApp/pages/zhwj/zhwj.js
index e6889cc..e6c1907 100644
--- a/SunshineLnsMinApp/pages/zhwj/zhwj.js
+++ b/SunshineLnsMinApp/pages/zhwj/zhwj.js
@@ -6,7 +6,7 @@
* 页面的初始数据
*/
data: {
- wjgk:'./../../images/wjgk.jpg',
+ wjgk: './../../images/wjgk.jpg',
dongtai1_1: app.globalData.imgUrl + '/image/dongtai1-1.jpg',
dongtai2_1: app.globalData.imgUrl + '/image/dongtai2-1.jpg',
dongtai3_1: app.globalData.imgUrl + '/image/dongtai3-1.jpg',
@@ -61,17 +61,48 @@
badge: 0,
name: '版权'
}],
+ dataSet: []
},
/**
* 生命周期函数--监听页面加载
*/
- onLoad: function(options) {
-
+ onLoad: function (options) {
+ var that = this;
+ wx.showLoading();
+ wx.request({
+ url: app.globalData.url + '/api/article/publicMsgQuery',
+ data: {
+ page: 1,
+ size: 1000,
+ flag: '未检动态',
+ },
+ success: function (res) {
+ wx.hideLoading();
+ console.log('res', res);
+ if (res.data.code == 0) {
+ let content = res.data.data.result.content.map(({
+ createTime,
+ ...i
+ }) => ({
+ ...i,
+ createTime: app.formatDate(createTime),
+ }));
+ console.log(content)
+ that.setData({
+ dataSet: content
+ })
+ } else {
+ wx.showToast({
+ title: res.data.msg,
+ })
+ }
+ }
+ })
},
// 跳转
- linkFunction: function(event) {
+ linkFunction: function (event) {
var str = event.currentTarget.dataset['str'];
var id = event.currentTarget.dataset['id'];
wx.navigateTo({
diff --git a/SunshineLnsMinApp/pages/zhwj/zhwj.wxml b/SunshineLnsMinApp/pages/zhwj/zhwj.wxml
index 6be7e25..997f9ee 100644
--- a/SunshineLnsMinApp/pages/zhwj/zhwj.wxml
+++ b/SunshineLnsMinApp/pages/zhwj/zhwj.wxml
@@ -4,47 +4,47 @@
</view>
<view class="zhwj-list">
- <view class="zhwj-list-flex">
- <view class="zhwj-list-flex-l" data-str="zhgk" bindtap='linkFunction'>
- <view class="cu-avatar round margin-left zhwj-list-flex-l-img" style="background-image: url('https://xnwj.gznsjc.gov.cn/nsjc-charge/image/zuj1.png');"></view>
- <view class="zhwj-list-flex-l-text">
- <view class="text-black text-bold text-lg">未检概况</view>
- <view class="text-gray">未检简介</view>
- </view>
- </view>
- <view class="zhwj-list-flex-r" data-str="zhdt" bindtap='linkFunction'>
- <view class="cu-avatar round margin-left zhwj-list-flex-l-img" style="background-image: url('https://xnwj.gznsjc.gov.cn/nsjc-charge/image/zuj2.png');"></view>
- <view class="zhwj-list-flex-l-text">
- <view class="text-black text-bold text-lg">未检动态</view>
- <view class="text-gray">最美未检剪影</view>
- </view>
- </view>
- </view>
- <view class="zhwj-list-flex">
- <view class="zhwj-list-flex-l" data-str="zhghLogin" bindtap='linkFunction'>
- <view class="cu-avatar round margin-left zhwj-list-flex-l-img" style="background-image: url('https://xnwj.gznsjc.gov.cn/nsjc-charge/image/zuj3.png');"></view>
- <view class="zhwj-list-flex-l-text">
- <view class="text-black text-bold text-lg">社会关护</view>
- <view class="text-gray">社会支持与配合</view>
- </view>
- </view>
- <view class="zhwj-list-flex-r" data-str="wjjb" bindtap='linkFunction'>
- <view class="cu-avatar round margin-left zhwj-list-flex-l-img" style="background-image: url('https://xnwj.gznsjc.gov.cn/nsjc-charge/image/zuj4.png');"></view>
- <view class="zhwj-list-flex-l-text">
- <view class="text-black text-bold text-lg">举报平台</view>
- <view class="text-gray">未成年人侵害案件</view>
- </view>
- </view>
- </view>
- <view class="zhwj-list-flex">
- <view class="zhwj-list-flex-l" data-str="weiwc" bindtap='linkFunction'>
- <view class="cu-avatar round margin-left zhwj-list-flex-l-img" style="background-image: url('https://xnwj.gznsjc.gov.cn/nsjc-charge/image/zuj5.png');"></view>
- <view class="zhwj-list-flex-l-text">
- <view class="text-black text-bold text-lg">入职查询</view>
- <view class="text-gray">未检职工入职查询</view>
- </view>
- </view>
- <!-- <view class="zhwj-list-flex-r" data-str="weiwc" bindtap='linkFunction'>
+ <view class="zhwj-list-flex">
+ <view class="zhwj-list-flex-l" data-str="zhgk" bindtap='linkFunction'>
+ <view class="cu-avatar round margin-left zhwj-list-flex-l-img" style="background-image: url('https://xnwj.gznsjc.gov.cn/nsjc-charge/image/zuj1.png');"></view>
+ <view class="zhwj-list-flex-l-text">
+ <view class="text-black text-bold text-lg">未检概况</view>
+ <view class="text-gray">未检简介</view>
+ </view>
+ </view>
+ <view class="zhwj-list-flex-r" data-str="zhdt" bindtap='linkFunction'>
+ <view class="cu-avatar round margin-left zhwj-list-flex-l-img" style="background-image: url('https://xnwj.gznsjc.gov.cn/nsjc-charge/image/zuj2.png');"></view>
+ <view class="zhwj-list-flex-l-text">
+ <view class="text-black text-bold text-lg">未检动态</view>
+ <view class="text-gray">最美未检剪影</view>
+ </view>
+ </view>
+ </view>
+ <view class="zhwj-list-flex">
+ <view class="zhwj-list-flex-l" data-str="zhghLogin" bindtap='linkFunction'>
+ <view class="cu-avatar round margin-left zhwj-list-flex-l-img" style="background-image: url('https://xnwj.gznsjc.gov.cn/nsjc-charge/image/zuj3.png');"></view>
+ <view class="zhwj-list-flex-l-text">
+ <view class="text-black text-bold text-lg">社会关护</view>
+ <view class="text-gray">社会支持与配合</view>
+ </view>
+ </view>
+ <view class="zhwj-list-flex-r" data-str="wjjb" bindtap='linkFunction'>
+ <view class="cu-avatar round margin-left zhwj-list-flex-l-img" style="background-image: url('https://xnwj.gznsjc.gov.cn/nsjc-charge/image/zuj4.png');"></view>
+ <view class="zhwj-list-flex-l-text">
+ <view class="text-black text-bold text-lg">举报平台</view>
+ <view class="text-gray">未成年人侵害案件</view>
+ </view>
+ </view>
+ </view>
+ <view class="zhwj-list-flex">
+ <view class="zhwj-list-flex-l" data-str="weiwc" bindtap='linkFunction'>
+ <view class="cu-avatar round margin-left zhwj-list-flex-l-img" style="background-image: url('https://xnwj.gznsjc.gov.cn/nsjc-charge/image/zuj5.png');"></view>
+ <view class="zhwj-list-flex-l-text">
+ <view class="text-black text-bold text-lg">入职查询</view>
+ <view class="text-gray">未检职工入职查询</view>
+ </view>
+ </view>
+ <!-- <view class="zhwj-list-flex-r" data-str="weiwc" bindtap='linkFunction'>
<view class="cu-avatar round margin-left zhwj-list-flex-l-img" style="background-image: url('https://xnwj.gznsjc.gov.cn/nsjc-charge/image/zuj6.png');"></view>
<view class="zhwj-list-flex-l-text">
<view class="text-black text-bold text-lg">普法预约</view>
@@ -52,51 +52,35 @@
</view>
</view> -->
- <view class="zhwj-list-flex-r" data-str="fzjdvisitList" bindtap='linkFunction'>
- <view class="cu-avatar round margin-left zhwj-list-flex-l-img" style="background-image: url('https://xnwj.gznsjc.gov.cn/nsjc-charge/image/zuj6.png');"></view>
- <view class="zhwj-list-flex-l-text">
- <view class="text-black text-bold text-lg">法治基地参观</view>
- <view class="text-gray">预约参观法治基地</view>
- </view>
- </view>
-
- </view>
+ <view class="zhwj-list-flex-r" data-str="fzjdvisitList" bindtap='linkFunction'>
+ <view class="cu-avatar round margin-left zhwj-list-flex-l-img" style="background-image: url('https://xnwj.gznsjc.gov.cn/nsjc-charge/image/zuj6.png');"></view>
+ <view class="zhwj-list-flex-l-text">
+ <view class="text-black text-bold text-lg">法治基地参观</view>
+ <view class="text-gray">预约参观法治基地</view>
+ </view>
+ </view>
+
+ </view>
</view>
<view class="index-gray "></view>
<view class="zhwj-b">
- <view class="zhwj-b-head">
- <span></span>
- <view class="zhwj-b-head-title text-black">未检动态</view>
- </view>
+ <view class="zhwj-b-head">
+ <span></span>
+ <view class="zhwj-b-head-title text-black">未检动态</view>
+ </view>
- <view class="zhwj-b-main" data-str="zhdtInfo" data-id="1" bindtap='linkFunction'>
- <view class="zhwj-b-head-l">
- <view class="zhwj-b-head-l-title text-black">南沙区院召开2019“沙鸥”法治宣讲团年度总结暨课件评选会</view>
- <view class="text-grey">检察宣传部 60阅读</view>
- </view>
- <view class="zhwj-b-head-r">
- <image mode='widthFix' src="{{dongtai1_1}}"></image>
- </view>
- </view>
- <view class="zhwj-b-main" data-str="zhdtInfo" data-id="2" bindtap='linkFunction'>
- <view class="zhwj-b-head-l">
- <view class="zhwj-b-head-l-title text-black">“沙鸥”法治宣讲团进校园开展假前安全教育</view>
- <view class="text-grey">检察宣传部 56阅读</view>
- </view>
- <view class="zhwj-b-head-r">
- <image src="{{dongtai2_1}}" mode='widthFix'></image>
- </view>
- </view>
- <view class="zhwj-b-main" data-str="zhdtInfo" data-id="3" bindtap='linkFunction'>
- <view class="zhwj-b-head-l">
- <view class="zhwj-b-head-l-title text-black">我院与华尔心理咨询中心开展反家暴普法宣传</view>
- <view class="text-grey">检察宣传部 245阅读</view>
- </view>
- <view class="zhwj-b-head-r">
- <image src="{{dongtai3_1}}" mode='widthFix'></image>
- </view>
- </view>
+ <view class="zhwj-b">
+ <view class="zhwj-b-main" wx:for="{{ dataSet }}" data-str="zhdtInfo" data-Id="{{item.id}}" bindtap='linkFunction'>
+ <view class="zhwj-b-head-l">
+ <view class="zhwj-b-head-l-title text-black">{{item.title}}</view>
+ <view class="text-grey">{{item.createTime}}<text decode="{{true}}" space="{{true}}"> </text>{{item.readCount}}阅读</view>
+ </view>
+ <view class="zhwj-b-head-r">
+ <image mode='widthFix' src="{{item.attList[0].path}}"></image>
+ </view>
+ </view>
+ </view>
</view>
\ No newline at end of file
--
Gitblit v1.8.0