dolphin-weex-bc 0.0.22 → 0.0.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dolphin-weex-bc",
-  "version": "0.0.22",
+  "version": "0.0.23",
   "description": "",
   "main": "index.js",
   "directories": {

package/packages/dof-consumables/index.vue

@@ -2,7 +2,7 @@
   <div class="material-wrapper" :style="{ width: width + 'px' }" ref="materialBox">
     <template v-for="(item, index) in deviceMaterialList">
       <!-- 展示不同模式下的样式 -->
-      <template v-if="isFilterShow">
+      <!-- <template v-if="isFilterShow">
         <div
           class="l-tittle-insufficient-box"
           v-if="index == 0 && (deviceTotal[0] > 0 || deviceTotal[0] === ' ')"
@@ -23,6 +23,28 @@
           :key="index"
           >耗材充足（{{ materialTotal[2] }}）</text
         >
+      </template> -->
+      <template v-if="isFilterShow">
+        <div
+          class="l-tittle-insufficient-box"
+          v-if="item.categorySort === 'insufficient' && item.categoryNum"
+          :key="item.applianceCode"
+        >
+          <text :class="['l-tittle', isDiablo && 'l-tittle-isDiablo']">耗材不足（{{ item.categoryNum }}）</text>
+          <slot name="filterShowAddCar"></slot>
+        </div>
+        <text
+          :key="item.applianceCode"
+          :class="['l-tittle', isDiablo && 'l-tittle-isDiablo']"
+          v-if="item.categorySort === 'unknown' && item.categoryNum"
+          >耗材数据未知（{{ item.categoryNum }}）</text
+        >
+        <text
+          :key="item.applianceCode"
+          :class="['l-tittle', isDiablo && 'l-tittle-isDiablo']"
+          v-if="item.categorySort === 'sufficient' && item.categoryNum"
+          >耗材充足（{{ item.categoryNum }}）</text
+        >
       </template>
       <div
         class="material-list"
@@ -297,18 +319,6 @@ export default {
       type: Boolean,
       default: false
     },
-    deviceTotal: {
-      type: Array,
-      default: () => {
-        return []
-      }
-    },
-    materialTotal: {
-      type: Array,
-      default: () => {
-        return []
-      }
-    },
     isFilterShow: {
       type: Boolean,
       default: false // 是否是分层模式
@@ -464,12 +474,12 @@ export default {
       // 1购买
       if (it.btnType == 1) {
         let activeUrl = it.purchaseInfo ? it.purchaseInfo.linkUrl : ''
-        let searchPage = it.purchaseInfo ? it.purchaseInfo.searchPage : ''
-        if (searchPage) {
-          searchPage = searchPage.includes('?')
-            ? `${searchPage}&entrance=consumables`
-            : `${searchPage}?entrance=consumables`
-          this.goodsjumpWebViewNew(searchPage)
+        let searchLinkUrl = it.purchaseInfo ? it.purchaseInfo.searchLinkUrl : ''
+        if (searchLinkUrl) {
+          searchLinkUrl = searchLinkUrl.includes('?')
+            ? `${searchLinkUrl}&entrance=consumables`
+            : `${searchLinkUrl}?entrance=consumables`
+          this.goodsjumpWebViewNew(searchLinkUrl)
         } else if (it.purchaseInfo && it.purchaseInfo.skuId) {
           this.goToGoodsDetail(it.purchaseInfo)
         } else if (it.goodsInfo && (it.goodsInfo.skulink || it.goodsInfo.skuId)) {
@@ -564,12 +574,12 @@ export default {
 
       if (it.serviceSupport && it.serviceSupport.washingService && it.serviceSupport.washingService.enable) {
         let activeUrl = it.serviceSupport.washingService.serviceUrl
-        let searchPage = it.serviceSupport.washingService.searchPage
-        if (searchPage) {
-          searchPage = searchPage.includes('?')
-            ? `${searchPage}&entrance=consumables`
-            : `${searchPage}?entrance=consumables`
-          this.goodsjumpWebViewNew(searchPage)
+        let searchLinkUrl = it.serviceSupport.washingService.searchLinkUrl
+        if (searchLinkUrl) {
+          searchLinkUrl = searchLinkUrl.includes('?')
+            ? `${searchLinkUrl}&entrance=consumables`
+            : `${searchLinkUrl}?entrance=consumables`
+          this.goodsjumpWebViewNew(searchLinkUrl)
         } else if (it.serviceSupport.washingService.skuId) {
           this.goToGoodsDetail(it.serviceSupport.washingService)
         } else if (

package/packages/material-event/index.js

@@ -791,14 +791,26 @@ const MaterialEvent = {
           it.chartData = this.setChartDataColmo(it)
           continue
         }
-        if (it.productCode && it.productCode != 0) tmpcodeList.push(it.productCode)
+        //这里需要对有skuid的耗材进行处理
+        let purchaseInfoPurchaseEnable = it.purchaseInfo && it.purchaseInfo.purchaseEnable
+        if (purchaseInfoPurchaseEnable && it.purchaseInfo.purchaseInfo.skuId) {
+        }
+
+        if (purchaseInfoPurchaseEnable && it.purchaseInfo.purchaseInfo.searchLinkUrl) {
+          //去掉有搜索列表的（优先级最高）
+        } else if (it.productCode && it.productCode != 0) {
+          tmpcodeList.push(it.productCode)
+        }
+
+        //这里需要对有skuid的耗材进行处理
+        let washingServiceEnable =
+          it.serviceSupport && it.serviceSupport.washingService && it.serviceSupport.washingService.enable
+        if (washingServiceEnable && it.serviceSupport.washingService.skuId) {
+        }
         //对清洗服务里面有productCode的，也需要请求商城那边接口
-        if (
-          it.serviceSupport &&
-          it.serviceSupport.washingService &&
-          it.serviceSupport.washingService.enable &&
-          it.serviceSupport.washingService.productCode
-        ) {
+        if (washingServiceEnable && it.serviceSupport.washingService.searchLinkUrl) {
+          //去掉有搜索列表的（优先级最高）
+        } else if (washingServiceEnable && it.serviceSupport.washingService.productCode) {
           tmpcodeList.push(it.serviceSupport.washingService.productCode)
         }
         it.chartData = this.setChartData(it)
@@ -968,7 +980,8 @@ const MaterialEvent = {
       item.consumables.forEach((it, i) => {
         if (
           (it.goodsInfo && (it.goodsInfo.skulink || it.goodsInfo.skuId)) ||
-          (it.purchaseInfo && it.purchaseInfo.linkUrl)
+          (it.purchaseInfo && it.purchaseInfo.linkUrl) ||
+          (it.purchaseInfo && it.purchaseInfo.searchLinkUrl)
         ) {
           it.btnType = 1
           it.btnText = '购买'
@@ -991,7 +1004,8 @@ const MaterialEvent = {
               it.serviceSupport.washingService.enable &&
               (it.serviceSupport.washingService.serviceUrl ||
                 (it.washingServiceGoodsInfo &&
-                  (it.washingServiceGoodsInfo.skulink || it.washingServiceGoodsInfo.skuId)))
+                  (it.washingServiceGoodsInfo.skulink || it.washingServiceGoodsInfo.skuId)) ||
+                it.serviceSupport.washingService.searchLinkUrl)
             ) {
               it.btnType = 4
               it.btnText = '清洗'
@@ -1027,109 +1041,6 @@ const MaterialEvent = {
     return 0
   },
 
-  //对材料进行分层排序
-  getMaterialSort(tempList) {
-    const categorizedDeviceMaterialList = {
-      insufficient: [],
-      unknown: [],
-      sufficient: []
-    }
-    let insufficientMaterialLength = 0
-    let unknownMaterialLength = 0
-    let sufficientMaterialLength = 0
-
-    let dsposeList = tempList || this.deviceMaterialList
-    dsposeList.forEach(device => {
-      const categorizedConsumables = {
-        insufficient: [],
-        unknown: [],
-        sufficient: []
-      }
-
-      device.consumables.forEach(consumable => {
-        if (
-          (consumable.remainingStatus == 1 || consumable.remainingStatus == 0) &&
-          consumable.remainingValue != null &&
-          device.deviceInfo.isOnline == 1 &&
-          consumable.remainingValueType != 5
-        ) {
-          categorizedConsumables.insufficient.push(consumable)
-          insufficientMaterialLength++
-        } else if (
-          consumable.remainingStatus == 2 &&
-          consumable.remainingValue != null &&
-          device.deviceInfo.isOnline == 1 &&
-          consumable.remainingValueType != 5
-        ) {
-          categorizedConsumables.sufficient.push(consumable)
-          sufficientMaterialLength++
-        } else {
-          categorizedConsumables.unknown.push(consumable)
-          unknownMaterialLength++
-        }
-      })
-
-      if (categorizedConsumables.insufficient.length > 0) {
-        categorizedDeviceMaterialList.insufficient.push({
-          ...device,
-          consumables: this.sortConsumables(categorizedConsumables.insufficient)
-        })
-      }
-
-      if (categorizedConsumables.unknown.length > 0) {
-        categorizedDeviceMaterialList.unknown.push({
-          ...device,
-          consumables: categorizedConsumables.unknown
-        })
-      }
-
-      if (categorizedConsumables.sufficient.length > 0) {
-        categorizedDeviceMaterialList.sufficient.push({
-          ...device,
-          consumables: this.sortConsumables(categorizedConsumables.sufficient)
-        })
-      }
-    })
-
-    // 对每个分类进行排序
-    categorizedDeviceMaterialList.insufficient.sort(this.sortByRemainingValue)
-    categorizedDeviceMaterialList.sufficient.sort(this.sortByRemainingValue)
-
-    // 合并三个数组
-    const sortedDeviceMaterialList = [
-      ...categorizedDeviceMaterialList.insufficient,
-      ...categorizedDeviceMaterialList.unknown,
-      ...categorizedDeviceMaterialList.sufficient
-    ]
-
-    //记录每一种情况下的设备数量
-    this.deviceTotal = [
-      categorizedDeviceMaterialList.insufficient.length,
-      categorizedDeviceMaterialList.unknown.length,
-      categorizedDeviceMaterialList.sufficient.length
-    ]
-    //记录每一种情况下的耗材数量
-    this.materialTotal = [insufficientMaterialLength, unknownMaterialLength, sufficientMaterialLength]
-    console.log(
-      '设备数量哦：' +
-        categorizedDeviceMaterialList.insufficient.length +
-        '---' +
-        categorizedDeviceMaterialList.unknown.length +
-        '---' +
-        categorizedDeviceMaterialList.sufficient.length
-    )
-    console.log(
-      '耗材数量哦：' + insufficientMaterialLength + '---' + unknownMaterialLength + '---' + sufficientMaterialLength
-    )
-
-    return {
-      sortedDeviceMaterialList,
-      materialTotal,
-      deviceTotal,
-      insufficientList
-    }
-  },
-
   setChartData(it, options = {}) {
     let isDiablo = this.isDiablo
     let needBackground = this.needBackground