@@ -79,6 +87,14 @@
+
+
+
+
-
+
+
+
+
+
+
+
diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue
index 699064c..b80d610 100644
--- a/src/pages/login/index.vue
+++ b/src/pages/login/index.vue
@@ -16,7 +16,7 @@
>
-
+
-
+
diff --git a/src/pages/user/user_plan.vue b/src/pages/user/user_plan.vue
index fa7c749..8f79325 100644
--- a/src/pages/user/user_plan.vue
+++ b/src/pages/user/user_plan.vue
@@ -13,10 +13,13 @@
table-layout="auto"
cellEmptyContent="-"
>
+
+ 理事会
+ 监事会
+
编辑
-
删除
@@ -29,6 +32,12 @@
+
+
+
+
@@ -39,12 +48,14 @@ export default {
data() {
return {
position_name: '',
+ type:null,
addMode: false,
isEdit: false,
editID:0,
list: [],
columns: [
{colKey: 'position_name', title: '职位名称'},
+ {colKey: 'type', title: '职位类别'},
{colKey: 'select', title: '操作', width: 200},
],
}
@@ -76,8 +87,10 @@ export default {
this.isEdit=false;
},
edit(d){
+ console.log(d);
this.editID=d.id;
this.position_name=d.position_name;
+ this.type=String(d.type);
this.addMode=true;
this.isEdit=true;
},
@@ -97,12 +110,16 @@ export default {
this.$message.error('职位名称不能为空');
return;
}
+ if (this.type == null) {
+ this.$message.error('职位类别不能为空');
+ return;
+ }
var url='/position/add';
if(this.isEdit){
url='/position/update';
}
this.$request
- .post(url,{position_name:this.position_name,id:this.editID})
+ .post(url,{position_name:this.position_name,type:this.type,id:this.editID})
.then((res) => {
if(res.code==1){
this.$message.success(res.msg);
diff --git a/src/permission.js b/src/permission.js
index 6f3cc29..db1ed3c 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -14,21 +14,19 @@ router.beforeEach(async (to, from, next) => {
const token = localStorage.getItem('associationToken');
console.log(token);
console.log(to.path);
-if(store.state.user.association){
+ console.log(to.path);
+if(store.state.user.association!=''){
if(typeof (store.state.user.association)=='object'){
var association=store.state.user.association;
}else{
var association=JSON.parse(store.state.user.association);
}
}
-
-
if (token) {
if (to.path === '/login') {
next();
return;
}
-
const roles = store.getters['user/roles'];
console.log(roles);
if (roles && roles.length > 0) {
@@ -42,7 +40,7 @@ if(store.state.user.association){
next({ ...to });
} catch (error) {
await store.commit('user/removeToken');
- next(`/login?id=`+association.id);
+ next(`/login?id=`+association.id?association.id:1);
NProgress.done();
}
}
@@ -51,7 +49,13 @@ if(store.state.user.association){
if (whiteListRouters.indexOf(to.path) !== -1) {
next();
} else {
- next(`/login?id=`+association.id);
+ console.log(association);
+ if(typeof (association)!='undefined'){
+ next(`/login?id=`+association.id);
+ }else{
+ next(`/login?id=1`);
+ }
+
}
NProgress.done();
}
diff --git a/src/router/modules/components.ts b/src/router/modules/components.ts
index 6af007c..f7991ac 100644
--- a/src/router/modules/components.ts
+++ b/src/router/modules/components.ts
@@ -78,6 +78,18 @@ export default [
redirect: '/association/index',
meta: { title: '协会管理', icon: HomeIcon },
children: [
+ {
+ path: 'carousel ',
+ name: 'associationCarousel',
+ component: () => import('@/pages/association/carousel.vue'),
+ meta: { title: '轮播图' },
+ },
+ {
+ path: 'opinion',
+ name: 'associationOpinion',
+ component: () => import('@/pages/association/opinion.vue'),
+ meta: { title: '意见反馈' },
+ },
{
path: 'index',
name: 'associationIndex',
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index c18b6e5..f203d56 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -7,7 +7,8 @@ const state = {
token: localStorage.getItem('associationToken') || 'main_token', // 默认token不走权限
userInfo: InitUserInfo,
association:localStorage.getItem('associationInfo') || '',
- apiUrl:'http://192.168.3.130'
+ //apiUrl:'http://192.168.3.130',
+ apiUrl:'https://ysx.0rui.cn'
};
const mutations = {
diff --git a/src/utils/request.ts b/src/utils/request.ts
index 3715a32..9b23562 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -1,7 +1,8 @@
import axios from 'axios';
import store from '../store'
//const API_HOST = env === 'mock' ? '/' : proxy[env].API; // 如果是mock模式 就不配置host 会走本地Mock拦截
-const API_HOST ="/api/";
+const API_HOST ="https://ysx.0rui.cn/api/";
+//const API_HOST ="/api/";
const CODE = {
LOGIN_TIMEOUT: 100000,
REQUEST_SUCCESS: 0,
@@ -141,7 +157,8 @@ export default {
activity_start_time: '',
activity_end_time: '',
activity_content: '',
- activity_location: ''
+ activity_location: '',
+ activity_type: null,
},
addMode: false,
isEdit: false,
@@ -163,6 +180,7 @@ export default {
list: [],
columns: [
{colKey: 'activity_name', title: '活动标题', align: 'center'},
+ {colKey: 'activity_type', title: '活动类别', align: 'center'},
{colKey: 'activity_desc', title: '活动简介', align: 'center'},
{colKey: 'activity_image', title: '活动图片', align: 'center'},
{colKey: 'activity_start_time', title: '活动开始时间', align: 'center'},
@@ -276,6 +294,17 @@ export default {
add() {
this.addMode = true;
this.isEdit = false;
+ this.addForm = {
+ activity_name: '',
+ activity_desc: '',
+ activity_image_show: [],
+ activity_image: '',
+ activity_start_time: '',
+ activity_end_time: '',
+ activity_content: '',
+ activity_location: '',
+ activity_type: null,
+ };
},
edit(d) {
console.log(d);
@@ -288,6 +317,7 @@ export default {
this.addForm.activity_end_time = d.activity_end_time;
this.addForm.activity_location = d.activity_location;
this.addForm.activity_content = d.activity_content;
+ this.addForm.activity_type = d.activity_type;
this.addMode = true;
this.isEdit = true;
},
@@ -316,6 +346,10 @@ export default {
this.$message.error('活动简介不能为空');
return;
}
+ if (this.addForm.activity_type == null) {
+ this.$message.error('活动类别不能为空');
+ return;
+ }
if (this.addForm.activity_image == '') {
this.$message.error('活动图片不能为空');
return;
diff --git a/src/pages/association/carousel.vue b/src/pages/association/carousel.vue
new file mode 100644
index 0000000..894121a
--- /dev/null
+++ b/src/pages/association/carousel.vue
@@ -0,0 +1,195 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/association/index.vue b/src/pages/association/index.vue
index f723fbc..18f9366 100644
--- a/src/pages/association/index.vue
+++ b/src/pages/association/index.vue
@@ -45,7 +45,7 @@
/>
+ 新增
+
+
+ 图片
+ 视频
+
+
+
+ 编辑
+
+ 删除
+
+
+
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
@@ -351,9 +358,11 @@ export default {
documents_file: '',
documents_file_show: [],
enterprise_location:'',
+ introduction:'',
+ enterprise_name:'',
},
ok: false,
- current: 0,
+ current: 2,
id: 0,
info: '',
industry_list:[],
@@ -537,6 +546,10 @@ export default {
this.$message.error('请上传个人照片！');
return;
}
+ if(this.formData.introduction==''){
+ this.$message.error('请填写自我介绍！');
+ return;
+ }
this.current = 2;
},
submit(){
@@ -548,6 +561,10 @@ export default {
this.$message.error('请输入统一社会信用代码！');
return;
}
+ if(this.formData.enterprise_name==''){
+ this.$message.error('请输入企业名称！');
+ return;
+ }
if (this.formData.enterprise_nature == '') {
this.$message.error('请输入企业性质！');
return;
diff --git a/src/pages/user/user_edit.vue b/src/pages/user/user_edit.vue
index 034f135..2f57f9a 100644
--- a/src/pages/user/user_edit.vue
+++ b/src/pages/user/user_edit.vue
@@ -89,6 +89,10 @@
+
+
+
+
@@ -309,7 +316,9 @@ export default {
superior_nature: '',
tuanweifuzerenxinxi: '',
documents_file: '',
- documents_file_show: []
+ documents_file_show: [],
+ introduction:'',
+ enterprise_name:'',
},
id: 0,
info: '',
@@ -426,6 +435,8 @@ export default {
this.formData.documents_file=res.data.documents_file;
this.formData.enterprise_location=res.data.enterprise_location;
this.formData.documents_file_show= [{url:store.state.user.apiUrl+ res.data.documents_file}];
+ this.formData.introduction=res.data.introduction;
+ this.formData.enterprise_name=res.data.enterprise_name;
})
.catch((e) => {
console.log(e);
diff --git a/src/pages/user/user_index.vue b/src/pages/user/user_index.vue
index f81ef96..794b0eb 100644
--- a/src/pages/user/user_index.vue
+++ b/src/pages/user/user_index.vue
@@ -49,10 +49,10 @@
:hover="true"
size="large"
table-layout="auto"
- cellEmptyContent="-"
+ cellEmptyContent="-" c
>
- ![]()
+ ![]()
{{row.gender==1?"男":"女"}}
@@ -124,7 +124,7 @@ export default {
methods: {
del(row){
this.$request
- .post("/member/del",{member_id:row.id})
+ .post("/member/del",{member_id:row.member_id})
.then( (res) => {
console.log(res);
if (res.code==1){
diff --git a/src/pages/user/user_info.vue b/src/pages/user/user_info.vue
index 56c28ad..53f7067 100644
--- a/src/pages/user/user_info.vue
+++ b/src/pages/user/user_info.vue
@@ -29,7 +29,7 @@
@@ -80,8 +80,8 @@
- 人员信息
+