feat:........

85c17b16 · maolipeng · 22caeeae · 85c17b16 · 85c17b16 · 85c17b16
Commit 85c17b16 authored Jun 19, 2021 by maolipeng
Show whitespace changes
Inline Side-by-side

Showing with 80 additions and 10 deletions

src/common/js/axios.ts
+9 -2

src/common/js/user.ts
+8 -0

src/modules/root/CollegeManagePage.jsx
+61 -8

src/modules/root/Login.jsx
+2 -0

No files found.
--- a/src/common/js/axios.ts
+++ b/src/common/js/axios.ts
@@ -90,8 +90,8 @@ class Axios {
      instance.interceptors.response.use((response: AxiosResponse): AxiosResponse | AxiosPromise => {
        const { message: ResMessage, success, resultMsg, code: resultCode } = response.data;
-        //服务到期code
+        const requestStatus = response.status;
-        if (resultCode === "10001") {
+        if (requestStatus === 10001) {
          Modal.warning({
            title:"服务已到期",
            content: "当前企业购买的小麦企学院服务已到期，如需继续使用学院功能，请尽快续费购买",
@@ -116,6 +116,13 @@ class Axios {
            window.RCHistory.replace('/login');
            return Promise.reject();
          break;
+          case 10001:
+            Modal.warning({
+              title:"服务已到期",
+              content: "当前企业购买的小麦企学院服务已到期，如需继续使用学院功能，请尽快续费购买",
+              okText: "我知道了"
+            })
+            break;
          default:
            message.error(error.message);
          break;

--- a/src/common/js/user.ts
+++ b/src/common/js/user.ts
@@ -12,6 +12,10 @@ import { PREFIX, USER_PREFIX } from '@/domains/basic-domain/constants';
 class User {
+  getVersion() {
+    return Storage.getObj(`${PREFIX}_version`)
+  }
  getStoreId(){
    return Storage.get(`${PREFIX}_storeId`)
  }
@@ -47,6 +51,10 @@ class User {
    return Storage.get(`${PREFIX}_isAdmin`);
  }
+  setVersion(value:any) {
+    return Storage.setObj(`${PREFIX}_version`,value)
+  }
  setStoreId(value:any){
    return Storage.set(`${PREFIX}_storeId`,value)
  }

--- a/src/modules/root/CollegeManagePage.jsx
+++ b/src/modules/root/CollegeManagePage.jsx
-import React from 'react';
+import React, { useEffect, useState } from 'react';
+import moment from "moment"
 import Service from "@/common/js/service";
 import BaseService from "@/domains/basic-domain/baseService";
 import User from "@/common/js/user";
 import { LIVE_SHARE } from "@/domains/course-domain/constants";
-import moment from 'moment';
 import { Modal, message } from 'antd';
 import './CollegeManagePage.less';
+import storage from '@/common/js/storage';
 const roleMap = {
  CloudManager: "管理员",
@@ -16,22 +17,68 @@ const roleMap = {
 function ExpirationPopover(props) {
+  const [showType, setShowType] = useState(0); //0不显示，1剩余30天，2小于等于7天，3已过期
+  useEffect(()=> {
+    if (props.surplusDayTime === 0 ) {
+      //已过期
+      if (storage.get("expiration_tip"+User.getUserId()+"_login") === "true") {
+        //只有登陆进来的时候提示一次
+        setShowType(3)
+      }
+    } else {
+      //即将过期
+      if (props.surplusDayTime === 30) {
+        if (storage.get("expiration_tip"+User.getUserId()+"_thirty") == null || storage.get("expiration_tip"+User.getUserId()+"_thirty") === "true") {
+          setShowType(1)
+        }
+      } else if (props.surplusDayTime <= 7) {
+        setShowType(2)
+      }
+    }
+  },[props.endTime,props.surplusDayTime])
+  function iknow() {
+    if (props.surplusDayTime === 0 ) {
+      //已过期
+      storage.set("expiration_tip"+User.getUserId()+"_login",false)
+    } else if (props.surplusDayTime === 30) {
+      storage.set("expiration_tip"+User.getUserId()+"_thirty",false)
+    }
+    setShowType(0)
+  }
+  if (props.surplusDayTime > 30) {
+    return ("")
+  }
  return (
+    <>
+      {
+        showType === 0 ? ("") :(
          <div className="expirationpopover">
          <div className="dialog">
          <div className="title">服务到期提醒</div>
-          <div className="tip-text">当前企业购买的小麦企学院服务已于 到期，到期后仍可访问，但功能不可使用，建议尽快续费购买哦~</div>
+          {
+            showType === 3 ? (
+              <div className="tip-text">当前企业购买的小麦企学院服务已于<span style={{color:"#FF4F4F"}}>{moment(props.endTime).format("YYYY-MM-DD")}</span>到期，到期后仍可访问，但功能不可使用，建议尽快续费购买哦~</div>
+            ) : (
+              <div className="tip-text">当前企业购买的小麦企学院服务 <span style={{color:"#FF4F4F"}}>仅剩{props.surplusDayTime}天</span>（于<span>{moment(props.endTime).format("YYYY-MM-DD")}</span>到期），为了不影响使用，建议尽快续费购买哦~</div>
+            )
+          }
          <div className="qrcode">
            <img src="https://cdn.xiaomai5.com/qixueyuankehu.png" alt=""></img>
            <div className="des">微信/企业微信扫码续费</div>
          </div>
          <div className="phone"><svg style={{position:"relative",top:"2px",marginRight:"4px"}} viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path d="M512.651 3.78c-281.433 0-509.21 228.324-509.21 509.209 0 281.43 228.325 509.203 509.21 509.203 281.427 0 509.202-228.317 509.202-509.203 0.55-280.885-227.775-509.21-509.202-509.21z m198.205 743.553c-36.14 36.136-169.737 1.641-302.24-130.312-131.953-131.959-165.902-266.104-129.768-301.695 31.211-31.21 68.99-85.417 125.939-14.782 56.943 70.629 29.016 90.34-3.291 122.647-22.449 22.448 24.642 79.392 73.37 128.125 49.283 48.73 105.678 95.818 128.126 73.368 32.306-32.305 52.017-60.23 122.646-3.288 71.182 56.949 16.426 95.276-14.782 125.937z" p-id="4409" fill="#999999"></path></svg>
          咨询电话：19157875632</div>
-          <div className="button">我知道了</div>
+          <div className="button" onClick={iknow}>我知道了</div>
        </div>
        </div>
        )
+      }
+    </>
+  )
 }
 export default class CollegeManagePage extends React.Component {
@@ -44,7 +91,9 @@ export default class CollegeManagePage extends React.Component {
      enterpriseId: User.getEnterpriseId(),
      isAdmin: false,
      createStoreList:[],
-      joinStoreList:[]
+      joinStoreList:[],
+      surplusDayTime:365, //剩余天数
+      endTime: 0 //有效截至时间
    };
  }
@@ -69,7 +118,11 @@ export default class CollegeManagePage extends React.Component {
  getVersion() {
    BaseService.getLesseeVersionMsg()
    .then(res=> {
-      console.log(res)
+      User.setVersion(res.result)
+      this.setState({
+        surplusDayTime: res.result.stateEnum === "YES" ? 0 : res.result.surplusDayTime,
+        endTime: res.result.validEndTime
+      })
    })
  }
@@ -160,7 +213,7 @@ export default class CollegeManagePage extends React.Component {
    } = this.state;
    return (
      <div className="college-manage-page">
-        <ExpirationPopover />
+        <ExpirationPopover surplusDayTime={this.state.surplusDayTime} endTime={this.state.endTime}/>
        <div className="college-header">
          <div className="box">
            <img className="box-image" src="https://image.xiaomaiketang.com/xm/fe4NCjr7XF.png" />

--- a/src/modules/root/Login.jsx
+++ b/src/modules/root/Login.jsx
@@ -6,6 +6,7 @@ import CheckBeforeSendCode from '../../components/CheckBeforeSendCode'
 import User from '@/common/js/user'
 import WechatLogin from './WechatLogin'
 import BaseService from '@/domains/basic-domain/baseService'
+import storage from '@/common/js/storage'
 import axios from 'axios'
 import _ from 'underscore'
 import user from '@/common/js/user'
@@ -43,6 +44,7 @@ function Login(props) {
      User.removeToken()
      User.removeEnterpriseId()
    }
+    storage.set("expiration_tip_login",true)
  }, [])
  function getWXWorkLoginNoCheck(enterpriseId, userId) {
    const params = {