jufubao-takeorder 1.0.2-beta6 → 1.0.2-beta8

package/package.json

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

package/src/components/JfbTakeorderIndex/JfbTakeorderIndex.vue

@@ -23,33 +23,38 @@
       <view class="menu_wrap" :style="[menuWrapBoxStyle]">
         <view class="jfb-takeorder-index__body-filter">
           <view
-            :style="{ color: filterType === 'province' ? mainColor : '' }"
+            :style="{ color: (filterType === 'province' || selectedProvs.length > 0) ? mainColor : '' }"
             @click="handleSwitchFilter('province')"
             class="jfb-takeorder-index__body-filter-item"
-            ><view>省份</view
-            ><XdFontIcon
+            >
+            <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"
               icon="iconxia_down"
             ></XdFontIcon
           ></view>
           <view
-            :style="{ color: filterType === 'city' ? mainColor : '' }"
+            :style="{ color: (filterType === 'city' || selectedCity.length > 0) ? mainColor : '' }"
             @click="handleSwitchFilter('city')"
             class="jfb-takeorder-index__body-filter-item"
-            ><view>城市</view
-            ><XdFontIcon
+            ><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"
               icon="iconxia_down"
             ></XdFontIcon
           ></view>
           <view
-            :style="{ color: filterType === 'brand' ? mainColor : '' }"
+            :style="{ color: (filterType === 'brand' || selectedBrands.length > 0) ? mainColor : '' }"
             @click="handleSwitchFilter('brand')"
             class="jfb-takeorder-index__body-filter-item"
-            ><view>品牌</view
-            ><XdFontIcon
+            ><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"
               icon="iconxia_down"
@@ -228,6 +233,9 @@ export default {
       isPreview: false,
       isOpenNew: "N",
       isOpenWin: "N",
+      selectedProvsName: [],
+      selectedCityName: [],
+      selectedBrandsName: [],
     };
   },
   computed: {
@@ -518,11 +526,13 @@ export default {
         // 如果“全部”未被选中，则只选中“全部”
         else {
           this.selectedProvs = ["all"];
+          this.selectedProvsName = ["全部"];
         }
       } else {
         // 如果当前选中了“全部”，则先取消“全部”的选择
         if (this.selectedProvs.includes("all")) {
           this.selectedProvs = []; // 清空，准备添加具体选项
+          this.selectedProvsName = [];
         }
 
         const index = this.selectedProvs.findIndex(
@@ -531,14 +541,16 @@ export default {
         if (index > -1) {
           // 如果已选中，则取消选择
           this.selectedProvs.splice(index, 1);
-
+          this.selectedProvsName.splice(index, 1);
           // 【可选】当所有具体选项都被取消时，自动选中“全部”
           if (this.selectedProvs.length === 0) {
             this.selectedProvs = ["all"];
+            this.selectedProvsName = ["全部"];
           }
         } else {
           // 如果未选中，则添加
           this.selectedProvs.push(item.value);
+          this.selectedProvsName.push(item.label);
         }
       }
     },
@@ -550,9 +562,11 @@ export default {
       if (index > -1) {
         // 如果已选中，则取消选择
         this.selectedBrands.splice(index, 1);
+        this.selectedBrandsName.splice(index, 1);
       } else {
         // 如果未选中，则添加
         this.selectedBrands.push(item.value);
+        this.selectedBrandsName.push(item.label);
       }
     },
     handleGetNew() {
@@ -636,20 +650,25 @@ export default {
       if (index > -1) {
         // 如果已选中，则取消选择
         this.selectedCity.splice(index, 1);
+        this.selectedCityName.splice(index, 1);
       } else {
         // 如果未选中，则添加
         this.selectedCity.push(city.city_code);
+        this.selectedCityName.push(city.city_name);
       }
     },
     handleResetFilter() {
       if (this.filterType === "province") {
         this.selectedProvs = [];
+        this.selectedProvsName = [];
       }
       if (this.filterType === "brand") {
         this.selectedBrands = [];
+        this.selectedBrandsName = [];
       }
       if (this.filterType === "city") {
         this.selectedCity = [];
+        this.selectedCityName = [];
       }
       this.filterType = "";
       this.showFilterQuery = false;
@@ -679,10 +698,7 @@ export default {
       }
     },
     onJfbShow(options) {
-      // 页面显示时恢复轮询
-      if (!this.pollTimer) {
-        this.startPolling();
-      }
+      this.onJfbLoad(options);
       console.log("event.onJfbShow", options);
     },
     onJfbHide(options) {
@@ -743,6 +759,13 @@ export default {
           margin-right: 10rpx;
         }
       }
+      &-text {
+        max-width: 90rpx;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        min-width: 0;
+      }
     }
     &-query {
       &-filter {

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>
@@ -169,7 +166,7 @@
           <input
             :disabled="quoteDisabled"
             v-model="quotePrice"
-            placeholder="请输入单张报价金额"
+            placeholder="请输入订单报价金额"
           />
         </view>
         <view class="quote-advice"
@@ -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();
@@ -618,7 +619,7 @@ export default {
         100
       );
       const price = parseFloat(this.quotePrice);
-      if (price < min || price > max) {
+      if (price > max) {
         this.$xdAlert({ content: `报价价格只能在建议报价区间内` });
         return;
       }
@@ -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

@@ -270,10 +270,7 @@ export default {
       }
     },
     onJfbShow(options) {
-      // 页面显示时恢复轮询
-      if (!this.pollTimer) {
-        this.startPolling();
-      }
+      this.onJfbLoad(options);      
     },
     onJfbHide(options) {
       // 页面隐藏时暂停轮询