dolphin-weex-bc 0.0.42 → 0.0.44

package/package.json

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

package/packages/dof-bc-consumables/index.vue

@@ -534,16 +534,16 @@ export default {
         let type = item.remainingStatus
         let percentTxt = item.percent
         let textColorList = ['#F56428', '#FFAA10', '#ffffff']
-        let frontColorList = ['#fd895c', '#ffd262', '#49c4fc']
-        let backColorList = ['#f56b35', '#ffb823', '#4baeff']
+        let frontColorList = ['#f78353', '#ffbb40', '#33b6f5']
+        let backColorList = ['#fbc1a9', '#ffdd9f', '#99dbfa']
 
         // 判断显示类型
         if( item.remainingValueType == 4 ) {
           percent = item.remainingStatus == 2 ? 0.6 : 0.1
           percentTxt = type == 2 ? '充足' : '不足'
           textColorList = ['#FF6A4C', '#FF6A4C', '#ffffff']
-          frontColorList = ['#fd895c', '#fd895c', '#49c4fc']
-          backColorList = ['#f56b35', '#f56b35', '#4baeff']
+          frontColorList = ['#f78353', '#f78353', '#33b6f5']
+          backColorList = ['#fbc1a9', '#fbc1a9', '#99dbfa']
         }
 
         // if( percent > 0.2 && percent <= 0.5 ){
@@ -557,6 +557,7 @@ export default {
           backgroundColor: '#00000000', //背景色 默认为#000000
           progress: percent < 0.01 && percent != 0 ? 0.01 : percent, //s 进度 [0 ... 1]
           showWaveCover: true,
+          waveCoverType: 0,
           textFont: 12, //字体大小，默认为14
           text: percentTxt, //文本 默认为空
           textColor: textColorList[type], //文本颜色，默认#FFFFFF
@@ -569,9 +570,9 @@ export default {
 
       }else {
         return {
-          backgroundColor: '#e9f1ff', //背景色 默认为#000000
           frontWaveColor: '#e9f1ff', //已完成后的颜色默认#FFFFFF
           backWaveColor: '#e9f1ff',
+          backgroundColor: '#00000000', //背景色 默认为#000000
           progress: 0,
           animate: false,
           text: '', //文本 默认为空
@@ -579,6 +580,18 @@ export default {
       }
     },
 
+    showBgco(it){
+      let bgcoArr = [this.bgcoOne,this.bgcoTwo,this.bgcoThree]
+      if(this.dealDeviceMaterialList[0].deviceInfo.isOnline == 1){
+        if(it.remainingValueType == 4){
+          bgcoArr = [this.bgcoOne,this.bgcoOne,this.bgcoThree]
+        }
+        return bgcoArr[it.remainingStatus]
+      }else{
+        return bgcoArr[2]
+      }
+    },
+
     showGoodsList() {
       this.showAddCartPopup = true
       let trackParam = {
@@ -795,11 +808,6 @@ export default {
       this.$bridge.trackEvent(trackParam)
     },
 
-    showBgco(item){
-      const bgcoArr = [this.bgcoOne,this.bgcoTwo,this.bgcoThree]
-      return bgcoArr[item.remainingStatus]
-    },
-
     scrollEvent1(e) {
       // console.log('scrollEvent===' + JSON.stringify(e))
       console.log('偏移量'+ (this.recommendSliderWidth - (686 + -e.contentOffset.x)))

package/packages/dof-material-add-card/index.vue

@@ -2,7 +2,7 @@
   <dof-popup
     :show="showAddCartInsidePopup"
     @dofPopupOverlayClicked="handleAddCartClose"
-    :height="980"
+    :height="880"
     pos="bottom"
     :popupColor="isDiablo ? '#1e2326' : ''"
   >

package/packages/material-event/index.js

@@ -1200,6 +1200,11 @@ const MaterialEvent = {
     let textColorList = isDiablo ? ['#D35926', '#D35926', '#0490D3'] : ['#F56428', '#F56428', '#00A4F2']
     let frontColorList = isDiablo ? ['#D35926', '#D35926', '#ADE0F6'] : ['#F56428', '#F56428', '#9fdaf5']
     let backColorList = isDiablo ? ['#FCA6A1', '#FCA6A1', '#CFEBF8'] : ['#fc9791', '#fc9791', '#c7e8f7']
+    let waveCoverType = 0
+    let showWaveCoverTypeArr = [3, 3, 2]
+    if(isDiablo){
+      waveCoverType = showWaveCoverTypeArr[type]
+    }
     return {
       frontWaveColor: frontColorList[type], //已完成后的颜色默认#FFFFFF
       backWaveColor: backColorList[type],
@@ -1207,6 +1212,7 @@ const MaterialEvent = {
       backgroundColor: isDiablo ? '#1E2326' : needBackground ? '#F6F7F9' : '#FFFFFF', //背景色 默认为#000000
       progress: percent, // 进度 [0 ... 1]
       showWaveCover: true,
+      waveCoverType: waveCoverType,
       textFont: this.isScale ? 11 : 12, //字体大小，默认为14
       text: percentTxt, //文本 默认为空
       textColor: textColorList[type], //文本颜色，默认#FFFFFF