diff --git a/config.js b/config.js
index 99d0baa..81581a5 100644
--- a/config.js
+++ b/config.js
@@ -3,7 +3,9 @@ export const appConfig = {
//appId:"wx3dc65ce9b588727a",//孕育咨询
//baseUrl: 'http://yunyubang.localhost.com',
baseUrl: 'https://yunyubang2021.langye.net', //孕育帮
- newBaseUrl: 'https://yunyubang.ali251.langye.net',
+ //baseUrl: 'http://yybtest.ali251.langye.net',
+ //newBaseUrl: 'https://yunyubang.ali251.langye.net',
+ newBaseUrl: 'http://yybtest.ali251.langye.net',
//baseUrl:'https://yybtest2021.langye.net',//孕育咨询
openidInfoKey: 'openid_info_yunyubang'
}
diff --git a/packages/packageCarecenter/pages/careCenter/careCenter.vue b/packages/packageCarecenter/pages/careCenter/careCenter.vue
index eff8a80..f7899d6 100644
--- a/packages/packageCarecenter/pages/careCenter/careCenter.vue
+++ b/packages/packageCarecenter/pages/careCenter/careCenter.vue
@@ -4,45 +4,57 @@
- 月子攻略
+
+ 月子攻略
+
更多
-
+
+
+
月子会所价格为何相差巨大月子会所价格为何相差巨大月子会所价格为何相差巨大？
市场纷繁复杂的套餐究竟如何选？
-
+
+
+
月子会所价格为何相差巨大月子会所价格为何相差巨大月子会所价格为何相差巨大？
市场纷繁复杂的套餐究竟如何选？
-
+
+
+
月子会所价格为何相差巨大月子会所价格为何相差巨大月子会所价格为何相差巨大？
市场纷繁复杂的套餐究竟如何选？
-
+
-
+
严选商家
-
+
+
+
-
+
严选商品
-
+
+
+
-
+
-
+
综合排序
@@ -55,44 +67,209 @@
已探店
-
- 推荐
+
+
+
+ 推荐
+
- 孕育邦孕妈妈摄影体验
- 孕妈宝宝成长讲座知识
- 东方之门/湖滨天地2.5km
- ￥30200 - ￥45000
+ {{item.name}}
+
+ {{tag}}
+
+
+ {{item.address}}2.5km
+ ￥30200 -
+ ￥45000
+
-
- 推荐
+
+
+
+
+
+
+ 综合排序
+ 全部地区
+ 筛选
+
+
+
+ 月子餐试吃
+ 已探店
+
+
+
+
+
+ 推荐
+
+
+ {{item.name}}
+
+ {{tag}}
+
+
+ {{item.address}}2.5km
+ ￥{{item.price}}
+
+
-
+
+
@@ -108,214 +285,330 @@
align-items: center;
justify-content: center;
}
- .careBanner{
- display:block;
- width:690rpx;
- height:220rpx;
- margin:20rpx auto;
+
+ .careBanner {
+ display: block;
+ width: 690rpx;
+ height: 220rpx;
+ margin: 20rpx auto;
}
- .strategyBox{
+
+ .strategyBox {
width: 710rpx;
padding-bottom: 16rpx;
background-image: linear-gradient(180deg, #FFE4EC 0%, #FFFFFF 24%);
border: 4rpx solid #FFFFFF;
- box-shadow: 0 0 20rpx 0 rgba(0,0,0,0.03);
+ box-shadow: 0 0 20rpx 0 rgba(0, 0, 0, 0.03);
border-radius: 16rpx;
- .strTit{
- padding:30rpx 25rpx 15rpx 25rpx;
- .strL{
+
+ .strTit {
+ padding: 30rpx 25rpx 15rpx 25rpx;
+
+ .strL {
font-size: 34rpx;
color: #333333;
letter-spacing: 1rpx;
- font-weight: 500;
- image{display:block;width: 30rpx;height: 34rpx;margin-right:10rpx;}
+ font-weight: 500;
+
+ image {
+ display: block;
+ width: 30rpx;
+ height: 34rpx;
+ margin-right: 10rpx;
+ }
}
- .more{
+
+ .more {
font-size: 28rpx;
color: #333333;
font-weight: 400;
}
}
- .strCol{
- padding:16rpx 25rpx;
- .strPic{
- width:140rpx;height:140rpx;border-radius:10rpx;
- image{display:block;width:140rpx;height:140rpx;border-radius:10rpx;}
+
+ .strCol {
+ padding: 16rpx 25rpx;
+
+ .strPic {
+ width: 140rpx;
+ height: 140rpx;
+ border-radius: 10rpx;
+
+ image {
+ display: block;
+ width: 140rpx;
+ height: 140rpx;
+ border-radius: 10rpx;
+ }
}
- .strInfo{
+
+ .strInfo {
flex: 1;
- padding-left:30rpx;
- .h3{font-size: 30rpx;color: #333333;font-weight: 500;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;width:460rpx;}
- .p{margin-top:10rpx;font-size: 24rpx;color: #999999;font-weight: 400;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;width:460rpx;}
+ padding-left: 30rpx;
+
+ .h3 {
+ font-size: 30rpx;
+ color: #333333;
+ font-weight: 500;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ width: 460rpx;
+ }
+
+ .p {
+ margin-top: 10rpx;
+ font-size: 24rpx;
+ color: #999999;
+ font-weight: 400;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ width: 460rpx;
+ }
}
}
}
-
- .careBox{
+
+ .careBox {
width: 750rpx;
- background-image: linear-gradient(180deg, rgba(255,255,255,0.80) 0%, rgba(255,255,255,0.80) 70%, rgba(255,255,255,0.00) 100%);
- border-radius: 40rpx 40rpx 0 0;
- margin-top:20rpx;
- .careTabs{
- width:100%;
- height:106rpx;
- .tabCol{
- width:50%;
- height:106rpx;
- line-height:106rpx;
+ background-image: linear-gradient(180deg, rgba(255, 255, 255, 0.80) 0%, rgba(255, 255, 255, 0.80) 70%, rgba(255, 255, 255, 0.00) 100%);
+ border-radius: 40rpx 40rpx 0 0;
+ margin-top: 20rpx;
+
+ .careTabs {
+ width: 100%;
+ height: 106rpx;
+
+ .tabCol {
+ width: 50%;
+ height: 106rpx;
+ line-height: 106rpx;
font-size: 36rpx;
color: #666666;
text-align: center;
font-weight: 400;
position: relative;
- text{position: relative;z-index:3;}
- .line{
- display:none;
- width:94rpx;
- height:33rpx;
+
+ text {
+ position: relative;
+ z-index: 3;
+ }
+
+ .line {
+ display: none;
+ width: 94rpx;
+ height: 33rpx;
position: absolute;
- left:50%;
+ left: 50%;
transform: translateX(-50%);
- bottom:20rpx;
- z-index:2;
- image{display:block;width:94rpx;height:33rpx;}
+ bottom: 20rpx;
+ z-index: 2;
+
+ image {
+ display: block;
+ width: 94rpx;
+ height: 33rpx;
+ }
}
}
- .cur{
- color: #333333;font-weight:600rpx;
- .line{display:block;}
+
+ .cur {
+ color: #333333;
+ font-weight: 600rpx;
+
+ .line {
+ display: block;
+ }
}
}
}
- .termBox{
+
+ .termBox {
width: 100%;
background: linear-gradient(180deg, rgba(255, 255, 255, 0.8) 0%, rgba(255, 255, 255, 0.8) 70%, rgba(255, 255, 255, 0) 100%);
border-radius: 40rpx 40rpx 0px 0px;
- .termOuter{
+
+ .termOuter {
display: flex;
align-items: center;
align-content: center;
justify-content: flex-start;
- .termCol{
- width:33.33%;
- text-align:center;
+
+ .termCol {
+ width: 33.33%;
+ text-align: center;
font-size: 28rpx;
font-weight: 400;
- color: #333333;
- padding:30rpx 0;
- .iconfont{font-size: 24rpx;color: #666666;line-height:28rpx;margin-left:8rpx;}
-
+ color: #333333;
+ padding: 30rpx 0;
+
+ .iconfont {
+ font-size: 24rpx;
+ color: #666666;
+ line-height: 28rpx;
+ margin-left: 8rpx;
+ }
+
}
- .termCol.cur{
- color:#FF578A;
- .iconfont{color: #FF578A;}
+
+ .termCol.cur {
+ color: #FF578A;
+
+ .iconfont {
+ color: #FF578A;
+ }
}
-
+
}
}
- .proBox{
- width:710rpx;
- background:#fff;
- margin:0 auto 30rpx auto;
- border-radius:12rpx;
+
+ .proBox {
+ width: 710rpx;
+ background: #fff;
+ margin: 0 auto 30rpx auto;
+ border-radius: 12rpx;
box-sizing: border-box;
- .tagGroup{
- padding:0 24rpx;
- text{
- display:inline-block;
+
+ .tagGroup {
+ padding: 0 24rpx;
+
+ text {
+ display: inline-block;
height: 64rpx;
background: #F6F6F6;
border-radius: 32rpx;
- padding:0 30rpx;
+ padding: 0 30rpx;
font-size: 26rpx;
color: #666666;
text-align: center;
line-height: 64rpx;
- font-weight: 400;
- margin-right:15rpx;
+ font-weight: 400;
+ margin-right: 15rpx;
}
}
}
- .introBox{
- padding:0 24rpx;
+
+ .introBox {
+ padding: 0 24rpx;
}
- .intro_column:first-child{
- border-top:none;
+
+ .intro_column:first-child {
+ border-top: none;
}
- .intro_column{
+
+ .intro_column {
display: flex;
justify-content: flex-start;
- padding:20rpx 0;
- width:100%;
- border-top:2rpx solid #EAEAEA;
- .imgOuter{
+ padding: 20rpx 0;
+ width: 100%;
+ border-top: 2rpx solid #EAEAEA;
+
+ .imgOuter {
width: 260rpx;
- height:210rpx;
+ height: 210rpx;
position: relative;
- border-radius:10rpx;
- image{width:260rpx;height:210rpx;border-radius:10rpx;}
- .i_intro{position: absolute;top:0;left:0;width: 68rpx;height: 32rpx;background: #FF578A;border-radius: 10rpx 0px 18rpx 0;font-size: 22rpx;font-weight: 400;color: #FFFFFF;line-height: 32rpx;text-align: center;}
+ border-radius: 10rpx;
+
+ image {
+ width: 260rpx;
+ height: 210rpx;
+ border-radius: 10rpx;
+ }
+
+ .i_intro {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 68rpx;
+ height: 32rpx;
+ background: #FF578A;
+ border-radius: 10rpx 0px 18rpx 0;
+ font-size: 22rpx;
+ font-weight: 400;
+ color: #FFFFFF;
+ line-height: 32rpx;
+ text-align: center;
+ }
}
- .columnInfo{
- flex:1;
- margin-left:22rpx;
+
+ .columnInfo {
+ flex: 1;
+ margin-left: 22rpx;
position: relative;
- .title{
- width:100%;
- font-size:30rpx;
- font-weight:700;
- color:#333;
+
+ .title {
+ width: 100%;
+ font-size: 30rpx;
+ font-weight: 700;
+ color: #333;
overflow: hidden;
white-space: nowrap;
- text-overflow: ellipsis;
+ text-overflow: ellipsis;
}
- .tags{
- margin-top:8rpx;
+
+ .tags {
+ margin-top: 8rpx;
}
- .tags text{
+
+ .tags text {
height: 28rpx;
- background: rgba(255,177,62,0.1);
+ background: rgba(255, 177, 62, 0.1);
border-radius: 4rpx;
- line-height:28rpx;
- font-size:20rpx;
+ line-height: 28rpx;
+ font-size: 20rpx;
padding: 0 10rpx;
- margin-right:10rpx;
- color:#FF753E;
+ margin-right: 10rpx;
+ color: #FF753E;
}
- .grayBg{
- background: #F6F6F6!important;
- color: #999999!important;
+
+ .grayBg {
+ background: #F6F6F6 !important;
+ color: #999999 !important;
}
- .subInfo{
- width:100%;
- font-size:24rpx;
- color:#999;
- font-weight:400;
+
+ .subInfo {
+ width: 100%;
+ font-size: 24rpx;
+ color: #999;
+ font-weight: 400;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
- padding-top:15rpx;
- .font_red{margin-left:10rpx;}
+ padding-top: 15rpx;
+
+ .font_red {
+ margin-left: 10rpx;
+ }
}
- .price{
+
+ .price {
position: absolute;
- width:100%;
- bottom:0;
- left:0;
+ width: 100%;
+ bottom: 0;
+ left: 0;
display: flex;
justify-content: flex-start;
align-items: center;
align-content: center;
- margin-top:8rpx;
- text{margin-right:10rpx;}
+ margin-top: 8rpx;
+
+ text {
+ margin-right: 10rpx;
+ }
+
font-size:36rpx;
color:#FF578A;
- .smallIcon{
+
+ .smallIcon {
font-size: 24rpx;
- margin-right:3rpx;
+ margin-right: 3rpx;
}
}
-
- }
+
+ }
+ }
+
+ ::v-deep .u-load-more-wrap {
+ padding: 30rpx 0;
}
diff --git a/packages/packageCarecenter/pages/careCenter/productDetail.vue b/packages/packageCarecenter/pages/careCenter/productDetail.vue
new file mode 100644
index 0000000..b454bb3
--- /dev/null
+++ b/packages/packageCarecenter/pages/careCenter/productDetail.vue
@@ -0,0 +1,42 @@
+
+
+
+
+
+
+
+
+
diff --git a/packages/packageCarecenter/pages/careCenter/serviceDetail.vue b/packages/packageCarecenter/pages/careCenter/serviceDetail.vue
new file mode 100644
index 0000000..860e14d
--- /dev/null
+++ b/packages/packageCarecenter/pages/careCenter/serviceDetail.vue
@@ -0,0 +1,330 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{detail.confinement_picture.length}}
+
+
+
+
+ 1
+
+
+
+
+
+
+
+
+
+
+
+ {{detail.name}}
+
+ {{detail.subheading}}
+
+
+
+
+
+
+
+ {{item1}}
+
+
+
+
+
+
+
+
+
+ {{detail.address}}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{detail.work_time}}
+
+
+
+
+
+
+
+
+
+ 人工客服
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/packages/packageCarecenter/static/clock.png b/packages/packageCarecenter/static/clock.png
new file mode 100644
index 0000000..25aa89c
Binary files /dev/null and b/packages/packageCarecenter/static/clock.png differ
diff --git a/packages/packageCarecenter/static/pic.png b/packages/packageCarecenter/static/pic.png
new file mode 100644
index 0000000..25c62b4
Binary files /dev/null and b/packages/packageCarecenter/static/pic.png differ
diff --git a/packages/packageCarecenter/static/position.png b/packages/packageCarecenter/static/position.png
new file mode 100644
index 0000000..53ac4ed
Binary files /dev/null and b/packages/packageCarecenter/static/position.png differ
diff --git a/packages/packageCarecenter/static/video.png b/packages/packageCarecenter/static/video.png
new file mode 100644
index 0000000..eb0c1c4
Binary files /dev/null and b/packages/packageCarecenter/static/video.png differ
diff --git a/packages/packageCarecenter/static/wechat.png b/packages/packageCarecenter/static/wechat.png
new file mode 100644
index 0000000..65e7981
Binary files /dev/null and b/packages/packageCarecenter/static/wechat.png differ
diff --git a/pages.json b/pages.json
index 0db07dd..47d0a3f 100644
--- a/pages.json
+++ b/pages.json
@@ -310,6 +310,22 @@
"navigationBarTitleText": "月子中心",
"navigationBarBackgroundColor": "#FFFFFF"
+ }
+ },
+ {
+ "path": "pages/careCenter/serviceDetail",
+ "style": {
+ "navigationBarTitleText": "商铺详情",
+ "navigationBarBackgroundColor": "#FFFFFF"
+
+ }
+ },
+ {
+ "path": "pages/careCenter/productDetail",
+ "style": {
+ "navigationBarTitleText": "产品详情",
+ "navigationBarBackgroundColor": "#FFFFFF"
+
}
}
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 0100e88..ac08282 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -188,9 +188,9 @@
utilSuccess: function(r) {
var res = r.data.data;
for (var m of res) {
- m.created_at = m.created_at.split("T")[0] + " " + m.created_at.split("T")[
- 1]
- .split(".")[0];
+ // m.created_at = m.created_at.split("T")[0] + " " + m.created_at.split("T")[
+ // 1]
+ // .split(".")[0];
m.poster = (weixin.isNull(m.poster) ? "../../static/rishang.png" : m
.poster_url)
}