Prechádzať zdrojové kódy

Merge remote-tracking branch 'origin/master'

颜琼丽 9 hodín pred
rodič
commit
a8817efd84

+ 1 - 1
jd-logistics-ui-v3/src/views/logistics/monthSummary/costList.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParamsCost" ref="queryCostRef" :inline="true" v-show="showSearch" label-width="100px">
+    <el-form :model="queryParamsCost" ref="queryCostRef" :inline="true" label-width="100px">
       <el-form-item label="运单号" prop="externalWaybillNo">
         <el-input
             v-model="queryParamsCost.externalWaybillNo"

+ 6 - 58
jd_logistics-app/pages/order/components/OrderFeesInfo.vue

@@ -1,15 +1,11 @@
 <template>
 	<view class="info-card">
-		<!-- <view class="card-header">
-			<image src="/static/images/verification/icon-fee.png"></image>
-			<text class="card-title">费用信息</text>
-		</view> -->
 		<view class="card-body">
-			<view class="info-row">
-				<text class="info-label">代收货款:</text>
-				<text class="info-value price">¥{{orderDetail.amount}}</text>
+			<view class="info-row" v-for="(item,index) in orderDetail" :key="index">
+				<text class="info-label">{{ item.feeName }}:</text>
+				<text class="info-value price">¥{{item.rateAmount}}</text>
 			</view>
-			<view class="info-row">
+			<!-- <view class="info-row">
 				<text class="info-label">保价{{orderDetail.platformShopCommissionPercent}}%:</text>
 				<text class="info-value">{{orderDetail.platformServiceFee}}</text>
 			</view>
@@ -32,7 +28,7 @@
 			<view class="info-row">
 				<text class="info-label">指定签收:</text>
 				<text class="info-value">{{orderDetail.actualIncomeAmount}}</text>
-			</view>
+			</view> -->
 		</view>
 	</view>
 
@@ -53,35 +49,7 @@
 		},
 		orderDetail: {
 			type: Object,
-			default: () => ({
-				dispatchInfo: null,
-				platformServiceFee:0, //平台服务费
-				memberPromotionFee:0, //会员推广费
-				actualIncomeAmount:0, //实际收入金额
-				goodsCommission: null,
-				goodsInfo: {},
-				grabInfo: {},
-				id: 22,
-				orderCreateTime: "2025-11-19 15:20:18",
-				refundReason: null,
-				serviceProviderInfo: null,
-				serviceTaskInfo: {},
-				shopConfirmStatus: null,
-				shopDesc: null,
-				shopDispatchVerifyStatus: "3",
-				shopEvaluateStatus: "1",
-				shopGoodsId: 10,
-				shopOrderAmount: 101,
-				shopOrderId: "6234567",
-				shopOrderNum: 1,
-				shopOrderStatus: "5",
-				shopPrice: 101,
-				shopRefundReviewStatus: null,
-				shopServiceStatus: "2",
-				shopUserTime: null,
-				userId: "",
-				platformShopCommissionPercent:'5'
-			})
+			default: () => ([])
 		}
 	})
 
@@ -127,26 +95,6 @@
 		overflow: hidden;
 		padding: 20rpx;
 		margin-bottom: 20rpx;
-		.card-header {
-			display: flex;
-			align-items: center;
-
-			image {
-				width: 35rpx;
-				height: 35rpx;
-			}
-
-			.card-title {
-				height: 48rpx;
-				line-height: 48rpx;
-				font-weight: 400;
-				font-size: 32rpx;
-				font-weight: bold;
-				color: #333;
-				margin-left: 10rpx;
-			}
-		}
-
 	}
 
 	.info-row {

+ 1 - 5
jd_logistics-app/pages/order/order_detail.vue

@@ -30,11 +30,7 @@
 			<OrderInfo :order-detail="orderInfo"></OrderInfo>
 
 			<view class="action-title">费用信息</view>
-			<view class="" v-for="(item,index) in details.feeList" :key="index">
-				<OrderFeesInfo :order-detail="item" />
-			</view>
-			
-
+			<OrderFeesInfo :order-detail="details.feeList" />
 		</view>
 	</view>
 </template>