diff --git a/apis/modules/ly.js b/apis/modules/ly.js
index b13e617..238ff3d 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)
diff --git a/pages.json b/pages.json
index 87df0d1..ce4f634 100644
--- a/pages.json
+++ b/pages.json
@@ -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 @@
+
+
+
+
+
+
+ {{info.activityName}}
+
+
+ 活动人数:{{info.activityNumber}}
+ 活动开始日期:{{info.eventStartDate}}
+ 活动结束日期:{{info.eventEndDate}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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 @@
+
+
+
+
+
+
+ {{item.activityName}}
+ {{item.eventStartDate?item.eventStartDate:'-'}}{{item.eventEndDate?'至'+item.eventEndDate:'-'}}
+
+
+
+
+
+
+
+
+
+
+ 暂无数据
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/declaration/list.vue b/pages/declaration/list.vue
index 765c235..d1a3ae2 100644
--- a/pages/declaration/list.vue
+++ b/pages/declaration/list.vue
@@ -70,7 +70,7 @@
政策文件
-
+
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 1a64548..6bcb276 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -64,6 +64,49 @@
+ 养老服务
+
+
+
+
+
+
+
+ 服务预约
+
+
+
+
+
+ 高龄津贴认证
+
+
+
+
+
+ 关爱地图
+
+
+
+
+
+
+ 养老助餐
+
+
+
+
+
+
+
+ 床位补贴机构资质申请
+
+
+
+
+
+
+
未成年服务
@@ -80,6 +123,12 @@
悄悄话
+
@@ -138,12 +187,7 @@
政策文件
-
-
-
-
- 区划活动
-
+
@@ -183,7 +227,22 @@
-
+
+
+
+
+ 活动服务
+
+
+
+
+
+
+
+ 活动
+
+
+
@@ -234,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/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/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