From b72fc1b10b08cf2fea1626d32e1ca2cccabe2edd Mon Sep 17 00:00:00 2001
From: liuwh <hugeinfo123>
Date: Tue, 31 Mar 2020 23:49:35 +0800
Subject: [PATCH] bug修复
---
SunshineLnsMinApp/pages/zhgk/zhgk.wxml | 21 +-
SunshineIns/src/page/ActiveManage.jsx | 9 +
SunshineIns/src/page/ActiveManageEditquestionnaire.jsx | 14 +
SunshineLnsMinApp/pages/zhwj/zhwj.wxml | 2
SunshineIns/src/index.jsx | 2
SunshineIns/src/page/ActiveManageEdit.jsx | 2
SunshineLnsMinApp/pages/rzcxList/rzcxList.wxml | 3
SunshineIns/src/view/LoginView/index.jsx | 2
SunshineIns/src/page/CareList.jsx | 2
SunshineIns/src/page/CareListEdit.jsx | 2
SunshineLnsMinApp/pages/xsuojbInfo/xsuojbInfo.js | 3
SunshineLnsMinApp/pages/xsjb/xsjb.json | 2
SunshineIns/src/page/Login.jsx | 4
SunshineLnsMinApp/pages/zhghLogin/zhghLogin.js | 4
SunshineLnsMinApp/pages/zhgh/zhgh.json | 2
SunshineLnsMinApp/pages/zhghLogin/zhghLogin.json | 2
SunshineIns/src/data/menu.js | 52 ++++---
SunshineIns/src/page/KeyWord.jsx | 2
SunshineLnsMinApp/pages/zhdt/zhdt.wxml | 4
SunshineLnsMinApp/pages/zhgh/zhgh.wxml | 169 +++++++++++++-----------
SunshineLnsMinApp/pages/fzpxInfo/fzpxInfo.js | 2
SunshineIns/src/view/QuestionnairContent/index.js | 17 ++
SunshineLnsMinApp/app.js | 4
SunshineLnsMinApp/pages/me/me.wxml | 12
SunshineLnsMinApp/pages/zhgk/zhgk.js | 62 ++++++--
SunshineLnsMinApp/pages/xsjb/xsjb.wxml | 2
SunshineLnsMinApp/pages/zhghInfo/zhghInfo.json | 2
27 files changed, 245 insertions(+), 159 deletions(-)
diff --git a/SunshineIns/src/data/menu.js b/SunshineIns/src/data/menu.js
index 5225655..f507c0b 100644
--- a/SunshineIns/src/data/menu.js
+++ b/SunshineIns/src/data/menu.js
@@ -83,20 +83,6 @@
icon: active,
iconCheck: activeCheck,
path: '/sweeping'
-},
-{
- id: 'lawSubscribe',
- name: '普法预约',
- icon: active,
- iconCheck: activeCheck,
- path: '/lawSubscribe'
-},
-{
- id: 'keyWord',
- name: '关键词维护',
- icon: active,
- iconCheck: activeCheck,
- path: '/keyWord'
}, {
id: 'activeManage',
name: '法治活动',
@@ -104,20 +90,40 @@
iconCheck: activeCheck,
path: '/activeManage'
},
+
{
- id: 'careList',
- name: '社会关护管理',
- icon: active,
- iconCheck: activeCheck,
- path: '/careList'
+ id: 'childManage',
+ name: '智慧未检',
+ icon: home,
+ iconCheck: homeCheck,
+ children: [{
+ id: 'careList',
+ name: '社会观护管理',
+ path: '/careList'
+ }, {
+ id: 'underAgeList',
+ name: '涉未成年负责部门组织',
+ path: '/underAgeList'
+ }, {
+ id: 'lawSubscribe',
+ name: '普法预约',
+ path: '/lawSubscribe'
+ }]
},
+
{
- id: 'underAgeList',
- name: '涉未成年负责部门组织',
- icon: active,
+ id: 'keyWord',
+ name: '关键词维护',
+ icon: home,
iconCheck: activeCheck,
- path: '/underAgeList'
+ children: [{
+ id: 'dxWords',
+ name: '典型案例关键词',
+ path: '/dxWords'
+ }]
},
+
+
{
id: 'noInspectionReportList',
name: '举报管理',
diff --git a/SunshineIns/src/index.jsx b/SunshineIns/src/index.jsx
index b7a2ee3..5f8aab1 100644
--- a/SunshineIns/src/index.jsx
+++ b/SunshineIns/src/index.jsx
@@ -89,7 +89,7 @@
<Route path='/supPerson' component={SupPerson} />
<Route path='/company' component={Company} />
<Route path='/underAgeList' component={UnderAgeList} />
- <Route path='/keyWord' component={KeyWord} />
+ <Route path='/dxWords' component={KeyWord} />
<Route path='/knowledgeBase' component={KnowledgeBase} />
<Route path='/articlePublish' component={ArticlePublish} />
<Route path='/articleEidt/:id' component={ArticleEidt} />
diff --git a/SunshineIns/src/page/ActiveManage.jsx b/SunshineIns/src/page/ActiveManage.jsx
index 819609c..3966f9a 100644
--- a/SunshineIns/src/page/ActiveManage.jsx
+++ b/SunshineIns/src/page/ActiveManage.jsx
@@ -298,6 +298,8 @@
record.status == 3 ?
<span>
<label className='theme-color' onClick={() => this.showModal(record.id)} style={{ cursor: 'pointer' }}>查看</label>
+ <Divider type="vertical" />
+ <label className='theme-color' onClick={() => this.signIn(record.id)} style={{ cursor: 'pointer' }}>签到上墙</label>
{!record.result &&
<React.Fragment>
<Divider type="vertical" />
@@ -306,7 +308,12 @@
}
</span>
:
- <span><label className='theme-color' onClick={() => this.showModal(record.id)} style={{ cursor: 'pointer' }}>查看</label></span>
+ record.status == 99 ?
+ <span><label className='theme-color' onClick={() => this.showModal(record.id)} style={{ cursor: 'pointer' }}>查看</label></span>
+ :
+ <span><label className='theme-color' onClick={() => this.showModal(record.id)} style={{ cursor: 'pointer' }}>查看</label>
+ <Divider type="vertical" />
+ <label className='theme-color' onClick={() => this.signIn(record.id)} style={{ cursor: 'pointer' }}>签到上墙</label></span>
)
),
diff --git a/SunshineIns/src/page/ActiveManageEdit.jsx b/SunshineIns/src/page/ActiveManageEdit.jsx
index b0a77c5..55c7f98 100644
--- a/SunshineIns/src/page/ActiveManageEdit.jsx
+++ b/SunshineIns/src/page/ActiveManageEdit.jsx
@@ -693,7 +693,7 @@
this.state.selectedQuestionnaireData.title ?
<div>
<span style={{ margin: '0 20px' }}>{this.state.selectedQuestionnaireData.title}</span>
- <Button type="link" disabled onClick={this.questionnaireCancle}>查看</Button>
+ <Button type="link" onClick={this.questionnaireCancle}>查看</Button>
<Button type="link" disabled onClick={this.questionnaireDel}>删除</Button>
</div> :
<Button style={{ marginLeft: '15px', width: '150px' }} onClick={this.selectonClick}>请选择</Button>
diff --git a/SunshineIns/src/page/ActiveManageEditquestionnaire.jsx b/SunshineIns/src/page/ActiveManageEditquestionnaire.jsx
index d1368d8..b84570f 100644
--- a/SunshineIns/src/page/ActiveManageEditquestionnaire.jsx
+++ b/SunshineIns/src/page/ActiveManageEditquestionnaire.jsx
@@ -107,7 +107,7 @@
问卷描述：{initData.content || '暂无'}
</h4>
<h4 style={{ marginBottom: 0 }}>
- 业务类型{initData.businessType || '暂无'}
+ 业务类型{typeStatus(initData.businessType) || '暂无'}
</h4>
</div>
</div>
@@ -124,3 +124,15 @@
}
}
+function typeStatus(type) {
+ switch (type) {
+ case 1:
+ return "企业体检";
+ case 2:
+ return "培训活动";
+ case 3:
+ return "未检调查";
+ case 4:
+ return "刑执监督";
+ }
+}
\ No newline at end of file
diff --git a/SunshineIns/src/page/CareList.jsx b/SunshineIns/src/page/CareList.jsx
index 96aa49c..1585a4c 100644
--- a/SunshineIns/src/page/CareList.jsx
+++ b/SunshineIns/src/page/CareList.jsx
@@ -61,7 +61,7 @@
}
componentDidMount() {
- document.title = '社会关护管理';
+ document.title = '社会观护管理';
this.getData();
}
diff --git a/SunshineIns/src/page/CareListEdit.jsx b/SunshineIns/src/page/CareListEdit.jsx
index f34510a..854d35d 100644
--- a/SunshineIns/src/page/CareListEdit.jsx
+++ b/SunshineIns/src/page/CareListEdit.jsx
@@ -526,7 +526,7 @@
<Row type="flex" align='middle' justify="space-around">
<Col span={6} pull={0} style={{ textAlign: 'center' }}><span>任务汇报</span></Col>
<Col span={18} push={0} >
- <TextArea disabled={disabled} rows={4} value={socialTaskObject.taskReport || ""} onChange={this.saveInputChange} name='taskReport' />
+ <TextArea disabled={disabled} rows={8} value={socialTaskObject.taskReport || ""} onChange={this.saveInputChange} name='taskReport' />
</Col>
<Col span={12} pull={0}></Col>
</Row>
diff --git a/SunshineIns/src/page/KeyWord.jsx b/SunshineIns/src/page/KeyWord.jsx
index 3bc2e3e..8e62cf6 100644
--- a/SunshineIns/src/page/KeyWord.jsx
+++ b/SunshineIns/src/page/KeyWord.jsx
@@ -26,7 +26,7 @@
}
componentDidMount() {
- document.title = '关键词维护';
+ document.title = '典型案例关键词';
this.getData();
}
diff --git a/SunshineIns/src/page/Login.jsx b/SunshineIns/src/page/Login.jsx
index e719d7d..2a6752b 100644
--- a/SunshineIns/src/page/Login.jsx
+++ b/SunshineIns/src/page/Login.jsx
@@ -42,8 +42,8 @@
// debugger;
if (res.code === 0) {
// location.href = res.data;
- location.href ='http://localhost:8080/index.html#/'
- // location.href ='http://nsjcy.hugeinfo.com.cn/nsjc-charge/pc/index.html#/'
+ // location.href ='http://localhost:8080/index.html#/'
+ location.href ='http://nsjcy.hugeinfo.com.cn/nsjc-charge/pc/index.html#/'
} else {
message.error(res.msg, 2)
}
diff --git a/SunshineIns/src/view/LoginView/index.jsx b/SunshineIns/src/view/LoginView/index.jsx
index b0ef095..4860a33 100644
--- a/SunshineIns/src/view/LoginView/index.jsx
+++ b/SunshineIns/src/view/LoginView/index.jsx
@@ -31,7 +31,7 @@
<React.Fragment>
<div className="login-view-main">
<div><img src={logo} style={{ width: '200px' }} /></div>
- <div className='login-view-text'>南沙区人民检察院阳光检务后台管理</div>
+ <div className='login-view-text'>南沙区人民检察院便利化诉讼服务智能平台管理后台</div>
</div>
<div className="login-view-content">
<div className="login-view-body">
diff --git a/SunshineIns/src/view/QuestionnairContent/index.js b/SunshineIns/src/view/QuestionnairContent/index.js
index 7b7de0a..3828d52 100644
--- a/SunshineIns/src/view/QuestionnairContent/index.js
+++ b/SunshineIns/src/view/QuestionnairContent/index.js
@@ -6,6 +6,19 @@
// import Default from '../../assets/scale_default.png'
const Option = Select.Option;
+
+function typeStatus(type) {
+ switch (type) {
+ case 1:
+ return "企业体检";
+ case 2:
+ return "培训活动";
+ case 3:
+ return "未检调查";
+ case 4:
+ return "刑执监督";
+ }
+}
class QuestionnairContent extends React.PureComponent {
state = {
questionnairSign: false,
@@ -20,7 +33,7 @@
this.setState({
questionnairTitle: title,
questionnairDescription: content,
- questionnairBusinessType: businessType
+ questionnairBusinessType: typeStatus(businessType)
});
}
//新增题目时内容页滚动到底部
@@ -86,7 +99,7 @@
questionnairBusinessType
} = this.state;
const { submitQuestionTemp, editors, btnLoading } = this.props;
-
+ console.log(questionnairBusinessType)
const questionnairtitleEl = (
<div className="title-inner">
<span style={{ color: 'red' }}>*</span>
diff --git a/SunshineLnsMinApp/app.js b/SunshineLnsMinApp/app.js
index 629c510..5ba6922 100644
--- a/SunshineLnsMinApp/app.js
+++ b/SunshineLnsMinApp/app.js
@@ -10,8 +10,8 @@
globalData: {
userInfo: null,
pageData: {},
- // url: 'https://nsjcy.hugeinfo.com.cn/nsjc-charge',
- url: 'http://1p885086k1.iok.la/nsjc-charge',
+ url: 'https://nsjcy.hugeinfo.com.cn/nsjc-charge',
+ // url: 'http://1p885086k1.iok.la/nsjc-charge',
// url: 'http://192.168.0.31:8085/nsjc-charge',
imgUrl: 'https://nsjcy.hugeinfo.com.cn/nsjc-charge',
// url: 'http://nsjc.vaiwan.com/nsjc-charge',
diff --git a/SunshineLnsMinApp/pages/fzpxInfo/fzpxInfo.js b/SunshineLnsMinApp/pages/fzpxInfo/fzpxInfo.js
index f38751d..02d8830 100644
--- a/SunshineLnsMinApp/pages/fzpxInfo/fzpxInfo.js
+++ b/SunshineLnsMinApp/pages/fzpxInfo/fzpxInfo.js
@@ -242,7 +242,7 @@
}))
} else {
wx.showToast({
- title: '报名失败,请稍后重试!',
+ title: res.data.msg,
icon: 'none'
})
}
diff --git a/SunshineLnsMinApp/pages/me/me.wxml b/SunshineLnsMinApp/pages/me/me.wxml
index 963157e..01e7aed 100644
--- a/SunshineLnsMinApp/pages/me/me.wxml
+++ b/SunshineLnsMinApp/pages/me/me.wxml
@@ -23,9 +23,9 @@
<div class="me-business-nav" bindtap="myTranslate">
<image class="me-business-icon" src="{{xxtx}}" />
<div class="me-business-title">我的活动</div>
- <block wx:if="{{notRead > 0}}">
+ <!-- <block wx:if="{{notRead > 0}}">
<div class="me-business-info">{{notRead}}</div>
- </block>
+ </block> -->
<image class="me-business-right-icon" src="{{user}}" />
</div>
@@ -43,9 +43,9 @@
<div class="me-business-nav" bindtap="rzcxList">
<image class="me-business-icon" src="{{xxtx}}" />
<div class="me-business-title">入职查询</div>
- <block wx:if="{{notRead > 0}}">
+ <!-- <block wx:if="{{notRead > 0}}">
<div class="me-business-info">{{notRead}}</div>
- </block>
+ </block> -->
<image class="me-business-right-icon" src="{{user}}" />
</div>
@@ -53,9 +53,9 @@
<div class="me-business-nav" bindtap="wdjb">
<image class="me-business-icon" src="{{xxtx}}" />
<div class="me-business-title">我的举报</div>
- <block wx:if="{{notRead > 0}}">
+ <!-- <block wx:if="{{notRead > 0}}">
<div class="me-business-info">{{notRead}}</div>
- </block>
+ </block> -->
<image class="me-business-right-icon" src="{{user}}" />
</div>
diff --git a/SunshineLnsMinApp/pages/rzcxList/rzcxList.wxml b/SunshineLnsMinApp/pages/rzcxList/rzcxList.wxml
index b3d0034..50f9182 100644
--- a/SunshineLnsMinApp/pages/rzcxList/rzcxList.wxml
+++ b/SunshineLnsMinApp/pages/rzcxList/rzcxList.wxml
@@ -8,7 +8,8 @@
</div>
<div class="businessSchedule-top-title">入职查询</div>
<div class="businessSchedule-top-status backgroundorange-title" wx:if="{{item.status==1}}">待回复</div>
- <div class="businessSchedule-top-status backgroundgreen-title" wx:elif="{{item.status==2}}">已回复</div>
+ <div class="businessSchedule-top-status backgroundgreen-title" wx:elif="{{item.status==2}}">检察院已审核</div>
+ <div class="businessSchedule-top-status backgroundgreen-title" wx:elif="{{item.status==3}}">公安已审核</div>
<div class="businessSchedule-top-status backgroundgray-title" wx:else>未知文件</div>
</div>
<div class="businessSchedule-center">{{item.reason}}</div>
diff --git a/SunshineLnsMinApp/pages/xsjb/xsjb.json b/SunshineLnsMinApp/pages/xsjb/xsjb.json
index 4ed6559..c3baedf 100644
--- a/SunshineLnsMinApp/pages/xsjb/xsjb.json
+++ b/SunshineLnsMinApp/pages/xsjb/xsjb.json
@@ -1,5 +1,5 @@
{
- "navigationBarTitleText": "未检举报平台(线上举报)",
+ "navigationBarTitleText": "举报平台详情",
"backgroundTextStyle": "light",
"navigationBarBackgroundColor": "#fff",
"navigationBarTextStyle": "black",
diff --git a/SunshineLnsMinApp/pages/xsjb/xsjb.wxml b/SunshineLnsMinApp/pages/xsjb/xsjb.wxml
index bebd7c5..3fa07ca 100644
--- a/SunshineLnsMinApp/pages/xsjb/xsjb.wxml
+++ b/SunshineLnsMinApp/pages/xsjb/xsjb.wxml
@@ -50,7 +50,7 @@
<div class="activity-uploadImage">
<view class="educt_hasupload_pic" wx:for="{{evalList.evalList1000}}" wx:key="index">
<image src="{{item.pic}}" class="upload" bindtap="previewImage" data-src="{{item.pic}}"></image>
- <image src="{{del}}" class="{{disabled? 'displayNone':'activity-uploadImag-del'}}" bindtap='clearImg' data-index="{{index}}" id="{{item.id}}" data-associatetypeid="{{1000}}"></image>
+ <!-- <image src="{{del}}" class="{{disabled? 'displayNone':'activity-uploadImag-del'}}" bindtap='clearImg' data-index="{{index}}" id="{{item.id}}" data-associatetypeid="{{1000}}"></image> -->
</view>
<view bindtap="joinPicture" data-index="{{0}}" data-associatetypeid="{{1000}}">
<image class="{{disabled? 'educt_upload_add activity-uploadImag-icon':'displayNone activity-uploadImag-icon'}}" src="{{add}}"></image>
diff --git a/SunshineLnsMinApp/pages/xsuojbInfo/xsuojbInfo.js b/SunshineLnsMinApp/pages/xsuojbInfo/xsuojbInfo.js
index 46ba921..86e77d7 100644
--- a/SunshineLnsMinApp/pages/xsuojbInfo/xsuojbInfo.js
+++ b/SunshineLnsMinApp/pages/xsuojbInfo/xsuojbInfo.js
@@ -182,8 +182,7 @@
joinPicture: function(e) {
console.log(e)
var that = this;
- console.log(that)
- app.joinPicture(e, that, e.currentTarget.dataset.associatetypeid, that.data.id);
+ app.joinPicture(e, that, e.currentTarget.dataset.associatetypeid, that.data.thisData.id);
},
// 删除图片
diff --git a/SunshineLnsMinApp/pages/zhdt/zhdt.wxml b/SunshineLnsMinApp/pages/zhdt/zhdt.wxml
index 6dbb7db..05ed8d4 100644
--- a/SunshineLnsMinApp/pages/zhdt/zhdt.wxml
+++ b/SunshineLnsMinApp/pages/zhdt/zhdt.wxml
@@ -1,6 +1,6 @@
<!--pages/zhdt/zhdt.wxml-->
<!-- 搜索 -->
- <view class="lawsList-search">
+ <!-- <view class="lawsList-search">
<view class="page">
<view class="page__bd">
<view class="weui-search-bar">
@@ -21,7 +21,7 @@
</view>
</view>
</view>
- </view>
+ </view> -->
<!-- <view class="index-gray "></view> -->
<view class="zhwj-b">
<view class="zhwj-b-main" wx:for="{{ dataSet }}" data-str="zhdtInfo" data-Id="{{item.id}}" bindtap='linkFunction'>
diff --git a/SunshineLnsMinApp/pages/zhgh/zhgh.json b/SunshineLnsMinApp/pages/zhgh/zhgh.json
index 88f9dd8..af066c0 100644
--- a/SunshineLnsMinApp/pages/zhgh/zhgh.json
+++ b/SunshineLnsMinApp/pages/zhgh/zhgh.json
@@ -1,5 +1,5 @@
{
- "navigationBarTitleText": "社会关护任务",
+ "navigationBarTitleText": "社会观护任务",
"backgroundTextStyle": "light",
"navigationBarBackgroundColor": "#fff",
"navigationBarTextStyle": "black"
diff --git a/SunshineLnsMinApp/pages/zhgh/zhgh.wxml b/SunshineLnsMinApp/pages/zhgh/zhgh.wxml
index b8725ae..d36d997 100644
--- a/SunshineLnsMinApp/pages/zhgh/zhgh.wxml
+++ b/SunshineLnsMinApp/pages/zhgh/zhgh.wxml
@@ -1,86 +1,101 @@
<!--pages/zhgh/zhgh.wxml-->
<view class='zhgh-bg'>
- <scroll-view scroll-x class="bg-white nav">
- <view class="flex text-center">
- <view class="cu-item flex-sub {{index==TabCur?'text-blue cur':''}}" wx:for="{{5}}" wx:key bindtap="tabSelect" data-id="{{index}}">
- {{list[index]}}
- </view>
- </view>
- </scroll-view>
+ <scroll-view scroll-x class="bg-white nav">
+ <view class="flex text-center">
+ <view class="cu-item flex-sub {{index==TabCur?'text-blue cur':''}}" wx:for="{{5}}" wx:key bindtap="tabSelect" data-id="{{index}}">
+ {{list[index]}}
+ </view>
+ </view>
+ </scroll-view>
- <view class="zhgh-list" wx:if='{{TabCur==0}}' wx:for="{{infoList}}" wx:key>
- <view class="zhgh-list1" data-str="zhghInfo" data-id="{{item.id}}" bindtap='linkFunction'>
- <view class="zhgh-list-b">
- <view class="zhgh-list-b-left">
- <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>
- </view>
+ <view class="zhgh-list" wx:if='{{TabCur==0}}' wx:for="{{infoList}}" wx:key>
+ <view class="zhgh-list1" data-str="zhghInfo" data-id="{{item.id}}" bindtap='linkFunction'>
+ <view class="zhgh-list-b">
+ <view class="zhgh-list-b-left">
+ <view class="zhgh-list-b-left-div font-lg">{{item.taskTitle}}</view>
+ <view class="zhgh-list-b-left-div">
+ <!-- <rich-text nodes="{{item.taskRequire}}"></rich-text> -->
+ 地址：{{item.taskAddress}}
+ </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>
- <view class="zhgh-list" wx:if='{{TabCur==1}}' wx:for="{{infoList}}" wx:key>
- <view class="zhgh-list1" data-str="zhghInfo" data-id="{{item.id}}" bindtap='linkFunction'>
- <view class="zhgh-list-b">
- <view class="zhgh-list-b-left">
- <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>
- </view>
+ <view class="zhgh-list" wx:if='{{TabCur==1}}' wx:for="{{infoList}}" wx:key>
+ <view class="zhgh-list1" data-str="zhghInfo" data-id="{{item.id}}" bindtap='linkFunction'>
+ <view class="zhgh-list-b">
+ <view class="zhgh-list-b-left">
+ <view class="zhgh-list-b-left-div font-lg">{{item.taskTitle}}</view>
+ <view class="zhgh-list-b-left-div">
+ <!-- <rich-text nodes="{{item.taskRequire}}"></rich-text> -->
+ 地址：{{item.taskAddress}}
+ </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>
- <view class="zhgh-list" wx:if='{{TabCur==2}}' wx:for="{{infoList}}" wx:key>
- <view class="zhgh-list1" data-str="zhghInfo" data-id="{{item.id}}" bindtap='linkFunction'>
- <view class="zhgh-list-b">
- <view class="zhgh-list-b-left">
- <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>
- </view>
+ <view class="zhgh-list" wx:if='{{TabCur==2}}' wx:for="{{infoList}}" wx:key>
+ <view class="zhgh-list1" data-str="zhghInfo" data-id="{{item.id}}" bindtap='linkFunction'>
+ <view class="zhgh-list-b">
+ <view class="zhgh-list-b-left">
+ <view class="zhgh-list-b-left-div font-lg">{{item.taskTitle}}</view>
+ <view class="zhgh-list-b-left-div">
+ <!-- <rich-text nodes="{{item.taskRequire}}"></rich-text> -->
+ 地址：{{item.taskAddress}}
+ </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>
- <view class="zhgh-list" wx:if='{{TabCur==3}}' wx:for="{{infoList}}" wx:key>
- <view class="zhgh-list1" data-str="zhghInfo" data-id="{{item.id}}" bindtap='linkFunction'>
- <view class="zhgh-list-b">
- <view class="zhgh-list-b-left">
- <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>
- </view>
+ <view class="zhgh-list" wx:if='{{TabCur==3}}' wx:for="{{infoList}}" wx:key>
+ <view class="zhgh-list1" data-str="zhghInfo" data-id="{{item.id}}" bindtap='linkFunction'>
+ <view class="zhgh-list-b">
+ <view class="zhgh-list-b-left">
+ <view class="zhgh-list-b-left-div font-lg">{{item.taskTitle}}</view>
+ <view class="zhgh-list-b-left-div">
+ <!-- <rich-text nodes="{{item.taskRequire}}"></rich-text> -->
+ 地址：{{item.taskAddress}}
+ </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>
- <view class="zhgh-list" wx:if='{{TabCur==4}}' wx:for="{{infoList}}" wx:key>
- <view class="zhgh-list1" data-str="zhghInfo" data-id="{{item.id}}" bindtap='linkFunction'>
- <view class="zhgh-list-b">
- <view class="zhgh-list-b-left">
- <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>
- </view>
+ <view class="zhgh-list" wx:if='{{TabCur==4}}' wx:for="{{infoList}}" wx:key>
+ <view class="zhgh-list1" data-str="zhghInfo" data-id="{{item.id}}" bindtap='linkFunction'>
+ <view class="zhgh-list-b">
+ <view class="zhgh-list-b-left">
+ <view class="zhgh-list-b-left-div font-lg">{{item.taskTitle}}</view>
+ <view class="zhgh-list-b-left-div">
+ <!-- <rich-text nodes="{{item.taskRequire}}"></rich-text> -->
+ 地址：{{item.taskAddress}}
+ </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>
</view>
\ No newline at end of file
diff --git a/SunshineLnsMinApp/pages/zhghInfo/zhghInfo.json b/SunshineLnsMinApp/pages/zhghInfo/zhghInfo.json
index 88f9dd8..af066c0 100644
--- a/SunshineLnsMinApp/pages/zhghInfo/zhghInfo.json
+++ b/SunshineLnsMinApp/pages/zhghInfo/zhghInfo.json
@@ -1,5 +1,5 @@
{
- "navigationBarTitleText": "社会关护任务",
+ "navigationBarTitleText": "社会观护任务",
"backgroundTextStyle": "light",
"navigationBarBackgroundColor": "#fff",
"navigationBarTextStyle": "black"
diff --git a/SunshineLnsMinApp/pages/zhghLogin/zhghLogin.js b/SunshineLnsMinApp/pages/zhghLogin/zhghLogin.js
index ad70df2..9eda973 100644
--- a/SunshineLnsMinApp/pages/zhghLogin/zhghLogin.js
+++ b/SunshineLnsMinApp/pages/zhghLogin/zhghLogin.js
@@ -8,8 +8,8 @@
data: {
src: app.globalData.imgUrl + '/image/bg1.jpg',
logo: app.globalData.imgUrl + '/image/logo.png',
- companyAccount: 'admin456',
- companyPassword: 'admin'
+ companyAccount: '',
+ companyPassword: ''
},
/**
* 生命周期函数--监听页面加载
diff --git a/SunshineLnsMinApp/pages/zhghLogin/zhghLogin.json b/SunshineLnsMinApp/pages/zhghLogin/zhghLogin.json
index 29f093d..585b6d0 100644
--- a/SunshineLnsMinApp/pages/zhghLogin/zhghLogin.json
+++ b/SunshineLnsMinApp/pages/zhghLogin/zhghLogin.json
@@ -1,3 +1,3 @@
{
- "navigationBarTitleText": "社会关护"
+ "navigationBarTitleText": "社会观护"
}
\ No newline at end of file
diff --git a/SunshineLnsMinApp/pages/zhgk/zhgk.js b/SunshineLnsMinApp/pages/zhgk/zhgk.js
index 886c494..e5da428 100644
--- a/SunshineLnsMinApp/pages/zhgk/zhgk.js
+++ b/SunshineLnsMinApp/pages/zhgk/zhgk.js
@@ -42,44 +42,72 @@
// var article = res.data.data;
// WxParse.wxParse('article', 'html', article, that, 5);
var attList = res.data.data.maps;
- var attList21 = app.where(attList, { type: 21 }) || [];
+ var attList21 = app.where(attList, {
+ type: 21
+ }) || [];
attList21.forEach(e => {
e.iconSrc = that.data.mp4Src
})
- var attList22 = app.where(attList, { type: 22 }) || [];
+ var attList22 = app.where(attList, {
+ type: 22
+ }) || [];
attList22.forEach(e => {
e.iconSrc = that.data.pictureSrc
})
- var attList23 = app.where(attList, { type: 23 }) || [];
+ var attList23 = app.where(attList, {
+ type: 23
+ }) || [];
attList23.forEach(e => {
e.iconSrc = that.data.wordSrc
})
- var attList24 = app.where(attList, { type: 24 }) || [];
+ var attList24 = app.where(attList, {
+ type: 24
+ }) || [];
attList24.forEach(e => {
e.iconSrc = that.data.excelSrc
})
- var attList25 = app.where(attList, { type: 25 }) || [];
+ var attList25 = app.where(attList, {
+ type: 25
+ }) || [];
attList25.forEach(e => {
e.iconSrc = that.data.pptSrc
})
- var attList26 = app.where(attList, { type: 26 }) || [];
+ var attList26 = app.where(attList, {
+ type: 26
+ }) || [];
attList26.forEach(e => {
e.iconSrc = that.data.pdfSrc
})
- var attList27 = app.where(attList, { type: 27 }) || [];
+ var attList27 = app.where(attList, {
+ type: 27
+ }) || [];
attList27.forEach(e => {
e.iconSrc = that.data.zipSrc
})
- var attList28 = app.where(attList, { type: 28 }) || [];
+ var attList28 = app.where(attList, {
+ type: 28
+ }) || [];
attList28.forEach(e => {
e.iconSrc = that.data.fileSrc
})
- var attList99 = app.where(attList, { type: 99 }) || [];
+ var attList99 = app.where(attList, {
+ type: 99
+ }) || [];
attList99.forEach(e => {
e.iconSrc = that.data.fileSrc
})
- var attList = { attList21, attList22, attList23, attList24, attList25, attList26, attList27, attList28, attList99 };
-
+ var attList = {
+ attList21,
+ attList22,
+ attList23,
+ attList24,
+ attList25,
+ attList26,
+ attList27,
+ attList28,
+ attList99
+ };
+
console.log(attList)
that.setData({
data: res.data.data,
@@ -95,17 +123,23 @@
})
},
+ //预览图片
+ previewImage: function(e) {
+ app.previewImage(e)
+ },
+
// 预览附件
- open: function (e) {
+ open: function(e) {
var path = e.currentTarget.dataset.path;
console.log(path)
wx.downloadFile({
url: path,
- success: function (res) {
+ success: function(res) {
+ console.log(res)
const filePath = res.tempFilePath
wx.openDocument({
filePath: filePath,
- success: function (res) {
+ success: function(res) {
console.log('打开文档成功')
}
})
diff --git a/SunshineLnsMinApp/pages/zhgk/zhgk.wxml b/SunshineLnsMinApp/pages/zhgk/zhgk.wxml
index 6532f11..f2246f1 100644
--- a/SunshineLnsMinApp/pages/zhgk/zhgk.wxml
+++ b/SunshineLnsMinApp/pages/zhgk/zhgk.wxml
@@ -17,35 +17,34 @@
<span>相关附件</span>
</div>
<div class="detail-img">
- <view class="attList" wx:for="{{attList.attList22}}" class="file" wx:key="{{key}}">
+ <view class="educt_hasupload_pic" wx:for="{{attList.attList22}}" wx:key="{{key}}">
+ <image src="{{item.path}}" class="upload" bindtap="previewImage" data-src="{{item.pic}}"></image>
+ </view>
+ <view class="educt_hasupload_pic" wx:for="{{attList.attList23}}" wx:key="{{key}}">
<image src="{{item.iconSrc}}" class="fileIcon" bindtap="open" data-path="{{item.path}}" class="detail-img-top"></image>
<div class="detail-img-bottom">{{item.name}}</div>
</view>
- <view class="attList" wx:for="{{attList.attList23}}" class="file" wx:key="{{key}}">
+ <view class="educt_hasupload_pic" wx:for="{{attList.attList24}}" wx:key="{{key}}">
<image src="{{item.iconSrc}}" class="fileIcon" bindtap="open" data-path="{{item.path}}" class="detail-img-top"></image>
<div class="detail-img-bottom">{{item.name}}</div>
</view>
- <view class="attList" wx:for="{{attList.attList24}}" class="file" wx:key="{{key}}">
+ <view class="educt_hasupload_pic" wx:for="{{attList.attList25}}" wx:key="{{key}}">
<image src="{{item.iconSrc}}" class="fileIcon" bindtap="open" data-path="{{item.path}}" class="detail-img-top"></image>
<div class="detail-img-bottom">{{item.name}}</div>
</view>
- <view class="attList" wx:for="{{attList.attList25}}" class="file" wx:key="{{key}}">
+ <view class="educt_hasupload_pic" wx:for="{{attList.attList26}}" wx:key="{{key}}">
<image src="{{item.iconSrc}}" class="fileIcon" bindtap="open" data-path="{{item.path}}" class="detail-img-top"></image>
<div class="detail-img-bottom">{{item.name}}</div>
</view>
- <view class="attList" wx:for="{{attList.attList26}}" class="file" wx:key="{{key}}">
+ <view class="educt_hasupload_pic" wx:for="{{attList.attList27}}" wx:key="{{key}}">
<image src="{{item.iconSrc}}" class="fileIcon" bindtap="open" data-path="{{item.path}}" class="detail-img-top"></image>
<div class="detail-img-bottom">{{item.name}}</div>
</view>
- <view class="attList" wx:for="{{attList.attList27}}" class="file" wx:key="{{key}}">
+ <view class="educt_hasupload_pic" wx:for="{{attList.attList28}}" wx:key="{{key}}">
<image src="{{item.iconSrc}}" class="fileIcon" bindtap="open" data-path="{{item.path}}" class="detail-img-top"></image>
<div class="detail-img-bottom">{{item.name}}</div>
</view>
- <view class="attList" wx:for="{{attList.attList28}}" class="file" wx:key="{{key}}">
- <image src="{{item.iconSrc}}" class="fileIcon" bindtap="open" data-path="{{item.path}}" class="detail-img-top"></image>
- <div class="detail-img-bottom">{{item.name}}</div>
- </view>
- <view class="attList" wx:for="{{attList.attList99}}" class="file" wx:key="{{key}}">
+ <view class="educt_hasupload_pic" wx:for="{{attList.attList99}}" wx:key="{{key}}">
<image src="{{item.iconSrc}}" class="fileIcon" bindtap="open" data-path="{{item.path}}" class="detail-img-top"></image>
<div class="detail-img-bottom">{{item.name}}</div>
</view>
diff --git a/SunshineLnsMinApp/pages/zhwj/zhwj.wxml b/SunshineLnsMinApp/pages/zhwj/zhwj.wxml
index 4d334ba..6ec824a 100644
--- a/SunshineLnsMinApp/pages/zhwj/zhwj.wxml
+++ b/SunshineLnsMinApp/pages/zhwj/zhwj.wxml
@@ -24,7 +24,7 @@
<view class="zhwj-list-flex-l" data-str="zhghLogin" bindtap='linkFunction'>
<view class="cu-avatar round margin-leftl 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-black text-bold text-lg">社会观护</view>
<view class="text-gray">社会支持与配合</view>
</view>
</view>
--
Gitblit v1.8.0