Merge remote-tracking branch 'origin/dev'

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",
+			"pagePath": "pages/homepage/homepage",
-				"iconPath": "static/homepagew.png",
+			"iconPath": "static/homepagew.png",
-				"selectedIconPath": "static/homepagews.png",
+			"selectedIconPath": "static/homepagews.png",
-				"text": "首页"
+			"text": "首页"
-			},
+		},
 			{
 				"pagePath": "pages/Personal/Personal",
 				"iconPath": "static/userw.png",

pages/Industrialbutler/Industrialbutler.vue

@@ -0,0 +1,19 @@
+<template>
+	<view>
+		<web-view src="https://ec.cib.com.cn/h5/index/jnfhwqh?isInpage=Y​​​​​"></web-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			};
+		}
+	}
+</script>
+
+<style lang="scss">
+
+</style>

pages/ServiceDetails/ServiceDetails.scss

@@ -1,9 +1,9 @@
-	.app {
+.app {
-		height: 100%;
+	height: 100%;
-		padding: 0 2% 2%;
+	padding: 0 2% 2%;
-		font-size: 36rpx;
+	font-size: 36rpx;
-		padding-top: 10rpx;
+	padding-top: 10rpx;
-		font-size: 34rpx;
+	font-size: 34rpx;
 	.masks{
 		image{
 			position: absolute;
@@ -280,7 +280,6 @@
 					float: right;
 					margin-right: 30rpx;
 				}
-
 			}
 		}
 	}

pages/homepage/homepage.vue

@@ -60,7 +60,10 @@
 				<image src="../../static/jypz.png" mode="" @tap='goseekmedicaladvice'></image>
 				<image src="../../static/qyzq.png" mode="" @tap='gosuyu'></image>
 			</view>
-			<image class="night" src="../../static/96558.png" mode="" @tap='gonight'></image>
+			<view class="rightimg">
+				<image src="../../static/guanjia.png" mode="" @tap='goguanjia'></image>
+				<image class="" src="../../static/96558.png" mode="" @tap='gonight'></image>
+			</view>
 			<view class="rightimg">
 				<image src="../../static/fuli.png" mode="" @tap='gomaterialbenefits'></image>
 				<image src="../../static/kefu.png" mode="" @tap='gocustomerservice'></image>
@@ -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;
 				}
 			}
 

pages/nursestation/nursestation.vue

@@ -2,16 +2,16 @@
 	<view class="app">
 		<!-- 轮播图 -->
 		<swiper :indicator-dots="true" indicator-color='#fff' indicator-active-color='#0086d6' :autoplay="autoplay"
-			:interval="2000" :duration="1000" class="swiper-box" :circular='true' @change="swiperChange">
+				:interval="2000" :duration="1000" class="swiper-box" :circular='true' @change="swiperChange">
 			<swiper-item v-for="(item ,index) in Banners" :key="index">
 				<view class="swiper-item" v-show="!splits(item)" wx-if="{item}" @tap='goswiper(item)'>
 					<image v-if="item" :src="item" mode="widthFix"></image>
 				</view>
 				<view class="swiper-item" v-show="splits(item)" v-if="item">
 					<video :id="'myVideo'+index" :autoplay="false" :src="item" controls show-fullscreen-btn
-						object-fit="fill" @play="play" @pause="pause" @ended="ended" auto-pause-if-navigate
+						   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
+						   show-play-btn :enable-progress-gesture='true' :show-center-play-btn='true' enable-play-gesture
-						auto-pause-if-open-native show-mute-btn></video>
+						   auto-pause-if-open-native show-mute-btn></video>
 				</view>
 			</swiper-item>
 		</swiper>
@@ -73,7 +73,7 @@
 			<view class="tive">
 				<view class="tab-box">
 					<view class="tab-item" @tap="testTabClick(item)" v-for="(item,index) in tabLists" :key="index"
-						:class="tabIndex == index?'active':''">
+						  :class="tabIndex == index?'active':''">
 						{{item.name}}
 					</view>
 				</view>
@@ -81,7 +81,7 @@
 				</u-tabs>
 				<view class="" v-if="servelist.length>0&&choicetab==false" style="margin:0">
 					<view class="item" v-for="item in servelist" :key="" v-show='choicetab==false'
-						@click.stop='goProjectDetails(item)'>
+						  @click.stop='goProjectDetails(item)'>
 						<image :src="item.itemPictureUrl"></image>
 						<view class="huanyao">{{item.nurseItemName}}
 						</view>
@@ -178,9 +178,9 @@
 				}], //分类标题
 				tabIndex: 0,
 				tabLists: [{
-						name: '服务项目',
+					name: '服务项目',
-						id: 0,
+					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(/\<img/gi,
-								"<br/><img class='richPic'")
+									"<br/><img class='richPic'")
 						}
 						res.data.nurseClassifyInfoList.forEach(e => {
 							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 {