Merge branch 'master' of http://192.168.10.18:3000/sooka_shop/sooka_consult_uniapp

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/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: '探索乡村能源供给新模式 绘就乡村振兴美丽新画卷'
 					},
 					{