Commit f28db474 authored by wangxuelai's avatar wangxuelai

''

parents fce6c98c 4920722f
# Default ignored files
/workspace.xml
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<module type="WEB_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.tmp" />
<excludeFolder url="file://$MODULE_DIR$/temp" />
<excludeFolder url="file://$MODULE_DIR$/tmp" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
\ No newline at end of file
<component name="ProjectCodeStyleConfiguration">
<code_scheme name="Project" version="173">
<JSCodeStyleSettings version="0">
<option name="FORCE_SEMICOLON_STYLE" value="true" />
<option name="USE_DOUBLE_QUOTES" value="false" />
<option name="FORCE_QUOTE_STYlE" value="true" />
<option name="VAR_DECLARATION_WRAP" value="2" />
<option name="OBJECT_LITERAL_WRAP" value="2" />
<option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
<option name="SPACES_WITHIN_IMPORTS" value="true" />
</JSCodeStyleSettings>
<codeStyleSettings language="JavaScript">
<option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
<option name="ALIGN_MULTILINE_FOR" value="false" />
<option name="METHOD_CALL_CHAIN_WRAP" value="2" />
<option name="IF_BRACE_FORCE" value="1" />
<option name="DOWHILE_BRACE_FORCE" value="1" />
<option name="WHILE_BRACE_FORCE" value="1" />
<option name="FOR_BRACE_FORCE" value="1" />
<indentOptions>
<option name="INDENT_SIZE" value="2" />
<option name="CONTINUATION_INDENT_SIZE" value="2" />
</indentOptions>
</codeStyleSettings>
</code_scheme>
</component>
\ No newline at end of file
<component name="ProjectCodeStyleConfiguration">
<state>
<option name="USE_PER_PROJECT_SETTINGS" value="true" />
</state>
</component>
\ No newline at end of file
<component name="InspectionProjectProfileManager">
<profile version="1.0">
<option name="myName" value="Project Default" />
<inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
</profile>
</component>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="JavaScriptSettings">
<option name="languageLevel" value="JSX" />
</component>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/biz.qingxiao.com.iml" filepath="$PROJECT_DIR$/.idea/biz.qingxiao.com.iml" />
</modules>
</component>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>
\ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
image/boy.png

868 Bytes

image/girl.png

908 Bytes

<!DOCTYPE html><html lang="en"><head><meta charset="UTF-8"><title>轻校</title><link rel="shortcut icon" href="https://cdn.img.shangjiadao.cn/qingxiao/biz/image/qxlogo4.png"><meta content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0;" name="viewport"><meta http-equiv="X-UA-Compatible" content="IE=edge"><!-- Polyfills --><!--[if lt IE 10]>
<script src="js/console-polyfill.js"></script>
<![endif]--><script charset="utf-8" src="https://map.qq.com/api/js?v=2.exp&key=XSZBZ-5LHCV-5I2P7-UQHPW-6456F-JBB3B"></script><link href="https://cdn.img.shangjiadao.cn/qingxiao/biz/dist/index.css?1564471604614" rel="stylesheet"><script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/lib/vendor.dll.js?32ssdddss2233" charset="utf-8"></script><script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/console-polyfill.js?3" charset="utf-8"></script><script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/es6-shim.min.js?3" charset="utf-8"></script><script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/es5-shim.js?3" charset="utf-8"></script><script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/es5-sham.min.js?3" charset="utf-8"></script><script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/json3.min.js?3" charset="utf-8"></script><script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/html5shiv.min.js?3" charset="utf-8"></script><script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/polyfill.js?3" charset="utf-8"></script></head><body><div id="root"></div><script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/dist/index.js?156447ddd1sssss604614" charset="utf-8"></script></body></html>
\ No newline at end of file
<![endif]--><script charset="utf-8" src="https://map.qq.com/api/js?v=2.exp&key=XSZBZ-5LHCV-5I2P7-UQHPW-6456F-JBB3B"></script><link href="https://cdn.img.shangjiadao.cn/qingxiao/biz/dist/index.css?1566843942128" rel="stylesheet"><script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/lib/vendor.dll.js?3" charset="utf-8"></script><script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/console-polyfill.js?3" charset="utf-8"></script><script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/es6-shim.min.js?3" charset="utf-8"></script><script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/es5-shim.js?3" charset="utf-8"></script><script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/es5-sham.min.js?3" charset="utf-8"></script><script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/json3.min.js?3" charset="utf-8"></script><script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/html5shiv.min.js?3" charset="utf-8"></script><script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/polyfill.js?3" charset="utf-8"></script></head><body><div id="root"></div><script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/dist/index.js?1566843942128" charset="utf-8"></script></body></html>
This diff is collapsed.
......@@ -2,16 +2,20 @@
"private": true,
"scripts": {
"start": "set NODE_ENV=development&&set PORT=80 && roadhog server",
"build": "set NODE_ENV=production && roadhog build",
"build": "set NODE_ENV=production&&roadhog build",
"test-build": "set NODE_ENV=development&&roadhog build",
"lint": "eslint --ext .js src test",
"precommit": "npm run lint",
"lib": "webpack --config webpackconfig/webpack.dll.config.js"
},
"dependencies": {
"antd": "3.20.6",
"@antv/data-set": "^0.10.2",
"antd": "^3.20.3",
"axios": "^0.18.0",
"babel-plugin-import": "^1.6.7",
"babel-polyfill": "^6.26.0",
"bizcharts": "^3.5.5",
"bizcharts-plugin-slider": "^2.1.1-beta.1",
"blueimp-md5": "^2.10.0",
"bundle-loader": "^0.5.6",
"clipboard": "^2.0.0",
......@@ -26,7 +30,6 @@
"eventsource-polyfill": "^0.9.6",
"fetch-ie8": "^1.5.0",
"fetch-jsonp": "^1.1.3",
"history": "^4.9.0",
"jquery": "^3.3.1",
"lodash": "^4.17.5",
"mockjs": "^1.0.1-beta3",
......@@ -35,7 +38,8 @@
"qs": "^6.5.1",
"react": "^16.2.0",
"react-dom": "^16.2.0",
"video-react": "^0.14.1"
"video-react": "^0.14.1",
"xlsx": "^0.15.0"
},
"devDependencies": {
"babel-eslint": "^8.2.2",
......
......@@ -815,7 +815,7 @@ export default {
const loading = message.loading('小程序生成中..');
const qrcodeData = yield call(commonAjax.generateQrcode, {
scene: `m=${mobile}&s=${school_id}`,
page: 'src/pages/websiteindex/index', // src/pages/setting/bindmobile2
page: 'src/pages/setting/bindmobile2', // src/pages/setting/bindmobile2
});
setTimeout(loading);
if (qrcodeData.code == 200) {
......@@ -835,7 +835,7 @@ export default {
const { record } = payload;
const qrcodeData = yield call(commonAjax.generateQrcode, {
scene: `uid=${record.uuid}&tmp=${record.id}`,
page: 'src/pages/websiteindex/index',
page: 'src/pages/signup/index',
});
if (qrcodeData.code == 200) {
message.success('小程序码生成成功', 1);
......
......@@ -66,7 +66,7 @@ class AddCourseTime extends React.Component {
<TimePicker
format="HH:mm"
placeholder="上课时间"
disabledHours={() => '00, 01, 02, 03, 04, 05'}
// disabledHours={() => '00, 01, 02, 03, 04, 05'}
/>)}
</Form.Item>
<Form.Item>
......@@ -76,7 +76,7 @@ class AddCourseTime extends React.Component {
<TimePicker
format="HH:mm"
placeholder="下课时间"
disabledHours={() => '00, 01, 02, 03, 04, 05'}
// disabledHours={() => '00, 01, 02, 03, 04, 05'}
/>)}
</Form.Item>
</Form>
......
......@@ -752,7 +752,7 @@ class ClassDetailForm extends React.Component {
// return;
// }
if (new Date(datetime.replace(/-/g, '/')).getTime() - new Date(schedule.start_time.replace(/-/g, '/')).getTime() < -2 * 3600) {
message.error('当前时间太早不能点名');
message.error(' 开课前两小时才能点名');
return;
}
dispatch({
......
......@@ -57,9 +57,8 @@ class teachersForm extends React.Component {
}
toCallStudents = (schedule) => {
const { dispatch, datetime } = this.props;
console.log(datetime, 'datetime');
if (new Date(datetime.replace(/-/g, '/')).getTime() - new Date(schedule.start_time.replace(/-/g, '/')).getTime() < -2 * 3600) {
message.error('当前时间太早不能点名');
message.error('开课前两小时才能点名');
return;
}
dispatch({
......
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