From 02b5b5cf1ae11b8c0cc410dfafe4f129aacd3d0c Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期二, 16 八月 2022 16:27:11 +0800
Subject: [PATCH] Merge branch 'hylywms' of http://47.97.1.152:5880/r/~whycq/wms-app into hylywms

---
 pages/basics/matQuery.vue |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/pages/basics/matQuery.vue b/pages/basics/matQuery.vue
index 8648be5..991cd95 100644
--- a/pages/basics/matQuery.vue
+++ b/pages/basics/matQuery.vue
@@ -15,7 +15,7 @@
 					<view class="text-title">{{matData.specs}}</view>
 				</view>
 				<view class="text-box">
-					<view class="text-title"><text>鎵瑰彿</text></view>
+					<view class="text-title"><text>搴忓垪鍙�</text></view>
 					<view class="text-title"><input type="text" v-model="matData.batch"></view>
 				</view>
 				<view class="text-box">
@@ -60,15 +60,13 @@
 			// #endif
 			
 			// 鐩戝惉acceptDataFromOpenerPage浜嬩欢锛岃幏鍙栦笂涓�椤甸潰閫氳繃eventChannel浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
-			eventChannel.on('acceptDataFromOpenerPage', function(data) {
+			eventChannel.on('matData', function(data) {
 			that.matData = data.data
 			})
 			
 		},
 		onShow() {
 			this.matData.anfme = 0
-			console.log(this.matData)
-			// this.matData = this.matData
 		},
 		methods: {
 			blur() {
@@ -85,7 +83,8 @@
 					uni.showToast({title: '璇疯緭鍏ユ暟閲�', icon: "none", position: 'top'});
 					return;
 				}
-				this.getOpenerEventChannel().emit('acceptDataFromOpenedPage', {data: this.matData});
+				this.getOpenerEventChannel().emit('matList', {data: this.matData});
+				uni.vibrateShort();
 				uni.navigateBack({
 					
 				})

--
Gitblit v1.9.1