Merge branch 'test' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test

pagesOrder/pay-order/pay-order.vue

@@ -186,6 +186,7 @@
 			tableId: order.tableId,
 			masterId: order.masterId,
 			vipUserId: user.value.id ? user.value.id : '',
+			orderId:order.id,
 			type: user.value.id ? 0 : 1 //0 设置 1 取消
 		}
 		Object.assign(submitPar, par)
@@ -201,6 +202,7 @@
 			 }).then(res=>{
 				 user.value = data
 				 order.memberId=data.id
+				 init()
 			 })
 		})
 	}