Merge branch 'master' of http://git.dashitech.com/seimin/zy-wechat

pages/specimenPort/detail.vue

@@ -175,10 +175,10 @@
 					barcode:scannerCode,
 					platform:"app"
 				}).then((res) => {
-					let data = res.data[0]
 					this.SMFlag = true
 					uni.hideLoading();
 					if(res.status==200){
+						let data = res.data[0]
 						let item = data.pathologySpecimenDTOList.find(i=>i.specimenCode == scannerCode)
 						if(!item.fixationTime && data.pathologyFormType==0){
 							if(data.status.value==2 || data.status.value==3 ||

pages/specimenPort/scan.vue

@@ -288,10 +288,10 @@
 					delete query.pathologyFormId
 				}
 				post("/pathology/scanCode", query).then((res) => {
-					let data = res.data[0]
 					this.SMFlag = true
 					uni.hideLoading();
 					if(res.status==200){
+						let data = res.data[0]
 						let item = data.pathologySpecimenDTOList.find(i=>i.specimenCode == scannerCode)
 						uni.setStorageSync('pathologyFormId', data.id);
 						if(!item.fixationTime && data.pathologyFormType==0){

pages/specimenPort/specimenPort.vue

@@ -197,7 +197,7 @@
 			},
 			// 查看详情
 			detail(item){
-				// this.padChange('118274209746944\n')
+				// this.padChange('BL2411281642091\n')
 				uni.navigateTo({
 				  url: `/pages/specimenPort/detail?detailId=${item.id}`
 				});
@@ -290,10 +290,10 @@
 					barcode:scannerCode,
 					platform:"app"
 				}).then((res) => {
-					let data = res.data[0]
 					this.SMFlag = true
 					uni.hideLoading();
 					if(res.status==200){
+						let data = res.data[0]
 						let item = data.pathologySpecimenDTOList.find(i=>i.specimenCode == scannerCode)
 						if(!item.fixationTime && data.pathologyFormType==0){
 							if(data.status.value==2 || data.status.value==3 ||