瀏覽代碼

Merge branch 'master' of http://git.ycjcjy.com/zhiyuxing/estateagents-admin-manager

weichaochao 5 年之前
父節點
當前提交
4c6b3ed24e

+ 2
- 2
config/config.js 查看文件

@@ -83,8 +83,8 @@ export default {
83 83
   targets: {
84 84
     ie: 11,
85 85
   },
86
-  publicPath: './',
87
-  // publicPath: 'https://njcjweb.oss-accelerate.aliyuncs.com/admin/',
86
+  // publicPath: './',
87
+  publicPath: 'https://njcjweb.oss-accelerate.aliyuncs.com/admin/',
88 88
   history: 'hash',
89 89
   devtool: isAntDesignProPreview ? 'source-map' : false,
90 90
   // umi routes: https://umijs.org/zh/guide/router.html

+ 5
- 5
config/routes.js 查看文件

@@ -497,11 +497,11 @@ export default [
497 497
                 name: '报备记录',
498 498
                 component: './record/report/index',
499 499
               },
500
-              {
501
-                path: '/record/drainage/DrainageVisitRecordList',
502
-                name: '分享记录',
503
-                component: './record/drainage/DrainageVisitRecordList',
504
-              },
500
+              // {
501
+              //   path: '/record/drainage/DrainageVisitRecordList',
502
+              //   name: '分享记录',
503
+              //   component: './record/drainage/DrainageVisitRecordList',
504
+              // },
505 505
               {
506 506
                 path: '/record/share/countList',
507 507
                 name: '销售分享统计',

+ 1
- 1
src/components/SelectButton/BuildSelect.jsx 查看文件

@@ -29,7 +29,7 @@ const BuildingSelect = props => {
29 29
 
30 30
   const getBuildList = e => {
31 31
     request({ ...apis.building.buildingSelect, params: { pageNum: 1, pageSize: 999 } }).then(data => {
32
-        setData(data.records)
32
+        setData(data)
33 33
         checkValue(data.records)
34 34
         // 默认选中第一个
35 35
     })

+ 1
- 1
src/pages/record/share/countList.jsx 查看文件

@@ -138,7 +138,7 @@ function record(props) {
138 138
           </Form.Item>
139 139
           <Form.Item>
140 140
             <span style={{marginRight:'10px'}}>分享时间:</span>
141
-                {getFieldDecorator('shareTime')(
141
+                {getFieldDecorator('shareTime',{initialValue : [moment(),moment()],})(
142 142
                   <RangePicker placeholder={['开始时间','结束时间']}/>
143 143
                 )}
144 144
           </Form.Item>

+ 1
- 1
src/pages/staff/list/editStaff.jsx 查看文件

@@ -55,7 +55,7 @@ const Edit = (props) => {
55 55
   //获取项目列表
56 56
   const getBuildList = e => {
57 57
     request({ ...apis.building.buildingSelect, params: { pageNum: 1, pageSize: 999 } }).then(data => {
58
-        setBuildData(data.records)
58
+        setBuildData(data)
59 59
     })
60 60
   }
61 61
 

+ 1
- 1
src/pages/system/document/audit.jsx 查看文件

@@ -26,7 +26,7 @@ const noauditPass = {
26 26
 function body (props) {
27 27
   const documentVerifyId = props.location.query.id
28 28
   const [data, setData] = useState([])
29
-  const [datas, setDatas] = useState({})
29
+  const [datas, setDatas] = useState({size: 0})
30 30
   // const [status,setStatus] = useState()
31 31
   useEffect(() => {
32 32
     getList()