diff --git a/src/api/peopleApi.js b/src/api/peopleApi.js index f83aa6a..5c77527 100644 --- a/src/api/peopleApi.js +++ b/src/api/peopleApi.js @@ -11,516 +11,529 @@ import request from '../utils/request'; * 获得议事厅分页 * @param {*} data */ -const assemblyHallPageApi = function (data) { - return request({ - url: '/admin-api/people/assembly-hall/page', - method: 'get', - data: data - }); +const assemblyHallPageApi = function(data) { + return request({ + url: '/admin-api/people/assembly-hall/page', + method: 'get', + data: data + }); }; /** * 获得人民调解员分页 * @param {*} data */ -const mediatorPageApi = function (data) { - return request({ - url: '/admin-api/people/mediator/page', - method: 'get', - data: data - }); +const mediatorPageApi = function(data) { + return request({ + url: '/admin-api/people/mediator/page', + method: 'get', + data: data + }); }; /** * 获得人民调解员详情 * @param {*} data */ -const mediatorGetApi = function (data) { - return request({ - url: '/admin-api/people/mediator/get', - method: 'get', - data: data - }); +const mediatorGetApi = function(data) { + return request({ + url: '/admin-api/people/mediator/get', + method: 'get', + data: data + }); }; /** * 获得群众点单分页 * @param {*} data */ -const seekHelpPageApi = function (data) { - return request({ - url: '/admin-api/people/seek-help/page', - method: 'get', - data: data - }); +const seekHelpPageApi = function(data) { + return request({ + url: '/admin-api/people/seek-help/page', + method: 'get', + data: data + }); }; /** * 创建群众点单 * @param {*} data */ -const seekHelpCreateApi = function (data) { - return request({ - url: '/admin-api/people/seek-help/create', - method: 'post', - data: data - }); +const seekHelpCreateApi = function(data) { + return request({ + url: '/admin-api/people/seek-help/create', + method: 'post', + data: data + }); }; /** * 获得群众点单详情 * @param {*} data */ -const seekHelpGetApi = function (data) { - return request({ - url: '/admin-api/people/seek-help/get', - method: 'get', - data: data - }); +const seekHelpGetApi = function(data) { + return request({ + url: '/admin-api/people/seek-help/get', + method: 'get', + data: data + }); }; -const massesDetailUpdate = function (data) { - // 点单状态变化如:接单 - return request({ - url: '/admin-api/people/seek-help/update', - method: 'put', - data: data - }); +const massesDetailUpdate = function(data) { + // 点单状态变化如:接单 + return request({ + url: '/admin-api/people/seek-help/update', + method: 'put', + data: data + }); }; -const seekHelpApi = function (data) { - // 点单 进行帮助 - return request({ - url: `/admin-api/people/seek-help/help/${data.id}`, - method: 'put', - data: data - }); +const seekHelpApi = function(data) { + // 点单 进行帮助 + return request({ + url: `/admin-api/people/seek-help/help/${data.id}`, + method: 'put', + data: data + }); }; /** * 获得法律法规分页 * @param {*} data */ -const lawsRegulationPageApi = function (data) { - return request({ - url: '/admin-api/people/laws-regulation/page', - method: 'get', - data: data - }); +const lawsRegulationPageApi = function(data) { + return request({ + url: '/admin-api/people/laws-regulation/page', + method: 'get', + data: data + }); }; /** * 获得法律法规详情 * @param {*} data */ -const lawsRegulationGetApi = function (data) { - return request({ - url: '/admin-api/people/laws-regulation/get', - method: 'get', - data: data - }); +const lawsRegulationGetApi = function(data) { + return request({ + url: '/admin-api/people/laws-regulation/get', + method: 'get', + data: data + }); }; /** * 获得调解案件分页分页 * @param {*} data */ -const casesListApi = function (data) { - return request({ - url: '/admin-api/people/cases/page', - method: 'get', - data: data - }); +const casesListApi = function(data) { + return request({ + url: '/admin-api/people/cases/page', + method: 'get', + data: data + }); }; /** * 获得调解案件 * @param {*} data */ -const getCasesIdApi = function (data) { - return request({ - url: '/admin-api/people/cases/get', - method: 'get', - data: data - }); +const getCasesIdApi = function(data) { + return request({ + url: '/admin-api/people/cases/get', + method: 'get', + data: data + }); }; /** * 创建调解案件 * @param {*} data */ -const createCasesApi = function (data) { - return request({ - url: '/admin-api/people/cases/create', - method: 'post', - data: data - }); +const createCasesApi = function(data) { + return request({ + url: '/admin-api/people/cases/create', + method: 'post', + data: data + }); }; /** * 获得党建引领详情 * @param {*} data */ -const newsGetApi = function (data) { - return request({ - url: '/admin-api/people/news/get', - method: 'get', - data: data - }); +const newsGetApi = function(data) { + return request({ + url: '/admin-api/people/news/get', + method: 'get', + data: data + }); }; /** * 获得医院分页 * @param {*} data */ -const hospitalPageApi = function (data) { - return request({ - url: '/admin-api/people/hospital/page', - method: 'get', - data: data - }); +const hospitalPageApi = function(data) { + return request({ + url: '/admin-api/people/hospital/page', + method: 'get', + data: data + }); }; /** * 获得医院详情 * @param {*} data */ -const hospitalGetApi = function (data) { - return request({ - url: '/admin-api/people/hospital/get', - method: 'get', - data: data - }); +const hospitalGetApi = function(data) { + return request({ + url: '/admin-api/people/hospital/get', + method: 'get', + data: data + }); }; /** * 获得医生分页 * @param {*} data */ -const doctorPageApi = function (data) { - return request({ - url: '/admin-api/people/doctor/page', - method: 'get', - data: data - }); +const doctorPageApi = function(data) { + return request({ + url: '/admin-api/people/doctor/page', + method: 'get', + data: data + }); }; /** * 获得议事厅分页 * @param {*} data */ -const assemblyIdApi = function (data) { - return request({ - url: '/admin-api/people/assemblymen/create', - method: 'post', - data: data - }); +const assemblyIdApi = function(data) { + return request({ + url: '/admin-api/people/assemblymen/create', + method: 'post', + data: data + }); }; /** * 获得议事厅分页 * @param {*} data */ -const assemblyhallIdApi = function (data) { - return request({ - url: '/admin-api/people/assembly-hall/get', - method: 'get', - data: data - }); +const assemblyhallIdApi = function(data) { + return request({ + url: '/admin-api/people/assembly-hall/get', + method: 'get', + data: data + }); }; /** * 获得评论分页 * @param {*} data */ -const commentPageApi = function (data) { - return request({ - url: '/admin-api/people/comment/page', - method: 'get', - data: data - }); +const commentPageApi = function(data) { + return request({ + url: '/admin-api/people/comment/page', + method: 'get', + data: data + }); }; /** * 创建评论 * @param {*} data */ -const commentCreateApi = function (data) { - return request({ - url: '/admin-api/people/comment/create', - method: 'post', - data: data - }); +const commentCreateApi = function(data) { + return request({ + url: '/admin-api/people/comment/create', + method: 'post', + data: data + }); }; /** * 获得议事厅详情 * @param {*} data */ -const assemblyHallGetApi = function (data) { - return request({ - url: '/admin-api/people/assembly-hall/get', - method: 'get', - data: data - }); +const assemblyHallGetApi = function(data) { + return request({ + url: '/admin-api/people/assembly-hall/get', + method: 'get', + data: data + }); }; /** * 星级党支部 * @param {*} data */ -const partyBranchApi = function (data) { - return request({ - url: '/admin-api/people/party-branch/page', - method: 'get', - data: data - }); +const partyBranchApi = function(data) { + return request({ + url: '/admin-api/people/party-branch/page', + method: 'get', + data: data + }); }; /** * 获得党建引领 - 获得新闻资讯及活动分页 * @param {*} data * @param {*} data.categoryId // 取字典新闻类型的键值 */ -const newsPageApi = function (data) { - return request({ - url: '/admin-api/people/news/page', - method: 'get', - data: data - }); +const newsPageApi = function(data) { + return request({ + url: '/admin-api/people/news/page', + method: 'get', + data: data + }); }; /** * 星级党支部详情 * @param {*} data */ -const partyBranchGetApi = function (data) { - return request({ - url: '/admin-api/people/party-branch/get', - method: 'get', - data: data - }); +const partyBranchGetApi = function(data) { + return request({ + url: '/admin-api/people/party-branch/get', + method: 'get', + data: data + }); }; /** * 获得优秀党员分页 - 五星党员 * @param {*} data */ -const excellentPartMemberPageApi = function (data) { - return request({ - url: '/admin-api/people/excellent-party-member/page', - method: 'get', - data: data - }); +const excellentPartMemberPageApi = function(data) { + return request({ + url: '/admin-api/people/excellent-party-member/page', + method: 'get', + data: data + }); }; /** * 获取部门列表 * @param {*} data */ -const deptListApi = function (data) { - return request({ - url: '/admin-api/system/dept/list', - method: 'get', - data: data - }); +const deptListApi = function(data) { + return request({ + url: '/admin-api/system/dept/list', + method: 'get', + data: data + }); }; /** * 获得优秀党员详情 * @param {*} data */ -const excellentPartMemberGetApi = function (data) { - return request({ - url: '/admin-api/people/excellent-party-member/get', - method: 'get', - data: data - }); +const excellentPartMemberGetApi = function(data) { + return request({ + url: '/admin-api/people/excellent-party-member/get', + method: 'get', + data: data + }); }; /** * 获得办事处分页 - 最美乡村 * @param {*} data */ -const agencyPageApi = function (data) { - return request({ - url: '/admin-api/people/agency/page', - method: 'get', - data: data - }); +const agencyPageApi = function(data) { + return request({ + url: '/admin-api/people/agency/page', + method: 'get', + data: data + }); }; /** * 获得村务公开分页 * @param {*} data */ -const villageAffairsPageApi = function (data) { - return request({ - url: '/admin-api/people/village-affairs/page', - method: 'get', - data: data - }); +const villageAffairsPageApi = function(data) { + return request({ + url: '/admin-api/people/village-affairs/page', + method: 'get', + data: data + }); }; /** * 获得办事处分页 * @param {*} data */ -const agencyContentPageApi = function (data) { - return request({ - url: '/admin-api/people/agency-content/page', - method: 'get', - data: data - }); +const agencyContentPageApi = function(data) { + return request({ + url: '/admin-api/people/agency-content/page', + method: 'get', + data: data + }); }; /** * 获得群众点单评论 * @param {*} data */ -const CrateAppraiseApi = function (data) { - return request({ - url: '/admin-api/people/seek-help/appraise', - method: 'put', - data: data - }); +const CrateAppraiseApi = function(data) { + return request({ + url: '/admin-api/people/seek-help/appraise', + method: 'put', + data: data + }); }; /** * 获得办事处内容详情 * @param {*} data */ -const agencyContentGetApi = function (data) { - return request({ - url: '/admin-api/people/agency-content/get', - method: 'get', - data: data - }); +const agencyContentGetApi = function(data) { + return request({ + url: '/admin-api/people/agency-content/get', + method: 'get', + data: data + }); }; /** * 获得办事处分页详情 * @param {*} data */ -const agencyGetApi = function (data) { - return request({ - url: '/admin-api/people/agency/get', - method: 'get', - data: data - }); +const agencyGetApi = function(data) { + return request({ + url: '/admin-api/people/agency/get', + method: 'get', + data: data + }); }; /** * 获得办事处内容 + 根据部门id * @param {*} data */ -const agencyContentGetOrgIdApi = function (data) { - return request({ - url: '/admin-api/people/agency-content/getOrgId', - method: 'get', - data: data - }); +const agencyContentGetOrgIdApi = function(data) { + return request({ + url: '/admin-api/people/agency-content/getOrgId', + method: 'get', + data: data + }); }; /** * 获得办事处内容 + 根据部门id * @param {*} data */ -const villageAffairsGetApi = function (data) { - return request({ - url: '/admin-api/people/village-affairs/get', - method: 'get', - data: data - }); +const villageAffairsGetApi = function(data) { + return request({ + url: '/admin-api/people/village-affairs/get', + method: 'get', + data: data + }); }; /** * 获得党活动事件分页 * @param {*} data */ -const partyEventPageApi = function (data) { - return request({ - url: '/admin-api/people/party-event/page', - method: 'get', - data: data - }); +const partyEventPageApi = function(data) { + return request({ + url: '/admin-api/people/party-event/page', + method: 'get', + data: data + }); }; /** * 获得党活动事件分页详情 * @param {*} data */ -const partyEventGetApi = function (data) { - return request({ - url: '/admin-api/people/party-event/get', - method: 'get', - data: data - }); +const partyEventGetApi = function(data) { + return request({ + url: '/admin-api/people/party-event/get', + method: 'get', + data: data + }); }; /** * 创建患者 - 申请签约家庭医生 * @param {*} data */ -const patientCreateApi = function (data) { - return request({ - url: '/admin-api/people/patient/create', - method: 'post', - data: data - }); +const patientCreateApi = function(data) { + return request({ + url: '/admin-api/people/patient/create', + method: 'post', + data: data + }); }; /** * 获取网格列表 * @param {*} data */ -const getGridListApi = function (data) { - return request({ - url: '/admin-api/people/grid/page', - method: 'get', - data: data - }); +const getGridListApi = function(data) { + return request({ + url: '/admin-api/people/grid/page', + method: 'get', + data: data + }); }; /** * 获取网格成员列表 * @param {*} data */ -const getGridMemberListApi = function (data) { - return request({ - url: '/admin-api/people/grid-member/page', - method: 'get', - data: data - }); +const getGridMemberListApi = function(data) { + return request({ + url: '/admin-api/people/grid-member/page', + method: 'get', + data: data + }); }; -export { - assemblyHallPageApi, - mediatorPageApi, - mediatorGetApi, - seekHelpPageApi, - seekHelpCreateApi, - seekHelpGetApi, - lawsRegulationPageApi, - lawsRegulationGetApi, - massesDetailUpdate, - seekHelpApi, - casesListApi, - getCasesIdApi, - createCasesApi, - newsGetApi, - hospitalPageApi, - hospitalGetApi, - doctorPageApi, - commentPageApi, - commentCreateApi, - assemblyHallGetApi, - newsPageApi, - assemblyIdApi, - assemblyhallIdApi, - partyBranchApi, - partyBranchGetApi, - excellentPartMemberPageApi, - deptListApi, - excellentPartMemberGetApi, - agencyPageApi, - villageAffairsPageApi, - agencyContentPageApi, - CrateAppraiseApi, - agencyContentGetApi, - agencyGetApi, - agencyContentGetOrgIdApi, - villageAffairsGetApi, - partyEventPageApi, - partyEventGetApi, - patientCreateApi, - getGridListApi, - getGridMemberListApi + +// 活动风采 +const activityPageApi = function(data) { + return request({ + url: '/admin-api/people/activity/page', + method: 'get', + data: data + }); }; + + + +export { + assemblyHallPageApi, + mediatorPageApi, + mediatorGetApi, + seekHelpPageApi, + seekHelpCreateApi, + seekHelpGetApi, + lawsRegulationPageApi, + lawsRegulationGetApi, + massesDetailUpdate, + seekHelpApi, + casesListApi, + getCasesIdApi, + createCasesApi, + newsGetApi, + hospitalPageApi, + hospitalGetApi, + doctorPageApi, + commentPageApi, + commentCreateApi, + assemblyHallGetApi, + newsPageApi, + assemblyIdApi, + assemblyhallIdApi, + partyBranchApi, + partyBranchGetApi, + excellentPartMemberPageApi, + deptListApi, + excellentPartMemberGetApi, + agencyPageApi, + villageAffairsPageApi, + agencyContentPageApi, + CrateAppraiseApi, + agencyContentGetApi, + agencyGetApi, + agencyContentGetOrgIdApi, + villageAffairsGetApi, + partyEventPageApi, + partyEventGetApi, + patientCreateApi, + getGridListApi, + getGridMemberListApi, + activityPageApi +}; \ No newline at end of file diff --git a/src/config/env.js b/src/config/env.js index 830e569..bebb3d3 100644 --- a/src/config/env.js +++ b/src/config/env.js @@ -2,33 +2,33 @@ * @name 小程序环境 * @description 多环境配置 */ -const envName = 'production'; +const envName = 'development'; const envs = [{ - envName: 'production', - appID: 'wx736395182f05a1b7', - appName: '介休网格通', - version: '1.0.0', - baseUrl: 'https://jxwgtjm.xuqidata.com:8088', - fileUrl: 'https://jiexiu.xuqidata.com:8083/jiexiujumin', - loginPath: '/admin-api/system/auth/wechat/app/login', - aMapKey: '29103dae675e5788eb011fb77ade8e3f', - pubkey: 'Si9veMEER0LGTcLL6xwRWxUB7UCF7jjb00548e0ddc1501de0f' -}, -{ - envName: 'development', - appID: 'wxcee598c3eb71e48d', - appName: '智慧旭奇', - version: '1.0.0', - baseUrl: 'http://47.92.245.35:5002', - // 接口前缀 - fileUrl: 'http://47.92.245.35:5009/xq-ssg', - // 图片服务器 - loginPath: '/admin-api/system/auth/wechat/app/login', - // 登陆接口 - aMapKey: '6e488a3ed079adbb01de2ecb88ca5905', - // 高德地图key - pubkey: 'O9eM4Cv5bpi30mgUw9GEkf19KVE8KE8D00a46a6e50bb9465b2' // 吾来对话机器人平台key -} + envName: 'production', + appID: 'wx736395182f05a1b7', + appName: '介休网格通', + version: '1.0.0', + baseUrl: 'https://jxwgtjm.xuqidata.com:8088', + fileUrl: 'https://jiexiu.xuqidata.com:8083/jiexiujumin', + loginPath: '/admin-api/system/auth/wechat/app/login', + aMapKey: '29103dae675e5788eb011fb77ade8e3f', + pubkey: 'Si9veMEER0LGTcLL6xwRWxUB7UCF7jjb00548e0ddc1501de0f' + }, + { + envName: 'development', + appID: 'wxcee598c3eb71e48d', + appName: '智慧旭奇', + version: '1.0.0', + baseUrl: 'http://47.92.245.35:5002', + // 接口前缀 + fileUrl: 'http://47.92.245.35:5009/xq-ssg', + // 图片服务器 + loginPath: '/admin-api/system/auth/wechat/app/login', + // 登陆接口 + aMapKey: '6e488a3ed079adbb01de2ecb88ca5905', + // 高德地图key + pubkey: 'O9eM4Cv5bpi30mgUw9GEkf19KVE8KE8D00a46a6e50bb9465b2' // 吾来对话机器人平台key + } ]; const isFind = envs.find((item) => item.envName === envName); diff --git a/src/packages/people/pages/party-branch/create.vue b/src/packages/people/pages/party-branch/create.vue new file mode 100644 index 0000000..0de851a --- /dev/null +++ b/src/packages/people/pages/party-branch/create.vue @@ -0,0 +1,358 @@ + + + + + \ No newline at end of file diff --git a/src/packages/people/pages/party-newspaper/create.vue b/src/packages/people/pages/party-newspaper/create.vue index b6a18e3..467bbda 100644 --- a/src/packages/people/pages/party-newspaper/create.vue +++ b/src/packages/people/pages/party-newspaper/create.vue @@ -78,6 +78,7 @@ + 性别 @@ -88,6 +89,69 @@ + + + + + 出生年月 + * + + + + + + + + + + + + + + 学历 + * + + + + + + + + + + + + + 工作单位 + * + + + + + + + 职务 + * + + + + + + + 联系方式 + * + + + + + + 提交 + 提交 + + @@ -268,6 +332,7 @@ } .form-button { + margin-top: 34rpx; padding: 25rpx 36rpx; } diff --git a/src/packages/people/pages/party-newspaper/index.vue b/src/packages/people/pages/party-newspaper/index.vue index e6b9e36..cee68cd 100644 --- a/src/packages/people/pages/party-newspaper/index.vue +++ b/src/packages/people/pages/party-newspaper/index.vue @@ -2,15 +2,16 @@ - + - + + - - 党员注册 + + {{item.name}} @@ -58,9 +59,19 @@ @@ -91,7 +160,7 @@ align-items: center; grid-gap: 24rpx; height: 100%; - padding: 56rpx 38rpx 0 38rpx; + padding: 40rpx 38rpx 0 38rpx; margin-bottom: 60rpx; .icon { diff --git a/src/packages/people/pages/second/second.vue b/src/packages/people/pages/second/second.vue index 8c541b0..670715e 100644 --- a/src/packages/people/pages/second/second.vue +++ b/src/packages/people/pages/second/second.vue @@ -20,7 +20,7 @@ v-for="(itemName, idx) in recursionTwoObj.children" :key="idx"> - @@ -45,7 +45,8 @@ - + @@ -150,8 +151,8 @@ pageNo: 1, pageSize: 12, total: 0, - latitude:0, - longitude:0 + latitude: 0, + longitude: 0 }; }, /** @@ -162,23 +163,23 @@ this.recursionApi(); this.callFcuntion(); if (navigator.geolocation) { - navigator.geolocation.getCurrentPosition( - function (position) { - console.log(position.coords.latitude); - this.latitude = position.coords.latitude; - this.longitude = position.coords.longitude; - uni.setStorageSync( - "userLocation", - position.coords.longitude + "," + position.coords.latitude - ); - }, - function (error) { - console.log(error.message); - } - ); - } else { - console.log("浏览器不支持地理定位功能"); - } + navigator.geolocation.getCurrentPosition( + function(position) { + console.log(position.coords.latitude); + this.latitude = position.coords.latitude; + this.longitude = position.coords.longitude; + uni.setStorageSync( + "userLocation", + position.coords.longitude + "," + position.coords.latitude + ); + }, + function(error) { + console.log(error.message); + } + ); + } else { + console.log("浏览器不支持地理定位功能"); + } }, onReachBottom() { if (this.newsPageList.length === this.total) { @@ -190,9 +191,9 @@ updateQuery(url, name) { return utils.updateQuery(url, name); }, - getDateTime(time){ - if(typeof item !== undefined) { - return utils.getDateTime(time) + getDateTime(time) { + if (typeof item !== undefined) { + return utils.getDateTime(time) } }, /** diff --git a/src/pages.json b/src/pages.json index 9ee0e89..291b6ec 100644 --- a/src/pages.json +++ b/src/pages.json @@ -182,6 +182,11 @@ "name": "people", "style": {} }, + { + "path": "pages/party-branch/create", + "name": "people", + "style": {} + }, { "path": "pages/guide/guide", "name": "people", diff --git a/src/pages/people/people.vue b/src/pages/people/people.vue index b7a62d3..629a22b 100644 --- a/src/pages/people/people.vue +++ b/src/pages/people/people.vue @@ -42,8 +42,8 @@ - + @@ -62,7 +62,7 @@