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

api/handleAffairs/gridType.js

@@ -25,7 +25,14 @@ export function addGridType(data) {
     data: data
   })
 }
-
+// 查询主题事项列表
+export function listMatters(query) {
+  return request({
+    url: '/system/matter/list',
+    method: 'get',
+    params: query
+  })
+}
 // 修改网格类型配置
 export function updateGridType(data) {
   return request({

api/handleAffairs/matter.js

@@ -9,14 +9,6 @@ export function listDept(query) {
   })
 }
 // 查询事项列表
-export function listMatters(query) {
-  return request({
-    url: '/system/matter/list',
-    method: 'get',
-    params: query
-  })
-}
-// 查询事项列表
 export function getMattersAll(query) {
   return request({
     url: '/system/matter/listAll',
@@ -40,6 +32,23 @@ export function addsc(data) {
   })
 }
 
+// 查询事项列表
+export function listMatters(query) {
+  return request({
+    url: '/system/matter/list',
+    method: 'get',
+    params: query
+  })
+}
+// 收藏事项
+export function scadd(data) {
+  return request({
+    url: '/system/collect/add',
+    method: 'post',
+    data: data
+  })
+}
+
 // 查询事项收藏详细
 export function collectlist(id) {
   return request({
@@ -48,18 +57,19 @@ export function collectlist(id) {
   })
 }
 
-// 查询事项详细
-export function getsc(id) {
+export function getsc(query) {
   return request({
-    url: '/system/collect/lists/' + id,
-    method: 'get'
-  })
+    url: '/system/collect/lists',
+    method: 'get',
+    params: query
+    
+  });
 }
 
-// 删除事项
+
+// 取消收藏事项
 export function delDept(id) {
   return request({
     url: '/system/collect/delete/' + id,
     method: 'delete'
-  })}
-
+  })}

api/cooperative/cooperative.js

@@ -1,6 +1,15 @@
 import request from '@/utils/request'
 
-// 查询合作社列表
+// 新增供销合作社
+export function addCooperative(data) {
+  return request({
+    url: '/high/server/cooperative',
+    method: 'post',
+    data: data
+  })
+}
+
+// 查询供销合作社列表
 export function getList(query) {
   return request({
     url: '/high/server/cooperative/list',
@@ -9,7 +18,7 @@ export function getList(query) {
   })
 }
 
-// 查询合作社详情
+// 查询供销合作社详情
 export function getDetails(id) {
   return request({
     url: '/high/server/cooperative/' + id,

api/me/nameAuthentication.js

@@ -8,3 +8,11 @@ export function appletAdd(query) {
     data: query
   })
 }
+
+//按用户id查询实名认证信息
+export function getUserInfo(userId) {
+  return request({
+    url: '/nameAuthentication/getNameInfo/'+ userId,
+    method: 'get',
+  })
+}

api/me/officialAuthentication.js

@@ -8,3 +8,12 @@ export function appletAdd(query) {
     data: query
   })
 }
+
+
+//按用户id查询实名认证信息
+export function getUserInfo(userId) {
+  return request({
+    url: '/officialAuthentication/getOfficialInfo/'+ userId,
+    method: 'get',
+  })
+}

api/specialService/financialInfrastructure.js

@@ -2,18 +2,18 @@ import upload from '@/utils/upload'
 import request from '@/utils/request'
 
 // 查询金融基建列表
-export function getCooperative() {
+export function listServer(query) {
   return request({
-    url: '/system/user/listAll',
-    method: 'get'
+    url: '/high/server/list',
+    method: 'get',
+    params: query
   })
 }
 
 // 查询金融基建详情
-export function updateUserProfile(data) {
+export function getServer(id,type) {
   return request({
-    url: '/system/user/profile',
-    method: 'put',
-    data: data
+    url: '/high/server/' + id + '/' + type,
+    method: 'get'
   })
 }

api/specialService/legalService.js

@@ -2,18 +2,18 @@ import upload from '@/utils/upload'
 import request from '@/utils/request'
 
 // 查询法律服务列表
-export function getCooperative() {
+export function listServer(query) {
   return request({
-    url: '/system/user/listAll',
-    method: 'get'
+    url: '/high/server/list',
+    method: 'get',
+    params: query
   })
 }
 
 // 查询法律服务详情
-export function updateUserProfile(data) {
+export function getServer(id,type) {
   return request({
-    url: '/system/user/profile',
-    method: 'put',
-    data: data
+    url: '/high/server/' + id + '/' + type,
+    method: 'get'
   })
 }

api/specialService/loveAtVillage.js

@@ -2,18 +2,18 @@ import upload from '@/utils/upload'
 import request from '@/utils/request'
 
 // 查询乡村婚恋列表
-export function getCooperative() {
+export function listServer(query) {
   return request({
-    url: '/system/user/listAll',
-    method: 'get'
+    url: '/high/server/list',
+    method: 'get',
+    params: query
   })
 }
 
 // 查询乡村婚恋详情
-export function updateUserProfile(data) {
+export function getServer(id,type) {
   return request({
-    url: '/system/user/profile',
-    method: 'put',
-    data: data
+    url: '/high/server/' + id + '/' + type,
+    method: 'get'
   })
 }

api/highFrequencyService/highFrequencyService.js

@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 
-// 查询高频服务列表
+// 查询特色服务列表
 export function listServer(query) {
   return request({
     url: '/high/server/list',
@@ -9,7 +9,7 @@ export function listServer(query) {
   })
 }
 
-// 查询高频服务详细
+// 查询特色服务详细
 export function getServer(id,type) {
   return request({
     url: '/high/server/' + id + '/' + type,
@@ -17,7 +17,7 @@ export function getServer(id,type) {
   })
 }
 
-// 新增高频服务
+// 新增特色服务
 export function addServer(data) {
   return request({
     url: '/high/server',
@@ -26,7 +26,7 @@ export function addServer(data) {
   })
 }
 
-// 修改高频服务
+// 修改特色服务
 export function updateServer(data) {
   return request({
     url: '/high/server',
@@ -35,7 +35,7 @@ export function updateServer(data) {
   })
 }
 
-// 删除高频服务
+// 删除特色服务
 export function delServer(id,type) {
   return request({
     url: '/high/server/' + id + '/' + type,

pages.json

@@ -7,7 +7,16 @@
 			}
 		},
 		{
-			"path": "pages/cooperative/cooperative",
+			"path": "pages/highFrequencyService/cooperative/addCooperative",
+			"style": {
+				"usingComponents": {},
+				"navigationBarBackgroundColor": "#07c160",
+				"navigationBarTextStyle": "white",
+				"navigationBarTitleText": "新增供销社信息"
+			}
+		},
+		{
+			"path": "pages/highFrequencyService/cooperative/cooperative",
 			"style": {
 				"usingComponents": {},
 				"navigationBarBackgroundColor": "#07c160",
@@ -70,7 +79,7 @@
 			}
 		},
 		{
-			"path": "pages/cooperative/details",
+			"path": "pages/highFrequencyService/cooperative/details",
 			"style": {
 				"usingComponents": {},
 				"navigationBarBackgroundColor": "#07c160",
@@ -116,7 +125,7 @@
 			}
 		},
 		{
-			"path": "pages/fuwu/fuwu",
+			"path": "pages/information/fuwu/fuwu",
 			"style": {
 				"usingComponents": {},
 				"onReachBottomDistance": 5,
@@ -142,7 +151,7 @@
 			}
 		},
 		{
-			"path": "pages/myPayKnow/myPayKnow",
+			"path": "pages/me/myPayKnow/myPayKnow",
 			"style": {
 				"usingComponents": {},
 				"navigationBarBackgroundColor": "#07c160",
@@ -176,7 +185,7 @@
 			}
 		},
 		{
-			"path": "pages/mattersAdd/mattersAdd",
+			"path": "pages/handleAffairs/mattersAdd/mattersAdd",
 			"style": {
 				"usingComponents": {},
 				"navigationBarBackgroundColor": "#07c160",
@@ -215,7 +224,7 @@
 			}
 		},
 		{
-			"path": "pages/informationAdd/informationAdd",
+			"path": "pages/information/informationAdd/informationAdd",
 			"style": {
 				"usingComponents": {},
 				"navigationBarBackgroundColor": "#07c160",
@@ -224,7 +233,7 @@
 			}
 		},
 		{
-			"path": "pages/informationDetail/informationDetail",
+			"path": "pages/information/informationDetail/informationDetail",
 			"style": {
 				"usingComponents": {},
 				"navigationBarBackgroundColor": "#07c160",
@@ -242,7 +251,7 @@
 			}
 		},
 		{
-			"path": "pages/myPayKnow/informationDetail",
+			"path": "pages/me/myPayKnow/informationDetail",
 			"style": {
 				"usingComponents": {},
 				"navigationBarBackgroundColor": "#07c160",
@@ -281,7 +290,7 @@
 			}
 		},
 		{
-			"path": "pages/handleAffairs/handleAffairs",
+			"path": "pages/handleAffairs/index",
 			"style": {
 				"usingComponents": {},
 				"navigationBarBackgroundColor": "#07c160",
@@ -334,7 +343,7 @@
 			}
 		},
 		{
-			"path": "pages/toGovernmentList/toGovernmentList",
+			"path": "pages/information/toGovernmentList/toGovernmentList",
 			"style": {
 				"usingComponents": {},
 				"navigationBarBackgroundColor": "#07c160",
@@ -351,7 +360,7 @@
 			}
 		},
 		{
-			"path": "pages/toLegal/toLegal",
+			"path": "pages/information/toLegal/toLegal",
 			"style": {
 				"usingComponents": {},
 				"navigationBarBackgroundColor": "#07c160",
@@ -380,7 +389,7 @@
 			}
 		},
 		{
-			"path": "pages/me/nameAuthentication",
+			"path": "pages/me/nameAuthentication/nameAuthentication",
 			"style": {
 				"usingComponents": {},
 				"navigationBarBackgroundColor": "#07c160",
@@ -390,7 +399,7 @@
 			}
 		},
 		{
-			"path": "pages/me/officialAuthentication",
+			"path": "pages/me/officialAuthentication/officialAuthentication",
 			"style": {
 				"usingComponents": {},
 				"navigationBarBackgroundColor": "#07c160",
@@ -400,7 +409,7 @@
 			}
 		},
 		{
-			"path": "pages/me/meOperate",
+			"path": "pages/me/meOperate/meOperate",
 			"style": {
 				"usingComponents": {},
 				"navigationBarBackgroundColor": "#07c160",
@@ -409,7 +418,7 @@
 			}
 		},
 		{
-			"path": "pages/gridQuery/gridQuery",
+			"path": "pages/handleAffairs/gridQuery/gridQuery",
 			"style": {
 				"usingComponents": {},
 				"navigationBarBackgroundColor": "#07c160",
@@ -554,7 +563,7 @@
 			}
 		},
 		{
-			"path": "pages/topic/topic",
+			"path": "pages/handleAffairs/topic/topic",
 			"style": {
 				"usingComponents": {},
 				"navigationBarBackgroundColor": "#07c160",
@@ -563,7 +572,7 @@
 			}
 		},
 		{
-			"path": "pages/matterAll/matterAll",
+			"path": "pages/handleAffairs/matterAll/matterAll",
 			"style": {
 				"usingComponents": {},
 				"navigationBarBackgroundColor": "#07c160",
@@ -572,7 +581,7 @@
 			}
 		},
 		{
-			"path": "pages/topic/dept",
+			"path": "pages/handleAffairs/dept/dept",
 			"style": {
 				"usingComponents": {},
 				"navigationBarBackgroundColor": "#07c160",
@@ -581,7 +590,7 @@
 			}
 		},
 		{
-			"path": "pages/gridQuery/mattercontent",
+			"path": "pages/handleAffairs/mattercontent/mattercontent",
 			"style": {
 				"usingComponents": {},
 				"navigationBarBackgroundColor": "#07c160",
@@ -611,7 +620,7 @@
 			},
 			{
 				"text": "资讯",
-				"pagePath": "pages/fuwu/fuwu",
+				"pagePath": "pages/information/fuwu/fuwu",
 				"iconPath": "static/pages/images/index2.png",
 				"selectedIconPath": "static/pages/images/index1.png"
 			},

pages/cooperative/cooperative.vue

@@ -1,65 +0,0 @@
-<template>
-    <view class="container">
-        <!-- 供销社列表 -->
-        <view class="rnwdList" v-for="(item, index) in list" :key="index">
-            <view @tap="goDetails(item.id)" class="cooperativeImgBox">
-                <image :src="loadImgSrc('/snbj.png')" class="cooperativeImg"></image>
-                <!--<image :src="loadImgSrc(item.imgUrl)" class="cooperativeImg"></image>-->
-            </view>
-            <view @tap="goDetails(item.id)" class="cooperativeBox">
-                <view class="list">
-                    <span class="listTitle">{{ item.name }}</span>
-                    <view class="jlSj">
-                        <span class="jf">
-                            {{ item.address?item.address:'' }}
-                        </span>
-                    </view>
-                </view>
-            </view>
-            <em class="iconfont icon-xiangyoujiantou"></em>
-        </view>
-    </view>
-</template>
-
-<script>
-import { getList, getDetails } from '@/api/cooperative/cooperative';
-export default {
-    data() {
-        return {
-            list: [
-                {
-                    name:"-",
-                    address:"-",
-                    chargePeople:"-",
-                    chargePhone:"-",
-                    imgUrl:"-"
-                }
-            ],
-        };
-    }
-    /**
-     * 生命周期函数--监听页面加载
-     */,
-    onLoad(options) {
-        this.getList();
-    },
-    methods: {
-        /** 查询列表 */
-        getList(type) {
-            this.loading = true;
-            getList().then(response => {
-                this.list = response.rows;
-            });
-        },
-        /** 查询详情 */
-        goDetails(id) {
-            uni.navigateTo({
-                url: '/pages/cooperative/details?id='+id
-            });
-        }
-    }
-};
-</script>
-<style>
-@import './cooperative.css';
-</style>

pages/topic/dept.vue

@@ -1,20 +1,23 @@
 <template>
 	<view>
-		<view class="btnContain">
-			<button 
-				v-for="(item,idx) in userType" 
-				@click="onclick(item,idx)"
-				:class="idx == currentIdx ? 'highlight' : 'not-highlight'"
-				:style="idx == 0 ? 'text-align:left' : 'text-align:right'"
-				>
-				{{item.dictLabel}}
-			</button>
-		</view>
+
+			<view class="btnContain">
+				<button
+					v-for="(item,idx) in userType"
+					@click="onclick(item,idx)"
+					:class="idx == currentIdx ? 'highlight' : 'not-highlight'"
+					:style="idx == 0 ? 'text-align:left' : 'text-align:right'"
+					>
+					{{item.dictLabel}}
+				</button>
+			</view>
+
+
 		<view>
 			<uni-grid :column="2" :square="false" :highlight="false">
 				<uni-grid-item v-for="(item, index) in dataList" :index="index" :key="index">
 						<view class="grid-item-box" @click="onMatters(item)">
-					
+
 						<text class="text">{{ item.name }}</text>
 					</view>
 				</uni-grid-item>
@@ -37,7 +40,7 @@
 			return {
 				userType: [], // 初始化用户类型为空
 				dataList: [],
-				currentIdx:null,
+				currentIdx:0,
 			}
 		},
 		created() {
@@ -46,9 +49,10 @@
 		},
 		methods: {
 			onMatters(data){
+        console.log(data)
 				uni.setStorageSync('data', {department:data.name,examine:1})
 				uni.navigateTo({
-					url: '/pages/matterAll/matterAll',
+					url: '/pages/handleAffairs/matterAll/matterAll',
 				});
 			},
 			getdataList(data){
@@ -63,7 +67,7 @@
 					_that.dataList = res.data
 					console.log("9999999999999999999999",_that.dataList)
 				})
-				
+
 			},
 			onclick(row,idx) {
 				this.currentIdx = idx
@@ -157,4 +161,5 @@
 		justify-content: center;
 		padding: 15px 0;
 	}
-</style>
+
+</style>

pages/gridQuery/gridQuery.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 			<view >
-				<uni-title type="h3" :title="data.name+'职责:'"></uni-title><br/><br/>
+				<uni-title type="h5" :title="data.name+'职责:'" color="#666"></uni-title><br/><br/>
 			</view>
 
 			<view>

pages/handleAffairs/handleAffairs.vue

@@ -2,15 +2,15 @@
 
 	<view style="background-color:#fff ;">
 		<!-- 搜索栏 -->
-		<view class="input-view_contain">
+		<view class="input-view_contain data-v-53a1f34c">
 			<view class="input-view">
-				<uni-icons type="search" size="20" class="search-icon" @tap="confirm"></uni-icons>
 				<input confirm-type="search" class="nav-bar-input" type="text" placeholder="输入搜索内容" @confirm="confirm" v-model="title"/>
+				<uni-icons type="search" size="20" class="search-icon" @tap="confirm"></uni-icons>
 			</view>
 		</view>
 		<view class="spacing"></view>
 		<!-- 网格配置列表滑动 -->
-		<view>
+		<view class="image-hei">
 			<uni-swiper-dot :info="info" :current="current" field="content" :mode="mode">
 				<swiper class="swiper-box" style="height: 160rpx;">
 					<swiper-item v-for="(item ,index) in gridtType" :key="index">
@@ -42,10 +42,10 @@
 		    <view class="segmented-control">
 		        <!-- <view class="segmented-control-item" :class="{ active: activeTab === 'recommend' }" @click="changeTab('recommend')">常办事项</view>
 		        <view class="segmented-control-item" :class="{ active: activeTab === 'favorite' }" @click="changeTab('favorite')">我的事</view> -->
-				<view 
-					class="segmented-control-item" 
-					:class="activeTab == e.label ? 'highlight' : 'not-highlight' " 
-					@click="changeTab(e.label)" 
+				<view
+					class="segmented-control-item"
+					:class="activeTab == e.label ? 'highlight' : 'not-highlight' "
+					@click="changeTab(e.label)"
 					v-for="(e,idx) in switchOption"
 					:key="idx"
 					>
@@ -61,7 +61,7 @@
 		                    <p @click="getmatter(item)">{{ item.title }}</p>
 		                </li> -->
 						<uni-list>
-							<uni-list-item  :title="item.title" v-for="(item,index) in recommendList" @click="getmatter(item)" clickable="true" ></uni-list-item>
+							<uni-list-item  class="list-item":title="item.title" v-for="(item,index) in recommendList" @click="getmatter(item)" clickable="true" link></uni-list-item>
 						</uni-list>
 		            </ul>
 		        </view>
@@ -73,16 +73,21 @@
 		                    <p @click="getmatter(item)">{{ item.title }}</p>
 		                </li> -->
 						<uni-list>
-							<uni-list-item  :title="item.title" v-for="(item,index) in favoriteList" @click="getmatter(item)" clickable="true" ></uni-list-item>
+							<uni-list-item class="list-item" :title="item.title" v-for="(item,index) in favoriteList" @click="getmatter(item)" clickable="true" link></uni-list-item>
 						</uni-list>
 		            </ul>
 		        </view>
 		    </view>
-
+			<uni-fab ref="fab" :horizontal="right" :vertical="bottom"
+			         @fabClick="goToMatterAllPage()"/>
+			<!-- <view class="add-button" @click="goToMatterAllPage">
+					<text>+</text>
+				</view> -->
 		</view>
 
 
 	</view>
+
 </template>
 
 <script>
@@ -109,7 +114,13 @@ import { listDept,collectlist } from '@/api/handleAffairs/matter.js';
 					    value:'我的事',
 					    label:'favorite'
 				    }
-			    ]
+			    ],
+				  userList: [], // 收藏列表数据
+				  //悬浮按钮右对齐
+				  right: 'right',
+				  //悬浮按钮下对齐
+				  bottom: 'bottom',
+				  color:'#8FBC8F '
 			};
 		},
 		created() {
@@ -118,6 +129,12 @@ import { listDept,collectlist } from '@/api/handleAffairs/matter.js';
 			this.getListscolle();
 		},
 		methods: {
+			  goToMatterAllPage() {
+			        // 使用 uni-app 的路由跳转方法跳转到 matterAll 页面
+			        uni.navigateTo({
+			            url: '/pages/handleAffairs/mattersAdd/mattersAdd'
+			        });
+			    },
 			confirm(){
 				if (!this.title.trim()) {//去除前后空格，在判断是否为空
 					return
@@ -125,13 +142,13 @@ import { listDept,collectlist } from '@/api/handleAffairs/matter.js';
 				console.log(this.title)
 				uni.setStorageSync('data', {title:this.title,examine:1})
 				uni.navigateTo({
-					url: '/pages/matterAll/matterAll',
+					url: '/pages/handleAffairs/matterAll/matterAll',
 				});
 			},
 			//主题导航跳转
 			topic(){
 				uni.navigateTo({
-					url: '/pages/topic/topic',
+					url: '/pages/handleAffairs/topic/topic',
 				});
 			},
 
@@ -139,7 +156,7 @@ import { listDept,collectlist } from '@/api/handleAffairs/matter.js';
 				console.log(item)
 				uni.setStorageSync('id', item.id)
 				uni.navigateTo({
-					url: '/pages/gridQuery/gridQuery?titleText='+item.name
+					url: '/pages/handleAffairs/gridQuery/gridQuery?titleText='+item.name
 
 				});
 			},
@@ -183,13 +200,13 @@ import { listDept,collectlist } from '@/api/handleAffairs/matter.js';
 			getmatter(item) {
 			    uni.setStorageSync('id', item.id);
 			    uni.navigateTo({
-			        url: '/pages/gridQuery/mattercontent',
+			        url: '/pages/handleAffairs/mattercontent/mattercontent',
 			    });
 			},
 			addNewItem(item) {
 
 			    uni.navigateTo({
-			        url: '/pages/mattersAdd/mattersAdd',
+			        url: '/pages/handleAffairs/mattersAdd/mattersAdd',
 			    });
 			},
 			changeTab(tab) {
@@ -202,7 +219,7 @@ import { listDept,collectlist } from '@/api/handleAffairs/matter.js';
 			dept(){
 
 				uni.navigateTo({
-					url: '/pages/topic/dept',
+					url: '/pages/handleAffairs/dept/dept',
 				});
 			}
 		}
@@ -229,7 +246,7 @@ import { listDept,collectlist } from '@/api/handleAffairs/matter.js';
 		position: relative;
 		display: flex;
 		width: 92%;
-		height: 6vh;
+		height: 8vh;
 		margin: auto;
 		border-radius: 10px;
 		border: 1px solid #19C56B;
@@ -265,11 +282,14 @@ import { listDept,collectlist } from '@/api/handleAffairs/matter.js';
 
 	}
 	.input-view_contain{
-		height: 6vh;
+		height: 50px;
 		width: 100%;
 		background-color: #07C160;
 	}
 	.input-view {
+
+		justify-content: space-between;
+		align-items: center;
 		/* #ifndef APP-PLUS-NVUE */
 		display: flex;
 		/* #endif */
@@ -286,6 +306,7 @@ import { listDept,collectlist } from '@/api/handleAffairs/matter.js';
 		width: 96%;
 		.nav-bar-input{
 			margin: auto 0;
+			font-size: 15px;
 		}
 	}
 	.segmented-control {
@@ -314,4 +335,11 @@ import { listDept,collectlist } from '@/api/handleAffairs/matter.js';
 	.spacing {
 		height: 40rpx;
 	}
+	.image-hei{
+		height:80px
+	}
+	.list-item {
+	   border-bottom: 1px dotted #ccc;
+	   height:35px
+	}
 </style>

pages/matterAll/matterAll.vue

@@ -68,7 +68,7 @@
 			onclick(data){//点击详情
 				uni.setStorageSync('id', data.id);
 				uni.navigateTo({
-				    url: '/pages/gridQuery/mattercontent',
+				    url: '/pages/handleAffairs/mattercontent/mattercontent',
 				});
 			},
 			getMatters() {
@@ -76,7 +76,7 @@
 				listMatters(_that.queryForm).then(res => {
 					_that.dataList = res.rows
 					_that.total = res.total
-					console.log(res)
+
 				})
 			}
 		}
@@ -84,7 +84,7 @@
 </script>
 
 <style lang="scss">
-@import './matterAll.css';
+@import 'matterAll.css';
 .container{
 	height: 100%;
 	content: '\e633';

pages/gridQuery/mattercontent.vue

@@ -2,18 +2,14 @@
 
 	<view>
 		<view class="rnwdList">
-
-
 			<ul >
 				<li >
-
 					<h3>{{matterlist.title }}</h3>
 				    <p>{{ matterlist.content }}</p>
+					<image class="uni-header-image" :src="'http://127.0.0.1:8080'+matterlist.picture"></image>
 					   <button @click="toggleFavorite">{{ isFavorite ? '❤️' : '🤍' }}</button>
 				</li>
 				</ul>
-
-
 		</view>
 	</view>
 
@@ -22,7 +18,7 @@
 
 <script>
 	import {
-		 getDept, addsc, delDept, getsc
+		 getDept, scadd, delDept, getsc
 	} from '@/api/handleAffairs/matter.js';
 
 	export default {
@@ -37,11 +33,11 @@
 
 		},
 
-
 		methods: {
 		      getList(){
 		        const _that = this;
 		        const id = uni.getStorageSync('id');
+
 		        getDept(id).then(res =>{
 		          _that.matterlist = res.data
 					this.checkFavorite();
@@ -56,19 +52,19 @@
 		        } else {
 					const userId = getApp().globalData.userId
 					const matterId = this.matterlist.id
-		         addsc({ matterId:this.matterlist.id , userId }).then(() => {
+		         scadd({ matterId:this.matterlist.id , userId }).then(() => {
 		             this.isFavorite = true;
 		         });
 		        }
 		      },
 
-		    checkFavorite() {
-				const userId = getApp().globalData.userId
-		      getsc(userId).then(res => {
-		        this.isFavorite = res.data;
-		      });
-		    },
-
+		   checkFavorite() {
+		   	const userId = getApp().globalData.userId
+		   	const matterId = this.matterlist.id
+		     getsc({ matterId , userId }).then(res => {
+		       this.isFavorite = res.data;
+		     });
+		   },
 	},
 	}
 </script>

pages/mattersAdd/mattersAdd.vue

@@ -23,25 +23,25 @@
 				</uni-forms-item>
 				<uni-forms-item name="type" label="主题类型" required label-width="30%">
 					<uni-data-select
-							
+
 						  style="width: 30%;margin: auto;"
 						  v-model="formData.type"
 						  placeholder="请选择主题类型"
-						  field="deptName as value, deptName as text"	
+						  field="deptName as value, deptName as text"
 						  :localdata="topicTypeList"
 					></uni-data-select>
 				</uni-forms-item>
 				<uni-forms-item name="department" label="所属部门" required label-width="30%">
 					<uni-data-select
-					
+
 						  style="width: 30%;margin: auto;"
 						  v-model="formData.department"
 						  placeholder="请选择所属部门"
-						  field="name as value, name as text"	
+						  field="name as value, name as text"
 						  :localdata="departmentList"
 					></uni-data-select>
 				</uni-forms-item>
-			
+
 				<uni-forms-item name="picture"  label="图片">
 					<upload :imgArr="imageList"  :fileSize="1" :limit="3" @updateImg="updateImg"></upload>
 				</uni-forms-item>
@@ -57,15 +57,15 @@
 		</uni-forms>
 	</view>
 </template>
- 
+
 <script>
-	import { 
+	import {
 		getListTopicType,
 		getListDepts ,
 	} from '@/api/me/matters/matters.js'
 	import upload from '@/components/upload/index.vue'
 	import {addsc} from '@/api/handleAffairs/matter.js'
-	
+
 	export default {
 		components: {
 			upload
@@ -108,7 +108,7 @@
 				imageList:[],
 				topicTypeList:[],
 				departmentList:[],
-			
+
 				show: false,
 				rules: {
 					title: {
@@ -166,13 +166,13 @@
 				// 			}
 				// 		]
 				// 	},
-				
+
 
 				}
 			}
 		},
 		methods: {
-		
+
 			submitForm(form) {
 			    this.$refs[form]
 			        .submit()
@@ -185,12 +185,12 @@
 			                    console.log("1111111111111", res);
 			                    if (res.confirm) {
 			                        // 用户点击确定按钮
-			                   
+
 			                    addsc(this.formData).then(response => {
 										console.log("7777777", this.formData);
 			                            this.$modal.msgSuccess("新增成功");
 			                             uni.navigateBack();
-			               
+
 			                        }).catch(error => {
 			                            console.error("新增方法出错：", error);
 			                        });
@@ -210,7 +210,7 @@
 			},
 
 
- 
+
 			// submitForm(form) {
 			// 	this.$refs[form]
 			// 		.submit()
@@ -224,8 +224,8 @@
 			// 			console.error('验证失败：', errors)
 			// 		})
 			// },
- 
-		
+
+
 			resetForm() {
 				this.$refs.form.resetFields()
 			},
@@ -247,7 +247,7 @@
 				//  this.formData.picture =this.imageList
 				 // this.formData.picture = JSON.stringify(this.imageList);
 				const pictureString = '"' + this.imageList.join('","') + '"';
-				
+
 				// 将转换后的字符串赋值给 this.formData.picture
 				this.formData.picture = pictureString;
 				// console.log("1111111111111",)
@@ -284,4 +284,4 @@
 		border-radius: 5px;
 		box-sizing: border-box;
 	}
-</style>
+</style>

pages/topic/topic.vue

@@ -1,7 +1,13 @@
 <template>
 	<view>
-		<view style="height: 20%;">
-			<button v-for="(item,index) in userType" @click="onclick(item)">{{item.dictLabel}}
+		<view class="btnContain">
+			<button
+				v-for="(item,idx) in userType"
+				@click="onclick(item,idx)"
+				:class="idx == currentIdx ? 'highlight' : 'not-highlight'"
+				:style="idx == 0 ? 'text-align:left' : 'text-align:right'"
+				>
+				{{item.dictLabel}}
 			</button>
 		</view>
 		<view>
@@ -30,7 +36,7 @@
 			return {
 				userType: [], // 初始化用户类型为空
 				dataList: [],
-
+				currentIdx:0,
 			}
 		},
 		created() {
@@ -41,7 +47,7 @@
 			onMatters(data){
 				uni.setStorageSync('data', {type:data.deptName,examine:1})
 				uni.navigateTo({
-					url: '/pages/matterAll/matterAll',
+					url: '/pages/handleAffairs/matterAll/matterAll',
 				});
 			},
 			getdataList(data){
@@ -57,8 +63,8 @@
 				})
 				console.log(_that.dataList)
 			},
-			onclick(row) {
-				
+			onclick(row,idx) {
+				this.currentIdx = idx
 				let data = {
 					objectOfHandling: row.dictValue,
 					yesOrNoShow: "0"
@@ -87,10 +93,41 @@
 		justify-content: center;
 		height: 100vh;
 	} */
+	.not-highlight{
+		color:#000;
+	}
+	.highlight{
+		color:#FF673D;
+	}
 
+	.btnContain{
+		position: relative;
+		width: 100%;
+		display: flex;
+		height: 20%;
+		background-color: #fff;
+		justify-content: space-between;
+	}
+	.btnContain::after{
+		content: '';
+		position: absolute;
+		width: 4rpx;
+		height: 40%;
+		left: 50%;
+		top: 30%;
+		z-index: 10;
+		margin: auto;
+		background-color: #E1E1E1;
+	}
 	button {
-		margin-bottom: 10px;
+		width: 30%;
+		border: none;
+		background-color: #fff;
 	}
+	button:after{
+		border: none;
+	}
+
 
 	.selected {
 		background-color: #007bff;
@@ -120,4 +157,4 @@
 		justify-content: center;
 		padding: 15px 0;
 	}
-</style>
+</style>

pages/highFrequencyService/cooperative/addCooperative.vue

@@ -0,0 +1,156 @@
+<template>
+  <uni-section title="提交前请仔细核对信息，提交后不可修改！" type="line">
+    <view class="example">
+      <!-- 自定义表单校验 -->
+      <uni-forms ref="customForm" :rules="rules" :modelValue="customFormData" label-align="center">
+        <uni-forms-item label="名 称" required name="name" label-width="125" label-align="center" >
+          <uni-easyinput v-model="customFormData.name" placeholder="请输入供销社名称" />
+        </uni-forms-item>
+        <uni-forms-item label="地 址" required name="address" label-width="95" label-align="center" >
+          <uni-easyinput v-model="customFormData.address" placeholder="请输入供销社地址" />
+        </uni-forms-item>
+        <uni-forms-item label="电 话" required name="chargePhone" label-width="95" label-align="center" >
+          <uni-easyinput v-model="customFormData.chargePhone" placeholder="请输入负责人电话" />
+        </uni-forms-item>
+        <uni-forms-item label="负责人" required name="chargePeople" label-width="95" label-align="center" >
+          <uni-easyinput v-model="customFormData.chargePeople" placeholder="请输入负责人姓名" />
+        </uni-forms-item>
+        <uni-forms-item label="图 片" required name="url" label-width="95">
+          <upload :imgArr="imageList" :fileSize="1" :limit="3" @updateImg="updateImg"/>
+        </uni-forms-item>
+      </uni-forms>
+      <button type="primary" @click="submit('customForm')">提交</button>
+    </view>
+  </uni-section>
+</template>
+
+<script>
+import { addCooperative } from "@/api/highFrequencyService/cooperative/cooperative";
+import upload from '../../components/upload/index.vue'
+export default {
+  components: {
+    upload
+  },
+  data() {
+    return {
+      // 基础表单数据
+      baseFormData: {
+        name: '',
+        address:'',
+        chargePeople:'',
+        chargePhone:'',
+        imgUrl:'',
+      },
+      // 校验规则
+      rules: {
+        name: {
+          rules: [{
+            required: true,
+            errorMessage: '供销社名称不能为空'
+          }]
+        },
+        address: {
+          rules: [{
+            required: true,
+            errorMessage: '供销社地址不能为空'
+          }]
+        },
+        chargePeople: {
+          rules: [{
+            required: true,
+            errorMessage: '负责人姓名不能为空'
+          }]
+        },
+        chargePhone: {
+          rules: [
+            {
+              required: true,
+              errorMessage: '负责人电话不能为空'
+            },
+            {
+              pattern:'^1[3456789]\\d{9}$',
+              errorMessage: '负责人电话不合法'
+            }
+          ]
+        },
+        imgUrlList: {
+          rules: [{
+            required: true,
+            errorMessage: '图片不能为空'
+          }]
+        },
+      },
+      imageList: [],
+      customFormData:{}
+    }
+  },
+  onLoad() {},
+  onReady() {
+    // 设置自定义表单校验规则，必须在节点渲染完毕后执行
+    this.$refs.customForm.setRules(this.rules)
+  },
+  created() {
+
+  },
+  methods: {
+    //转换为下拉选列表
+    formatOptions(data) {
+      return data.map(item => ({
+        value: item.id,
+        text: item.productName,
+        children: item.children ? this.formatOptions(item.children) : null,
+      }));
+    },
+    submit(ref) {
+      this.$refs[ref].validate().then(res => {
+        if (res) {
+          this.customFormData.imgUrl = this.imageList.join(',')
+          addCooperative(this.customFormData).then(response => {
+            this.$modal.msgSuccess('提交成功');
+            this.customFormData = {...this.baseFormData};
+            uni.navigateTo({
+              url: '../cooperative/cooperative'
+            });
+          }).catch(err => {
+            console.log('err', err);
+          })
+        }
+      })
+    },
+    updateImg(imgList) {
+      this.imageList = imgList;
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+
+.example {
+  padding: 15px;
+  background-color: #fff;
+}
+
+.segmented-control {
+  margin-bottom: 15px;
+}
+
+.button-group {
+  margin-top: 15px;
+  display: flex;
+  justify-content: space-around;
+}
+
+.form-item {
+  display: flex;
+  align-items: center;
+}
+
+.button {
+  display: flex;
+  align-items: center;
+  height: 35px;
+  margin-left: 10px;
+}
+</style>
+

pages/highFrequencyService/cooperative/cooperative.vue

@@ -0,0 +1,119 @@
+<template>
+    <view class="container">
+        <!-- 供销社列表 -->
+        <view class="rnwdList" v-for="(item, index) in list" :key="index">
+            <view @tap="goDetails(item.id)" class="cooperativeImgBox">
+                <image :src="loadImgSrc('/snbj.png')" class="cooperativeImg"></image>
+                <!--<image :src="loadImgSrc(item.imgUrl)" class="cooperativeImg"></image>-->
+            </view>
+            <view @tap="goDetails(item.id)" class="cooperativeBox">
+                <view class="list">
+                    <span class="listTitle">{{ item.name }}</span>
+                    <view class="jlSj">
+                        <span class="jf">
+                            {{ item.address?item.address:'' }}
+                        </span>
+                    </view>
+                </view>
+            </view>
+            <em class="iconfont icon-xiangyoujiantou"></em>
+        </view>
+        <uni-load-more :status="status" :content-text="contentText"/>
+        <uni-fab ref="fab" horizontal="right" vertical="bottom"
+                 @fabClick="handleAdd()"/>
+    </view>
+</template>
+
+<script>
+import { getList, getDetails } from '@/api/highFrequencyService/cooperative/cooperative';
+export default {
+    data() {
+        return {
+            // 查询参数
+            queryParams: {
+                pageNum: 1,
+                pageSize: 15,
+                id: null,
+                status:"1",
+            },
+            // 加载更多
+            status: 'more',
+            contentText: {
+                contentdown: '查看更多',
+                contentrefresh: '加载中',
+                contentnomore: '------------------我是有底线的------------------'
+            },
+            // 列表数据
+            list: [
+                {
+                    name:"-",
+                    address:"-",
+                    chargePeople:"-",
+                    chargePhone:"-",
+                    imgUrl:"-"
+                }
+            ],
+        };
+    },
+    onPullDownRefresh() {
+        this.queryParams.pageNum = 1;
+        this.list = [];
+        this.getList()
+    },
+    //上拉加载
+    onReachBottom(){
+        let pageNum = this.queryParams.pageNum;
+        let pageSize = this.queryParams.pageSize;
+        let total = this.total;
+        if(pageNum*pageSize >= total){
+            uni.showToast({
+                title:'暂无更多数据'
+            });
+            return;
+        } else {
+            this.queryParams.pageNum += 1;
+            this.getList()
+        }
+    }
+    /**
+     * 生命周期函数--监听页面加载
+     */,
+    onLoad(options) {
+        this.getList();
+    },
+    methods: {
+        /** 新增按钮操作 */
+        handleAdd(){
+            uni.navigateTo({
+                url: '../highFrequencyService/cooperative/addCooperative'
+            });
+        },
+        /** 查询列表 */
+        getList(type) {
+            this.loading = true;
+            getList().then(response => {
+                if (this.queryParams.pageNum === 1) {
+                    this.list = response.rows;
+                } else {
+                    this.list = this.list.concat(response.rows);
+                }
+                // 判断是否还有更多数据
+                if (response.rows.length < this.queryParams.pageSize) {
+                    this.status = 'noMore'; // 没有更多数据
+                } else {
+                    this.status = 'more'; // 还有更多数据
+                }
+            });
+        },
+        /** 查询详情 */
+        goDetails(id) {
+            uni.navigateTo({
+                url: '/pages/highFrequencyService/cooperative/details?id='+id
+            });
+        }
+    }
+};
+</script>
+<style>
+@import './cooperative.css';
+</style>

pages/cooperative/details.vue

@@ -19,7 +19,7 @@
 </template>
 
 <script>
-    import { getDetails } from '@/api/cooperative/cooperative';
+    import { getDetails } from '@/api/highFrequencyService/cooperative/cooperative';
     export default {
     data() {
         return {

pages/index/index.vue

@@ -387,7 +387,7 @@
 				let id = e.id || ''
 				let type = 10
 				uni.navigateTo({
-					url: `../informationDetail/informationDetail?id=${id}&type=${type}`
+					url: `../information/informationDetail/informationDetail?id=${id}&type=${type}`
 				});
 			},
 			//封面与轮播图
@@ -415,19 +415,19 @@
 			},
 			toLegal() {
 				uni.navigateTo({
-					url: '/pages/toLegal/toLegal'
+					url: '/pages/information/toLegal/toLegal'
 				});
 			},
 			//政策推荐
 			toGovernmentList() {
 				uni.navigateTo({
-					url: '/pages/toGovernmentList/toGovernmentList'
+					url: '/pages/information/toGovernmentList/toGovernmentList'
 				});
 			},
 			//惠民通
 			toGovernmentList1() {
 				uni.navigateTo({
-					url: '/pages/toGovernmentList/toGovernmentList?type=10'
+					url: '/pages/information/toGovernmentList/toGovernmentList?type=10'
 				});
 			},
 			governmentListData() {
@@ -467,7 +467,7 @@
 
 			goCooperative() {
 				uni.navigateTo({
-					url: '/pages/cooperative/cooperative'
+					url: '/pages/highFrequencyService/cooperative/cooperative'
 				});
 			},
 			goLoveAtVillage() {
@@ -487,7 +487,7 @@
 			},
 			goBanShi() {
 				uni.navigateTo({
-					url: '/pages/handleAffairs/handleAffairs'
+					url: '/pages/handleAffairs/index'
 				});
 			},
 			//获取最新公告列表（三条未读消息）
@@ -610,4 +610,4 @@
 </script>
 <style>
 	@import './index.css';
-</style>
+</style>

pages/fuwu/fuwu.vue

@@ -18,7 +18,7 @@
 	        <view class="list" @tap.stop="goDetails(item)" v-for="(item, index1) in qbwd" :key="index1">
 				<span v-if="item.top == 1" style="color: red;">[置顶]</span>
 	            <span class="listTitle">{{ item.titleName }}</span>
-	
+
 	            <view class="onePic" v-if="item.top != 1  ? item.urls.length == 1 : false ">
 	                <image :src="loadImgSrcLocalhost(item.urls[index2])" v-for="(v, index2) in item.urls" :key="index2">
 					</image>
@@ -27,12 +27,12 @@
 	                <image :src="loadImgSrcLocalhost(item.urls[index2])" v-for="(v, index2) in item.urls" :key="index2">
 					</image>
 	            </view>
-	
+
 	            <view class="threePic" v-if="item.top != 1 ? item.urls.length == 3 : false">
 	                <image :src="loadImgSrcLocalhost(item.urls[index2])" v-for="(v, index2) in item.urls" :key="index2">
 					</image>
 	            </view>
-	
+
 	           <view class="jlSj">
 	                <span class="jf">
 	                   {{ item.updateTime || item.createTime }}
@@ -53,7 +53,7 @@
 	                    </span>
 	                </view>
 	            </view>
-	
+
 			</view>
 	    </view>
 		<!-- 新增资讯按钮 -->
@@ -223,7 +223,7 @@ export default {
 };
 </script>
 <style lang="scss">
-@import './fuwu.css';
+@import 'fuwu.css';
 .container{
 	height: 100%;
 	content: '\e633';
@@ -234,6 +234,6 @@ export default {
 	}
 }
 .not-favorite{
-	
+
 }
 </style>

pages/informationDetail/informationDetail.vue

@@ -6,7 +6,7 @@
             <view class="wenzhangLy">
                 <!-- 头像昵称 -->
                 <view class="txTime">
-                    <image :src="loadImgSrcLocalhost(detailInfo.headImg)" style="border-radius: 50px;"></image>
+                    <image :src="(detailInfo.headImg!=null)?loadImgSrcLocalhost(detailInfo.headImg):'https://tse4-mm.cn.bing.net/th/id/OIP-C.cYyiJYfTo1SY1cj26FQpAQHaHa?rs=1&pid=ImgDetMain'" style="border-radius: 50px;"></image>
                     <view class="time">
                         <p>{{detailInfo.nickName?detailInfo.nickName:'网友'}}</p>
                         <span>{{ detailInfo.createTime }}</span>
@@ -134,7 +134,7 @@ export default {
 };
 </script>
 <style lang="scss">
-@import './informationDetail.css';
+@import 'informationDetail.css';
 
 .collect{
 	.icon-shoucang:before{

pages/toGovernmentList/toGovernmentList.vue

@@ -233,7 +233,7 @@ export default {
 };
 </script>
 <style lang="scss">
-@import './index.css';
+@import 'toGovernmentList.css';
 .container{
 	height: 100%;
 	content: '\e633';

pages/toLegal/toLegal.vue

@@ -26,7 +26,7 @@
 					<image :src="loadImgSrcLocalhost(item.urls[index2])" v-for="(v, index2) in item.urls" :key="index2">
 					</image>
 				</view>
-					
+
 				<view class="threePic" v-if="item.top != 1 ? item.urls.length == 3 : false">
 					<image :src="loadImgSrcLocalhost(item.urls[index2])" v-for="(v, index2) in item.urls" :key="index2">
 					</image>
@@ -51,7 +51,7 @@
 	                    </span>
 	                </view>
 	            </view>
-	
+
 			</view>
 	    </view>
 		<!-- 新增资讯按钮 -->
@@ -220,7 +220,7 @@ export default {
 };
 </script>
 <style lang="scss">
-@import './toLegal.css';
+@import 'toLegal.css';
 .container{
 	height: 100%;
 }
@@ -234,6 +234,6 @@ export default {
 	}
 }
 .not-favorite{
-	
+
 }
 </style>

pages/matters/matters.vue

@@ -122,7 +122,7 @@ export default {
 		},
 		fabClick(){
 			uni.navigateTo({
-				url: `../mattersAdd/mattersAdd`
+				url: `/pages/handleAffairs/mattersAdd/mattersAdd`
 			})
 		},
 		search(){
@@ -195,6 +195,6 @@ export default {
 	}
 }
 .not-favorite{
-	
+
 }
 </style>

pages/me/me.vue

@@ -30,7 +30,7 @@ export default {
 			},
 			list: [
 				{
-					id: 'me/meOperate',//id是文件路径
+					id: 'me/meOperate/meOperate',//id是文件路径
 					name: '我的积分流水',
 					open: false,
 				},
@@ -40,12 +40,12 @@ export default {
 					open: false,
 				},
 				{
-					id: 'me/nameAuthentication',
+					id: 'me/nameAuthentication/nameAuthentication',
 					name: '实名认证',
 					open: false,
 				},
 				{
-					id: 'me/officialAuthentication',
+					id: 'me/officialAuthentication/officialAuthentication',
 					name: '官方认证',
 					open: false,
 				},
@@ -55,7 +55,7 @@ export default {
 					open: false,
 				},
 				{
-					id: 'myPayKnow/myPayKnow',
+					id: 'me/myPayKnow/myPayKnow',
 					name: '我的付费知识',
 					open: false,
 				}

pages/me/meOperate.vue

@@ -86,5 +86,5 @@ export default {
 </script>
 
 <style>
-@import './meOperate.css';
+@import 'meOperate.css';
 </style>

pages/myPayKnow/informationDetail.vue

@@ -113,7 +113,7 @@ export default {
 };
 </script>
 <style lang="scss">
-@import './informationDetail.css';
+@import 'informationDetail.css';
 
 .collect{
 	.icon-shoucang:before{

pages/myPayKnow/myPayKnow.vue

@@ -32,7 +32,7 @@
 
 <script>
 	import {myPayKnow} from '@/api/me/me.js'
-	
+
 export default {
     data() {
         return {
@@ -98,12 +98,12 @@ export default {
         goDetails(item) {
 			if(item==null) return;
             uni.navigateTo({
-                url: '/pages/myPayKnow/informationDetail?obj='+ encodeURIComponent(JSON.stringify(item))
+                url: '/pages/me/myPayKnow/informationDetail?obj='+ encodeURIComponent(JSON.stringify(item))
             });
         }
     }
 };
 </script>
 <style>
-@import './myPayKnow.css';
+@import 'myPayKnow.css';
 </style>

pages/me/nameAuthentication.vue

@@ -12,19 +12,23 @@
                 <uni-forms-item label="身份证号" required name="idCard">
                     <uni-easyinput v-model="form.idCard" placeholder="请输入身份证号" maxlength="18"/>
                 </uni-forms-item>
-                <uni-forms-item label="身份证正反面" required name="path">
+				<uni-forms-item label="身份证正反面" required class="onePic" v-if="form.id != null">
+					<image :src="loadImgSrc(item)" v-for="(item, index1) in imageList" :key="index1">
+					</image>
+				</uni-forms-item>
+                <uni-forms-item label="身份证正反面" required name="path" v-if="form.id == null">
                     <upload :imgArr="imageList" name="path" v-model="form.path" :fileSize="1" :limit="2"
                             @updateImg="updateImg"></upload>
                 </uni-forms-item>
             </uni-forms>
-            <button type="primary" @click="submitForm('customForm')">提交</button>
+            <button type="primary" @click="submitForm('customForm')" v-if="form.id==null">提交</button>
         </view>
     </uni-section>
 </template>
 
 <script>
-    import upload from '../../components/upload/index.vue'
-    import {appletAdd} from '@/api/me/nameAuthentication.js'
+    import upload from '../../../components/upload/index.vue'
+    import {appletAdd,getUserInfo} from '@/api/me/nameAuthentication.js'
 
     export default {
         components: {
@@ -33,6 +37,8 @@
         onReady() {
             // 设置自定义表单校验规则，必须在节点渲染完毕后执行
             this.$refs.customForm.setRules(this.customRules)
+			this.userId = getApp().globalData.userId
+			this.getUserInfoByUserId(this.userId)
         },
         data() {
             return {
@@ -97,10 +103,22 @@
 				})
             },
 
+			//图片上传
             updateImg(imgList) {
                 this.imageList = imgList;
                 this.form.path = this.imageList.join(',');
-            }
+            },
+			
+			//按userId查询实名认证信息
+			getUserInfoByUserId(userId){
+				getUserInfo(userId).then(res =>{
+					if(res.data!=null){
+						this.form = res.data;
+						this.imageList = res.data.path.split(",")
+					}
+					
+				})
+			}
         }
     };
 </script>

pages/me/officialAuthentication.vue

@@ -12,19 +12,23 @@
                 <uni-forms-item label="联系电话" required name="phone">
                     <uni-easyinput v-model="form.phone" placeholder="请输入联系电话" maxlength="13"/>
                 </uni-forms-item>
-                <uni-forms-item label="证照信息" required name="path">
+				<uni-forms-item label="证照信息" required class="onePic" v-if="form.id != null">
+					<image :src="loadImgSrc(item)" v-for="(item, index1) in imageList" :key="index1">
+					</image>
+				</uni-forms-item>
+                <uni-forms-item label="证照信息" required name="path" v-if="form.id == null">
                     <upload :imgArr="imageList" name="path" v-model="form.path" :fileSize="1" :limit="2"
                             @updateImg="updateImg"></upload>
                 </uni-forms-item>
             </uni-forms>
-            <button type="primary" @click="submitForm('customForm')">提交</button>
+            <button type="primary" @click="submitForm('customForm')" v-if="form.id==null">提交</button>
         </view>
     </uni-section>
 </template>
 
 <script>
-    import upload from '../../components/upload/index.vue'
-    import {appletAdd} from '@/api/me/officialAuthentication.js'
+    import upload from '../../../components/upload/index.vue'
+    import {appletAdd,getUserInfo} from '@/api/me/officialAuthentication.js'
 
     export default {
         components: {
@@ -33,6 +37,8 @@
         onReady() {
             // 设置自定义表单校验规则，必须在节点渲染完毕后执行
             this.$refs.customForm.setRules(this.customRules)
+			this.userId = getApp().globalData.userId
+			this.getUserInfoByUserId(this.userId)
         },
         data() {
             return {
@@ -87,18 +93,28 @@
 						})
 					}else{
 						appletAdd(this.form).then(res => {
-							console.log("1111111111")
 							uni.navigateBack();
-							console.log("2222222222222")
 						});
 					}
 				})
             },
 			
+			//图片上传
             updateImg(imgList) {
                 this.imageList = imgList;
                 this.form.path = this.imageList.join(',');
-            }
+            },
+			
+			//按userId查询实名认证信息
+			getUserInfoByUserId(userId){
+				getUserInfo(userId).then(res =>{
+					if(res.data!=null){
+						this.form = res.data;
+						this.imageList = res.data.path.split(",")
+					}
+					
+				})
+			}
         }
     };
 </script>

pages/quotations/quotations.vue

@@ -89,6 +89,7 @@ export default {
   onPullDownRefresh() {
     this.queryParams.pageNum = 1;
     this.quotationsList = [];
+    this.categories = [];
     this.getList()
   },
   //上拉加载
@@ -189,4 +190,4 @@ export default {
 }
 
 
-</style>
+</style>

pages/specialService/financialInfrastructure/details.vue

@@ -15,7 +15,7 @@
 </template>
 
 <script>
-    import { listServer, getServer, delServer, addServer, updateServer } from '@/api/highFrequencyService/highFrequencyService';
+    import { listServer, getServer, delServer, addServer, updateServer } from '@/api/specialService/specialService';
     export default {
         data() {
             return {

pages/specialService/financialInfrastructure/financialInfrastructure.vue

@@ -12,14 +12,31 @@
             </view>
             <em class="iconfont icon-xiangyoujiantou"></em>
         </view>
+        <!-- 我是有底线的 -->
+        <uni-load-more :status="status" :content-text="contentText"/>
     </view>
 </template>
 
 <script>
-import { listServer, getServer, delServer, addServer, updateServer } from '@/api/highFrequencyService/highFrequencyService';
+import { listServer, getServer, delServer, addServer, updateServer } from '@/api/specialService/specialService';
 export default {
     data() {
         return {
+            // 查询参数
+            queryParams: {
+                pageNum: 1,
+                pageSize: 15,
+                id: null,
+                status:"1",
+            },
+            // 加载更多
+            status: 'more',
+            contentText: {
+                contentdown: '查看更多',
+                contentrefresh: '加载中',
+                contentnomore: '------------------我是有底线的------------------'
+            },
+            // 列表数据
             list: [
                 {
                     titleName:"-",
@@ -27,6 +44,27 @@ export default {
                 }
             ],
         };
+    },
+    onPullDownRefresh() {
+        console.log("onPullDownRefresh  "+this.queryParams.pageNum)
+        this.queryParams.pageNum = 1;
+        this.list = [];
+        this.getList(9)
+    },
+    //上拉加载
+    onReachBottom(){
+        let pageNum = this.queryParams.pageNum;
+        let pageSize = this.queryParams.pageSize;
+        let total = this.total;
+        if(pageNum*pageSize >= total){
+            uni.showToast({
+                title:'暂无更多数据'
+            });
+            return;
+        } else {
+            this.queryParams.pageNum += 1;
+            this.getList(9)
+        }
     }
     /**
      * 生命周期函数--监听页面加载
@@ -39,7 +77,17 @@ export default {
         getList(type) {
             this.loading = true;
             listServer({type: type}).then(response => {
-                this.list = response.rows;
+                if (this.queryParams.pageNum === 1) {
+                    this.list = response.rows;
+                } else {
+                    this.list = this.list.concat(response.rows);
+                }
+                // 判断是否还有更多数据
+                if (response.rows.length < this.queryParams.pageSize) {
+                    this.status = 'noMore'; // 没有更多数据
+                } else {
+                    this.status = 'more'; // 还有更多数据
+                }
             });
         },
         /** 查询详情 */

pages/specialService/legalService/details.vue

@@ -15,7 +15,7 @@
 </template>
 
 <script>
-    import { listServer, getServer, delServer, addServer, updateServer } from '@/api/highFrequencyService/highFrequencyService';
+    import { listServer, getServer, delServer, addServer, updateServer } from '@/api/specialService/specialService';
     export default {
         data() {
             return {

pages/specialService/legalService/legalService.vue

@@ -12,14 +12,31 @@
             </view>
             <em class="iconfont icon-xiangyoujiantou"></em>
         </view>
+        <!-- 我是有底线的 -->
+        <uni-load-more :status="status" :content-text="contentText"/>
     </view>
 </template>
 
 <script>
-import { listServer, getServer, delServer, addServer, updateServer } from '@/api/highFrequencyService/highFrequencyService';
+import { listServer, getServer, delServer, addServer, updateServer } from '@/api/specialService/specialService';
 export default {
     data() {
         return {
+            // 查询参数
+            queryParams: {
+                pageNum: 1,
+                pageSize: 15,
+                id: null,
+                status:"1",
+            },
+            // 加载更多
+            status: 'more',
+            contentText: {
+                contentdown: '查看更多',
+                contentrefresh: '加载中',
+                contentnomore: '------------------我是有底线的------------------'
+            },
+            // 列表数据
             list: [
                 {
                     titleName:"-",
@@ -27,6 +44,27 @@ export default {
                 }
             ],
         };
+    },
+    onPullDownRefresh() {
+        console.log("onPullDownRefresh  "+this.queryParams.pageNum)
+        this.queryParams.pageNum = 1;
+        this.list = [];
+        this.getList(8)
+    },
+    //上拉加载
+    onReachBottom(){
+        let pageNum = this.queryParams.pageNum;
+        let pageSize = this.queryParams.pageSize;
+        let total = this.total;
+        if(pageNum*pageSize >= total){
+            uni.showToast({
+                title:'暂无更多数据'
+            });
+            return;
+        } else {
+            this.queryParams.pageNum += 1;
+            this.getList(8)
+        }
     }
     /**
      * 生命周期函数--监听页面加载
@@ -39,7 +77,17 @@ export default {
         getList(type) {
             this.loading = true;
             listServer({type: type}).then(response => {
-                this.list = response.rows;
+                if (this.queryParams.pageNum === 1) {
+                    this.list = response.rows;
+                } else {
+                    this.list = this.list.concat(response.rows);
+                }
+                // 判断是否还有更多数据
+                if (response.rows.length < this.queryParams.pageSize) {
+                    this.status = 'noMore'; // 没有更多数据
+                } else {
+                    this.status = 'more'; // 还有更多数据
+                }
             });
         },
         /** 查询详情 */

pages/specialService/loveAtVillage/details.vue

@@ -15,7 +15,7 @@
 </template>
 
 <script>
-import { listServer, getServer, delServer, addServer, updateServer } from '@/api/highFrequencyService/highFrequencyService';
+import { listServer, getServer, delServer, addServer, updateServer } from '@/api/specialService/specialService';
 export default {
     data() {
         return {

pages/specialService/loveAtVillage/loveAtVillage.vue

@@ -12,14 +12,31 @@
             </view>
             <em class="iconfont icon-xiangyoujiantou"></em>
         </view>
+        <!-- 我是有底线的 -->
+        <uni-load-more :status="status" :content-text="contentText"/>
     </view>
 </template>
 
 <script>
-import { listServer, getServer, delServer, addServer, updateServer } from '@/api/highFrequencyService/highFrequencyService';
+import { listServer, getServer, delServer, addServer, updateServer } from '@/api/specialService/specialService';
 export default {
     data() {
         return {
+            // 查询参数
+            queryParams: {
+                pageNum: 1,
+                pageSize: 15,
+                id: null,
+                status:"1",
+            },
+            // 加载更多
+            status: 'more',
+            contentText: {
+                contentdown: '查看更多',
+                contentrefresh: '加载中',
+                contentnomore: '------------------我是有底线的------------------'
+            },
+            // 列表数据
             list: [
                 {
                     titleName:"-",
@@ -27,6 +44,27 @@ export default {
                 }
             ],
         };
+    },
+    onPullDownRefresh() {
+        console.log("onPullDownRefresh  "+this.queryParams.pageNum)
+        this.queryParams.pageNum = 1;
+        this.list = [];
+        this.getList(7)
+    },
+    //上拉加载
+    onReachBottom(){
+        let pageNum = this.queryParams.pageNum;
+        let pageSize = this.queryParams.pageSize;
+        let total = this.total;
+        if(pageNum*pageSize >= total){
+            uni.showToast({
+                title:'暂无更多数据'
+            });
+            return;
+        } else {
+            this.queryParams.pageNum += 1;
+            this.getList(7)
+        }
     }
     /**
      * 生命周期函数--监听页面加载
@@ -39,7 +77,17 @@ export default {
         getList(type) {
             this.loading = true;
             listServer({type: type}).then(response => {
-                this.list = response.rows;
+                if (this.queryParams.pageNum === 1) {
+                    this.list = response.rows;
+                } else {
+                    this.list = this.list.concat(response.rows);
+                }
+                // 判断是否还有更多数据
+                if (response.rows.length < this.queryParams.pageSize) {
+                    this.status = 'noMore'; // 没有更多数据
+                } else {
+                    this.status = 'more'; // 还有更多数据
+                }
             });
         },
         /** 查询详情 */