Pārlūkot izejas kodu

Merge remote-tracking branch 'origin/master'

wangzhe 1 gadu atpakaļ
vecāks
revīzija
2bae95afd8
33 mainītis faili ar 337 papildinājumiem un 86 dzēšanām
  1. 16 16
      pages.json
  2. 11 10
      pages/topic/dept.vue
  3. 0 0
      pages/handleAffairs/gridQuery/gridQuery.vue
  4. 8 8
      pages/handleAffairs/handleAffairs.vue
  5. 0 0
      pages/handleAffairs/matterAll/matterAll.css
  6. 2 2
      pages/matterAll/matterAll.vue
  7. 0 0
      pages/handleAffairs/mattercontent/mattercontent.vue
  8. 0 0
      pages/handleAffairs/mattersAdd/mattersAdd.css
  9. 18 18
      pages/mattersAdd/mattersAdd.vue
  10. 5 5
      pages/topic/topic.vue
  11. 5 5
      pages/index/index.vue
  12. 0 0
      pages/information/fuwu/fuwu.css
  13. 6 6
      pages/fuwu/fuwu.vue
  14. 0 0
      pages/information/informationAdd/informationAdd.css
  15. 0 0
      pages/information/informationAdd/informationAdd.vue
  16. 0 0
      pages/information/informationDetail/informationDetail.css
  17. 2 2
      pages/informationDetail/informationDetail.vue
  18. 0 0
      pages/information/toGovernmentList/toGovernmentList.css
  19. 1 1
      pages/toGovernmentList/toGovernmentList.vue
  20. 0 0
      pages/information/toLegal/toLegal.css
  21. 4 4
      pages/toLegal/toLegal.vue
  22. 2 2
      pages/matters/matters.vue
  23. 2 2
      pages/me/me.vue
  24. 0 0
      pages/me/meOperate/meOperate.css
  25. 1 1
      pages/me/meOperate.vue
  26. 0 0
      pages/me/myPayKnow/informationDetail.css
  27. 1 1
      pages/myPayKnow/informationDetail.vue
  28. 0 0
      pages/me/myPayKnow/myPayKnow.css
  29. 3 3
      pages/myPayKnow/myPayKnow.vue
  30. 0 0
      pages/me/nameAuthentication/nameAuthentication.css
  31. 127 0
      pages/me/nameAuthentication/nameAuthentication.vue
  32. 0 0
      pages/me/officialAuthentication/officialAuthentication.css
  33. 123 0
      pages/me/officialAuthentication/officialAuthentication.vue

+ 16 - 16
pages.json

@@ -125,7 +125,7 @@
 			}
 		},
 		{
-			"path": "pages/fuwu/fuwu",
+			"path": "pages/information/fuwu/fuwu",
 			"style": {
 				"usingComponents": {},
 				"onReachBottomDistance": 5,
@@ -151,7 +151,7 @@
 			}
 		},
 		{
-			"path": "pages/myPayKnow/myPayKnow",
+			"path": "pages/me/myPayKnow/myPayKnow",
 			"style": {
 				"usingComponents": {},
 				"navigationBarBackgroundColor": "#07c160",
@@ -185,7 +185,7 @@
 			}
 		},
 		{
-			"path": "pages/mattersAdd/mattersAdd",
+			"path": "pages/handleAffairs/mattersAdd/mattersAdd",
 			"style": {
 				"usingComponents": {},
 				"navigationBarBackgroundColor": "#07c160",
@@ -224,7 +224,7 @@
 			}
 		},
 		{
-			"path": "pages/informationAdd/informationAdd",
+			"path": "pages/information/informationAdd/informationAdd",
 			"style": {
 				"usingComponents": {},
 				"navigationBarBackgroundColor": "#07c160",
@@ -233,7 +233,7 @@
 			}
 		},
 		{
-			"path": "pages/informationDetail/informationDetail",
+			"path": "pages/information/informationDetail/informationDetail",
 			"style": {
 				"usingComponents": {},
 				"navigationBarBackgroundColor": "#07c160",
@@ -241,7 +241,7 @@
 				"navigationBarTitleText": "资讯详情"
 			}
 		},{
-			"path": "pages/myPayKnow/informationDetail",
+			"path": "pages/me/myPayKnow/informationDetail",
 			"style": {
 				"usingComponents": {},
 				"navigationBarBackgroundColor": "#07c160",
@@ -280,7 +280,7 @@
 			}
 		},
 		{
-			"path": "pages/handleAffairs/handleAffairs",
+			"path": "pages/handleAffairs/index",
 			"style": {
 				"usingComponents": {},
 				"navigationBarBackgroundColor": "#07c160",
@@ -333,7 +333,7 @@
 			}
 		},
 		{
-			"path": "pages/toGovernmentList/toGovernmentList",
+			"path": "pages/information/toGovernmentList/toGovernmentList",
 			"style": {
 				"usingComponents": {},
 				"navigationBarBackgroundColor": "#07c160",
@@ -350,7 +350,7 @@
 			}
 		},
 		{
-			"path": "pages/toLegal/toLegal",
+			"path": "pages/information/toLegal/toLegal",
 			"style": {
 				"usingComponents": {},
 				"navigationBarBackgroundColor": "#07c160",
@@ -399,7 +399,7 @@
 			}
 		},
 		{
-			"path": "pages/me/meOperate",
+			"path": "pages/me/meOperate/meOperate",
 			"style": {
 				"usingComponents": {},
 				"navigationBarBackgroundColor": "#07c160",
@@ -408,7 +408,7 @@
 			}
 		},
 		{
-			"path": "pages/gridQuery/gridQuery",
+			"path": "pages/handleAffairs/gridQuery/gridQuery",
 			"style": {
 				"usingComponents": {},
 				"navigationBarBackgroundColor": "#07c160",
@@ -553,7 +553,7 @@
 			}
 		},
 		{
-			"path": "pages/topic/topic",
+			"path": "pages/handleAffairs/topic/topic",
 			"style": {
 				"usingComponents": {},
 				"navigationBarBackgroundColor": "#07c160",
@@ -562,7 +562,7 @@
 			}
 		},
 		{
-			"path": "pages/matterAll/matterAll",
+			"path": "pages/handleAffairs/matterAll/matterAll",
 			"style": {
 				"usingComponents": {},
 				"navigationBarBackgroundColor": "#07c160",
@@ -571,7 +571,7 @@
 			}
 		},
 		{
-			"path": "pages/topic/dept",
+			"path": "pages/handleAffairs/dept/dept",
 			"style": {
 				"usingComponents": {},
 				"navigationBarBackgroundColor": "#07c160",
@@ -580,7 +580,7 @@
 			}
 		},
 		{
-			"path": "pages/gridQuery/mattercontent",
+			"path": "pages/handleAffairs/mattercontent/mattercontent",
 			"style": {
 				"usingComponents": {},
 				"navigationBarBackgroundColor": "#07c160",
@@ -610,7 +610,7 @@
 			},
 			{
 				"text": "资讯",
-				"pagePath": "pages/fuwu/fuwu",
+				"pagePath": "pages/information/fuwu/fuwu",
 				"iconPath": "static/pages/images/index2.png",
 				"selectedIconPath": "static/pages/images/index1.png"
 			},

+ 11 - 10
pages/topic/dept.vue

@@ -1,9 +1,9 @@
 <template>
 	<view>
-		
+
 			<view class="btnContain">
-				<button 
-					v-for="(item,idx) in userType" 
+				<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'"
@@ -11,13 +11,13 @@
 					{{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>
@@ -49,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){
@@ -66,7 +67,7 @@
 					_that.dataList = res.data
 					console.log("9999999999999999999999",_that.dataList)
 				})
-				
+
 			},
 			onclick(row,idx) {
 				this.currentIdx = idx
@@ -160,5 +161,5 @@
 		justify-content: center;
 		padding: 15px 0;
 	}
-	
-</style>
+
+</style>

pages/gridQuery/gridQuery.vue → pages/handleAffairs/gridQuery/gridQuery.vue


+ 8 - 8
pages/handleAffairs/handleAffairs.vue

@@ -132,7 +132,7 @@ import { listDept,collectlist } from '@/api/handleAffairs/matter.js';
 			  goToMatterAllPage() {
 			        // 使用 uni-app 的路由跳转方法跳转到 matterAll 页面
 			        uni.navigateTo({
-			            url: '/pages/mattersAdd/mattersAdd'
+			            url: '/pages/handleAffairs/mattersAdd/mattersAdd'
 			        });
 			    },
 			confirm(){
@@ -142,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',
 				});
 			},
 
@@ -156,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
 
 				});
 			},
@@ -200,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) {
@@ -219,7 +219,7 @@ import { listDept,collectlist } from '@/api/handleAffairs/matter.js';
 			dept(){
 
 				uni.navigateTo({
-					url: '/pages/topic/dept',
+					url: '/pages/handleAffairs/dept/dept',
 				});
 			}
 		}
@@ -287,7 +287,7 @@ import { listDept,collectlist } from '@/api/handleAffairs/matter.js';
 		background-color: #07C160;
 	}
 	.input-view {
-		
+
 		justify-content: space-between;
 		align-items: center;
 		/* #ifndef APP-PLUS-NVUE */

pages/matterAll/matterAll.css → pages/handleAffairs/matterAll/matterAll.css


+ 2 - 2
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() {
@@ -84,7 +84,7 @@
 </script>
 
 <style lang="scss">
-@import './matterAll.css';
+@import 'matterAll.css';
 .container{
 	height: 100%;
 	content: '\e633';

pages/gridQuery/mattercontent.vue → pages/handleAffairs/mattercontent/mattercontent.vue


pages/mattersAdd/mattersAdd.css → pages/handleAffairs/mattersAdd/mattersAdd.css


+ 18 - 18
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>

+ 5 - 5
pages/topic/topic.vue

@@ -1,8 +1,8 @@
 <template>
 	<view>
 		<view class="btnContain">
-			<button 
-				v-for="(item,idx) in userType" 
+			<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'"
@@ -47,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){
@@ -99,7 +99,7 @@
 	.highlight{
 		color:#FF673D;
 	}
-	
+
 	.btnContain{
 		position: relative;
 		width: 100%;
@@ -157,4 +157,4 @@
 		justify-content: center;
 		padding: 15px 0;
 	}
-</style>
+</style>

+ 5 - 5
pages/index/index.vue

@@ -381,7 +381,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}`
 				});
 			},
 			//封面与轮播图
@@ -409,19 +409,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() {
@@ -481,7 +481,7 @@
 			},
 			goBanShi() {
 				uni.navigateTo({
-					url: '/pages/handleAffairs/handleAffairs'
+					url: '/pages/handleAffairs/index'
 				});
 			},
 			//获取最新公告列表(三条未读消息)

pages/fuwu/fuwu.css → pages/information/fuwu/fuwu.css


+ 6 - 6
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/informationAdd/informationAdd.css → pages/information/informationAdd/informationAdd.css


pages/informationAdd/informationAdd.vue → pages/information/informationAdd/informationAdd.vue


pages/informationDetail/informationDetail.css → pages/information/informationDetail/informationDetail.css


+ 2 - 2
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/index.css → pages/information/toGovernmentList/toGovernmentList.css


+ 1 - 1
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.css → pages/information/toLegal/toLegal.css


+ 4 - 4
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>

+ 2 - 2
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>

+ 2 - 2
pages/me/me.vue

@@ -30,7 +30,7 @@ export default {
 			},
 			list: [
 				{
-					id: 'me/meOperate',//id是文件路径
+					id: 'me/meOperate/meOperate',//id是文件路径
 					name: '我的积分流水',
 					open: false,
 				},
@@ -55,7 +55,7 @@ export default {
 					open: false,
 				},
 				{
-					id: 'myPayKnow/myPayKnow',
+					id: 'me/myPayKnow/myPayKnow',
 					name: '我的付费知识',
 					open: false,
 				}

pages/me/meOperate.css → pages/me/meOperate/meOperate.css


+ 1 - 1
pages/me/meOperate.vue

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

pages/myPayKnow/informationDetail.css → pages/me/myPayKnow/informationDetail.css


+ 1 - 1
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.css → pages/me/myPayKnow/myPayKnow.css


+ 3 - 3
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>

+ 0 - 0
pages/me/nameAuthentication/nameAuthentication.css


+ 127 - 0
pages/me/nameAuthentication/nameAuthentication.vue

@@ -0,0 +1,127 @@
+<template>
+    <uni-section title="实名认证" type="line">
+        <view class="example">
+            <!-- 自定义表单校验 -->
+            <uni-forms ref="customForm" :rules="customRules" :modelValue="form">
+                <uni-forms-item label="姓名" required name="name">
+                    <uni-easyinput v-model="form.name" placeholder="请输入姓名" maxlength="20"/>
+                </uni-forms-item>
+                <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="idCard">
+                    <uni-easyinput v-model="form.idCard" placeholder="请输入身份证号" maxlength="18"/>
+                </uni-forms-item>
+				<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')" v-if="form.id==null">提交</button>
+        </view>
+    </uni-section>
+</template>
+
+<script>
+    import upload from '../../../components/upload/index.vue'
+    import {appletAdd,getUserInfo} from '@/api/me/nameAuthentication.js'
+
+    export default {
+        components: {
+            upload
+        },
+        onReady() {
+            // 设置自定义表单校验规则,必须在节点渲染完毕后执行
+            this.$refs.customForm.setRules(this.customRules)
+			this.userId = getApp().globalData.userId
+			this.getUserInfoByUserId(this.userId)
+        },
+        data() {
+            return {
+                form: {},
+                // 表单校验
+                customRules: {
+                    name: {
+                        rules: [{
+                            required: true,
+                            errorMessage: '姓名不能为空'
+                        }]
+                    },
+                    phone: {
+                        rules: [{
+                            required: true,
+                            errorMessage: '电话不能为空'
+                        },
+						{
+						  pattern:'^1[3456789]\\d{9}$',
+						  errorMessage: '请填写正确的手机号'
+						}]
+                    },
+                    idCard: {
+                        rules: [{
+                            required: true,
+                            errorMessage: '身份证号不能为空'
+                        },
+						{
+						  pattern: '/(^\\d{15}$)|(^\\d{18}$)|(^\\d{17}(\\d|X|x)$)/',
+						  errorMessage: '请填写正确的身份号'
+						}]
+                    },
+                    path: {
+                        rules: [{
+                            required: true,
+                            errorMessage: '身份证正反面不能为空'
+                        }]
+                    },
+                },
+                imageList: []
+            }
+        },
+        methods: {
+            // 取消按钮
+            cancel() {
+                this.open = false;
+                this.reset();
+            },
+            /** 提交按钮 */
+            submitForm(e) {
+				this.$refs[e].validate().then(res => {
+					if(this.imageList.length!=2){
+						uni.showToast({
+							title: "身份证正反面照片为两张!",
+							icon: "none"
+						})
+					}else{
+						appletAdd(this.form).then(res => {
+							uni.navigateBack();
+						});
+					}
+				})
+            },
+
+			//图片上传
+            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>
+
+<style>
+</style>

+ 0 - 0
pages/me/officialAuthentication/officialAuthentication.css


+ 123 - 0
pages/me/officialAuthentication/officialAuthentication.vue

@@ -0,0 +1,123 @@
+<template>
+    <uni-section title="官方认证" type="line">
+        <view class="example">
+            <!-- 自定义表单校验 -->
+            <uni-forms ref="customForm" :rules="customRules" :modelValue="form">
+                <uni-forms-item label="企业名称" required name="enterpriseName">
+                    <uni-easyinput v-model="form.enterpriseName" placeholder="请输入企业名称" maxlength="20"/>
+                </uni-forms-item>
+                <uni-forms-item label="法人姓名" required name="legalName">
+                    <uni-easyinput v-model="form.legalName" placeholder="请输入法人姓名" maxlength="20"/>
+                </uni-forms-item>
+                <uni-forms-item label="联系电话" required name="phone">
+                    <uni-easyinput v-model="form.phone" placeholder="请输入联系电话" maxlength="13"/>
+                </uni-forms-item>
+				<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')" v-if="form.id==null">提交</button>
+        </view>
+    </uni-section>
+</template>
+
+<script>
+    import upload from '../../../components/upload/index.vue'
+    import {appletAdd,getUserInfo} from '@/api/me/officialAuthentication.js'
+
+    export default {
+        components: {
+            upload
+        },
+        onReady() {
+            // 设置自定义表单校验规则,必须在节点渲染完毕后执行
+            this.$refs.customForm.setRules(this.customRules)
+			this.userId = getApp().globalData.userId
+			this.getUserInfoByUserId(this.userId)
+        },
+        data() {
+            return {
+                form: {},
+                // 表单校验
+                customRules: {
+                    enterpriseName: {
+                        rules: [{
+                            required: true,
+                            errorMessage: '企业名称不能为空'
+                        }]
+                    },
+                    legalName: {
+                        rules: [{
+                            required: true,
+                            errorMessage: '法人姓名不能为空'
+                        }]
+                    },
+                    phone: {
+                        rules: [{
+                            required: true,
+                            errorMessage: '联系电话不能为空'
+                        },
+						{
+						  pattern:'^1[3456789]\\d{9}$',
+						  errorMessage: '请填写正确的手机号'
+						}]
+                    },
+                    path: {
+                        rules: [{
+                            required: true,
+                            errorMessage: '证照信息不能为空'
+                        }]
+                    },
+                },
+                imageList: []
+            }
+        },
+        methods: {
+            // 取消按钮
+            cancel() {
+                this.open = false;
+                this.reset();
+            },
+            /** 提交按钮 */
+            submitForm(e) {
+				this.$refs[e].validate().then(res => {
+					if(this.imageList.length!=2){
+						uni.showToast({
+							title: "证照信息照片为两张!",
+							icon: "none"
+						})
+					}else{
+						appletAdd(this.form).then(res => {
+							uni.navigateBack();
+						});
+					}
+				})
+            },
+			
+			//图片上传
+            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>
+
+<style>
+</style>