From 9c7c21e8eacda173feb418bdfe739f7f97358233 Mon Sep 17 00:00:00 2001
From: liuwh <hugeinfo123>
Date: Sun, 29 Mar 2020 17:28:46 +0800
Subject: [PATCH] bug修复
---
SunshineIns/src/page/policeSecurityEdit.jsx | 4
SunshineLnsMinApp/pages/zdyf/zdyf.js | 2
SunshineIns/src/page/NoInspectionReportList.jsx | 7
SunshineIns/src/page/SignIn.jsx | 13 +-
SunshineLnsMinApp/pages/rzcx/rzcx.wxml | 16 +--
SunshineLnsMinApp/pages/yshjqyfw/yshjqyfw.js | 3
SunshineIns/src/page/ActiveManageEdit.jsx | 39 ++++---
SunshineIns/src/data/menu.js | 2
SunshineLnsMinApp/pages/yshjqyfw/yshjqyfw.wxml | 10 +-
SunshineIns/src/page/NoInspectionReportDetail.jsx | 43 ++++----
SunshineIns/src/page/QuestionDetail.jsx | 2
SunshineLnsMinApp/pages/myTranslate/myTranslate.wxml | 2
SunshineLnsMinApp/pages/fzpxInfo/fzpxInfo.js | 1
SunshineLnsMinApp/app.js | 4
SunshineLnsMinApp/pages/xsuojbInfo/xsuojbInfo.wxml | 2
SunshineIns/src/page/ExamineEdit.jsx | 4
SunshineLnsMinApp/pages/xsuojbInfo/xsuojbInfo.js | 44 ++++----
SunshineLnsMinApp/pages/index/index.js | 4
SunshineIns/src/page/Login.jsx | 2
SunshineLnsMinApp/pages/index/index.wxml | 56 ++++++-----
SunshineLnsMinApp/pages/xsjb/xsjb.js | 4
21 files changed, 132 insertions(+), 132 deletions(-)
diff --git a/SunshineIns/src/data/menu.js b/SunshineIns/src/data/menu.js
index d7293f6..5225655 100644
--- a/SunshineIns/src/data/menu.js
+++ b/SunshineIns/src/data/menu.js
@@ -120,7 +120,7 @@
},
{
id: 'noInspectionReportList',
- name: '未检举报',
+ name: '举报管理',
icon: active,
iconCheck: activeCheck,
path: '/noInspectionReportList'
diff --git a/SunshineIns/src/page/ActiveManageEdit.jsx b/SunshineIns/src/page/ActiveManageEdit.jsx
index 54d86a0..b0a77c5 100644
--- a/SunshineIns/src/page/ActiveManageEdit.jsx
+++ b/SunshineIns/src/page/ActiveManageEdit.jsx
@@ -510,16 +510,18 @@
title: '报名方',
dataIndex: 'proposerName',
key: 'proposerName'
- }, {
- title: '报名方性质',
- dataIndex: 'signerType',
- key: 'signerType',
- render: text => (<span>{text == 1 ? '个人' : '企业'}</span>)
- }, {
- title: '报名人数',
- dataIndex: 'signNum',
- key: 'signNum',
- }, {
+ },
+ // {
+ // title: '报名方性质',
+ // dataIndex: 'signerType',
+ // key: 'signerType',
+ // render: text => (<span>{text == 1 ? '个人' : '企业'}</span>)
+ // }, {
+ // title: '报名人数',
+ // dataIndex: 'signNum',
+ // key: 'signNum',
+ // },
+ {
title: '审核状态',
dataIndex: 'signStatus',
key: 'signStatus',
@@ -539,10 +541,11 @@
cancelText="不通过"
>
<a href="#">审核</a>
- </Popconfirm> : <span disabled>审核</span>
+ </Popconfirm> : <span disabled></span>
)
}];
-
+ console.log('savedate.activityStatus', savedate.activityStatus)
+ console.log('savedate.activityType', savedate.activityType)
return (
<div className="app-page">
<Spin spinning={loading}>
@@ -701,21 +704,21 @@
}
{
- activityType == 'act_1' ? (dateSource.length > 0 ?
+ savedate.activityType == 'act_1' ? (dateSource.length > 0 ?
<div style={divStyle}>
<Divider orientation="left" style={{ margin: '20px', width: '97%' }}>报名人员信息</Divider>
<TableView columns={columns} data={dateSource} pageSize='6' size='small' />
</div> : null) : null
}
{
- activityType == 'act_2' || activityType == 'act_3' ? (dateSource.length > 0 ?
+ savedate.activityType == 'act_2' || savedate.activityType == 'act_3' ? (dateSource.length > 0 ?
<div style={divStyle}>
<Divider orientation="left" style={{ margin: '20px', width: '97%' }}>报名名单</Divider>
<TableView columns={act2columns} data={dateSource} pageSize='6' size='small' />
</div> : null) : null
}
{
- activityType == 'act_2' || activityType == 'act_3' ? (dateSource.length > 0 ?
+ savedate.activityType == 'act_2' || savedate.activityType == 'act_3' ? (dateSource.length > 0 ?
<div style={divStyle}>
<Divider orientation="left" style={{ margin: '20px', width: '97%' }}>培训结果</Divider>
<div style={divStyle}>
@@ -742,7 +745,7 @@
}
{
- activityType == 'act_1' && (
+ savedate.activityType == 'act_1' && (
savedate.activityStatus == null || savedate.activityStatus == 0 ?
<div style={{ display: 'flex', justifyContent: 'center' }}>
<Button style={{ marginRight: '15px', width: '150px' }} type="primary" onClick={this.submit}>提交</Button>
@@ -762,7 +765,7 @@
)
}
{
- activityType == 'act_2' || activityType == 'act_3' && (
+ savedate.activityType == 'act_2' || savedate.activityType == 'act_3' ? (
savedate.activityStatus == null || savedate.activityStatus == 0 ?
<div style={{ display: 'flex', justifyContent: 'center' }}>
<Button style={{ marginRight: '15px', width: '150px' }} type="primary" onClick={this.submit}>提交</Button>
@@ -779,7 +782,7 @@
<Button style={{ marginLeft: '15px', width: '150px' }} onClick={this.cancle}>返回</Button>
</div>
)
- )
+ ) : '123'
}
</BusDetailView>
diff --git a/SunshineIns/src/page/ExamineEdit.jsx b/SunshineIns/src/page/ExamineEdit.jsx
index ea11120..63d228e 100644
--- a/SunshineIns/src/page/ExamineEdit.jsx
+++ b/SunshineIns/src/page/ExamineEdit.jsx
@@ -69,7 +69,7 @@
...res,
},
loading: false,
- fileList: res.list ? res.list.map((item, index) => ({ uid: index, id: item.id, name: item.name, status: 'done', url: domain + `/api/v1/attachment/download/${item.id}?online=false` })) : []
+ fileList: res.list ? res.list.map((item, index) => ({ uid: uid, id: item.uid, name: item.name, status: 'done', url: domain + `/api/v1/attachment/download/${item.uid}?online=false` })) : []
});
})
@@ -249,7 +249,7 @@
showRemoveIcon: false
},
onDownload: (file) => {
- Fetch.attachmentDownload(file.id)
+ Fetch.attachmentDownload(file.uid)
.then(res => {
message.success("下载成功！");
});
diff --git a/SunshineIns/src/page/Login.jsx b/SunshineIns/src/page/Login.jsx
index a25323a..2a6752b 100644
--- a/SunshineIns/src/page/Login.jsx
+++ b/SunshineIns/src/page/Login.jsx
@@ -23,7 +23,7 @@
}
componentDidMount() {
- document.title = '南沙区人民检察院阳光检务后台管理登录';
+ document.title = '南沙区人民检察院便利化诉讼服务智能平台管理后台';
}
//登录
onClick = (userName, password) => {
diff --git a/SunshineIns/src/page/NoInspectionReportDetail.jsx b/SunshineIns/src/page/NoInspectionReportDetail.jsx
index 10fb38a..c94fb60 100644
--- a/SunshineIns/src/page/NoInspectionReportDetail.jsx
+++ b/SunshineIns/src/page/NoInspectionReportDetail.jsx
@@ -11,7 +11,7 @@
import LineView from "../view/LineView";
import HeadView from "../view/HeadView";
import Fetch from "../fetch";
-import {domain} from "../fetch/_fetch";
+import { domain } from "../fetch/_fetch";
const { TextArea } = Input;
const replyAdmin = {
display: 'block',
@@ -102,12 +102,13 @@
};
const { detail, data } = this.state;
const { flag } = this.props.match.params;
+ console.log(data)
return (
<div className="app-page">
<HeadView history={this.props.history} />
<Breadcrumb style={{ padding: '20px' }}>
- <Breadcrumb.Item><a href="">后台中心</a></Breadcrumb.Item>
- <Breadcrumb.Item>未检举报</Breadcrumb.Item>
+ <Breadcrumb.Item><a href="index.html#/noInspectionReportList">未检举报</a></Breadcrumb.Item>
+ <Breadcrumb.Item>未检举报详情</Breadcrumb.Item>
</Breadcrumb>
<BusDetailView>
<div>
@@ -158,10 +159,10 @@
(
data.type != 21 ?
< div style={{ marginRight: "10px" }} key={key}>
- <a href={domain + 'api/v1/attachment/image/'+data.id} target='_black'> <img src={domain + 'api/v1/attachment/image/'+data.id} width='70' height='70' /></a>
+ <a href={domain + 'api/v1/attachment/image/' + data.id} target='_black'> <img src={domain + 'api/v1/attachment/image/' + data.id} width='70' height='70' /></a>
</div>
: < div style={{ marginRight: "10px" }} key={key}>
- <a href={domain + 'api/v1/attachment/image/'+data.id} target='_black'><video src={domain + 'api/v1/attachment/image/'+data.id} width='70' height='70'></video></a>
+ <a href={domain + 'api/v1/attachment/image/' + data.id} target='_black'><video src={domain + 'api/v1/attachment/image/' + data.id} width='70' height='70'></video></a>
</div>
)
))
@@ -169,24 +170,22 @@
</div>
</LineView>
{
- data.ReplyLogs ?
+ detail.tipoffResult ?
<LineView title="回复记录" style="15vh">
- {data.ReplyLogs.map((contacts, key) => (
- <div style={{ width: '100%', height: '70px' }} key={key}>
- {contacts.userType === 1 ?
- <React.Fragment>
- <div style={timeUser} >{contacts.replyerName}:{moment(contacts.createTime).format('YYYY/MM/DD HH:mm:ss')}</div>
- <div style={replyUser}>{contacts.content}</div>
- </React.Fragment>
- :
- <React.Fragment>
- <div style={timeAdmin} > {contacts.replyerName}:{moment(contacts.createTime).format('YYYY/MM/DD HH:mm:ss')}</div>
- <div style={replyAdmin}>{contacts.content}</div>
- </React.Fragment>
- }
-
- </div>
- ))}
+ <table>
+ <tbody>
+ <tr>
+ <td className="table-vaule1">回复人</td>
+ <td className="table-vaule2">{detail.handlerName}</td>
+ <td className="table-vaule3">回复时间</td>
+ <td className="table-vaule4">{moment(detail.handleTime).format('YYYY/MM/DD HH:mm:ss')}</td>
+ </tr>
+ <tr>
+ <td className="table-vaule1">回复内容</td>
+ <td className="table-vaule2">{detail.tipoffResult}</td>
+ </tr>
+ </tbody>
+ </table>
</LineView>
: null}
{
diff --git a/SunshineIns/src/page/NoInspectionReportList.jsx b/SunshineIns/src/page/NoInspectionReportList.jsx
index 35344fd..29c6813 100644
--- a/SunshineIns/src/page/NoInspectionReportList.jsx
+++ b/SunshineIns/src/page/NoInspectionReportList.jsx
@@ -31,9 +31,10 @@
return (
<div className="app-page">
<HeadView history={this.props.history} />
- <LinkView sed="未检举报" local="未检举报" />
- <NoInspectionReportTableList history={this.props.history} />
-
+ {/* <LinkView sed="未检举报" local="未检举报" /> */}
+ <div style={{ background: '#fff', margin: 20 }}>
+ <NoInspectionReportTableList history={this.props.history} />
+ </div>
</div>
);
}
diff --git a/SunshineIns/src/page/QuestionDetail.jsx b/SunshineIns/src/page/QuestionDetail.jsx
index ffce5d7..709e7e8 100644
--- a/SunshineIns/src/page/QuestionDetail.jsx
+++ b/SunshineIns/src/page/QuestionDetail.jsx
@@ -106,7 +106,7 @@
问卷描述：{initData.content || '暂无'}
</h4>
<h4 style={{ marginBottom: 0 }}>
- 业务类型：{typeStatus( ) || '暂无'}
+ 业务类型：{typeStatus(initData.businessType) || '暂无'}
</h4>
</div>
</div>
diff --git a/SunshineIns/src/page/SignIn.jsx b/SunshineIns/src/page/SignIn.jsx
index b1c8084..e865382 100644
--- a/SunshineIns/src/page/SignIn.jsx
+++ b/SunshineIns/src/page/SignIn.jsx
@@ -30,15 +30,18 @@
}
componentDidMount() {
-
document.title = '签到上墙';
- this.getData();
+ setInterval(() => this.getData(), 5000)
+ }
+
+ componentWillMount() {
+ this.getData()
}
getData = () => {
// signinfo
const { id } = this.props.match.params;
- this.setState({ loading: true })
+ // this.setState({ loading: true })
Fetch.signinfo(id)
.then(res => {
console.log(res)
@@ -46,7 +49,7 @@
code: res.data.code,
personList: res.data.personList,
activityName: res.data.activityName,
- loading: false,
+ // loading: false,
});
})
}
@@ -90,7 +93,7 @@
</div>
{
item.signStatus == 3 ?
- <div style={{ padding: '0 12px',width:'168px' }}>
+ <div style={{ padding: '0 12px', width: '168px' }}>
<div>签到人：{item.proposerName}</div>
<div>签到时间：{moment(item.updateTime).format(format)}</div>
</div> : ''
diff --git a/SunshineIns/src/page/policeSecurityEdit.jsx b/SunshineIns/src/page/policeSecurityEdit.jsx
index 1939bc1..ea0f5ba 100644
--- a/SunshineIns/src/page/policeSecurityEdit.jsx
+++ b/SunshineIns/src/page/policeSecurityEdit.jsx
@@ -69,7 +69,7 @@
...res,
},
loading: false,
- fileList: res.list ? res.list.map((item, index) => ({ uid: index, id: item.id, name: item.name, status: 'done', url: domain + `/api/v1/attachment/download/${item.id}?online=false` })) : []
+ fileList: res.list ? res.list.map((item, index) => ({ uid: uid, id: item.uid, name: item.name, status: 'done', url: domain + `/api/v1/attachment/download/${item.uid}?online=false` })) : []
});
})
@@ -249,7 +249,7 @@
showRemoveIcon: false
},
onDownload: (file) => {
- Fetch.attachmentDownload(file.id)
+ Fetch.attachmentDownload(file.uid)
.then(res => {
message.success("下载成功！");
});
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 934abec..f38751d 100644
--- a/SunshineLnsMinApp/pages/fzpxInfo/fzpxInfo.js
+++ b/SunshineLnsMinApp/pages/fzpxInfo/fzpxInfo.js
@@ -67,7 +67,6 @@
signStatus: options.signStatus
})
} else {
- sign
if (options.flag == 'true') {
//可报名
console.log('可报名')
diff --git a/SunshineLnsMinApp/pages/index/index.js b/SunshineLnsMinApp/pages/index/index.js
index 384c1d3..bccb8eb 100644
--- a/SunshineLnsMinApp/pages/index/index.js
+++ b/SunshineLnsMinApp/pages/index/index.js
@@ -38,11 +38,7 @@
}, {
name: '检务公开'
}, {
- name: '法治培训'
- }, {
name: '知识产权'
- }, {
- name: '营商环境'
}],
},
//事件处理函数
diff --git a/SunshineLnsMinApp/pages/index/index.wxml b/SunshineLnsMinApp/pages/index/index.wxml
index 3d689b4..c95216b 100644
--- a/SunshineLnsMinApp/pages/index/index.wxml
+++ b/SunshineLnsMinApp/pages/index/index.wxml
@@ -149,7 +149,10 @@
自贸区法律服务
</view>
</view>
- <view class="bg-img" style="margin: 6px;height: 78px;flex: 1; line-height: 78px;">
+ <view class="bg-img" data-str="yshjqyfw" data-id="9" bindtap='clinkFunction' style="background-image: url('https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1577104674828&di=1ad5819ce06281fb5090a4038980917e&imgtype=0&src=http%3A%2F%2Fimage.sike.news.cn%2Fuploads%2F2019%2F05%2F2019-05-2451.jpg');margin: 6px;height: 78px;flex: 1; line-height: 78px;">
+ <view class="bg-shadeTop">
+ 营商环境
+ </view>
</view>
</view>
</view>
@@ -209,6 +212,21 @@
<!-- 南检活动 -->
<view class='VerticalNav-flex' wx:if="{{moduleDiv==5}}">
<view class='VerticalNav-flex-t'>
+ <view class="bg-img" data-str="fzpx" bindtap='linkFunction' style="background-image: url('https://ss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=1291150546,1510144282&fm=26&gp=0.jpg');margin: 6px;height: 78px;flex: 1; line-height: 78px;">
+ <view class="bg-shadeTop">
+ 法治培训
+ </view>
+ </view>
+ <view class="bg-img" style="margin: 6px;height: 78px;flex: 1; line-height: 78px;">
+ <view class="bg-img" data-str="fzxkt" bindtap='linkFunction' style="background-image: url('https://ss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=1291150546,1510144282&fm=26&gp=0.jpg');">
+ <view class="bg-shadeTop">
+ 法治小课堂
+ </view>
+ </view>
+ </view>
+ <!-- <view class='VerticalNav-flex-div'></view> -->
+ </view>
+ <view class='VerticalNav-flex-t'>
<view class="bg-img" bindtap='activity' style="background-image: url('https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1576727840095&di=c57a0f0d43a2b175981b679f8e328428&imgtype=0&src=http%3A%2F%2Fwx2.sinaimg.cn%2Fcrop.0.0.738.415.1000%2F006ba4mely1fmndnl221jj30m50bjq5i.jpg');margin: 6px;height: 78px;flex: 1; line-height: 78px;">
<view class="bg-shadeTop">
活动一览
@@ -262,31 +280,17 @@
</view>
<!-- 法治培训服务 -->
- <view class='VerticalNav-flex' wx:if="{{moduleDiv==7}}">
- <view class='VerticalNav-flex-t'>
- <view class="bg-img" data-str="fzpx" bindtap='linkFunction' style="background-image: url('https://ss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=1291150546,1510144282&fm=26&gp=0.jpg');margin: 6px;height: 78px;flex: 1; line-height: 78px;">
- <view class="bg-shadeTop">
- 法治培训
- </view>
- </view>
- <view class="bg-img" style="margin: 6px;height: 78px;flex: 1; line-height: 78px;">
- <view class="bg-img" data-str="fzxkt" bindtap='linkFunction' style="background-image: url('https://ss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=1291150546,1510144282&fm=26&gp=0.jpg');">
- <view class="bg-shadeTop">
- 法治小课堂
- </view>
- </view>
- </view>
- <!-- <view class='VerticalNav-flex-div'></view> -->
- </view>
+ <!-- <view class='VerticalNav-flex' wx:if="{{moduleDiv==7}}"> -->
- <!-- <view class='VerticalNav-flex-t'>
+
+ <!-- <view class='VerticalNav-flex-t'>
<view class='VerticalNav-flex-div'>信访预约</view>
<view class='VerticalNav-flex-div'>监督联络站</view>
</view> -->
- </view>
+ <!-- </view> -->
<!-- 知识产权 -->
- <view class='VerticalNav-flex' wx:if="{{moduleDiv==8}}">
+ <view class='VerticalNav-flex' wx:if="{{moduleDiv==7}}">
<view class='VerticalNav-flex-t'>
<view class="bg-img" data-str="lawInfo" data-id="9" bindtap='clinkFunction' style="background-image: url('https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1577104674828&di=1ad5819ce06281fb5090a4038980917e&imgtype=0&src=http%3A%2F%2Fimage.sike.news.cn%2Fuploads%2F2019%2F05%2F2019-05-2451.jpg');margin: 6px;height: 78px;flex: 1; line-height: 78px;">
<view class="bg-shadeTop">
@@ -308,7 +312,7 @@
典型案例
</view>
</view>
-
+
<view class="bg-img" style="margin: 6px;height: 78px;flex: 1; line-height: 78px;">
<view class="bg-img" data-str="xsuojb" bindtap='linkFunction' style="background-image: url('https://ss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=1291150546,1510144282&fm=26&gp=0.jpg');">
<view class="bg-shadeTop">
@@ -322,7 +326,7 @@
</view>
<!-- 营商环境 -->
- <view class='VerticalNav-flex' wx:if="{{moduleDiv==9}}">
+ <!-- <view class='VerticalNav-flex' wx:if="{{moduleDiv==8}}">
<view class='VerticalNav-flex-t'>
<view class="bg-img" data-str="yshjqyfw" data-id="9" bindtap='clinkFunction' style="background-image: url('https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1577104674828&di=1ad5819ce06281fb5090a4038980917e&imgtype=0&src=http%3A%2F%2Fimage.sike.news.cn%2Fuploads%2F2019%2F05%2F2019-05-2451.jpg');margin: 6px;height: 78px;flex: 1; line-height: 78px;">
<view class="bg-shadeTop">
@@ -330,15 +334,15 @@
</view>
</view>
<view class="bg-img" style="margin: 6px;height: 78px;flex: 1; line-height: 78px;">
- </view>
- <!-- <view class="bg-img" data-str="createSub" data-id="9" bindtap='clinkFunction' style="background-image: url('https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1577104674828&di=1ad5819ce06281fb5090a4038980917e&imgtype=0&src=http%3A%2F%2Fimage.sike.news.cn%2Fuploads%2F2019%2F05%2F2019-05-2451.jpg');margin: 6px;height: 78px;flex: 1; line-height: 78px;">
+ </view> -->
+ <!-- <view class="bg-img" data-str="createSub" data-id="9" bindtap='clinkFunction' style="background-image: url('https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1577104674828&di=1ad5819ce06281fb5090a4038980917e&imgtype=0&src=http%3A%2F%2Fimage.sike.news.cn%2Fuploads%2F2019%2F05%2F2019-05-2451.jpg');margin: 6px;height: 78px;flex: 1; line-height: 78px;">
<view class="bg-shadeTop">
问卷调查
</view>
</view> -->
- </view>
+ <!-- </view>
- </view>
+ </view> -->
</view>
</div>
diff --git a/SunshineLnsMinApp/pages/myTranslate/myTranslate.wxml b/SunshineLnsMinApp/pages/myTranslate/myTranslate.wxml
index 14d61d3..8c3c1c8 100644
--- a/SunshineLnsMinApp/pages/myTranslate/myTranslate.wxml
+++ b/SunshineLnsMinApp/pages/myTranslate/myTranslate.wxml
@@ -11,7 +11,7 @@
<!-- <div class="businessSchedule-top-img">
<image src="{{item.iconSrc}}" class="businessSchedule-top-img"></image>
</div> -->
- <div class="businessSchedule-top-title">{{item.activityTitle}}</div>
+ <div class="businessSchedule-top-title">{{item.activityType}}</div>
<div class="businessSchedule-top-status backgroundorange-title" wx:if="{{item.signStatus==1}}">未审核</div>
<div class="businessSchedule-top-status backgroundorange-title" wx:if="{{item.signStatus==2}}">未签到</div>
<div class="businessSchedule-top-status backgroundorange-title" wx:if="{{item.signStatus==3}}">已签到</div>
diff --git a/SunshineLnsMinApp/pages/rzcx/rzcx.wxml b/SunshineLnsMinApp/pages/rzcx/rzcx.wxml
index e44038c..c4a434b 100644
--- a/SunshineLnsMinApp/pages/rzcx/rzcx.wxml
+++ b/SunshineLnsMinApp/pages/rzcx/rzcx.wxml
@@ -1,6 +1,11 @@
<!--pages/rzcx/rzcx.wxml-->
<div class="boxshadow">
+ <div class="publicSnapshot-main">
+ <span class="red-title"></span>
+ <span>申请人姓名</span>
+ <input data-name="createrName" bindinput="inputChange" disabled="{{disabled}}" value='{{picturesInfo.createrName}}'></input>
+ </div>
<div class="publicSnapshot-message">
<span></span>
<span>照片上传</span>
@@ -27,17 +32,6 @@
</div>
</div>
<div class="index-gray"></div>
-
-<div class="boxshadow">
- <div class="publicSnapshot-message">
- <span></span>
- <span>申请理由</span>
- </div>
- <div class="border-bottom"></div>
- <div class="publicSnapshot-main" style='display:block'>
- <textarea data-name="reason" bindinput="inputChange" disabled="{{disabled}}" value='{{picturesInfo.reason}}' placeholder="请输入备注内容" />
- </div>
-</div>
<div wx:if="{{approveLogs.length == 1}}">
<div class="index-gray"></div>
diff --git a/SunshineLnsMinApp/pages/xsjb/xsjb.js b/SunshineLnsMinApp/pages/xsjb/xsjb.js
index 03df3e6..91b5728 100644
--- a/SunshineLnsMinApp/pages/xsjb/xsjb.js
+++ b/SunshineLnsMinApp/pages/xsjb/xsjb.js
@@ -152,8 +152,8 @@
icon: 'success',
duration: 2000
})
- wx.navigateTo({
- url: '../zhwj/zhwj',
+ wx.navigateBack({
+ delta: 2
})
}
}
diff --git a/SunshineLnsMinApp/pages/xsuojbInfo/xsuojbInfo.js b/SunshineLnsMinApp/pages/xsuojbInfo/xsuojbInfo.js
index 4ce6725..46ba921 100644
--- a/SunshineLnsMinApp/pages/xsuojbInfo/xsuojbInfo.js
+++ b/SunshineLnsMinApp/pages/xsuojbInfo/xsuojbInfo.js
@@ -37,7 +37,7 @@
/**
* 生命周期函数--监听页面加载
*/
- onLoad: function (options) {
+ onLoad: function(options) {
const id = options.id || 'new';
let that = this;
var userinfo = wx.getStorageSync("user");
@@ -48,7 +48,7 @@
data: {
id,
},
- success: function (res) {
+ success: function(res) {
console.log('res', res);
var dataSet = res.data;
var evalList1000 = dataSet.attachments || [];
@@ -111,32 +111,32 @@
onSubmit() {
console.log(this.data.thisData)
- if(!this.data.thisData.tipoffObject){
+ if (!this.data.thisData.tipoffObject) {
return app.showModal("请填写举报对象！");
}
- if(!this.data.thisData.tipoffAction){
+ if (!this.data.thisData.tipoffAction) {
return app.showModal("请选择举报行为！");
}
- if(!this.data.thisData.tipoffAddress){
+ if (!this.data.thisData.tipoffAddress) {
return app.showModal("请填写发生地！");
}
- if(!this.data.thisData.tipoffContent){
+ if (!this.data.thisData.tipoffContent) {
return app.showModal("请填写具体事项！");
}
- if(!this.data.evalList){
+ if (!this.data.evalList) {
return app.showModal("请上传证明材料！");
}
- if(!this.data.thisData.tipoffType){
+ if (!this.data.thisData.tipoffType) {
return app.showModal("请选择方式！");
}
- if(this.data.thisData.tipoffType=='2'){
- if(!this.data.thisData.createrName){
+ if (this.data.thisData.tipoffType == '2') {
+ if (!this.data.thisData.createrName) {
return app.showModal("请填写姓名！");
}
- if(!this.data.thisData.createrMobile){
+ if (!this.data.thisData.createrMobile) {
return app.showModal("请填写手机号码！");
}
- if(!this.data.thisData.createrAddress){
+ if (!this.data.thisData.createrAddress) {
return app.showModal("请填写联系方式！");
}
}
@@ -147,15 +147,15 @@
header: {
"Content-Type": "application/json"
},
- success: function (res) {
+ success: function(res) {
if (res.data.code == 0) {
wx.showToast({
title: '提交成功！',
icon: 'success',
duration: 2000
})
- wx.navigateTo({
- url: '../zhwj/zhwj',
+ wx.navigateBack({
+ delta: 2
})
}
}
@@ -163,10 +163,10 @@
},
// 选择地理位置
- chooseLocation: function (e) {
+ chooseLocation: function(e) {
const that = this;
wx.chooseLocation({
- success: function (res) {
+ success: function(res) {
console.log('res', res);
that.setData({
thisData: {
@@ -179,7 +179,7 @@
},
//添加图片
- joinPicture: function (e) {
+ joinPicture: function(e) {
console.log(e)
var that = this;
console.log(that)
@@ -187,13 +187,13 @@
},
// 删除图片
- clearImg: function (e) {
+ clearImg: function(e) {
var that = this;
app.clearImg(e, that);
},
//预览图片
- previewImage: function (e) {
+ previewImage: function(e) {
app.previewImage(e);
},
@@ -206,13 +206,13 @@
this.setData({
[key]: e.detail.value,
[`display${key}`]: e.detail.label,
- showInfo:true,
+ showInfo: true,
thisData: {
...this.data.thisData,
[key]: e.detail.value,
}
});
- }else{
+ } else {
this.setData({
[key]: e.detail.value,
[`display${key}`]: e.detail.label,
diff --git a/SunshineLnsMinApp/pages/xsuojbInfo/xsuojbInfo.wxml b/SunshineLnsMinApp/pages/xsuojbInfo/xsuojbInfo.wxml
index f0cf6ce..12a76f7 100644
--- a/SunshineLnsMinApp/pages/xsuojbInfo/xsuojbInfo.wxml
+++ b/SunshineLnsMinApp/pages/xsuojbInfo/xsuojbInfo.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}}" bindtap='clearImg' data-index="{{index}}" id="{{item.id}}" data-associatetypeid="{{1000}}"></image>
+ <image src="{{del}}" class="{{imgdisabled? '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/yshjqyfw/yshjqyfw.js b/SunshineLnsMinApp/pages/yshjqyfw/yshjqyfw.js
index 4461c26..2c26c2f 100644
--- a/SunshineLnsMinApp/pages/yshjqyfw/yshjqyfw.js
+++ b/SunshineLnsMinApp/pages/yshjqyfw/yshjqyfw.js
@@ -7,6 +7,7 @@
*/
data: {
wjgk: './../../images/wjgk.jpg',
+ qiyefuwu: app.globalData.imgUrl + '/images/qiyefuwu.png',
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',
@@ -71,7 +72,7 @@
var that = this;
wx.showLoading();
wx.request({
- url: app.globalData.url + '/api/question/examination',
+ url: app.globalData.url + '/api/question/publicMsgQuery',
data: {
page: 1,
size: 1000,
diff --git a/SunshineLnsMinApp/pages/yshjqyfw/yshjqyfw.wxml b/SunshineLnsMinApp/pages/yshjqyfw/yshjqyfw.wxml
index a51b31c..b0e1e42 100644
--- a/SunshineLnsMinApp/pages/yshjqyfw/yshjqyfw.wxml
+++ b/SunshineLnsMinApp/pages/yshjqyfw/yshjqyfw.wxml
@@ -1,18 +1,18 @@
<!--pages/zhwj/zhwj.wxml-->
-<view class="bg-img padding-tb-xl" style="background-image: url('https://xnwj.gznsjc.gov.cn/nsjc-charge/image/juxing.png');height: 414rpx;">
+<view class="bg-img padding-tb-xl" style="background-image: url('https://nsjcy.hugeinfo.com.cn/nsjc-charge/image/qiyefuwu.png');height: 414rpx;">
</view>
<view class="zhwj-list">
<view class="zhwj-list-flex">
<view class="zhwj-list-flex-l" data-str="zscqdxal" 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="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>
</view>
<view class="zhwj-list-flex-r" data-str="zdyf" 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="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>
@@ -20,13 +20,13 @@
</view>
<view class="zhwj-list-flex">
<view class="zhwj-list-flex-l" data-str="flcx" 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="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>
</view>
<view class="zhwj-list-flex-r" data-str="createSubList" 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="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>
diff --git a/SunshineLnsMinApp/pages/zdyf/zdyf.js b/SunshineLnsMinApp/pages/zdyf/zdyf.js
index 70d3eb3..f6c0c4f 100644
--- a/SunshineLnsMinApp/pages/zdyf/zdyf.js
+++ b/SunshineLnsMinApp/pages/zdyf/zdyf.js
@@ -21,7 +21,7 @@
var that = this;
wx.showLoading();
wx.request({
- url: app.globalData.url + '/api/article/publicMsgQuery',
+ url: app.globalData.url + '/api/question/publicMsgQuery',
data: {
page: 1,
size: 1000,
--
Gitblit v1.8.0