Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into ymf_test

src/views/product/specifications.vue

@@ -232,7 +232,8 @@ function subitgoods() {
   })
 }
 function handleClose(index: any, i: any) {
-  datas.contentForm.children[index].value.splice(i, 1);
+  console.log(datas.contentForm.children[index].children, 22222222)
+  datas.contentForm.children[index].children.splice(i, 1);
 }
 function showInput(index: any) {
   datas.contentForm.children[index].inputVisible = true;

src/views/tool/Instead/index.vue

@@ -464,16 +464,8 @@ async function createOrder(key) {
   }
 }
 
-// 取消历史订单
-async function clearOldOrder(params) {
-  const res1 = params.placeNum
-    ? await orderApi.rmPlaceOrder(params)
-    : await orderApi.cancelOrder(params);
-  carts.clearHistory();
-  ElMessage({
-    type: res1 ? "success" : "error",
-    message: res1 ? "删除成功" : "删除失败",
-  });
+// 清空历史订单回调
+async function clearOldOrderCallback() {
   // 获取历史订单数据
   const res = await orderApi.getHistoryList({
     orderId: carts.oldOrder.id,
@@ -492,6 +484,22 @@ async function clearOldOrder(params) {
     carts.setOldOrder(res);
   }
 }
+// 取消历史订单
+async function clearOldOrder(params) {
+  try {
+    const res1 = params.placeNum
+      ? await orderApi.rmPlaceOrder(params)
+      : await orderApi.cancelOrder(params);
+    carts.clearHistory();
+    ElMessage({
+      type: res1 ? "success" : "error",
+      message: res1 ? "删除成功" : "删除失败",
+    });
+    clearOldOrderCallback();
+  } catch (error) {
+    clearOldOrderCallback();
+  }
+}
 
 //可选套餐商品
 const refAddTaocan = ref();