Merge branch 'feature/asyncOrder' into feature/temp

# Conflicts:
#	pages/personal/personal.vue

pages/market/one/cooperative/order.vue

@@ -4,7 +4,6 @@
 			<u-tabs :list="tab" @click="click" :lineHeight="5"></u-tabs>
 			<view style="display: flex;margin-top: 10px;z-index: 999;">
 				<view class="searchDate" @click="show=!show">{{param.declTime}}</view>
-				<!-- <u--input placeholder="选择日期" border="surround"   v-model="param.declTime" clearable readonly @click="show=!show"> -->
 				</u--input>
 				<view class="reset_btn" @click="cleanDate">重置</view>
 			</view>

pages/market/two/leader/order.vue

@@ -9,8 +9,8 @@
 					<span v-if="item.purchaserId === null || item.purchaserId === '' || item.purchaserId === undefined">车牌号 {{ item.veNo }}</span>
 					<span v-else>采购商 {{ item.purchaserName }}</span>
 					<span>
-						<view class="state" v-if="item.purchaserId === null || item.purchaserId === '' || item.purchaserId === undefined"><text class="icon">&#xe830;</text>待下单</view>
-						<view class="state" v-else><text class="icon" style="color: #13ce66">&#xe830;</text>已下单</view>
+						<view class="state" v-if="item.purchaserId === null || item.purchaserId === '' || item.purchaserId === undefined"><text class="icon">&#xe830;</text>未销售</view>
+						<view class="state" v-else><text class="icon" style="color: #13ce66">&#xe830;</text>已销售</view>
 					</span>
 				</view>
 				<view class="con">
@@ -38,8 +38,8 @@ export default {
 		return {
 			tab: [
 				{ name: '全部'},
-				{ name: '待下单'},
-				{ name: '已下单'},
+				{ name: '未销售'},
+				{ name: '已销售'},
 			],
 			param: { pageNo: 1, pageSize: 10 },
 			list: [],

pages/personal/personal.vue

@@ -27,10 +27,10 @@
 			</view>
 			<view class="message _info" v-if="(user.userType == 1 || user.userType == 2) && user.face == 1">
 				<text class="icon">&#xe643;</text>
-				<text>人脸已认证<text style="color: blue;margin-left: 5px;"></text></text>
+				<text>人脸已认证<text style="color: blue;margin-left: 5px;"></text><text style="color: blue;" @click="authAgain">重新认证</text></text>
 			</view>
 			<!--用户信息-->
-			<view class="user" style="display: flex;">
+			<view class="user">
 				<image src="../../static/icon/user.png" mode="widthFix" class="head"></image>
 				<view class="con">
 					<view class="nickName omit">{{user.name}}({{ user.phone }})</view>
@@ -81,19 +81,16 @@
 					<text class="title" style="color: firebrick;;font-weight: bold;">加入互助组</text>
 					<text class="icon arrow">&#xe8f2;</text>
 				</view>
-				<view class="s_item ">
-					<text class="icon ic">&#xe622;</text>
-					<text class="title">APP版本 {{version}}</text>
-				</view>
 			</view>
 			<button class="btn exit" @click="exitLogin()">退出登录</button>
-			<button class="btn exit" @click="cancelAccount()">注销账号</button>
+			<!-- <button class="btn exit" @click="cancelAccount()">注销账号</button> -->
 		</view>
 		<view class="version">
-			<view>
-				<view>Copyright@2024-2030</view>
-				<view>天保国际物流投资有限公司版权所有</view>
-			</view>
+		<view style="line-height: 30px;">
+			<view>Copyright@2024-2030</view>
+			<view>天保国际物流投资有限公司版权所有</view>
+			<view>APP版本 {{version}}</view>
+		</view>
 		</view>
 	</view>
 </template>
@@ -152,6 +149,11 @@
 			}
 		},
 		methods: {
+			authAgain(){
+				uni.navigateTo({
+					url: '/pages/face/faceRegister?type=1'
+				});
+			},
 			makePhoneCall(phone) {
 				uni.makePhoneCall({
 					phoneNumber: phone
@@ -183,7 +185,7 @@
 					});
 				}
 			},
-			
+
 			wallet() {
 				if (!this.hasAuth() && this.user.userType == 1) {
 					uni.navigateTo({
@@ -215,7 +217,7 @@
 				};
 				uni.showModal({
 					title: '提示',
-					content: '确定注销登录?',
+					content: '确定退出登录?',
 					success: res => {
 						if (res.confirm) {
 							uni.removeStorageSync('token');
@@ -241,7 +243,7 @@
 				};
 				uni.showModal({
 					title: '提示',
-					content: '确定注销账号?',
+					content: '确定注销账号？注销后不能登录APP',
 					success: res => {
 						if (res.confirm) {
 							uni.removeStorageSync('token');
@@ -330,10 +332,8 @@
 	}
 
 	.version {
-		margin-left: 15%;
-		position: fixed;
-		bottom: 25px;
+		margin-top: 25px;
 		color: #888484;
 		text-align: center;
 	}
-</style>
+</style>