Merge remote-tracking branch 'origin/dev'

pages.json

@@ -288,6 +288,14 @@
 				"enablePullDownRefresh": false
 			}
 		}
+	    ,{
+            "path" : "pages/Industrialbutler/Industrialbutler",
+            "style" :
+            {
+                "navigationBarTitleText": "兴业管家",
+                "enablePullDownRefresh": false
+            }
+        }
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",

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,4 +1,4 @@
-	.app {
+.app {
 	height: 100%;
 	padding: 0 2% 2%;
 	font-size: 36rpx;
@@ -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;
 				}
 			}