dolphin-weex-ui 1.2.0 → 1.2.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -10,6 +10,7 @@
10
10
  </template>
11
11
 
12
12
  <script>
13
+ import { Bridge } from 'dolphin-native-bridge'
13
14
  export default {
14
15
  props: {
15
16
  bgColor: String,
@@ -19,30 +20,38 @@ export default {
19
20
  default: true
20
21
  }
21
22
  },
23
+ data: () => ({
24
+ bottomArc: 0
25
+ }),
22
26
  computed: {
23
27
  isipx: function() {
28
+ if (this.bottomArc) return true
24
29
  return (
25
30
  weex &&
26
31
  (weex.config.env.deviceModel === 'iPhone10,3' ||
27
32
  weex.config.env.deviceModel === 'iPhone10,6' || //iphoneX
28
33
  weex.config.env.deviceModel === 'iPhone11,8' || //iPhone XR
29
34
  weex.config.env.deviceModel === 'iPhone11,2' || //iPhone XS
30
- weex.config.env.deviceModel === 'iPhone11,4' ||
31
- weex.config.env.deviceModel === 'iPhone11,6' || //iPhone XS Max
32
- weex.config.env.deviceModel === 'iPhone12,1' || //iPhone 11
33
- weex.config.env.deviceModel === 'iPhone12,3' || //iPhone 11 Pro
34
- weex.config.env.deviceModel === 'iPhone12,5' || //iPhone 11 Pro Max
35
- weex.config.env.deviceModel === 'iPhone13,1' || //iPhone 12 mini
36
- weex.config.env.deviceModel === 'iPhone13,2' || //iPhone 12
37
- weex.config.env.deviceModel === 'iPhone13,3' || //iPhone 12 Pro
38
- weex.config.env.deviceModel === 'iPhone13,4' || //iPhone 12 Pro Max
39
- weex.config.env.deviceModel === 'iPhone14,4' || //iPhone 13 mini
40
- weex.config.env.deviceModel === 'iPhone14,5' || //iPhone 13
41
- weex.config.env.deviceModel === 'iPhone14,2' || //iPhone 13 Pro
42
- weex.config.env.deviceModel === 'Iphone14,3' //iPhone 13 Pro Max
43
- )
35
+ weex.config.env.deviceModel === 'iPhone11,4' ||
36
+ weex.config.env.deviceModel === 'iPhone11,6' || //iPhone XS Max
37
+ weex.config.env.deviceModel === 'iPhone12,1' || //iPhone 11
38
+ weex.config.env.deviceModel === 'iPhone12,3' || //iPhone 11 Pro
39
+ weex.config.env.deviceModel === 'iPhone12,5' || //iPhone 11 Pro Max
40
+ weex.config.env.deviceModel === 'iPhone13,1' || //iPhone 12 mini
41
+ weex.config.env.deviceModel === 'iPhone13,2' || //iPhone 12
42
+ weex.config.env.deviceModel === 'iPhone13,3' || //iPhone 12 Pro
43
+ weex.config.env.deviceModel === 'iPhone13,4' || //iPhone 12 Pro Max
44
+ weex.config.env.deviceModel === 'iPhone14,4' || //iPhone 13 mini
45
+ weex.config.env.deviceModel === 'iPhone14,5' || //iPhone 13
46
+ weex.config.env.deviceModel === 'iPhone14,2' || //iPhone 13 Pro
47
+ weex.config.env.deviceModel === 'Iphone14,3') //iPhone 13 Pro Max
44
48
  )
45
49
  }
50
+ },
51
+ created() {
52
+ Bridge.getAllBarHeight().then(res => {
53
+ this.bottomArc = res.bottomArc || 0
54
+ })
46
55
  }
47
56
  }
48
57
  </script>
@@ -1,6 +1,6 @@
1
1
  <template>
2
2
  <div class="wrap" v-if="show" :style="wrapStyle">
3
- <div class="dof-result" :style="{ paddingTop: setPaddingTop }">
3
+ <div class="dof-result" :style="{ paddingTop: setPaddingTop, backgroundColor: bgColor }">
4
4
  <image class="result-image" :aria-hidden="true" :src="resultType.pic"></image>
5
5
  <div class="result-content" v-if="resultType.content">
6
6
  <slot name="text">
@@ -39,7 +39,7 @@
39
39
  width: 750px;
40
40
  flex: 1;
41
41
  align-items: center;
42
- background-color: #f9f9f9;
42
+ /* background-color: #f9f9f9; */
43
43
  }
44
44
 
45
45
  .result-image {
@@ -124,6 +124,10 @@ export default {
124
124
  paddingTop: {
125
125
  type: [Number, String],
126
126
  default: 220
127
+ },
128
+ bgColor: {
129
+ type: String,
130
+ default: '#f9f9f9'
127
131
  }
128
132
  },
129
133
  computed: {
@@ -89,6 +89,7 @@ const animation = weex.requireModule('animation')
89
89
  const { platform } = weex.config.env
90
90
  const isWeb = typeof window === 'object' && platform.toLowerCase() === 'web'
91
91
  import DofOverlay from '../dof-overlay'
92
+ import { Bridge } from 'dolphin-native-bridge'
92
93
 
93
94
  export default {
94
95
  components: { DofOverlay },
@@ -141,10 +142,12 @@ export default {
141
142
  },
142
143
  data: () => ({
143
144
  haveOverlay: true,
144
- isOverShow: true
145
+ isOverShow: true,
146
+ bottomArc: 0
145
147
  }),
146
148
  computed: {
147
149
  isipx: function() {
150
+ if (this.bottomArc) return true
148
151
  return (
149
152
  weex &&
150
153
  (weex.config.env.deviceModel === 'iPhone10,3' ||
@@ -215,6 +218,11 @@ export default {
215
218
  return style
216
219
  }
217
220
  },
221
+ created() {
222
+ Bridge.getAllBarHeight().then(res => {
223
+ this.bottomArc = res.bottomArc || 0
224
+ })
225
+ },
218
226
  methods: {
219
227
  actionsheetBtnClick(index, text) {
220
228
  this.appearPopup(false)
@@ -121,6 +121,10 @@
121
121
  border-width: 0px;
122
122
  background-color: #ffffff;
123
123
  }
124
+ .switch-active-deepSteelblue {
125
+ border-width: 0px;
126
+ background-color: #1f94d2;
127
+ }
124
128
  .switch-disabled {
125
129
  opacity: 0.3;
126
130
  }