fix:添加党组织注册、完成党员服务页面

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
+};

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);

src/packages/people/pages/party-branch/create.vue

@@ -0,0 +1,358 @@
+<template>
+  <view class="">
+    <custom-nav-bar position="fixed" color="black" left-text="党组织注册" left-arrow />
+
+    <view class="form-list">
+      <view class="form-body form-col">
+        <view class="label">
+          <text>单位名称</text>
+          <text class="red">*</text>
+        </view>
+        <input class="flex1 textarea-class" @input="headleInput" :value="form.name" type="text" data-name="name"
+          placeholder="请输入" />
+      </view>
+
+      <view class="form-body">
+        <view class="flex flex-v-center flex-between">
+          <view class="label">
+            <text>支部名称</text>
+            <text class="red">*</text>
+          </view>
+          <view class="label-value flex flex-v-center">
+            <picker @change="bindPickerChange" range-key="label" :value="form.type" :range="columns">
+              <!-- <view style="color: #000000">{{ columns[form.type].label }}</view> -->
+            </picker>
+            <image class="ic-xia" src="/static/packages/people/images/ic-xia.png"></image>
+          </view>
+        </view>
+      </view>
+
+      <view class="form-body form-col">
+        <view class="label">
+          <text>单位地址</text>
+          <text class="red">*</text>
+        </view>
+        <input class="flex1 textarea-class" @input="headleInput" :value="form.name" type="text" data-name="name"
+          placeholder="请输入" />
+      </view>
+
+      <view class="form-body form-col">
+        <view class="label">
+          <text>支部书记</text>
+          <text class="red">*</text>
+        </view>
+        <input class="flex1 textarea-class" @input="headleInput" :value="form.name" type="text" data-name="name"
+          placeholder="请输入" />
+      </view>
+
+      <view class="form-body form-col">
+        <view class="label">
+          <text>联系方式</text>
+          <text class="red">*</text>
+        </view>
+        <input class="flex1 textarea-class" @input="headleInput" :value="form.name" type="text" data-name="name"
+          placeholder="请输入" />
+      </view>
+
+      <view class="form-body form-col">
+        <view class="label">
+          <text>党建联系人</text>
+          <text class="red">*</text>
+        </view>
+        <input class="flex1 textarea-class" @input="headleInput" :value="form.name" type="text" data-name="name"
+          placeholder="请输入" />
+      </view>
+
+      <view class="form-body form-col">
+        <view class="label">
+          <text>联系方式</text>
+          <text class="red">*</text>
+        </view>
+        <input class="flex1 textarea-class" @input="headleInput" :value="form.name" type="text" data-name="name"
+          placeholder="请输入" />
+      </view>
+
+      <view class="form-body">
+        <view class="flex flex-v-center flex-between">
+          <view class="label">
+            <text>结对共建社区</text>
+            <text class="red">*</text>
+          </view>
+          <view class="label-value flex flex-v-center">
+            <picker @change="bindPickerChange" range-key="label" :value="form.type" :range="columns">
+              <!-- <view style="color: #000000">{{ columns[form.type].label }}</view> -->
+            </picker>
+            <image class="ic-xia" src="/static/packages/people/images/ic-xia.png"></image>
+          </view>
+        </view>
+      </view>
+
+      <view class="form-body">
+        <view class="flex flex-v-center flex-between">
+          <view class="label">
+            <text>结对共建小区</text>
+            <text class="red">*</text>
+          </view>
+          <view class="label-value flex flex-v-center">
+            <picker @change="bindPickerChange" range-key="label" :value="form.type" :range="columns">
+              <!-- <view style="color: #000000">{{ columns[form.type].label }}</view> -->
+            </picker>
+            <image class="ic-xia" src="/static/packages/people/images/ic-xia.png"></image>
+          </view>
+        </view>
+      </view>
+
+      <view class="form-body form-col">
+        <view class="label">
+          <text>支部党员人数</text>
+          <text class="red">*</text>
+        </view>
+        <input class="flex1 textarea-class" @input="headleInput" :value="form.name" type="text" data-name="name"
+          placeholder="请输入" />
+      </view>
+
+      <view class="form-button">
+        <van-button v-if="checked" @click="submit" block color="#FE3B53">提交</van-button>
+        <van-button v-else disabled block color="#C1C1C1">提交</van-button>
+      </view>
+
+    </view>
+
+  </view>
+</template>
+
+<script>
+  export default {
+    data() {
+      return {
+        form: {},
+        columns: [],
+        fileList: [],
+        checked: '1',
+      }
+    },
+    methods: {
+      bindPickerChange() {
+
+      },
+      headleInput() {
+
+      },
+      async afterRead(event) {
+        const {
+          file
+        } = event;
+
+        const res = await getApp().globalData.upload({
+          file
+        });
+        if (res.code !== 0) {
+          uni.showToast({
+            title: '上传图片失败',
+            icon: 'none'
+          });
+          return false;
+        }
+        // this.fileList.push({url:res.data})
+        this.appealEnclosure.push(res.data);
+      },
+      beforeDelete(file, dateil) {
+        this.appealEnclosure.splice(dateil.index, 1);
+        this.fileList.splice(dateil.index, 1)
+      },
+      submit() {
+
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+  .form-list {
+    width: 100%;
+  }
+
+  .form-body {
+    font-size: 32rpx;
+    font-weight: 400;
+    color: #333333;
+    padding: 40rpx 40rpx 38rpx;
+    position: relative;
+
+    &::before {
+      content: '';
+      position: absolute;
+      left: 50%;
+      bottom: 0;
+      transform: translateX(-50%);
+      width: 678rpx;
+      height: 1px;
+      background-color: #EFEFEF;
+    }
+
+    .label {
+      font-size: 28rpx;
+      font-weight: 400;
+      color: #333333;
+    }
+
+    .label-value {
+      font-size: 32rpx;
+      font-weight: 500;
+      color: #000000;
+      line-height: 32rpx;
+
+      .ic-xia {
+        margin-left: 27rpx;
+        width: 32rpx;
+        height: 32rpx;
+      }
+    }
+
+    .picker {
+      margin-top: 24rpx;
+    }
+
+    .picker-text {
+      font-size: 32rpx;
+      font-weight: 400;
+      color: #999999;
+    }
+
+    .picker-line {
+      flex: 1;
+    }
+
+    .textarea-class {
+      margin-top: 26rpx;
+      width: 100%;
+      font-size: 32rpx;
+      font-weight: 400;
+    }
+
+    .form-msg {
+      font-size: 26rpx;
+      font-weight: 400;
+      color: #999999;
+      line-height: 26rpx;
+      margin-top: 28rpx;
+    }
+
+    .location {
+      width: 32rpx;
+      height: 32rpx;
+    }
+
+    .location-info {
+      margin-top: 26rpx;
+
+      input {
+        font-size: 32rpx;
+        font-weight: 400;
+      }
+    }
+  }
+
+  .form-col {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    text-align: right;
+
+    .textarea-class {
+      margin-top: 0;
+    }
+
+    .card-placeholder {
+      font-size: 32rpx;
+      font-weight: 400;
+      color: #000000;
+    }
+  }
+
+  .form-location {
+    padding: 20rpx 35rpx;
+    border-radius: 16rpx;
+  }
+
+  .form-treaty {
+    padding: 83rpx 40rpx 32rpx;
+
+    .ic-check {
+      width: 32rpx;
+      height: 32rpx;
+    }
+
+    .checbox-text {
+      font-size: 28rpx;
+      font-weight: 400;
+      color: #000000;
+      line-height: 28rpx;
+
+      .jump-to {
+        color: var(--item-dominant-color);
+      }
+    }
+  }
+
+  .form-button {
+    margin-top: 34rpx;
+    padding: 25rpx 36rpx;
+  }
+
+  .form-button-body {
+    height: 80rpx;
+    font-size: 32rpx;
+    font-weight: 400;
+    color: #ffffff;
+    line-height: 80rpx;
+    text-align: center;
+    background: #c1c1c1;
+    border-radius: 8rpx;
+  }
+
+  .form-button-body-select {
+    background: var(--item-dominant-color);
+  }
+
+  .form-image {
+    margin: 20rpx 0rpx 20rpx 0;
+    display: flex;
+    align-items: center;
+    flex-wrap: wrap;
+  }
+
+  .form-image>view {
+    width: 31.3%;
+    position: relative;
+    margin-right: 13.5rpx;
+  }
+
+  .form-image>view>image:nth-child(1) {
+    width: 100%;
+    height: 200rpx;
+    border-radius: 10rpx;
+  }
+
+  .form-image>view>image:nth-child(2) {
+    position: absolute;
+    top: -0rpx;
+    right: 0rpx;
+    width: 40rpx;
+    height: 40rpx;
+  }
+
+  .camera {
+    width: 160rpx;
+    height: 160rpx;
+  }
+
+  .pd-left {
+    text-align: left;
+    padding-left: 35px;
+  }
+
+  .img-icon {
+    height: 20px;
+  }
+</style>

src/packages/people/pages/party-newspaper/create.vue

@@ -78,6 +78,7 @@
         <input class="flex1 textarea-class" @input="headleInput" :value="form.name" type="text" data-name="name"
           placeholder="请输入" />
       </view>
+
       <view class="form-body form-col">
         <view class="label">
           <text>性别</text>
@@ -88,6 +89,69 @@
           <van-radio name="2" icon-size="32rpx" checked-color="#FE3B53">女</van-radio>
         </van-radio-group>
       </view>
+
+      <view class="form-body">
+        <view class="flex flex-v-center flex-between">
+          <view class="label">
+            <text>出生年月</text>
+            <text class="red">*</text>
+          </view>
+          <view class="label-value flex flex-v-center">
+            <picker @change="bindPickerChange" range-key="label" :value="form.type" :range="columns">
+              <!-- <view style="color: #000000">{{ columns[form.type].label }}</view> -->
+            </picker>
+            <image class="ic-xia" src="/static/packages/people/images/ic-xia.png"></image>
+          </view>
+        </view>
+      </view>
+
+      <view class="form-body">
+        <view class="flex flex-v-center flex-between">
+          <view class="label">
+            <text>学历</text>
+            <text class="red">*</text>
+          </view>
+          <view class="label-value flex flex-v-center">
+            <picker @change="bindPickerChange" range-key="label" :value="form.type" :range="columns">
+              <!-- <view style="color: #000000">{{ columns[form.type].label }}</view> -->
+            </picker>
+            <image class="ic-xia" src="/static/packages/people/images/ic-xia.png"></image>
+          </view>
+        </view>
+      </view>
+
+      <view class="form-body form-col">
+        <view class="label">
+          <text>工作单位</text>
+          <text class="red">*</text>
+        </view>
+        <input class="flex1 textarea-class" @input="headleInput" :value="form.name" type="text" data-name="name"
+          placeholder="请输入" />
+      </view>
+
+      <view class="form-body form-col">
+        <view class="label">
+          <text>职务</text>
+          <text class="red">*</text>
+        </view>
+        <input class="flex1 textarea-class" @input="headleInput" :value="form.name" type="text" data-name="name"
+          placeholder="请输入" />
+      </view>
+
+      <view class="form-body form-col">
+        <view class="label">
+          <text>联系方式</text>
+          <text class="red">*</text>
+        </view>
+        <input class="flex1 textarea-class" @input="headleInput" :value="form.name" type="text" data-name="name"
+          placeholder="请输入" />
+      </view>
+
+      <view class="form-button">
+        <van-button v-if="checked" @click="submit" block color="#FE3B53">提交</van-button>
+        <van-button v-else disabled block color="#C1C1C1">提交</van-button>
+      </view>
+
     </view>
 
   </view>
@@ -268,6 +332,7 @@
   }
 
   .form-button {
+    margin-top: 34rpx;
     padding: 25rpx 36rpx;
   }
 

src/packages/people/pages/party-newspaper/index.vue

@@ -2,15 +2,16 @@
   <view>
     <custom-nav-bar left-text="党员服务" left-arrow />
 
-    <image class="second-header"
-      src="https://jiexiu.xuqidata.com:8083/jiexiujumin/5ff449a20cf95f6f207d2b3bc07816da05117b68cd810f7db27a6b8de34a61d9.png">
+    <image class="second-header" :src="recursionObj.icon">
     </image>
 
     <view class="party-grid">
-      <block v-for="(item,index) in 4" :key="index">
+      <block v-for="(item,index) in recursionTwoObj" :key="index">
+        <navigator v-if="item.clickUrl" class="line-navigator" :url="updateQuery(item.clickUrl, item)"
+          hover-class="none"></navigator>
         <view style="width: 100%;height: 100%;;">
-          <image class="icon" src="/src/static/logo.png" mode=""></image>
-          <view class="title">党员注册</view>
+          <image class="icon" :src="item.icon" mode=""></image>
+          <view class="title">{{item.name}}</view>
         </view>
       </block>
     </view>
@@ -58,9 +59,19 @@
 </template>
 
 <script>
+  import * as peopleApi from '@/api/peopleApi';
+  import * as publicApi from '@/api/publicApi';
+  import utils from '@/utils/util.map'
   export default {
     data() {
       return {
+        option: {},
+        recursionObj: {},
+        recursionTwoObj: [],
+        newsPageList: [],
+        pageNo: 1,
+        pageSize: 12,
+        total: 0,
         background: ['color1', 'color2', 'color3'],
         indicatorDots: true,
         autoplay: false,
@@ -68,13 +79,71 @@
         duration: 500
       }
     },
+    onLoad(option) {
+      this.option = option
+      this.recursionApi();
+      this.newsPageApi(false)
+    },
     methods: {
+      updateQuery(url, name) {
+        return utils.updateQuery(url, name);
+      },
+      async recursionApi() {
+        const res = await publicApi.recursionApi({
+          bannerType: 1,
+          parentId: this.option.parentId
+        });
+        if (res.data) {
+          this.recursionObj = res.data[0]
+          this.recursionTwoObj = res.data[1].children || []
+        }
+      },
+      // 分页参数处理事件
+      generalQueryData(reset = false) {
+        const {
+          pageNo,
+          pageSize
+        } = this;
+        const params = {
+          pageNo: 1,
+          pageSize: 14
+        };
+        if (reset) {
+          return params;
+        }
+        return {
+          ...params,
+          pageNo: pageNo + 1,
+          pageSize
+        };
+      },
+      async newsPageApi(reset = true) {
+        const params = this.generalQueryData(reset);
+        const param = {
+          pageNo: 1,
+          pageSize: 10,
+        };
+        if (this.searchValue) {
+          param.title = this.searchValue;
+        }
+        const res = await peopleApi.activityPageApi(param);
+        if (res.data && res.data.list && res.data.list.length) {
+          this.newsPageList = res.data.list
+
+        }
+      },
       headerDetail(item) {
         uni.navigateTo({
           url: './detail?id=' + item.id
         })
       }
-    }
+    },
+    onReachBottom() {
+      if (this.newsPageList.length === this.total) {
+        return;
+      }
+      this.newsPageApi(false);
+    },
   }
 </script>
 
@@ -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 {

src/packages/people/pages/second/second.vue

@@ -20,7 +20,7 @@
         v-for="(itemName, idx) in recursionTwoObj.children" :key="idx">
         <!-- <navigator v-if="itemName.clickUrl" class="line-navigator" :url="toods.updateQuery(itemName.clickUrl, itemName)"
           hover-class="none"></navigator> -->
-          <navigator v-if="itemName.clickUrl" class="line-navigator" :url="updateQuery(itemName.clickUrl, itemName)"
+        <navigator v-if="itemName.clickUrl" class="line-navigator" :url="updateQuery(itemName.clickUrl, itemName)"
           hover-class="none"></navigator>
 
         <image class="line-bg" :src="itemName.icon"></image>
@@ -45,7 +45,8 @@
 
     <view class="second-tabs" v-if="option.name === '家庭医生' || option.name === '党建引领'">
       <van-tabs id="secondTabs" @click-tab="onTabsChange($event, { tagId: 'secondTabs' })">
-        <van-tab :title="key.name" v-for="(key, index) in recursionObj.children" :name="key.value" :key="index"></van-tab>
+        <van-tab :title="key.name" v-for="(key, index) in recursionObj.children" :name="key.value"
+          :key="index"></van-tab>
       </van-tabs>
     </view>
 
@@ -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)
         }
       },
       /**

src/pages.json

@@ -182,6 +182,11 @@
           "name": "people",
           "style": {}
         },
+        {
+          "path": "pages/party-branch/create",
+          "name": "people",
+          "style": {}
+        },
         {
           "path": "pages/guide/guide",
           "name": "people",

src/pages/people/people.vue

@@ -42,8 +42,8 @@
         </view>
 
         <view class="second-model flex flex-v-center flex-between" v-else>
-          <view :class="'second-line flex flex-col ' + (idx === 0 ? 'line1' : '')" :style="itemName.cssStyle"
-            v-for="(itemName, idx) in item.children" :key="idx">
+          <view :class="'second-line flex flex-col ' + (idx === 0 || idx === 5 ? 'line1' : '')"
+            :style="itemName.cssStyle" v-for="(itemName, idx) in item.children" :key="idx">
             <navigator v-if="itemName.clickUrl" class="line-navigator" :url="updateQuery(itemName.clickUrl, itemName)"
               hover-class="none"></navigator>
 
@@ -62,7 +62,7 @@
 <script>
   import utils from '@/utils/util.map.js'
   import * as publicApi from '@/api/publicApi.js'; // 公共 API
-  
+
   export default {
     data() {
       return {
@@ -79,8 +79,8 @@
           name: ''
         },
         e: [],
-        latitude:0,
-        longitude:0
+        latitude: 0,
+        longitude: 0
       };
     }
     /**
@@ -91,23 +91,23 @@
       this.getBannerList();
       this.recursionApi();
       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("浏览器不支持地理定位功能");
+      }
     },
     methods: {
       updateQuery(url, name) {
@@ -159,9 +159,9 @@
         } = event.currentTarget.dataset;
         const urlArray = item.clickUrl.split(',');
         console.log(item)
-        if(item.name === '智慧社区'){
+        if (item.name === '智慧社区') {
           uni.navigateTo({
-            url:`/packages/public/pages/web-view/web-view?parentId=[id]&name=${item.name}`
+            url: `/packages/public/pages/web-view/web-view?parentId=[id]&name=${item.name}`
           })
         }