jufubao-takeorder 1.0.2-beta7 → 1.0.2-beta9

package/package.json

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

package/src/components/JfbTakeorderIndex/JfbTakeorderIndex.vue

@@ -23,13 +23,19 @@
       <view class="menu_wrap" :style="[menuWrapBoxStyle]">
         <view class="jfb-takeorder-index__body-filter">
           <view
-            :style="{ color: (filterType === 'province' || selectedProvs.length > 0) ? mainColor : '' }"
+            :style="{
+              color:
+                filterType === 'province' || selectedProvs.length > 0
+                  ? mainColor
+                  : '',
+            }"
             @click="handleSwitchFilter('province')"
             class="jfb-takeorder-index__body-filter-item"
-            >
-            <view v-if="selectedProvs.length===0">省份</view
-            >
-            <view v-else class="jfb-takeorder-index__body-filter-text">{{ selectedProvsName.join('') }}</view>
+          >
+            <view v-if="selectedProvs.length === 0">省份</view>
+            <view v-else class="jfb-takeorder-index__body-filter-text">{{
+              selectedProvsName.join("")
+            }}</view>
             <XdFontIcon
               style="font-weight: bolder"
               size="20"
@@ -37,11 +43,18 @@
             ></XdFontIcon
           ></view>
           <view
-            :style="{ color: (filterType === 'city' || selectedCity.length > 0) ? mainColor : '' }"
+            :style="{
+              color:
+                filterType === 'city' || selectedCity.length > 0
+                  ? mainColor
+                  : '',
+            }"
             @click="handleSwitchFilter('city')"
             class="jfb-takeorder-index__body-filter-item"
-            ><view v-if="selectedCity.length===0">城市</view
-            ><view v-else class="jfb-takeorder-index__body-filter-text">{{ selectedCityName.join('') }}</view>
+            ><view v-if="selectedCity.length === 0">城市</view
+            ><view v-else class="jfb-takeorder-index__body-filter-text">{{
+              selectedCityName.join("")
+            }}</view>
             <XdFontIcon
               style="font-weight: bolder"
               size="20"
@@ -49,11 +62,18 @@
             ></XdFontIcon
           ></view>
           <view
-            :style="{ color: (filterType === 'brand' || selectedBrands.length > 0) ? mainColor : '' }"
+            :style="{
+              color:
+                filterType === 'brand' || selectedBrands.length > 0
+                  ? mainColor
+                  : '',
+            }"
             @click="handleSwitchFilter('brand')"
             class="jfb-takeorder-index__body-filter-item"
-            ><view v-if="selectedBrands.length===0">品牌</view
-            ><view v-else class="jfb-takeorder-index__body-filter-text">{{ selectedBrandsName.join('') }}</view>
+            ><view v-if="selectedBrands.length === 0">品牌</view
+            ><view v-else class="jfb-takeorder-index__body-filter-text">{{
+              selectedBrandsName.join("")
+            }}</view>
             <XdFontIcon
               style="font-weight: bolder"
               size="20"
@@ -228,7 +248,7 @@ export default {
       page_token: 1,
       hasNext: true,
       next_page_token: "",
-      max_id: null,
+      max_id: 0,
       order_detail_path: "",
       isPreview: false,
       isOpenNew: "N",
@@ -343,7 +363,9 @@ export default {
       // 只有当有选择时，才添加筛选参数，如果选择了 'all' 则不传
       if (this.selectedProvs && this.selectedProvs.length > 0) {
         // 如果只有一个选项且为 'all'，则不传 province_codes
-        if (!(this.selectedProvs.length === 1 && this.selectedProvs[0] === 'all')) {
+        if (
+          !(this.selectedProvs.length === 1 && this.selectedProvs[0] === "all")
+        ) {
           params.province_codes = this.selectedProvs;
         }
       }
@@ -496,13 +518,16 @@ export default {
      * 处理子组件派发的 'expire' 事件
      * 订单倒计时结束后，从列表中删除该订单
      */
-    handleOrderExpire(orderId) {
+    handleOrderExpire(order) {
       if (this.isPreview) return;
       const orderIndex = this.orderList.findIndex(
-        (item) => item.order_id === orderId
+        (item) => item.order_id === order.order_id
       );
       if (orderIndex === -1) return;
-
+      if (order.user_quotation_status === "quoted") {
+        this.handleRefresh();
+        return;
+      }
       // 从列表中删除该订单
       this.orderList.splice(orderIndex, 1);
     },
@@ -574,7 +599,7 @@ export default {
         vm: this,
         data: {
           order_type: this.order_type,
-          max_id: this.max_id || 0,
+          max_id: this.max_id,
         },
       })
         .then((res) => {
@@ -608,7 +633,9 @@ export default {
               });
             }
           }
-          this.max_id = res.new_order_max_id;
+          if (res.new_order_max_id > this.max_id) {
+            this.max_id = res.new_order_max_id;
+          }
           this.showNew = res.is_exist_new_order;
         })
         .catch((err) => {
@@ -698,10 +725,7 @@ export default {
       }
     },
     onJfbShow(options) {
-      // 页面显示时恢复轮询
-      if (!this.pollTimer) {
-        this.startPolling();
-      }
+      this.onJfbLoad(options);
       console.log("event.onJfbShow", options);
     },
     onJfbHide(options) {

package/src/components/JfbTakeorderOrderDetail/JfbTakeorderOrderDetail.vue

@@ -27,9 +27,8 @@
     >
       <view
         v-if="
-          (info.user_quotation_status === 'received' ||
-            info.user_quotation_status === 'win_order') &&
-          info.order_status !== 'close'
+          info.user_quotation_status === 'received' ||
+          info.user_quotation_status === 'win_order'
         "
         class="jfb-takeorder-order-detail__countdown-banner"
         :style="{ backgroundColor: mainColor }"
@@ -58,7 +57,7 @@
         v-if="
           info.user_quotation_status === 'wait_quote' ||
           info.user_quotation_status === 'quoted' ||
-          info.order_status === 'close' ||
+          info.user_quotation_status === 'close' ||
           info.user_quotation_status === 'cancel_quotation'
         "
         class="wrap"
@@ -68,7 +67,7 @@
           v-if="
             step === 1 ||
             info.user_quotation_status === 'quoted' ||
-            info.order_status === 'close'
+            info.user_quotation_status === 'close'
           "
         >
           <view>市场原价（仅供参考）</view>
@@ -91,7 +90,7 @@
           v-if="
             step === 1 ||
             info.user_quotation_status === 'quoted' ||
-            info.order_status === 'close'
+            info.user_quotation_status === 'close'
           "
         >
           <view>报价人数</view>
@@ -102,7 +101,7 @@
           v-if="
             step === 1 ||
             info.user_quotation_status === 'quoted' ||
-            info.order_status === 'close'
+            info.user_quotation_status === 'close'
           "
         >
           <view>报价倒计时</view>
@@ -158,9 +157,7 @@
           (info.user_quotation_status === 'cancel_quotation' ||
             info.user_quotation_status === 'wait_quote' ||
             info.user_quotation_status === 'quoted') &&
-          step !== 2 &&
-          info.order_status !== 'reported' &&
-          info.order_status !== 'close'
+          step !== 2
         "
       >
         <view class="quote-title">订单报价</view>
@@ -185,8 +182,8 @@
       <view
         class="wrap upload"
         v-if="
-          info.user_quotation_status === 'received' &&
-          info.order_status !== 'close'
+          info.user_quotation_status === 'received' ||
+          info.user_quotation_status === 'reported'
         "
       >
         <view class="voucher" v-if="voucherImages && voucherImages.length > 0">
@@ -223,7 +220,7 @@
             </view>
           </view>
         </view>
-        <view style="display: flex; justify-content: center">
+        <view v-if="info.user_quotation_status === 'received'" style="display: flex; justify-content: center">
           <xd-upload
             @on-done="handleUploadDone"
             selectType="image"
@@ -242,7 +239,7 @@
             >
           </xd-upload>
         </view>
-        <view class="upload-notice">
+        <view v-if="info.user_quotation_status === 'received'" class="upload-notice">
           <text>请务必按真实报单并仔细校对取餐码正确无误，</text>
           <text :style="{ color: mainColor }"
             >取餐码错误或未上报真实取餐码造成客诉产生损失将由您承担！</text
@@ -251,9 +248,9 @@
       </view>
       <view
         v-if="
-          (info.order_status === 'close' || info.order_status === 'quoting') &&
-          notice &&
-          info.user_quotation_status !== 'received'
+          (info.user_quotation_status === 'close' ||
+            info.user_quotation_status === 'quoted') &&
+          notice
         "
         class="special-tip wrap"
         style="padding: 24rpx 32rpx"
@@ -273,7 +270,10 @@
       <view v-if="!isCountdownEnd" :style="{ height: '100rpx' }"></view>
       <view
         :key="info.user_quotation_status"
-        v-if="info.order_status !== 'close' && info.order_status !== 'reported'"
+        v-if="
+          info.user_quotation_status !== 'close' &&
+          info.user_quotation_status !== 'reported'
+        "
         class="fixe_bottom"
         :style="prod_bottom"
       >
@@ -478,7 +478,7 @@ export default {
       // 上报倒计时定时器标识
       reportCountdownTimer: null,
       // 上报倒计时剩余秒数（10分钟 = 600秒）
-      reportCountdownSeconds: 600,
+      reportCountdownSeconds: 0,
       quotePrice: "",
       closeMask: true,
       showConfirmDialog: false,
@@ -509,7 +509,10 @@ export default {
       };
     },
     quotePriceTotal() {
-      return this.$xdUniHelper.multiplyFloatNumber(this.quotePrice, this.info.product_total);
+      return this.$xdUniHelper.multiplyFloatNumber(
+        this.quotePrice,
+        this.info.product_total
+      );
     },
   },
   watch: {
@@ -566,11 +569,9 @@ export default {
             this.quoteDisabled = true;
           }
           if (
-            (this.info.user_quotation_status === "cancel_quotation" ||
-              this.info.user_quotation_status === "wait_quote" ||
-              this.info.user_quotation_status === "quoted") &&
-            this.info.order_status !== "reported" &&
-            this.info.order_status !== "close"
+            this.info.user_quotation_status === "cancel_quotation" ||
+            this.info.user_quotation_status === "wait_quote" ||
+            this.info.user_quotation_status === "quoted"
           ) {
             this.startCountdown();
           }
@@ -582,7 +583,7 @@ export default {
             //如果已接单，开启十分钟上报订单倒计时
             this.startReportCountdown();
           }
-          if (this.info.order_status === "close") {
+          if (this.info.user_quotation_status === "close") {
             //如果订单已关闭，则隐藏所有按钮，并且清除倒计时
             this.isCountdownEnd = true;
             this.clearReceiveCountdown();
@@ -772,7 +773,7 @@ export default {
       // 先清除可能存在的旧定时器，防止重复计时
       this.clearReportCountdown();
       // 初始化倒计时秒数（10分钟 = 600秒），如果有接口返回的时间则使用接口返回的时间
-      this.reportCountdownSeconds = this.info.rest_report_time || 600;
+      this.reportCountdownSeconds = this.info.rest_report_time;
       this.isReportCountdownEnd = false;
 
       // 创建每秒执行的定时器

package/src/components/JfbTakeorderOrderList/JfbTakeorderOrderList.vue

@@ -82,7 +82,7 @@ export default {
       isPreview: false,
       isOpenNew: "N",
       isOpenWin: "N",
-      max_id: null,
+      max_id: 0,
     };
   },
   watch: {
@@ -185,13 +185,17 @@ export default {
      * 处理子组件派发的 'expire' 事件
      * 订单倒计时结束后，从列表中删除该订单
      */
-    handleOrderExpire(orderId) {
+    handleOrderExpire(order) {
       if (this.isPreview) return;
       const orderIndex = this.orderList.findIndex(
-        (item) => item.order_id === orderId || item.id === orderId
+        (item) => item.order_id === order.order_id
       );
       if (orderIndex === -1) return;
-
+      //如果用户状态为已报价，倒计时结束后则刷新列表，并return
+      if (order.user_quotation_status === "quoted") {
+        this.handleRefresh();
+        return;
+      }
       // 从列表中删除该订单
       this.orderList.splice(orderIndex, 1);
     },
@@ -215,28 +219,42 @@ export default {
         vm: this,
         data: {
           order_type: this.order_type,
-          max_id: this.max_id || 0,
+          max_id: this.max_id,
         },
       }).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' });
+            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' });
+              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' });
+            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.voiceAlert({
+              type: "win",
+              filePath: "https://img.jufubao.cn/takeorder/wait_order.mp3",
+            });
           }
         }
-        this.max_id = res.new_order_max_id;
+        if (res.new_order_max_id > this.max_id) {
+          this.max_id = res.new_order_max_id;
+        }
         this.showNew = res.is_exist_new_order;
       });
     },
@@ -270,7 +288,7 @@ export default {
       }
     },
     onJfbShow(options) {
-      this.onJfbLoad(options);      
+      this.onJfbLoad(options);
     },
     onJfbHide(options) {
       // 页面隐藏时暂停轮询