Skip to content

W
wechat-common
Commit 36a38734 by wufan
Options

Merge branch 'feature/pangguoming/20210630/tenant_config_add' into 'master' 

Feature/pangguoming/20210630/tenant config add

See merge request !4
parents 32f48f21 b2f0792a
Showing with 159 additions and 63 deletions
config/webpack.config.js
......@@ -26,17 +26,14 @@ const ForkTsCheckerWebpackPlugin = require('react-dev-utils/ForkTsCheckerWebpack
const typescriptFormatter = require('react-dev-utils/typescriptFormatter');
const postcssNormalize = require('postcss-normalize');
const vConsolePlugin = require('vconsole-webpack-plugin');
const appPackageJson = require(paths.appPackageJson);
// Source maps are resource heavy and can cause out of memory issue for large source files.
const shouldUseSourceMap = process.env.GENERATE_SOURCEMAP !== 'false';
// Some apps do not need the benefits of saving a web request, so not inlining the chunk
// makes for a smoother build process.
const shouldInlineRuntimeChunk = process.env.INLINE_RUNTIME_CHUNK !== 'false';
const isExtendingEslintConfig = process.env.EXTEND_ESLINT === 'true';
const imageInlineSizeLimit = parseInt(
process.env.IMAGE_INLINE_SIZE_LIMIT || '10000'
......@@ -608,9 +605,6 @@ module.exports = function(webpackEnv) {
};
},
}),
new vConsolePlugin({
enable: (process.env.DEPLOY_ENV === 'prod' || process.env.DEPLOY_ENV === 'beta') ? false : true
}),
// Moment.js is an extremely popular library that bundles large locale files
// by default due to how webpack interprets its code. This is a practical
// solution that requires the user to opt into importing specific locales.
......
package.json
......@@ -50,6 +50,7 @@
"jest-resolve": "24.9.0",
"jest-watch-typeahead": "0.4.2",
"less-loader": "^6.2.0",
"lottie-web": "^5.7.11",
"microevent": "^1.0.0",
"mini-css-extract-plugin": "0.9.0",
"optimize-css-assets-webpack-plugin": "5.0.3",
......
public/animation.json 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
public/h5.html
<!--
* @Author: zhangleyuan
* @Date: 2021-04-08 14:56:33
* @LastEditors: zhangleyuan
* @LastEditTime: 2021-04-13 18:09:09
* @Description: 描述一下
* @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
-->
<!--
* @Author: 吴文洁
* @Date: 2020-08-24 12:20:57
......@@ -24,10 +17,10 @@
<meta name="theme-color" content="#000000" />
<!-- <link rel="apple-touch-icon" href="../src/common/images/logo.png" /> -->
<link rel="shortcut icon" href="https://image.xiaomaiketang.com/xm/KGSYFEpcHT.png">
<title>小麦企培</title>
<script type="text/javascript" charset="utf-8" src="./jquery.min.js"></script>
<script src="./lottie.js"></script>
<script type="text/javascript" src='./animation.json'></script>
<style type="text/css">
.box {
width: 100%;
......@@ -56,6 +49,17 @@
display: none;
text-align: center;
}
#lottie{
width: 150px;
height: 150px;
margin: 0 auto;
}
#tenant-config-error-message{
max-width: 70%;
margin: 25px auto;
font-size: 14px;
color: #999;
}
</style>
</head>
......@@ -70,11 +74,12 @@
<div id="error" class='hide'>
<img src="https://image.xiaomaiketang.com/xm/6kSAYFMm2r.png
" style='width:60px' alt="">
<p id='message'>
</p>
<p id='message'></p>
</div>
<div id="tenant-config-error" class='hide'>
<div id="lottie"></div>
<p id='tenant-config-error-message'></p>
</div>
</div>
......@@ -122,9 +127,13 @@
}, (res) => {
if (res.code == 200) {
$('#success').show()
} else {
}else if(res.code === 'DEPLOY_CROP_ADD_USER_NO'){
//租户配置到限，跳转空白提示缺省页
$('#tenant-config-error').show();
$('#tenant-config-error-message').html(res.message)
emptyAnimation()
} else {
$('#error').show();
var message = res.message.split(',').join('<br />')
if(message === "非当前企业学院"){
$('#message').html("<div><div>非当前企业学院</div><div class='desc'>尝试扫描「企业外部客户」二维码登录</div></div>");
......@@ -151,7 +160,16 @@
$.ajax(ajaxOptions)
}
function emptyAnimation(){
let params = {
container: document.getElementById('lottie'),
renderer: 'svg',
loop: true,
autoplay: true,
animationData: jsonDate
};
lottie.loadAnimation(params);
}
});
</script>
......
public/lottie.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/common/js/axios.ts
......@@ -7,12 +7,11 @@
* @Copyright: 杭州杰竞科技有限公司 版权所有
*/
import axios, { AxiosInstance, AxiosRequestConfig, AxiosResponse, AxiosPromise } from 'axios';
import { BASIC_HOST, TIME_OUT } from '@/domains/basic-domain/constants';
import { message } from 'antd';
import axios, { AxiosInstance, AxiosPromise, AxiosRequestConfig, AxiosResponse } from 'axios';
import { BASIC_HOST, TIME_OUT, USER_TYPE, VERSION, PROJECT } from '@/domains/basic-domain/constants';
import User from './user';
interface FetchParams {
url: string,
......@@ -65,9 +64,13 @@ class Axios {
})
instance.interceptors.response.use((response: AxiosResponse): AxiosResponse | AxiosPromise => {
const { message: ResMessage, success, resultMsg, resultCode } = response.data;
const { message: ResMessage, success, resultMsg, resultCode,code } = response.data;
if (success || resultCode === 0) {
return response;
}else if(code === 'DEPLOY_CROP_ADD_USER_NO'){
//租户配置到限，跳转空白提示缺省页
window.location.replace("/wechat-common/#/empty-page")
return Promise.reject(response.data)
}
message.error(ResMessage || resultMsg);
return Promise.reject(response.data);
......
src/common/js/config.ts
......@@ -6,13 +6,6 @@
* @Description: 描述一下
* @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
*/
/*
* @Author: wufan
* @Date: 2020-08-27 19:57:29
* @Last Modified by: wufan
* @Last Modified time: 2020-09-04 16:20:52
* 系统配置
*/
const APP_ID_MAP = {
dev: 'wx3ea60e78ddfa277e',
......
src/modules/empty-page/EmptyPage.jsx 0 → 100644
import React, { useEffect } from 'react'
import Lottie from 'lottie-web'
import './EmptyPage.less'
const EmptyPage = function () {
useEffect(() => {
Lottie.loadAnimation({
path: 'https://image.xiaomaiketang.com/xm/AhcJZHdMZf.json',
name: 'test',
renderer: 'svg',
loop: true,
autoplay: true,
container: document.getElementById('empty-img-box'),
})
}, [])
return (
<div className='empty-page'>
<div id='empty-img-box'></div>
<div className='tip'>企业使用人数已达上限或已过期</div>
<div className='tip'>建议联系管理员</div>
</div>
)
}
export default EmptyPage
src/modules/empty-page/EmptyPage.less 0 → 100644
.empty-page {
position: fixed;
left: 0;
top:0;
width: 100vw;
height: 100vh;
background: #fff;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
.empty-img-box {
max-width: 30%;
}
.tip{
font-size: 14px;
color: #999999;
}
}
src/routes/config/cloudClass.tsx
......@@ -10,6 +10,7 @@ import { MenuConfig } from '@/routes/interface';
import Authorize from '@/modules/authorize';
import WorkWxAuthorize from '@/modules/workWxAuthorize';
import EmptyPage from '@/modules/empty-page/EmptyPage'
const CloudClassConfig: MenuConfig = {
key: 'cloudClass',
name: '云课堂',
......@@ -26,6 +27,12 @@ const CloudClassConfig: MenuConfig = {
path: '/work-wechat-authorize',
component: WorkWxAuthorize,
},
{
key: 'empty-page',
name: '提示',
path: '/empty-page',
component:EmptyPage,
},
]
};
export default CloudClassConfig;
yarn.lock
......@@ -1101,14 +1101,6 @@
core-js-pure "^3.0.0"
regenerator-runtime "^0.13.4"
"@babel/runtime-corejs3@^7.11.2":
version "7.12.5"
resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.12.5.tgz#ffee91da0eb4c6dae080774e94ba606368e414f4"
integrity sha512-roGr54CsTmNPPzZoCP1AmDXuBoNao7tnSA83TXTwt+UK5QVyh1DIJnrgYRPWKCF2flqZQXwa7Yr8v7VmLzF0YQ==
dependencies:
core-js-pure "^3.0.0"
regenerator-runtime "^0.13.4"
"@babel/runtime-corejs3@^7.8.3":
version "7.9.0"
resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.9.0.tgz#0d4119c44ad05bfa0ca16f2f4f91cde430056c08"
......@@ -3489,6 +3481,11 @@ copy-descriptor@^0.1.0:
resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
copy-text-to-clipboard@^3.0.1:
version "3.0.1"
resolved "https://registry.nlark.com/copy-text-to-clipboard/download/copy-text-to-clipboard-3.0.1.tgz#8cbf8f90e0a47f12e4a24743736265d157bce69c"
integrity sha1-jL+PkOCkfxLkokdDc2Jl0Ve85pw=
copy-to-clipboard@^3.2.0:
version "3.3.1"
resolved "https://registry.yarnpkg.com/copy-to-clipboard/-/copy-to-clipboard-3.3.1.tgz#115aa1a9998ffab6196f93076ad6da3b913662ae"
......@@ -3519,6 +3516,11 @@ core-js@^2.4.0:
resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c"
integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==
core-js@^3.11.0:
version "3.15.2"
resolved "https://registry.nlark.com/core-js/download/core-js-3.15.2.tgz?cache=0&sync_timestamp=1624966012065&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcore-js%2Fdownload%2Fcore-js-3.15.2.tgz#740660d2ff55ef34ce664d7e2455119c5bdd3d61"
integrity sha1-dAZg0v9V7zTOZk1+JFURnFvdPWE=
core-js@^3.5.0:
version "3.6.4"
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.4.tgz#440a83536b458114b9cb2ac1580ba377dc470647"
......@@ -4939,6 +4941,11 @@ fill-range@^7.0.1:
dependencies:
to-regex-range "^5.0.1"
filter-obj@^1.1.0:
version "1.1.0"
resolved "https://registry.npm.taobao.org/filter-obj/download/filter-obj-1.1.0.tgz?cache=0&sync_timestamp=1617699897053&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffilter-obj%2Fdownload%2Ffilter-obj-1.1.0.tgz#9b311112bc6c6127a16e016c6c5d7f19e0805c5b"
integrity sha1-mzERErxsYSehbgFsbF1/GeCAXFs=
finalhandler@~1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d"
......@@ -7121,6 +7128,11 @@ lottie-web@^5.1.3:
resolved "https://registry.yarnpkg.com/lottie-web/-/lottie-web-5.7.5.tgz#92d72de9d94c733ac21ce613a5f3fc21ebe3f92c"
integrity sha512-jXgxG5od5F1QkTItb8wMej3aFEQ+tg95jma33GBDn1K3kRfy9zXXG+F62B440wphCdwY5sjg6h6664L5dvnuWw==
lottie-web@^5.7.11:
version "5.7.11"
resolved "https://registry.nlark.com/lottie-web/download/lottie-web-5.7.11.tgz?cache=0&sync_timestamp=1622806624941&other_urls=https%3A%2F%2Fregistry.nlark.com%2Flottie-web%2Fdownload%2Flottie-web-5.7.11.tgz#4ba74e8a629f76d3c0a0062ddc37d2b96e13765c"
integrity sha1-S6dOimKfdtPAoAYt3DfSuW4Tdlw=
lower-case@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.1.tgz#39eeb36e396115cc05e29422eaea9e692c9408c7"
......@@ -7448,11 +7460,6 @@ moment@2.x, moment@^2.24.0:
resolved "https://registry.yarnpkg.com/moment/-/moment-2.27.0.tgz#8bff4e3e26a236220dfe3e36de756b6ebaa0105d"
integrity sha512-al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ==
moment@^2.29.1:
version "2.29.1"
resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3"
integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==
move-concurrently@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
......@@ -7493,6 +7500,11 @@ multicast-dns@^6.0.1:
dns-packet "^1.3.1"
thunky "^1.0.2"
mutation-observer@^1.0.3:
version "1.0.3"
resolved "https://registry.npm.taobao.org/mutation-observer/download/mutation-observer-1.0.3.tgz#42e9222b101bca82e5ba9d5a7acf4a14c0f263d0"
integrity sha1-QukiKxAbyoLlup1aes9KFMDyY9A=
mutationobserver-shim@^0.3.2:
version "0.3.7"
resolved "https://registry.yarnpkg.com/mutationobserver-shim/-/mutationobserver-shim-0.3.7.tgz#8bf633b0c0b0291a1107255ed32c13088a8c5bf3"
......@@ -9151,6 +9163,16 @@ query-string@^4.1.0:
object-assign "^4.1.0"
strict-uri-encode "^1.0.0"
query-string@^6.13.8:
version "6.14.1"
resolved "https://registry.nlark.com/query-string/download/query-string-6.14.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fquery-string%2Fdownload%2Fquery-string-6.14.1.tgz#7ac2dca46da7f309449ba0f86b1fd28255b0c86a"
integrity sha1-esLcpG2n8wlEm6D4ax/SglWwyGo=
dependencies:
decode-uri-component "^0.2.0"
filter-obj "^1.1.0"
split-on-first "^1.0.0"
strict-uri-encode "^2.0.0"
querystring-es3@^0.2.0:
version "0.2.1"
resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
......@@ -10669,6 +10691,11 @@ spdy@^4.0.2:
select-hose "^2.0.0"
spdy-transport "^3.0.0"
split-on-first@^1.0.0:
version "1.1.0"
resolved "https://registry.nlark.com/split-on-first/download/split-on-first-1.1.0.tgz#f610afeee3b12bce1d0c30425e76398b78249a5f"
integrity sha1-9hCv7uOxK84dDDBCXnY5i3gkml8=
split-string@^3.0.1, split-string@^3.0.2:
version "3.1.0"
resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
......@@ -10776,6 +10803,11 @@ strict-uri-encode@^1.0.0:
resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
integrity sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=
strict-uri-encode@^2.0.0:
version "2.0.0"
resolved "https://registry.npm.taobao.org/strict-uri-encode/download/strict-uri-encode-2.0.0.tgz#b9c7330c7042862f6b142dc274bbcc5866ce3546"
integrity sha1-ucczDHBChi9rFC3CdLvMWGbONUY=
string-convert@^0.2.0:
version "0.2.1"
resolved "https://registry.yarnpkg.com/string-convert/-/string-convert-0.2.1.tgz#6982cc3049fbb4cd85f8b24568b9d9bf39eeff97"
......@@ -11506,6 +11538,22 @@ vary@~1.1.2:
resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
vconsole-webpack-plugin@^1.5.2:
version "1.6.1"
resolved "https://registry.nlark.com/vconsole-webpack-plugin/download/vconsole-webpack-plugin-1.6.1.tgz#7a9ee82c0a90d58964034f6d6bd349242ce65a70"
integrity sha1-ep7oLAqQ1YlkA09ta9NJJCzmWnA=
dependencies:
vconsole "^3.6"
vconsole@^3.6:
version "3.8.1"
resolved "https://registry.nlark.com/vconsole/download/vconsole-3.8.1.tgz#b9bd28451277b11615e85e3b54b680473694b3a1"
integrity sha1-ub0oRRJ3sRYV6F47VLaARzaUs6E=
dependencies:
copy-text-to-clipboard "^3.0.1"
core-js "^3.11.0"
mutation-observer "^1.0.3"
vendors@^1.0.0:
version "1.0.4"
resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.4.tgz#e2b800a53e7a29b93506c3cf41100d16c4c4ad8e"
......@@ -11520,7 +11568,7 @@ verror@1.10.0:
core-util-is "1.0.2"
extsprintf "^1.2.0"
vfile-message@*, vfile-message@^2.0.4:
vfile-message@*:
version "2.0.4"
resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-2.0.4.tgz#5b43b88171d409eae58477d13f23dd41d52c371a"
integrity sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ==
......@@ -11561,14 +11609,6 @@ walker@^1.0.7, walker@~1.0.5:
dependencies:
makeerror "1.0.x"
wangeditor@^4.0.4:
version "4.5.4"
resolved "https://registry.yarnpkg.com/wangeditor/-/wangeditor-4.5.4.tgz#cce6f73b96fdb9ce1f19a1e972e1fd0aef9192a6"
integrity sha512-HqqyPzpf03E2VO7qtOz2nUCr7GT75/+9agvQnG5Ybiwu9FcwGkVipn9BdVxydBxfAeRGCXXWs6+v3Z9dJ0H2fg==
dependencies:
"@babel/runtime" "^7.11.2"
"@babel/runtime-corejs3" "^7.11.2"
warning@4.x, warning@^4.0.1, warning@^4.0.2, warning@^4.0.3, warning@~4.0.3:
version "4.0.3"
resolved "https://registry.yarnpkg.com/warning/-/warning-4.0.3.tgz#16e9e077eb8a86d6af7d64aa1e05fd85b4678ca3"
......@@ -11990,21 +12030,18 @@ ws@^6.1.2, ws@^6.2.1:
dependencies:
async-limiter "~1.0.0"
xiaomai-b-components@^3.12.15:
version "3.12.15"
resolved "https://registry.yarnpkg.com/xiaomai-b-components/-/xiaomai-b-components-3.12.15.tgz#caedd0ad5df60aeb50f17939f113b35cf238d35e"
integrity sha512-CICDS1XRAh5fM79qvhxmRebs6kZ/TiY20UXxSkIob4nCcu79cHwj3jkrQIiVONFnBBvR1kzF4YiKj/1EtzDAWg==
xiaomai-b-components@1.4.4:
version "1.4.4"
resolved "https://registry.nlark.com/xiaomai-b-components/download/xiaomai-b-components-1.4.4.tgz#2bea138f0234c52a3d1d2d27f683c3e217c4c4c0"
integrity sha1-K+oTjwI0xSo9HS0n9oPD4hfExMA=
dependencies:
"@babel/runtime" "^7.11.2"
"@types/react-lottie" "^1.2.5"
"@types/underscore" "^1.10.24"
"@types/vfile-message" "^2.0.0"
babel-plugin-import "^1.13.0"
moment "^2.29.1"
react-lottie "^1.2.3"
underscore "^1.11.0"
vfile-message "^2.0.4"
wangeditor "^4.0.4"
xml-name-validator@^3.0.0:
version "3.0.0"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment