From 3b248c09340777caba6e5f0fb5471ead1dbe167b Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期五, 13 九月 2024 19:09:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'remote-v2/master-2.0' into master-2.0
---
sub_pages/supplier/order-manage/order-manage-settlement-op-detail.vue | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/sub_pages/supplier/order-manage/order-manage-settlement-op-detail.vue b/sub_pages/supplier/order-manage/order-manage-settlement-op-detail.vue
index 47c3886..55feea7 100644
--- a/sub_pages/supplier/order-manage/order-manage-settlement-op-detail.vue
+++ b/sub_pages/supplier/order-manage/order-manage-settlement-op-detail.vue
@@ -7,12 +7,18 @@
},
orderItemId: '',
op: '',
-
+ opStr:''
};
},
async onLoad(options) {
this.orderItemId = options.orderItemId || ''
this.op = options.op || ''
+ this.opStr = options.opStr || ''
+ if (this.opStr) {
+ uni.setNavigationBarTitle({
+ title: opStr
+ })
+ }
await this.init()
@@ -56,7 +62,7 @@
<template>
<view class="delivery-detail-page bg-white p20">
<no-data v-if="!dto.id" style="width: 100%;"></no-data>
-
+
<view v-if="dto.id">
<view class="delivery-info p10 flex">
<view class="flex1">
@@ -70,15 +76,16 @@
<view class="name" v-if="dto.targetLevel">降级等级：{{ dto.targetLevelStr || dto.targetLevel || '-'}}
</view>
- <view class="name" v-if="dto.type">处理类型：{{ dto.type || '-'}}</view>
+ <!-- <view class="name" v-if="dto.type">处理类型：{{ dto.type || '-'}}</view> -->
<view class="name">处理数量：{{ dto.num || '-' }}</view>
- <view class="name">扣款金额：{{ dto.deductAmount || '-'}}</view>
+ <view class="name">扣款金额：￥{{ dto.deductAmount || '-'}}</view>
</view>
</view>
</view>
+ <!-- #ifndef PUB_CUSTOMER -->
<view class="p10" style="margin-top: 0rpx;padding-top: 0rpx;" v-if="dto.pictureList&&dto.pictureList.length>0">
<view class="line-gray"></view>
@@ -92,6 +99,8 @@
</view>
</view>
</view>
+ <!-- #endif -->
+
</view>
</view>
--
Gitblit v1.9.3