jufubao-takeorder 1.0.2-beta5 → 1.0.2-beta7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-takeorder",
-  "version": "1.0.2-beta5",
+  "version": "1.0.2-beta7",
   "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: {
@@ -332,9 +340,12 @@ export default {
         page_size: this.page_size, // 每页数量
       };
 
-      // 只有当有选择时，才添加筛选参数
+      // 只有当有选择时，才添加筛选参数，如果选择了 'all' 则不传
       if (this.selectedProvs && this.selectedProvs.length > 0) {
-        params.province_codes = this.selectedProvs;
+        // 如果只有一个选项且为 '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;
@@ -515,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(
@@ -528,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);
         }
       }
     },
@@ -547,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() {
@@ -633,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;
@@ -740,6 +762,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

@@ -169,7 +169,7 @@
           <input
             :disabled="quoteDisabled"
             v-model="quotePrice"
-            placeholder="请输入单张报价金额"
+            placeholder="请输入订单报价金额"
           />
         </view>
         <view class="quote-advice"
@@ -196,7 +196,7 @@
             :key="index"
           >
             <view class="voucher-item-image">
-              <image :src="item.report_voucher" />
+              <image :src="item.report_voucher_preview_url" />
               <view>凭证图</view>
             </view>
             <view>
@@ -509,7 +509,7 @@ export default {
       };
     },
     quotePriceTotal() {
-      return this.quotePrice * this.info.product_total;
+      return this.$xdUniHelper.multiplyFloatNumber(this.quotePrice, this.info.product_total);
     },
   },
   watch: {
@@ -618,7 +618,7 @@ export default {
         100
       );
       const price = parseFloat(this.quotePrice);
-      if (price < min || price > max) {
+      if (price > max) {
         this.$xdAlert({ content: `报价价格只能在建议报价区间内` });
         return;
       }
@@ -864,7 +864,8 @@ export default {
             .then((res1) => {
               console.log("event.getImagePreview", res);
               let obj = {
-                report_voucher: res1.preview_url,
+                report_voucher: files[0].url,
+                report_voucher_preview_url: res1.preview_url,
                 code_list: res.list.map((item) => {
                   if (item.show_type === "qrcode") {
                     let reg = /^(http:\/\/|https:\/\/|\/\/)+.+$/;

package/src/components/JfbTakeorderOrderList/JfbTakeorderOrderList.vue

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