优化桌面端

2024-05-16 16:55:55 +08:00
parent 43ccf82177
commit 6f378cc3c0
6 changed files with 141 additions and 239 deletions
--- a/src/api/product.js
+++ b/src/api/product.js
@@ -26,6 +26,19 @@ export function productqueryCommodityInfo(params) {
    });
 }

+/**
+ * 查询商品信息
+ * @param {*} params 
+ * @returns 
+ */
+export function queryNewCommodityInfo(params) {
+    return request({
+        method: "get",
+        url: "product/queryNewCommodityInfo",
+        params
+    });
+}
+
 /**
 * 通过选中的商品规格查询价格
 * @param {*} params 
--- a/src/views/home/components/goods.vue
+++ b/src/views/home/components/goods.vue
@@ -30,11 +30,12 @@
            <el-input placeholder="请输入商品名称查询" prefix-icon="Search" v-model="commdityName" clearable
                @input="inputChange"></el-input>
        </div>
-        <el-button :icon="shopListType == 'text' ? 'PictureRounded' : 'PriceTag'"
-            @click="changeShopListType"></el-button>
+        <!-- <el-button :icon="shopListType == 'text' ? 'PictureRounded' : 'PriceTag'"
+            @click="changeShopListType"></el-button> -->
    </div>
    <div class="shop_list" :class="{ img: shopListType == 'img' }" v-loading="loading">
-        <swiper class="swiper_box" direction="vertical" @slideChange="onSlideChange">
+        <!-- <swiper class="swiper_box" direction="vertical" @slideChange="onSlideChange"> -->
+        <swiper class="swiper_box" direction="vertical">
            <swiper-slide class="slide_item" v-for="(goods, index) in goodsList" :key="index">
                <div class="item_wrap" v-for="item in goods" :key="item.id" @click="showSkuHandle(item)">
                    <div class="item">
@@ -42,7 +43,7 @@
                        <div class="cover" v-if="shopListType == 'img'">
                            <el-image :src="item.coverImg" class="el_img" fit="cover"></el-image>
                        </div>
-                        <div class="name"><el-text line-clamp="2">{{ item.name }}</el-text></div>
+                        <div class="name"><el-text line-clamp="1">{{ item.name }}</el-text></div>
                        <div class="item_empty" v-if="shopListType == 'text'"></div>
                        <div class="price">
                            <el-text>￥{{ item.lowPrice }}</el-text>
@@ -66,7 +67,7 @@ import useStorage from "@/utils/useStorage";

 import skuModal from '@/components/skuModal.vue'

-import { queryCategory, productqueryCommodityInfo, queryProductSku } from '@/api/product'
+import { queryCategory, queryNewCommodityInfo, queryProductSku } from '@/api/product'
 import { useUser } from "@/store/user.js"

 import { Swiper, SwiperSlide } from 'swiper/vue'
@@ -183,6 +184,7 @@ function changeCategory(index) {
    finish.value = false
    currentGoodsIndex.value = 0
    loopMax.value = 0
+    clearInterval(loopTimer.value)
    loopTimer.value = null

    updataGoods()
@@ -221,7 +223,7 @@ async function queryCategoryAjax() {
 async function productqueryCommodityInfoAjax() {
    try {
        // loading.value = true
-        const res = await productqueryCommodityInfo({
+        const res = await queryNewCommodityInfo({
            shopId: store.userInfo.shopId,
            categoryId: categorys.value[categorysActive.value].id,
            commdityName: commdityName.value,
@@ -234,11 +236,15 @@ async function productqueryCommodityInfoAjax() {
        }
        // loading.value = false

-        if (res.total > (goodsPageSize.value * 2)) {
+        if (res.pages > 2 && loopTimer.value == null) {
            // 启动循环任务
-            loopMax.value = parseInt(res.total / goodsPageSize.value)
+            // loopMax.value = parseInt(res.total / goodsPageSize.value)
            loopGetGoods()
        }
+        if (goodsPage.value >= res.pages) {
+            clearInterval(loopTimer.value)
+            loopTimer.value = null
+        }
        return res.list
    } catch (error) {
        loading.value = false
@@ -250,14 +256,9 @@ async function productqueryCommodityInfoAjax() {
 function loopGetGoods() {
    loopTimer.value = setInterval(async () => {
        goodsPage.value++
-        if (goodsPage.value > loopMax.value) {
-            clearInterval(loopTimer.value)
-            loopTimer.value = null
-            return
-        }
        const res = await productqueryCommodityInfoAjax()
        goodsList.value.push(res)
-    }, 2000)
+    }, 1000)
 }

 // 更新商品数据
--- a/src/views/home/components/settleAccount.vue
+++ b/src/views/home/components/settleAccount.vue
@@ -1,12 +1,7 @@
 <!-- 结算订单 -->

 <template>
-  <el-drawer
-    size="100%"
-    :with-header="false"
-    direction="btt"
-    v-model="dialogVisible"
-  >
+  <el-drawer size="100%" :with-header="false" direction="btt" v-model="dialogVisible">
    <div class="drawer_wrap">
      <div class="cart_list">
        <div class="nav_wrap card">
@@ -18,9 +13,7 @@
          <div class="info">
            <div class="master_id">{{ props.masterId }}</div>
            <div class="btm">
-              <span class="p"
-                >服务员：{{ store.userInfo.shopName || "暂无" }}</span
-              >
+              <span class="p">服务员：{{ store.userInfo.shopName || "暂无" }}</span>
              <span class="t">{{
                props.orderInfo.createdAt &&
                dayjs(props.orderInfo.createdAt).format("MM-DD HH:mm")
@@ -28,10 +21,7 @@
            </div>
          </div>
        </div>
-        <div
-          class="list_wrap card"
-          style="margin-top: var(--el-font-size-base)"
-        >
+        <div class="list_wrap card" style="margin-top: var(--el-font-size-base)">
          <div class="item" v-for="item in props.cart" :key="item.id">
            <div class="top">
              <span class="name">{{ item.name }}</span>
@@ -48,11 +38,7 @@
              </div>
            </div>
            <div class="packge_Wrap" v-if="item.isPack == 'true'">
-              <div
-                class="icon_item"
-                v-if="item.isPack == 'true'"
-                @click="giftPackHandle('isPack', item)"
-              >
+              <div class="icon_item" v-if="item.isPack == 'true'" @click="giftPackHandle('isPack', item)">
                <el-icon class="icon" style="color: var(--primary-color)">
                  <Box />
                </el-icon>
@@ -63,29 +49,15 @@
        <div class="footer">
          <!-- <el-button icon="Edit"></el-button> -->
          <div class="button">
-            <el-checkbox
-              v-model="isPrint"
-              border
-              label="打印结算小票"
-              style="width: 100%"
-            />
+            <el-checkbox v-model="isPrint" border label="打印结算小票" style="width: 100%" />
          </div>
          <div class="print">
-            <el-button
-              type="primary"
-              v-loading="printLoading"
-              @click="printHandle"
-              >打印预结单</el-button
-            >
+            <el-button type="primary" v-loading="printLoading" @click="printHandle">打印预结单</el-button>
          </div>
        </div>
      </div>
      <div class="pay_wrap">
-        <payCard
-          :amount="props.amount"
-          :orderId="props.orderInfo.id"
-          @paySuccess="paySuccess"
-        />
+        <payCard :amount="props.amount" :orderId="props.orderInfo.id" @paySuccess="paySuccess" />
      </div>
    </div>
  </el-drawer>
@@ -150,40 +122,41 @@ async function bySubTypeAjax() {
  }
 }

+// 打印操作
 async function printHandle() {
-  // try {
-  //   if (!isPrint.value) return;
-  //   if (printList.value.length) {
-  //     const data = {
-  //       shop_name: store.userInfo.merchantName,
-  //       carts: props.cart,
-  //       amount: props.amount,
-  //       remark: props.remark,
-  //       orderInfo: props.orderInfo,
-  //       deviceName: printList.value[0].config.deviceName,
-  //       createdAt: dayjs(props.orderInfo.createdAt).format(
-  //         "YYYY-MM-DD HH:mm:ss"
-  //       ),
-  //       printTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
-  //     };
-  //     ipcRenderer.send("printerInfoSync", JSON.stringify(data));
-  //   } else {
-  //     ElMessage.error("您还没有添加打印设备");
-  //   }
-  // } catch (error) {
-  //   console.log(error);
-  // }
  try {
-    printLoading.value = true;
-    await print({
-      type: "normal",
-      ispre: true,
-      orderId: props.orderInfo.id,
-    });
-    printLoading.value = false;
-    ElMessage.success("打印成功");
+    if (!isPrint.value) return;
+    if (printList.value.length) {
+      const data = {
+        shop_name: store.userInfo.merchantName,
+        carts: props.cart,
+        amount: props.amount,
+        remark: props.remark,
+        orderInfo: props.orderInfo,
+        deviceName: printList.value[0].config.deviceName,
+        createdAt: dayjs(props.orderInfo.createdAt).format(
+          "YYYY-MM-DD HH:mm:ss"
+        ),
+        printTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
+      };
+      ipcRenderer.send("printerInfoSync", JSON.stringify(data));
+    } else {
+      ElMessage.error("您还没有添加本地打印设备，将使用网络打印");
+      try {
+        printLoading.value = true;
+        await print({
+          type: "normal",
+          ispre: true,
+          orderId: props.orderInfo.id,
+        });
+        printLoading.value = false;
+        ElMessage.success("打印成功");
+      } catch (error) {
+        printLoading.value = false;
+        console.log(error);
+      }
+    }
  } catch (error) {
-    printLoading.value = false;
    console.log(error);
  }
 }