Merge branch 'feature/maolipeng/20210610/zuhuyouhua' into dev

# Conflicts: # yarn.lock

Merge branch 'feature/maolipeng/20210610/zuhuyouhua' into dev
# Conflicts: # yarn.lock
603dedf5 · maolipeng · a3dde9bc · b3f22742 · 603dedf5 · 603dedf5
Commit 603dedf5 authored Jun 25, 2021 by maolipeng
Show whitespace changes
Inline Side-by-side

Showing with 78 additions and 49 deletions

src/modules/college-manage/LimitTip.tsx
+3 -3

src/modules/home/Home.jsx
+1 -1

src/modules/root/Menu.tsx
+4 -4

yarn.lock
+70 -41

No files found.
--- a/src/modules/college-manage/LimitTip.tsx
+++ b/src/modules/college-manage/LimitTip.tsx
@@ -7,13 +7,13 @@ import "./LimitTip.less"
 export default function LimitTip(props:{total:number,type:string,tip:() => React.ReactNode}) {
    const [isOver, setIsOver] = useState(false)
-    const [limitUser, setLimitUser] = useState(0)
+    const [limitUser, setLimitUser] = useState("0")
    useEffect(()=> {
      BaseService.getLesseeVersionMsg()
      .then(res=> {
-        setIsOver(res.result.surplusUserNum === 0 || res.result.whetherReachUserNum)
+        setIsOver(res.result.whetherReachUserNum)
-        setLimitUser(res.result.userNum)
+        setLimitUser(res.result.userNum === -1 ?  "不限人数" : res.result.userNum)
      })
    },[])

--- a/src/modules/home/Home.jsx
+++ b/src/modules/home/Home.jsx
@@ -36,7 +36,7 @@ function HomeTip() {
  useEffect(()=> {
    BaseService.getLesseeVersionMsg()
    .then(res=> {
-        setIsOverNum(res.result.surplusUserNum === 0)
+        setIsOverNum(res.result.whetherReachUserNum)
        setSurplusDay(res.result.surplusDayTime)
        setExpirationTime(moment(res.result.validEndTime).format("YYYY-MM-DD"))
        if (res.result.stateEnum === "NO") {

--- a/src/modules/root/Menu.tsx
+++ b/src/modules/root/Menu.tsx
@@ -43,8 +43,8 @@ function VersionPanel(props:any) {
      User.setVersion(version)
      let versioninfo = {
-        userNum: version.userNum,
+        userNum: version.userNum === -1 ? "不限人数" : version.userNum,
-        surplusUserNum: version.surplusUserNum,
+        surplusUserNum: version.userNum === -1 ? "不限人数" : version.surplusUserNum,
        surplusDayTime: version.surplusDayTime,
        validEndTime: moment(version.validEndTime).format("YYYY-MM-DD"),
        validStartTime: moment(version.validStartTime).format("YYYY-MM-DD"),
@@ -88,7 +88,7 @@ function VersionPanel(props:any) {
      {isExpiration ? <div className="expiration-tag">已过期</div> : ""}
      <div className="content">
-        <div className="widget" style={{marginRight:"40px",marginBottom:"16px"}}>
+        <div className="widget" style={{marginRight:"26px",marginBottom:"16px",width:"70px"}}>
          <div className="lable">剩余天数</div>
          <div className="lable-text">{versionInfo.surplusDayTime}</div>
        </div>
@@ -96,7 +96,7 @@ function VersionPanel(props:any) {
          <div className="lable">有效起止日期</div>
          <div className="lable-text">{versionInfo.validStartTime}~{versionInfo.validEndTime}</div>
        </div>
-        <div className="widget" style={{marginRight:"40px",marginBottom:"8px"}}>
+        <div className="widget" style={{marginRight:"26px",marginBottom:"8px",width:"70px"}}>
          <div className="lable">剩余人数</div>
          <div className="lable-text">{versionInfo.surplusUserNum}</div>
        </div>

--- a/yarn.lock
+++ b/yarn.lock
@@ -2451,10 +2451,10 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
    "@types/color-name" "^1.1.1"
    color-convert "^2.0.1"
-antd@^4.9.4:
+antd@4.16.5:
-  version "4.15.6"
+  version "4.16.5"
-  resolved "https://registry.yarnpkg.com/antd/-/antd-4.15.6.tgz#bc4359b8f232c8bbb073d7236446edc9aa658d38"
+  resolved "https://registry.nlark.com/antd/download/antd-4.16.5.tgz#6105bd848fb2e468e0d1d3ec024c82d2516587ef"
-  integrity sha512-uXn1uRFlPLrAmjfkyxKc3avMVO5N30o3YoSMSJPRw5OLNjOfWsnZDPKvZwinn+QQE9N7dRXylcMfNvl11LH2gA==
+  integrity sha1-YQW9hI+y5Gjg0dPsAkyC0lFlh+8=
  dependencies:
    "@ant-design/colors" "^6.0.0"
    "@ant-design/icons" "^4.6.2"
@@ -2474,10 +2474,10 @@ antd@^4.9.4:
    rc-field-form "~1.20.0"
    rc-image "~5.2.4"
    rc-input-number "~7.1.0"
-    rc-mentions "~1.5.0"
+    rc-mentions "~1.6.1"
-    rc-menu "~8.10.0"
+    rc-menu "~9.0.12"
    rc-motion "^2.4.0"
-    rc-notification "~4.5.2"
+    rc-notification "~4.5.7"
    rc-pagination "~3.1.6"
    rc-picker "~2.5.10"
    rc-progress "~3.1.0"
@@ -2487,15 +2487,15 @@ antd@^4.9.4:
    rc-slider "~9.7.1"
    rc-steps "~4.1.0"
    rc-switch "~3.2.0"
-    rc-table "~7.13.0"
+    rc-table "~7.15.1"
-    rc-tabs "~11.7.0"
+    rc-tabs "~11.9.1"
    rc-textarea "~0.3.0"
    rc-tooltip "~5.1.1"
    rc-tree "~4.1.0"
    rc-tree-select "~4.3.0"
    rc-trigger "^5.2.1"
    rc-upload "~4.3.0"
-    rc-util "^5.9.4"
+    rc-util "^5.13.1"
    scroll-into-view-if-needed "^2.2.25"
    warning "^4.0.3"
@@ -6376,7 +6376,8 @@ hmac-drbg@^1.0.0:
    minimalistic-assert "^1.0.0"
    minimalistic-crypto-utils "^1.0.1"
-hoist-non-react-statics@^3.1.0, hoist-non-react-statics@^3.3.2:
+hoist-non-react-statics@^3.1.0:
  version "3.3.2"
  resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45"
  integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==
@@ -10578,7 +10579,7 @@ rc-drawer@~4.3.0:
    classnames "^2.2.6"
    rc-util "^5.7.0"
-rc-dropdown@^3.1.3, rc-dropdown@~3.2.0:
+rc-dropdown@^3.2.0, rc-dropdown@~3.2.0:
  version "3.2.0"
  resolved "https://registry.yarnpkg.com/rc-dropdown/-/rc-dropdown-3.2.0.tgz#da6c2ada403842baee3a9e909a0b1a91ba3e1090"
  integrity sha512-j1HSw+/QqlhxyTEF6BArVZnTmezw2LnSmRk6I9W7BCqNCKaRwleRmMMs1PHbuaG8dKHVqP6e21RQ7vPBLVnnNw==
@@ -10615,30 +10616,29 @@ rc-input-number@~7.1.0:
    classnames "^2.2.5"
    rc-util "^5.9.8"
-rc-mentions@~1.5.0:
+rc-mentions@~1.6.1:
-  version "1.5.3"
+  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/rc-mentions/-/rc-mentions-1.5.3.tgz#b92bebadf8ad9fb3586ba1af922d63b49d991c67"
+  resolved "https://registry.nlark.com/rc-mentions/download/rc-mentions-1.6.1.tgz?cache=0&sync_timestamp=1621867143484&other_urls=https%3A%2F%2Fregistry.nlark.com%2Frc-mentions%2Fdownload%2Frc-mentions-1.6.1.tgz#46035027d64aa33ef840ba0fbd411871e34617ae"
-  integrity sha512-NG/KB8YiKBCJPHHvr/QapAb4f9YzLJn7kDHtmI1K6t7ZMM5YgrjIxNNhoRKKP9zJvb9PdPts69Hbg4ZMvLVIFQ==
+  integrity sha1-RgNQJ9ZKoz74QLoPvUEYceNGF64=
  dependencies:
    "@babel/runtime" "^7.10.1"
    classnames "^2.2.6"
-    rc-menu "^8.0.1"
+    rc-menu "^9.0.0"
    rc-textarea "^0.3.0"
    rc-trigger "^5.0.4"
    rc-util "^5.0.1"
-rc-menu@^8.0.1, rc-menu@^8.6.1, rc-menu@~8.10.0:
+rc-menu@^9.0.0, rc-menu@~9.0.12:
-  version "8.10.8"
+  version "9.0.12"
-  resolved "https://registry.yarnpkg.com/rc-menu/-/rc-menu-8.10.8.tgz#c3eb2158b3983e42a67192babad9c8128755d26a"
+  resolved "https://registry.nlark.com/rc-menu/download/rc-menu-9.0.12.tgz#492c4bb07a596e2ce07587c669b27ee28c3810c5"
-  integrity sha512-0gnSR0nmR/60NnK+72EGd+QheHyPSQ3wYg1TwX1zl0JJ9Gm0purFFykCXVv/G0Jynpt0QySPAos+bpHpjMZdoQ==
+  integrity sha1-SSxLsHpZbizgdYfGabJ+4ow4EMU=
  dependencies:
    "@babel/runtime" "^7.10.1"
    classnames "2.x"
-    mini-store "^3.0.1"
+    rc-motion "^2.4.3"
-    rc-motion "^2.0.1"
+    rc-overflow "^1.2.0"
    rc-trigger "^5.1.2"
-    rc-util "^5.7.0"
+    rc-util "^5.12.0"
-    resize-observer-polyfill "^1.5.0"
    shallowequal "^1.1.0"
 rc-motion@^2.0.0, rc-motion@^2.0.1, rc-motion@^2.2.0, rc-motion@^2.3.0, rc-motion@^2.3.4, rc-motion@^2.4.0:
@@ -10650,10 +10650,19 @@ rc-motion@^2.0.0, rc-motion@^2.0.1, rc-motion@^2.2.0, rc-motion@^2.3.0, rc-motio
    classnames "^2.2.1"
    rc-util "^5.2.1"
-rc-notification@~4.5.2:
+rc-motion@^2.4.3:
-  version "4.5.5"
+  version "2.4.4"
-  resolved "https://registry.yarnpkg.com/rc-notification/-/rc-notification-4.5.5.tgz#9660a495d5f20bd677686e4f7fc00e4f0c1a3849"
+  resolved "https://registry.nlark.com/rc-motion/download/rc-motion-2.4.4.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Frc-motion%2Fdownload%2Frc-motion-2.4.4.tgz#e995d5fa24fc93065c24f714857cf2677d655bb0"
-  integrity sha512-YIfhTSw+h5GsSdgMnuMx24wqiPlg3FeamuOlkh9RkyHx+SeZVAKzQ0juy2NGvPEF2hDWi5xTqxUqLdo0L2AmGg==
+  integrity sha1-6ZXV+iT8kwZcJPcUhXzyZ31lW7A=
+  dependencies:
+    "@babel/runtime" "^7.11.1"
+    classnames "^2.2.1"
+    rc-util "^5.2.1"
+rc-notification@~4.5.7:
+  version "4.5.7"
+  resolved "https://registry.nlark.com/rc-notification/download/rc-notification-4.5.7.tgz#265e6e6a0c1a0fac63d6abd4d832eb8ff31522f1"
+  integrity sha1-Jl5uagwaD6xj1qvU2DLrj/MVIvE=
  dependencies:
    "@babel/runtime" "^7.10.1"
    classnames "2.x"
@@ -10670,6 +10679,16 @@ rc-overflow@^1.0.0:
    rc-resize-observer "^1.0.0"
    rc-util "^5.5.1"
+rc-overflow@^1.2.0:
+  version "1.2.2"
+  resolved "https://registry.nlark.com/rc-overflow/download/rc-overflow-1.2.2.tgz#95b0222016c0cdbdc0db85f569c262e7706a5f22"
+  integrity sha1-lbAiIBbAzb3A24X1acJi53BqXyI=
+  dependencies:
+    "@babel/runtime" "^7.11.1"
+    classnames "^2.2.1"
+    rc-resize-observer "^1.0.0"
+    rc-util "^5.5.1"
 rc-pagination@~3.1.6:
  version "3.1.6"
  resolved "https://registry.yarnpkg.com/rc-pagination/-/rc-pagination-3.1.6.tgz#db3c06e50270b52fe272ac527c1fdc2c8d28af1f"
@@ -10760,26 +10779,27 @@ rc-switch@~3.2.0:
    classnames "^2.2.1"
    rc-util "^5.0.1"
-rc-table@~7.13.0:
+rc-table@~7.15.1:
-  version "7.13.3"
+  version "7.15.2"
-  resolved "https://registry.yarnpkg.com/rc-table/-/rc-table-7.13.3.tgz#25d5f5ec47ee2d8a293aff18c4c4b8876f78c22b"
+  resolved "https://registry.nlark.com/rc-table/download/rc-table-7.15.2.tgz#f6ab73b2cfb1c76f3cf9682c855561423c6b5b22"
-  integrity sha512-oP4fknjvKCZAaiDnvj+yzBaWcg+JYjkASbeWonU1BbrLcomkpKvMUgPODNEzg0QdXA9OGW0PO86h4goDSW06Kg==
+  integrity sha1-9qtzss+xx288+WgshVVhQjxrWyI=
  dependencies:
    "@babel/runtime" "^7.10.1"
    classnames "^2.2.5"
    rc-resize-observer "^1.0.0"
-    rc-util "^5.4.0"
+    rc-util "^5.13.0"
    shallowequal "^1.1.0"
-rc-tabs@~11.7.0:
+rc-tabs@~11.9.1:
-  version "11.7.3"
+  version "11.9.1"
-  resolved "https://registry.yarnpkg.com/rc-tabs/-/rc-tabs-11.7.3.tgz#32a30e59c6992d60fb58115ba0bf2652b337ed43"
+  resolved "https://registry.nlark.com/rc-tabs/download/rc-tabs-11.9.1.tgz?cache=0&sync_timestamp=1621867452307&other_urls=https%3A%2F%2Fregistry.nlark.com%2Frc-tabs%2Fdownload%2Frc-tabs-11.9.1.tgz#5b2e74da9a276978c2172ef9a05ae8af14da74cb"
-  integrity sha512-5nd2NVss9TprPRV9r8N05SjQyAE7zDrLejxFLcbJ+BdLxSwnGnk3ws/Iq0smqKZUnPQC0XEvnpF3+zlllUUT2w==
+  integrity sha1-Wy502ponaXjCFy75oFrorxTadMs=
  dependencies:
    "@babel/runtime" "^7.11.2"
    classnames "2.x"
-    rc-dropdown "^3.1.3"
+    rc-dropdown "^3.2.0"
-    rc-menu "^8.6.1"
+    rc-menu "^9.0.0"
    rc-resize-observer "^1.0.0"
    rc-util "^5.5.0"
@@ -10860,6 +10880,15 @@ rc-util@^5.0.1:
    react-is "^16.12.0"
    shallowequal "^1.1.0"
+rc-util@^5.12.0, rc-util@^5.13.0, rc-util@^5.13.1:
+  version "5.13.1"
+  resolved "https://registry.nlark.com/rc-util/download/rc-util-5.13.1.tgz#03e74955b5c46a58cbc6236e4d30dd462c755290"
+  integrity sha1-A+dJVbXEaljLxiNuTTDdRix1UpA=
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    react-is "^16.12.0"
+    shallowequal "^1.1.0"
 rc-virtual-list@^3.0.1, rc-virtual-list@^3.2.0:
  version "3.2.6"
  resolved "https://registry.yarnpkg.com/rc-virtual-list/-/rc-virtual-list-3.2.6.tgz#2c92a40f4425e19881b38134d6bd286a11137d2d"
@@ -11733,7 +11762,7 @@ shallow-clone@^0.1.2:
    lazy-cache "^0.2.3"
    mixin-object "^2.0.1"
-shallowequal@^1.0.2, shallowequal@^1.1.0:
+shallowequal@^1.1.0:
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/shallowequal/-/shallowequal-1.1.0.tgz#188d521de95b9087404fd4dcb68b13df0ae4e7f8"
  integrity sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==