Merge remote-tracking branch 'origin/master'

data/json.js

@@ -34,7 +34,7 @@ var qbwd = [
             }
         ],
         jf: '300',
-        ly: '30',
+        pl: '20',
         title: '探索乡村能源供给新模式 绘就乡村振兴美丽新画卷'
     },
     {
@@ -106,7 +106,7 @@ var jcwd = [
             }
         ],
         jf: '300',
-        ly: '30',
+        pl: '20',
         title: '探索乡村能源供给新模式 绘就乡村振兴美丽新画卷'
     },
     {
@@ -219,7 +219,7 @@ var zdxs = [
             }
         ],
         jf: '300',
-        ly: '30',
+        pl: '20',
         title: '探索乡村能源供给新模式 绘就乡村振兴美丽新画卷'
     },
     {
@@ -345,7 +345,7 @@ var index = [
             }
         ],
         jf: '300',
-        ly: '30',
+        pl: '20',
         title: '探索乡村能源供给新模式 绘就乡村振兴美丽新画卷'
     },
     {

pages/demo/sannong/sannong.vue

@@ -9,7 +9,6 @@
                     <view class="rnwdList">
                         <view class="list" @tap="goDetails" v-for="(item, index1) in qbwd" :key="index1">
                             <span class="listTitle">{{ item.title }}</span>
-
                             <view class="onePic" v-if="item.imgList.length == 1">
                                 <image :src="loadImgSrc(item.url)" v-for="(item, index2) in item.imgList" :key="index2"></image>
                             </view>

pages/highServer/cooperative/cooperative.vue

@@ -2,7 +2,7 @@
     <view class="container">
         <!-- 供销社列表 -->
         <view class="rnwdList" v-for="(item, index) in list" :key="index">
-            <view @tap="goDetails(item.id)" class="cooperativeImgBox">
+            <view @tap="goDetails(item.id)" class="cooperativeImgBox" style="width: 30%;">
                 <!--<image :src="loadImgSrc('/snbj.png')" class="cooperativeImg"></image>-->
                 <image :src="loadImgSrcLocalhost(item.imgUrl)" class="cooperativeImg"></image>
             </view>

pages/highServer/cooperative/details.css

@@ -1,5 +1,5 @@
 .container{
-    padding: 0;
+    padding: 0 20rpx;
 }
 
 .cooperativeImgBox{
@@ -8,7 +8,7 @@
     top: 0;
     z-index: 0;
     width: 100%;
-    height: 480rpx;
+    height: 400rpx;
 }
 .cooperativeImg{
     position: static;
@@ -24,13 +24,15 @@
     font-size: 50rpx;
 }
 .itemBox:nth-child(2n-1){
-    background: #ccc;
+    background: #e4e4e4;
 }
 .itemBox:nth-child(2n){
-    background: #ddd;
+    background: #eee;
 }
 
 .item{
+	font-size: 30rpx;
+	padding: 20rpx;
     /*width: 100%;*/
     /*background-color: #57f5a1;*/
 }

pages/highServer/inquiry/inquiry.css

@@ -51,9 +51,10 @@
     height: 100%;
 }
 .list {
-    border-bottom: solid 2rpx #f6f6f6;
-    padding: 10rpx 0;
-    width: 100%;
+	border-bottom: solid 2rpx #f6f6f6;
+	padding: 20rpx 0;
+	width: 100%;
+	
 }
 .lb {
     background: #0d9970;
@@ -133,4 +134,8 @@
 .ck {
     color: #c4c4c4;
 	margin-left:240px;
+}
+.f-r {
+	position: absolute;
+	right: 30rpx;
 }

pages/highServer/inquiry/inquiry.vue

@@ -23,7 +23,7 @@
 				</view>
 
 				<view class="jlSj">
-					<view class="ck">
+					<view class="ck f-r">
 						<span>
 							<em class="iconfont icon-chakan"></em>
 							{{ item.likeNum }}

pages/highServer/inquiryDetail/inquiryDetails.css

@@ -1,4 +1,5 @@
 /* pages/wenbaxiangqing.wxss */
+
 .title {
     font-size: 44rpx;
     text-align: center;

pages/highServer/inquiryDetail/inquiryDetails.vue

@@ -105,7 +105,9 @@
 </script>
 <style lang="scss">
 	@import './inquiryDetails.css';
-
+    .container{
+		padding:50rpx;
+	}
 	.collect {
 		.icon-shoucang:before {
 			color: red;

pages/highServer/service/service.vue

@@ -19,10 +19,8 @@
 					<span>线上问诊</span>
 				</li>
 				<li>
-					<view class="gxs" @tap="goCooperative"><em class="iconfont icon-gongxiaoshelogo"></em></view>
-					<span @tap="goLoveAtVillage">供</span>
-					<span @tap="goLegalService">销</span>
-					<span @tap="goFinancialInfrastructure">社</span>
+					<view @tap="goCooperative" class="gxs"><em class="iconfont icon-gongxiaoshelogo"></em></view>
+					<span @tap="goCooperative">供销社</span>
 				</li>
 				<li>
 					<view class="xlzx"><em class="iconfont icon-linshijiuzhu"></em></view>
@@ -49,16 +47,16 @@
 		<view class="gpfwNav specialService">
 			<ul>
 				<li>
-					<view class="xchl"><em class="iconfont marriage-pic"></em></view>
-					<span>乡村婚恋</span>
+					<view @tap="goLoveAtVillage" class="xchl"><em class="iconfont marriage-pic"></em></view>
+					<span @tap="goLoveAtVillage">乡村婚恋</span>
 				</li>
 				<li>
-					<view class="flfw"><em class="iconfont legal-pic"></em></view>
-					<span>法律服务</span>
+					<view @tap="goLegalService" class="flfw"><em class="iconfont legal-pic"></em></view>
+					<span @tap="goLegalService">法律服务</span>
 				</li>
 				<li>
-					<view class="jrjj"><em class="iconfont system-pic"></em></view>
-					<span>金融基建</span>
+					<view @tap="goFinancialInfrastructure" class="jrjj"><em class="iconfont system-pic"></em></view>
+					<span @tap="goFinancialInfrastructure">金融基建</span>
 				</li>
 			</ul>
 		</view>
@@ -67,6 +65,30 @@
 </template>
 
 <script>
+	export default {
+		methods: {
+			goCooperative() {
+				uni.navigateTo({
+					url: '/pages/highServer/cooperative/cooperative'
+				});
+			},
+			goLoveAtVillage() {
+				uni.navigateTo({
+					url: '/pages/specialService/loveAtVillage/loveAtVillage'
+				});
+			},
+			goLegalService() {
+				uni.navigateTo({
+					url: '/pages/specialService/legalService/legalService'
+				});
+			},
+			goFinancialInfrastructure() {
+				uni.navigateTo({
+					url: '/pages/specialService/financialInfrastructure/financialInfrastructure'
+				});
+			},
+		}
+	}
 </script>
 
 <style>

pages/index/index.vue

@@ -309,7 +309,7 @@
 							}
 						],
 						jf: '300',
-						ly: '30',
+            pl: '30',
 						title: '探索乡村能源供给新模式 绘就乡村振兴美丽新画卷'
 					},
 					{

pages/specialService/loveAtVillage/loveAtVillage.css

@@ -1,136 +1,164 @@
 /* pages/wenda/wenda.wxss */
 .wendaFL {
-    width: 100%;
-    display: flex;
-    justify-content: space-between;
-    margin: 30rpx 0 0 0;
+	width: 100%;
+	display: flex;
+	justify-content: space-between;
+	margin: 30rpx 0 0 0;
 }
+
 .wendaFL li {
-    width: 48%;
-    height: 168rpx;
-    position: relative;
+	width: 48%;
+	height: 168rpx;
+	position: relative;
 }
+
 .lbBj {
-    position: absolute;
-    left: 0;
-    top: 0;
-    z-index: 0;
-    width: 100%;
-    height: 100%;
-}
+	position: absolute;
+	left: 0;
+	top: 0;
+	z-index: 0;
+	width: 100%;
+	height: 100%;
+}
+
 .wendaFL li h2 {
-    font-size: 36rpx;
-    position: absolute;
-    left: 30rpx;
-    top: 40rpx;
-    z-index: 1;
-    font-weight: bold;
-}
+	font-size: 36rpx;
+	position: absolute;
+	left: 30rpx;
+	top: 40rpx;
+	z-index: 1;
+	font-weight: bold;
+}
+
 .wendaFL li span {
-    font-size: 30rpx;
-    position: absolute;
-    left: 30rpx;
-    top: 88rpx;
-    z-index: 1;
+	font-size: 30rpx;
+	position: absolute;
+	left: 30rpx;
+	top: 88rpx;
+	z-index: 1;
 }
+
 .wendaFL li.sanNong {
-    color: #0d9970;
+	color: #0d9970;
 }
+
 .wendaFL li.jiuYe {
-    color: #1e8fb4;
+	color: #1e8fb4;
 }
+
 .wendaFL li.faLv {
-    color: #1e5dab;
+	color: #1e5dab;
 }
+
 .wendaFL li.jiuZhen {
-    color: #4a700d;
+	color: #4a700d;
 }
+
 /* 列表 */
 .rnwdList {
-    width: 100%;
-    height: 100%;
+	width: 100%;
+	height: 100%;
 }
+
 .list {
-    border-bottom: solid 2rpx #f6f6f6;
-    padding: 10rpx 0;
-    width: 100%;
+	border-bottom: solid 2rpx #f6f6f6;
+	padding: 20rpx 0;
+	width: 100%;
+	
 }
+
 .lb {
-    background: #0d9970;
-    color: #fff;
-    font-size: 24rpx;
-    width: 12%;
-    text-align: center;
-    padding: 2rpx 0;
-    line-height: 40rpx;
-    height: 40rpx;
-    border-radius: 10rpx;
-}
+	background: #0d9970;
+	color: #fff;
+	font-size: 24rpx;
+	width: 12%;
+	text-align: center;
+	padding: 2rpx 0;
+	line-height: 40rpx;
+	height: 40rpx;
+	border-radius: 10rpx;
+}
+
 .listTitle {
-    font-size: 32rpx;
-    color: #333;
-    line-height: 40rpx;
+	font-size: 32rpx;
+	color: #333;
+	line-height: 40rpx;
 }
+
 .icon-jifen {
-    font-size: 28rpx;
-    color: #07c160;
-    margin: 0 0 0 6rpx;
+	font-size: 28rpx;
+	color: #07c160;
+	margin: 0 0 0 6rpx;
 }
+
 .icon-pinglun,
 .icon-chakan,
 .icon-shoucang {
-    font-size: 28rpx;
-    margin: 0 6rpx 0 20rpx;
-    color: #c4c4c4;
+	font-size: 28rpx;
+	margin: 0 6rpx 0 20rpx;
+	color: #c4c4c4;
 }
+
 .icon-xiangyoujiantou {
-    font-size: 30rpx;
-    color: #c4c4c4;
-    line-height: 60rpx;
+	font-size: 30rpx;
+	color: #c4c4c4;
+	line-height: 60rpx;
 }
+
 .onePic {
-    width: 100%;
-    height: 360rpx;
-    border-radius: 20rpx;
-    overflow: hidden;
-    margin: 20rpx 0;
+	width: 100%;
+	height: 360rpx;
+	border-radius: 20rpx;
+	overflow: hidden;
+	margin: 20rpx 0;
 }
+
 .onePic image {
-    width: 100%;
-    height: 100%;
+	width: 100%;
+	height: 100%;
 }
+
 .twoPic {
-    width: 100%;
-    height: 220rpx;
-    margin: 20rpx 0;
-    display: flex;
-    justify-content: space-between;
+	width: 100%;
+	height: 220rpx;
+	margin: 20rpx 0;
+	display: flex;
+	justify-content: space-between;
 }
+
 .twoPic image {
-    width: 49%;
-    height: auto;
-    border-radius: 20rpx;
+	width: 49%;
+	height: auto;
+	border-radius: 20rpx;
 }
+
 .threePic {
-    width: 100%;
-    height: 160rpx;
-    margin: 20rpx 0;
-    display: flex;
-    justify-content: space-between;
+	width: 100%;
+	height: 160rpx;
+	margin: 20rpx 0;
+	display: flex;
+	justify-content: space-between;
 }
+
 .threePic image {
-    width: 32%;
-    height: auto;
-    border-radius: 20rpx;
+	width: 32%;
+	height: auto;
+	border-radius: 20rpx;
 }
+
 .jlSj {
-    height: 40rpx;
-    display: flex;
-    justify-content: space-between;
-    font-size: 24rpx;
-    margin: 20rpx 0 0 0;
+	height: 40rpx;
+	display: flex;
+	justify-content: space-between;
+	font-size: 24rpx;
+	margin: 20rpx 0 0 0;
 }
+
 .ck {
-    color: #c4c4c4;
-    margin-left:240px;
+	color: #c4c4c4;
 }
+
+.f-r {
+	position: absolute;
+	right: 30rpx;
+}

pages/specialService/loveAtVillage/loveAtVillage.vue

@@ -23,7 +23,7 @@
                 </view>
 
                 <view class="jlSj">
-                    <view class="ck">
+                    <view class="ck f-r">
 						<span>
 							<em class="iconfont icon-chakan"></em>
 							{{ item.likeNum }}