解决冲突

src/views/tool/Instead/index.vue

@@ -2039,7 +2039,7 @@ export default {
     },
     quansConfirm(e, goodsPayPriceMap) {
       console.log(e);
-      this.createOrder.discount = 1;
+     // this.createOrder.discount = 1;
       this.points.selected = "";
       e.map((v, index) => {
         return {
@@ -3438,7 +3438,8 @@ export default {
     },
     reset() {
       // this.goods.list = [];
-      this.isAllWaitCall = false;
+      this.isAllWaitCall=false;
+      this.selQuan=[];
       this.guazhangRen = "";
       this.order.status = "";
       this.loading = false;