From 8e15159256cd131705aff50b2973bdae52ce6b9b Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 06 十月 2023 17:23:19 +0800
Subject: [PATCH] #
---
pages/common/data-list/dataDetail.vue | 40 ++++++++++++++++++++
pages/api/addMat.js | 5 ++
pages/component/demo.vue | 21 ++++++++--
components/z-data-list/z-data-list.vue | 4 -
4 files changed, 62 insertions(+), 8 deletions(-)
diff --git a/components/z-data-list/z-data-list.vue b/components/z-data-list/z-data-list.vue
index a3e3aef..4ec90a0 100644
--- a/components/z-data-list/z-data-list.vue
+++ b/components/z-data-list/z-data-list.vue
@@ -74,18 +74,16 @@
}
.main-left {
flex: 7;
- background-color: #005500;
display: flex;
flex-direction: column;
padding-top: 8rpx;
padding-bottom: 8rpx;
}
.main-right {
- background-color: #ffaaff;
flex: 1;
display: flex;
align-items: center;
- /* flex-direction: column; */
+ justify-content: center;
}
.main-list {
display: flex;
diff --git a/pages/api/addMat.js b/pages/api/addMat.js
index 31055b8..25bbed2 100644
--- a/pages/api/addMat.js
+++ b/pages/api/addMat.js
@@ -18,7 +18,10 @@
}
function isEmpty(obj) {
- return typeof obj == "undefined" || obj == null || obj === "";
+ if (JSON.stringify(obj) === '{}') {
+ return true
+ }
+ return obj == "undefined" || obj == null || obj === "" || obj == {};
}
module.exports = {
diff --git a/pages/common/data-list/dataDetail.vue b/pages/common/data-list/dataDetail.vue
index 02409e3..4feda4c 100644
--- a/pages/common/data-list/dataDetail.vue
+++ b/pages/common/data-list/dataDetail.vue
@@ -2,6 +2,46 @@
</template>
<script>
+ export default {
+ data() {
+ return {
+ mat: {
+ matnr: null,
+ maktx: null,
+ specs: null,
+ batch: null,
+ orderNo: null,
+ anfme: 0,
+ },
+ baseIP:'',
+ basePORT:'',
+ }
+ },
+ onLoad(option) {
+ let that = this
+ // #ifdef APP-NVUE
+ const eventChannel = this.$scope.eventChannel; // 鍏煎APP-NVUE
+ // #endif
+ // #ifndef APP-NVUE
+ const eventChannel = this.getOpenerEventChannel();
+ // #endif
+
+ // 鐩戝惉acceptDataFromOpenerPage浜嬩欢锛岃幏鍙栦笂涓�椤甸潰閫氳繃eventChannel浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
+ eventChannel.on('mat', function(data) {
+ console.log(data);
+ })
+
+
+ },
+ methods: {
+ back() {
+ this.getOpenerEventChannel().emit('matList', {data: this.mat});
+ uni.navigateBack({
+
+ })
+ }
+ }
+ }
</script>
<style>
diff --git a/pages/component/demo.vue b/pages/component/demo.vue
index ea8d39d..55b9159 100644
--- a/pages/component/demo.vue
+++ b/pages/component/demo.vue
@@ -17,7 +17,7 @@
<hr>
- <z-data-list class="data-list" v-for="it in zDataList" @goDetail='goDetail' :list="it" ></z-data-list>
+ <z-data-list class="data-list" v-for="it in zDataList" @goDetail='goDetail(it.item)' :list="it" ></z-data-list>
<button @click="add">add</button>
@@ -30,7 +30,7 @@
</template>
<script>
- import addMat from '../api/addMat.js'
+ import addMat, { isEmpty } from '../api/addMat.js'
export default {
data() {
return {
@@ -69,9 +69,22 @@
}
},
- goDetail() {
+ goDetail(param) {
+ console.log(param);
uni.navigateTo({
- url: '/pages/common/data-list/dataDetail'
+ url: '/pages/common/data-list/dataDetail',
+ // 浼�
+ success: function(res) {
+ res.eventChannel.emit('mat', {
+ data: param
+ })
+ },
+ // 鎺�
+ events: {
+ matList: function(data) {
+ console.log(data);
+ },
+ },
})
}
}
--
Gitblit v1.9.1