diff --git a/packages/packageCarecenter/pages/careCenter/careCenter.vue b/packages/packageCarecenter/pages/careCenter/careCenter.vue
index c3ac4b7..53fb86c 100644
--- a/packages/packageCarecenter/pages/careCenter/careCenter.vue
+++ b/packages/packageCarecenter/pages/careCenter/careCenter.vue
@@ -7,33 +7,18 @@
月子攻略
- 更多
+ 更多
-
+
-
+
- 月子会所价格为何相差巨大月子会所价格为何相差巨大月子会所价格为何相差巨大?
- 市场纷繁复杂的套餐究竟如何选?
-
-
-
-
-
-
-
- 月子会所价格为何相差巨大月子会所价格为何相差巨大月子会所价格为何相差巨大?
- 市场纷繁复杂的套餐究竟如何选?
-
-
-
-
-
-
-
- 月子会所价格为何相差巨大月子会所价格为何相差巨大月子会所价格为何相差巨大?
- 市场纷繁复杂的套餐究竟如何选?
+ {{item.title}}
+
+ {{item.subheading}}
+
@@ -55,7 +40,7 @@
-
+
@@ -95,7 +80,7 @@
-
+
@@ -118,12 +103,9 @@
{{tag}}
-
{{addressComputed(item.service.name)}}
¥{{item.price}}
-
@@ -159,9 +141,25 @@
loading: '努力加载中',
nomore: '实在没有了'
},
+
+ strategies: [], //攻略
}
},
methods: {
+ toStrategyDetail(id) {
+ this.$u.throttle(() => {
+ uni.navigateTo({
+ url: `/packages/packageCarecenter/pages/careCenter/strategyDetail?id=${id}`
+ })
+ })
+ },
+ toStrategyCenter() {
+ this.$u.throttle(() => {
+ uni.navigateTo({
+ url: '/packages/packageCarecenter/pages/careCenter/strategyCenter'
+ })
+ })
+ },
init() {
this.tabSelect()
this.tabIndex = 2
@@ -241,7 +239,22 @@
})
}
})
- }
+ },
+
+ getStrategy() {
+ weixin.request({
+ newUrl: true,
+ api: '/api/member/get-strategy',
+ data: {
+ page: 1,
+ page_size: 5
+ },
+ utilSuccess: res => {
+ this.strategies = res.rows
+ console.log(this.strategies);
+ }
+ })
+ },
},
computed: {
nameComputed() {
@@ -250,7 +263,7 @@
return '未知'
}
if (name.length > 12) {
- return name.slice(0, 11) + '..'
+ return name.slice(0, 11) + '...'
}
return name
}
@@ -261,7 +274,7 @@
return '无'
}
if (address && (address.length > 12)) {
- return address.slice(0, 11) + '..'
+ return address.slice(0, 11) + '...'
}
return address
}
@@ -290,6 +303,8 @@
this.init()
})
+
+ this.getStrategy()
},
onReachBottom() {
diff --git a/packages/packageCarecenter/pages/careCenter/productDetail.vue b/packages/packageCarecenter/pages/careCenter/productDetail.vue
index 4693072..be69717 100644
--- a/packages/packageCarecenter/pages/careCenter/productDetail.vue
+++ b/packages/packageCarecenter/pages/careCenter/productDetail.vue
@@ -69,8 +69,8 @@
- {{item.name}}
- {{item.content}}
+ {{item.content}}
+ {{item.name}}
@@ -87,7 +87,7 @@
-
+
@@ -323,14 +323,18 @@
text-align: center;
border: 1px solid #191B1A;
border-radius: 24rpx;
- flex-basis: 163rpx;
+ flex: 0;
+ height: 135rpx;
margin-right: 14rpx;
+ margin-bottom: 12rpx;
&-name {
font-size: 30rpx;
font-weight: 400;
color: #333333;
+ white-space: nowrap;
+ word-wrap: keep-all;
padding: 27rpx 24rpx 18rpx 24rpx;
}
@@ -339,8 +343,10 @@
background-color: #191B1A;
color: #fff;
border-radius: 0 0 24rpx 24rpx;
+ white-space: nowrap;
+ word-wrap: keep-all;
- padding: 8rpx 0;
+ padding: 8rpx 24rpx;
}
}
}
diff --git a/packages/packageCarecenter/pages/careCenter/serviceDetail.vue b/packages/packageCarecenter/pages/careCenter/serviceDetail.vue
index 348f0e9..07b3888 100644
--- a/packages/packageCarecenter/pages/careCenter/serviceDetail.vue
+++ b/packages/packageCarecenter/pages/careCenter/serviceDetail.vue
@@ -158,7 +158,7 @@
-
+
@@ -215,22 +215,25 @@
barTop: 667,
barFixed: false,
bar: [{
- label: '本店商品',
- height: 0,
- class: '.service-product'
- }, {
- label: '本店活动',
- height: 0,
- class: '.service-activity'
- }, {
- label: '商户简介',
- height: 0,
- class: '.service-info'
- }, {
- label: '图文详情',
- height: 0,
- class: '.service-imageinfo'
- }],
+ label: '本店商品',
+ height: 0,
+ class: '.service-product'
+ },
+ // {
+ // label: '本店活动',
+ // height: 0,
+ // class: '.service-activity'
+ // },
+ {
+ label: '商户简介',
+ height: 0,
+ class: '.service-info'
+ }, {
+ label: '图文详情',
+ height: 0,
+ class: '.service-imageinfo'
+ }
+ ],
barHeight: 0,
detail: {},
btnStyle: {
@@ -314,7 +317,6 @@
this.getServiceDetail(option.id)
},
onPageScroll(e) {
- console.log(e);
this.$u.throttle(() => {
if (e.scrollTop > this.barTop) {
this.barFixed = true
@@ -760,8 +762,9 @@
.service-imageinfo {
width: 100%;
+ background: #fff;
- padding-bottom: 100rpx;
+ padding: 0 28rpx 10rpx 28rpx;
}
.bottom-btn {
diff --git a/packages/packageCarecenter/pages/careCenter/strategyCenter.vue b/packages/packageCarecenter/pages/careCenter/strategyCenter.vue
new file mode 100644
index 0000000..5671c3d
--- /dev/null
+++ b/packages/packageCarecenter/pages/careCenter/strategyCenter.vue
@@ -0,0 +1,202 @@
+
+
+
+
+
+
+
+
+ 月子攻略
+
+
+
+
+
+
+
+
+
+
+ {{item.title}}
+
+ {{item.subheading}}
+
+
+
+
+
+
+
+
+
+
+
+
+ 询问客服
+
+
+
+
+
+
+
+
+
diff --git a/packages/packageCarecenter/pages/careCenter/strategyDetail.vue b/packages/packageCarecenter/pages/careCenter/strategyDetail.vue
new file mode 100644
index 0000000..3de982e
--- /dev/null
+++ b/packages/packageCarecenter/pages/careCenter/strategyDetail.vue
@@ -0,0 +1,61 @@
+
+
+
+ {{detail.title}}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/packages/packageCarecenter/static/msg.png b/packages/packageCarecenter/static/msg.png
new file mode 100644
index 0000000..40957a5
Binary files /dev/null and b/packages/packageCarecenter/static/msg.png differ
diff --git a/pages.json b/pages.json
index 47d0a3f..b930666 100644
--- a/pages.json
+++ b/pages.json
@@ -327,8 +327,21 @@
"navigationBarBackgroundColor": "#FFFFFF"
}
+ },
+ {
+ "path": "pages/careCenter/strategyCenter",
+ "style": {
+ "navigationBarTitleText": "月子攻略",
+ "navigationBarBackgroundColor": "#FFFFFF"
+ }
+ },
+ {
+ "path": "pages/careCenter/strategyDetail",
+ "style": {
+ "navigationBarTitleText": "攻略详情",
+ "navigationBarBackgroundColor": "#FFFFFF"
+ }
}
-
]
}
],