人脸认证

App.vue

@@ -41,6 +41,7 @@ button::after {
 	 //       url('~@/static/font/iconfont.woff?t=1724655869789') format('woff'),
 	 //       url('~@/static/font/iconfont.ttf?t=1724655869789') format('truetype');
 }
+
 .icon {
 	font-family: iconfont;
 }

common/http.js

@@ -1,9 +1,9 @@
 
 // const ip = 'http://192.168.2.8:8080'; //线下
 //const ip = 'http://hs-server.aseanbusiness.cn'; //线上
-const ip = 'http://hs-server.tbgjhc.top:8018';
 const ngip = 'http://hs.tbgjhc.top:7010'
-// const ip = 'http:///192.168.3.15:8080'; //线下
+// const ip = 'http://hs-server.tbgjhc.top:8018';
+const ip = 'http:///192.168.31.251:8080'; //线下
 
 /**
  * 封装的http请求

pages/face/faceRegister.nvue

@@ -56,7 +56,8 @@
 					filePath: 'file://' + img,
 					name: 'file',
 					formData: {
-						id: that.userId
+						id: that.userId,
+						type:that.type
 					},
 					header: {
 						satoken: uni.getStorageSync('token')
@@ -72,7 +73,6 @@
 							user.face = 1;
 							uni.setStorageSync('info', user)
 							setTimeout(() => {
-								uni.$emit('face', true);
 								uni.navigateBack();
 								uni.hideLoading();
 							}, 1000)

pages/market/one/leader/order.vue

@@ -42,9 +42,6 @@
 						v-if="item.peopleConfirmStatus == 1 && item.Sxb010Status == 1 && item.finishStatus == 0 && item.refundStatus == 0">
 						<view class="an" style="color: #f44336" @click.stop="orderRefund(item.id)">退款</view>
 					</template>
-					<template v-if="item.resaleStatus == 0 && item.beingOrder == 0&& item.upStatus == 2">
-						<view class="an" style="color: #f44336" @click.stop="downOrder(item)">下架</view>
-					</template>
 				</view>
 			</view>
 			<view class="loading" v-if="loadMore"><u-loadmore :status="loadMore ? 'loading' : 'nomore'" /></view>

pages/market/order/order.vue

@@ -25,7 +25,7 @@
 					<view class="productName omit">{{ item.goodsNames }}</view>
 					<view class="desc omit">
 						<text>重量 {{ item.totalWeight }}{{ item.goodsUnit }}</text>
-						<text>{{ item.tradeAreaName }}</text>
+						<text>{{ item.veNo }}</text>
 					</view>
 					<view class="price">¥ {{ item.totalPrice }}</view>
 				</view>
@@ -33,16 +33,17 @@
 				<view class="op">
 					<view class="date">{{ item.createTime }}</view>
 					<!-- <template v-if="item.finishStatus == 1 && item.upStatus != 2"> -->
-					<template>
-						<view v-if="user.bindShop==2" class="an down_btn" style="background-color: #3c9cff;color: white;" @click.stop="resale(item)">上架
+					<template v-if="item.finishStatus == 1 && item.upStatus != 2">
+						<view v-if="user.bindShop==2" class="an down_btn"
+							style="background-color: #3c9cff;color: white;" @click.stop="resale(item)">上架
 						</view>
 						<view v-else class="an">请联系互助社绑定商铺
 						</view>
 					</template>
 
 					<!-- <template v-if="item.resaleStatus == 0 && item.beingOrder == 0&& item.upStatus == 2"> -->
-					<template v-if="item.resaleStatus == 0 && item.beingOrder == 0&& item.upStatus == 2">
-						<view class="an down_btn"  @click.stop="downOrder(item)">下架</view>
+					<template v-if="item.resaleStatus == 0 && item.beingOrder == 0&& item.upStatus == 2&&item.finishStatus==1">
+						<view class="an down_btn" @click.stop="downOrder(item)">下架</view>
 					</template>
 				</view>
 			</view>
@@ -62,7 +63,7 @@
 						peopleConfirmStatus: '', //边民确认状态
 						cooperEntrustStatus: '', //互助委托申报确认状态
 						applyConfirmStatus: '', //进口申报确认状态
-						finishStatus: '', //订单完成状态
+						finishStatus: 1, //订单完成状态
 						resaleStatus: '' //订单转售状态
 					},
 					{
@@ -86,7 +87,8 @@
 				],
 				param: {
 					pageNo: 1,
-					pageSize: 10
+					pageSize: 10,
+					finishStatus:1
 				},
 				list: [],
 				loadMore: true,