jufubao-base 1.0.236-beta1 → 1.0.236-beta2

package/package.json

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

package/src/components/JfbBaseCardGive/JfbBaseCardGive.vue

@@ -133,7 +133,7 @@
           <view style="display: flex;align-items: center;justify-content: space-between;">
             <xd-button @click="handleShare" width="260rpx" type="primary" size="small"
               >通知微信好友</xd-button>
-            <xd-button @click="handleShare" width="260rpx" type="primary" size="small"
+            <xd-button @click="toSeeShareImg" width="260rpx" type="primary" size="small"
               >查看分享图片</xd-button>
           </view>
           
@@ -156,6 +156,9 @@
       <view class="share_card_dialog" v-show="showShareCard">
         <view class="share_modal" @click="showShareCard=false"></view>
         <view class="share_content">
+          <view class="share_close" @click="showShareCard=false">
+            <xd-font-icon icon="iconguanbi" :size="32" color="#FFFFFF"></xd-font-icon>
+          </view>
           <image :src="canvasUrl" v-if="canvasUrl" class="share_img"  style="width: 654rpx; height: 968rpx;"></image>
         </view>
       </view>
@@ -366,8 +369,7 @@ export default {
       });
       // #endif
     },
-    handleShare() {
-      //#ifdef H5
+    toSeeShareImg(){
       this.dialogShow = false;
       this.showShareCard = true;
       if(this.canvasUrl) return;
@@ -384,6 +386,10 @@ export default {
           },
         })
       })
+    },
+    handleShare() {
+      //#ifdef H5
+      this.dialogShow = true;
       // #endif
       // #ifdef MP-WEIXIN
       this.setShareInfo({
@@ -423,7 +429,7 @@ export default {
         position: fixed;
         top: 0;
         left: 0;
-        background: rgba(0, 0, 0, 0.5);
+        background: rgba(0, 0, 0, 0.7);
         z-index: 112;
       }
       .share_content{
@@ -434,6 +440,29 @@ export default {
         left: 50%;
         transform: translate(-50%, -50%);
         z-index: 113;
+        &::before{
+          content: "长按图片，并选择保存到手机";
+          position: absolute;
+          top: -70rpx;
+          left: 0;
+          width: 100%;
+          height: 100%;
+          font-size: 32rpx;
+          color: #FFFFFF;
+          text-align: center;
+          font-weight: 500;
+        }
+        .share_close{
+          position: absolute;
+          top: 0;
+          right: 0;
+          width: 80rpx;
+          height: 80rpx;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          z-index: 9999;
+        }
         .share_img{
           position: absolute;
           top: 0;

package/src/components/JfbBaseNotice/Attr.js

@@ -266,11 +266,11 @@ export default {
         label: "是否显示提示图标:",
         ele: "xd-radio",
         valueKey: "show_tip_icon",
-        value: data['show_tip_icon'],
+        value: data['show_tip_icon'] || 'N',
         groupKey: 'content',
         list: [
-          { label: '是', value: 'Y' },
-          { label: '否', value: 'N' }
+          { label: '显示', value: 'Y' },
+          { label: '不显示', value: 'N' }
         ]
       },
       data.style === '1' && data.show_tip_icon === 'Y' && {

package/src/components/JfbBaseNotice/JfbBaseNotice.vue

@@ -111,11 +111,13 @@
                   :style="{height: tipIconHeight+'rpx'}"
                   style="width: auto;margin-right: 12rpx;" mode="heightFix"
                 ></image>
-                <xd-content-xss
-                  :key="contentKey"
-                  :html="content"
-                  :font-sizes="fontSize"
-                ></xd-content-xss>
+                <view style="flex: 1;">
+                  <xd-content-xss
+                    :key="contentKey"
+                    :html="content"
+                    :font-sizes="fontSize"
+                  ></xd-content-xss>
+                </view>
               </view>
             </view>
           </template>

package/src/components/JfbBasePosterType/Attr.js

@@ -582,6 +582,7 @@ export default {
         value: params['textColor'] || '',
         placeholder: '请选择文字颜色',
         classNmae: 'input80',
+        hidden: true,
       },
       {
         label: '外边距设置:',