face

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 ip = 'http://hs-server.tbgjhc.top:8018';
 const ngip = 'http://hs.tbgjhc.top:7010'
-// const ip = 'http:///127.0.0.1:8080'; //线下
+const ip = 'http:///192.168.3.15:8080'; //线下
 
 /**
  * 封装的http请求

pages/face/faceRegister.nvue

@@ -47,6 +47,9 @@
 				});
 			},
 			registerFace(img) {
+				if(!img){
+					return;
+				}
 				const that = this;
 				uni.uploadFile({
 					url: http.ip + '/sp-admin/app/AppUser/face',
@@ -64,7 +67,6 @@
 							that.release();
 							uni.showToast({title: this.type==1?'录入成功':'验证成功'});
 							let user=uni.getStorageSync('info');
-							console.log(user);
 							user.face=1;
 							uni.setStorageSync('info',user)
 							setTimeout(()=>{
@@ -79,7 +81,7 @@
 							})
 							setTimeout(function() {
 								that.takePicture();
-							}, 600);
+							}, 800);
 						}
 
 					}

pages/index/index.vue

@@ -128,7 +128,7 @@
 		},
 		onShow() {
 			this.getOrderConfirm();
-			//this.checkFace()
+			this.checkFace()
 			this.keyword = '';
 			this.getRead();
 		},
@@ -137,7 +137,7 @@
 				this.show = false;
 			},
 			checkFace() {
-				let user = this.getUser();
+				let user = this.getUser();  
 				if ((user.userType == 1 || user.userType == 2) && user.face == 0) {
 					this.faceRegister = true;
 					return;

pages/login/login.vue

@@ -36,7 +36,7 @@ export default {
 	data() {
 		return {
 			show: true,
-			item: {phone:'13658831034',password:'123456',checked:[]}
+			item: {phone:'',password:'',checked:[]}
 		};
 	},
 	onLoad() {

pages/market/one/leader/order.vue

@@ -51,8 +51,10 @@
 					<template
 						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 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.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 == 1 && item.beingOrder == 0">
 						<view class="an" style="color: #f44336"  @click.stop="updateResalePrice(item.id)">修改转售价格</view>
@@ -185,7 +187,7 @@
 					success: res => {
 						this.loadMore = parseInt(res.data.pageCount) > this.param.pageNo;
 						if (res.data.data) {
-							this.list=res.data.data;
+							this.list = res.data.data;
 							console.log("---1---=" + this.list[0].finishStatus)
 							console.log("---2---=" + this.list[0].resaleStatus)
 						}
@@ -259,10 +261,11 @@
 </script>
 
 <style lang="scss">
-page {
-	background-color: $pg;
-}
-.state{
-	margin-right: -70px;
-}
-</style>
+	page {
+		background-color: $pg;
+	}
+
+	.state {
+		margin-right: -70px;
+	}
+</style>