From 704f82b06befe96e5f739b2dce419f76f5683a6f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 15 八月 2022 09:27:54 +0800
Subject: [PATCH] Merge branch 'develop'

---
 src/tabviews/custom/components/timeline/normal-timeline/index.jsx |   35 +++++++++++++++++++++++++++++++++++
 1 files changed, 35 insertions(+), 0 deletions(-)

diff --git a/src/tabviews/custom/components/timeline/normal-timeline/index.jsx b/src/tabviews/custom/components/timeline/normal-timeline/index.jsx
index 13127d8..c4a13c7 100644
--- a/src/tabviews/custom/components/timeline/normal-timeline/index.jsx
+++ b/src/tabviews/custom/components/timeline/normal-timeline/index.jsx
@@ -240,6 +240,11 @@
       return
     }
 
+    // if (config.setting.interType === 'inner' && config.setting.innerFunc === 'z_mk_express') {
+    //   this.getExpress()
+    //   return
+    // }
+
     this.setState({
       loading: true
     })
@@ -272,6 +277,36 @@
     }
   }
 
+  getExpress = () => {
+    this.setState({
+      loading: true
+    })
+    Api.wxNginxRequest(`express/yuantong/YT6590674317601`, 'get').then(res => {
+      if (!res || typeof(res) !== 'string') {
+        notification.error({
+          top: 92,
+          message: '鏈幏鍙栧埌蹇�掍俊鎭�',
+          duration: 10
+        })
+      } else {
+        let data = res.split(/\n/).filter(Boolean)
+
+        data = data.map((item, i) => {
+          return {
+            $Index: i,
+            date: item.substr(0, 19),
+            content: item.substr(20)
+          }
+        })
+
+        this.setState({
+          data: data,
+          loading: false
+        })
+      }
+    })
+  }
+
   getnodes = (data) => {
     const { config, card } = this.state
 

--
Gitblit v1.8.0