组件样式调整

packages/common/styles/ionic.less

@@ -4328,7 +4328,7 @@ ion-infinite-scroll:not(.active) .icon:before {
 
 /* If you change these, change platform.scss as well */
 .has-header {
-  top: 44px;
+  top: 44px; /*no*/
 }
 
 .no-header {
@@ -4348,7 +4348,7 @@ ion-infinite-scroll:not(.active) .icon:before {
 }
 
 .has-footer {
-  bottom: 44px;
+  bottom: 44px; /*no*/
 }
 
 .has-subfooter {

packages/common/styles/platform-ios.less

@@ -4,10 +4,10 @@
     bottom: 12px;
   }
   .has-header {
-    top: @iosHasHeader;
+    top: 64px; /*no*/
   }
   .header-top {
-    margin-top: 63px;
+    margin-top: 63px; /*no*/
   }
   .img {
     margin-top: 10px;

packages/common/styles/platform-iosx.less

@@ -2,18 +2,18 @@
 @media (device-width: 375px) and (device-height: 812px) and (-webkit-min-device-pixel-ratio: 3) {
   .platform-ios{
     .has-header {
-      top: 79px
+      top: 84px /*no*/
     }
     .has-tabs {
-      bottom: 84px;
+      bottom: 84px; /*no*/
     }
     .has-footer{
-      margin-bottom: @bottomSafeArea;
+      margin-bottom: 34px; /*no*/
     }
     .public-style {
       .bottom-tab{
-        height: 78px;
-        padding-bottom: @bottomSafeArea;
+        height: 78px; /*no*/
+        padding-bottom: 34px; /*no*/
       }
     }
   }

packages/common/utils/index.js

@@ -19,7 +19,7 @@ export function timeout (time) {
  * @param {any} msg 信息
  */
 export function assert (condition, msg) {
-  if (!condition) throw new Error(`[hips] ${msg}`)
+  if (!condition) throw new Error(`[hls-ui] ${msg}`)
 }
 
 /**

packages/components/ActionSheet/actionsheet.vue

@@ -184,7 +184,7 @@
     .platform-ios {
       .action-sheet-backdrop {
         .action-sheet {
-          margin-bottom: @bottomSafeArea;
+          margin-bottom: 34px; /*no*/
         }
       }
     }
@@ -195,7 +195,7 @@
     .platform-ios {
       .action-sheet-backdrop {
         .action-sheet {
-          margin-bottom: @bottomSafeArea;
+          margin-bottom: 34px /*no*/
         }
       }
     }

packages/components/BottomTab/index.vue

@@ -28,7 +28,7 @@ export default {
 
 <style lang="less">
   .h-bottom-tab {
-    height: 44px;
+    height: 44px; /*no*/
     width: 100%;
     background-color: #fff;
     position: fixed;
@@ -43,8 +43,8 @@ export default {
     .platform-ios {
       //.h-ios {
       .h-bottom-tab {
-        height: 78px;
-        padding-bottom: @bottomSafeArea;
+        height: 78px; /*no*/
+        padding-bottom: 34px; /*no*/
       }
       //}
     }
@@ -53,8 +53,8 @@ export default {
     .platform-ios {
       //.h-ios {
       .h-bottom-tab {
-        height: 78px;
-        padding-bottom: @bottomSafeArea;
+        height: 78px; /*no*/
+        padding-bottom: 34px; /*no*/
       }
       //}
     }

packages/components/Dialog/Notify.vue

@@ -150,26 +150,26 @@ export default {
 
   // ios平台
   .platform-ios .hls-notify .hls-notify-wrap-plugin {
-    padding-top: @iosPaddingTop;
-    height: @iosHasHeader;
+    padding-top: 20px; /*no*/
+    height: 44px; /*no*/
   }
 
   // iPhoneX适配
   @media (device-width: 375px) and (device-height: 812px) and (-webkit-min-device-pixel-ratio: 3) {
-    .platform-ios.platform-cordova:not(.fullscreen) {
+    .platform-ios{
       .hls-notify .hls-notify-wrap-plugin {
-        padding-top: @iosxPaddingTop;
-        height: @iosxHasHeader;
+        padding-top: 40px; /*no*/
+        height: 84px; /*no*/
       }
     }
   }
 
   // iPhoneX Max适配
   @media (device-width: 414px) and (device-height: 896px) {
-    .platform-ios.platform-cordova:not(.fullscreen) {
+    .platform-ios{
       .hls-notify .hls-notify-wrap-plugin {
-        padding-top: @iosxPaddingTop;
-        height: @iosxHasHeader;
+        padding-top: 40px; /*no*/
+        height: 84px; /*no*/
       }
     }
   }

packages/components/HContent/index.vue

@@ -30,7 +30,7 @@ export default {
   @media (device-width: 375px) and (device-height: 812px) and (-webkit-min-device-pixel-ratio: 3) {
     .platform-ios {
       .has-header {
-        top: @iosxHasHeader;
+        top: 84px; /*no*/
       }
     }
   }
@@ -39,7 +39,7 @@ export default {
   @media (device-width: 414px) and (device-height: 896px) {
     .platform-ios {
       .has-header {
-        top: @iosxHasHeader;
+        top: 84px; /*no*/
       }
     }
   }

packages/components/HHeader/index.vue

@@ -50,7 +50,7 @@ export default {
 
   .h-header {
     flex-shrink: 0;
-    height: @headerHeight;
+    height: 44px; /*no*/
     background: #fff;
     display: flex;
     align-items: center;
@@ -62,7 +62,7 @@ export default {
       flex: 1;
       font-size: 17px;
       font-weight: 500;
-      line-height: @headerHeight;
+      line-height: 44px;
       text-align: center;
       text-overflow: ellipsis;
       white-space: nowrap;
@@ -88,7 +88,7 @@ export default {
 
       .h-header-btn {
         &:first-of-type {
-          padding-left: @paddingLength;
+          padding-left: 15px;
         }
       }
     }
@@ -100,7 +100,7 @@ export default {
         justify-content: flex-end;
 
         &:last-of-type {
-          padding-right: @paddingLength;
+          padding-right: 15px;
         }
       }
     }
@@ -141,7 +141,7 @@ export default {
 
   // ios平台
   .platform-ios .h-header {
-    padding-top: @iosPaddingTop;
+    padding-top: 20px; /*no*/
   }
 
   // iPhoneX适配
@@ -149,7 +149,7 @@ export default {
     .platform-ios {
       //.h-ios {
       .h-header {
-        padding-top: @iosxPaddingTop;
+        padding-top: 40px; /*no*/
       }
 
       //}
@@ -161,7 +161,7 @@ export default {
     .platform-ios {
       //.h-ios {
       .h-header {
-        padding-top: @iosxPaddingTop;
+        padding-top: 40px; /*no*/
       }
 
       //}

packages/components/NumberKeyboard/index.vue

@@ -182,7 +182,7 @@
     .platform-ios {
       .number-keyboard {
         &__body {
-          margin-bottom: @bottomSafeArea;
+          margin-bottom: 34px; /*no*/
         }
       }
     }
@@ -192,7 +192,7 @@
     .platform-ios {
       .number-keyboard {
         &__body {
-          margin-bottom: @bottomSafeArea;
+          margin-bottom: 34px; /*no*/
         }
       }
     }

packages/components/Scroll/index.vue

@@ -464,7 +464,7 @@ export default {
   @media (device-width: 375px) and (device-height: 812px) and (-webkit-min-device-pixel-ratio: 3) {
     .platform-ios {
       .has-header {
-        top: @iosxHasHeader;
+        top: 84px; /*no*/
       }
     }
   }
@@ -473,7 +473,7 @@ export default {
   @media (device-width: 414px) and (device-height: 896px)  {
     .platform-ios {
       .has-header {
-        top: @iosxHasHeader;
+        top: 84px; /*no*/
       }
     }
   }

src/main.js

@@ -9,7 +9,7 @@ import router from './router/index'
 
 import flexible from './common/ydui.flexible'
 
-import {componentInstall,appStyle} from '../packages/index'
+import {componentInstall, appStyle} from '../packages/index'
 
 /**
  * 指令

src/pages/hlsPopup.vue

@@ -387,7 +387,7 @@ export default {
       this.show2 = true
     },
     handleNotify () {
-      this.showNotify({
+      this.hlsPopup.showNotify({
         content: '提示内容',
         position: 'top',
         time: 2000,
@@ -408,28 +408,28 @@ export default {
       // console.log(`change: ${i}`)
     },
     showLoading () {
-      hlsPopup.showLoading('请稍等!')
+      this.hlsPopup.showLoading('请稍等!')
     },
     hideLoading () {
-      hlsPopup.hideLoading()
+      this.hlsPopup.hideLoading()
     },
     showLongTop () {
-      hlsPopup.showLongTop('操作成功操作成功操作成功操作成功操作成功操作成功操作成功操作成功操作成功')
+      this.hlsPopup.showLongTop('操作成功操作成功操作成功操作成功操作成功操作成功操作成功操作成功操作成功')
     },
     showLongCenter () {
-      hlsPopup.showLongCenter('操作成功操作成功操作成功')
+      this.hlsPopup.showLongCenter('操作成功操作成功操作成功')
     },
     showLongBottom () {
-      hlsPopup.showLongBottom('操作成功操作成功操作成功操作成功')
+      this.hlsPopup.showLongBottom('操作成功操作成功操作成功操作成功')
     },
     showSuccess () {
-      hlsPopup.showSuccess('操作成功')
+      this.hlsPopup.showSuccess('操作成功')
     },
     showError () {
-      hlsPopup.showError('操作失败')
+      this.hlsPopup.showError('操作失败')
     },
     showConfirm () {
-      hlsPopup.showConfirm({
+      this.hlsPopup.showConfirm({
         title: '确定退出',
         content: '退出后需从新登录',
         onConfirm: function (index) {
@@ -438,7 +438,7 @@ export default {
       })
     },
     showPopup () {
-      hlsPopup.showPopup({
+      this.hlsPopup.showPopup({
         title: '确定退出',
         content: '退出后需从新登录',
         onConfirm: function () {
@@ -447,7 +447,7 @@ export default {
       })
     },
     showActionSheet () {
-      hlsPopup.showActionSheet({
+      this.hlsPopup.showActionSheet({
         titleText: '请选择照片',
         buttonArray: ['拍照', '从相册取'],
         callback: (index) => {
@@ -456,7 +456,7 @@ export default {
       })
     },
     showActionSheetButton () {
-      hlsPopup.showActionSheet({
+      this.hlsPopup.showActionSheet({
         titleText: '照片',
         buttonArray: [{text: '拍照', type: 'warn'}, {text: '从相册取', type: 'primary'}],
         callback: (index) => {
@@ -465,7 +465,7 @@ export default {
       })
     },
     showTime (format) {
-      hlsPopup.showTime({
+      this.hlsPopup.showTime({
         nowDate: '2017-08-12',
         format: format,
         callback: (date) => {
@@ -474,7 +474,7 @@ export default {
       })
     },
     showBigPicture () {
-      hlsPopup.showBigPicture({
+      this.hlsPopup.showBigPicture({
         imgUrl: 'http://hlsapp.hand-china.com/hls_file/2018/05/F1B6D85E409A4714A8540504B2D133AD',
       })
     },
@@ -492,7 +492,7 @@ export default {
           'code_name': '个人2',
         },
       ]
-      hlsPopup.selectList({
+      this.hlsPopup.selectList({
         list: bpClassList,
         code: 'bp_type',
         object: {},
@@ -526,7 +526,7 @@ export default {
           'parent': 'NP2',
         },
       ]
-      hlsPopup.selectList({
+      this.hlsPopup.selectList({
         list: bpClassList,
         code: 'bp_type',
         object: {},
@@ -573,7 +573,7 @@ export default {
           'parent': 'NP1',
         },
       ]
-      hlsPopup.selectList({
+      this.hlsPopup.selectList({
         list: bpClassList,
         code: 'bp_type',
         object: {},
@@ -625,7 +625,7 @@ export default {
     },
     keyboradShow () {
       let vm = this
-      hlsPopup.showNumberKeyborad({
+      this.hlsPopup.showNumberKeyborad({
         title: '数字键盘',
         keyDown: (text) => {
           vm.onInput(text)

src/styles/variables.less

@@ -10,7 +10,7 @@
 /**
 * 颜色
 */
-@theme-color:#f0f;
+@theme-color:#5D98F6;
 @font-color:#666666;
 @mainColor: #000;
 @baseColor: white;