dolphin-weex-ui 2.4.22 → 2.4.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dolphin-weex-ui",
-  "version": "2.4.22",
+  "version": "2.4.23",
   "description": "inteligense cross platform frame",
   "main": "index.js",
   "directories": {

package/packages/dof-result/index.vue

@@ -1,7 +1,12 @@
 <template>
   <div class="wrapper" v-if="show" :style="wrapStyle">
     <div class="dof-result" :style="{ top: setPaddingTop, backgroundColor: bgColor_ }">
-      <image class="result-image" :aria-hidden="true" :src="resultType.pic" :style="imgStyle"></image>
+      <image
+        :class="[isNewVersion ? 'result-image-new' : 'result-image']"
+        :aria-hidden="true"
+        :src="resultType.pic"
+        :style="imgStyle"
+      ></image>
       <slot name="text">
         <div class="result-content" v-if="resultType.content">
           <text class="content-text">{{ resultType.content }}</text>
@@ -48,6 +53,11 @@
   height: 320px;
 }
 
+.result-image-new {
+  width: 460x;
+  height: 384px;
+}
+
 .result-content {
   margin-top: 0px;
   align-items: center;
@@ -91,19 +101,23 @@ import DofButton from '../dof-button'
 import imgs from './imgs'
 import ColmoMixin from '../../mixins/colmo'
 import DiabloMixin from '../../mixins/diablo'
+import Utils from '../utils/index.js'
+
+const defaultPicBaseUrl = imageName => `meiju://common/emptyImage?imageName=${imageName}`
+const isNewVersion = Utils.compareVersionNew('11.4.15')
 const Types = {
   noNetwork: {
-    pic: imgs['noNetwork'],
+    pic: isNewVersion ? defaultPicBaseUrl('img_empty_02_disconnection') : imgs['noNetwork'],
     content: '网络异常，请检查您的网络设置'
     // button: '刷新'
   },
   noUpdate: {
-    pic: imgs['noUpdate'],
+    pic: isNewVersion ? defaultPicBaseUrl('img_empty_03_update') : imgs['noUpdate'],
     content: '当前版本较低',
     desc: '请更新到最新版APP'
   },
   noPage: {
-    pic: imgs['noPage'],
+    pic: isNewVersion ? defaultPicBaseUrl('img_empty_04_content') : imgs['noPage'],
     content: '找不到页面'
   },
   colmo: {
@@ -143,6 +157,9 @@ export default {
     }
   },
   computed: {
+    isNewVersion() {
+      return Utils.compareVersionNew('11.4.15')
+    },
     type_() {
       if (this.type) return this.type
       return this._isColmo ? 'colmo' : 'noPage'

package/packages/utils/index.js

@@ -277,6 +277,21 @@ const Utils = {
     }
     return false
   },
+  toNum(a) {
+    a = a.toString()
+    var c = a.split('.')
+    var r = ['0000', '000', '00', '0', '']
+    for (var i = 0; i < c.length; i++) {
+      var len = c[i].length
+      c[i] = r[len] + c[i]
+    }
+    var res = c.join('')
+    return res
+  },
+  compareVersionNew(a) {
+    // 判断当前版本是否大于等于比较的版本
+    return this.toNum(weex.config.env.appVersion) >= this.toNum(a)
+  },
   /**
    * 分割数组
    * @param arr 被分割数组