Skip to content

P
project-online-old
提交 8085a32d authored 作者: 王鹏飞's avatar 王鹏飞
浏览文件
操作

chore: update

上级 a470908f
隐藏空白字符变更
内嵌 并排
正在显示 包含 66 行增加 和 75 行删除
build/webpack.client.conf.js
浏览文件 @ 8085a32d
const fs = require('fs') const fs = require('fs')
const path = require('path') const path = require('path')
...@@ -14,7 +13,6 @@ const CopyWebpackPlugin = require('copy-webpack-plugin') ...@@ -14,7 +13,6 @@ const CopyWebpackPlugin = require('copy-webpack-plugin')
const VconsoleWebpackPlugin = require('vconsole-webpack-plugin') const VconsoleWebpackPlugin = require('vconsole-webpack-plugin')
const $GLOBAL = require('./webpack.base.conf') const $GLOBAL = require('./webpack.base.conf')
let config = null let config = null
if ($GLOBAL.isDev === 'development') { if ($GLOBAL.isDev === 'development') {
...@@ -48,7 +46,7 @@ if ($GLOBAL.isDev === 'development') { ...@@ -48,7 +46,7 @@ if ($GLOBAL.isDev === 'development') {
followRedirects: true, followRedirects: true,
logLevel: 'info', logLevel: 'info',
headers: { headers: {
'Referer': $GLOBAL.webConf.url Referer: $GLOBAL.webConf.url
}, },
pathRewrite: { pathRewrite: {
'^/api': '/' '^/api': '/'
...@@ -59,34 +57,31 @@ if ($GLOBAL.isDev === 'development') { ...@@ -59,34 +57,31 @@ if ($GLOBAL.isDev === 'development') {
hot: true hot: true
}, },
module: { module: {
rules: [{ rules: [
test: /\.(sa|sc|c)ss$/, {
use: [ test: /\.(sa|sc|c)ss$/,
'style-loader', use: [
'css-loader', 'style-loader',
{ 'css-loader',
loader: 'postcss-loader', {
options: { loader: 'postcss-loader',
plugins: [ options: {
AutoPrefixer({ plugins: [
'overrideBrowserslist': [ AutoPrefixer({
'cover 99.5%', overrideBrowserslist: ['cover 99.5%', 'ie 6-8', 'since 2015', 'last 10 iOS versions']
'ie 6-8', })
'since 2015', ]
'last 10 iOS versions' }
] },
}) {
] loader: 'sass-loader',
} options: {
}, implementation: require('dart-sass')
{ }
loader: 'sass-loader',
options: {
implementation: require('dart-sass')
} }
} ]
] }
}] ]
}, },
plugins: [ plugins: [
new VueLoaderPlugin(), new VueLoaderPlugin(),
...@@ -107,41 +102,37 @@ if ($GLOBAL.isDev === 'development') { ...@@ -107,41 +102,37 @@ if ($GLOBAL.isDev === 'development') {
mode: 'production', mode: 'production',
entry: { entry: {
app: $GLOBAL.EntryPath, app: $GLOBAL.EntryPath,
vendor: ['vue', 'vue-router', 'vue-i18n'] vendor: ['vue', 'vue-router']
}, },
module: { module: {
rules: [{ rules: [
test: /\.(sa|sc|c)ss$/, {
use: [ test: /\.(sa|sc|c)ss$/,
{ use: [
loader: MiniCssExtractPlugin.loader, {
options: { loader: MiniCssExtractPlugin.loader,
} options: {}
}, },
'css-loader', 'css-loader',
{ {
loader: 'postcss-loader', loader: 'postcss-loader',
options: { options: {
plugins: [ plugins: [
AutoPrefixer({ AutoPrefixer({
'overrideBrowserslist': [ overrideBrowserslist: ['cover 99.5%', 'ie 6-8', 'since 2015', 'last 10 iOS versions']
'cover 99.5%', })
'ie 6-8', ]
'since 2015', }
'last 10 iOS versions' },
] {
}) loader: 'sass-loader',
] options: {
} implementation: require('dart-sass')
}, }
{
loader: 'sass-loader',
options: {
implementation: require('dart-sass')
} }
} ]
] }
}] ]
}, },
plugins: [ plugins: [
new CleanWebpackPlugin(['**/*'], { root: $GLOBAL.OutputPath }), new CleanWebpackPlugin(['**/*'], { root: $GLOBAL.OutputPath }),
...@@ -170,7 +161,7 @@ if ($GLOBAL.isDev === 'development') { ...@@ -170,7 +161,7 @@ if ($GLOBAL.isDev === 'development') {
from: $GLOBAL.EntryStaticPath, from: $GLOBAL.EntryStaticPath,
to: $GLOBAL.OutputStaticPath, to: $GLOBAL.OutputStaticPath,
ignore: ['.*'], ignore: ['.*'],
transform: function (content) { transform: function(content) {
return content return content
} }
} }
...@@ -199,7 +190,7 @@ if ($GLOBAL.isDev === 'development') { ...@@ -199,7 +190,7 @@ if ($GLOBAL.isDev === 'development') {
priority: -10, priority: -10,
reuseExistingChunk: false, reuseExistingChunk: false,
test: /node_modules\/(.*)\.js/ test: /node_modules\/(.*)\.js/
}, }
} }
} }
} }
......
src/pages/my/application/form/info/answer.js
浏览文件 @ 8085a32d
...@@ -19,16 +19,17 @@ export default function(_this) { ...@@ -19,16 +19,17 @@ export default function(_this) {
const [first = {}, second = {}, third = {}, fourth = {}] = answers const [first = {}, second = {}, third = {}, fourth = {}] = answers
return { return {
qid1: first.qid || '1', qid1: first.qid || '1',
question1: first.question || '自我介绍', question1: '自我介绍',
answer1: first.answer, answer1: first.answer,
qid2: second.qid || '2', qid2: second.qid || '2',
question2: second.question || '这个MAP计划对你个人将来有什么好处？你在这个项目中的个人发展目标是什么？', question2: '申请这个家庭教育硕士项目在未来对你个人有什么好处?',
answer2: second.answer, answer2: second.answer,
qid3: third.qid || '3', qid3: third.qid || '3',
question3: third.question || '这个MAP计划对你将来的职业发展有什么好处？你的职业发展目标是什么？', question3: '通过这个家庭教育硕士项目的学习，你对自己未来的个人发展目标/职业发展目标是什么? ',
answer3: third.answer, answer3: third.answer,
qid4: fourth.qid || '4', qid4: fourth.qid || '4',
question4: fourth.question || '你参加过心理学的工作坊或培训班吗？请把它列出来。你是如何从这些学习经验中获益的？', question4:
'你参加过家庭教育或者与之相关的工作坊或者培训吗？请按照年份列出来，你是如何从这些学习经验中获益的？',
answer4: fourth.answer answer4: fourth.answer
} }
} }
...@@ -53,18 +54,18 @@ export default function(_this) { ...@@ -53,18 +54,18 @@ export default function(_this) {
items: [ items: [
{ {
type: 'v-input', type: 'v-input',
label: '自我介绍（简述自己与心理学的渊源；对心理学的兴趣，什么促使自身喜欢心理学；讲一个与内心活动有关的故事）不低于260字', label:
'自我介绍(简要介绍一下自己，你是如何对家庭教育产生的兴趣，什么促使你下定决心学习家庭教育；可以讲一个跟自身有关的故事。)不低于300字',
model: 'answer1', model: 'answer1',
attrs: { type: 'textarea', rows: '8', style: 'width:100%' }, attrs: { type: 'textarea', rows: '8', style: 'width:100%' },
rules: [ rules: [
{ required: true, message: '请输入', trigger: 'blur' }, { required: true, message: '请输入', trigger: 'blur' },
{ min: 260, message: '长度在 260 个字符以上', trigger: 'blur' } { min: 300, message: '长度在 300 个字符以上', trigger: 'blur' }
] ]
}, },
{ {
type: 'v-input', type: 'v-input',
label: label: '申请这个家庭教育硕士项目在未来对你个人有什么好处? 不低于260字',
'这个MAP计划对你个人将来有什么好处？你在这个项目中的个人发展目标是什么？（聚焦在MAP学习对个人成长的帮助；如何实现自我目标和个人的社会价值）不低于260字',
model: 'answer2', model: 'answer2',
attrs: { type: 'textarea', rows: '8', style: 'width:100%' }, attrs: { type: 'textarea', rows: '8', style: 'width:100%' },
rules: [ rules: [
...@@ -75,8 +76,7 @@ export default function(_this) { ...@@ -75,8 +76,7 @@ export default function(_this) {
}, },
{ {
type: 'v-input', type: 'v-input',
label: label: '通过这个家庭教育硕士项目的学习，你对自己未来的个人发展目标/职业发展目标是什么? 不低于260字。',
'这个MAP计划对你将来的职业发展有什么好处？你的职业发展目标是什么？（紧密联系MAP课程对目前职业的直接帮助；对未来职业发展目标的支持；如何通过职业平台把所学的心理学技能帮助到更多有需要的人)不低于260字',
model: 'answer3', model: 'answer3',
attrs: { type: 'textarea', rows: '8', style: 'width:100%' }, attrs: { type: 'textarea', rows: '8', style: 'width:100%' },
rules: [ rules: [
...@@ -87,7 +87,7 @@ export default function(_this) { ...@@ -87,7 +87,7 @@ export default function(_this) {
}, },
{ {
type: 'v-input', type: 'v-input',
label: '你参加过心理学的工作坊或培训班吗？请把它列出来。你是如何从这些学习经验中获益的？', label: '你参加过家庭教育或者与之相关的工作坊或者培训吗？请按照年份列出来，你是如何从这些学习经验中获益的？',
model: 'answer4', model: 'answer4',
attrs: { type: 'textarea', rows: '8', style: 'width:100%' }, attrs: { type: 'textarea', rows: '8', style: 'width:100%' },
rules: [ rules: [
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论