shish 1 час назад
Родитель
Сommit
aab4c4d6fd
2 измененных файлов с 29 добавлено и 27 удалено
  1. 2 2
      ghsApp/src/admin/home/components/OrderItem.vue
  2. 27 25
      ghsApp/src/pagesOrder/detail.vue

+ 2 - 2
ghsApp/src/admin/home/components/OrderItem.vue

@@ -1026,9 +1026,9 @@ export default {
 .forward-tag {
   text-align: center;
   color: #ff2842;
-  font-size: 44upx;
+  font-size: 40upx;
   font-weight: bold;
-  padding: 24upx 0;
+  padding: 10upx 0;
 }
 .order-list_info {
   padding: 10upx 30upx 30upx;

+ 27 - 25
ghsApp/src/pagesOrder/detail.vue

@@ -199,7 +199,7 @@
 					<view>订单状态:</view>
 					<view>{{ detailInfo.status==1?'待付款':detailInfo.status==2?'待发货':detailInfo.status==3?'配送中':detailInfo.status==4?'已完成':detailInfo.status==5?'已取消':'已退款' }}</view>
 
-					<view class="price" style="font-weight:normal;">
+					<view class="price" style="font-weight:normal;" v-if="Number(detailInfo.forward)==0">
 						<block v-if="detailInfo.status == 2 && detailInfo.book == 0">
 							<button class="admin-button-com bule" @click.stop="directFh(detailInfo)">发货</button>
 							<button class="admin-button-com bule" style="margin-left:30upx;" @click.stop="fillNoFh(detailInfo)">物流单发货</button>
@@ -258,24 +258,26 @@
 			<view class="flex-space title">
 				商品信息
 				<text style="font-weight:normal;font-size:26upx;color:green;max-width:190upx;overflow: hidden;white-space:nowrap;">{{ detailInfo.customName||'' }}</text>
-				<view class="flex" style="color: #3385ff;font-weight: 400" v-if="(detailInfo.status == 3 || detailInfo.status == 2) && detailInfo.book == 0">
-					<button class="admin-button-com bule middle" @click.stop="confirmReach(detailInfo,0)">确认送达</button>
-				</view>
-				<view v-else class="flex">
-					<button disabled="true" class="admin-button-com bule active middle" style="border:1rpx solid #ccc;">确认送达</button>
-				</view>
+				<block v-if="Number(detailInfo.forward)==0">
+					<view class="flex" style="color: #3385ff;font-weight: 400" v-if="(detailInfo.status == 3 || detailInfo.status == 2) && detailInfo.book == 0">
+						<button class="admin-button-com bule middle" @click.stop="confirmReach(detailInfo,0)">确认送达</button>
+					</view>
+					<view v-else class="flex">
+						<button disabled="true" class="admin-button-com bule active middle" style="border:1rpx solid #ccc;">确认送达</button>
+					</view>
 
-				<view class="flex" style="color: #3385ff;" v-if="detailInfo.status == 4">
-					<button class="admin-button-com bule middle" @click.stop="goRefund()">发起售后</button>
-				</view>
-				<view v-else class="flex">
-					<block v-if="detailInfo.status == 1 || detailInfo.status == 5">
-						<button disabled="true" class="admin-button-com bule active middle" style="border:1rpx solid #ccc;">发起售后</button>
-					</block>
-					<block v-else>
-						<button class="admin-button-com bule middle" @click.stop="readyGoRefund(detailInfo)">发起售后</button>
-					</block>
-				</view>
+					<view class="flex" style="color: #3385ff;" v-if="detailInfo.status == 4">
+						<button class="admin-button-com bule middle" @click.stop="goRefund()">发起售后</button>
+					</view>
+					<view v-else class="flex">
+						<block v-if="detailInfo.status == 1 || detailInfo.status == 5">
+							<button disabled="true" class="admin-button-com bule active middle" style="border:1rpx solid #ccc;">发起售后</button>
+						</block>
+						<block v-else>
+							<button class="admin-button-com bule middle" @click.stop="readyGoRefund(detailInfo)">发起售后</button>
+						</block>
+					</view>
+				</block>
 			</view>
 			<view class="module-com content-box">
 				<view class="commodity-view">
@@ -416,13 +418,13 @@
 						<div class="detail-price_box" style="font-size: 34upx;color:#3385FF;">¥{{ parseFloat(detailInfo.realPrice)}}</div>
 					</tui-list-cell>
 
-				<block v-if="detailInfo.staffFinance==1">
-					<tui-list-cell class="line-cell" :hover="false" @click="toggleFinanceInfo">
-						<div class="tui-title">查看财务</div>
-						<div v-if="showFinanceInfo" class="detail-price_box" style="font-weight:normal;font-size:30upx;">成本¥{{ detailInfo.remainCost?parseFloat(detailInfo.remainCost):0 }} 利润¥{{ detailInfo.profit?parseFloat(detailInfo.profit):0 }}</div>
-						<div v-else class="detail-price_box" style="color:#ada8a8;font-size:30upx;font-weight:normal;">点击查看</div>
-					</tui-list-cell>
-				</block>
+					<block v-if="Number(detailInfo.forward)==0 && detailInfo.staffFinance==1">
+						<tui-list-cell class="line-cell" :hover="false" @click="toggleFinanceInfo">
+							<div class="tui-title">查看财务</div>
+							<div v-if="showFinanceInfo" class="detail-price_box" style="font-weight:normal;font-size:30upx;">成本¥{{ detailInfo.remainCost?parseFloat(detailInfo.remainCost):0 }} 利润¥{{ detailInfo.profit?parseFloat(detailInfo.profit):0 }}</div>
+							<div v-else class="detail-price_box" style="color:#ada8a8;font-size:30upx;font-weight:normal;">点击查看</div>
+						</tui-list-cell>
+					</block>
 
 				</div>
 			</view>