代客下单增加用户扫描二维码支付

src/views/tool/Instead/index.vue

@@ -1087,9 +1087,11 @@
       ref="refWxScanCode"
       defaultTips="请使用扫码枪扫描微信/支付宝收款码"
       title="扫码支付"
-      :openSwitch="false"
+      :openSwitch="true"
       :price="createOrder.data.amount * createOrder.discount"
+      :order="createOrder.data"
       @confirm="scanPayConfirm"
+      @paySuccess="payOrderSuccess"
     ></scan-pay>
     <!-- 储值卡支付 -->
     <scan-pay
@@ -2085,11 +2087,17 @@ export default {
       // if(!this.table.tableId){
       //   return this.$message.error("请选择桌台");
       // }
-      if (this.table) {
+      if (this.table.tableId) {
         return $getMasterId({
           tableId: this.table.tableId,
           vipUserId: this.vipUser.id,
+          useType:this.useTypes.sel=='takeout'?'takeout':'',
         });
+      }else{
+        // return $getMasterId({
+        //   useType:'takeout',
+        //   vipUserId: this.vipUser.id,
+        // });
       }
     },
     onSelGoodsSkuClose() {
@@ -2888,6 +2896,8 @@ export default {
       this.getCategory();
       this.getTable();
       console.log(params);
+      const res=await this.getMasterId()
+      console.log(res)
       if (!params) {
         //无台桌代客下单
         return;