From 40ba4c8f015f9d1d259357990b163a64587eb6fd Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期六, 25 五月 2024 16:39:58 +0800
Subject: [PATCH] Merge branch 'standard1' of http://47.97.1.152:5880/r/wms_app into standard1
---
pages/mat/matSelected.vue | 7 ++++---
manifest.json | 2 +-
pages/mat/matQuery.vue | 2 +-
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/manifest.json b/manifest.json
index b67a802..0120ced 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
"name" : "涓壃WMS",
"appid" : "__UNI__DA5854D",
"description" : "",
- "versionName" : "2023063001",
+ "versionName" : "2024031401",
"versionCode" : "100",
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
diff --git a/pages/mat/matQuery.vue b/pages/mat/matQuery.vue
index c8316fb..127b892 100644
--- a/pages/mat/matQuery.vue
+++ b/pages/mat/matQuery.vue
@@ -229,11 +229,11 @@
padding: 4rpx 12rpx;
}
.tag-item {
- width: 100%;
min-height: 60rpx;
line-height: 2;
padding-left: 50rpx;
color: #606266;
font-size: 14px;
+ word-wrap: break-word;
}
</style>
\ No newline at end of file
diff --git a/pages/mat/matSelected.vue b/pages/mat/matSelected.vue
index a0d2b69..6cbc97a 100644
--- a/pages/mat/matSelected.vue
+++ b/pages/mat/matSelected.vue
@@ -7,7 +7,7 @@
</view>
<view class="form-item">
<view class="form-item-desc"><text>鍟嗗搧鍚嶇О</text></view>
- <view class="form-item-content"><text>{{mat.maktx}}</text></view>
+ <view class="form-item-content"><text style="word-wrap:break-word">{{mat.maktx}}</text></view>
</view>
<view class="form-item">
<view class="form-item-desc"><text>瑙勬牸</text></view>
@@ -101,12 +101,13 @@
box-shadow: 0px 0px 50px 0px rgba(0,0,0,0.2) ;
}
.form-item {
- height: 100rpx;
- line-height: 100rpx;
+ min-height: 100rpx;
+ line-height: 1.3;
border-bottom: 1px solid #DCDFE6;
margin-left: 40rpx;
display: flex;
align-items: center;
+ word-wrap: break-word;
}
.form-item-desc {
width: 30%;
--
Gitblit v1.9.1