优化订单结算不去结算购物车

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "vite-electron",
 	"private": true,
-	"version": "2.0.20",
+	"version": "2.0.21",
 	"main": "dist-electron/main.js",
 	"scripts": {
 		"dev": "chcp 65001 && vite",

src/store/goods.js

@@ -890,7 +890,7 @@ export const useGoods = defineStore("goods", {
           .map((item) => item.goods)
           .flat()
           .map(this.comleteOrderInfo);
-        if (this.payType == 'table') {
+        if (this.payType == 'table' || this.payType == 'order') {
           return [...giftGoods, ...oldOrderGoods];
         } else {
           return [...currentGoods, ...giftGoods, ...oldOrderGoods];

src/views/home/components/settleAccount.vue

@@ -265,7 +265,7 @@ function show(t) {
   goodsStore.payType = props.type
   dialogVisible.value = true;
   cartInfo.value = { ...goodsStore.cartInfo }
-  if (props.type === 'table') {
+  if (props.type === 'table' || props.type === 'order') {
     orderList.value = goodsStore.orderList.map(item => item.goods).flat()
   } else {
     orderList.value = [...goodsStore.cartList, ...goodsStore.orderList.map(item => item.goods).flat()]

src/views/order/index.vue

@@ -168,7 +168,7 @@
   <!-- 打印操作 -->
   <PrintDrawer ref="PrintDrawerRef" />
   <!-- 结算订单 -->
-  <SettleAccount ref="SettleAccountRef" @success="orderListAjax" />
+  <SettleAccount ref="SettleAccountRef" type="order" @success="orderListAjax" />
   <!-- 全部商品 -->
   <allGoodsDialog ref="allGoodsDialogRef" />
 </template>