forked from nsjcy/frontEnd/nsjcy

xuxj
2020-04-26 8b3fbce45058894a76aefbf11b3a199f60d487d6
bug修改
18 files modified
223 ■■■■■ changed files
SunshineIns/src/fetch/_fetch.js 5 ●●●●● patch | view | raw | blame | history
SunshineIns/src/fetch/appointment.js 9 ●●●●● patch | view | raw | blame | history
SunshineIns/src/page/ArticleEidt.jsx 4 ●●●● patch | view | raw | blame | history
SunshineIns/src/page/Company.jsx 17 ●●●●● patch | view | raw | blame | history
SunshineIns/src/page/KnowledgeBase.jsx 20 ●●●●● patch | view | raw | blame | history
SunshineIns/src/page/LawSubscribe.jsx 18 ●●●● patch | view | raw | blame | history
SunshineIns/src/page/LawSubscribeDetail.jsx 14 ●●●●● patch | view | raw | blame | history
SunshineIns/src/page/NoInspectionReportList.jsx 9 ●●●●● patch | view | raw | blame | history
SunshineIns/src/page/SupPerson.jsx 35 ●●●●● patch | view | raw | blame | history
SunshineIns/src/page/UnitManage.jsx 18 ●●●●● patch | view | raw | blame | history
SunshineIns/src/page/UserManage.jsx 8 ●●●●● patch | view | raw | blame | history
SunshineIns/src/view/tree/index.jsx 2 ●●● patch | view | raw | blame | history
SunshineLnsMinApp/app.js 4 ●●●● patch | view | raw | blame | history
SunshineLnsMinApp/pages/createSub/createSub.wxml 18 ●●●● patch | view | raw | blame | history
SunshineLnsMinApp/pages/xsjb/xsjb.wxml 12 ●●●●● patch | view | raw | blame | history
SunshineLnsMinApp/pages/yshjqyfw/yshjqyfw.wxml 2 ●●● patch | view | raw | blame | history
SunshineLnsMinApp/pages/zdyf/zdyf.wxml 24 ●●●●● patch | view | raw | blame | history
SunshineLnsMinApp/project.config.json 4 ●●●● patch | view | raw | blame | history
SunshineIns/src/fetch/_fetch.js
@@ -2,11 +2,10 @@
// export const base = 'http://xnwj.gznsjc.gov.cn';
// export const base = 'http://1p885086k1.iok.la';
export const base = 'http://nsjcy.hugeinfo.com.cn';
//export const base = 'http://nsjcy.hugeinfo.com.cn';
// export const base = 'http://1p885086k1.iok.la';
//  export const base = 'http://localhost:8080';
export const base = 'http://localhost:6060';
export const domain = base + '/nsjc-charge/';
SunshineIns/src/fetch/appointment.js
@@ -1,12 +1,11 @@
import fetch from './_fetch';
import { message } from 'antd';
export default ({
    userName,
    nature,
    content,
    createTime,
    contactName,
    contactPhone,
    activitiesTime,
    status
}) => fetch(`api/v1/appointment/finds?userName=${userName || ''}&nature=${nature || ''}&content=${content || ''}&createTime=${createTime || ''}&businessType=26&status=${status || ''}`)
}) => fetch(`api/v1/appointment/finds?contactName=${contactName || ''}&contactPhone=${contactPhone || ''}&activitiesTime=${activitiesTime || ''}&businessType=26&status=${status || ''}`)
    .then(
        json => json.data
    )
SunshineIns/src/page/ArticleEidt.jsx
@@ -89,6 +89,10 @@
    const list = this.state.selectedRow.map(({ id }) => id);
    const { savedate } = this.state;
    savedate.list = list;
    if (!savedate.title) {
      message.warning("请输入信息标题");
      return;
    }
    if (!savedate.channelIdd) {
      message.warning("请选择信息分类");
      return;
SunshineIns/src/page/Company.jsx
@@ -92,6 +92,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({
@@ -99,11 +105,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.saveCompany(savedate)
SunshineIns/src/page/KnowledgeBase.jsx
@@ -102,6 +102,26 @@
  handleOk = () => {
    this.setState({ loading: true });
    const { savedate } = this.state;
    if (!savedate.title) {
      this.setState({
        loading: false
      });
      return message.warning("知识库标题不能为空");
    }
    if (!savedate.faqType) {
      this.setState({
        loading: false
      });
      return message.warning("问题类型不能为空");
    }
    if (!savedate.content) {
      this.setState({
        loading: false
      });
      return message.warning("知识库内容不能为空");
    }
    Fetch.saveFaq(savedate)
      .then(res => {
        if (res.statuscode === 1) {
SunshineIns/src/page/LawSubscribe.jsx
@@ -14,18 +14,6 @@
import Fetch from '../fetch';
import TableView from '../view/TableView';
const Option = Select.Option;
function typeOfName(type) {
  switch (type) {
    case 1:
      return "涉黑涉恶违法犯罪行为";
    case 2:
      return "涉黑涉恶违法犯罪保护伞";
    case 3:
      return "其他";
    default:
      return "Unkonw";
  }
}
export default class LawSubscribe extends React.Component {
  constructor(props) {
    super(props);
@@ -149,10 +137,10 @@
    return (
      <div className="app-page">
        <HeadView history={this.props.history} />
        {/* <Breadcrumb style={{ padding: '20px' }}>
        <Breadcrumb style={{ padding: '20px' }}>
          <Breadcrumb.Item><a href="">后台中心</a></Breadcrumb.Item>
          <Breadcrumb.Item>扫黑除恶</Breadcrumb.Item>
        </Breadcrumb> */}
          <Breadcrumb.Item>普法预约</Breadcrumb.Item>
        </Breadcrumb>
        <TableBtnView name={''} key={resetKey}>
          <Input placeholder="联系人模糊查询" style={{ width: "200px" }} name='contactName' onChange={this.onInputChange} />
          <Input placeholder="联系电话模糊查询" style={{ width: "200px" }} name='contactPhone' onChange={this.onInputChange} />
SunshineIns/src/page/LawSubscribeDetail.jsx
@@ -146,6 +146,20 @@
                    <td className="table-vaule3">学校地址</td>
                    <td className="table-vaule4">{data.schoolAddress}</td>
                  </tr>
                  <tr>
                    <td className="table-vaule1">活动时间</td>
                    <td className="table-vaule2">{moment(data.activitiesTime).format("YYYY-MM-DD HH:mm")}</td>
                    <td className="table-vaule3">活动人数</td>
                    <td className="table-vaule4">{data.activitiesNum}</td>
                  </tr>
                  <tr>
                    <td className="table-vaule1">活动地址</td>
                    <td className="table-vaule2">{data.activitiesAddress}</td>
                  </tr>
                  <tr>
                    <td className="table-vaule1">活动备注</td>
                    <td className="table-vaule2">{data.remake}</td>
                  </tr>
                </tbody>
              </table>
SunshineIns/src/page/NoInspectionReportList.jsx
@@ -1,5 +1,5 @@
import React from 'react';
import { Input, Button, DatePicker, Divider, message, Popconfirm, Select, Badge } from 'antd';
import { Breadcrumb } from 'antd';
import HeadView from '../view/HeadView';
import LinkView from '../view/LinkView';
import NoInspectionReportTableList from './NoInspectionReportTableList';
@@ -17,7 +17,7 @@
  componentDidMount() {
    document.title = '未检举报';
    document.title = '举报管理';
    // this.getData();
  }
@@ -31,7 +31,10 @@
    return (
      <div className="app-page">
        <HeadView history={this.props.history} />
        {/* <LinkView sed="未检举报" local="未检举报" /> */}
        <Breadcrumb style={{ padding: '20px' }}>
          <Breadcrumb.Item><a href="">后台中心</a></Breadcrumb.Item>
          <Breadcrumb.Item>举报管理</Breadcrumb.Item>
        </Breadcrumb>
        <div style={{ background: '#fff', margin: 20 }}>
          <NoInspectionReportTableList history={this.props.history} />
        </div>
SunshineIns/src/page/SupPerson.jsx
@@ -92,7 +92,30 @@
  handleOk = () => {
    this.setState({ loading: true });
    const { savedate } = this.state;
    console.log(savedate)
    if (!savedate.name) {
      this.setState({
        loading: false
      });
      return message.warning("人员姓名不能为空");
    }
    if (!savedate.workNo) {
       this.setState({
          loading: false
        });
      return message.warning("工作编号不能为空");
    }
    if (!savedate.post) {
      this.setState({
        loading: false
      });
      return message.warning("人员职位不能为空");
    }
    if (!savedate.unit) {
      this.setState({
        loading: false
      });
      return message.warning("所属单位不能为空");
    }
    if (savedate.phone) {
      if (!validator.mobile(savedate.phone)) {
        this.setState({
@@ -100,6 +123,11 @@
        });
        return message.warning("电话号码格式不正确");
      }
    }else{
      this.setState({
        loading: false
      });
      return message.warning("电话号码不能为空");
    }
    if (savedate.idcard) {
      if (!validator.carIdNumber(savedate.idcard)) {
@@ -108,6 +136,11 @@
        });
        return message.warning("身份证格式不正确");
      }
    }else{
      this.setState({
        loading: false
      });
      return message.warning("身份证号码不能为空");
    }
    Fetch.savePerson(savedate)
      .then(res => {
SunshineIns/src/page/UnitManage.jsx
@@ -159,15 +159,17 @@
  ConfirmTip = (node) => {
    let _this = this
    confirm({
      title: <span style={{ fontSize: 19 }}>确定要删除该资源吗?</span>,
      content: <span style={{ fontSize: 18 }}>删除该资源的同时,会删除与该资源的所有关系,也会删除所有的子资源。</span>,
      title: <span style={{ fontSize: 19 }}>确定要删除该节点吗?</span>,
      content: <span style={{ fontSize: 18 }}>删除该节点的同时,会删除与该节点的所有关系,也会删除所有的发布的信息文章。</span>,
      onOk() {
        Fetch.unitDel(node.id).then(res => {
          message.success('节点删除成功')
          _this.setState({
            rightShow: false
        Fetch.deleteType(node.id)
          .then(data => {
            if (data.statuscode == 1) {
              message.success("删除成功!")
            } else {
              message.error('删除失败,请联系管理员', 2)
            }
          })
        });
        _this.loadData();
        _this.setState({ treeKey: Date.now() - 1512523199245 })
      },
@@ -206,7 +208,7 @@
        <HeadView history={this.props.history} />
        <Breadcrumb style={{ padding: '20px' }}>
          <Breadcrumb.Item><a href="">后台中心</a></Breadcrumb.Item>
          <Breadcrumb.Item>扫黑除恶</Breadcrumb.Item>
          <Breadcrumb.Item>文章分类管理</Breadcrumb.Item>
        </Breadcrumb>
        <div style={{ border: 20, margin: 20, padding: 32, flex: 1, background: '#fff' }} >
          <Row style={{ height: '95%' }} >
SunshineIns/src/page/UserManage.jsx
@@ -176,14 +176,6 @@
          <Input placeholder="根据姓名模糊查询" style={{ width: "200px" }} name='userName' onChange={this.onInputChange} />
          <Input placeholder="根据身份证号模糊查询" style={{ width: "200px" }} name='idcard' onChange={this.onInputChange} />
          <Input placeholder="根据电话号码模糊查询" style={{ width: "200px" }} name='mobile' onChange={this.onInputChange} />
          <Select
            style={{ width: 200 }}
            placeholder="根据状态查询"
            onChange={(value) => this.onInputChange({ target: { name: 'isAudit', value } })}
          >
            <Option value="2">已审核</Option>
            <Option value="1">待审核</Option>
          </Select>
          <Button type="primary" onClick={this.Seaech}>查询</Button>
          <Button onClick={this.Reset}>重置</Button>
        </TableBtnView>
SunshineIns/src/view/tree/index.jsx
@@ -185,7 +185,7 @@
        // style={{height: 413, overflowY: 'auto'}}
        <div>
        <Tree
          defaultExpandAll={true}
          defaultExpandAll={false}
          onSelect={this.treeSelect}
          // onExpand={this.onExpand}
          // expandedKeys={expandedKeys}
SunshineLnsMinApp/app.js
@@ -10,9 +10,9 @@
  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://192.168.0.31:8085/nsjc-charge',
     url: 'http://localhost:6060/nsjc-charge',
    imgUrl: 'https://nsjcy.hugeinfo.com.cn/nsjc-charge',
    // url: 'http://nsjc.vaiwan.com/nsjc-charge',
    // imgUrl: 'http://nsjc.vaiwan.com/nsjc-charge'
SunshineLnsMinApp/pages/createSub/createSub.wxml
@@ -31,19 +31,5 @@
      </view>
    </view>
  </view>
  <!-- <view class="question" wx:if="{{confirm}}">
    <view class="selectType">
      <view class="toRadio" data-type="1" catchtap="toRadio">
        <icon class="iconfont icon-guanbi"></icon>
        单选题
      </view>
      <view class="toFillBlack" data-type="0" catchtap="toRadio">
        <icon class="iconfont icon-combinedshapecopy2"></icon>
        填空题
      </view>
    </view>
  </view> -->
  <button class="btn" catchtap='submit' wx:if="{{confirm}}">提交</button>
  <button class="btn" catchtap='publish' wx:if="{{!confirm}}">确认发布</button>
  <button class="btn" catchtap='returnEdit' wx:if="{{!confirm}}">返回修改</button>
</view>
</view>
<button class="btn" catchtap='submit'>提交</button>
SunshineLnsMinApp/pages/xsjb/xsjb.wxml
@@ -46,7 +46,7 @@
        </wux-cell-group>
        <wux-cell-group title="证明材料上传">
        <wux-cell-group title="证明材料">
            <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>
@@ -96,6 +96,16 @@
            </wux-field>
        </wux-cell-group>
    <wux-cell-group title="回复内容" wx:if="{{thisData.tipoffResult}}">
      <wux-field name="回复内容" initialValue="{{ thisData.tipoffResult }}">
                <wux-cell hover-class="none">
                    <wux-textarea rows="3" bind:change="inputOnchange" data-key="tipoffResult" label="回复内容" placeholder="回复内容" />
                </wux-cell>
            </wux-field>
    </wux-cell-group>
        <view class="padding-sm" wx:if="{{disabled}}">
            <button class="cu-btn block bg-blue margin-tb-sm lg" bindtap="onSubmit">
                提交举报
SunshineLnsMinApp/pages/yshjqyfw/yshjqyfw.wxml
@@ -1,6 +1,6 @@
<!--pages/zhwj/zhwj.wxml-->
<view class="bg-img padding-tb-xl" style="background-image: url('https://nsjcy.hugeinfo.com.cn/nsjc-charge/image/qiyefuwu.png');height: 414rpx;">
<view class="bg-img padding-tb-xl" style="background-image: url('https://nsjcy.hugeinfo.com.cn/nsjc-charge/image/qyfw.jpg');height: 414rpx;">
</view>
<view class="zhwj-list">
SunshineLnsMinApp/pages/zdyf/zdyf.wxml
@@ -1,28 +1,4 @@
<!--pages/zhdt/zhdt.wxml-->
<!-- 搜索 -->
  <view class="lawsList-search">
    <view class="page">
      <view class="page__bd">
        <view class="weui-search-bar">
          <view class="weui-search-bar__form">
            <view class="weui-search-bar__box">
              <icon class="weui-icon-search_in-box" type="search" size="14"></icon>
              <input type="text" class="weui-search-bar__input" placeholder="搜索" value="{{inputVal}}" focus="{{inputShowed}}" bindinput="inputTyping" bindconfirm='confirmTap' />
              <view class="weui-icon-clear" wx:if="{{inputVal.length > 0}}" bindtap="clearInput">
                <icon type="clear" size="14"></icon>
              </view>
            </view>
            <label class="weui-search-bar__label" hidden="{{inputShowed}}" bindtap="showInput">
              <icon class="weui-icon-search" type="search" size="14"></icon>
              <view class="weui-search-bar__text">搜索</view>
            </label>
          </view>
          <view class="weui-search-bar__cancel-btn" hidden="{{!inputShowed}}" bindtap="hideInput">取消</view>
        </view>
      </view>
    </view>
  </view>
<!-- <view class="index-gray "></view> -->
<view class="zhwj-b">
  <view class="zhwj-b-main" wx:for="{{ dataSet }}" data-str="zhdtInfo" data-Id="{{item.id}}" bindtap='linkFunction'>
    <view class="zhwj-b-head-l">
SunshineLnsMinApp/project.config.json
@@ -1,7 +1,7 @@
{
    "description": "项目配置文件。",
    "setting": {
        "urlCheck": true,
        "urlCheck": false,
        "es6": true,
        "postcss": true,
        "minified": true,
@@ -21,7 +21,7 @@
        "preloadBackgroundData": false
    },
    "compileType": "miniprogram",
    "libVersion": "2.10.1",
    "libVersion": "2.10.4",
    "appid": "wx50bea0a98be5935d",
    "projectname": "nsjc",
    "isGameTourist": false,