jufubao-base 1.0.236-beta2 → 1.0.236-beta4

package/package.json

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

package/src/components/JfbBaseCardGive/JfbBaseCardGive.vue

@@ -93,13 +93,13 @@
       >
         <xd-button type="primary" @click="handleCancel">取消赠送</xd-button>
         <!-- #ifdef H5 -->
-        <xd-button type="primary" @click="handleShare">再次分享</xd-button>
+        <xd-button type="primary" @click="handleReShare">再次分享</xd-button>
         <!-- #endif -->
         <!-- #ifdef MP-WEIXIN -->
         <button
           :style="{ background: mainColor }"
           class="share-btn"
-          @click="handleShare"
+          @click="handleReShare"
           open-type="share"
         >
           再次分享
@@ -387,9 +387,13 @@ export default {
         })
       })
     },
+    handleReShare(){
+      this.dialogShow = true;
+    },
     handleShare() {
       //#ifdef H5
-      this.dialogShow = true;
+      let share = `${document.location.origin}/${this.projectAttr.deploy_dir}${this.get_url}?transfer_auth_code=${this.info.transfer_record.transfer_auth_code}`;
+      this.copy(share);
       // #endif
       // #ifdef MP-WEIXIN
       this.setShareInfo({

package/src/components/JfbBaseCardReceiveCover/JfbBaseCardReceiveCover.vue

@@ -16,6 +16,7 @@
     </view>
     <!-- #endif -->
     <view
+      v-if="loaded"
       :style="{
         height: layoutInfo.bodyMinHeightRpx + 'rpx',
         background: status === 'N' ? canReceiveBgColor : cannotReceiveBgColor,
@@ -54,6 +55,7 @@ export default {
   mixins: [componentsMixins, extsMixins, JfbBaseCardReceiveCoverMixin],
   data() {
     return {
+      loaded: false,
       btnBg: "",
       contentBg: "",
       greeting: "",
@@ -125,6 +127,7 @@ export default {
         .then((res) => {
           this.greeting = res.transfer_record.greeting;
           this.status = res.transfer_record.status;
+          this.loaded = true;
         })
         .catch((err) => {
           console.log(err, "err");

package/src/components/JfbBaseNotice/Attr.js

@@ -262,7 +262,7 @@ export default {
           {"label": "弹窗显示", "value": '3'},
         ],
       },
-      data.style === '1' && {
+      {
         label: "是否显示提示图标:",
         ele: "xd-radio",
         valueKey: "show_tip_icon",
@@ -271,9 +271,10 @@ export default {
         list: [
           { label: '显示', value: 'Y' },
           { label: '不显示', value: 'N' }
-        ]
+        ],
+        hidden: data.style !== '1',
       },
-      data.style === '1' && data.show_tip_icon === 'Y' && {
+      {
         label: "提示图标:",
         ele: 'xd-upload',
         valueKey: 'staticTipIcon',
@@ -288,6 +289,8 @@ export default {
         size: .5,
         action: 'action',
         sort: true,
+        hidden: data.style !== '1' || data.show_tip_icon !== 'Y',
+
       },
       {
         label: '是否隐藏弹框(仅预览模式生效):',

package/src/components/JfbBaseNotice/JfbBaseNotice.vue

@@ -111,18 +111,28 @@
                   :style="{height: tipIconHeight+'rpx'}"
                   style="width: auto;margin-right: 12rpx;" mode="heightFix"
                 ></image>
-                <view style="flex: 1;">
-                  <xd-content-xss
-                    :key="contentKey"
-                    :html="content"
-                    :font-sizes="fontSize"
-                  ></xd-content-xss>
+                <view class="jfb-base-notice__body-content_inner"
+                  :style="{
+                    fontSize: fontSize + 'rpx',
+                  }"
+                  v-html="$xdUniHelper.filterHtml(content)"
+                  @click="showStaticDialog = true"
+                >
                 </view>
               </view>
             </view>
           </template>
         </template>
       </view>
+      <XdDailog :show.sync="showStaticDialog" :showTitle="false" :cancel="false" :confirm="false">
+        <view style="padding-top: 60rpx;">
+          <xd-content-xss
+            :key="contentKey"
+            :html="content"
+            :font-sizes="fontSize"
+          ></xd-content-xss>
+        </view>
+      </XdDailog>
       <xd-down-drawer
         v-if="showUp"
         :show.sync="showUp"
@@ -162,6 +172,7 @@
   import XdContentXss from '@/components/XdContentXss/XdContentXss';
   import XdNoticeBar from "./XdNoticeBar"
   import XdButton from "@/components/XdButton/XdButton.vue";
+  import XdDailog from "@/components/XdDailog/XdDailog.vue"
   import { jfbRootExec } from "@/utils/xd.event";
   import JfbBaseNoticeMixin from "./JfbBaseNoticeMixin";
   import componentsMixins from "@/mixins/componentsMixins";
@@ -179,7 +190,8 @@
       XdContentXss,
       XdNoticeBar,
       XdDownDrawer,
-      XdButton
+      XdButton,
+      XdDailog
     },
     mixins: [componentsMixins,extsMixins,JfbBaseNoticeMixin],
     data() {
@@ -230,6 +242,8 @@
         staticTipIcon: "",
         tipIconHeight: 50,
 
+        showStaticDialog: false,
+
         isMp:false,
 
         btnConfirmWidth: "",
@@ -536,6 +550,13 @@
         padding: unit(8, rpx) unit(10, rpx);
         display: flex;
         align-items: center;
+
+        &_inner{
+          flex: 1;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+        }
       }
     }