diff --git a/common/http.api.js b/common/http.api.js
index 3778bec..bf85f84 100644
--- a/common/http.api.js
+++ b/common/http.api.js
@@ -50,13 +50,14 @@ let apiApp = {
cartDestroy: '/api/mobile/cart/destroy',
hospital: '/api/mobile/hospital/hospital',
- banner: '/api/mobile/other/banner',
- // 就医服务
- serveHospital:'/api/mobile/serve-hospital/hospital',
- serveHospitalDetail:'/api/mobile/serve-hospital/hospital-detail',
- serveHospitalForm:'/api/mobile/serve-hospital/forms',
- serveHospitalOrder:'/api/mobile/user/serve-hospital-form',
- serveHospitalOrderDetail:'/api/mobile/user/serve-hospital-form-detail',
+ banner: '/api/mobile/other/banner',
+ // 就医服务
+ serveHospital:'/api/mobile/serve-hospital/hospital',
+ serveHospitalDetail:'/api/mobile/serve-hospital/hospital-detail',
+ serveHospitalForm:'/api/mobile/serve-hospital/forms',
+ serveHospitalOrder:'/api/mobile/user/serve-hospital-form',
+ serveHospitalOrderDetail:'/api/mobile/user/serve-hospital-form-detail',
+ oldAgeAllowanceSubmit: '/api/mobile/user/old-age-allowance',
}
@@ -114,13 +115,14 @@ const install = (Vue, vm) => {
const cartList = (params = {}) => vm.$u.get(apiApp.cartIndex, params)
const cartShow = (params = {}) => vm.$u.get(apiApp.cartShow, params)
const cartSave = (params = {}) => vm.$u.post(apiApp.cartSave, params)
- const cartDestroy = (params = {}) => vm.$u.get(apiApp.cartDestroy, params)
+ const cartDestroy = (params = {}) => vm.$u.get(apiApp.cartDestroy, params)
// 就医服务
const serveHospital = (params = {}) => vm.$u.get(apiApp.serveHospital, params)
- const serveHospitalDetail = (params = {}) => vm.$u.get(apiApp.serveHospitalDetail, params)
- const serveHospitalForm = (params = {}) => vm.$u.get(apiApp.serveHospitalForm, params)
- const serveHospitalOrder = (params = {}) => vm.$u.get(apiApp.serveHospitalOrder, params)
- const serveHospitalOrderDetail = (params = {}) => vm.$u.get(apiApp.serveHospitalOrderDetail, params)
+ const serveHospitalDetail = (params = {}) => vm.$u.get(apiApp.serveHospitalDetail, params)
+ const serveHospitalForm = (params = {}) => vm.$u.get(apiApp.serveHospitalForm, params)
+ const serveHospitalOrder = (params = {}) => vm.$u.get(apiApp.serveHospitalOrder, params)
+ const serveHospitalOrderDetail = (params = {}) => vm.$u.get(apiApp.serveHospitalOrderDetail, params)
+ const oldAgeAllowanceSubmit = (params = {}) => vm.$u.post(apiApp.oldAgeAllowanceSubmit, params)
// end
vm.$u.api = {
@@ -146,9 +148,11 @@ const install = (Vue, vm) => {
// 用户商城订单
userOrders,userOrdersDetail,productOrderRefund,
// 购物车
- cartList, cartSave, cartShow, cartDestroy,
- //就医服务
- serveHospital,serveHospitalDetail,serveHospitalForm,serveHospitalOrder,serveHospitalOrderDetail
+ cartList, cartSave, cartShow, cartDestroy,
+ //就医服务
+ serveHospital,serveHospitalDetail,serveHospitalForm,serveHospitalOrder,serveHospitalOrderDetail,
+ // 养老补贴
+ oldAgeAllowanceSubmit
};
}
diff --git a/manifest.json b/manifest.json
index b99a3cf..2395296 100644
--- a/manifest.json
+++ b/manifest.json
@@ -5,7 +5,7 @@
"versionName" : "1.0.0",
"versionCode" : "100",
"transformPx" : false,
- "sassImplementationName": "node-sass",
+ "sassImplementationName" : "node-sass",
/* 5+App特有相关 */
"app-plus" : {
"usingComponents" : true,
@@ -64,11 +64,11 @@
"scope.chooseAddress" : {
"desc" : "需要获取您的收货地址"
},
- "scope.chooseLocation" : {
- "desc" : "需要获取您的详细地址"
- }
+ "scope.chooseLocation" : {
+ "desc" : "需要获取您的详细地址"
+ }
},
- "requiredPrivateInfos" : [ "getLocation", "chooseAddress","chooseLocation" ],
+ "requiredPrivateInfos" : [ "getLocation", "chooseAddress", "chooseLocation" ],
"optimization" : {
"subPackages" : true
},
diff --git a/package_sub/pages/OldAgeAllowance/OldAgeAllowance.vue b/package_sub/pages/OldAgeAllowance/OldAgeAllowance.vue
new file mode 100644
index 0000000..0b2535d
--- /dev/null
+++ b/package_sub/pages/OldAgeAllowance/OldAgeAllowance.vue
@@ -0,0 +1,250 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 【专属福利】您家60岁以上失能老人
+ 每月最高领800元!
+
+
+
+
+ *
+ 手机号:
+
+
+
+
+
+
+ 提交咨询信息
+
+
+
+
+
+
+
+
diff --git a/pages.json b/pages.json
index 0d83496..907d0cd 100644
--- a/pages.json
+++ b/pages.json
@@ -205,6 +205,12 @@
"navigationBarTitleText": "公益服务",
"enablePullDownRefresh": true
}
+ },
+ {
+ "path": "pages/OldAgeAllowance/OldAgeAllowance",
+ "style": {
+ "navigationBarTitleText": "养老补贴"
+ }
}
]
}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 464a1f6..974fdc0 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -61,9 +61,9 @@
-->
-
+
+
+
热门医院
@@ -92,10 +92,10 @@
浴疗人次2万+
- 照护人数15万+
- 服务人次200万+
- 服务小时2000万+
-
+ 照护人数15万+
+ 服务人次200万+
+ 服务小时2000万+
+
@@ -112,9 +112,9 @@
-
- 联系我们
- 0519-81191800
+
+ 联系我们
+ 0519-81191800
@@ -151,8 +151,23 @@
-
+
+
+
+
+
+
+
+
+
+
+
@@ -167,6 +182,7 @@
},
data() {
return {
+ showYlbtMask: false,
isShowSite: false,
list_site: [{
id: '',
@@ -211,8 +227,8 @@
{
text: "智能AI",
icon: "/static/index/index6.png",
- to: "/pages/aichat/index",
- },
+ upgrade: true,
+ }
],
hospitals: [],
@@ -247,14 +263,25 @@
return getApp().globalData.navbarHeight;
},
},
- methods: {
- goSwiper(e){
- var data = this.banners[e]
- if(data.jump_type==1 && data.jump_url){
- uni.navigateTo({
- url:data.jump_url
- })
- }
+ methods: {
+ closeYlbtMask() {
+ this.showYlbtMask = false
+ },
+ goOldAgeAllowanceFromMask() {
+ this.closeYlbtMask()
+ this.$u.throttle(
+ this.$u.route({
+ url: '/package_sub/pages/OldAgeAllowance/OldAgeAllowance'
+ })
+ )
+ },
+ goSwiper(e){
+ var data = this.banners[e]
+ if(data.jump_type==1 && data.jump_url){
+ uni.navigateTo({
+ url:data.jump_url
+ })
+ }
},
getElScrollTop() {
const query = uni.createSelectorQuery().in(this);
@@ -284,6 +311,10 @@
// this.getPhotos()
},
goLinks(item) {
+ if (item.upgrade) {
+ this.$u.toast('功能升级中')
+ return
+ }
if (item.to) {
this.$u.throttle(
this.$u.route({
@@ -413,7 +444,6 @@
margin-left: 18rpx;
}
- &__icon {}
}
.search-sticky {
@@ -515,7 +545,7 @@
padding-top: 20rpx;
}
- .icon {
+ .icon {
width: 220rpx;
height: 160rpx;
@@ -536,8 +566,8 @@
font-size: 0;
&>image {
- width: 700rpx;
- height: 169rpx;
+ width: 100%;
+ height: 223rpx;
}
}
@@ -644,21 +674,21 @@
#e26165 0%,
#c10d12 94%,
#c10d12 100%);
- position: relative;
+ position: relative;
padding: 55rpx 0 0 20rpx;
.text1 {
color:#f7dddf;
- font-size: 24rpx;
- padding-bottom:34rpx;
- position: relative;
- z-index:1;
- &>text{
- font-weight: bold;
- font-size: 36rpx;
- color: #fff;
- margin-left:20rpx;
- margin-right:5rpx;
+ font-size: 24rpx;
+ padding-bottom:34rpx;
+ position: relative;
+ z-index:1;
+ &>text{
+ font-weight: bold;
+ font-size: 36rpx;
+ color: #fff;
+ margin-left:20rpx;
+ margin-right:5rpx;
}
}
@@ -693,8 +723,8 @@
position: relative;
background: linear-gradient(to bottom, #f3d4d4, #f2edf0);
- .text1 {
- text-align: center;
+ .text1 {
+ text-align: center;
padding:0 20rpx;
padding-top: 50rpx;
@@ -707,7 +737,7 @@
text:nth-child(2) {
font-size: 23rpx;
color: #929196;
- font-weight: 500;
+ font-weight: 500;
margin-left:5rpx;
}
}
@@ -715,7 +745,7 @@
.text2 {
font-size: 24rpx;
color: #202020;
- font-weight: 500;
+ font-weight: 500;
padding:0 20rpx;
padding-top: 10rpx;
text-align: center;
@@ -735,7 +765,7 @@
background: linear-gradient(to bottom, #f7e9dd, #f4f1f1);
.text1 {
- text-align: center;
+ text-align: center;
padding:0 20rpx;
padding-top: 50rpx;
@@ -755,7 +785,7 @@
.text2 {
font-size: 24rpx;
color: #202020;
- font-weight: 500;
+ font-weight: 500;
padding: 0 20rpx;
padding-top: 10rpx;
text-align: center;
@@ -781,11 +811,11 @@
position: absolute;
left: 20rpx;
top: 50%;
- transform: translateY(-50%);
- &>view:last-child{
- font-size: 26rpx;
- color:#202020;
- margin-top: 15rpx;
+ transform: translateY(-50%);
+ &>view:last-child{
+ font-size: 26rpx;
+ color:#202020;
+ margin-top: 15rpx;
}
}
@@ -853,4 +883,41 @@
}
}
}
+
+ .ylbt-mask {
+ position: fixed;
+ left: 0;
+ right: 0;
+ top: 0;
+ bottom: 0;
+ background: rgba(0, 0, 0, 0.6);
+ z-index: 100000;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ padding: 48rpx 40rpx;
+ box-sizing: border-box;
+ }
+
+ .ylbt-mask__box {
+ position: relative;
+ width: 100%;
+ }
+
+ .ylbt-mask__close {
+ position: absolute;
+ top: -29rpx;
+ right: -21rpx;
+ z-index: 2;
+ padding: 10rpx;
+ line-height: 1;
+ background: rgba(0, 0, 0, 0.4);
+ border-radius: 50%;
+ }
+
+ .ylbt-mask__img {
+ width: 100%;
+ display: block;
+ border-radius: 16rpx;
+ }
\ No newline at end of file
diff --git a/static/index/ai.png b/static/index/ai.png
deleted file mode 100644
index f7f81e1..0000000
Binary files a/static/index/ai.png and /dev/null differ
diff --git a/static/ylbt.png b/static/ylbt.png
new file mode 100644
index 0000000..e7057f8
Binary files /dev/null and b/static/ylbt.png differ
diff --git a/static/ylbtbg.png b/static/ylbtbg.png
new file mode 100644
index 0000000..b1cd1fa
Binary files /dev/null and b/static/ylbtbg.png differ
diff --git a/static/ylbticon1.png b/static/ylbticon1.png
new file mode 100644
index 0000000..ad3b33b
Binary files /dev/null and b/static/ylbticon1.png differ
diff --git a/static/ylbticon2.png b/static/ylbticon2.png
new file mode 100644
index 0000000..68abcbc
Binary files /dev/null and b/static/ylbticon2.png differ
diff --git a/static/ylbticon3.png b/static/ylbticon3.png
new file mode 100644
index 0000000..14d93b1
Binary files /dev/null and b/static/ylbticon3.png differ
diff --git a/static/ylbtmask.png b/static/ylbtmask.png
new file mode 100644
index 0000000..79af5b0
Binary files /dev/null and b/static/ylbtmask.png differ
diff --git a/static/ylbttitle.png b/static/ylbttitle.png
new file mode 100644
index 0000000..966ef89
Binary files /dev/null and b/static/ylbttitle.png differ