修复

liuwh

2020-03-05 63de1e2ae6d1197d28d4cf1f6c191e6effeb978b

修复

 SunshineIns/src/fetch/questionQuery.js

@@ -1,6 +1,6 @@
import fetch from './_fetch';
import { message } from 'antd';
export default ({ page, size }) =>
  fetch(`api/question/query?size=${size}&page=${page}`)
export default ({ page, size, status }) =>
  fetch(`api/question/query?size=${size}&page=${page}&status=${status||''}`)
    .then(json => json)
    .catch(error => message.error('详情加载失败，请联系管理员', 2));

 SunshineIns/src/fetch/socialCompany.js

@@ -1,6 +1,6 @@
import fetch from './_fetch';
import { message } from 'antd';
export default ({ companyName, companyLegal,companyTel,companyAccount, createTime }) => fetch(`api/socialCompany/finds?companyName=${companyName || ''}&companyLegal=${companyLegal || ''}&companyTel=${companyTel || ''}&companyAccount=${companyAccount || ''}&createTime=${createTime || ''}`)
export default ({ companyName, companyLegal,companyTel }) => fetch(`api/socialCompany/finds?companyName=${companyName || ''}&companyLegal=${companyLegal || ''}&companyTel=${companyTel || ''}`)
    .then(
        json => json.rows
    )

 SunshineIns/src/fetch/socialQuery.js

@@ -1,6 +1,6 @@
import fetch from './_fetch';
import { message } from 'antd';
export default ({page,size, taskType, status, startTime,endTime}) => fetch(`api/social/query?size=${size}&page=${page}&taskType=${taskType}&status=${status}&startTime=${startTime}&endTime=${endTime}`)
export default ({ page, size, taskType, status, startTime, endTime }) => fetch(`api/social/query?size=${size}&page=${page}&taskType=${taskType || ''}&status=${status || ''}&startTime=${startTime || ''}&endTime=${endTime || ''}`)
    .then(
        json => json
    )

 SunshineIns/src/index.jsx

@@ -59,6 +59,8 @@
          <Route path="/bus/attachment/:busId/:attachmentId" component={AttTree} />
          <Route path="/bus/attachment/:busId" component={AttTree} />
          {/* <Route path='/questionnaire/newly' component={AttTree} /> */}
           {/* 签到墙 */}
           <Route path='/signIn/:id' component={null} />
          <Route component={Menu} />
        </Switch>
        <Switch>

 SunshineIns/src/page/ActiveManage.jsx

@@ -144,7 +144,17 @@
        this.setState({
            formData: data,
        });
        this.getData();
        this.setState({ loading: true })
        Fetch.activeManage({ ...this.state.formData })
            .then(res => {
                for (var i = 0; i < res.length; i++) {
                    res[i]['index'] = i + 1;
                }
                this.setState({
                    data: res,
                    loading: false
                });
            });
    }

    saveInputChange = ({ target: { value, name } }) => {

 SunshineIns/src/page/ActiveManageEdit.jsx

@@ -5,8 +5,8 @@
 */
import React from 'react';

import { Row, Col, Input, DatePicker, Button, Modal, Upload, Icon, message, Divider, TimePicker, Badge, Select, Popconfirm, Spin, Breadcrumb } from 'antd';
const { TextArea } = Input;
import { Row, Col, Input, DatePicker, Button, Modal, Upload, Table, Icon, message, Divider, TimePicker, Badge, Select, Popconfirm, Spin, Breadcrumb } from 'antd';
const { TextArea, Search } = Input;
import HeadView from '../view/HeadView';
import BusDetailView from '../view/BusDetailView';
import TableView from '../view/TableView';
@@ -46,6 +46,7 @@
            savedate: {},
            formdata: {},
            fileList: [],
            attList1: [],
            previewVisible: false,
            previewImage: '',
            visible: false,
@@ -56,7 +57,12 @@
            status: '',
            loading: false,
            code: '',
            editorState: BraftEditor.createEditorState(null)
            editorState: BraftEditor.createEditorState(null),
            questionnaireModal: false,
            pageSize: 10,
            page: 1,
            selectedRowKeys: [],
            selectedQuestionnaireData: {}
        };
    }

@@ -95,9 +101,19 @@
                    dateSource: res.personList || [],
                    // fileList: res.attachments.length > 0 ? res.attachments.filter(item=>(item.typeId==1000)) : [],
                    fileList: res.attachments || [],
                    attList1: res.attList1 || [],
                    loading: false,
                    modalLoading: false,
                    selectedQuestionnaireData: res.questionnaire || {}
                });
            })
    }
    onShowSizeChange = (current, pageSize) => {
        this.setState({ pageSize, page: 1 })
        this.loadData(1, pageSize);
    }
    pageChange = (page, pageSize) => {
        this.loadData(page, pageSize);
    }

    saveInputChange = ({ target: { value, name } }) => {
@@ -109,13 +125,74 @@
        }))
    }

    selectonClick = () => {
        this.setState({
            questionnaireModal: true,
            modalLoading: true
        })
        Fetch.questionQuery({
            status: 3,
            page: this.state.page,
            size: this.state.pageSize,
        })
            .then(res => {
                console.log('res', res);
                this.setState({
                    modalLoading: false
                })
                if (res.code == 0) {
                    for (var i = 0; i < res.data.content.length; i++) {
                        res.data.content[i]['index'] = i + 1;
                        res.data.content[i]['key'] = i;
                    }
                    this.setState({
                        tableData: res.data.content,
                        totalElements: res.data.totalElements
                    });

                }
            });
    }

    selectCancelModel = () => {
        this.setState({
            questionnaireModal: false,
            selectedRowKeys: [],
            selectedQuestionnaireData: {},
        })
    }


    questionnaireCancle = () => {
        const {selectedQuestionnaireData}=this.state;
        this.props.history.push(`/questionnaire/detail/${selectedQuestionnaireData.id}`)
    }

    questionnaireDel = () => {
        this.setState({ selectedQuestionnaireData: {} })
    }

    handleOk = (e) => {
        console.log(e)
        this.setState({
            questionnaireModal: false,
            selectedRowKeys: []
        })
    }

    questionnaireSearch = (value) => {
        console.log(value)
    }

    submit = () => {
        const { savedate } = this.state;
        const { savedate, selectedQuestionnaireData, fileList } = this.state;
        savedate.startTime = moment(savedate.startDate + " " + moment(savedate.startHour).format(format), 'YYYY-MM-DD HH:mm')
        savedate.endTime = moment(savedate.endDate + " " + moment(savedate.endHour).format(format), 'YYYY-MM-DD HH:mm')
        // console.log({...savedate,queId:selectedQuestionnaireData[0].id});
        console.log(savedate);
        if (!savedate.activityPersonQuota) {
            message.warning("活动人数不能为空");
        console.log(selectedQuestionnaireData);
        if (!savedate.host) {
            message.warning("主持人不能为空");
            return;
        }
        if (savedate.activityPhone) {
@@ -123,7 +200,37 @@
                return message.warning("联系电话不能为空");
            }
        }
        Fetch.saveActive(savedate)
        if (!savedate.activityTitle) {
            message.warning("活动标题不能为空");
            return;
        }
        if (!savedate.activityAddress) {
            message.warning("活动地址不能为空");
            return;
        }
        if (!savedate.activityPersonQuota) {
            message.warning("活动人数不能为空");
            return;
        }
        if (!savedate.activityDesc) {
            message.warning("活动描述不能为空");
            return;
        }
        if (!savedate.requirement) {
            message.warning("报名要求不能为空");
            return;
        }

        if (fileList.length = 0) {
            message.warning("添加图片不能为空");
            return;
        }

        if (!selectedQuestionnaireData) {
            return message.warning("调查问卷不能为空");
        }

        Fetch.saveActive({ ...savedate, queId: selectedQuestionnaireData.id })
            .then(res => {
                if (res.code === 0) {
                    message.success("提交成功！");
@@ -294,16 +401,28 @@
        }))
    }

    onSelectChange = (selectedRowKeys, selectedRows) => {
        const { tableData } = this.state;
        console.log('selectedRowKeys changed: ', selectedRowKeys);
        console.log('selectedRowKeys changed: ', selectedRows);
        console.log(tableData[selectedRowKeys[0]]);
        console.log(tableData);
        this.setState({
            selectedQuestionnaireData: tableData[selectedRowKeys[0]],
            selectedRowKeys
        })
    };

    handleCancel = () => this.setState({ previewVisible: false })
    render() {
        const { savedate, previewVisible, previewImage, editorState, fileList, dateSource, code, hitList, activityType, disabled, loading } = this.state;
        const { savedate, previewVisible, previewImage, editorState, selectedRowKeys, fileList, attList1, dateSource, code, hitList, activityType, disabled, loading, modalLoading } = this.state;
        console.log('disabled', fileList)
        const props = {
            action: domain + 'api/v1/attachment/materials?entityId=' + savedate.id,
            onChange: ({ file, fileList }) => {
                this.setState({ fileList });
            },
            fileList: fileList.filter(item=>(item.typeId==1000)),
            fileList: fileList,
            onRemove: (file) => {
                Fetch.deleteAttachment(file.uid)
                    .then(res => {
@@ -322,17 +441,17 @@
        const bottmProps = {
            action: domain + 'api/v1/attachment/materials?entityId=' + savedate.id,
            onChange: ({ file, fileList }) => {
                this.setState({ fileList });
                this.setState({ attList1: fileList });
            },
            fileList: fileList.filter(item=>(item.typeId==1020)),
            fileList: attList1,
            onRemove: (file) => {
                Fetch.deleteAttachment(file.uid)
                    .then(res => {
                        message.success("移除成功！");
                    });
                this.setState(({ fileList }) => {
                    const index = fileList.indexOf(file);
                    const newFileList = fileList.slice();
                this.setState(({ attList1 }) => {
                    const index = attList1.indexOf(file);
                    const newFileList = attList1.slice();
                    newFileList.splice(index, 1);
                    return {
                        fileList: newFileList,
@@ -360,6 +479,30 @@
                    )
            )
            )
        }];
        const questionnaireColumns = [{
            title: '主题',
            dataIndex: 'title',
            key: 'title',
            ellipsis: true,
            render: (cur, item) => {
                return cur || '暂无'
            }
        }, {
            title: '描述',
            dataIndex: 'content',
            key: 'content',
            ellipsis: true,
            render: (cur, item) => {
                return cur || '暂无'
            }
        }, {
            title: '发布时间',
            dataIndex: 'publicTime',
            key: 'publicTime',
            render: (cur, item) => {
                return cur ? moment(cur).format("YYYY-MM-DD HH:mm") : '暂无'
            }
        }];

        const act2columns = [{
@@ -520,6 +663,41 @@
                                </Col>
                            </Row>
                        </div>
                        {
                            savedate.activityStatus == null || savedate.activityStatus == 0 ?
                                <div style={divStyle}>
                                    <Row type="flex" align='top' justify="space-around">
                                        <Col span={6} pull={0} style={{ textAlign: 'center' }}><span>调查问卷</span></Col>
                                        <Col span={18} push={0} >
                                            {
                                                this.state.selectedQuestionnaireData.title ?
                                                    <div>
                                                        <span style={{ margin: '0 20px' }}>{this.state.selectedQuestionnaireData.title}</span>
                                                        <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>
                                            }
                                        </Col>
                                    </Row>
                                </div> :
                                <div style={divStyle}>
                                    <Row type="flex" align='top' justify="space-around">
                                        <Col span={6} pull={0} style={{ textAlign: 'center' }}><span>调查问卷</span></Col>
                                        <Col span={18} push={0} >
                                            {
                                                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" disabled onClick={this.questionnaireDel}>删除</Button>
                                                    </div> :
                                                    <Button style={{ marginLeft: '15px', width: '150px' }} onClick={this.selectonClick}>请选择</Button>
                                            }
                                        </Col>
                                    </Row>
                                </div>
                        }

                        {
                            activityType == 'act_1' ? (dateSource.length > 0 ?
@@ -541,10 +719,10 @@
                                    <Divider orientation="left" style={{ margin: '20px', width: '97%' }}>培训结果</Divider>
                                    <div style={divStyle}>
                                        <Row type="flex" align='top' justify="space-around">
                                            <Col span={6} pull={0} style={{ textAlign: 'center' }}><span>添加图片</span></Col>
                                            <Col span={6} pull={0} style={{ textAlign: 'center' }}><span>添加结果图片</span></Col>
                                            <Col span={18} push={0} >
                                                <Upload disabled={disabled} listType="picture-card" onPreview={this.handlePreview} {...bottmProps}>
                                                    

                                                </Upload>
                                                <Modal visible={previewVisible} footer={null} onCancel={this.handleCancel}>
                                                    <img alt="example" style={{ width: '100%' }} src={previewImage} />
@@ -637,6 +815,46 @@
                        }

                    </Modal>
                    <Modal
                        title="选择调查问卷"
                        visible={this.state.questionnaireModal}
                        onCancel={this.selectCancelModel}
                        onOk={this.handleOk}
                        width='1000px'
                    >
                        <Search
                            placeholder="请输入问卷调查标题"
                            enterButton="查询"
                            size="large"
                            style={{ margin: '12px' }}
                            onSearch={value => this.questionnaireSearch(value)}
                        />

                        <Table
                            size="middle"
                            dataSource={this.state.tableData}
                            rowSelection={{
                                selectedRowKeys,
                                type: 'radio',
                                onChange: this.onSelectChange,
                            }}
                            loading={{ spinning: this.state.modalLoading }}
                            columns={questionnaireColumns}
                            pagination={{
                                pageSize: this.state.pageSize,
                                onChange: this.pageChange,
                                total: this.state.totalElements,
                                showSizeChanger: true,
                                onShowSizeChange: this.onShowSizeChange,
                                showTotal: (total, range) => `共${total}条记录 `,
                                // itemRender: this.itemRender,
                                showQuickJumper: true,
                                defaultCurrent: 1,
                                current: this.state.page
                            }}
                        />
                        {/* <TableView columns={columns} data={this.state.tableData} pageSize='10' size='default' loading={modalLoading} /> */}
                    </Modal>
                </Spin>
            </div>
        );

 SunshineIns/src/page/ArticleEidt.jsx

@@ -5,7 +5,7 @@
 */
import React from 'react';

import { Row, Col, Input, Select, DatePicker, Button, Tag, Tooltip, Modal, Upload, Icon, message, TreeSelect } from 'antd';
import { Row, Col, Input, Select, DatePicker, Button, Tag, Tooltip, Modal, Upload, Icon, message, TreeSelect, Breadcrumb } from 'antd';
import HeadView from '../view/HeadView';
import BusDetailView from '../view/BusDetailView';
import AddComView from '../view/AddComView';
@@ -219,6 +219,10 @@
    return (
      <div className="app-page">
        <HeadView history={this.props.history} />
        <Breadcrumb style={{ padding: '20px' }}>
                        <Breadcrumb.Item><a href="index.html#/articlePublish">信息发布</a></Breadcrumb.Item>
                        <Breadcrumb.Item>信息公布详情</Breadcrumb.Item>
                    </Breadcrumb>
        <BusDetailView type='信息添加' >
          <div style={divStyle}>
            <Row type="flex" align='middle' justify="space-around">

 SunshineIns/src/page/ArticlePublish.jsx

@@ -137,16 +137,17 @@
      title: '标题',
      dataIndex: 'title',
      key: 'title',
      render: text => <span>{subStr(text, 20)}</span>
      render: text => <span>{text?subStr(text, 20):'暂无'}</span>
    }, {
      title: '信息类型',
      dataIndex: 'channelName',
      key: 'channelName',
      render: text => <span>{text||'暂无'}</span>
    }, {
      title: '信息内容',
      dataIndex: 'content',
      key: 'content',
      render: text => <span>{subStr(text, 40)}</span>
      render: text => <span>{text?subStr(text, 40):'暂无'}</span>
    }, {
      title: '操作人',
      dataIndex: 'author',

 SunshineIns/src/page/CareList.jsx

@@ -77,12 +77,23 @@
        this.setState({
            formData: data,
        });
        this.getData();
        this.setState({ loading: true })
        Fetch.socialQuery({ ...data })
            .then(res => {
                console.log(res)
                for (var i = 0; i < res.rows.length; i++) {
                    res.rows[i]['index'] = i + 1;
                }
                this.setState({
                    data: res.rows,
                    loading: false,
                });
            });
    }

    getData = () => {
        const { formData } = this.state;
        this.setState({loading:true})
        this.setState({ loading: true })
        Fetch.socialQuery({ ...formData })
            .then(res => {
                console.log(res)
@@ -91,7 +102,7 @@
                }
                this.setState({
                    data: res.rows,
                    loading:false,
                    loading: false,
                });
            });
    }
@@ -158,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: '创建时间',
@@ -175,7 +186,7 @@
            dataIndex: 'endTime',
            key: 'endTime',
            render: text => <span>{moment(text).format("YYYY-MM-DD HH:mm")}</span>
        },{
        }, {
            title: '操作',
            key: 'action',
            render: (text, record) => (
@@ -240,7 +251,7 @@
                                keylistName: 'rangeTimelist',
                            },
                        ]} />
                    <TableView columns={columns} data={data} pageSize='10' size='default' loading={loading}/>
                    <TableView columns={columns} data={data} pageSize='10' size='default' loading={loading} />
                </div>
            </div>
        );

 SunshineIns/src/page/Index.jsx

@@ -55,10 +55,6 @@
        <Badge count={text} />
      )
    }, {
      title: '创建时间',
      dataIndex: 'createTime',
      key: 'createTime',
    }, {
      title: '操作',
      key: 'action',
      render: (text, record) => (

 SunshineIns/src/page/KnowledgeBase.jsx

@@ -152,20 +152,22 @@
      title: '问题',
      dataIndex: 'title',
      key: 'title',
      render: text => <span>{subStr(text,20)}</span>
      render: text => <span>{text?subStr(text,20):'暂无'}</span>
    }, {
      title: '分类',
      dataIndex: 'faqType',
      key: 'faqType',
      render: text => <span>{text||'暂无'}</span>
    }, {
      title: '具体内容',
      dataIndex: 'content',
      key: 'content',
      render: text => <span>{subStr(text,50)}</span>
      render: text => <span>{text?subStr(text,50):'暂无'}</span>
    }, {
      title: '操作人',
      dataIndex: 'createrName',
      key: 'createrName',
      render: text => <span>{text||'暂无'}</span>
    }, {
      title: '创建时间',
      dataIndex: 'createTime',

 SunshineIns/src/page/PoliceSecurity.jsx

@@ -87,7 +87,7 @@
        }))
    }
    showModal = (id) => {
        this.props.history.push("/entry/ExamineEdit/" + id);
        this.props.history.push("/entry/policeSecurity/" + id);
    }

    Seaech = () => {

 SunshineIns/src/page/SignIn.jsx

@@ -56,17 +56,18 @@
        return (
            <div className="app-page">
                <Spin spinning={loading}>
                    <Affix style={{ position: 'absolute', top: 520, right: 20 }}>
                    {/* <Affix style={{ position: 'absolute', top: 520, right: 20 }}>
                        <Card>
                            < img style={{ width: '150px', height: '150px' }} src={`data:image/png;base64,${code}`} alt=""></img>
                        </Card>
                    </Affix>
                    </Affix> */}
                    <Card style={{ margin: "8%" }}>
                        <div>
                            <Row type="flex" justify="center" align="middle" style={{ borderBottom: '1px solid #D8D8D8' }}>
                                <Col style={{ color: '#3D444D', fontSize: 26, fontWeight: 'bold', lineHeight: '75px' }}>
                                    {activityName}
                            <Row type="flex"  align="middle" style={{ borderBottom: '1px solid #D8D8D8' }}>
                                <Col span={20} style={{ color: '#3D444D', fontSize: 26, fontWeight: 'bold', lineHeight: '75px' }}>
                                    活动标题：{activityName}
                                </Col>
                                <Col>< img style={{ width: '150px', height: '150px' }} src={`data:image/png;base64,${code}`} alt=""></img></Col>
                            </Row>
                        </div>

@@ -85,7 +86,7 @@
                                        <div style={{ width: '150px', height: '150px', color:'#000', position: 'absolute', display:'flex',justifyContent:'flex-end' }}><Icon type="check-circle" style={{fontSize:'32px'}} theme="twoTone" twoToneColor="#52c41a" /></div> : ''
                                        }
                                    </div>
                                )) : <span>暂无数据</span>
                                )) : <div style={{height:'150px'}}>暂无人员签到</div>
                            }
                        </div>
                    </Card>

 SunshineIns/src/page/UnderAgeList.jsx

@@ -2,6 +2,7 @@

import HeadView from '../view/HeadView';
import TableBtnView from '../view/TableBtnView';
import CommonSearchForm from '../view/CommonSearchForm';
import { Input, Button, DatePicker, Divider, Modal, message } from 'antd'
import moment from 'moment'
import Fetch from '../fetch';
@@ -15,7 +16,12 @@
      loading: false,
      visible: false,
      savedate: {},
      formdata: {},
      formData: {
        __key: Date.now(),
        companyName: '',
        companyLegal: '',
        companyTel: '',
    },
      resetKey: Date.now(),
      closeKey: Date.now()
    };
@@ -25,15 +31,42 @@
    document.title = '涉未成年负责部门组织';
    this.getData();
  }
  getData = () => {
    const { formdata } = this.state;
    Fetch.socialCompany(formdata)

  setFormData = data => {
    console.log('form', data);
    this.setState({
      formData: data,
    });
  }

  searchonClick = data => {
    console.log('form', data);
    this.setState({
      formData: data,
    });
    this.setState({ loading: true })
    Fetch.socialCompany({...data})
      .then(res => {
        for (var i = 0; i < res.length; i++) {
          res[i]['index'] = i + 1;
        }
        this.setState({
          data: res
          data: res,
          loading: false
        });
      });
  }
  getData = () => {
    const { formdata } = this.state;
    this.setState({ loading: true })
    Fetch.socialCompany({formdata})
      .then(res => {
        for (var i = 0; i < res.length; i++) {
          res[i]['index'] = i + 1;
        }
        this.setState({
          data: res,
          loading: false
        });
      });
  }
@@ -186,12 +219,32 @@
        </span>
      ),
    }];
    const { data, resetKey, visible, loading, savedate, closeKey } = this.state;
    const { data, resetKey, visible, loading, savedate, closeKey, formData } = this.state;
    return (

      <div className="app-page">
        <HeadView history={this.props.history} />
        <TableBtnView key={-resetKey} type="infoManage" name='涉未成年负责部门组织' btnName='新建公司' onClick={() => this.showModal('new')}>
        <div style={{ background: '#fff', margin: 20 }}>
          <CommonSearchForm
            {...this.props}
            formData={formData}
            setFormData={this.setFormData}
            searchonClick={this.searchonClick}
            pathName={this.props.location.pathname}
            data={[
              {
                type: 'input', name: '公司名称', label: '公司名称', key: 'companyName'
              },
              {
                type: 'input', name: '法人姓名', label: '法人姓名', key: 'companyLegal'
              },
              {
                type: 'input', name: '联系电话', label: '联系电话', key: 'companyTel'
              },
            ]} />
          <TableView columns={columns} data={data} pageSize='10' size='default' loading={loading} />
        </div>
        {/* <TableBtnView key={-resetKey} type="infoManage" name='涉未成年负责部门组织' btnName='新建公司' onClick={() => this.showModal('new')}>
          <Input placeholder="根据公司名称模糊查询" style={{ width: "200px" }} name='companyName' onChange={this.onInputChange} />
          <Input placeholder="根据法人姓名模糊查询" style={{ width: "200px" }} name='companyLegal' onChange={this.onInputChange} />
          <Input placeholder="根据联系电话模糊查询" style={{ width: "200px" }} name='companyTel' onChange={this.onInputChange} />
@@ -200,7 +253,7 @@
          <Button type="primary" onClick={this.Seaech}>查询</Button>
          <Button onClick={this.Reset}>重置</Button>
        </TableBtnView>
        <TableView columns={columns} data={data} pageSize='10' size='default' />
        <TableView columns={columns} data={data} pageSize='10' size='default' /> */}
        <Modal
          key={closeKey}
          confirmLoading={loading}

 SunshineLnsMinApp/app.js

@@ -92,6 +92,11 @@
  },
  //上传文件
  upload: function(these, path, associateTypeId, way, id) {
    console.log(these)
    console.log(path)
    console.log(associateTypeId)
    console.log(way)
    console.log(id)
    var status = these.data['status'];
    var batch;
    if (status == 4) {
@@ -99,6 +104,7 @@
    } else {
      batch = 0
    }
    console.log(batch)
    wx.showToast({
      icon: "loading",
      title: "正在上传"
@@ -116,6 +122,7 @@
        batch
      },
      success: function(res) {
        console.log(res)
        var evalList = these.data.evalList;
        var evalListType = 'evalList' + associateTypeId;
        var data = JSON.parse(res.data)

 SunshineLnsMinApp/app.json

@@ -9,6 +9,7 @@
    "pages/fzxktDetail/fzxktDetail",
    "pages/fzjdvisitList/fzjdvisitList",
    "pages/weiwc/weiwc",
    "pages/zhghLogin/zhghLogin",
    "pages/zhgh/zhgh",
    "pages/zhghInfo/zhghInfo",
    "pages/zhgk/zhgk",

 SunshineLnsMinApp/pages/zhdt/zhdt.wxml

@@ -27,7 +27,7 @@
  <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}}<span>  </span>{{item.readCount}}阅读</view>
      <view class="text-grey">{{item.createTime}}<text decode="{{true}}" space="{{true}}">&nbsp;&nbsp;&nbsp;&nbsp;</text>{{item.readCount}}阅读</view>
    </view>
    <view class="zhwj-b-head-r">
      <image mode='widthFix' src="{{item.attList[0].path}}"></image>

 SunshineLnsMinApp/pages/zhgh/zhgh.js

@@ -1,4 +1,5 @@
// pages/zhgh/zhgh.js
var app = getApp();
Page({

  /**
@@ -6,27 +7,53 @@
   */
  data: {
    TabCur: 0,
    list: ['合适成年人', '跟踪帮教', '社会调查', '疏导干预'],
    infoList: [{
      img: 'https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1576749884261&di=4aea8bc541cc566e82c98bbab89c3a50&imgtype=0&src=http%3A%2F%2F5b0988e595225.cdn.sohucs.com%2Fimages%2F20180329%2Fd244aac01ed543d5a9ddbfdde6796e67.jpeg',
      name: '农村老人关护',
      status: '待完成'
    }, {
        img: 'https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1576749926263&di=25f2103c52b624a5333b195cafa1feb4&imgtype=0&src=http%3A%2F%2Fphotocdn.sohu.com%2F20131023%2FImg388741073.jpg',
      name: '老人院陪护聊天',
      status: '已完成'
    }, {
        img: 'https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1576749996179&di=3285ac9bfc16e70040ab17572ddc9adb&imgtype=0&src=http%3A%2F%2Finews.gtimg.com%2Fnewsapp_match%2F0%2F10906442862%2F0.jpg',
      name: '广场卫生执勤辅助',
      status: '已完成'
    }, ]
    list: ['全部', '跟踪帮教', '合适成年人', '社会调查', '心理疏导'],
    infoList: [],
  },

  /**
   * 生命周期函数--监听页面加载
   */
  onLoad: function(options) {
  onLoad: function (options) {
    this.daTatoGet('')
  },

  daTatoGet: function (type) {
    var that = this;
    wx.showLoading();
    wx.request({
      url: app.globalData.url + '/api/social/myTask',
      data: {
        page: 1,
        size: 1000,
        userId: wx.getStorageSync('id'),
        taskType: type,
      },
      success: function (res) {
        wx.hideLoading();
        console.log('res', res);
        if (res.data.code == 0) {
          let content = res.data.data.content.map(({
            startTime,
            endTime,
            status,
            ...i
          }) => ({
            ...i,
            startTime: app.formatDate(startTime),
            endTime: app.formatDate(endTime),
            status:status==0?'未开始':status==1?'进行中':status==2?'已结束':status==3?'结束':status==99?'':'(未知)'
          }));
          that.setData({
            infoList: content
          })
        } else {
          wx.showToast({
            title: res.data.msg,
          })
        }
      }
    })
  },


@@ -35,13 +62,15 @@
      TabCur: e.currentTarget.dataset.id,
      scrollLeft: (e.currentTarget.dataset.id - 1) * 60
    })
    this.daTatoGet(e.currentTarget.dataset.id)
  },

  // 跳转
  linkFunction: function(event) {
  linkFunction: function (event) {
    var str = event.currentTarget.dataset['str'];
    var id = event.currentTarget.dataset['id'];
    wx.navigateTo({
      url: '../' + str + '/' + str
      url: '../' + str + '/' + str + '?id=' + id
    })
  }
})

 SunshineLnsMinApp/pages/zhgh/zhgh.wxml

@@ -1,107 +1,77 @@
<!--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="{{4}}" 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-list" data-str="zhghInfo" bindtap='linkFunction'>
      <view class="zhgh-list-img">
        <image src="{{item.img}}"></image>
      </view>
      <view class="zhgh-list-b">
        <view class="zhgh-list-b-left">
          <view class="zhgh-list-b-left-div font-lg">{{item.name}}</view>
          <view class="zhgh-list-b-left-div">2019.12.12 20:00</view>
        </view>
        <view class="zhgh-list-b-right">{{item.status}}</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">{{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 wx:if='{{TabCur==1}}'>
    <view class="zhgh-list" data-str="zhghInfo" bindtap='linkFunction'>
      <view class="zhgh-list-img">
        <image src="https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1577344816&di=7e4576e47e6cbbce2e4e4c80ce501c85&imgtype=jpg&er=1&src=http%3A%2F%2Fhz.wenming.cn%2Fwm_jy%2Ffocus%2F201809%2FW020180917332975135768.jpg"></image>
      </view>
      <view class="zhgh-list-b">
        <view class="zhgh-list-b-left">
          <view class="zhgh-list-b-left-div font-lg">帮教未成年人</view>
          <view class="zhgh-list-b-left-div">2019.11.23 12:00</view>
        </view>
        <view class="zhgh-list-b-right">待完成</view>
      </view>
    </view>
    <view class="zhgh-list" data-str="zhghInfo" bindtap='linkFunction'>
      <view class="zhgh-list-img">
        <image src="https://ss0.bdstatic.com/70cFuHSh_Q1YnxGkpoWK1HF6hhy/it/u=3881324343,2281839731&fm=15&gp=0.jpg"></image>
      </view>
      <view class="zhgh-list-b">
        <view class="zhgh-list-b-left">
          <view class="zhgh-list-b-left-div font-lg">学习辅导</view>
          <view class="zhgh-list-b-left-div">2019.12.12 20:00</view>
        </view>
        <view class="zhgh-list-b-right">待完成</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>
        </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>
        </view>
    </view>

  <view wx:if='{{TabCur==2}}'>
    <view class="zhgh-list" data-str="zhghInfo" bindtap='linkFunction'>
      <view class="zhgh-list-img">
        <image src="https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1576750458167&di=f36e82a737b6ffe14a638c3e9a1afd6c&imgtype=0&src=http%3A%2F%2Fimg.cjyun.org%2Fa%2F10064%2F201701%2Fd5fd012d0f7be1c0ee68738178595a4c.jpeg"></image>
      </view>
      <view class="zhgh-list-b">
        <view class="zhgh-list-b-left">
          <view class="zhgh-list-b-left-div font-lg">社会环境调查</view>
          <view class="zhgh-list-b-left-div">2019.12.12 20:00</view>
        </view>
        <view class="zhgh-list-b-right">待完成</view>
      </view>
    </view>
    <view class="zhgh-list" data-str="zhghInfo" bindtap='linkFunction'>
      <view class="zhgh-list-img">
        <image src="https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1576750537170&di=d7533f2546f856da44eb44d5acb33f90&imgtype=0&src=http%3A%2F%2Fimage.codes51.com%2FArticle%2Fimage%2F20160530%2F20160530024642_5901.jpg"></image>
      </view>
      <view class="zhgh-list-b">
        <view class="zhgh-list-b-left">
          <view class="zhgh-list-b-left-div font-lg">环境数据调查</view>
          <view class="zhgh-list-b-left-div">2019.12.12 20:00</view>
        </view>
        <view class="zhgh-list-b-right">待完成</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>
        </view>
    </view>

  <view wx:if='{{TabCur==3}}'>
    <view class="zhgh-list" data-str="zhghInfo" bindtap='linkFunction'>
      <view class="zhgh-list-img">
        <image src="https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1577345685&di=556a32729fa812cc81c060243816111d&imgtype=jpg&er=1&src=http%3A%2F%2Fwww.zhanjiang.gov.cn%2Ffileserver%2FNews%2Fb8bfdf37-7242-4d16-bbc0-1244d78aeca4.jpg"></image>
      </view>
      <view class="zhgh-list-b">
        <view class="zhgh-list-b-left">
          <view class="zhgh-list-b-left-div font-lg">未成年人心理辅导</view>
          <view class="zhgh-list-b-left-div">2019.12.12 20:00</view>
        </view>
        <view class="zhgh-list-b-right">待完成</view>
      </view>
    </view>
    <view class="zhgh-list" data-str="zhghInfo" bindtap='linkFunction'>
      <view class="zhgh-list-img">
        <image src="https://ss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=1146387832,2824320615&fm=15&gp=0.jpg"></image>
      </view>
      <view class="zhgh-list-b">
        <view class="zhgh-list-b-left">
          <view class="zhgh-list-b-left-div font-lg">教育疏导</view>
          <view class="zhgh-list-b-left-div">2019.12.12 20:00</view>
        </view>
        <view class="zhgh-list-b-right">待完成</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="cu-btn bg-red margin-tb-sm lg">{{item.status}}</view>
                </view>
            </view>
        </view>
    </view>

</view>

 SunshineLnsMinApp/pages/zhgh/zhgh.wxss

@@ -2,14 +2,20 @@

.zhgh-bg {
  background-color: #f1f1f1;
  height: 100vh;
}

.zhgh-list {
  background: #fff;
  background: #f1f1f1;
  margin: 10PX;
  border-radius: 6PX;
}

.zhgh-list1 {
  background: #fff;
  border-radius: 6px;
}

.zhgh-list-img {
}


 SunshineLnsMinApp/pages/zhghInfo/zhghInfo.js

@@ -1,26 +1,174 @@
// pages/zhghInfo/zhghInfo.js
var app = getApp();
Page({

  /**
   * 页面的初始数据
   */
  data: {

    data: {},
    add: app.globalData.imgUrl + '/image/add.svg',
    del: app.globalData.imgUrl + '/image/del.svg',
    evalList: {},
    id: "",
    status: 4,
    disabled: false,
    taskReport: ''
  },

  /**
   * 生命周期函数--监听页面加载
   */
  onLoad: function (options) {

    var that = this;
    console.log(options.id)
    wx.showLoading();
    wx.request({
      url: app.globalData.url + '/api/social/find/' + options.id,
      success: function (res) {
        wx.hideLoading();
        console.log('res', res);
        if (res.data.code == 0) {
          var dataSet = res.data.data;
          var evalList1000 = dataSet.attachments || [];
          console.log('37', evalList1000)
          var evalList = {
            evalList1000,
          };
          for (var i in evalList) {
            evalList[i] = evalList[i].map(({
              imgPath: pic,
              attachmentId: id
            }) => ({
              pic,
              id
            }))
          }
          console.log('48', evalList)
          that.setData({
            data: {
              ...res.data.data,
              createTime: app.formatDate(res.data.data.createTime),
              startTime: app.formatDate(res.data.data.startTime),
              endTime: app.formatDate(res.data.data.endTime),
              status: res.data.data.status == 0 ? '未开始' : res.data.data.status == 1 ? '进行中' : res.data.data.status == 2 ? '已结束' : res.data.data.status == 99 ? '结束' : '(未知)'
            },
            id: res.data.data.id,
            evalList,
            taskReport: res.data.data.taskReport || ''
          })
        } else {
          wx.showToast({
            title: res.data.msg,
          })
        }
      }
    })
  },
  //输入框
  inputChange: function (e) {
    var taskReport = e.currentTarget.dataset.name;
    this.setData({
      taskReport
    })
  },

  // 跳转
  linkFunction: function () {
    wx.showToast({
      title: '提交成功',
      icon: 'success',
      duration: 2000
  //添加图片
  joinPicture: function (e) {
    console.log(e)
    var that = this;
    console.log(that)
    app.joinPicture(e, that, e.currentTarget.dataset.associatetypeid, that.data.id);
  },

  // 删除图片
  clearImg: function (e) {
    var that = this;
    app.clearImg(e, that);
  },

  //预览图片
  previewImage: function (e) {
    app.previewImage(e);
  },

  onPreview(e) {
    console.log('onPreview', e)
    const {
      file,
      fileList
    } = e.detail
    wx.previewImage({
      current: file.url,
      urls: fileList.map((n) => n.url),
    })
  },
  onRemove(e) {
    const {
      file,
      fileList
    } = e.detail;
    let that = this;
    var id = e.currentTarget.dataset['id'];
    console.log(id);
    let {
      supplyAttachmentList
    } = that.data.item;
    wx.showModal({
      content: '确定删除？',
      success: (res) => {
        if (res.confirm) {
          wx.showLoading();
          wx.request({
            url: app.globalData.url + '/api/v1/attachment/deleteByOwnerAtt',
            method: 'GET',
            data: {
              attId: file.id,
              owenId: id
            },
            success: function (res) {
              console.log('res', res);
              that.data.item.supplyAttachmentList = supplyAttachmentList.filter((n) => n.uid !== file.uid)
              that.setData({
                item: that.data.item
              })
              wx.hideLoading();
            }
          })
        }
      },
    })
  },

  // 提交
  linkFunction: function () {
    var that = this;
    wx.showLoading();
    wx.request({
      url: app.globalData.url + '/api/social/submitTask',
      method: 'GET',
      data: {
        taskId: that.data.id,
        userId: wx.getStorageSync('id'),
        taskReport:that.data.taskReport
      },
      success: function (res) {
        wx.hideLoading();
        console.log('res', res);
        if (res.data.code == 0) {
          wx.showToast({
            title: '提交成功',
            icon: 'success',
            duration: 2000
          })
        } else {
          wx.showToast({
            title: res.data.msg,
          })
        }
      }
    })

   
  },
})

 SunshineLnsMinApp/pages/zhghInfo/zhghInfo.wxml

@@ -1,41 +1,43 @@
<!--pages/zhghInfo/zhghInfo.wxml-->

<view class="zhghInfo-bg">
  <view class="zhghInfo-main">
    <view class="zhghInfo-main-img">
      <image src="http://www.gzns.gov.cn/nsjcy/njxw/201911/W020191101471253416700.jpg"></image>
    </view>
    <view class="zhghInfo-main-b">
      <view class="zhghInfo-main-b-left">
        <view class="zhghInfo-main-b-left-div font-lg">街镇老人关护任务</view>
        <view class="zhghInfo-main-b-left-div">2019.12.12 20:00</view>
      </view>
      <view class="zhghInfo-main-b-right">待完成</view>
    </view>
  </view>
    <view class="zhghInfo-main">
        <view class="zhghInfo-main-b">
            <view class="zhghInfo-main-b-left">
                <view class="zhghInfo-main-b-left-div font-lg">{{data.taskTitle}}</view>
                <view class="zhghInfo-main-b-left-div">{{data.startTime}}~{{data.endTime}}</view>
            </view>
            <!-- <view class="zhghInfo-main-b-right">{{data.status}}</view> -->
            <view class="zhghInfo-main-b-right round cu-tag margin-tb-sm lg {{data.status=='未开始'?bg-grey:data.status=='进行中'?bg-red:bg-blue}}">{{data.status}}</view>
        </view>
    </view>

  <view class="zhghInfo-center">
    <view class="zhghInfo-center-title">任务分派时间：
      <text>2019/11/11</text>
    </view>
    <view class="zhghInfo-center-title">任务描述</view>
    <view class="zhghInfo-center-txt">老人们读书讲故事 陪护聊天 积极有耐心</view>
    <view class="zhghInfo-center-txt">处理好老人周边环境，打扫卫生，制造良好环境</view>
  </view>
    <view class="zhghInfo-center">
        <view class="zhghInfo-center-title">任务分派时间：
            <text>{{data.createTime}}</text>
        </view>
        <view class="zhghInfo-center-title">任务描述</view>
        <view class="zhghInfo-center-txt">{{data.taskRequire}}</view>
    </view>

  <view class="zhghInfo-accessory">
    <view class="zhghInfo-center-title">附件</view>
    <view class="zhghInfo-center-img">
      <image mode='widthFix' src="https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1576751446711&di=9a51ccd14d7d6223f49cf72979e74ca0&imgtype=0&src=http%3A%2F%2F08imgmini.eastday.com%2Fmobile%2F20191208%2F20191208110046_ce457572d1c4ffd2702fb562caa4180e_1.jpeg"></image>
      <image mode='widthFix' src="https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1576751446712&di=e0b0e646cc1dd468fafbc791182aeac6&imgtype=0&src=http%3A%2F%2Fcsgy.rmzxb.com.cn%2Fupload%2Fresources%2Fimage%2F2016%2F10%2F17%2F1180737_500x500.jpg"></image>
    </view>
  </view>
    <view class="zhghInfo-accessory">
        <view class="zhghInfo-center-title">附件</view>
        <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}}" class="{{disabled? 'displayNone':'activity-uploadImag-del'}}"></image>
            </view>
            <view bindtap="joinPicture" data-index="{{0}}" data-associatetypeid="{{1000}}" class="{{disabled? 'displayNone':'educt_upload_add'}}">
                <image class="activity-uploadImag-icon" src="{{add}}"></image>
            </view>
        </div>
    </view>

  <view class="zhghInfo-text">
    <view class="zhghInfo-center-title">任务汇报</view>
    <view class="zhghInfo-center-textarea">
      <textarea placeholder="学会与老人沟通，耐心积极，心态良好" placeholder-style="color:#9B9B9B;"></textarea>
    </view>
    <view class="button-submit" bindtap='linkFunction'>提交</view>
  </view>
    <view class="zhghInfo-text">
        <view class="zhghInfo-center-title">任务汇报</view>
        <view class="zhghInfo-center-textarea">
            <textarea data-name="taskReport" bindinput="inputChange" disabled="{{disabled}}"  placeholder="学会与老人沟通，耐心积极，心态良好" placeholder-style="color:#9B9B9B;"></textarea>
        </view>
        <view class="button-submit" bindtap='linkFunction'>提交</view>
    </view>
</view>

 SunshineLnsMinApp/pages/zhghInfo/zhghInfo.wxss

@@ -53,11 +53,39 @@
  margin: 10PX;
}

.upload {
  width: 48px;
  height: 48px;
}

.activity-uploadImag-del {
  width: 20px;
  height: 20px;
  position: absolute;
  left: 28px;
}

.activity-uploadImage {
  display: flex;
  padding: 1vh 2vh;
}

.zhghInfo-center-title text {
  font-size: 14px;
  font-weight: 300;
}

.educt_hasupload_pic {
  display: flex;
  position: relative;
  padding-right: 1vh;
}

.activity-uploadImag-icon {
  width: 48px;
  height: 48px;
}

.zhghInfo-center-txt {
  line-height: 24PX;
  margin-left: 12PX;

 SunshineLnsMinApp/pages/zhghLogin/zhghLogin.js

New file
@@ -0,0 +1,68 @@
// pages/zhghLogin/zhghLogin.js
//获取应用实例
var app = getApp();
Page({
  /**
   * 页面的初始数据
   */
  data: {
    src: app.globalData.imgUrl + '/image/bg1.jpg',
    logo: app.globalData.imgUrl + '/image/logo.png',
    companyAccount: 'admin456',
    companyPassword: 'admin'
  },
  /**
   * 生命周期函数--监听页面加载
   */
  onLoad: function (options) {},

  // 输入框内容
  inputHandler: function (event) {
    var type = event.currentTarget.dataset['type'];
    console.log(type)
    console.log(event.detail.value)
    this.setData({
      [type]: event.detail.value
    })
  },

  //登录
  simulationButton: function () {
    const {
      companyAccount,
      companyPassword
    } = this.data;
    let that = this;
    wx.request({
      url: app.globalData.url + '/api/socialCompany/loginCheck',
      method: 'POST',
      data: {
        companyAccount,
        companyPassword
      },
      success: function (res) {
        console.log(res)
        if (res.data.code == 0) {
          wx.showToast({
            title: '登录成功！',
            icon: 'success',
            duration: 1500,
            success: function () {
              wx.setStorageSync('id', res.data.data.id)
              setTimeout(() => {
                wx.navigateTo({
                  url: '../zhgh/zhgh'
                })
              }, 1500);
            }
          })
        } else {
          wx.showToast({
            title: res.data.msg,
            icon: 'none'
          })
        }
      }
    })
  }
})

 SunshineLnsMinApp/pages/zhghLogin/zhghLogin.json

New file
@@ -0,0 +1,3 @@
{
  "navigationBarTitleText": "社会关护"
}

 SunshineLnsMinApp/pages/zhghLogin/zhghLogin.wxml

New file
@@ -0,0 +1,17 @@
<!--pages/zhghLogin/zhghLogin.wxml-->
<view class="index-main">
    <image class="index-icon" src="{{src}}"></image>

</view>

<view class='buttom-button'>
    <view class='login-item'>
        <text class="cuIcon-people lg text-black"></text>
        <input bindinput='inputHandler' data-type='companyAccount' class='login-item-input' placeholder='请输入账号' type='text'></input>
    </view>
    <view class='login-item'>
        <text class="cuIcon-lock lg text-black"></text>
        <input bindinput='inputHandler' data-type='companyPassword' type='password' class='login-item-input' placeholder='请输入密码'></input>
    </view>
    <button bindtap='simulationButton' class='login-submit-btn'>登录</button>
</view>

 SunshineLnsMinApp/pages/zhghLogin/zhghLogin.wxss

New file
@@ -0,0 +1,39 @@
/* pages/zhghLogin/zhghLogin.wxss */

.index-icon {
  width: 100%;
  height: 32vh;
  background-size: cover;
}

.login-item {
  display: flex;
  margin: 24rpx 42rpx;
  background-color: #fafafa;
  font-size: 28rpx;
  align-items: center;
}

.login-main {
  height: 100vh;
  background-color: #fff;
}

.login-img {
  width: 38rpx;
  height: 38rpx;
}

.login-item-input {
  margin-left: 12rpx;
  height: 98rpx;
  line-height: 98rpx;
}

.login-submit-btn {
  color: #fff !important;
  margin: 42rpx;
  font-size: 32rpx;
  border-radius: 8rpx;
  background: linear-gradient(135deg, rgba(61, 155, 241) 0%, rgba(23, 144, 255) 100%);
}

 SunshineLnsMinApp/pages/zhwj/zhwj.wxml

@@ -21,7 +21,7 @@
    </view>
  </view>
  <view class="zhwj-list-flex">
    <view class="zhwj-list-flex-l" data-str="zhgh" bindtap='linkFunction'>
    <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>