From d7004986135c0885c1b9a92fb48919179732c00d Mon Sep 17 00:00:00 2001
From: xuxj <hugeinfo123>
Date: Sat, 09 May 2020 09:20:13 +0800
Subject: [PATCH] BUG修改
---
SunshineLnsMinApp/pages/publicSnapshot/publicSnapshot.wxml | 2
SunshineIns/src/fetch/index.js | 4 +
SunshineIns/src/page/BusDetail.jsx | 2
SunshineIns/src/page/UnderAgeList.jsx | 17 +++++
SunshineIns/src/fetch/_fetch.js | 2
SunshineIns/src/page/ApplyFor.jsx | 7 +-
SunshineLnsMinApp/pages/agentInfo/agentInfo.wxss | 2
SunshineIns/src/page/Sweeping.jsx | 2
SunshineIns/src/fetch/questionQuery.js | 4
SunshineIns/src/conf/reset.scss | 4
SunshineIns/src/page/ActiveManageEdit.jsx | 17 +++--
SunshineIns/src/page/Snapshot.jsx | 2
SunshineLnsMinApp/pages/dissDetail/dissDetail.js | 4 -
SunshineLnsMinApp/pages/publicSnapshot/publicSnapshot.js | 4 +
SunshineLnsMinApp/app.js | 6 +-
SunshineLnsMinApp/pages/video/video.wxml | 4
SunshineIns/src/fetch/entryDelete.js | 6 ++
SunshineLnsMinApp/pages/guideInfo/guideInfo.js | 10 +-
SunshineLnsMinApp/pages/scanEvildoing/scanEvildoing.js | 16 +++--
SunshineIns/src/page/BusList.jsx | 3
SunshineIns/src/page/CareList.jsx | 9 +-
SunshineLnsMinApp/pages/progressQuery/progressQuery.js | 32 ++++++++--
22 files changed, 107 insertions(+), 52 deletions(-)
diff --git a/SunshineIns/src/conf/reset.scss b/SunshineIns/src/conf/reset.scss
index f63a5a2..69b1750 100644
--- a/SunshineIns/src/conf/reset.scss
+++ b/SunshineIns/src/conf/reset.scss
@@ -44,14 +44,14 @@
height: 100vh;
}
.table-vaule1{
- width: 10%;
+ width: 25%;
}
.table-vaule2 {
width: 50%;
color: #000;
}
.table-vaule3{
- width: 10%;
+ width: 25%;
}
.table-vaule4 {
color: #000;
diff --git a/SunshineIns/src/fetch/_fetch.js b/SunshineIns/src/fetch/_fetch.js
index 80e2db8..6ff33d5 100644
--- a/SunshineIns/src/fetch/_fetch.js
+++ b/SunshineIns/src/fetch/_fetch.js
@@ -2,7 +2,7 @@
// export const base = 'http://xnwj.gznsjc.gov.cn';
// export const base = 'http://1p885086k1.iok.la';
-
+//export const base = 'http://120.79.193.119:9021/';
export const base = 'http://localhost:6060';
export const domain = base + '/nsjc-charge/';
diff --git a/SunshineIns/src/fetch/entryDelete.js b/SunshineIns/src/fetch/entryDelete.js
new file mode 100644
index 0000000..1e23653
--- /dev/null
+++ b/SunshineIns/src/fetch/entryDelete.js
@@ -0,0 +1,6 @@
+import fetch from './_fetch';
+import { message } from 'antd';
+export default (id) => fetch(`api/entry/delete?id=${id}`)
+ .catch(
+ error => message.error('详情加载失败，请联系管理员', 2)
+ );
diff --git a/SunshineIns/src/fetch/index.js b/SunshineIns/src/fetch/index.js
index c7d04dc..d0047e6 100644
--- a/SunshineIns/src/fetch/index.js
+++ b/SunshineIns/src/fetch/index.js
@@ -101,6 +101,7 @@
import searchLawDelete from './searchLawDelete';
import questionFindPersonById from './questionFindPersonById';
import getAnswer from './getAnswer';
+import entryDelete from './entryDelete';
export default {
domain,
@@ -205,5 +206,6 @@
searchLawSave,
searchLawDelete,
questionFindPersonById,
- getAnswer
+ getAnswer,
+ entryDelete
};
\ No newline at end of file
diff --git a/SunshineIns/src/fetch/questionQuery.js b/SunshineIns/src/fetch/questionQuery.js
index 25523a0..acad532 100644
--- a/SunshineIns/src/fetch/questionQuery.js
+++ b/SunshineIns/src/fetch/questionQuery.js
@@ -1,6 +1,6 @@
import fetch from './_fetch';
import { message } from 'antd';
-export default ({ page, size, status }) =>
- fetch(`api/question/query?size=${size}&page=${page}&status=${status||''}`)
+export default ({ page, size, status ,title}) =>
+ fetch(`api/question/query?size=${size}&page=${page}&status=${status||''}&title=${title || ''}`)
.then(json => json)
.catch(error => message.error('详情加载失败，请联系管理员', 2));
diff --git a/SunshineIns/src/page/ActiveManageEdit.jsx b/SunshineIns/src/page/ActiveManageEdit.jsx
index 2c3caca..f4bd483 100644
--- a/SunshineIns/src/page/ActiveManageEdit.jsx
+++ b/SunshineIns/src/page/ActiveManageEdit.jsx
@@ -124,13 +124,14 @@
}))
}
- selectonClick = () => {
+ selectonClick = (value) => {
this.setState({
questionnaireModal: true,
modalLoading: true
})
Fetch.questionQuery({
status: 3,
+ title : value,
page: this.state.page,
size: this.state.pageSize,
})
@@ -150,6 +151,10 @@
}
});
+ }
+
+ selClick = () =>{
+ this.selectonClick("");
}
selectCancelModel = () => {
@@ -472,7 +477,7 @@
)
}];
const questionnaireColumns = [{
- title: '主题',
+ title: '问卷标题',
dataIndex: 'title',
key: 'title',
ellipsis: true,
@@ -668,7 +673,7 @@
<Button type="link" onClick={this.questionnaireCancle}>查看</Button>
<Button type="link" onClick={this.questionnaireDel}>删除</Button>
</div> :
- <Button style={{ marginLeft: '15px', width: '150px' }} onClick={this.selectonClick}>请选择</Button>
+ <Button style={{ marginLeft: '15px', width: '150px' }} onClick={this.selClick}>请选择</Button>
}
</Col>
</Row>
@@ -684,7 +689,7 @@
<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>
+ <Button style={{ marginLeft: '15px', width: '150px' }} onClick={this.selClick}>请选择</Button>
}
</Col>
</Row>
@@ -770,7 +775,7 @@
<Button style={{ marginLeft: '15px', width: '150px' }} onClick={this.cancle}>返回</Button>
</div>
)
- ) : '123'
+ ) : ''
}
</BusDetailView>
@@ -826,7 +831,7 @@
enterButton="查询"
size="large"
style={{ margin: '12px' }}
- onSearch={value => this.questionnaireSearch(value)}
+ onSearch={value => this.selectonClick(value)}
/>
<Table
diff --git a/SunshineIns/src/page/ApplyFor.jsx b/SunshineIns/src/page/ApplyFor.jsx
index 7047bb8..cb266ae 100644
--- a/SunshineIns/src/page/ApplyFor.jsx
+++ b/SunshineIns/src/page/ApplyFor.jsx
@@ -123,10 +123,9 @@
}
confirm = (e) => {
- console.log(e);
this.setState({ loading: true })
- Fetch.socialDelete(e).then(res => {
- if (res.code == 0) {
+ Fetch.entryDelete(e).then(res => {
+ if (res.statuscode == 1) {
console.log(res)
this.setState({ loading: false })
message.success('删除成功');
@@ -173,7 +172,7 @@
<React.Fragment>
<Divider type="vertical" />
<Popconfirm
- title="确认删除任务吗?"
+ title="确认删除申请吗?"
id={record.id}
onConfirm={e => this.confirm(record.id)}
okText="确定"
diff --git a/SunshineIns/src/page/BusDetail.jsx b/SunshineIns/src/page/BusDetail.jsx
index ba21751..6aaad82 100644
--- a/SunshineIns/src/page/BusDetail.jsx
+++ b/SunshineIns/src/page/BusDetail.jsx
@@ -662,7 +662,7 @@
</td>
</tr>
<tr>
- <td>审批结论</td>
+ <td>审批意见</td>
<td>
<TextArea
placeholder="请输入审批意见及理由"
diff --git a/SunshineIns/src/page/BusList.jsx b/SunshineIns/src/page/BusList.jsx
index f17fc8b..3872f6c 100644
--- a/SunshineIns/src/page/BusList.jsx
+++ b/SunshineIns/src/page/BusList.jsx
@@ -120,6 +120,7 @@
loading: false
})
})
+
}
onDetail = (_text, _record) => {
@@ -133,7 +134,7 @@
onDel = (_text, _record) => {
Fetch.businessDel({ businessId: _text.businessId }).then(res => {
if (res.code == 0) {
- message.warning('正在更新列表');
+ message.success('删除成功');
this.onTableChange();
}
}, err => {
diff --git a/SunshineIns/src/page/CareList.jsx b/SunshineIns/src/page/CareList.jsx
index 1585a4c..2a9e0a6 100644
--- a/SunshineIns/src/page/CareList.jsx
+++ b/SunshineIns/src/page/CareList.jsx
@@ -32,6 +32,7 @@
1,
2,
3,
+ 4
]
const activityStatusIds = {
0: '未开始',
@@ -41,9 +42,9 @@
}
const activityStatusList = [
+ 0,
1,
- 2,
- 3,
+ 2
]
export default class CareList extends React.Component {
constructor(props) {
@@ -224,10 +225,10 @@
<div style={{ marginLeft: '90%', marginBottom: '20px', marginTop: '20px' }}>
<Button type="primary" size='large' onClick={() => this.showModal('new')}>新建任务</Button>
</div>
- {/* <Breadcrumb style={{ padding: '20px' }}>
+ <Breadcrumb style={{ padding: '20px' }}>
<Breadcrumb.Item><a href="">后台中心</a></Breadcrumb.Item>
<Breadcrumb.Item>社会关护</Breadcrumb.Item>
- </Breadcrumb> */}
+ </Breadcrumb>
<div style={{ background: '#fff', margin: 20 }}>
<CommonSearchForm
{...this.props}
diff --git a/SunshineIns/src/page/Snapshot.jsx b/SunshineIns/src/page/Snapshot.jsx
index 8fd1481..ab08a34 100644
--- a/SunshineIns/src/page/Snapshot.jsx
+++ b/SunshineIns/src/page/Snapshot.jsx
@@ -174,7 +174,7 @@
</Breadcrumb>
<TableBtnView name={''} key={resetKey}>
<Input placeholder="根据姓名模糊查询" style={{ width: "200px" }} name='userName' onChange={this.onInputChange} />
- <Input placeholder="根据电话号码模糊查询" style={{ width: "200px" }} name='mobile' onChange={this.onInputChange} />
+ <Input placeholder="根据联系方式模糊查询" style={{ width: "200px" }} name='mobile' onChange={this.onInputChange} />
<Input placeholder="根据拍摄地址模糊查询" style={{ width: "200px" }} name='address' onChange={this.onInputChange} />
<Select
style={{ width: 200 }}
diff --git a/SunshineIns/src/page/Sweeping.jsx b/SunshineIns/src/page/Sweeping.jsx
index 9142bc3..f1faea6 100644
--- a/SunshineIns/src/page/Sweeping.jsx
+++ b/SunshineIns/src/page/Sweeping.jsx
@@ -168,7 +168,7 @@
<Option value="2">涉黑涉恶违法犯罪保护伞</Option>
<Option value="3">其他</Option>
</Select>
- <Input placeholder="根据内容模糊查询" style={{ width: "200px" }} name='content' onChange={this.onInputChange} />
+ <Input placeholder="根据举报说明模糊查询" style={{ width: "200px" }} name='content' onChange={this.onInputChange} />
<Select
style={{ width: 200 }}
placeholder="根据状态查询"
diff --git a/SunshineIns/src/page/UnderAgeList.jsx b/SunshineIns/src/page/UnderAgeList.jsx
index 1dd453e..2861502 100644
--- a/SunshineIns/src/page/UnderAgeList.jsx
+++ b/SunshineIns/src/page/UnderAgeList.jsx
@@ -118,6 +118,12 @@
handleOk = () => {
this.setState({ loading: true });
const { savedate } = this.state;
+ if (!savedate.companyName) {
+ this.setState({
+ loading: false
+ });
+ return message.warning("公司名称不能为空");
+ }
if (savedate.companyTel) {
if (!validator.mobile(savedate.companyTel)) {
this.setState({
@@ -125,11 +131,22 @@
});
return message.warning("电话号码格式不正确");
}
+ }else{
+ this.setState({
+ loading: false
+ });
+ return message.warning("电话号码为空");
}
if (!savedate.companyAccount) {
+ this.setState({
+ loading: false
+ });
return message.warning("账号不能为空");
}
if (!savedate.companyPassword) {
+ this.setState({
+ loading: false
+ });
return message.warning("密码不能为控");
}
Fetch.socialCompanySave(savedate)
diff --git a/SunshineLnsMinApp/app.js b/SunshineLnsMinApp/app.js
index 98dab51..dd4d87f 100644
--- a/SunshineLnsMinApp/app.js
+++ b/SunshineLnsMinApp/app.js
@@ -10,11 +10,11 @@
globalData: {
userInfo: null,
pageData: {},
- // url: 'https://nsjcy.hugeinfo.com.cn/nsjc-charge',
+ url: 'https://nsjcy.hugeinfo.com.cn/nsjc-charge',
// url: 'http://1p885086k1.iok.la/nsjc-charge',
- // url: 'http://localhost:6060/nsjc-charge',
+ //url: 'http://localhost:6060/nsjc-charge',
imgUrl: 'https://nsjcy.hugeinfo.com.cn/nsjc-charge',
- url: 'http://nsjc.vaiwan.com/nsjc-charge',
+ //url: 'http://nsjc.vaiwan.com/nsjc-charge',
// imgUrl: 'http://nsjc.vaiwan.com/nsjc-charge'
},
// 过滤数组
diff --git a/SunshineLnsMinApp/pages/agentInfo/agentInfo.wxss b/SunshineLnsMinApp/pages/agentInfo/agentInfo.wxss
index 250562d..eaeb23d 100644
--- a/SunshineLnsMinApp/pages/agentInfo/agentInfo.wxss
+++ b/SunshineLnsMinApp/pages/agentInfo/agentInfo.wxss
@@ -21,7 +21,7 @@
font-size: 14px;
color: #333;
margin-right: auto;
- width: 20%;
+ width: 25%;
}
.agentInfo-main span:nth-child(3) {
diff --git a/SunshineLnsMinApp/pages/dissDetail/dissDetail.js b/SunshineLnsMinApp/pages/dissDetail/dissDetail.js
index 71d51d3..06e0b0c 100644
--- a/SunshineLnsMinApp/pages/dissDetail/dissDetail.js
+++ b/SunshineLnsMinApp/pages/dissDetail/dissDetail.js
@@ -37,9 +37,7 @@
scanEvildoing: function (e) {
var name = this.data.name;
if (name == '公益随手拍') {
- wx.navigateTo({
- url: '../video/video',
- })
+ app.getPermission( '../video/video')
} else {
wx.navigateTo({
url: '../scanEvildoing/scanEvildoing?id=new',
diff --git a/SunshineLnsMinApp/pages/guideInfo/guideInfo.js b/SunshineLnsMinApp/pages/guideInfo/guideInfo.js
index 7987541..d45c0f3 100644
--- a/SunshineLnsMinApp/pages/guideInfo/guideInfo.js
+++ b/SunshineLnsMinApp/pages/guideInfo/guideInfo.js
@@ -221,11 +221,11 @@
}else if (id ==5) {
this.setData({
numberArray: [{
- nav: "控申业务流程", time: "发布时间： 2018-06-21",
- text: [{ img:"http://www.gzns.gov.cn/nsjcy/newygjw/bszn/201806/W020180622729218592008.png"},
- { img: "http://www.gzns.gov.cn/nsjcy/newygjw/bszn/201806/W020180622729218605904.png" },
- { img: "http://www.gzns.gov.cn/nsjcy/newygjw/bszn/201806/W020180622729218606806.png" },
- { img: "http://www.gzns.gov.cn/nsjcy/newygjw/bszn/201806/W020180622729218618091.png" },
+ nav: "控申业务流程", time: "发布时间： 2019-06-21",
+ text: [{ img:"http://nsjcy.hugeinfo.com.cn/nsjc-charge/image/zn/1.png"},
+ { img: "http://nsjcy.hugeinfo.com.cn/nsjc-charge/image/zn/2.png" },
+ { img: "http://nsjcy.hugeinfo.com.cn/nsjc-charge/image/zn/3.png" },
+ { img: "http://nsjcy.hugeinfo.com.cn/nsjc-charge/image/zn/4.png" },
]
}]
})
diff --git a/SunshineLnsMinApp/pages/progressQuery/progressQuery.js b/SunshineLnsMinApp/pages/progressQuery/progressQuery.js
index 8879344..bf6fc8e 100644
--- a/SunshineLnsMinApp/pages/progressQuery/progressQuery.js
+++ b/SunshineLnsMinApp/pages/progressQuery/progressQuery.js
@@ -140,16 +140,34 @@
}
const {
evalList1001,
+ evalList1002,
+ evalList1003,
+ evalList1004,
evalList1014
} = this.data.evalList;
- if (evalList1001.length == 0) {
- return app.showModal("请上传申请人身份证正反面！");
+
+ if (caseQuery.relation == 1 || caseQuery.relation == 2) {
+ if (evalList1002.length == 0) {
+ return app.showModal("请上传律师证！");
+ }
+ if (evalList1003.length == 0) {
+ return app.showModal("请上传律师所函！");
+ }
+ if (evalList1004.length == 0) {
+ return app.showModal("请上传授权委托书(或法律援助公函)！");
+ }
}
- if (evalList1001.length < 2) {
- return app.showModal("请至少上传两张身份证附件!")
- }
- if (evalList1014.length == 0) {
- return app.showModal("请上传关系证明！");
+
+ if (caseQuery.relation == 3){
+ if (evalList1001.length == 0) {
+ return app.showModal("请上传申请人身份证正反面！");
+ }
+ if (evalList1001.length < 2) {
+ return app.showModal("请至少上传两张身份证附件!")
+ }
+ if (evalList1014.length == 0) {
+ return app.showModal("请上传关系证明！");
+ }
}
}
var that = this;
diff --git a/SunshineLnsMinApp/pages/publicSnapshot/publicSnapshot.js b/SunshineLnsMinApp/pages/publicSnapshot/publicSnapshot.js
index f8eca97..bb75463 100644
--- a/SunshineLnsMinApp/pages/publicSnapshot/publicSnapshot.js
+++ b/SunshineLnsMinApp/pages/publicSnapshot/publicSnapshot.js
@@ -161,6 +161,10 @@
if (!verify.email(picturesInfo.mobile)) {
return app.showModal("电子邮箱格式不正确!")
}
+ } else {
+ if(!verify.length < 5 ){
+ return app.showModal("QQ号码长度最少5位!")
+ }
}
}
if (!picturesInfo.address) {
diff --git a/SunshineLnsMinApp/pages/publicSnapshot/publicSnapshot.wxml b/SunshineLnsMinApp/pages/publicSnapshot/publicSnapshot.wxml
index a9e338f..7e43ab1 100644
--- a/SunshineLnsMinApp/pages/publicSnapshot/publicSnapshot.wxml
+++ b/SunshineLnsMinApp/pages/publicSnapshot/publicSnapshot.wxml
@@ -82,7 +82,7 @@
</picker>
<image class="publicSnapshot-main-img" src="{{user}}"></image>
</div>
- <input data-name="mobile" bindinput="inputChange" disabled="{{disabled}}" value='{{picturesInfo.mobile}}'></input>
+ <input data-name="mobile" bindinput="inputChange" disabled="{{disabled}}" value='{{picturesInfo.mobile}}' style="width:100%"></input>
</div>
<div class="publicSnapshot-main">
<span class="red-title"></span>
diff --git a/SunshineLnsMinApp/pages/scanEvildoing/scanEvildoing.js b/SunshineLnsMinApp/pages/scanEvildoing/scanEvildoing.js
index 2e4aba3..4eebda4 100644
--- a/SunshineLnsMinApp/pages/scanEvildoing/scanEvildoing.js
+++ b/SunshineLnsMinApp/pages/scanEvildoing/scanEvildoing.js
@@ -167,6 +167,7 @@
if (!scanData.content) {
return app.showModal("请填写举报事项！");
}
+
const {
evalList1017,
evalList1001
@@ -174,6 +175,7 @@
if (evalList1017.length == 0) {
return app.showModal("请上传相关材料/照片！");
}
+ debugger;
if (that.data.switch) {
scanData.isRealName = 1;
var peopleInfo = that.data.peopleInfo;
@@ -186,20 +188,22 @@
}
if (!peopleInfo.mobile) {
return app.showModal("请填写联系方式!");
+ } else {
+ if (!verify.phone(peopleInfo.mobile)) {
+ return app.showModal("手机号码格式不正确!")
+ }
}
if (!peopleInfo.address) {
return app.showModal("请填写住所!");
}
if (!peopleInfo.cardNo) {
return app.showModal("请填写身份证号码!");
+ } else {
+ if (!verify.carIdNumber(peopleInfo.cardNo)) {
+ return app.showModal("身份证格式不正确!")
+ }
}
} else {
- if (!verify.phone(peopleInfo.mobile)) {
- return app.showModal("手机号码格式不正确!")
- }
- if (!verify.carIdNumber(peopleInfo.cardNo)) {
- return app.showModal("身份证格式不正确!")
- }
if (evalList1001.length < 2) {
return app.showModal("请至少上传两张身份证附件!")
}
diff --git a/SunshineLnsMinApp/pages/video/video.wxml b/SunshineLnsMinApp/pages/video/video.wxml
index ffa5db1..ee9c4a7 100644
--- a/SunshineLnsMinApp/pages/video/video.wxml
+++ b/SunshineLnsMinApp/pages/video/video.wxml
@@ -32,10 +32,10 @@
<div class="video-item">
<div class="video-four">
- <image class="video-win" src="{{img4}}" bindtap='publicSnapshot' data-type="{{3}}"></image>
+ <image class="video-win" src="{{img4}}" bindtap='publicSnapshot' data-type="{{4}}"></image>
</div>
<div class="video-four">
- <image class="video-win" src="{{img5}}" bindtap='publicSnapshot' data-type="{{4}}"></image>
+ <image class="video-win" src="{{img5}}" bindtap='publicSnapshot' data-type="{{3}}"></image>
</div>
</div>
</div>
\ No newline at end of file
--
Gitblit v1.8.0