diff --git a/App.vue b/App.vue index 5f2e039..186dd4a 100644 --- a/App.vue +++ b/App.vue @@ -13,9 +13,9 @@ gain() { // const token = uni.getStorageSync("token"); // if (!token) return - this.API.getplie({ + this.API.getplie1({ pageNum: 1, - pageSize: 8000 + pageSize: 80000 }).then(response => { console.log(response, '界桩') let box1 = [] diff --git a/apis/modules/ly.js b/apis/modules/ly.js index b13e617..39ab3c8 100644 --- a/apis/modules/ly.js +++ b/apis/modules/ly.js @@ -1,6 +1,14 @@ import request from '../../service/request.js' import utils from '../../service/utils.js' export default { + // 活动列表查询 + getactivityInfoSheet(pages){ + return request.get('/boundary/activityInfoSheet/list',pages); + }, + // 详情活动列表查询 + getactivityInfoSheetdetail(pages){ + return request.get('/boundary/activityInfoSheet/'+pages); + }, // 获取详情界桩 getariesInfo(data){ return request.get('/areBoundary/ariesInfo/'+data) @@ -45,10 +53,14 @@ export default { getpolicyDocumentone(data){ return request.get('/arePlaceName/policyDocument/'+data) }, - // 行政区 + // 界桩 getplie(data){ return request.get('/areBoundary/ariesInfo/list',data) }, + // 行政区 + getplie1(data){ + return request.get('/areBoundary/plie/list',data) + }, // 申报小区门牌 adddoorplate(data){ return request.post('/arePlaceName/doorplate',data) diff --git a/pages.json b/pages.json index 4080cc9..ce4f634 100644 --- a/pages.json +++ b/pages.json @@ -317,7 +317,7 @@ }, { "path": "pages/declaration/list", "style": { - "navigationBarTitleText": "区域服务", + "navigationBarTitleText": "区划地名", "enablePullDownRefresh": false } @@ -462,6 +462,29 @@ "enablePullDownRefresh": false, "navigationStyle": "custom" } + }, + { + "path" : "pages/activity/activity", + "style" : + { + "navigationBarTitleText" : "活动详情", + "enablePullDownRefresh" : false + } + }, + { + "path" : "pages/activitylist/activitylist", + "style" : + { + "navigationBarTitleText" : "活动列表", + "enablePullDownRefresh" : false + } + }, + { + "path" : "pages/webviewyl/webviewyl", + "style" : + { + "navigationStyle": "custom" + } } ], "globalStyle": { diff --git a/pages/activity/activity.vue b/pages/activity/activity.vue new file mode 100644 index 0000000..ac408ae --- /dev/null +++ b/pages/activity/activity.vue @@ -0,0 +1,292 @@ + + + + + \ No newline at end of file diff --git a/pages/activitylist/activitylist.vue b/pages/activitylist/activitylist.vue new file mode 100644 index 0000000..e477ce7 --- /dev/null +++ b/pages/activitylist/activitylist.vue @@ -0,0 +1,109 @@ + + + + + \ No newline at end of file diff --git a/pages/declaration/declarationListdetail.vue b/pages/declaration/declarationListdetail.vue index a471886..e0b646f 100644 --- a/pages/declaration/declarationListdetail.vue +++ b/pages/declaration/declarationListdetail.vue @@ -6,7 +6,7 @@ - 基本信息 + 基本信息 diff --git a/pages/declaration/list.vue b/pages/declaration/list.vue index e3fcc9c..5813ef4 100644 --- a/pages/declaration/list.vue +++ b/pages/declaration/list.vue @@ -2,21 +2,29 @@ - + - + - - 门楼牌申报 + 地名申报 + + + + + + 地名查询 + + + - 地名标志牌申报 + 地名标志备案 @@ -27,12 +35,13 @@ 建筑物名称备案 - + - + - 地名申报 + + 门楼牌备案 @@ -41,17 +50,10 @@ - 界桩管护 - - - - - - - - 地名查询服务 + 界桩维护 + @@ -60,7 +62,22 @@ 巡检任务 - + + + + + + 政策文件 + + + + + + + + 区划活动 + + - - - - - 殡葬服务 - - - - - - - - 线上报丧 - - - - - - 线上预约 - - - - - - 办事指南 - - - - - - 常见问题 - - - - - + - 区域服务 + 养老服务 - - + + - + - 门楼牌申报 + 服务预约 - + - + - 地名标志牌申报 + 高龄津贴认证 - + - + - 建筑物备案 + 关爱地图 - + + - + - 地名备案 + 养老助餐 - - + + - + - 地名查询服务 - - - - - - 巡检任务 + 床位补贴机构资质申请 - - 未保服务 + 未成年服务 @@ -165,58 +123,127 @@ 悄悄话 + - + - 区域划分 + 区划地名服务 - + - + - 门楼牌申报 + 地名申报 + + + + + + 地名查询 - 地名标志牌申报 + 地名标志备案 + + - 建筑物备案 - - - - - - 地名备案 + 建筑物名称备案 + - + - + - 地名查询服务 + 门楼牌备案 - + + + + + + 政策文件 + + + + + + + + 殡葬服务 + + + + + + + + 线上报丧 + + + + + + 线上预约 + + + + + + 办事指南 + + + + + + 常见问题 + + + + + + + + 活动服务 + + + + + + + + 活动 + + + + @@ -266,6 +293,12 @@ uni.hideTabBar(); }, methods: { + goyl(e) { + console.log(e) + uni.navigateTo({ + url: '/pages/webviewyl/webviewyl?url='+e + }) + }, // funeralculture() { uni.setStorageSync('dh', 1) diff --git a/pages/policy/policy.vue b/pages/policy/policy.vue index 1b61a01..9e16abd 100644 --- a/pages/policy/policy.vue +++ b/pages/policy/policy.vue @@ -7,7 +7,7 @@ {{item.title}} {{item.readCount}}人阅读 - + @@ -68,8 +68,8 @@ display: flex; flex-direction: column; justify-content: space-between; - width: 58%; - margin-right: 2%; + width: 100%; + // margin-right: 2%; .f1 { font-size: 35rpx; diff --git a/pages/policy/policydetail.vue b/pages/policy/policydetail.vue index e14f897..91bcb5d 100644 --- a/pages/policy/policydetail.vue +++ b/pages/policy/policydetail.vue @@ -7,7 +7,7 @@ {{info.absrtact}} - + @@ -38,7 +38,7 @@ OrderType: 0, info: {}, nvConfig: { - title: "", + title: "详情", bgColor: "#ffffff", color: "#000000", fixedAssist: { @@ -68,7 +68,7 @@ this.API.getpolicyDocumentone(e).then(res => { console.log(res); this.info = res.data - this.nvConfig.title = this.info.title + // this.nvConfig.title = this.info.title }) }, downfile(e) { diff --git a/pages/receiptRegistration/receiptRegistration.vue b/pages/receiptRegistration/receiptRegistration.vue index 1d9f968..92356ad 100644 --- a/pages/receiptRegistration/receiptRegistration.vue +++ b/pages/receiptRegistration/receiptRegistration.vue @@ -18,6 +18,14 @@ 乡镇上报 + + + + + + 未成年活动 + + diff --git a/pages/webviewyl/webviewyl.vue b/pages/webviewyl/webviewyl.vue new file mode 100644 index 0000000..e167be8 --- /dev/null +++ b/pages/webviewyl/webviewyl.vue @@ -0,0 +1,36 @@ + + + + + diff --git a/pages/whisper/index.vue b/pages/whisper/index.vue index 6ad0385..1012101 100644 --- a/pages/whisper/index.vue +++ b/pages/whisper/index.vue @@ -58,7 +58,7 @@ 就读学校 + v-model="form.attendSchool" placeholder="请输入" style="text-align: right;" /> diff --git a/static/yl/image-2.png b/static/yl/image-2.png new file mode 100644 index 0000000..8062c87 --- /dev/null +++ b/static/yl/image-2.png diff --git a/static/yl/image-3.png b/static/yl/image-3.png new file mode 100644 index 0000000..c4891e4 --- /dev/null +++ b/static/yl/image-3.png diff --git a/static/yl/image-4.png b/static/yl/image-4.png new file mode 100644 index 0000000..8f1dced --- /dev/null +++ b/static/yl/image-4.png diff --git a/static/yl/image-5.png b/static/yl/image-5.png new file mode 100644 index 0000000..e26cdfa --- /dev/null +++ b/static/yl/image-5.png diff --git a/static/yl/image.png b/static/yl/image.png new file mode 100644 index 0000000..90fdefc --- /dev/null +++ b/static/yl/image.png