lilei 7 months ago
parent
commit
860989c789

+ 2 - 2
pagesA/digitalShelf/choosePart.vue

@@ -1028,9 +1028,9 @@
 				.item-tempPart{
 					background: #F44336;
 					color: #fff;
-					border-radius: 1em;
+					border-radius: 6px;
 					font-size: 20rpx;
-					padding: 0 0.5em;
+					padding: 0 5px;
 					display: inline-block;
 					margin-right: 5px;
 				}

+ 1 - 1
pagesB/procureOrder/creatOrder.vue

@@ -389,7 +389,7 @@
 			}
 			.product-price{
 				padding:0 6px;
-				margin-top: 6px;
+				margin: 6px 0;
 				> view{
 					background: #fff;
 					padding: 10px;

+ 3 - 8
pagesB/procureOrder/orderDetail.vue

@@ -225,12 +225,9 @@
 		   uni.setNavigationBarTitle({
 		   	title: '采购订单详情'
 		   })
-		   
 		   // 查明细
-		   if(option.purchaseSn){
-			   this.purchaseSn = option.purchaseSn
-			   this.getDetail()
-		   }
+		   this.purchaseSn = option.purchaseSn
+		   this.getDetail()
 		   // 获取明细列表
 		   this.getDetailList()
 	   },
@@ -251,8 +248,7 @@
 		   },
 		   //是否已付款
 		   isPayOk(){
-			   const item = this.info
-			   return this.hasPay && item.payInfo.payState=='FINISH'
+			   return this.hasPay && this.info.payInfo.payState=='FINISH'
 		   },
 	   },
 	   methods: {
@@ -397,7 +393,6 @@
 		 },
 		 // 再次购买
 		 buyAgain(item){
-		 	 
 		 },
 		 // 确认收货
 		 receiveOrder(item){

+ 1 - 1
pagesB/procureOrder/orderList.vue

@@ -72,7 +72,7 @@
 										 <u-button style="margin-left: 10px;" v-if="item.billStatus == 'WAIT_PAY'" size="mini" shape="round" type="error" plain @click="payOrder(item)">立即支付</u-button>
 										 <!-- <u-button style="margin-left: 10px;" v-if="item.billStatus == 'CANCEL'" size="mini" shape="round" type="error" plain @click="buyAgain(item)">再次购买</u-button> -->
 										 <u-button style="margin-left: 10px;" v-if="item.billStatus == 'WAIT_RECEIVE'" size="mini" shape="round" type="error" plain @click="receiveOrder(item)">确认收货</u-button>
-										 <view v-if="item.billStatus == 'CANCEL'&&item.payInfo">
+										 <view v-if="(item.billStatus == 'CANCEL'||item.billStatus == 'AUDIT_REJECT')&&item.payInfo">
 											<u-tag type="success" size="mini" v-if="item.payInfo.refundState=='FINISH'" mode="plain" text="已退款" shape="square"/>
 											<u-tag type="error" size="mini" v-else text="退款失败" shape="square" mode="plain"/>
 										 </view>