jufubao-takeorder 1.0.2-beta4 → 1.0.2-beta6

package/src/components/JfbTakeorderIndex/Api.js

@@ -22,5 +22,51 @@ module.exports = [
     params: {},
     isConsole: true,
     disabled: true,
-  }
+  },
+  {
+    mapFnName: 'getOrderList',
+    title: '订单列表',
+    path: '/takeorder/v1/order',
+    isRule: false,
+    params: {
+      tab: ['tab', 'String', '必选'],
+      order_type: ['订单类型', 'Number', '必选'],
+      page_token: ['page_token', 'Number', ''],
+      page_size: ['page_size', 'Number', ''],
+    },
+    isConsole: true,
+    disabled: true,
+  },
+  {
+    mapFnName: 'getNewOrderNotify',
+    title: '新订单通知-轮询（5s轮询一次）',
+    path: '/takeorder/v1/new-order/notify',
+    isRule: false,
+    params: {
+      order_type: ['订单类型', 'Number', '必选'],
+      max_id: ['订单列表的最大ID，如果不存在，直接传递 0', 'Number', ''],
+    },
+    isConsole: true,
+    disabled: true,
+  },
+  {
+    mapFnName: 'getBrandOptions',
+    title: '品牌列表',
+    path: '/takeorder/v1/brand/options',
+    isRule: false,
+    params: {
+      order_type: ['订单类型', 'Number', '必选'],
+    },
+    isConsole: true,
+    disabled: true,
+  },
+  {
+    mapFnName: 'getUserConfig',
+    title: '获取用户配置',
+    path: '/takeorder/v1/user-config',
+    isRule: false,
+    params: {},
+    isConsole: true,
+    disabled: true,
+  },
 ];

package/src/components/JfbTakeorderIndex/JfbTakeorderIndex.vue

@@ -145,7 +145,7 @@
         </view>
       </view>
       <view v-show="showFilterQuery" class="modal"></view>
-      <view style="height: 92rpx"></view>
+      <view v-if="!isPreview" style="height: 92rpx"></view>
       <view
         v-if="showNew"
         @click="handleRefresh"
@@ -155,13 +155,19 @@
         <view>新的订单来了，点我立即刷新</view></view
       >
       <view v-for="(item, index) in orderList" :key="index">
-        <Order
+        <CusTakeorder
           :item="item"
           :mainColor="mainColor"
           @expire="handleOrderExpire"
           @btnEvent="handleBtnEvent"
-        ></Order>
+        ></CusTakeorder>
       </view>
+      <xd-no-data
+        icon-type="order"
+        :scale-size="2"
+        v-if="orderList && orderList.length === 0"
+        >暂无订单</xd-no-data
+      >
     </view>
   </view>
 </template>
@@ -173,9 +179,12 @@ import JfbTakeorderIndexMixin from "./JfbTakeorderIndexMixin";
 import XdButton from "@/components/XdButton/XdButton";
 import { getContainerPropsValue } from "@/utils/xd.base";
 import componentsMixins from "@/mixins/componentsMixins";
-import Order from "./components/order.vue";
+import CusTakeorder from "@/components/CusTakeorder/CusTakeorder";
 import CityPicker from "./components/cityPicker.vue";
 import extsMixins from "@/mixins/extsMixins";
+import getServiceUrl from "@/common/getServiceUrl";
+import XdNoData from "@/components/XdNoData/XdNoData";
+import { mapActions } from "vuex";
 const Color = require("color");
 
 export default {
@@ -183,53 +192,19 @@ export default {
   components: {
     XdFontIcon,
     XdButton,
-    Order,
+    CusTakeorder,
     CityPicker,
+    XdNoData,
   },
   mixins: [componentsMixins, extsMixins, JfbTakeorderIndexMixin],
   data() {
     return {
       newBackgroundColor: "",
       showNew: false,
-      orderList: [
-        {
-          id: 1,
-          num: 15,
-          people: 30,
-          remainingTime: 10,
-          shop_name: "味多美(北京西单大悦城店)",
-          brand_name: "味多美",
-          city: "北京市",
-          products: [
-            {
-              product_thumb:
-                "https://img.js.design/assets/img/68b554c9c3a1ea02642d7d2f.png#afa2b9b9d50bcd2f1394619ecc488a99",
-              product_name:
-                "贝欧宝 BIOBOR贝欧宝维生素C+叶黄素酯软糖118g多重营养3D小熊造型糖果Q弹维生素C+叶黄素酯软糖",
-              product_sku: "118g",
-              minPrice: 132,
-              maxPrice: 1232,
-              num: 15,
-            },
-            {
-              product_thumb:
-                "https://img.js.design/assets/img/68b554c9c3a1ea02642d7d2f.png#afa2b9b9d50bcd2f1394619ecc488a99",
-              product_name:
-                "贝欧宝 BIOBOR贝欧宝维生素C+叶黄素酯软糖118g多重营养3D小熊造型糖果Q弹维生素C+叶黄素酯软糖",
-              product_sku: "450g",
-              minPrice: 456,
-              maxPrice: 1546,
-              num: 16,
-            },
-          ],
-          market_price: 4000,
-          minPrice: 456,
-          maxPrice: 1546,
-          order_status: 1,
-        },
-      ],
+      pollTimer: null, // 轮询定时器
+      orderList: [],
       filterType: "",
-      closeMask: true,
+      closeMask: false,
       cityList: [],
       provinceList: [],
       selectedProvs: [],
@@ -242,15 +217,26 @@ export default {
       cityGroups: [],
       letters: [],
       selectedCity: [],
+      order_type: "hourdash",
+      orderTab: "index",
+      page_size: 10,
+      page_token: 1,
+      hasNext: true,
+      next_page_token: "",
+      max_id: null,
+      order_detail_path: "",
+      isPreview: false,
+      isOpenNew: "N",
+      isOpenWin: "N",
     };
   },
   computed: {
     menuWrapBoxStyle() {
       let style = {};
-      // if (!this.isPreview) {
-      style["position"] = "fixed";
-      style["top"] = `${this.layoutInfo.top}rpx`;
-      // }
+      if (!this.isPreview) {
+        style["position"] = "fixed";
+        style["top"] = `${this.layoutInfo.top}rpx`;
+      }
       return this.styleObjectToString(style);
     },
   },
@@ -263,12 +249,31 @@ export default {
   created() {
     this.init(this.container);
   },
+  destroyed() {
+    // 清除定时器
+    this.stopPolling();
+  },
   methods: {
+    ...mapActions(["voiceAlert", "playWebSpeech", "playAudioFile"]),
     onJfbLoad(options) {
       this.initFilter();
-      setTimeout(() => {
-        this.handleGetNew();
-      }, 1000);
+      // 获取订单列表
+      this.getList();
+
+      // 立即调用一次
+      if (!this.isPreview) {
+        jfbRootExec("getUserConfig", {
+          vm: this,
+          data: {},
+        }).then((res) => {
+          this.isOpenNew = res.is_open_new_order_notify_audio;
+          this.isOpenWin = res.is_open_win_order_audio;
+          // 立即调用一次
+          this.handleGetNew();
+          // 启动定时器，每5秒调用一次
+          this.startPolling();
+        });
+      }
     },
     /**
      * @description 监听事件变化
@@ -278,6 +283,11 @@ export default {
       this.newBackgroundColor = Color(this.warningColor).alpha(0.15).toString();
       this.filterBackground = Color(this.mainColor).alpha(0.15).toString();
       this.filterBorderColor = Color(this.mainColor).alpha(0.5).toString();
+      this.order_detail_path = getContainerPropsValue(
+        container,
+        "content.order_detail_path",
+        { value: "" }
+      ).value;
       if (this.$configProject["isPreview"]) {
         this.isPreview = true;
       }
@@ -292,26 +302,77 @@ export default {
           vm: this,
           data: {},
         }),
+        jfbRootExec("getBrandOptions", {
+          vm: this,
+          data: {
+            order_type: this.order_type,
+          },
+        }),
       ])
         .then((res) => {
-          debugger;
           res[1].list.unshift({ label: "全部", value: "all" });
           const processedData = this.processCityData(res[0]);
           this.hotCities = processedData.hotCities;
           this.cityGroups = processedData.cityGroups;
           this.letters = processedData.letters;
           this.provinceList = this.ensureLengthMultipleOfFour(res[1].list);
-          this.brandList = this.ensureLengthMultipleOfFour([
-            { label: "味多美", value: "味多美" },
-            { label: "好利来", value: "好利来" },
-            { label: "哈根达斯", value: "哈根达斯" },
-            { label: "必胜客", value: "必胜客" },
-            { label: "麦当劳", value: "麦当劳" },
-            { label: "肯德基", value: "肯德基" },
-          ]);
+          this.brandList = this.ensureLengthMultipleOfFour(res[2].list);
         })
         .catch();
     },
+    /**
+     * 获取订单列表
+     */
+    getList() {
+      // 构建请求参数
+      const params = {
+        tab: this.orderTab, // tab参数，暂时传空字符串
+        order_type: this.order_type,
+        page_token: this.page_token, // 初始分页token
+        page_size: this.page_size, // 每页数量
+      };
+
+      // 只有当有选择时，才添加筛选参数，如果选择了 'all' 则不传
+      if (this.selectedProvs && this.selectedProvs.length > 0) {
+        // 如果只有一个选项且为 'all'，则不传 province_codes
+        if (!(this.selectedProvs.length === 1 && this.selectedProvs[0] === 'all')) {
+          params.province_codes = this.selectedProvs;
+        }
+      }
+      if (this.selectedCity && this.selectedCity.length > 0) {
+        params.city_codes = this.selectedCity;
+      }
+      if (this.selectedBrands && this.selectedBrands.length > 0) {
+        params.brand_ids = this.selectedBrands;
+      }
+
+      jfbRootExec("getOrderList", {
+        vm: this,
+        data: params,
+      })
+        .then((res) => {
+          // 设置订单列表数据
+          let list = res.list.map((item) => {
+            item.product_list = item.product_list.map((prod, i) => {
+              prod["product_thumb"] = prod.product_thumb
+                ? getServiceUrl(prod.product_thumb, "size3")
+                : "";
+              return prod;
+            });
+            return item;
+          });
+          if (this.page_token === 1) {
+            this.orderList = list;
+          } else {
+            this.orderList = this.orderList.concat(list);
+          }
+          this.hasNext = res.next_page_token !== "";
+          this.next_page_token = res.next_page_token;
+        })
+        .catch((err) => {
+          console.error("获取订单列表失败:", err);
+        });
+    },
     /**
      * 处理城市接口数据，转换为组件所需格式
      * @param {Object} rawData - 接口返回的原始城市数据
@@ -417,28 +478,6 @@ export default {
       // 6. 合并原始数据和占位符，并返回新数组
       return [...data, ...placeholders];
     },
-    /**
-     * 计算订单剩余时间（秒）
-     */
-    calculateRemainingTime(expireTime) {
-      const now = Date.now();
-      return expireTime > now ? Math.floor((expireTime - now) / 1000) : 0;
-    },
-    /**
-     * 校准所有订单的倒计时
-     */
-    calibrateAllCountdowns() {
-      this.orderList.forEach((order) => {
-        if (order.status === "pending") {
-          const remainingTime = this.calculateRemainingTime(order.expireTime);
-          this.$set(order, "remainingTime", remainingTime);
-          // 如果校准后发现订单已经过期，直接触发状态更新
-          if (remainingTime <= 0 && !order.isUpdating) {
-            this.handleOrderExpire(order.id);
-          }
-        }
-      });
-    },
     isOptionSelected(item) {
       let selects = [];
       if (this.filterType === "province") selects = this.selectedProvs;
@@ -447,51 +486,17 @@ export default {
     },
     /**
      * 处理子组件派发的 'expire' 事件
+     * 订单倒计时结束后，从列表中删除该订单
      */
-    async handleOrderExpire(orderId) {
+    handleOrderExpire(orderId) {
+      if (this.isPreview) return;
       const orderIndex = this.orderList.findIndex(
-        (item) => item.id === orderId
+        (item) => item.order_id === orderId
       );
       if (orderIndex === -1) return;
 
-      // 在发起请求前，先在本地标记为更新中，以防止重复请求
-      this.$set(this.orderList[orderIndex], "isUpdating", true);
-      this.$set(this.orderList[orderIndex], "status", "pending");
-      this.$set(this.orderList[orderIndex], "remainingTime", 50);
-      // try {
-      //   // 父组件统一发起 API 请求
-      //   const res = await uni.request({
-      //     url: `https://api.example.com/orders/${orderId}/expire`,
-      //     method: "PUT",
-      //   });
-
-      //   if (res.statusCode === 200 && res.data.success) {
-      //     // API 请求成功，更新本地数据
-      //     this.$set(this.orderList[orderIndex], "status", "expired");
-      //     this.$set(this.orderList[orderIndex], "remainingTime", 0);
-      //   } else {
-      //     throw new Error("API 请求返回失败");
-      //   }
-      // } catch (error) {
-      //   console.error(`订单 ${orderId} 状态更新失败:`, error);
-      //   // 请求失败，取消本地更新中状态，并可以实现重试逻辑
-      //   this.$set(this.orderList[orderIndex], "isUpdating", false);
-
-      //   // 简单的重试逻辑
-      //   uni.showToast({ title: "订单状态更新失败，正在重试...", icon: "none" });
-      //   setTimeout(() => {
-      //     this.handleOrderExpire(orderId);
-      //   }, 3000);
-      // } finally {
-      //   // 无论成功失败，都清除更新中标记（如果还存在的话）
-      //   // 注意：在 try 块的成功分支中已经改变了状态，这里主要处理失败的情况
-      //   if (
-      //     this.orderList[orderIndex] &&
-      //     this.orderList[orderIndex].isUpdating
-      //   ) {
-      //     this.$set(this.orderList[orderIndex], "isUpdating", false);
-      //   }
-      // }
+      // 从列表中删除该订单
+      this.orderList.splice(orderIndex, 1);
     },
     handleSwitchFilter(type) {
       if (this.filterType === type) {
@@ -551,11 +556,78 @@ export default {
       }
     },
     handleGetNew() {
-      console.log("获取是否有新订单");
-      this.showNew = true;
+      jfbRootExec("getNewOrderNotify", {
+        vm: this,
+        data: {
+          order_type: this.order_type,
+          max_id: this.max_id || 0,
+        },
+      })
+        .then((res) => {
+          if (res.is_exist_new_order && res.is_exist_win_order) {
+            if (this.isOpenNew === "Y") {
+              this.voiceAlert({
+                type: "new",
+                filePath: "https://img.jufubao.cn/takeorder/new_order.mp3",
+              });
+            }
+            if (this.isOpenWin === "Y") {
+              setTimeout(() => {
+                this.voiceAlert({
+                  type: "win",
+                  filePath: "https://img.jufubao.cn/takeorder/wait_order.mp3",
+                });
+              }, 1000);
+            }
+          } else if (res.is_exist_new_order) {
+            if (this.isOpenNew === "Y") {
+              this.voiceAlert({
+                type: "new",
+                filePath: "https://img.jufubao.cn/takeorder/new_order.mp3",
+              });
+            }
+          } else if (res.is_exist_win_order) {
+            if (this.isOpenWin === "Y") {
+              this.voiceAlert({
+                type: "win",
+                filePath: "https://img.jufubao.cn/takeorder/wait_order.mp3",
+              });
+            }
+          }
+          this.max_id = res.new_order_max_id;
+          this.showNew = res.is_exist_new_order;
+        })
+        .catch((err) => {
+          console.error("获取新订单通知失败:", err);
+        });
+    },
+    /**
+     * 启动轮询定时器
+     */
+    startPolling() {
+      // 如果已经存在定时器，先清除
+      if (this.pollTimer) {
+        clearInterval(this.pollTimer);
+      }
+      // 每5秒调用一次接口
+      this.pollTimer = setInterval(() => {
+        console.log("startPolling");
+        this.handleGetNew();
+      }, 5000);
+    },
+    /**
+     * 停止轮询定时器
+     */
+    stopPolling() {
+      if (this.pollTimer) {
+        clearInterval(this.pollTimer);
+        this.pollTimer = null;
+      }
     },
     handleRefresh() {
-      //刷新列表
+      // 刷新列表
+      this.getList();
+      this.showNew = false;
     },
     handleCitySelect(city) {
       const index = this.selectedCity.findIndex(
@@ -579,23 +651,43 @@ export default {
       if (this.filterType === "city") {
         this.selectedCity = [];
       }
+      this.filterType = "";
       this.showFilterQuery = false;
+      this.getList();
     },
     handleConfirmFilter() {
       this.showFilterQuery = false;
-      //重新调用接口
+      this.filterType = "";
+      // 重新调用接口
+      this.getList();
     },
-    onJfbScroll(options) {
-      console.log("event.onJfbScroll", options);
+    /**
+     * 处理按钮事件，跳转到订单详情
+     * @param {Object} item - 订单对象
+     */
+    handleBtnEvent({ item, btn }) {
+      // 跳转到订单详情页
+      this.$xdUniHelper.navigateTo({
+        url: `${this.order_detail_path}?order_id=${item.order_id}`,
+      });
     },
+    onJfbScroll(options) {},
     onJfbReachBottom(options) {
-      console.log("event.onJfbReachBottom", options);
+      if (this.hasNext) {
+        this.page_token = this.next_page_token;
+        this.getList();
+      }
     },
     onJfbShow(options) {
-      this.calibrateAllCountdowns();
+      // 页面显示时恢复轮询
+      if (!this.pollTimer) {
+        this.startPolling();
+      }
       console.log("event.onJfbShow", options);
     },
     onJfbHide(options) {
+      // 页面隐藏时暂停轮询
+      this.stopPolling();
       console.log("event.onJfbHide", options);
     },
     onJfbBack(options) {