gxd-uni-library-editx 1.0.83-beta8 → 1.0.83

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gxd-uni-library-editx",
-  "version": "1.0.83-beta8",
+  "version": "1.0.83",
   "private": false,
   "description": "聚福宝基础插件专用库",
   "main": "index.js",

package/src/components/XdBar/XdBar.vue

@@ -1,5 +1,5 @@
 <template>
-  <view class="xd-custom-bar" v-if="initDone">
+  <view class="xd-custom-bar" v-if="initDone" :style="{height: barNavHeight + barStatusHeight  + 'rpx'}">
     <view
       class="xd-custom-bar__fixed"
       :style="{
@@ -181,6 +181,11 @@
     created(){
       this.noPrevToIndex = this.$settings['noPrevPageToIndex'] === undefined ? false : this.$settings['noPrevPageToIndex'];
 
+      // #ifdef MP-WEIXIN
+      this.uiIconSize = 36;
+      this.uiFontSize = 24;
+      // #endif
+
       //背景颜色设置
       this.uiBgColor = this.bgColor || this.$mainColor;
       if(this.color) this.uiTextColor = this.color;

package/src/components/XdLayout/XdLayout.vue

@@ -7,16 +7,15 @@
       <!--topBar-->
       <view class="xd-Layout__top-height"
         :style="{
-          height: (topHeight +navBarHeight + statusBarHeight) +'rpx',
+          height: (topHeight + navBarHeight + statusBarHeight) +'rpx',
           backgroundImage: getNavBackImage,
           backgroundPosition: 'top center',
           backgroundSize: '100%',
           backgroundRepeat: 'no-repeat',
         }"
       ></view>
-      <!--topBar-->
       <view class="xd-Layout__bar"
-        v-show="showBar || isPreviewShowBar"
+        v-show="showBar || isPreviewShowBar || isCustomNavigation"
         :class="{isPreviewShowBar: isPreviewShowBar}"
         :style="{
           height: navBarHeight + statusBarHeight + 'rpx',
@@ -31,7 +30,7 @@
           :bar-nav-height="navBarHeight"
           :bar-status-height="statusBarHeight"
           :title="getTitle"
-          :show-back="showBack"
+          :show-back="isShowBack"
           :color="getBarTextColor"
           :bg-color="getBarBgColor"
           :bg-image="!wiewType && navigationStyle ? bgImage: ''"
@@ -42,6 +41,7 @@
           <slot name="topBar" v-if="isSlotTopBar"></slot>
         </xd-bar>
       </view>
+      <!--topBar-->
       <!--top-->
       <view class="xd-Layout__top animation-top"
         v-show="contentStatus"
@@ -94,7 +94,7 @@
         <slot name="footer"></slot>
       </view>
       <!--bottom-->
-      <!--tabbar-->
+      <!--tabBar-->
       <view class="xd-Layout__tabbar"
         v-show="showFooter"
         :style="{
@@ -111,7 +111,7 @@
         </template>
         <slot name="footerBar" v-else></slot>
       </view>
-      <!--tabbar-->
+      <!--tabBar-->
       <view class="xd-Layout__footer-height" :style="{height: (bottomHeight + (isFooterSolt ? footerHeight: 110)) + 'rpx' }"></view>
     </view>
     <view v-if="websiteStatus === false && this.mpSiteLoading" class="website-disable">
@@ -348,8 +348,21 @@
         'siteInfo'
       ]),
 
+      isShowBack(){
+        return this.showBack || this.isCustomNavigation
+      },
+
+      //微信小程序自定义不显示头处理
+      isCustomNavigation(){
+        // #ifdef MP-WEIXIN || APP-PLUS || MP-ALIPAY
+        return !this.wiewType && this.navigationStyle && !this.showBar
+        // #endif
+        return false
+
+      },
+
       isPreviewShowBar(){
-        if(this.wiewType && this.navigationStyle && !this.showBar) return true
+        return this.wiewType && this.navigationStyle && !this.showBar;
       },
       getTitle(){
         if(this.isPreviewShowBar) return '该模块只有在预览模式显示';
@@ -679,13 +692,13 @@
         // 设置状态栏高度
         this.statusBarHeight = this.getRpx(this.systemInfoSyn.statusBarHeight);
 
-        // h5 app mp-alipay
-        // #ifndef H5 || APP-PLUS || MP-ALIPAY
+        // MP-WEIXIN｜APP-PLUS｜mp-alipay
+        // #ifdef  MP-WEIXIN || APP-PLUS || MP-ALIPAY
         // 获取胶囊的位置
         const menuButtonInfo = uni.getMenuButtonBoundingClientRect();
         // (胶囊底部高度 - 状态栏的高度) + (胶囊顶部高度 - 状态栏内的高度) = 导航栏的高度
         //开启自定义导航
-        if(this.navigationStyle === 'custom'){
+        if(this.navigationStyle === 'custom' || this.navigationStyle === true){
           this.navBarHeight = this.getRpx((menuButtonInfo.bottom - this.systemInfoSyn.statusBarHeight) + (menuButtonInfo.top - this.systemInfoSyn.statusBarHeight));
         }
         else{
@@ -694,10 +707,10 @@
         }
         // #endif
 
+        //底部设置
         if(!this.showFooter) {
           this.tabbarHeigth = 0;
         }
-
         this.createTime = new Date().getTime() - this.startTime;
       },
 
@@ -798,6 +811,12 @@
       },
 
       backEvent() {
+        // #ifdef  MP-WEIXIN || APP-PLUS || MP-ALIPAY
+        if(this.isCustomNavigation) {
+          this.$xdUniHelper.navigateBack();
+          return
+        }
+        // #endif
         this.$emit('onBack');
         this.$emit('back');
       },