机构

components/cm-module/orderDetails/orderButton.vue

@@ -2,6 +2,7 @@
 	<view class="button-template" :style="{paddingBottom :isIphoneX ? '68rpx' : '0rpx'}">
 		<!-- 底部按钮 -->
 		<view class="button-content">
+			<view class="btn btn-payment" v-if="order.affirmPaymentFlag=='00'" @click.stop="btnConfirm('payment',order)">确认打款<text>供应商</text></view>
 			<view class="btn btn-pay" v-if="btnState.isPay" @click.stop="btnConfirm('pay',order)">付款</view>
 			<view class="btn btn-share" @click.stop="onShareCode">
 				<view class="tips" v-if="shareCode">分享码：{{shareCode}}</view>
@@ -145,6 +146,17 @@
 				float: right;
 				border: 2rpx solid #999999;
 				border-radius: 32rpx;
+				&.btn-payment{
+					line-height: 38rpx;
+					font-size: 24rpx;
+					background: #f9a94b;
+					color: #fff;
+					border: 2rpx solid #f9a94b;
+					text{
+						display: block;
+						line-height: 15rpx;
+					}
+				}
 			}
 			.btn-color{
 				background: $btn-confirm;

components/cm-module/orderDetails/orderListButton.vue

@@ -2,7 +2,7 @@
 	<view class="button-template">
 		<!-- 底部按钮 -->
 		<view class="button-content">
-			<view class="btn btn-payment" v-if="order.affirmPaymentFlag=='0'" @click.stop="btnConfirm('payment',order)">确认打款<text>供应商</text></view>
+			<view class="btn btn-payment" v-if="order.affirmPaymentFlag=='00'" @click.stop="btnConfirm('payment',order)">确认打款<text>供应商</text></view>
 			<view class="btn btn-pay" v-if="btnState.isPay" @click.stop="btnConfirm('pay',order)">付款</view>
 			<view class="btn btn-share"  @click.stop="onShareCode(order.orderID)">分享订单</view>
 			<view class="btn btn-confirm" v-if="btnState.isConfirmation" @click.stop="btnConfirm('confirmation',order)">确认订单</view>

pages/user/order/order-details.vue

@@ -218,6 +218,9 @@
 					case 'confirmation':
 						this.handOrderConfirmation()
 						break
+					case 'payment':
+						this.hanldConfirmFn(data.orderId);
+						break	
 				}
 			},
 			getOrderPaymentValidation(data){//监听根据付款状态做操作
@@ -271,6 +274,18 @@
 					this.$api.navigateTo(`/pages/user/order/order-payment?type=payfirm&orderID=${data.orderId}`)
 				}
 			},
+			hanldConfirmFn (orderId){//确认打款供应商
+				this.$util.modal('提示','确定委托采美平台打款给供应商吗？确定之前请务必确保货品完好？','确定','取消',true,() =>{
+					this.OrderService.confirmpayment({orderID:orderId,userId:this.userID}).then(response =>{
+						this.$util.msg('确认成功',2000,true,'success');
+						setTimeout(() => {
+							this.getOrderDatainit(this.currentTab)
+						},2000)
+					}).catch(error =>{
+						this.$util.msg(error.msg,2000)
+					})
+				})
+			},
 			handOrderConfirm(){//确认收货
 				this.$util.modal('提示','是否确认收货','确定','取消',true,() =>{
 					confirmReceipt({orderID:this.orderID}).then(response =>{

seller/pages/order/order-details.vue

@@ -5,10 +5,10 @@
 		<view class="container-details" :style="{paddingTop:navbarHeight+'px'}">
 			<!-- 地址选择 -->
 			<order-address ref="orderAddress" v-if="isRequest" :addressData="addressData"></order-address>
-			<!-- 订单信息 -->
-			<order-information ref="information" v-if="isRequest" :information="information"></order-information>
 			<!-- 商品 -->
 			<goods-list ref='goods' v-if="isRequest" :shopOrderData="shopOrderData" @popupClick="hanldePopupFn"></goods-list>
+			<!-- 订单信息 -->
+			<order-information ref="information" v-if="isRequest" :information="information"></order-information>
 			<!-- 发票信息 -->
 			<invoice-tent ref="invoice" v-if="isRequest" :orderInvoice="orderInvoice"></invoice-tent>
 			<!-- 转账信息 -->