From f8867b8df117d1ac0f1311970994e15059c3da03 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期四, 05 九月 2024 15:57:36 +0800
Subject: [PATCH] add 兼容扫码问题
---
sub_pages/partner/markup-config/markup-config.vue | 85 +++++++++++++++++++++++-------------------
1 files changed, 47 insertions(+), 38 deletions(-)
diff --git a/sub_pages/partner/markup-config/markup-config.vue b/sub_pages/partner/markup-config/markup-config.vue
index d34bb16..f77f8fa 100644
--- a/sub_pages/partner/markup-config/markup-config.vue
+++ b/sub_pages/partner/markup-config/markup-config.vue
@@ -22,48 +22,57 @@
<view class="title">
商品名称：{{ item.name || '-' }}
</view>
- <u-divider></u-divider>
+ <u-divider style="margin-top: 20rpx;padding-top: 20rpx;"></u-divider>
<view class="form">
- <view class="form-item">
- <view class="form-item-label">分类</view>
- <view class="form-item-value">{{ item.categoryStr || '-' }}</view>
+ <view class="flex">
+ <view class="form-item">
+ <view class="form-item-label">分类</view>
+ <view class="form-item-value">{{ item.categoryStr || '-' }}</view>
+ </view>
+ <view class="form-item">
+ <view class="form-item-label">规格</view>
+ <view class="form-item-value">{{ item.unit || '-' }}</view>
+ </view>
</view>
- <view class="form-item">
- <view class="form-item-label">规格</view>
- <view class="form-item-value">{{ item.unit || '-' }}</view>
+ <view class="flex">
+ <view class="form-item">
+ <view class="form-item-label">规格</view>
+ <view class="form-item-value">{{ item.unit || '-' }}</view>
+ </view>
+ <view class="form-item">
+ <view class="form-item-label">重量</view>
+ <view class="form-item-value">{{ item.weight || '-' }}</view>
+ </view>
</view>
- <view class="form-item">
- <view class="form-item-label">规格</view>
- <view class="form-item-value">{{ item.unit || '-' }}</view>
+ <view class="flex">
+ <view class="form-item">
+ <view class="form-item-label">颜色</view>
+ <view class="form-item-value">{{ item.color || '-' }}</view>
+ </view>
+ <view class="form-item">
+ <view class="form-item-label">级别</view>
+ <view class="form-item-value">{{ item.levelStr || '-' }}</view>
+ </view>
</view>
- <view class="form-item">
- <view class="form-item-label">重量</view>
- <view class="form-item-value">{{ item.weight || '-' }}</view>
- </view>
- <view class="form-item">
- <view class="form-item-label">颜色</view>
- <view class="form-item-value">{{ item.color || '-' }}</view>
- </view>
- <view class="form-item">
- <view class="form-item-label">级别</view>
- <view class="form-item-value">{{ item.levelStr || '-' }}</view>
- </view>
- <view class="form-item">
- <view class="form-item-label">供应商价格</view>
- <view class="form-item-value">￥{{ item.price || '-' }}</view>
- </view>
- <view class="form-item">
- <view class="form-item-label">加价金额</view>
- <view class="form-item-value">{{ item.fee || '-' }}</view>
+ <view class="flex">
+ <view class="form-item">
+ <view class="form-item-label">供应商价格</view>
+ <view class="form-item-value">￥{{ item.price || '-' }}</view>
+ </view>
+ <view class="form-item">
+ <view class="form-item-label">加价金额</view>
+ <view class="form-item-value">{{ item.fee || '-' }}</view>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="form-item-label">供应商名称</view>
+ <view class="form-item-value">{{ item.supplierName || '-' }}</view>
</view>
<view class="form-item">
<view class="form-item-label">审核时间</view>
<view class="form-item-value">{{ item.auditTime || '-' }}</view>
</view>
- <view class="form-item">
- <view class="form-item-label">供应商名称</view>
- <view class="form-item-value">{{ item.supplierName || '-' }}</view>
- </view>
+
</view>
</view>
</view>
@@ -97,7 +106,6 @@
},
onReachBottom() {
- this.page.current += 1
this.getMore()
},
async onPullDownRefresh() {
@@ -204,8 +212,8 @@
}
.form {
- display: flex;
- flex-wrap: wrap;
+ // display: flex;
+ // flex-wrap: wrap;
.form-item {
height: 40rpx;
@@ -213,8 +221,9 @@
// padding-top: 4rpx;
padding-bottom: 0rpx;
border-bottom: none;
- min-width: 35%;
- max-width: 50%;
+ min-width: unset;
+ max-width: unset;
+ display: flex;
flex: 1;
.form-item-label {}
--
Gitblit v1.9.3