diff --git a/README.md b/README.md
index ddccb0d..c49b3f2 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,6 @@ npm run dev
npm run build:stage
# 构建生产环境
-配置路由：router -- index.js -- new Router添加: base: '/yoga/manager',
npm run build:prod
```
## 项目地址
diff --git a/package.json b/package.json
index a363a07..8118d56 100644
--- a/package.json
+++ b/package.json
@@ -1,9 +1,9 @@
{
"name": "ruoyi-ui-merge",
"version": "3.8.3",
- "description": "ruoyi-mall商城管理系统",
- "author": "若依",
- "license": "MIT",
+ "description": "yoga后台管理系统",
+ "author": "",
+ "license": "",
"scripts": {
"dev": "vue-cli-service serve",
"local": "vue-cli-service serve --mode .env.local",
@@ -58,6 +58,7 @@
"screenfull": "5.0.2",
"sortablejs": "1.10.2",
"v-charts": "^1.19.0",
+ "path-to-regexp": "2.4.0",
"vue": "2.6.12",
"vue-count-to": "1.0.13",
"vue-cropper": "0.5.5",
@@ -90,7 +91,8 @@
"stylus": "^0.54.5",
"stylus-loader": "^3.0.2",
"svg-sprite-loader": "5.1.1",
- "vue-template-compiler": "2.6.12"
+ "vue-template-compiler": "2.6.12",
+ "normalize.css": "7.0.0"
},
"engines": {
"node": ">=8.9",
diff --git a/public/favicon.ico b/public/favicon.ico
index e919b2f..317330f 100644
Binary files a/public/favicon.ico and b/public/favicon.ico differ
diff --git a/src/App.vue b/src/App.vue
index 59c1ee2..3fc78b7 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -18,5 +18,5 @@ export default {
}
diff --git a/src/assets/icons/svg/one-to-many.svg b/src/assets/icons/svg/one-to-many.svg
new file mode 100644
index 0000000..086aedb
--- /dev/null
+++ b/src/assets/icons/svg/one-to-many.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/svg/one-to-one.svg b/src/assets/icons/svg/one-to-one.svg
new file mode 100644
index 0000000..b086e12
--- /dev/null
+++ b/src/assets/icons/svg/one-to-one.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/components/sc/student/changeStudent.vue b/src/components/sc/student/changeStudent.vue
index 0da022c..db920ab 100644
--- a/src/components/sc/student/changeStudent.vue
+++ b/src/components/sc/student/changeStudent.vue
@@ -1,32 +1,22 @@
-
+
-
+
-
-
+
+
-
-
+
+
@@ -38,25 +28,14 @@
-
-
-
- {{ dict.dictLabel }}
-
-
-
+
-
-
-
-
-
-
+
+
@@ -113,7 +77,7 @@ export default {
open: false,
// 表单参数
form: {
- sex: 'M'
+ sex: '2'
},
// 所属学校数据字典
schoolOptions: [],
@@ -121,7 +85,7 @@ export default {
sexOptions: [],
rules: {
studentName: [
- { required: true, message: '学生姓名不能为空', trigger: 'blur' }
+ { required: true, message: '学员姓名不能为空', trigger: 'blur' }
],
birthDay: [
{ required: true, message: '出生日期不能为空', trigger: 'blur' }
@@ -147,7 +111,7 @@ export default {
},
methods: {
loadDictInfo() {
- this.getDictListByDictType('sex').then(response => {
+ this.getDictListByDictType('sys_user_sex').then(response => {
this.sexOptions = response.data
})
this.getDictListByDictType('contact_relation').then(response => {
@@ -166,7 +130,7 @@ export default {
schoolName: undefined,
studentName: undefined,
birthDay: undefined,
- sex: 'M',
+ sex: '2',
phone: undefined,
inTime: moment(new Date()).format('YYYY-MM-DD')
}
@@ -181,7 +145,7 @@ export default {
this.loadDictInfo()
this.reset()
this.open = true
- this.title = '添加学生基本信息'
+ this.title = '添加学员基本信息'
},
handleUpdate(studentId) {
this.loadDictInfo()
@@ -192,7 +156,7 @@ export default {
this.contactArray = response.data.contactList
}
this.open = true
- this.title = '修改学生基本信息'
+ this.title = '修改学员基本信息'
})
},
/** 提交按钮 */
@@ -201,7 +165,7 @@ export default {
if (valid) {
this.contactArray.forEach(item => {
if (item.contactRelation === undefined || item.contactRelation === null || item.contactRelation.trim() === '') {
- this.msgError('请选择联系人与学生关系')
+ this.msgError('请选择联系人与学员关系')
valid = false
} else if (item.contactPhone === undefined || item.contactPhone === null || item.contactPhone.trim() === '') {
this.msgError('请填写联系人电话')
@@ -227,7 +191,7 @@ export default {
if (response.respCode === '0000') {
this.msgSuccess('操作成功')
this.open = false
- this.$emit('success')
+ this.$emit('success',response.data)
} else {
this.msgError(response.respMsg)
}
diff --git a/src/components/sc/student/studentSelect.vue b/src/components/sc/student/studentSelect.vue
index 2059c6a..dc81b79 100644
--- a/src/components/sc/student/studentSelect.vue
+++ b/src/components/sc/student/studentSelect.vue
@@ -41,6 +41,9 @@ export default {
this.searchStudent('')
},
methods: {
+ defaultStudentId(studentId){
+ this.studentId=studentId;
+ },
// 查询学生
searchStudent(query) {
// 查询值变更时 重置页码
diff --git a/src/main.js b/src/main.js
index 234a877..2ec13de 100644
--- a/src/main.js
+++ b/src/main.js
@@ -6,14 +6,11 @@ import Element from 'element-ui'
import './assets/styles/element-variables.scss'
import '@/assets/styles/index.scss' // global css
+import '@/styles/index.scss' // global css
import '@/assets/styles/ruoyi.scss' // ruoyi css
-import ElementUI from 'element-ui'
-import 'element-ui/lib/theme-chalk/index.css'
-import locale from 'element-ui/lib/locale/lang/zh-CN' // lang i18n
import 'normalize.css/normalize.css' // A modern alternative to CSS resets
-import '@/styles/index.scss' // global css
import App from './App'
import store from './store'
@@ -132,8 +129,6 @@ DictData.install()
Vue.use(Element, {
size: Cookies.get('size') || 'medium' // set element-ui default size
})
-// set ElementUI lang to EN
-Vue.use(ElementUI, { locale })
Vue.config.productionTip = false
diff --git a/src/router/index.js b/src/router/index.js
index 788819c..4787fbf 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -234,7 +234,7 @@ Router.prototype.push = function push(location) {
export default new Router({
mode: 'history', // 去掉url中的#
- // base: '/yoga/manager/',
+ base: process.env.NODE_ENV=== "production" ? "/yoga/manager/" : "",
scrollBehavior: () => ({ y: 0 }),
routes: constantRoutes
})
diff --git a/src/utils/request.js b/src/utils/request.js
index d5202b5..da319ba 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -75,6 +75,7 @@ service.interceptors.response.use(res => {
if(res.request.responseType === 'blob' || res.request.responseType === 'arraybuffer'){
return res.data
}
+ let url=process.env.NODE_ENV=== "production" ? "/yoga/manager/index" : "/index";
if (code === 401) {
if (!isRelogin.show) {
isRelogin.show = true;
@@ -86,8 +87,7 @@ service.interceptors.response.use(res => {
).then(() => {
isRelogin.show = false;
store.dispatch('LogOut').then(() => {
- // location.href = '/index';
- this.$router.push(`/login?redirect=${this.$route.fullPath}`)
+ location.href = url;
})
}).catch(() => {
isRelogin.show = false;
diff --git a/src/views/courseOrder/signUp.vue b/src/views/courseOrder/signUp.vue
index 079d754..6aac39c 100644
--- a/src/views/courseOrder/signUp.vue
+++ b/src/views/courseOrder/signUp.vue
@@ -6,7 +6,7 @@
-
+
新建学员
@@ -527,7 +527,7 @@
-
+