jufubao-takeorder 1.0.2-beta4 → 1.0.2-beta6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-takeorder",
-  "version": "1.0.2-beta4",
+  "version": "1.0.2-beta6",
   "private": false,
   "description": "聚福宝业务组件基础插件包",
   "main": "index.js",

package/src/components/JfbTakeorderFilterOrderList/Api.js

@@ -6,52 +6,37 @@
  */
 module.exports = [
   {
-    //设置方法名字当别忘记加上【模块名字】：Filter
-    mapFnName: 'getFilterByIdFilmSquate',
-    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,
   },
   {
-    //设置方法名字当别忘记加上【模块名字】：Filter
-    mapFnName: 'updateFilterFilmPaiqiDate',
-    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,
   },
   {
-    //设置方法名字当别忘记加上【模块名字】：Filter
-    mapFnName: 'removeFilterFilmAddress',
-    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,
-  },
-  {
-    //设置方法名字当别忘记加上【模块名字】：Filter
-    mapFnName: 'addFilterFilmcart',
-    title: '添加购物车',
-    path: '/api/account/film/paiqi-date',
-    isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
-    },
+    params: {},
     isConsole: true,
     disabled: true,
   },

package/src/components/JfbTakeorderFilterOrderList/Attr.js

@@ -1,12 +1,16 @@
 'use strict';
+import Style from './cusAttr/style'
+import Advanced from './cusAttr/advanced'
+import Content from './cusAttr/content'
 
-/**
- * @description 当表单组件中有联动操作时候，使用方法进行返回
- */
 export default {
   style: [],
-  content: (data) => {
-    return [].filter(i=>i)
+  content: (data, gValue, gColor, oldData) => {
+    return [
+      ...Content(data, gValue, gColor, oldData),
+      ...Style(data, gValue, gColor, oldData),
+      ...Advanced(data, gValue, gColor, oldData),
+    ].filter(i => i)
   },
   advanced: [],
-};
+}

package/src/components/JfbTakeorderFilterOrderList/JfbTakeorderFilterOrderList.vue

@@ -2,21 +2,28 @@
   <view
     class="jfb-takeorder-filter-order-list"
     @click="handleEditxSelect"
-    :class="{ editx : isEditx && active }"
+    :class="{ editx: isEditx && active }"
   >
     <!--#ifdef H5-->
     <view
       class="jfb-takeorder-filter-order-list__edit"
-      :class="{ editx : isEditx && active }"
+      :class="{ editx: isEditx && active }"
       v-if="isEditx && active"
     >
-      <view class="jfb-takeorder-filter-order-list__edit-icon" @click.stop="delEdit">
-        <xd-font-icon icon="iconshanchu-01" color="#fff" size="30"></xd-font-icon>
+      <view
+        class="jfb-takeorder-filter-order-list__edit-icon"
+        @click.stop="delEdit"
+      >
+        <xd-font-icon
+          icon="iconshanchu-01"
+          color="#fff"
+          size="30"
+        ></xd-font-icon>
       </view>
     </view>
     <!-- #endif -->
     <view class="jfb-takeorder-filter-order-list__body">
-      <view class="fixed_top" :style="{top: (layoutInfo.top - 2)+'rpx'}">
+      <view class="fixed_top" :style="{ top: layoutInfo.top - 2 + 'rpx' }">
         <xd-tab
           v-if="initStatus"
           :tabIndex="tabIndex"
@@ -27,184 +34,320 @@
           @onTab="handleChange"
         ></xd-tab>
       </view>
-      <view style="height: 100rpx;"></view>
+      <view style="height: 100rpx"></view>
       <view v-for="(item, index) in orderList" :key="index">
-        <Order
+        <CusTakeorder
+          :isNeedCutDown="false"
           :item="item"
           :mainColor="mainColor"
-          :isNeedCutDown="false"
           @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 JfbTakeorderFilterOrderListMixin from "./JfbTakeorderFilterOrderListMixin";
-  import { getContainerPropsValue } from "@/utils/xd.base";
-  import componentsMixins from "@/mixins/componentsMixins";
-  import XdTab from "@/components/XdTab/XdTab";
-  import extsMixins from "@/mixins/extsMixins";
-  import Order from "./components/order.vue";
-  export default {
-    name: "JfbTakeorderFilterOrderList",
-    components: {
-      XdFontIcon,
-      XdTab,
-      Order
-    },
-    mixins: [
-      componentsMixins, extsMixins, JfbTakeorderFilterOrderListMixin
-    ],
-    data() {
-      return {
-        initStatus: false,
-        tabIndex: 0,
-        tabList: [
-          {"name": "全部", "value": 'all'},
-          { "name": "待上报", "value": 'wait_report' },
-          { "name": "待结算", "value": 'wait_settle' },
-          {"name": "已完成", "value": 'com'},
-          { "name": "纠纷中", "value": 'dispute' },
-        ],
-        page_size: 10,
-        page_token: 1,
-        hasNext: true,
-        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,
-          },
-        ],
-        //todo
-      }
-    },
-    watch: {
-      container(value, oldValue) {
-        if (JSON.stringify(value) === JSON.stringify(oldValue)) return;
-        if (this.$configProject['isPreview']) this.init(value)
-      },
-    },
-    created() {
-      this.init(this.container);
+import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
+import { jfbRootExec } from "@/utils/xd.event";
+import JfbTakeorderFilterOrderListMixin from "./JfbTakeorderFilterOrderListMixin";
+import { getContainerPropsValue } from "@/utils/xd.base";
+import componentsMixins from "@/mixins/componentsMixins";
+import XdTab from "@/components/XdTab/XdTab";
+import extsMixins from "@/mixins/extsMixins";
+import CusTakeorder from "@/components/CusTakeorder/CusTakeorder";
+import XdNoData from "@/components/XdNoData/XdNoData";
+import getServiceUrl from "@/common/getServiceUrl";
 
+export default {
+  name: "JfbTakeorderFilterOrderList",
+  components: {
+    XdFontIcon,
+    XdTab,
+    CusTakeorder,
+    XdNoData,
+  },
+  mixins: [componentsMixins, extsMixins, JfbTakeorderFilterOrderListMixin],
+  data() {
+    return {
+      initStatus: false,
+      tabIndex: 0,
+      tabList: [
+        { name: "全部", value: "all" },
+        { name: "待上报", value: "wait_report" },
+        { name: "待结算", value: "wait_settle" },
+        { name: "已完成", value: "com" },
+        { name: "纠纷中", value: "dispute" },
+      ],
+      page_size: 10,
+      page_token: 1,
+      hasNext: true,
+      next_page_token: "",
+      orderList: [],
+      order_type: "hourdash",
+      orderTab: "",
+      order_detail_path: "",
+      isPreview: false,
+      isOpenNew: "N",
+      isOpenWin: "N",
+      max_id: null,
       //todo
+    };
+  },
+  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: {
+    onJfbLoad(options) {
+      let status = options.status || options.type;
+      //地址栏设置值
+      if (status) {
+        this.tabIndex = this.tabList.findIndex((item) => {
+          return item.value === status;
+        });
+      }
+      this.initStatus = true;
+      this.getList(status);
+      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();
+        });
+      }
+    },
+    /**
+     * @description 监听事件变化
+     * @param container {object} 业务组件对象自己
+     */
+    init(container) {
+      this.order_detail_path = getContainerPropsValue(
+        container,
+        "content.order_detail_path",
+        { value: "" }
+      ).value;
+      if (this.$configProject["isPreview"]) {
+        this.isPreview = true;
+      }
     },
-    methods: {
-      onJfbLoad(options) {
-        let status = options.status || options.type;
-        //地址栏设置值
-        if (status) {
-          this.tabIndex = this.tabList.findIndex((item) => {
-            return item.status === status;
+    getList(status) {
+      jfbRootExec("getOrderList", {
+        vm: this,
+        data: {
+          tab: status,
+          order_type: this.order_type,
+          page_token: this.page_token,
+          page_size: this.page_size,
+        },
+      })
+        .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;
           });
-        }
-        this.initStatus = true;
-        this.getList(status);
-      },
-      /**
-       * @description 监听事件变化
-       * @param container {object} 业务组件对象自己
-       */
-      init(container) {
+          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);
+        });
+    },
+    // 语音提示方法
+    voiceAlert(type) {
+      // #ifdef H5
+      this.playWebSpeech(type);
+      // #endif
 
-        //this.bgcolor = getContainerPropsValue(container, 'content.bgcolor', '#fff');
+      // #ifdef APP-PLUS || MP-WEIXIN
+      this.playAudioFile(type);
+      // #endif
+    },
 
-        //this.height = getContainerPropsValue(container, 'content.height', 10);
-      },
-      getList(status) {
-        
-      },
-      handleChange(item, index) {
-        if (index === this.tabIndex) return;
-        this.tabIndex = index;
-        this.page_token = 1;
-        this.hasNext = true;
-        this.getList(item);
-        // #ifdef H5
-        let params = this.$xdUniHelper.parseURL().params;
-        params["type"] = item.status;
-        history.replaceState(
-          null,
-          null,
-          `?${this.$xdUniHelper.jsonToParams(params)}`
-        );
-        // #endif
-      },
-      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)
-      },
-    }
-  }
+    // H5端使用Web Speech API
+    playWebSpeech(type) {
+      if ("speechSynthesis" in window) {
+        const msg = new SpeechSynthesisUtterance();
+        msg.text =
+          type === "new"
+            ? "您有新的订单请及时处理"
+            : "您有新的中标订单请及时处理";
+        msg.lang = "zh-CN";
+        msg.volume = 1;
+        speechSynthesis.speak(msg);
+      }
+    },
 
+    // App和小程序端使用音频文件
+    playAudioFile() {
+      const innerAudioContext = uni.createInnerAudioContext();
+      innerAudioContext.autoplay = true;
+      innerAudioContext.src = "/static/order-alert.mp3";
+      innerAudioContext.onPlay(() => {
+        console.log("开始播放");
+      });
+    },
+    /**
+     * 处理按钮事件，跳转到订单详情
+     * @param {Object} item - 订单对象
+     */
+    handleBtnEvent({ item, btn }) {
+      // 跳转到订单详情页
+      this.$xdUniHelper.navigateTo({
+        url: `${this.order_detail_path}?order_id=${item.order_id}`,
+      });
+    },
+    /**
+     * 获取新订单通知
+     */
+    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;
+      });
+    },
+    handleChange(item, index) {
+      if (index === this.tabIndex) return;
+      this.tabIndex = index;
+      this.orderTab = item.value;
+      this.page_token = 1;
+      this.hasNext = true;
+      this.getList(item.value);
+      // #ifdef H5
+      let params = this.$xdUniHelper.parseURL().params;
+      params["type"] = item.value;
+      history.replaceState(
+        null,
+        null,
+        `?${this.$xdUniHelper.jsonToParams(params)}`
+      );
+      // #endif
+    },
+    /**
+     * 启动轮询定时器
+     */
+    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) {
+      console.log("event.onJfbScroll", options);
+    },
+    onJfbReachBottom(options) {
+      if (this.hasNext) {
+        this.page_token = this.next_page_token;
+        this.getList(this.orderTab);
+      }
+    },
+    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 "./JfbTakeorderFilterOrderListLess.less";
+@import "./JfbTakeorderFilterOrderListLess.less";
 
-  .jfb-takeorder-filter-order-list {
-    &__body{
-      .fixed_top{
-        position: fixed;
-        top: 0;
-        left: 0;
-        width: 100%;
-        background: #FFFFFF;
-        z-index: 999;
-      }
+.jfb-takeorder-filter-order-list {
+  &__body {
+    .fixed_top {
+      position: fixed;
+      top: 0;
+      left: 0;
+      width: 100%;
+      background: #ffffff;
+      z-index: 999;
     }
   }
+}
 </style>

package/src/components/JfbTakeorderFilterOrderList/Mock.js

@@ -2,7 +2,7 @@
 
 module.exports = {
   
-  getFilterByIdFilmSquate:{},
+  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" },
   
   updateFilterFilmPaiqiDate:{},
   

package/src/components/JfbTakeorderFilterOrderList/cusAttr/advanced.js

@@ -0,0 +1,26 @@
+'use strict';
+import {
+  dataVal,
+  statusDataVal,
+  statusShow
+} from "@/utils/AttrTools";
+export default (data, gValue, gColor, oldData = {}) => {
+  return [
+    {
+      label: '订单详情',
+      ele: 'xd-select-pages-path',
+      labelInline: true,
+      valueKey: 'order_detail_path',
+      placeholder: '请选择订单详情页面',
+      className: 'input100',
+      value: dataVal({ data, key: 'order_detail_path', dValue: null, gValue }),
+      groupKey: 'advanced',
+      inline: false,
+      setting: {
+        mode: 'new',
+        router: XdBus.getParentApi('getPagesTree'),
+      },
+    },
+  ].filter(i => i)
+}
+

package/src/components/JfbTakeorderFilterOrderList/cusAttr/content.js

@@ -0,0 +1,9 @@
+'use strict';
+
+import { customVal, dataVal } from "@/utils/AttrTools";
+
+export default (data, gValue, gColor, oldData = {}) => {
+  return [
+  ].filter(i => i)
+}
+

package/src/components/JfbTakeorderFilterOrderList/cusAttr/style.js

@@ -0,0 +1,11 @@
+'use strict';
+import {
+  dataVal,
+  statusShow,
+  statusDataVal,
+} from "@/utils/AttrTools";
+
+export default function (data, gValue, gColor, oldData) {
+  return [].filter(i => i)
+}
+