diff --git a/pages.json b/pages.json
index 1e4cf90..6f70529 100644
--- a/pages.json
+++ b/pages.json
@@ -288,7 +288,15 @@
"enablePullDownRefresh": false
}
}
- ],
+ ,{
+ "path" : "pages/Industrialbutler/Industrialbutler",
+ "style" :
+ {
+ "navigationBarTitleText": "兴业管家",
+ "enablePullDownRefresh": false
+ }
+ }
+ ],
"globalStyle": {
"navigationBarTextStyle": "black",
"navigationBarTitleText": "",
@@ -302,11 +310,11 @@
"borderStyle": "black",
"backgroundColor": "#ffffff",
"list": [{
- "pagePath": "pages/homepage/homepage",
- "iconPath": "static/homepagew.png",
- "selectedIconPath": "static/homepagews.png",
- "text": "首页"
- },
+ "pagePath": "pages/homepage/homepage",
+ "iconPath": "static/homepagew.png",
+ "selectedIconPath": "static/homepagews.png",
+ "text": "首页"
+ },
{
"pagePath": "pages/Personal/Personal",
"iconPath": "static/userw.png",
diff --git a/pages/Industrialbutler/Industrialbutler.vue b/pages/Industrialbutler/Industrialbutler.vue
new file mode 100644
index 0000000..09d528e
--- /dev/null
+++ b/pages/Industrialbutler/Industrialbutler.vue
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
diff --git a/pages/ServiceDetails/ServiceDetails.scss b/pages/ServiceDetails/ServiceDetails.scss
index 33aedc9..d624fcf 100644
--- a/pages/ServiceDetails/ServiceDetails.scss
+++ b/pages/ServiceDetails/ServiceDetails.scss
@@ -1,9 +1,9 @@
- .app {
- height: 100%;
- padding: 0 2% 2%;
- font-size: 36rpx;
- padding-top: 10rpx;
- font-size: 34rpx;
+.app {
+ height: 100%;
+ padding: 0 2% 2%;
+ font-size: 36rpx;
+ padding-top: 10rpx;
+ font-size: 34rpx;
.masks{
image{
position: absolute;
@@ -234,7 +234,7 @@
.detailslist {
position: relative;
-
+
image {
width: 182rpx;
height: 182rpx;
@@ -258,7 +258,7 @@
word-break:break-all;
}
}
-
+
.bottom {
view {
font-size: 25rpx;
@@ -280,7 +280,6 @@
float: right;
margin-right: 30rpx;
}
-
}
}
- }
\ No newline at end of file
+ }
diff --git a/pages/homepage/homepage.vue b/pages/homepage/homepage.vue
index e2ce9cb..f259564 100644
--- a/pages/homepage/homepage.vue
+++ b/pages/homepage/homepage.vue
@@ -60,7 +60,10 @@
-
+
+
+
+
@@ -331,6 +334,12 @@
success(res) {}
})
},
+ //跳转管家
+ goguanjia() {
+ uni.navigateTo({
+ url: '/pages/Industrialbutler/Industrialbutler'
+ })
+ },
//跳转
gopzyh() {
uni.navigateTo({
@@ -532,14 +541,13 @@
image {
width: 30%;
- height: 170rpx;
+ height: 160rpx;
}
}
.shopping {
- margin-top: 5rpx;
width: 98%;
- height: 170rpx;
+ height: 160rpx;
}
.rightimg {
@@ -548,9 +556,9 @@
image {
display: block;
- margin-bottom: 10rpx;
+ margin-bottom: 15rpx;
width: 100%;
- height: 165rpx;
+ height: 120rpx;
}
}
diff --git a/pages/nursestation/nursestation.vue b/pages/nursestation/nursestation.vue
index e13e3a8..fb66455 100644
--- a/pages/nursestation/nursestation.vue
+++ b/pages/nursestation/nursestation.vue
@@ -2,16 +2,16 @@
+ :interval="2000" :duration="1000" class="swiper-box" :circular='true' @change="swiperChange">
+ object-fit="fill" @play="play" @pause="pause" @ended="ended" auto-pause-if-navigate
+ show-play-btn :enable-progress-gesture='true' :show-center-play-btn='true' enable-play-gesture
+ auto-pause-if-open-native show-mute-btn>
@@ -73,7 +73,7 @@
+ :class="tabIndex == index?'active':''">
{{item.name}}
@@ -81,7 +81,7 @@
+ @click.stop='goProjectDetails(item)'>
{{item.nurseItemName}}
@@ -178,9 +178,9 @@
}], //分类标题
tabIndex: 0,
tabLists: [{
- name: '服务项目',
- id: 0,
- },
+ name: '服务项目',
+ id: 0,
+ },
{
name: '产品',
id: 1,
@@ -380,7 +380,7 @@
res.data.stationPictureUrl = baseurl + res.data.stationPictureUrl
if (res.data.agencyIntroduce) {
res.data.agencyIntroduce = res.data.agencyIntroduce.replace(/\![]()
![]()
{
e.name = e.classifyName
@@ -395,7 +395,7 @@
})
if (res.data.poserInfoList[0].video) {
res.data.poserInfoList[0].video = baseurl + res.data.poserInfoList[0]
- .posterVideoUrl
+ .posterVideoUrl
this.Banners.push(res.data.poserInfoList[0].video)
}
} else {
diff --git a/static/96558.png b/static/96558.png
index 2ea0405..516577c 100644
Binary files a/static/96558.png and b/static/96558.png differ
diff --git a/static/fuli.png b/static/fuli.png
index 35cb95b..43c16ce 100644
Binary files a/static/fuli.png and b/static/fuli.png differ
diff --git a/static/guanjia.png b/static/guanjia.png
new file mode 100644
index 0000000..ce38ed0
Binary files /dev/null and b/static/guanjia.png differ
diff --git a/static/kefu.png b/static/kefu.png
index a9f7388..0c50218 100644
Binary files a/static/kefu.png and b/static/kefu.png differ