dolphin-weex-ui 2.2.18 → 2.3.0

package/packages/dof-panel/index.vue

@@ -56,7 +56,7 @@ export default {
     },
     mrTextStyle() {
       let { theme } = this
-      let colorVal = THEME_COLOR[theme] || '#267aff'
+      let colorVal = THEME_COLOR[theme] || '#00A4F2'
       return {
         color: colorVal
       }
@@ -199,7 +199,7 @@ export default {
   font-family: PingFangSC-Regular;
   font-size: 24px;
   line-height: 24px;
-  color: #666666;
+  color: #616C73;
   lines: 1;
   text-overflow: ellipsis;
 }
@@ -213,14 +213,14 @@ export default {
   font-family: PingFangSC-Medium;
   font-size: 44px;
   line-height: 44px;
-  color: #000000;
+  color: #1E2E37;
 }
 .unit-text {
   margin-left: 6px;
   font-family: PingFangSC-Regular;
   font-size: 24px;
   line-height: 32px;
-  color: #666666;
+  color: #616C73;
 }
 .btn {
   height: 100px;
@@ -232,7 +232,7 @@ export default {
 .btn-text {
   font-family: PingFangSC-Medium;
   font-size: 28px;
-  color: #267aff;
+  color: #00A4F2;
   text-align: center;
   line-height: 28px;
 }

package/packages/dof-panel/type.js

@@ -1,11 +1,11 @@
 export const THEME_COLOR = {
-  primary: '#267aff',
+  primary: '#00A4F2',
   purple: '#995EFC',
   slate: '#6575FF',
   aqua: '#29C3FF',
-  turquoise: '#00CBB8',
+  turquoise: '#00BDB2',
   yellow: '#FFAA10',
-  orange: '#FF8225',
-  tomato: '#FF6A4C',
+  orange: '#FFAA10',
+  tomato: '#F56428',
   gray: '#7C879B'
 }

package/packages/dof-picker/picker.vue

@@ -245,7 +245,7 @@ export default {
     font-family: PingFangSC-Regular;
     /* opacity: 0.6; */
     font-size: 28px;
-    color: #8A8A8F;
+    color: #8E969B;
     text-align: left;
 }
 .list-item {
@@ -254,7 +254,7 @@ export default {
     font-family: PingFangSC-Regular;
     opacity: 0.3;
     font-size: 36px;
-    color: #000000;
+    color: #1E2E37;
     text-align: center;
 }
 .list-item-left {
@@ -292,7 +292,7 @@ export default {
 }
 .selected-item {
     opacity: 1;
-    color: #000000;
+    color: #1E2E37;
     font-size: 36px;
 }
 .select-area {

package/packages/dof-popover2/index.vue

@@ -53,7 +53,7 @@
                 v-else
                 :code="'\u4725'"
                 :size="32"
-                :color="_isColmo ? 'rgba(255,255,255,0.80)' : '#333333'"
+                :color="_isColmo ? 'rgba(255,255,255,0.80)' : '#1E2E37'"
                 @dofIconFontClicked="$emit('clickedCloseBtn')"
               ></dof-iconfont>
             </div>
@@ -528,7 +528,7 @@ export default {
   background-color: #ffffff;
 }
 .u-popover-theme-dark {
-  background-color: #000000;
+  background-color: #1E2E37;
 }
 .i-btn {
   flex-direction: row;
@@ -581,7 +581,7 @@ export default {
   flex: 1;
   font-family: PingFangSC-Regular;
   font-size: 24px;
-  color: #666666;
+  color: #616C73;
   font-weight: 400;
 }
 </style>

package/packages/dof-popup/index.vue

@@ -23,8 +23,8 @@
               : _isColmo
               ? 'rgba(255,255,255,0.80)'
               : index === 0
-              ? '#666666'
-              : '#267aff'
+              ? '#616C73'
+              : '#00A4F2'
           }"
           @click="actionsheetBtnClick(index, btn.hasOwnProperty('text') ? btn.text : btn)"
           >{{ btn.hasOwnProperty('text') ? btn.text : btn }}</text
@@ -32,7 +32,7 @@
       </div>
       <div
         :style="{
-          height: show && isipx ? '68px' : '0px',
+          height: show && isipx ? sageHeight + 'px' : '0px',
           backgroundColor: _isColmo ? '#151617' : padStyle.backgroundColor
         }"
       ></div>
@@ -78,13 +78,13 @@
   flex: 1; /* add by lau resolve bottom button */
 }
 .leftBtn {
-  color: #666666;
+  color: #616C73;
   border-right-color: #e5e5e5;
   border-right-width: 1px;
   border-right-style: solid;
 }
 .rightBtn {
-  color: #267aff;
+  color: #00A4F2;
 }
 .midea-actionsheet-btn:active {
   background-color: #f5f5f5;
@@ -166,11 +166,13 @@ export default {
     isOverShow: true,
     bottomArc: 0,
     show_: false,
-    overlayShow: false
+    overlayShow: false,
+    sageHeight: 68
   }),
   computed: {
     isipx: function() {
       if (this.bottomArc) return true
+      if(weex && weex.config.env.platform == 'harmony' && weex.config.env.safeAreaBottomHeight) return true
       return (
         weex &&
         (weex.config.env.deviceModel === 'iPhone10,3' ||
@@ -195,7 +197,7 @@ export default {
     _height() {
       let { height, isipx, pos } = this
       height = Number(height)
-      height = isipx && pos == 'bottom' ? height + 68 : height
+      height = isipx && pos == 'bottom' ? height + this.sageHeight : height
       return height
     },
     transformValue() {
@@ -274,6 +276,9 @@ export default {
     Bridge.getAllBarHeight().then(res => {
       this.bottomArc = res.bottomArc || 0
     })
+    if(weex && weex.config.env.platform == 'harmony' && weex.config.env.safeAreaBottomHeight){
+      this.sageHeight = weex.config.env.safeAreaBottomHeight
+    }
   },
   methods: {
     actionsheetBtnClick(index, text) {

package/packages/dof-progress/index.vue

@@ -20,7 +20,7 @@ export default {
   props: {
     barColor: {
       type: String,
-      default: '#267aff'
+      default: '#00A4F2'
     },
     barWidth: {
       type: Number,

package/packages/dof-promt/index.vue

@@ -33,7 +33,7 @@
   width: 750px;
   height: 1344px;
   align-items: center;
-  background-color:#333333;
+  background-color:#1E2E37;
   opacity:0.3;
   position:fixed;
   /* z-index:1000; */
@@ -49,7 +49,7 @@
   padding-top:30px;padding-bottom:20px
 }
 .box-title-text{
-font-family: PingFangSC-Medium;font-weight: bold; font-size:32px;color:#000000;text-align:center
+font-family: PingFangSC-Medium;font-weight: bold; font-size:32px;color:#1E2E37;text-align:center
 }
 .box-input-wrapper{
   padding-left:32px;padding-right:32px;padding-top:10px;padding-bottom:24px;
@@ -58,7 +58,7 @@ font-family: PingFangSC-Medium;font-weight: bold; font-size:32px;color:#000000;t
   border-width: 1px;
   border-style: solid;
   border-color: #9F9F9F;
-  color:#333333;
+  color:#1E2E37;
   background-color:#FFFFFF;
   height: 48px;
   font-size:24px;
@@ -80,7 +80,7 @@ flex-direction:row;height:84px;flex:1;align-items:center;justify-content:center;
   font-weight: bold;
 }
 .confirm-text {
-  color: #000000;
+  color: #1E2E37;
 }
 .wrapper{
   background-color:#F7F7F7;
@@ -109,11 +109,11 @@ export default {
     },
     cancelColor: {
       type: String,
-      default: '#267aff'
+      default: '#00A4F2'
     },
     confirmColor: {
       type: String,
-      default: '#267aff'
+      default: '#00A4F2'
     }
   },
   watch: {

package/packages/dof-radio-list/index.vue

@@ -7,6 +7,7 @@
       @dofRadioItemChecked="dofRadioItemChecked(i, $event)"
       :key="i"
       :isFullBorder="isFullBorder"
+      :isShowBorder="_isColmo ? true : isShowBorder"
       :isLast="i === updateList.length - 1"
     ></radio-item>
   </div>
@@ -29,6 +30,11 @@ export default {
     isFullBorder: {
       type: Boolean,
       default: true
+    },
+    // 是否显示边框
+    isShowBorder: {
+      type: Boolean,
+      default: false
     }
   },
   data: () => ({

package/packages/dof-radio-list/radio-item.vue

@@ -23,9 +23,9 @@
     </dof-cell>
     <div
       class="fakeStyle"
-      v-if="!isLast"
+      v-if="!isLast && isShowBorder"
       :style="{
-        backgroundColor: _isColmo ? 'rgba(255, 255, 255, 0.1)' : '#f2f2f2',
+        backgroundColor: _isColmo ? 'rgba(255, 255, 255, 0.1)' : '#dddddd',
         right: isFullBorder ? '0px' : '24px'
       }"
     ></div>
@@ -93,6 +93,11 @@ export default {
     isLast: {
       type: Boolean,
       default: false
+    },
+    // 是否显示边框
+    isShowBorder: {
+      type: Boolean,
+      default: false
     }
 
     // itemImg: {

package/packages/dof-refresher/index.vue

@@ -268,7 +268,7 @@ export default {
   top: 0;
   /* box-sizing: border-box; */
   border-width: 2px;
-  border-color: #666666;
+  border-color: #616C73;
   border-style: solid;
   border-radius: 30px;
   opacity: 0;
@@ -282,7 +282,7 @@ export default {
   /* margin-right: 20px; */
   height: 60px;
   width: 60px;
-  color: #666666;
+  color: #616C73;
 }
 
 .arrow-down {
@@ -297,7 +297,7 @@ export default {
 .u-txt {
   font-size: 24px;
   line-height: 40px;
-  color: #999999;
+  color: #8E969B;
   margin-top: 10px;
   margin-left: 10px;
   height: 40px;