更新边民确认

App.vue

@@ -39,7 +39,7 @@ button::after {
 /**挂载iconfont字体图标*/
 @font-face {
 	font-family: 'iconfont';
-	src: url('https://at.alicdn.com/t/c/font_4191999_uwys6dyk5iq.ttf?t=1691992251789') format('truetype');
+	src: url('https://at.alicdn.com/t/c/font_4191999_pn5jkrx05l.ttf?t=1692117075907') format('truetype');
 	/* src: url('~@/static/font/iconfont.ttf') format('truetype'); */
 }
 .icon {

common/style.scss

@@ -757,6 +757,7 @@
 			text-align: right;
 			font-size: 15px;
 			float: right;
+			margin-top: -20px;
 		}
 	}
 }

pages.json

@@ -68,7 +68,7 @@
 		}, {
 			"path": "pages/authentication/info",
 			"style": {
-				"navigationBarTitleText": "完善资料",
+				"navigationBarTitleText": "填写认证资料",
 				"enablePullDownRefresh": false
 			}
 

pages/index/index.vue

@@ -69,9 +69,9 @@ export default {
 		};
 	},
 	onLoad() {
+		this.getMenu();
 		this.getBannerList();
 		this.getNewsList();
-		this.getMenu();
 	},
 	onShow() {
 		this.keyword = '';
@@ -101,7 +101,7 @@ export default {
 			});
 		},
 		getMenu() {
-			this.menuList=[];
+			this.menuList = [];
 			let menu = uni.getStorageSync('menu');
 			this.http.request({
 				url: '/sp-admin/app/AppMenu/getList',
@@ -148,6 +148,13 @@ export default {
 		go(url) {
 			uni.navigateTo({ url: url });
 		}
+	},
+	//下拉刷新
+	onPullDownRefresh() {
+		setTimeout(() => {
+			uni.stopPullDownRefresh();
+			this.getMenu();
+		}, 1000);
 	}
 };
 </script>

pages/market/one/leader/detail.vue

@@ -41,7 +41,7 @@
 				</view>
 				<view class="item">
 					<text class="label">边民</text>
-					<text class="desc">查看</text>
+					<text class="desc" @click="members()">查看</text>
 				</view>
 				<view class="item">
 					<text class="label">发布时间</text>
@@ -94,7 +94,14 @@ export default {
 			});
 		}
 	},
-	methods: {}
+	methods: {
+		//查看边民
+		members() {
+			uni.navigateTo({
+				url: '/pages/market/one/leader/members'
+			});
+		}
+	}
 };
 </script>
 
@@ -102,4 +109,4 @@ export default {
 page {
 	background-color: $pg;
 }
-</style>
+</style>

pages/market/one/leader/members.vue

@@ -1,19 +1,100 @@
 <template>
 	<view>
-		
+		<view class="search">
+			<u-search placeholder="输入姓名搜索" v-model="param.goodsName" bgColor="white" @search="refresh()" :animation="true" actionText="取消" @clear="refresh()"></u-search>
+			<view class="clear"></view>
+		</view>
+		<view class="list">
+			<view class="item" v-for="(item, index) in list" :key="index">
+				<view class="flex">
+					<view class="f name" style="flex: 0.5">{{ item.name }}</view>
+					<view class="f" v-for="(item, index) in item.items" :key="index">
+						<text class="icon" v-if="item.state == 0">&#xe631;</text>
+						<text class="icon ok" v-else>&#xe631;</text>
+						<text>{{ item.name }}</text>
+					</view>
+				</view>
+			</view>
+		</view>
 	</view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				
-			};
+export default {
+	data() {
+		return {
+			param: {},
+			list: [
+				{
+					name: '杨振生',
+					items: [
+						{ name: '订单确认', state: 0 },
+						{ name: '进境申报', state: 0 },
+						{ name: '进口申报', state: 1 }
+					]
+				},
+				{
+					name: '林傍玲',
+					items: [
+						{ name: '订单确认', state: 1 },
+						{ name: '进境申报', state: 0 },
+						{ name: '进口申报', state: 1 }
+					]
+				},
+				{
+					name: '毛燕美',
+					items: [
+						{ name: '订单确认', state: 0 },
+						{ name: '进境申报', state: 1 },
+						{ name: '进口申报', state: 1 }
+					]
+				}
+			]
+		};
+	},
+	onLoad() {
+		//this.getData();
+	},
+	methods: {
+		getData() {
+			this.http.request({
+				url: '/level-one-server/app/TbOrder/xxx',
+				data: this.param,
+				success: res => {}
+			});
+		},
+		detail(item) {
+			uni.navigateTo({ url: '/pages/market/one/leader/detail?id=' + item.id });
 		}
 	}
+};
 </script>
 
 <style lang="scss">
-
+page {
+	background-color: $pg;
+}
+.list {
+	padding: 15px;
+	.item {
+		padding: 15px 10px 15px 10px;
+		background-color: white;
+		border-radius: 5px;
+		margin-bottom: 10px;
+		color: $font-c;
+		.f {
+			padding: 2px;
+			font-size: 14px;
+			.icon {
+				color: #c3c5c7;
+			}
+			.ok {
+				color: $main-color;
+			}
+		}
+		.name {
+			font-weight: bold;
+		}
+	}
+}
 </style>

pages/market/one/leader/order.vue

@@ -31,6 +31,9 @@
 				<view class="op">
 					<view class="date">2022-12-12:12:12</view>
 					<template v-if="item.enterpriseConfirm == 0">
+						<view class="an" style="color: #f44336" v-if="user.userType == 1" @click.stop="confirm(item.id)">边民确认</view>
+					</template>
+					<template v-if="item.enterpriseConfirm == 0">
 						<view class="an" style="color: #f44336" v-if="user.userType == 2" @click.stop="confirm(item.id)">取消订单</view>
 					</template>
 					<template v-if="item.enterpriseConfirm == 3">
@@ -79,6 +82,7 @@ export default {
 				pageNo: 1,
 				pageSize: 10
 			},
+			user:this.getUser(),
 			list: [],
 			loadMore: true,
 			user: this.getUser()

pages/personal/personal.vue

@@ -20,6 +20,17 @@
 				<text class="icon edit" @click="go('/pages/personal/my')">&#xe645;</text>
 				<view class="clear"></view>
 			</view>
+			<!--边民菜单-->
+			<view class="menu" v-if="user.userType == 1">
+				<view class="msn" @click="go('/pages/market/one/leader/order')">
+					<view class="out">
+						<view class="int">
+							<view class="icon ioc" style="background-color: #f0dcfc; color: #b064d8">&#xe628;</view>
+							<view class="tit">我的订单</view>
+						</view>
+					</view>
+				</view>
+			</view>
 			<!--组长菜单-->
 			<view class="menu" v-if="user.userType == 2">
 				<view class="msn" @click="go('/pages/market/one/leader/cart')">
@@ -92,6 +103,14 @@
 						</view>
 					</view>
 				</view>
+				<view class="msn" @click="go('/pages/authentication/index')">
+					<view class="out">
+						<view class="int">
+							<view class="icon ioc" style="background-color: #f0dcfc; color: #b064d8">&#xe628;</view>
+							<view class="tit">认证</view>
+						</view>
+					</view>
+				</view>
 			</view>
 			<view class="cmd">
 				<view class="s_item" @click="show = true">
@@ -155,7 +174,7 @@ export default {
 		exitLogin() {
 			let param = {
 				appUserId: this.getUser().id
-			}
+			};
 			uni.showModal({
 				title: '提示',
 				content: '确定注销登录?',