13

# Conflicts:
#	src/router/index.js

.env.production

@@ -3,3 +3,4 @@ NODE_ENV='production'
 VUE_APP_ENV = 'production'
 VUE_APP_BASE_URL = '/'
 outputDir = 'epmet-wx-pa'
+PUBLIC_PATH = ''

.env.staging

@@ -2,5 +2,5 @@ NODE_ENV='staging'
 # must start with VUE_APP_
 VUE_APP_ENV = 'staging'
 VUE_APP_BASE_URL = '/'
-outputDir = 'dist'
-outputDir = 'epmet-work-wx-dev-staging'
+outputDir = 'epmet-wx-pa-staging'
+PUBLIC_PATH = ''

README.md

@@ -1,3 +1,13 @@
+### 启动流程
+...安装依赖就不讲了
+把线上地址映射到本地 必须必须!!!!!!
+不会的可以参考这个: https://blog.csdn.net/weixin_55846296/article/details/131451501
+↓↓↓↓
+然后跑起来之后你本地的域名就会变成epmet-cloud.elinkservice.cn
+↓↓↓↓
+在你小程序的公众号开发中输入以下网址就能够访问了
+http://epmet-cloud.elinkservice.cn:80/?appId=wx1078fa1e99424de9&redirect=epmet-cloud.elinkservice.cn&houseId=1640692803448688642
+
 ### Node 版本要求
 
 `Vue CLI` 需要 Node.js 8.9 或更高版本 (推荐 8.11.0+)。你可以使用 [nvm](https://github.com/nvm-sh/nvm) 或

package.json

@@ -10,6 +10,7 @@
     "build": "vue-cli-service build",
     "build:dev": "vue-cli-service build --mode development",
     "build:stage": "vue-cli-service build --mode staging",
+    "build:prod": "vue-cli-service build --mode production",
     "lint": "vue-cli-service lint",
     "deps": "yarn upgrade-interactive --latest"
   },

project.config.json

@@ -0,0 +1,28 @@
+{
+  "appid": "wxaf87b420b87e2d79",
+  "compileType": "miniprogram",
+  "libVersion": "3.4.6",
+  "packOptions": {
+    "ignore": [],
+    "include": []
+  },
+  "setting": {
+    "coverView": true,
+    "es6": true,
+    "postcss": true,
+    "minified": true,
+    "enhance": true,
+    "showShadowRootInWxmlPanel": true,
+    "packNpmRelationList": [],
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
+    }
+  },
+  "condition": {},
+  "editorSetting": {
+    "tabIndent": "insertSpaces",
+    "tabSize": 2
+  }
+}

project.private.config.json

@@ -0,0 +1,7 @@
+{
+  "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
+  "projectname": "epmet-wx-pa",
+  "setting": {
+    "compileHotReLoad": true
+  }
+}

public/index.html

@@ -14,6 +14,7 @@
     <div id="app"></div>
     <script src="//res2.wx.qq.com/open/js/jweixin-1.6.0.js"></script>
     <script src="https://3gimg.qq.com/lightmap/components/geolocation/geolocation.min.js"></script>
+    <script charset="utf-8" src="https://map.qq.com/api/js?v=2.exp&key=Q37BZ-7GERW-LZUR3-3WWD5-ZY3R2-D6FBG"></script> <!-- 腾讯地图 -->
 <!--    <script type="text/javascript" src="//mapapi.qq.com/web/mapComponents/geoLocation/v/geolocation.min.js"></script>-->
   </body>
 </html>

src/api/activity.js

@@ -0,0 +1,32 @@
+// axios
+import request from '@/utils/request'
+
+// 添加活动
+export function addActivityRecord(data) {
+  return request({
+    url: '/actual/base/communityActivityApplicationRecord/addActivityRecord',
+    method: 'post',
+    data
+  })
+}
+export function detail(id) {
+  return request({
+    url: `/actual/base/communityActivity/detail/${id}`,
+    method: 'get',
+  })
+}
+
+export function getById(id) {
+  return request({
+    url: `/actual/base/communityActivity/getById/${id}`,
+    method: 'get',
+  })
+}
+
+export function communityActivityApplicationRecordDelete(data) {
+  return request({
+    url: `/actual/base/communityActivityApplicationRecord/delete`,
+    method: 'post',
+    data
+  })
+}

src/api/demand.js

@@ -29,6 +29,7 @@ export function getUserDemandUnSolvedDetail(params) {
     params
   })
 }
+
 // 需求类型
 
 export function selectList(id) {
@@ -37,3 +38,19 @@ export function selectList(id) {
     method: 'get'
   })
 }
+//诉求详情
+export function icEventOldDetail(data) {
+  return request({
+    url: `/governance/icEventOld/detail`,
+    method: 'post',
+    data
+  })
+}
+//办理经过
+export function icEventOldProcess(data) {
+  return request({
+    url: `/governance/icEventOld/process`,
+    method: 'post',
+    data
+  })
+}

src/api/discusion.js

@@ -0,0 +1,8 @@
+// axios
+import request from '@/utils/request'
+export function icEventOldDiscussDetil(id) {
+    return request({
+        url: `/governance/commonServiceType/selectList/${id}`,
+        method: 'get'
+      })
+  }

src/api/event.js

@@ -10,6 +10,15 @@ export function saveOfficialAccountEvent(data) {
     data
   })
 }
+// 上报范围
+export function checkAreaPoint(data) {
+  return request({
+    url: `/gov/org/agency/checkAreaPoint`,
+    method: 'post',
+    message: '上报事件中...',
+    data
+  })
+}
 
 // 获取事件列表
 export function eventList(params) {
@@ -20,11 +29,19 @@ export function eventList(params) {
     params
   })
 }
-
+//我的诉求列表
+export function collects(data) {
+  return request({
+    url: `/governance/icEventOld/list`,
+    method: 'post',
+    message: '获取诉求中...',
+    data
+  })
+}
 // 事件评价
 export function updateEvent(data) {
   return request({
-    url: `/governance/officialAccountEventList/updateEvent`,
+    url: `/governance/icEventOld/comment`,
     method: 'post',
     message: '事件评价中...',
     data
@@ -39,3 +56,13 @@ export function process(data) {
     data
   })
 }
+// 获取事件详情
+
+export function eventDetail(data) {
+  return request({
+    url: `/governance/icEvent/detail`,
+    method: 'post',
+    message: '获取事件详情中...',
+    data
+  })
+}

src/api/home.js

@@ -0,0 +1,83 @@
+// axios
+import request from '@/utils/request'
+
+// 【社区服务】活动列表+轮播图
+export function communityActivity(data) {
+    return request({
+      url: `/actual/base/communityActivity/page`,
+      method: 'post',
+      data
+    })
+  }
+  // 【居民议事】列表
+export function icEventOldDiscuss(data) {
+  return request({
+    url: `/governance/icEventOldDiscuss/pageList`,
+    method: 'post',
+    data
+  })
+}
+
+  // 【社区讯息】菜单
+  export function advertisingTag(data) {
+    return request({
+      url: `/actual/base/advertisingTag/page`,
+      method: 'post',
+      data
+    })
+  }
+  // 【社区讯息】菜单
+  export function communityPublicity(data) {
+    return request({
+      url: `/actual/base/communityPublicity/page`,
+      method: 'post',
+      data
+    })
+  }
+    // 【社区讯息】详情
+  export function communityPublicityDetail(id) {
+      return request({
+        url: `/actual/base/communityPublicity/${id}`,
+        method: 'get',
+      })
+  }
+//议事赞成/反对
+export function handelClicsupport(data) {
+  return request({
+    url: `/governance/icEventOldDiscuss/addDiscuss`,
+    method: 'post',
+    data
+  })
+}
+//议事详情
+export function andelClicDetail(data) {
+  return request({
+    url: `/governance/icEventOld/detail`,
+    method: 'post',
+    data
+  })
+}
+//搜索
+export function keyWordSearch(data) {
+  return request({
+    url: `/actual/base/communityActivity/keyWordSearch`,
+    method: 'post',
+    data
+  })
+}
+  //热门词语
+export function popularSearch(data) {
+    return request({
+      url: `/actual/base/communityActivity/topWordList`,
+      method: 'post',
+      data
+    })
+}
+  //社区讯息点赞
+  export function communityPublicityGiveLike(data) {
+    return request({
+      url: `/actual/base/communityPublicity/giveLike`,
+      method: 'post',
+      data
+    })
+}

src/api/house.js

@@ -0,0 +1,17 @@
+// axios
+import request from '@/utils/request'
+
+//扫描二维码获取房屋信息
+export function getHouseInfoQR(id) {
+    return request({
+      url: `/actual/base/communityHouse/houseQrCode/info/${id}`,
+      method: 'get',
+    })
+  }
+  //扫描电子门牌二维码获取房屋信息
+  export function getcommunityBuildInfoQR(id) {
+    return request({
+      url: `/actual/base/communityBuildingUnit/unitQrCode/info/${id}`,
+      method: 'get',
+    })
+  }

src/api/lingCircle.js

@@ -0,0 +1,17 @@
+// axios
+import request from '@/utils/request'
+
+//获取生活圈
+export function sphereLifeSearchList(parm) {
+    return request({
+      url: `/voluntary/sphereLife/searchList?lon=${parm.lon}&lat=${parm.lat}&name=${parm.name}`,
+      method: 'get',
+    })
+  }
+  //获取生活圈
+export function sphereLifeSearcdetail(id) {
+  return request({
+    url: `/voluntary/sphereLife/detail/${id}`,
+    method: 'get',
+  })
+}

src/api/message.js

@@ -0,0 +1,11 @@
+// axios
+import request from '@/utils/request'
+
+//扫描二维码获取房屋信息
+export function querystaffmessage(data) {
+    return request({
+      url: `/message/usermessage/staff/querystaffmessage`,
+      method: 'POST',
+      data
+    })
+  }

src/api/peoSuggestion.js

@@ -0,0 +1,51 @@
+import request from '@/utils/request'
+export function icEventSpecialSubject(data) {
+    return request({
+      url: `/governance/icEventSpecialSubject/page`,
+      method: 'post',
+      data
+    })
+  }
+  //专题详细介绍
+  export function getDetailSpecial(params) {
+    return request({
+      url: `/governance/icEventSpecialSubject/getDetail`,
+      method: 'get',
+      message: '获取处理进展中...',
+      params
+    })
+  }
+  //金点子专题详情
+  export function getDetail(data) {
+    return request({
+      url: `/governance/icEventOld/detail`,
+      method: 'post',
+      data
+    })
+  }
+  //金点子详情
+
+  //获取处理进展
+// export function getDetail(params) {
+//     return request({
+//       url: `/governance/icEventSpecialSubject/getDetail`,
+//       method: 'get',
+//       message: '获取处理进展中...',
+//       params
+//     })
+//   }
+  
+  export function icEventOldAdd(data) {
+    return request({
+      url: `/governance/icEventOld/add`,
+      method: 'post',
+      data
+    })
+  }
+  export function ideaList(data) {
+    return request({
+      url: `/governance/icEventOld/ideaList`,
+      method: 'post',
+      data
+    })
+  }

src/api/satisfaction.js

@@ -0,0 +1,12 @@
+// axios
+import request from '@/utils/request'
+
+// 获取我的满意度调查
+export function inspRecord(params) {
+  return request({
+    url: `/governance/satisfaction/communitySelfInsp/inspRecord/list`,
+    method: 'get',
+    message: '加载中...',
+    params
+  })
+}

src/api/service.js

@@ -0,0 +1,44 @@
+// axios
+import request from '@/utils/request'
+
+//服务找人详情
+export function icServiceRecordV2(data) {
+  return request({
+    url: `/governance/icServiceRecordV2/detail`,
+    method: 'post',
+    data
+  })
+}
+//温暖找人详情
+export function icServiceWarmRecord(data) {
+    return request({
+      url: `/governance/icServiceWarmRecord/detail`,
+      method: 'post',
+      data
+    })
+}
+  //技能找人详情
+export function icServiceSkillRecord(data) {
+    return request({
+      url: `/governance/icServiceSkillRecord/detail`,
+      method: 'post',
+      data
+    })
+}
+  //岗位招人详情
+export function icServicePostRecord(data) {
+    return request({
+      url: `/governance/icServicePostRecord/detail`,
+      method: 'post',
+      data
+    })
+}
+//扫描二维码获取房屋信息
+export function policyDetail(id) {
+  return request({
+    url: `/governance/policy/policyDetail/${id}`,
+    method: 'get',
+  })
+}
+
+

src/api/user.js

@@ -4,13 +4,13 @@ import request from '@/utils/request'
 // 登录
 export function login(data) {
   return request({
-    url: `/auth/publicuser/wxcodetotoken`,
+    url: `/auth/loginH5/resiH5/loginFromH5ByWxCode`,
     method: 'post',
     message: '登录中...',
     data
   })
 }
-// 检测用户是否完善信息
+// 检测用户是否完善信息-废弃
 export function checkWxmpRegister(params) {
   return request({
     url: `/third/pacustomer/checkWxmpRegister`,
@@ -18,13 +18,13 @@ export function checkWxmpRegister(params) {
     params
   })
 }
+
 // 获取用户信息
-export function getUserWechatByUserId(params) {
+export function getUserWechatByUserId(id) {
   return request({
-    url: `/auth/publicuser/getUserWechatByUserId`,
+    url: `epmetuser/user/getH5LoginUserInfo/${id}`,
     method: 'get',
-    message: '获取用户信息中...',
-    params
+    message: '加载中....',
   })
 }
 
@@ -33,7 +33,7 @@ export function register(data) {
   return request({
     url: `/auth/publicuser/register`,
     method: 'post',
-    message: '提交用户信息中...',
+    message: '登录中...',
     data
   })
 }
@@ -41,7 +41,7 @@ export function register(data) {
 // 修改用户信息
 export function editUser(data) {
   return request({
-    url: `/third/pauserwechat/updateUserWechat`,
+    url: `/epmetuser/user/saveOrUpdateUserH5DTO`,
     method: 'post',
     message: '提交用户信息中...',
     data
@@ -106,7 +106,14 @@ export function houseoption(data) {
     data
   })
 }
-
+//获取我的消息列表
+export function querystaffmessage(params) {
+  return request({
+    url: `/message/usermessage/staff/querystaffmessage`,
+    method: 'post',
+    params
+  })
+}
 // 获取消息列表
 export function getWxmpEventAndDemandMessageList(params) {
   return request({
@@ -115,3 +122,27 @@ export function getWxmpEventAndDemandMessageList(params) {
     params
   })
 }
+// 获取组织树
+export function getAllOrgTreeList(data) {
+  return request({
+    url: `/gov/org/customerAgencyTree/getAllOrgTreeList`,
+    method: 'post',
+    data
+  })
+}
+// 搜索组织树
+export function getNeighborHoodListByName(data) {
+  return request({
+    url: `/actual/base/communityQuarters/getNeighborHoodListByName`,
+    method: 'post',
+    data
+  })
+}
+//获取可享服务
+export function myCommonsService(data) {
+  return request({
+    url: `/actual/base/residentBaseInfo/myCommonsService`,
+    method: 'post',
+    data
+  })
+}

src/assets/css/index.less

@@ -1,4 +1,5 @@
 
+@import "../fonts/index.css";
 html,
 body #app {
   color: @black;
@@ -8,16 +9,214 @@ body #app {
 #app {
   font-size: 16px;
   background-size: 100% auto;
+  font-family:pingfang-ordinary;
 }
 
-.flex {
+.card{
+  background-color: #fff;
+  border-radius: 8px;
+  // box-shadow: 0 1px 3px rgba(0,0,0,.3);
+  padding: 13px;
+  box-sizing: border-box;
+  width: auto;
+  .title{
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    :nth-child(1){
+      font-family:pingfang-bold;
+      font-size: 17px;
+    }
+    :nth-child(2){
+      color: #B4B4B4;
+      font-size: 14px;
+    }
+  }
+}
+.no-data{
+  height: 50px;
+  width: 100%;
+  color: #666666;
+  text-align: center;
+  line-height: 50px;
+  font-size: 15px;
+}
+.oh{
+  overflow: hidden;
+}
+.y66666{
+  color: #666666;
+}
+.C1{
+  color: #C1C1C1;
+}
+.AAA{
+  color: #AAAAAA;
+}
+.white{
+  color: #fff;
+}
+.gray{
+  color: #999999 !important;
+}
+.orange{
+  color: #f98f1a;
+}
+.blue{
+  color: #3974f6;
+}
+.flex{
   display: flex;
+  .flex1{
+    flex: 1;
+  }
+  &-1{
+    flex: 1;
+  }
+  &-y{
+      flex-direction: column;
+  }
+  &-x{
+    flex-direction: row;
+}
+  &-center1{
+    justify-content: center;
+  }
+  &-center2{
+    align-items: center;
+  }
+  &-center3{
+    align-items: flex-start;
+  }
+  //
+  &-mean{
+    justify-content: space-around;
+  }
+  //两端对齐
+  &-end{
+    justify-content: space-between;
+  }
+  //水平轴右对齐
+  &-fend{
+    justify-content: flex-end;
+  }
+  // 允许子元素换行
+  &-wrap{
+    flex-wrap: wrap;
+  }
+}
+.z{
+  z-index: 5;
+}
+.m{
+  &-left12{
+    margin-left: 12px;
+  }
+  &-left5{
+    margin-left: 12px;
+  }
+  &-left012{
+    margin-left: -5px;
+  }
+  &-left18{
+    margin-left: 18px;
+  }
+  &-right12{
+    margin-right: 12px;
+  }
+  &-right7{
+    margin-right: 7px;
+  }
+  &-top12{
+    margin-top: 12px;
+  }
+  &-top5{
+    margin-top: 5px;
+  }
+  &-bottom5{
+    margin-bottom: 5px;
+  }
+  &-bottom10{
+    margin-bottom: 10px;
+  }
+  &-right10{
+    margin-right: 10px;
+  }
+  &-right26{
+    margin-right: 26px;
+  }
+  
+  &-top15{
+    margin-top: 15px;
+  }
+  &-top10{
+    margin-top: 10px;
+  }
+  &-top18{
+    margin-top: 18px;
+  }
+  &-bot50{
+    margin-bottom: 50px;
+  }
+  &-bot10{
+    margin-bottom:10px;
+  }
+  &-top16{
+    margin-top:16px;
+  }
+}
+
+.p{
+  &-18{
+    padding: 0 18px;
+  }
+  &-12{
+    padding: 12px;
+  }
+}
+//固定在底部左侧。背景颜色为白色，全部窗口
+.bto_btn{
+  position: fixed;
+  bottom: 5px;
+  left: 0;
+  background: #ffffff;
+  width: 100%;
+  padding: 6px 26px;
+  box-sizing: border-box;
+  text-align: right;
+}
+// 相对定位
+.required{
+  position: relative;
+  
 }
 
+.required::after{
+  content: '*';
+  position: absolute;
+  left: -10px;
+  top: 0;
+  color: red;
+}
+.absolute{
+  position: absolute;
+}
 .mr10 {
   margin-right: 10px;
 }
-
+.text{
+  &-align{
+    &-center{
+      text-align: center;
+    }
+    &-right{
+      text-align: right;
+    }
+    &-left{
+      text-align: left;
+    }
+  }
+}
 .primary-color {
   color: @blue;
 }
@@ -32,4 +231,79 @@ body #app {
 .container {
   padding: 10px;
 }
-
+.img{
+  &_17{
+    width: 17px;
+    height: 17px;
+  }
+  &_16{
+    width: 16px;
+    height: 16px;
+  }
+  &_20{
+    width: 20px;
+    height: 20px;
+  }
+  &_23{
+    width: 23px;
+    height: 23px;
+  }
+  &_round{
+    border-radius: 5px;
+  }
+  &_33{
+    width: 33px;
+    height: 33px;
+  }
+  &_57{
+    width: 57px;
+    height: 57px;
+  }
+}
+.font-size13{
+  font-size: 13px;
+}
+.font-size14{
+  font-size: 14px;
+}
+.font-size15{
+  font-size: 15px;
+}
+.font-size18{
+  font-size: 18px;
+}
+.font-size21{
+  font-size: 21px;
+}
+.font-size25{
+  font-size: 25px;
+}
+.font-bold{
+  font-weight: bold;
+}
+.text{
+  &-right{
+    text-align: right;
+  }
+  &-left{
+    text-align: left;
+  }
+}
+.bot_btn{
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  background: #ffffff;
+  width: 100%;
+  right: 0;
+}
+.content{
+  width: calc(100% - 20px);
+  margin: 0 auto;
+}
+.back_color{
+  background: #F7F7F7;
+}
+.nowrap{
+  white-space: nowrap
+}

src/assets/css/vant-theme.less

@@ -1,4 +1,4 @@
-@blue: #4F94FF;
+@blue: #3974f6;
 @gray-5: #C1C1C1;
 @border-color: #EAEAEA;
 @black: #333333;

src/assets/fonts/index.css

@@ -0,0 +1,17 @@
+@font-face {
+    font-family: 'pingfang-bold';
+    src: url('pingfang-bold.ttf');
+    src:url('pingfang-bold.ttf') format('truetype');
+    font-weight: normal;
+    font-style: normal;
+    font-display: swap;
+}
+@font-face {
+    font-family: 'pingfang-ordinary';
+    src: url('pingfang-ordinary.ttf');
+    src:url('pingfang-ordinary.ttf') format('truetype');
+    font-weight: normal;
+    font-style: normal;
+    font-display: swap;
+}
+