jufubao-base 1.0.61-beta5 → 1.0.62

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.61-beta5",
+  "version": "1.0.62",
   "private": false,
   "description": "聚福宝业务组件基础插件包",
   "main": "index.js",

package/src/components/JfbBaseCard/JfbBaseCard.vue

@@ -67,37 +67,39 @@
           </view>
         </template>
       </view>
+      <!--notice-->
       <view class="jfb-base-card__body-line" v-if="!notice"></view>
-      <view
-        class="jfb-base-card__body-notice"
-        :style="{ background: noticeBackgroundColor }"
-        v-if="notice"
-      >
-        <xd-notice-bar
-          :showIcon="true"
-          :scrollable="true"
-          :speed="20"
-          :fontSize="24"
-          :height="70"
-          :is-no-bgc="false"
+      <view class="jfb-base-card__body-notice" v-if="notice">
+        <view
+          class="jfb-base-card__body-notice-in"
+          :style="{ background: noticeBackgroundColor }"
         >
-          <template>
-            <view v-html="notice"></view>
-          </template>
-        </xd-notice-bar>
+          <xd-notice-bar
+            :showIcon="true"
+            :scrollable="true"
+            :speed="20"
+            :fontSize="24"
+            :height="70"
+            :is-no-bgc="false"
+          >
+            <template>
+              <view v-html="notice"></view>
+            </template>
+          </xd-notice-bar>
+        </view>
       </view>
-      <view
-        v-if="noticeStatus && isPreview && notice === ''"
-        class="jfb-base-card__body-notice"
-        :style="{
+      <view class="jfb-base-card__body-notice" v-if="noticeStatus && isPreview && notice === ''">
+        <view
+          class="jfb-base-card__body-notice-in"
+          :style="{
           background: noticeBackgroundColor,
           textAlign: 'center',
           color: dangerColor,
           fontSize: 26 + 'rpx',
         }"
-      >
-        该组件未配置数据，因此改模块在正式环境将不显示</view
-      >
+        >该组件未配置数据，因此改模块在正式环境将不显示</view>
+      </view>
+      <!--notice end-->
       <view class="jfb-base-card__body-tab">
         <view
           @click="tabIndex = 1"
@@ -298,10 +300,10 @@ export default {
     this.init(this.container);
     this.noticeBackgroundColor = Color(this.warningColor).alpha(0.2).toString();
     this.isPreview = this.$configProject.isPreview;
-    
+
     //#ifdef H5
     this.isWx = this.isPreview || isWechat();
-    
+
     if (!this.$configProject.isPreview) {
       jfbRootExec("getH5WxAuthorize", {
         vm: this,
@@ -331,7 +333,7 @@ export default {
       this.allEntryPath = getContainerPropsValue(container,"content.allEntryPath",{value: ""}).value;
       this.login_name = getContainerPropsValue(container, "content.login_name", "登录");
     },
-    
+
     handleToLink(path) {
       this.$xdUniHelper.navigateTo({
         url: path,
@@ -529,7 +531,7 @@ export default {
         .catch(() => this.$xdHideLoading());
     },
 
-    onShow(options) {
+    onJfbShow(options) {
       this.onJfbLoad(options);
     },
 
@@ -629,9 +631,22 @@ export default {
     }
 
     &-notice {
-      margin: unit(46, rpx) unit(-35, rpx) 0 unit(-35, rpx);
-      padding: unit(22, rpx) unit(35, rpx);
-      line-height: unit(70, rpx);
+      width: 100%;
+      margin-top: unit(30, rpx);
+      height: unit(80, rpx);
+      position: relative;
+      &-in {
+        position: absolute;
+        left: unit(-30, rpx);
+        top: unit(0, rpx);
+        right: unit(-30, rpx);
+        bottom: 0;
+        display: flex;
+        padding: 0 unit(30, rpx);
+        overflow: hidden;
+        align-items: center;
+      }
+
     }
 
     &-tab {