dolphin-weex-bc 0.0.22 → 0.0.23

package/dist/index.web.js

@@ -4034,9 +4034,23 @@ var MaterialEvent = {
                       it.chartData = _this15.setChartDataColmo(it);
                       continue;
                     }
-                    if (it.productCode && it.productCode != 0) tmpcodeList.push(it.productCode);
+                    //这里需要对有skuid的耗材进行处理
+                    var 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的耗材进行处理
+                    var 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 = _this15.setChartData(it);
@@ -4410,7 +4424,7 @@ var MaterialEvent = {
 
     this.deviceMaterialList.forEach(function (item, index) {
       item.consumables.forEach(function (it, i) {
-        if (it.goodsInfo && (it.goodsInfo.skulink || it.goodsInfo.skuId) || it.purchaseInfo && it.purchaseInfo.linkUrl) {
+        if (it.goodsInfo && (it.goodsInfo.skulink || it.goodsInfo.skuId) || it.purchaseInfo && it.purchaseInfo.linkUrl || it.purchaseInfo && it.purchaseInfo.searchLinkUrl) {
           it.btnType = 1;
           it.btnText = '购买';
         } else {
@@ -4426,7 +4440,7 @@ var MaterialEvent = {
                 it.btnType = 2;
                 it.btnText = '保养';
               }
-            } else if (it.serviceSupport && it.serviceSupport.washingService && it.serviceSupport.washingService.enable && (it.serviceSupport.washingService.serviceUrl || it.washingServiceGoodsInfo && (it.washingServiceGoodsInfo.skulink || it.washingServiceGoodsInfo.skuId))) {
+            } else if (it.serviceSupport && it.serviceSupport.washingService && it.serviceSupport.washingService.enable && (it.serviceSupport.washingService.serviceUrl || it.washingServiceGoodsInfo && (it.washingServiceGoodsInfo.skulink || it.washingServiceGoodsInfo.skuId) || it.serviceSupport.washingService.searchLinkUrl)) {
               it.btnType = 4;
               it.btnText = '清洗';
             }
@@ -4465,82 +4479,6 @@ var MaterialEvent = {
     // 都有type=4的保持原顺序
     return 0;
   },
-
-
-  //对材料进行分层排序
-  getMaterialSort: function getMaterialSort(tempList) {
-    var _this22 = this;
-
-    var categorizedDeviceMaterialList = {
-      insufficient: [],
-      unknown: [],
-      sufficient: []
-    };
-    var insufficientMaterialLength = 0;
-    var unknownMaterialLength = 0;
-    var sufficientMaterialLength = 0;
-
-    var dsposeList = tempList || this.deviceMaterialList;
-    dsposeList.forEach(function (device) {
-      var categorizedConsumables = {
-        insufficient: [],
-        unknown: [],
-        sufficient: []
-      };
-
-      device.consumables.forEach(function (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(_extends({}, device, {
-          consumables: _this22.sortConsumables(categorizedConsumables.insufficient)
-        }));
-      }
-
-      if (categorizedConsumables.unknown.length > 0) {
-        categorizedDeviceMaterialList.unknown.push(_extends({}, device, {
-          consumables: categorizedConsumables.unknown
-        }));
-      }
-
-      if (categorizedConsumables.sufficient.length > 0) {
-        categorizedDeviceMaterialList.sufficient.push(_extends({}, device, {
-          consumables: _this22.sortConsumables(categorizedConsumables.sufficient)
-        }));
-      }
-    });
-
-    // 对每个分类进行排序
-    categorizedDeviceMaterialList.insufficient.sort(this.sortByRemainingValue);
-    categorizedDeviceMaterialList.sufficient.sort(this.sortByRemainingValue);
-
-    // 合并三个数组
-    var sortedDeviceMaterialList = [].concat(_toConsumableArray(categorizedDeviceMaterialList.insufficient), _toConsumableArray(categorizedDeviceMaterialList.unknown), _toConsumableArray(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: sortedDeviceMaterialList,
-      materialTotal: materialTotal,
-      deviceTotal: deviceTotal,
-      insufficientList: insufficientList
-    };
-  },
   setChartData: function setChartData(it) {
     var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
 
@@ -4659,7 +4597,7 @@ var MaterialEvent = {
 
   //分层排序
   sortHierarchical: function sortHierarchical(data) {
-    var _this23 = this;
+    var _this22 = this;
 
     var categorizedDeviceMaterialList = {
       insufficient: [],
@@ -4690,7 +4628,7 @@ var MaterialEvent = {
 
       if (categorizedConsumables.insufficient.length > 0) {
         categorizedDeviceMaterialList.insufficient.push(_extends({}, device, {
-          consumables: _this23.sortConsumables(categorizedConsumables.insufficient)
+          consumables: _this22.sortConsumables(categorizedConsumables.insufficient)
         }));
       }
 
@@ -4702,7 +4640,7 @@ var MaterialEvent = {
 
       if (categorizedConsumables.sufficient.length > 0) {
         categorizedDeviceMaterialList.sufficient.push(_extends({}, device, {
-          consumables: _this23.sortConsumables(categorizedConsumables.sufficient)
+          consumables: _this22.sortConsumables(categorizedConsumables.sufficient)
         }));
       }
     });
@@ -64522,6 +64460,28 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 
 var globalEvent = weex.requireModule('globalEvent');
 var animation = weex.requireModule('animation');
@@ -64573,18 +64533,6 @@ exports.default = {
       type: Boolean,
       default: false
     },
-    deviceTotal: {
-      type: Array,
-      default: function _default() {
-        return [];
-      }
-    },
-    materialTotal: {
-      type: Array,
-      default: function _default() {
-        return [];
-      }
-    },
     isFilterShow: {
       type: Boolean,
       default: false // 是否是分层模式
@@ -64816,10 +64764,10 @@ exports.default = {
       // 1购买
       if (it.btnType == 1) {
         var activeUrl = it.purchaseInfo ? it.purchaseInfo.linkUrl : '';
-        var searchPage = it.purchaseInfo ? it.purchaseInfo.searchPage : '';
-        if (searchPage) {
-          searchPage = searchPage.includes('?') ? searchPage + '&entrance=consumables' : searchPage + '?entrance=consumables';
-          this.goodsjumpWebViewNew(searchPage);
+        var 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)) {
@@ -64912,10 +64860,10 @@ exports.default = {
 
       if (it.serviceSupport && it.serviceSupport.washingService && it.serviceSupport.washingService.enable) {
         var activeUrl = it.serviceSupport.washingService.serviceUrl;
-        var searchPage = it.serviceSupport.washingService.searchPage;
-        if (searchPage) {
-          searchPage = searchPage.includes('?') ? searchPage + '&entrance=consumables' : searchPage + '?entrance=consumables';
-          this.goodsjumpWebViewNew(searchPage);
+        var 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 (it.washingServiceGoodsInfo && (it.washingServiceGoodsInfo.skulink || it.washingServiceGoodsInfo.skuId)) {
@@ -73033,8 +72981,8 @@ module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c
       "weex-type": "div"
     }
   }, [_vm._l((_vm.deviceMaterialList), function(item, index) {
-    return [(_vm.isFilterShow) ? [(index == 0 && (_vm.deviceTotal[0] > 0 || _vm.deviceTotal[0] === ' ')) ? _c('div', {
-      key: index,
+    return [(_vm.isFilterShow) ? [(item.categorySort === 'insufficient' && item.categoryNum) ? _c('div', {
+      key: item.applianceCode,
       staticClass: "l-tittle-insufficient-box weex-ct weex-div",
       attrs: {
         "weex-type": "div"
@@ -73045,21 +72993,21 @@ module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c
       attrs: {
         "weex-type": "text"
       }
-    }, [_vm._v("耗材不足（" + _vm._s(_vm.materialTotal[0]) + "）")]), _vm._v(" "), _vm._t("filterShowAddCar", null, {})], 2) : _vm._e(), _vm._v(" "), (index == _vm.deviceTotal[0] && _vm.deviceTotal[1] > 0) ? _c('p', {
-      key: index,
+    }, [_vm._v("耗材不足（" + _vm._s(item.categoryNum) + "）")]), _vm._v(" "), _vm._t("filterShowAddCar", null, {})], 2) : _vm._e(), _vm._v(" "), (item.categorySort === 'unknown' && item.categoryNum) ? _c('p', {
+      key: item.applianceCode,
       staticClass: " weex-el weex-text",
       class: ['l-tittle', _vm.isDiablo && 'l-tittle-isDiablo'],
       attrs: {
         "weex-type": "text"
       }
-    }, [_vm._v("耗材数据未知（" + _vm._s(_vm.materialTotal[1]) + "）")]) : _vm._e(), _vm._v(" "), (index == _vm.deviceTotal[0] + _vm.deviceTotal[1] && _vm.deviceTotal[2] > 0) ? _c('p', {
-      key: index,
+    }, [_vm._v("耗材数据未知（" + _vm._s(item.categoryNum) + "）")]) : _vm._e(), _vm._v(" "), (item.categorySort === 'sufficient' && item.categoryNum) ? _c('p', {
+      key: item.applianceCode,
       staticClass: " weex-el weex-text",
       class: ['l-tittle', _vm.isDiablo && 'l-tittle-isDiablo'],
       attrs: {
         "weex-type": "text"
       }
-    }, [_vm._v("耗材充足（" + _vm._s(_vm.materialTotal[2]) + "）")]) : _vm._e()] : _vm._e(), _vm._v(" "), _c('div', {
+    }, [_vm._v("耗材充足（" + _vm._s(item.categoryNum) + "）")]) : _vm._e()] : _vm._e(), _vm._v(" "), _c('div', {
       key: index,
       staticClass: "material-list weex-ct weex-div",
       style: ({