diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..d37039b Binary files /dev/null and b/dist.zip differ diff --git a/package.json b/package.json index 03e28e0..6bf7af2 100644 --- a/package.json +++ b/package.json @@ -32,6 +32,7 @@ "typescript": "^5.1.6", "vue": "~2.6.14", "vue-clipboard2": "^0.3.1", + "vue-cropper": "^0.6.5", "vue-router": "^3.5.1", "vuex": "^3.6.2", "vuex-router-sync": "^5.0.0" diff --git a/src/main.jsx b/src/main.jsx index 321d8af..ce9955e 100644 --- a/src/main.jsx +++ b/src/main.jsx @@ -14,7 +14,6 @@ import '@/style/index.less'; import './permission'; import store from './store'; - Vue.use(VueRouter); Vue.use(TDesign); Vue.use(VueClipboard); @@ -41,7 +40,7 @@ new Vue({ // eslint-disable-next-line @typescript-eslint/no-unused-vars render: (h) => (
- {/* 可以通过config-provider提供全局(多语言、全局属性)配置,如 + {/* 可以通过config-provider提供全局(多语言、全局属性)配置,如 */} diff --git a/src/pages/activity/activity_index.vue b/src/pages/activity/activity_index.vue index 76b4576..c130f71 100644 --- a/src/pages/activity/activity_index.vue +++ b/src/pages/activity/activity_index.vue @@ -77,6 +77,9 @@
+
+ 导出 +
+ + + + + + @@ -325,11 +334,13 @@ diff --git a/src/pages/association/index.vue b/src/pages/association/index.vue index 18f9366..e9cfa22 100644 --- a/src/pages/association/index.vue +++ b/src/pages/association/index.vue @@ -23,8 +23,8 @@ - - + +
@@ -196,7 +196,7 @@ export default { return; } if (this.association_phone == '') { - this.$message.error('协会电话不能为空'); + this.$message.error('协会联系方式不能为空'); return; } if (this.association_emal == '') { diff --git a/src/pages/association/system.vue b/src/pages/association/system.vue new file mode 100644 index 0000000..f4a1f31 --- /dev/null +++ b/src/pages/association/system.vue @@ -0,0 +1,374 @@ + + + diff --git a/src/pages/dashboard/base/index.ts b/src/pages/dashboard/base/index.ts index f07bf90..c31a8e9 100644 --- a/src/pages/dashboard/base/index.ts +++ b/src/pages/dashboard/base/index.ts @@ -204,9 +204,10 @@ export function getLineChartDataSet({ .format('MM-DD'), ); } - + console.log(timeArray); inArray.push(getRandomArray().toString()); outArray.push(getRandomArray().toString()); + } const dataSet = { diff --git a/src/pages/news/news_index.vue b/src/pages/news/news_index.vue index fb57b7e..03beff6 100644 --- a/src/pages/news/news_index.vue +++ b/src/pages/news/news_index.vue @@ -41,7 +41,7 @@ - + @@ -120,8 +120,8 @@ export default { list: [], gory_list:[], columns: [ - {colKey: 'news_title', title: '新闻标题', align: 'center'}, - {colKey: 'name', title: '类别', align: 'center'}, + {colKey: 'news_title', title: '新闻标题', align: 'center', width: 300}, + {colKey: 'name', title: '所属类目', align: 'center'}, {colKey: 'news_auto', title: '作者', align: 'center'}, {colKey: 'news_hits', title: '点击量', align: 'center'}, {colKey: 'news_source', title: '来源', align: 'center'}, diff --git a/src/pages/register/index.vue b/src/pages/register/index.vue index a163c10..8b84ce4 100644 --- a/src/pages/register/index.vue +++ b/src/pages/register/index.vue @@ -118,12 +118,12 @@
- + diff --git a/src/pages/user/user_edit.vue b/src/pages/user/user_edit.vue index ce6b874..9ff1d01 100644 --- a/src/pages/user/user_edit.vue +++ b/src/pages/user/user_edit.vue @@ -65,9 +65,9 @@ - - - + + + @@ -102,15 +102,17 @@
- - + +
+
+ + + + +

点击上传图片

+
+ 请选择身份证正面照 +
- - + + @@ -187,7 +189,7 @@ - + @@ -247,22 +249,63 @@
- + +
+
+ +
+
+
+ +
+
+
+ +
diff --git a/src/pages/user/user_edit_shen.vue b/src/pages/user/user_edit_shen.vue index 931f2ff..3d8edad 100644 --- a/src/pages/user/user_edit_shen.vue +++ b/src/pages/user/user_edit_shen.vue @@ -20,12 +20,13 @@
@@ -38,41 +39,137 @@ >
- -
+ +
- - -
旧信息
-
- - - -
新信息
-
-
- - -
证件照:123456
-
- -
->
-
- -
123456
-
-
+ + +
类别
+
+ +
原信息
+
+ + + +
新信息
+
+
+ + + +
名片背景图:
+
形象照:
+
协会职务:
+
姓名:
+
性别:
+
联系方式:
+
个人经历:
+
公司图标:
+
公司名称:
+
公司行业:
+
公司地址:
+
公司介绍:
+
+
+ + +
+ +
+ 无 +
+
+
+
{{ updateInfo.member.position_name }}
+
{{ updateInfo.member.nikename }}
+
{{ updateInfo.member.gender_name }}
+
{{ updateInfo.member.phone }}
+
{{ updateInfo.member.introduction }}
+
+ +
+ 无 +
+
+
{{ updateInfo.member.enterprise_name }}
+
{{ updateInfo.member.industry_name }}
+
{{ updateInfo.member.enterprise_location==''?'无':updateInfo.member.enterprise_location }}
+
{{ updateInfo.member.enterprise_Introduction }}
+
+
+ +
+ +
+
+ + +
+
+
{{ updateInfo.member_log.position_name }}
+
{{ updateInfo.member_log.nikename }}
+
{{ updateInfo.member_log.gender_name }}
+
{{ updateInfo.member_log.phone }}
+
{{ updateInfo.member_log.introduction }}
+
+ +
+ 无 +
+
+
{{ updateInfo.member_log.enterprise_name }}
+
{{ updateInfo.member_log.industry_name }}
+
{{ updateInfo.member_log.enterprise_location }}
+
{{ updateInfo.member_log.enterprise_Introduction }}
+
+
+
+
+ + 审核通过 + + + + 审核拒绝 + +
diff --git a/src/pages/user/user_index.vue b/src/pages/user/user_index.vue index fac38ff..0daf250 100644 --- a/src/pages/user/user_index.vue +++ b/src/pages/user/user_index.vue @@ -9,7 +9,7 @@ :style="{ marginBottom: '30px' }" > - + @@ -33,6 +33,14 @@ /> + + + + + + + + @@ -100,7 +108,7 @@ export default { tabIndex:1, columns:[ { colKey: 'member_id', title: '会员ID'}, - { colKey: 'photo_image', title: '证件照'}, + { colKey: 'photo_image', title: '形象照'}, { colKey: 'nikename', title: '会员姓名'}, { colKey: 'position_name', title: '职位'}, { colKey: 'phone', title: '手机号'}, @@ -112,9 +120,11 @@ export default { page:1, size:10, formData:{ + position_id:'', nikename: '', phone: '' }, + positionList:[], } }, mounted() { @@ -124,8 +134,20 @@ export default { this.association=JSON.parse(this.$store.state.user.association); } this.getList(); + this.getPositionList(); }, methods: { + getPositionList() { + this.$request + .post("/position") + .then((res) => { + console.log(res); + this.positionList = res.data; + }) + .catch((e) => { + console.log(e); + }); + }, tabIndexChange(d){ console.log(d); this.page=1; diff --git a/src/pages/user/user_info.vue b/src/pages/user/user_info.vue index 1dd1c83..65b9bf0 100644 --- a/src/pages/user/user_info.vue +++ b/src/pages/user/user_info.vue @@ -2,7 +2,7 @@
- +