From 0abe6ac3b77cd414e860df4979aa06c62c3e6143 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期五, 06 九月 2024 19:06:46 +0800
Subject: [PATCH] 1、【花满芫小程序项目】 小程序-花店：申请售后-售后理由字段布局调整，字数过多显示会跨行 2、【花满芫小程序项目】 管理端-合伙人：质检详情-降级、缺货、补货高亮显示 3、【花满芫小程序项目】 小程序-花店：浏览记录-浏览记录默认状态按照时间倒序排列 因为目前只显示10条记录，不按时间顺序的话最新的浏览记录就不会被看到； 4、【花满芫小程序项目】 小程序-合伙人：合伙人审核-1.已经审核通过后，现在还可以再次提交审核，不合逻辑。 2.审核后的不通过原因，需要显示在小程序端；
---
pages/order/order-sale/order-sale.vue | 3 +
sub_pages/supplier/supplier-info/supplier-info.vue | 2
sub_pages/customer/self/history.vue | 7 +++
sub_pages/partner/delivery/delivery-detail.vue | 25 +++++++++---
pages/order/order-sale/order-sale-detail.vue | 1
sub_pages/partner/partner-info/partner-info.vue | 25 +++++++++++-
6 files changed, 54 insertions(+), 9 deletions(-)
diff --git a/pages/order/order-sale/order-sale-detail.vue b/pages/order/order-sale/order-sale-detail.vue
index 9bd5274..7287905 100644
--- a/pages/order/order-sale/order-sale-detail.vue
+++ b/pages/order/order-sale/order-sale-detail.vue
@@ -134,6 +134,7 @@
</view>
+fv
<view class="info-container bg-white br-4">
<view class="form-item">
diff --git a/pages/order/order-sale/order-sale.vue b/pages/order/order-sale/order-sale.vue
index 5f133bb..8a1a58a 100644
--- a/pages/order/order-sale/order-sale.vue
+++ b/pages/order/order-sale/order-sale.vue
@@ -214,6 +214,8 @@
.label {
font-weight: 400;
color: #666666;
+ min-width: 140rpx;
+ // margin-right: 20rpx;
}
.label::after {
@@ -225,6 +227,7 @@
.value {
font-weight: 400;
color: #000000;
+ word-break: break-all;
}
.value.red {
diff --git a/sub_pages/customer/self/history.vue b/sub_pages/customer/self/history.vue
index 0c60b89..1664760 100644
--- a/sub_pages/customer/self/history.vue
+++ b/sub_pages/customer/self/history.vue
@@ -55,6 +55,13 @@
})
})
},
+ onShow() {
+ // 页面显示时重新加载浏览记录数据
+ this.listApi = '/api/browse/history/list'
+ this.page.size =30
+ this.getList()
+ },
+
methods: {
async deleteExpired() {
diff --git a/sub_pages/partner/delivery/delivery-detail.vue b/sub_pages/partner/delivery/delivery-detail.vue
index 962cad0..c5aa2d6 100644
--- a/sub_pages/partner/delivery/delivery-detail.vue
+++ b/sub_pages/partner/delivery/delivery-detail.vue
@@ -339,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>
@@ -530,6 +530,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;
+ }
}
}
}
diff --git a/sub_pages/partner/partner-info/partner-info.vue b/sub_pages/partner/partner-info/partner-info.vue
index c816e67..0227bdc 100644
--- a/sub_pages/partner/partner-info/partner-info.vue
+++ b/sub_pages/partner/partner-info/partner-info.vue
@@ -66,11 +66,12 @@
<view class="label required">上传身份证正反面</view>
<view class="m-l-a m-r-0 flex">
<view class="component-button-upload">
-
+
</view>
</view>
</view>
+
<view class="flex p20" style="padding-top: 0rpx;padding-bottom: 10rpx"
v-if="dto.idCards&&dto.idCards.length>0">
@@ -81,12 +82,26 @@
<view class="t-red text-center" @click.stop="deleteImg('idCards',index)">删除</view>
</view>
</view>
+
+ <view class="form-item m-t-20" v-if="dto.status&&dto.status=='R' ">
+ <view class="label required" >不通过原因</view>
+ </view>
+ <view class="form-item m-t-20" v-if="dto.status&&dto.status=='R' ">
+ <view class="reject-reason">
+ {{dto.rejectReason}}
+ </view>
+ </view>
- <view class="button-green-1 m-t-20 button-fixed-bottom before-line " @click="submit">
+ <view class="button-green-1 m-t-20 button-fixed-bottom before-line " @click="submit" v-if="dto.status&&dto.status!='P' " >
{{source==='step'?'下一步':'提交审核'}}
</view>
+
+ <view class="button-green-1 m-t-20 button-fixed-bottom before-line " style="font-size: 22rpx;" v-if="dto.status&&dto.status=='P' " >
+ 审核已通过
+ </view>
+
</view>
@@ -507,4 +522,10 @@
color: #F56c6c;
background-color: rgb(254, 243, 243);
}
+
+ .reject-reason{
+ word-wrap: break-word; /* 遇到长单词时强制换行 */
+ word-break: break-all; /* 长单词会在任意位置换行 */
+ white-space: normal; /* 允许换行 */
+ }
</style>
\ No newline at end of file
diff --git a/sub_pages/supplier/supplier-info/supplier-info.vue b/sub_pages/supplier/supplier-info/supplier-info.vue
index e04c51f..0648603 100644
--- a/sub_pages/supplier/supplier-info/supplier-info.vue
+++ b/sub_pages/supplier/supplier-info/supplier-info.vue
@@ -180,7 +180,7 @@
<view class="button-green-1 m-t-20 button-fixed-bottom before-line " style="font-size: 22rpx;"
v-if="currentInfo.supplierDTO&¤tInfo.supplierDTO.status==='P'">
- 审核已通过,部分信息请前往个人资料修改
+ 审核已通过
</view>
<view class="button-green-1 m-t-20 button-fixed-bottom before-line " v-else @click="submit">
--
Gitblit v1.9.3