jufubao-takeorder 1.0.2-beta4 → 1.0.2-beta6

package/src/components/JfbTakeorderOrderDetail/Mock.js

@@ -1,13 +1,13 @@
 'use strict';
 
 module.exports = {
-  
-  getOrderByIdFilmSquate:{},
-  
-  updateOrderFilmPaiqiDate:{},
-  
-  removeOrderFilmAddress:{},
-  
-  addOrderFilmcart:{},
-  
+  getTakeorderOrderDetail: { "id": 80, "order_id": "h866697758749884417", "shop_name": "星巴克(平谷国泰店)", "shop_address": "平谷区文化北街13号国泰商场一层", "brand_name": "星巴克", "province_name": "平谷区", "market_amount": 525, "suggest_min_quotation": 116, "suggest_max_quotation": 171, "rest_quotation_time": 259, "rest_receive_time": 0, "rest_report_time": 0, "buyer_phone_number": "18232189788", "receive_user_settle_amount": 100, "quotation_person_count": 0, "user_quotation": 0, "order_status": "quoting", "user_quotation_status": "wait_quote", "product_list": [{ "product_name": "星巴克经典咖啡", "product_sku_name": "大杯\/特别热\/经典糖\/标准\/全脂牛奶", "product_thumb": "https:\/\/www.shuomingshu.cn\/wp-content\/uploads\/images\/2023\/01\/07\/dc0bdf6bfedb4038911ec6550fd31d62_5t1vcuagbok.jpg", "product_num": 5, "market_price": 382, "suggest_min_quotation": 23, "suggest_max_quotation": 34, "user_quotation": 0 }], "product_total": 5, "report_voucher_list": [], "request_id": "dd0ae89273941292" },
+  createQuotation: {},
+  cancelQuotation: {},
+  updateQuotation: {},
+  discardOrder: {},
+  acceptOrder: {},
+  reportOrder: {},
+  imageRecognition: {},
+  getImagePreview: {}
 }

package/src/components/JfbTakeorderOrderDetail/components/CusEditQuote.vue

@@ -2,7 +2,7 @@
   <view class="dialog">
     <view class="dialog-body">
       <view class="dialog-title">修改报价</view>
-      <view class="current-quote"> 当前报价：¥{{ info.currentQuote }} </view>
+      <view class="current-quote"> 当前报价：¥{{ $xdUniHelper.divisionFloatNumber(info.user_quotation,100) }} </view>
       <!-- 报价输入框（带¥前缀） -->
       <view class="quote-input">
         <view class="quote-input-unit">¥</view>
@@ -12,7 +12,7 @@
       <view class="suggest-wrap">
         建议报价：
         <text :style="{ color: mainColor }" class="suggest-range"
-          >¥{{ info.suggestMin }} ~ ¥{{ info.suggestMax }}</text
+          >¥{{ $xdUniHelper.divisionFloatNumber(info.suggest_min_quotation,100) }} ~ ¥{{ $xdUniHelper.divisionFloatNumber(info.suggest_max_quotation,100) }}</text
         >
       </view>
       <!-- 备注说明 -->
@@ -62,17 +62,6 @@ export default {
     };
   },
   methods: {
-    // 过滤输入：只允许数字+小数点（最多两位小数）
-    filterInput(e) {
-      let val = e.detail.value;
-      // 只保留数字和小数点
-      val = val.replace(/[^\d.]/g, "");
-      // 去重小数点
-      val = val.replace(/\.{2,}/g, ".");
-      // 限制小数点后最多两位
-      val = val.replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3");
-      this.inputQuote = val;
-    },
     handleClose() {
       this.$emit("close");
     },

package/src/components/JfbTakeorderOrderDetail/components/products.vue

@@ -1,15 +1,18 @@
 <template>
-  <view class="wrap order-info" :class="{'no-margin-top': status==='daishangbao'}">
+  <view
+    class="wrap order-info"
+    :class="{ 'no-margin-top': info.user_quotation_status === 'received' }"
+  >
     <view class="order-info-title">
       <view class="order-info-title-left">
         <view>{{ info.shop_name }}</view>
         <text>｜</text>
         <view>{{ info.brand_name }}</view>
       </view>
-      <view class="order-info-title-right">{{ info.city }}</view>
+      <view class="order-info-title-right">{{ info.province_name }}</view>
     </view>
     <view
-      v-for="(Pitem, Pindex) in info.products"
+      v-for="(Pitem, Pindex) in info.product_list"
       :key="Pindex"
       class="order-info-product"
     >
@@ -19,12 +22,13 @@
           Pitem.product_name
         }}</view>
         <view class="order-info-product-info-sku"
-          >规格：{{ Pitem.product_sku }}</view
+          >规格：{{ Pitem.product_sku_name }}</view
         >
         <view class="order-info-product-info-price">
           <view class="order-info-product-info-price-left"
-            ><text>¥ </text>{{ Pitem.minPrice }}<text class="range">～</text
-            ><text>¥ </text>{{ Pitem.maxPrice }}</view
+            ><text>¥ </text>{{ $xdUniHelper.divisionFloatNumber(Pitem.suggest_min_quotation,100)
+            }}<text class="range">～</text><text>¥ </text
+            >{{ $xdUniHelper.divisionFloatNumber(Pitem.suggest_max_quotation,100) }}</view
           >
           <view class="order-info-product-info-price-right"
             ><XdFontIcon
@@ -32,7 +36,7 @@
               color="#999"
               size="14"
             ></XdFontIcon
-            ><view>{{ Pitem.num }}</view></view
+            ><view>{{ Pitem.product_num }}</view></view
           >
         </view>
       </view>
@@ -47,11 +51,7 @@ export default {
       type: Object,
       default: () => ({}),
     },
-    status: {
-      type: String,
-      default: '',
-    },
-  }
+  },
 };
 </script>
 
@@ -61,7 +61,7 @@ export default {
   margin: 16rpx;
   border-radius: 16rpx;
   &.no-margin-top {
-    margin-top: 0;
+    margin-top: 0 !important;
   }
 }
 .order-info {
@@ -73,9 +73,11 @@ export default {
     &-left {
       display: flex;
       align-items: center;
+      font-size: 28rpx;
     }
     &-right {
       font-weight: 500;
+      font-size: 28rpx;
     }
   }
   &-product {
@@ -90,6 +92,7 @@ export default {
     }
     &-info {
       margin-left: 24rpx;
+      font-size: 28rpx;
       &-name {
         .uni-max-cut(2,80);
         margin-bottom: 10rpx;

package/src/components/JfbTakeorderOrderList/Api.js

@@ -6,52 +6,37 @@
  */
 module.exports = [
   {
-    //设置方法名字当别忘记加上【模块名字】：Order
-    mapFnName: 'getOrderByIdFilmSquate',
-    title: '获取电影广场列表',
-    path: '/api/account/film/list-film-square',
+    mapFnName: 'getOrderList',
+    title: '订单列表',
+    path: '/takeorder/v1/order',
     isRule: false,
     params: {
-      last_key: ['当前页', 'Number', '必选'],
-      page_size: ['每页数量', 'Number', '必选'],
+      tab: ['tab', 'String', '必选'],
+      order_type: ['订单类型', 'Number', '必选'],
+      page_token: ['page_token', 'Number', ''],
+      page_size: ['page_size', 'Number', ''],
     },
     isConsole: true,
     disabled: true,
   },
   {
-    //设置方法名字当别忘记加上【模块名字】：Order
-    mapFnName: 'updateOrderFilmPaiqiDate',
-    title: '更新排期',
-    path: '/api/account/film/paiqi-date',
+    mapFnName: 'getNewOrderNotify',
+    title: '新订单通知-轮询（5s轮询一次）',
+    path: '/takeorder/v1/new-order/notify',
     isRule: false,
     params: {
-      film_id: ['电影id', 'Number', '必选'],
-      cinema_id: ['影院id', 'Number', '必选'],
+      order_type: ['订单类型', 'Number', '必选'],
+      max_id: ['订单列表的最大ID，如果不存在，直接传递 0', 'Number', ''],
     },
     isConsole: true,
     disabled: true,
   },
   {
-    //设置方法名字当别忘记加上【模块名字】：Order
-    mapFnName: 'removeOrderFilmAddress',
-    title: '删除我的配送地址',
-    path: '/api/account/film/paiqi-date',
+    mapFnName: 'getUserConfig',
+    title: '获取用户配置',
+    path: '/takeorder/v1/user-config',
     isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    //设置方法名字当别忘记加上【模块名字】：Order
-    mapFnName: 'addOrderFilmcart',
-    title: '添加购物车',
-    path: '/api/account/film/paiqi-date',
-    isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
-    },
+    params: {},
     isConsole: true,
     disabled: true,
   },

package/src/components/JfbTakeorderOrderList/JfbTakeorderOrderList.vue

@@ -2,168 +2,304 @@
   <view
     class="jfb-takeorder-order-list"
     @click="handleEditxSelect"
-    :class="{ editx : isEditx && active }"
+    :class="{ editx: isEditx && active }"
   >
     <!--#ifdef H5-->
     <view
       class="jfb-takeorder-order-list__edit"
-      :class="{ editx : isEditx && active }"
+      :class="{ editx: isEditx && active }"
       v-if="isEditx && active"
     >
       <view class="jfb-takeorder-order-list__edit-icon" @click.stop="delEdit">
-        <xd-font-icon icon="iconshanchu-01" color="#fff" size="30"></xd-font-icon>
+        <xd-font-icon
+          icon="iconshanchu-01"
+          color="#fff"
+          size="30"
+        ></xd-font-icon>
       </view>
     </view>
     <!-- #endif -->
     <view class="jfb-takeorder-order-list__body">
-      <view
+      <!-- <view
         v-if="showNew"
         @click="handleRefresh"
         :style="{ color: warningColor, background: newBackgroundColor }"
         class="jfb-takeorder-quoted-list__body-new"
         ><XdFontIcon size="24" icon="iconIM"></XdFontIcon>
         <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>
 
 <script>
-  import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
-  import { jfbRootExec } from "@/utils/xd.event";
-  import JfbTakeorderOrderListMixin from "./JfbTakeorderOrderListMixin";
-  import { getContainerPropsValue } from "@/utils/xd.base";
-  import componentsMixins from "@/mixins/componentsMixins";
+import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
+import { jfbRootExec } from "@/utils/xd.event";
+import JfbTakeorderOrderListMixin from "./JfbTakeorderOrderListMixin";
+import { getContainerPropsValue } from "@/utils/xd.base";
+import componentsMixins from "@/mixins/componentsMixins";
 import extsMixins from "@/mixins/extsMixins";
-  import Order from "./components/order.vue";
+import CusTakeorder from "@/components/CusTakeorder/CusTakeorder";
+import getServiceUrl from "@/common/getServiceUrl";
+import XdNoData from "@/components/XdNoData/XdNoData";
+import { mapActions } from "vuex";
 const Color = require("color");
-  export default {
-    name: "JfbTakeorderOrderList",
-    components: {
-      XdFontIcon,
-      Order,
-    },
-    mixins: [
-      componentsMixins, extsMixins, JfbTakeorderOrderListMixin
-    ],
-    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,
-          },
-        ],
-        orderType: ""
+export default {
+  name: "JfbTakeorderOrderList",
+  components: {
+    XdFontIcon,
+    CusTakeorder,
+    XdNoData,
+  },
+  mixins: [componentsMixins, extsMixins, JfbTakeorderOrderListMixin],
+  data() {
+    return {
+      newBackgroundColor: "",
+      showNew: false,
+      pollTimer: null, // 轮询定时器
+      orderList: [],
+      order_type: "hourdash",
+      orderTab: "index",
+      page_size: 10,
+      page_token: 1,
+      hasNext: true,
+      next_page_token: "",
+      order_detail_path: "",
+      isPreview: false,
+      isOpenNew: "N",
+      isOpenWin: "N",
+      max_id: null,
+    };
+  },
+  watch: {
+    container(value, oldValue) {
+      if (JSON.stringify(value) === JSON.stringify(oldValue)) return;
+      if (this.$configProject["isPreview"]) this.init(value);
+    },
+  },
+  created() {
+    this.init(this.container);
+  },
+  destroyed() {
+    this.stopPolling();
+  },
+  methods: {
+    ...mapActions(["voiceAlert", "playWebSpeech", "playAudioFile"]),
+    onJfbLoad(options) {
+      // 获取订单列表
+      this.getList();
+      if (!this.isPreview) {
+        jfbRootExec("getUserConfig", {
+          vm: this,
+          data: {},
+        }).then((configRes) => {
+          this.isOpenNew = configRes.is_open_new_order_notify_audio;
+          this.isOpenWin = configRes.is_open_win_order_audio;
+          // 立即调用一次
+          this.handleGetNew();
+          // 启动定时器，每5秒调用一次
+          this.startPolling();
+        });
       }
     },
-    watch: {
-      container(value, oldValue) {
-        if (JSON.stringify(value) === JSON.stringify(oldValue)) return;
-        if (this.$configProject['isPreview']) this.init(value)
-      },
+    /**
+     * @description 监听事件变化
+     * @param container {object} 业务组件对象自己
+     */
+    init(container) {
+      this.newBackgroundColor = Color(this.warningColor).alpha(0.15).toString();
+      this.orderTab = getContainerPropsValue(
+        container,
+        "content.orderTab",
+        "index"
+      );
+      this.order_detail_path = getContainerPropsValue(
+        container,
+        "content.order_detail_path",
+        { value: "" }
+      ).value;
+      if (this.$configProject["isPreview"]) {
+        this.isPreview = true;
+      }
     },
-    created() {
-      this.init(this.container);
+    /**
+     * 获取订单列表
+     */
+    getList() {
+      // 构建请求参数
+      const params = {
+        tab: this.orderTab,
+        order_type: this.order_type,
+        page_token: this.page_token,
+        page_size: this.page_size,
+      };
 
-      //todo
+      return 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);
+        });
     },
-    methods: {
-      onJfbLoad(options) {
-
-        // jfbRootExec('baiduUserLogin', {
-
-        //   vm: this,//   data: {
-
-        //     account: 'gaoshiyong',//     password: '123456789',//     type: 3,//     ...options
-
-        //   }
-
-        // }).then().catch()
-      },
-      /**
-       * @description 监听事件变化
-       * @param container {object} 业务组件对象自己
-       */
-      init(container) {
-        this.newBackgroundColor = Color(this.warningColor).alpha(0.15).toString();
-        this.orderType = getContainerPropsValue(container, 'content.orderType', '');
-
-        //this.height = getContainerPropsValue(container, 'content.height', 10);
-      },
-      onJfbScroll(options) {
-        console.log('event.onJfbScroll', options)
-      },
-      onJfbReachBottom(options) {
-        console.log('event.onJfbReachBottom', options)
-      },
-      onJfbShow(options) {
-        console.log('event.onJfbShow', options)
-      },
-      onJfbHide(options) {
-        console.log('event.onJfbHide', options)
-      },
-      onJfbBack(options) {
-        console.log('event.onJfbBack', options)
-      },
-      onJfbUpdate(...data) {
-        console.log('event.onJfbUpdate', data)
-      },
-      onJfbCustomEvent(options) {
-        console.log('event.onJfbReachBottom', options)
-      },
-    }
-  }
+    handleBtnEvent({ item, btn }) {
+      // 跳转到订单详情页
+      this.$xdUniHelper.navigateTo({
+        url: `${this.order_detail_path}?order_id=${item.order_id}`,
+      });
+    },
+    /**
+     * 处理子组件派发的 'expire' 事件
+     * 订单倒计时结束后，从列表中删除该订单
+     */
+    handleOrderExpire(orderId) {
+      if (this.isPreview) return;
+      const orderIndex = this.orderList.findIndex(
+        (item) => item.order_id === orderId || item.id === orderId
+      );
+      if (orderIndex === -1) return;
 
+      // 从列表中删除该订单
+      this.orderList.splice(orderIndex, 1);
+    },
+    /**
+     * 刷新列表
+     */
+    handleRefresh() {
+      // 重置分页
+      this.page_token = 1;
+      this.hasNext = true;
+      this.next_page_token = "";
+      // 重新获取列表
+      this.getList();
+      this.showNew = false;
+    },
+    /**
+     * 获取新订单通知
+     */
+    handleGetNew() {
+      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;
+      });
+    },
+    /**
+     * 启动轮询定时器
+     */
+    startPolling() {
+      // 如果已经存在定时器，先清除
+      if (this.pollTimer) {
+        clearInterval(this.pollTimer);
+      }
+      // 每5秒调用一次接口
+      this.pollTimer = setInterval(() => {
+        this.handleGetNew();
+      }, 5000);
+    },
+    /**
+     * 停止轮询定时器
+     */
+    stopPolling() {
+      if (this.pollTimer) {
+        clearInterval(this.pollTimer);
+        this.pollTimer = null;
+      }
+    },
+    onJfbScroll(options) {},
+    onJfbReachBottom(options) {
+      if (this.hasNext) {
+        this.page_token = this.next_page_token;
+        this.getList();
+      }
+    },
+    onJfbShow(options) {
+      // 页面显示时恢复轮询
+      if (!this.pollTimer) {
+        this.startPolling();
+      }
+    },
+    onJfbHide(options) {
+      // 页面隐藏时暂停轮询
+      this.stopPolling();
+      console.log("event.onJfbHide", options);
+    },
+    onJfbBack(options) {
+      console.log("event.onJfbBack", options);
+    },
+    onJfbUpdate(...data) {
+      console.log("event.onJfbUpdate", data);
+    },
+    onJfbCustomEvent(options) {
+      console.log("event.onJfbReachBottom", options);
+    },
+  },
+};
 </script>
 
 <style scoped lang="less">
-  @import "./JfbTakeorderOrderListLess.less";
-
-  .jfb-takeorder-order-list {
-    &__body{
+@import "./JfbTakeorderOrderListLess.less";
 
-    }
+.jfb-takeorder-order-list {
+  &__body {
+    // 订单列表容器样式
+    padding: 0;
   }
+}
 </style>

package/src/components/JfbTakeorderOrderList/Mock.js

@@ -2,7 +2,7 @@
 
 module.exports = {
   
-  getOrderByIdFilmSquate:{},
+  getOrderList: { "list": [{ "order_id": "h867336984252252161", "order_status": "quoting", "shop_name": "星巴克(平谷国泰店)", "brand_name": "星巴克", "province_name": "平谷区", "market_amount": 525, "suggest_min_quotation": 116, "suggest_max_quotation": 171, "rest_quotation_time": 12, "rest_receive_time": 0, "rest_report_time": 0, "quotation_person_count": 0, "user_quotation": 0, "user_quotation_status": "wait_quote", "product_list": [{ "product_name": "星巴克经典咖啡", "product_sku_name": "大杯\/特别热\/经典糖\/标准\/全脂牛奶", "product_thumb": "https:\/\/www.shuomingshu.cn\/wp-content\/uploads\/images\/2023\/01\/07\/dc0bdf6bfedb4038911ec6550fd31d62_5t1vcuagbok.jpg", "product_num": 5, "market_price": 382, "suggest_min_quotation": 23, "suggest_max_quotation": 34, "user_quotation": 0 }], "button_list": [] }], "next_page_token": "", "request_id": "c1dfb0423e9c83df" },
   
   updateOrderFilmPaiqiDate:{},