代客下单修改

台桌列表跳转到代客下单立即结账时使用当前台桌的masterId

src/views/table/table_list.vue

@@ -373,6 +373,7 @@ export default {
           tableId: this.selTable.tableId,
           useType: this.selTable.useType,
           maxCapacity:this.selTable.maxCapacity,
+          masterId:this.selTable.masterId,
           ...query,
         },
       });

src/views/tool/Instead/components/scan-pay.vue

@@ -7,7 +7,7 @@
           @click="changeKey('paysSel', index)"
           v-for="(item, index) in pays"
           :key="index"
-          :type="paysSel == index ? 'success' : ''"
+          :type="paysSel == index ? 'primary' : ''"
           >{{ item.text }}</el-button
         >
       </div>
@@ -189,10 +189,12 @@ export default {
     open() {
       this.show = true;
       this.form.money = Number(this.price).toFixed(2);
-      $getOrderPayUrl({ orderId: this.order.id }).then((res) => {
-        console.log(res);
-        this.paymentQrcode = res;
-      });
+      if (this.openSwitch) {
+        $getOrderPayUrl({ orderId: this.order.id }).then((res) => {
+          console.log(res);
+          this.paymentQrcode = res;
+        });
+      }
       this.$nextTick(() => {
         this.$refs.refInputCode.focus();
       });

src/views/tool/Instead/index.vue

@@ -1753,7 +1753,7 @@ export default {
     //台桌变化时重新获取取餐号、购物车数据，如果是正在结账状态，创建订单到待支付页面
     async onTableChange() {
       const res = await this.getMasterId();
-      this.masterId = res.masterId;
+      this.masterId = this.key=='isPayOrder'? this.table.masterId : res.masterId;
       //空闲并且免餐位费设置默认就餐人数1
       if (
         !this.perpole &&
@@ -2944,6 +2944,7 @@ export default {
           tableId: params.tableId,
           useType: params.useType,
           maxCapacity: params.maxCapacity * 1,
+          masterId:params.masterId
         },
         key = params.key,
         perpoleNumber = params.num;
@@ -2959,6 +2960,7 @@ export default {
       this.isCreateOrder = this.key == "isPayOrder" ? true : false;
       this.perpole = perpoleNumber;
       this.table = item;
+      this.masterId = item.masterId;
     },
     close() {
       if (this.table.tableId) {