heyang 2 lat temu
rodzic
commit
7e5f409736
2 zmienionych plików z 20 dodań i 13 usunięć
  1. 2 2
      api/request/config.js
  2. 18 11
      pages/fingerprint.vue

+ 2 - 2
api/request/config.js

@@ -1,6 +1,6 @@
 const config = {
 	//base_url: 'http://192.168.1.9:8080',//柴
-	 base_url: 'http://192.168.1.7:8080',//刘波
+	 //base_url: 'http://192.168.1.7:8080',//刘波
 	// base_url: 'http://192.168.1.17:8080',//周攀
     // base_url: 'http://192.168.1.8:8080',//高升
 	// base_url: 'http://192.168.1.29:8080',//何成
@@ -9,7 +9,7 @@ const config = {
 
 	// base_url: 'https://lab.sxitdlc.com/labNhSystem/',//43服务器高升测试
 	// base_url: 'https://lab.sxitdlc.com/labAppTest/',//43服务器线上
-    //base_url: 'https://lab.sxitdlc.com/appTest/',//88服务器线上
+    base_url: 'https://lab.sxitdlc.com/appTest/',//88服务器线上
 	//base_url: 'https://lab.sxitdlc.com/labSystem/', //矿大地址
 	// base_url: 'https://lab.sxitdlc.com/jdlabSystem/', //交大地址
     // base_url: 'https://lab.sxitdlc.com/jndxlabSystem/', //暨大地址

+ 18 - 11
pages/fingerprint.vue

@@ -2,7 +2,7 @@
 <template>
 	<view id="fingerprint">
 		<view class="fingerprint_one" v-if="pageType==1">
-			<view class="fingerprint_one_li" @click="goPage('add')" v-for="(item,index) in fingerprintList" :key="index">
+			<view class="fingerprint_one_li" @click="goPage(item)" v-for="(item,index) in fingerprintList" :key="index">
 				<view class="fingerprint_one_li_l">{{item.name}}</view>
 				<view :class="item.isConfig?'colorB':'colorA'">{{item.isConfig?'已配置':'无'}}</view>
 				<img  class="fingerprint_one_li_r" src="@/images/icon_04.png">
@@ -80,12 +80,14 @@
 					},
 				],
 				yesUseList:[],
+				fingerNum:null,//第几个指纹
 				
 				
 			}
 		},
 		onLoad() {
 			this.impowerUseList();
+			this.fingerprintClick();
 		},
 		onShow(){
 			
@@ -127,11 +129,17 @@
 		   async fingerprintClick(){
 		   	let _this=this;
 		       const {data} = await fingerprintQueryList(uni.getStorageSync('userId'));
-		   	if(data.code == 200){
-		   		uni.navigateTo({
-		   			url: '/pages/fingerprint',//指纹信息
-		   		});
-		   	}
+				if(data.code == 200){
+					if(data.rows.length>0){
+						_this.fingerprintList.forEach(function(item){
+							data.rows.forEach(function(item2){
+								if(item.num==item2.fingerNum){
+									item.isConfig=true;
+								}
+							})
+						})
+					}
+				}
 		   },
 		   //指纹采集
 		   async fingerprintGtherFun(){
@@ -140,7 +148,7 @@
 			   this.yesUseList.forEach(function(item){
 					  if(item.isCheck){
 						  obj.hardId=item.hardId
-						  obj.num=1
+						  obj.num=_this.fingerNum
 					  }
 			   })
 		       const {data} = await fingerprintGther(obj)
@@ -181,10 +189,9 @@
 				}
 			},
 			//页面跳转
-            goPage(type){
-                if(type == 'add'){//学生卡上传
-                  this.pageType=2;
-				}
+            goPage(d){
+                this.pageType=2;
+				this.fingerNum=d.num;
 			},
 		
 		},