From e8d258576a34f35cfefbd6bfe07b7f22e72d87d4 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期三, 11 九月 2024 10:42:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/v2' into v2
---
sub_pages/partner/delivery/delivery-detail.vue | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/sub_pages/partner/delivery/delivery-detail.vue b/sub_pages/partner/delivery/delivery-detail.vue
index 2dfefd8..77cf96a 100644
--- a/sub_pages/partner/delivery/delivery-detail.vue
+++ b/sub_pages/partner/delivery/delivery-detail.vue
@@ -52,7 +52,8 @@
},
async onLoad(options) {
this.id = options.id || ''
-
+ // this.form.status='reduce'
+ // this.$refs.popup_form.open()
this.$http.request('get', '/api/code/value', {
params: {
type: 'FLOWER_LEVEL'
@@ -164,7 +165,7 @@
}
if (this.form.deductAmount) {
if ((parseInt(this.form.deductAmount * 100) / 100) != this.form.deductAmount) {
- this.$message.showToast('扣款金额至多2位小数')
+ this.$message.showToast('扣款金额最多2位小数字')
return
}
}
@@ -338,17 +339,17 @@
</view>
<view class="each-item">
- <view class="label">降级</view>
- <view class="value">{{ item.reduceNum || 0 }}</view>
+ <view class="label-color">降级</view>
+ <view class="value-color">{{ item.reduceNum || 0 }}</view>
</view>
<view class="each-item">
- <view class="label">缺货</view>
- <view class="value">{{ item.lackNum || 0 }}</view>
+ <view class="label-color">缺货</view>
+ <view class="value-color">{{ item.lackNum || 0 }}</view>
</view>
<view class="each-item">
- <view class="label">补货</view>
- <view class="value">{{ item.replaceNum || 0 }}</view>
+ <view class="label-color">补货</view>
+ <view class="value-color">{{ item.replaceNum || 0 }}</view>
</view>
</view>
@@ -369,6 +370,7 @@
<view class="button button-0 " @click="printDeliveryOrder(item)">打印</view>
</view>
</view>
+
</view>
<uni-popup ref="popup_form" type="top" :mask-click="false">
@@ -529,6 +531,19 @@
font-size: 24rpx;
color: #666666;
}
+
+ .label-color {
+ font-weight: 400;
+ font-size: 24rpx;
+ color: #FD191C;
+ text-align: left;
+ padding-right: 10rpx;
+ }
+ .value-color {
+ font-weight: 400;
+ font-size: 24rpx;
+ color: #FD191C;
+ }
}
}
}
--
Gitblit v1.9.3