zls

config/config.js

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

package.json

@@ -67,8 +67,8 @@
     "redux": "^4.0.1",
     "swiper": "^5.3.6",
     "umi": "^2.13.3",
-    "umi-plugin-pro-block": "^1.3.2",
-    "umi-plugin-react": "^1.9.5",
+    "umi-plugin-pro-block": "^1.3.6",
+    "umi-plugin-react": "^1.15.3",
     "umi-request": "^1.0.8",
     "wangeditor": "^3.1.1"
   },
@@ -108,10 +108,10 @@
     "pro-download": "1.0.1",
     "slash2": "^2.0.0",
     "stylelint": "^10.1.0",
-    "umi-plugin-ga": "^1.1.3",
-    "umi-plugin-pro": "^1.0.2",
+    "umi-plugin-ga": "^1.1.6",
+    "umi-plugin-pro": "^1.0.3",
     "umi-types": "^0.3.8",
-    "webpack-theme-color-replacer": "^1.2.15"
+    "webpack-theme-color-replacer": "^1.3.7"
   },
   "optionalDependencies": {
     "puppeteer": "^1.17.0"

src/pages/activity/ActivityList.jsx

@@ -35,9 +35,11 @@ const header = props => {
   useEffect(() => {
 
     if (localStorage.getItem("activePageParams")) {
-      props.form.setFieldsValue(JSON.parse(localStorage.getItem("activePageParams")));
-      // const { getFieldDecorator } = JSON.parse(localStorage.getItem("pageParams"))
 
+      const localStorageValue = JSON.parse(localStorage.getItem("activePageParams"))
+      localStorageValue.time = localStorageValue.time ? moment(localStorageValue.time) : ''
+
+      props.form.setFieldsValue(localStorageValue);
       getList(JSON.parse(localStorage.getItem("activePageParams")))
     } else {
       localStorage.setItem("activePageParams", JSON.stringify({ pageNum: 1, pageSize: 10 }));

src/pages/activity/helpActivity/helpRecord.jsx

@@ -267,7 +267,7 @@ function body(props) {
   const { helpActivityId } = props.location.query
   useEffect(() => {
     console.log('customerType', customerType)
-    getList({ pageNumber: 1, pageSize: 10, status: customerType, helpActivityId })
+    getList({ pageNum: 1, pageSize: 10, status: customerType, helpActivityId })
   }, [])
 
   function getList(params) {

src/pages/activity/helpActivity/list.jsx

@@ -20,9 +20,13 @@ const header = props => {
 
   useEffect(() => {
     if (localStorage.getItem("helpActivePageParams")) {
-      props.form.setFieldsValue(JSON.parse(localStorage.getItem("helpActivePageParams")));
+      // props.form.setFieldsValue(JSON.parse(localStorage.getItem("helpActivePageParams")));
       // const { getFieldDecorator } = JSON.parse(localStorage.getItem("pageParams"))
+      const localStorageValue = JSON.parse(localStorage.getItem("helpActivePageParams"))
+      localStorageValue.startTime = localStorageValue.startTime ? moment(localStorageValue.startTime) : ''
+      localStorageValue.endTime = localStorageValue.endTime ? moment(localStorageValue.endTime) : ''
 
+      props.form.setFieldsValue(localStorageValue);
       getList(JSON.parse(localStorage.getItem("helpActivePageParams")))
     } else {
       localStorage.setItem("helpActivePageParams", JSON.stringify({ pageNum: 1, pageSize: 10 }));

src/pages/building/list/index.jsx

@@ -181,9 +181,13 @@ function body(props) {
   // eslint-disable-next-line react-hooks/rules-of-hooks
   useEffect(() => {
     if (localStorage.getItem("pageParams")) {
-      props.form.setFieldsValue(JSON.parse(localStorage.getItem("pageParams")));
+
       // const { getFieldDecorator } = JSON.parse(localStorage.getItem("pageParams"))
-      getList(JSON.parse(localStorage.getItem("pageParams")))
+      const localStorageValue = JSON.parse(localStorage.getItem("pageParams"))
+      localStorageValue.startDate = localStorageValue.startDate ? moment(localStorageValue.startDate) : ''
+      props.form.setFieldsValue(localStorageValue);
+
+      getList({ pageNum: 1, pageSize: 9, ...JSON.parse(localStorage.getItem("pageParams")) })
     } else {
       getList({ pageNum: 1, pageSize: 9 })
     }

src/pages/customer/customerlist/index.jsx

@@ -76,12 +76,18 @@ function body(props) {
     if (localStorage.getItem("state")) {
       console.log(localStorage.getItem("state"), 'state')
       if (JSON.parse(localStorage.getItem("state")) == 'private') {
-        props.form.setFieldsValue(JSON.parse(localStorage.getItem("priPageParams")));
-        getList({ ...JSON.parse(localStorage.getItem("priPageParams")) })
+        const localStorageValue = JSON.parse(localStorage.getItem("priPageParams"))
+        localStorageValue.startCreateDate = localStorageDate(localStorageValue.startCreateDate)
+        localStorageValue.endCreateDate = localStorageDate(localStorageValue.endCreateDate)
+        props.form.setFieldsValue(localStorageValue);
+        getList({ pageNumber: 1, pageSize: 10, ...JSON.parse(localStorage.getItem("priPageParams")) })
       } else {
         setCustomerType('public')
-        props.form.setFieldsValue(JSON.parse(localStorage.getItem("pubPageParams")));
-        getList({ ...JSON.parse(localStorage.getItem("pubPageParams")) })
+        const localStorageValue = JSON.parse(localStorage.getItem("pubPageParams"))
+        localStorageValue.startCreateDate = localStorageDate(localStorageValue.startCreateDate)
+        localStorageValue.endCreateDate = localStorageDate(localStorageValue.endCreateDate)
+        props.form.setFieldsValue(localStorageValue);
+        getList({ pageNumber: 1, pageSize: 10, ...JSON.parse(localStorage.getItem("pubPageParams")) })
       }
 
     } else {
@@ -92,6 +98,13 @@ function body(props) {
 
   function getList(params) {
     // 网路请求
+    console.log(params, '111111111111111')
+    if (params.startCreateDate) {
+      params.startCreateDate = moment(params.startCreateDate).format('YYYY-MM-DD HH:mm:ss');
+    }
+    if (params.endCreateDate) {
+      params.endCreateDate = moment(params.endCreateDate).format('YYYY-MM-DD HH:mm:ss');
+    }
     request({ ...apis.customer.customerRecommend, params: { ...params } }).then(res => {
       if (params.customerType === 'private') {
         setDataSource(res)
@@ -154,6 +167,8 @@ function body(props) {
     console.log(e)
   }
 
+  const localStorageDate = (date) => date ? moment(date) : ''
+
   // 分页
   function onChange(pageNum) {
     // eslint-disable-next-line react-hooks/rules-of-hooks
@@ -184,8 +199,10 @@ function body(props) {
     localStorage.setItem("state", JSON.stringify(value))
     if (value === 'private') {
       if (localStorage.getItem("priPageParams")) {
-        props.form.setFieldsValue(JSON.parse(localStorage.getItem("priPageParams")));
-
+        const localStorageValue = JSON.parse(localStorage.getItem("priPageParams"))
+        localStorageValue.startCreateDate = localStorageDate(localStorageValue.startCreateDate)
+        localStorageValue.endCreateDate = localStorageDate(localStorageValue.endCreateDate)
+        props.form.setFieldsValue(localStorageValue);
         getList(JSON.parse(localStorage.getItem("priPageParams")))
       } else {
         localStorage.setItem("priPageParams", JSON.stringify({ pageNumber: 1, pageSize: 10, customerType: value }))
@@ -195,9 +212,12 @@ function body(props) {
     } else {
 
       if (localStorage.getItem("pubPageParams")) {
-        props.form.setFieldsValue(JSON.parse(localStorage.getItem("pubPageParams")));
-        // const { getFieldDecorator } = JSON.parse(localStorage.getItem("pageParams"))
-        getList({ customerType, ...JSON.parse(localStorage.getItem("pubPageParams")) })
+        const localStorageValue = JSON.parse(localStorage.getItem("pubPageParams"))
+        localStorageValue.startCreateDate = localStorageDate(localStorageValue.startCreateDate)
+        localStorageValue.endCreateDate = localStorageDate(localStorageValue.endCreateDate)
+        props.form.setFieldsValue(localStorageValue);
+
+        getList( {pageNumber: 1, pageSize: 10, customerType, ...JSON.parse(localStorage.getItem("pubPageParams")) })
       } else {
         localStorage.setItem("pubPageParams", JSON.stringify({ pageNumber: 1, pageSize: 10, customerType: 'public' }))
         getList({ pageNumber: 1, pageSize: 10, customerType: 'public' })

src/pages/record/share/countList.jsx

@@ -167,8 +167,8 @@ function record(props) {
           </Form.Item>
           <Form.Item>
             <span style={{marginRight:'10px'}}>分享时间：</span>
-                {getFieldDecorator('shareTime')(
-                  <RangePicker placeholder={['开始时间','结束时间']} />
+                {getFieldDecorator('shareTime',{initialValue : [moment(),moment()],})(
+                  <RangePicker placeholder={['开始时间','结束时间']}/>
                 )}
           </Form.Item>
           <Form.Item style={{position:'absolute',right:'38px'}}>

src/utils/request.js

@@ -20,7 +20,7 @@ const codeMessage = {
   410: '请求的资源被永久删除，且不会再得到的。',
   422: '当创建一个对象时，发生一个验证错误。',
   500: '服务器发生错误，请检查服务器。',
-  502: '网关错误。',
+  502: '连接服务超时',
   503: '服务不可用，服务器暂时过载或维护。',
   504: '网关超时。',
 };
@@ -70,7 +70,8 @@ request.interceptors.response.use(async (response, options) => {
       const errorText = codeMessage[response.status] || response.statusText;
       const { status, url } = response;
       notification.error({
-        message: `请求错误 ${status}: ${url}`,
+        // message: `连接超时，请刷新或重新登录 ${status}: ${url}`,
+        message: `连接超时，请刷新或重新登录 ${status}: ${url}`,
         description: errorText,
       });
       throw new Error(response.statusText);