From 420730d1ccf4734d21fb45aea58f8e7fd85bdc06 Mon Sep 17 00:00:00 2001
From: Tw93 <tw93@qq.com>
Date: Mon, 30 Sep 2019 19:14:08 +0800
Subject: [PATCH] remove alipay and support x bar

---
 CHANGELOG.md                             |  4 ++++
 CHANGELOG_cn.md                          |  6 ++++++
 package.json                             |  2 +-
 packages/utils/index.js                  |  4 ----
 packages/wxc-special-rich-text/index.vue |  4 ++--
 packages/wxc-tab-bar/README.md           | 11 ++++++-----
 packages/wxc-tab-bar/README_cn.md        | 13 +++++++------
 packages/wxc-tab-bar/index.vue           |  8 ++++++--
 8 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e1f31c22..9cd38737 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change Log
 
+## 0.7.0
+- [-] Remove alipay util,Preventing audit issues [issue/467](https://github.com/alibaba/weex-ui/issues/467)
+- [!] [wxc-tab-bar](https://alibaba.github.io/weex-ui/#/cn/packages/wxc-tab-bar) add `supportXBar` param.
+
 ## 0.6.16
 - [+] [wxc-pan-item](https://alibaba.github.io/weex-ui/#/cn/packages/wxc-pan-item/) add `extId` when  pan. [issue/441](https://github.com/alibaba/weex-ui/issues/441)
 
diff --git a/CHANGELOG_cn.md b/CHANGELOG_cn.md
index cf2cbf45..4112afc3 100644
--- a/CHANGELOG_cn.md
+++ b/CHANGELOG_cn.md
@@ -1,4 +1,10 @@
 # 升级日志
+
+## 0.7.0
+- [-] 移除支付宝判断，防止审核问题 [issue/467](https://github.com/alibaba/weex-ui/issues/467)
+- [!] [wxc-tab-bar](https://alibaba.github.io/weex-ui/#/cn/packages/wxc-tab-bar) 增加 `supportXBar` 参数可用于设置不要 iPhone X 底部 bar 的增高兼容效果
+
+
 ## 0.6.16
 - [+] [wxc-pan-item](https://alibaba.github.io/weex-ui/#/cn/packages/wxc-pan-item/) 滑动时候新增 `extId` 回调  [issue/441](https://github.com/alibaba/weex-ui/issues/441)
 
diff --git a/package.json b/package.json
index 285bc487..a9674ead 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "weex-ui",
-  "version": "0.6.17",
+  "version": "0.7.0",
   "description": "A rich interaction, lightweight, high performance UI library based on Weex",
   "main": "index.js",
   "lib": "vue",
diff --git a/packages/utils/index.js b/packages/utils/index.js
index 962fa56d..ace10e85 100644
--- a/packages/utils/index.js
+++ b/packages/utils/index.js
@@ -142,10 +142,6 @@ const Utils = {
       const { platform } = weex.config.env;
       return platform.toLowerCase() === 'android';
     },
-    isAlipay () {
-      const { appName } = weex.config.env;
-      return appName === 'AP';
-    },
     isTmall () {
       const { appName } = weex.config.env;
       return /(tm|tmall|天猫)/i.test(appName);
diff --git a/packages/wxc-special-rich-text/index.vue b/packages/wxc-special-rich-text/index.vue
index 5468342e..57e4948e 100644
--- a/packages/wxc-special-rich-text/index.vue
+++ b/packages/wxc-special-rich-text/index.vue
@@ -98,7 +98,7 @@ under the License.
   import Utils from '../utils';
 
   const { appName, osName, deviceWidth } = weex.config.env;
-  const needHack = ((Utils.env.isAlipay() || appName === 'UC' || appName === 'TUnionSDK') && osName !== 'iOS') || Utils.env.isAndroid();
+  const needHack = ((Utils.env.isWeb() || appName === 'UC' || appName === 'TUnionSDK') && osName !== 'iOS') || Utils.env.isAndroid();
   const isPad = osName === 'iOS' && deviceWidth > 1300;
 
   import WxcRichTextText from '../wxc-rich-text/wxc-rich-text-text.vue';
@@ -107,7 +107,7 @@ under the License.
   export default {
     components: {
       WxcRichTextText,
-      WxcRichTextTag,
+      WxcRichTextTag
     },
     props: {
       configList: {
diff --git a/packages/wxc-tab-bar/README.md b/packages/wxc-tab-bar/README.md
index 1a5a5a6e..efc814e9 100644
--- a/packages/wxc-tab-bar/README.md
+++ b/packages/wxc-tab-bar/README.md
@@ -21,13 +21,13 @@
                @wxcTabBarCurrentTabSelected="wxcTabBarCurrentTabSelected">
     <!--The first page content-->
     <div class="item-container" :style="contentStyle"><text>Home</text></div>
-    
+
     <!--The second page content-->
     <div class="item-container" :style="contentStyle"><text>Hot</text></div>
-    
+
     <!-- The third page content-->
     <div class="item-container" :style="contentStyle"><text>Message</text></div>
-    
+
     <!-- The fourth page content-->
     <div class="item-container" :style="contentStyle"><text>My</text></div>
   </wxc-tab-bar>
@@ -43,8 +43,8 @@
 </style>
 <script>
   import { WxcTabBar, Utils } from 'weex-ui';
- 
-  // https://github.com/alibaba/weex-ui/blob/master/example/tab-bar/config.js 
+
+  // https://github.com/alibaba/weex-ui/blob/master/example/tab-bar/config.js
   import Config from './config'
 
   export default {
@@ -85,6 +85,7 @@ More details can be found in [here](https://github.com/alibaba/weex-ui/blob/mast
 | duration | `Number` |`N`| `300` | page slider time of animation |
 | timing-function | `String` |`N`| `-` | page slider function of animation |
 | wrap-bg-color | `String` |`N`| `#F2F3F4` |page background color|
+| support-x-bar | `Boolean` |`Y`| `true` |if set `false`，the iPhone X Bar will not go into effect|
 
 ### *1: Using iconFont
 - After Weex Ui version about `0.3.8`, we can use `iconFont` to represent our title image, you can use like this:
diff --git a/packages/wxc-tab-bar/README_cn.md b/packages/wxc-tab-bar/README_cn.md
index 916de124..a45d5d76 100644
--- a/packages/wxc-tab-bar/README_cn.md
+++ b/packages/wxc-tab-bar/README_cn.md
@@ -21,13 +21,13 @@
                @wxcTabBarCurrentTabSelected="wxcTabBarCurrentTabSelected">
     <!-- 第一个页面内容-->
     <div class="item-container" :style="contentStyle"><text>首页</text></div>
-    
+
     <!-- 第二个页面内容-->
     <div class="item-container" :style="contentStyle"><text>特别推荐</text></div>
-    
+
     <!-- 第三个页面内容-->
     <div class="item-container" :style="contentStyle"><text>消息中心</text></div>
-    
+
     <!-- 第四个页面内容-->
     <div class="item-container" :style="contentStyle"><text>我的主页</text></div>
   </wxc-tab-bar>
@@ -43,8 +43,8 @@
 </style>
 <script>
   import { WxcTabBar, Utils } from 'weex-ui';
- 
-  // https://github.com/alibaba/weex-ui/blob/master/example/tab-bar/config.js 
+
+  // https://github.com/alibaba/weex-ui/blob/master/example/tab-bar/config.js
   import Config from './config'
 
   export default {
@@ -85,11 +85,12 @@
 | title-use-slot | `Boolean` |`N`| `false` | 使用 slot 配置底部导航 (注2)|
 | timing-function | `String` |`N`| `-` | 页面切换动画函数 |
 | wrap-bg-color | `String` |`N`| `#F2F3F4` |页面背景颜色|
+| support-x-bar | `Boolean` |`Y`| `true` |假如设置为 false，iPhone X 类型机器将不会有 bar 增高的兼容|
 
 ### 注1：使用 iconFont
 
 - 在 Weex Ui 0.3.8以后，我们可以使用 iconFont 来代替原有 tab title 中的图片配置，像下面这个配置即可：
- 
+
 ```
  // https://github.com/alibaba/weex-ui/blob/master/example/tab-bar/config.js#L51
  // '&#xe608;' -> '\ue608'
diff --git a/packages/wxc-tab-bar/index.vue b/packages/wxc-tab-bar/index.vue
index 9f077c67..150944f0 100644
--- a/packages/wxc-tab-bar/index.vue
+++ b/packages/wxc-tab-bar/index.vue
@@ -175,6 +175,10 @@ under the License.
         type: Boolean,
         default: true
       },
+      supportXBar: {
+        type: Boolean,
+        default: true
+      },
       duration: {
         type: [Number, String],
         default: 300
@@ -193,14 +197,14 @@ under the License.
       translateX: 0
     }),
     created () {
-      const { titleType, tabStyles } = this;
+      const { titleType, tabStyles, supportXBar } = this;
       if (titleType === 'iconFont' && tabStyles.iconFontUrl) {
         dom.addRule('fontFace', {
           'fontFamily': "wxcIconFont",
           'src': `url('${tabStyles.iconFontUrl}')`
         });
       }
-      this.isIPhoneX = Utils.env.isIPhoneX();
+      this.isIPhoneX = Utils.env.isIPhoneX() && supportXBar;
     },
     methods: {
       next () {