Merge remote-tracking branch 'origin/master'

pages/highServer/service/service.vue

@@ -6,15 +6,15 @@
 		</view>
 		<view class="gpfwNav">
 			<ul>
-				<li>
+				<li @tap="goLvxd">
 					<view class="lvxd"><em class="iconfont icon-jurassic_nav"></em></view>
 					<span>旅游向导</span>
 				</li>
-				<li>
+				<li @tap="goXlzx">
 					<view class="xlzx"><em class="iconfont icon-xinlizixun"></em></view>
 					<span>心里咨询</span>
 				</li>
-				<li>
+				<li @tap="goXswz">
 					<view class="xswz"><em class="iconfont icon-wenzhen"></em></view>
 					<span>线上问诊</span>
 				</li>
@@ -22,19 +22,19 @@
 					<view @tap="goCooperative" class="gxs"><em class="iconfont icon-gongxiaoshelogo"></em></view>
 					<span>供销社</span>
 				</li>
-				<li>
+				<li @tap="goBfjz">
 					<view class="xlzx"><em class="iconfont icon-linshijiuzhu"></em></view>
 					<span>帮扶救助</span>
 				</li>
-				<li>
+				<li @tap="goZsk">
 					<view class="xswz"><em class="iconfont icon-zhishi1"></em></view>
 					<span>知识库</span>
 				</li>
-				<li>
+				<li @tap="goZbdh">
 					<view class="lvxd"><em class="iconfont icon-zhibo"></em></view>
 					<span>直播带货</span>
 				</li>
-				<li>
+				<li @tap="goShfw">
 					<view class="more"><em class="iconfont life-pic"></em></view>
 					<span>生活服务</span>
 				</li>
@@ -87,58 +87,104 @@
 					url: '/pages/specialService/financialInfrastructure/financialInfrastructure'
 				});
 			},
+			goLvxd() {
+				uni.navigateTo({
+					url: '/pages/highServer/travelGuide/travelGuide'
+				});
+			},
+			goXlzx() {
+				uni.navigateTo({
+					url: '/pages/highServer/psychology/psychology'
+				});
+			},
+			goXswz() {
+				uni.navigateTo({
+					url: '/pages/highServer/inquiry/inquiry'
+				});
+			},
+			goBfjz() {
+				uni.navigateTo({
+					url: '/pages/highServer/help/help'
+				});
+			},
+			goZsk() {
+				uni.navigateTo({
+					url: '/pages/highServer/knowledge/knowledge'
+				});
+			},
+			goZbdh() {
+				uni.navigateTo({
+					url: '/pages/highServer/liveBroadcast/liveBroadcast'
+				});
+			},
+			goShfw() {
+				uni.navigateTo({
+					url: '/pages/highServer/lifeServices/lifeServices'
+				});
+			},
 		}
 	}
 </script>
 
 <style>
 	@import 'service.css';
-	.marriage-pic{
+
+	.marriage-pic {
 		background: url('../../../static/images/more/marriage.png') 0 0 no-repeat;
 		background-size: 100% 100%;
 	}
-	.legal-pic{
+
+	.legal-pic {
 		background: url('../../../static/images/more/legal.png') 0 0 no-repeat;
 		background-size: 100% 100%;
 	}
-	.system-pic{
+
+	.system-pic {
 		background: url('../../../static/images/more/system.png') 0 0 no-repeat;
 		background-size: 100% 100%;
 	}
-	.specialService-pic{
+
+	.specialService-pic {
 		background: url('../../../static/images/more/specialService.png') 0 0 no-repeat;
 		background-size: 100% 100%;
 	}
-	.life-pic{
+
+	.life-pic {
 		background: url('../../../static/images/more/lifeHelp.png') 0 0 no-repeat;
 		background-size: 80% 80%;
 		margin: 10% !important;
 	}
-	.titleLeftSecond::after{
-		content:'';
+
+	.titleLeftSecond::after {
+		content: '';
 		left: -109px;
 		width: 12vw;
 		background: url('../../../static/images/more/specialService.png') 0 0 no-repeat;
 		background-size: 93% 93%;
 		position: relative;
 	}
-	.gpfwNav ul li view.xchl{
+
+	.gpfwNav ul li view.xchl {
 		background: none;
 	}
-	.gpfwNav ul li view.flfw{
+
+	.gpfwNav ul li view.flfw {
 		background: none;
 	}
-	.gpfwNav ul li view.jrjj{
+
+	.gpfwNav ul li view.jrjj {
 		background: none;
 	}
-	.specialService{
+
+	.specialService {
 		width: 100% !important;
 	}
-	.specialService li{
+
+	.specialService li {
 		width: 20vh;
 	}
-	.specialService li view{
+
+	.specialService li view {
 		width: 100%;
 	}
-
-</style>
+</style>