From e1f70a62b31f326a6627d7975b17dd8304af7d90 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 06 十月 2023 16:23:24 +0800
Subject: [PATCH] #
---
pages/api/addMat.js | 31 +++++++++++--------------------
pages/component/demo.vue | 4 +++-
components/z-data-list/z-data-list.vue | 18 +++++++++++-------
3 files changed, 25 insertions(+), 28 deletions(-)
diff --git a/components/z-data-list/z-data-list.vue b/components/z-data-list/z-data-list.vue
index 0c3338c..a3e3aef 100644
--- a/components/z-data-list/z-data-list.vue
+++ b/components/z-data-list/z-data-list.vue
@@ -2,15 +2,16 @@
<view >
<view class="main">
<view class="main-left" >
- <view class="main-list" v-for="it in dataList" >
- <view>{{it.key}}</view>
- <view style="margin-left: 8px;">{{it.value}}</view>
+ <view class="main-list" v-for="it in dataList" style="width: 100%;">
+ <view style="flex: 1;padding-left: 8rpx;">{{it.key}}</view>
+ <view>:</view>
+ <view style="flex: 3;padding-left: 8rpx;">{{it.value}}</view>
</view>
</view>
<view class="main-right" @click="goDetail">
<view class="list-options">
<view class="list-number">1</view>
- <view class="abdb"> > </view>
+ <uni-icons class="opt-icon" type="right" size="20" color="#707070"></uni-icons>
</view>
</view>
</view>
@@ -72,13 +73,15 @@
border-radius: 16rpx;
}
.main-left {
- flex: 4;
+ 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;
@@ -86,6 +89,7 @@
}
.main-list {
display: flex;
+ align-items: center;
}
.list-options {
display: flex;
@@ -96,7 +100,7 @@
right: 10px;
top: 5px;
}
- .abdb {
- flex: 0;
+ .opt-icon {
+ display: flex;
}
</style>
\ No newline at end of file
diff --git a/pages/api/addMat.js b/pages/api/addMat.js
index 46bab97..31055b8 100644
--- a/pages/api/addMat.js
+++ b/pages/api/addMat.js
@@ -1,36 +1,27 @@
async function addMat() {
let that = this,item = {};
- var res = await uni.request({
+ var ress = await uni.request({
url: 'http://127.0.0.1:8089/bfwms/mat/auth',
data: {matnr: '3CPPJ.B.GMB.LZ.QBY4-10/15P316LLZ'},
- }).then((res)=> {
- let mat = res.data.data
+ }).then((result)=> {
+ let mat = result.data.data
item['detl'] = [
{key: '鍟嗗搧鐮�',value: mat.matnr},
{key: '鍟嗗搧鍚嶇О',value: mat.maktx},
{key: '瑙勬牸',value: mat.specs},
{key: '鏁伴噺',value: 100},
]
+ },(res)=>{
+ console.log(res);
})
-
-
- // success(res) {
- // result = res.data.data
- // console.log(result);
- // // res = res.data
- // // let mat = res.data
- // // let item = {}
- // // item['detl'] = [
- // // {key: '鍟嗗搧鐮�',value: mat.matnr},
- // // {key: '鍟嗗搧鍚嶇О',value: mat.maktx},
- // // {key: '瑙勬牸',value: mat.specs},
- // // {key: '鏁伴噺',value: 100},
- // // ]
- // // that.zDataList.push(item)
- // }
return item
}
+function isEmpty(obj) {
+ return typeof obj == "undefined" || obj == null || obj === "";
+}
+
module.exports = {
- addMat: addMat
+ addMat: addMat,
+ isEmpty: isEmpty
}
\ No newline at end of file
diff --git a/pages/component/demo.vue b/pages/component/demo.vue
index 6c11c69..ea8d39d 100644
--- a/pages/component/demo.vue
+++ b/pages/component/demo.vue
@@ -49,7 +49,9 @@
},
async add() {
let mat = await addMat.addMat()
- this.zDataList.push(mat)
+ if (!addMat.isEmpty(mat)) {
+ this.zDataList.push(mat)
+ }
},
focus() {
if (this.zInputList[0].focus) {
--
Gitblit v1.9.1