jufubao-base 1.0.134-beta1 → 1.0.134-beta10

package/package.json

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

package/src/components/JfbBaseCard/Attr.js

@@ -435,11 +435,6 @@ export default {
             loading.close()
           }
         },
-        inline: false,
-        notice: '',
-        rules: [
-          {required: true, message: '请配置温馨提示内容', trigger: 'change'},
-        ],
       },
     ].filter(i => i)
   },

package/src/components/JfbBaseCard/JfbBaseCard.vue

@@ -92,12 +92,11 @@
         <view
           class="jfb-base-card__body-notice-in"
           :style="{
-          background: noticeBackgroundColor,
-          textAlign: 'center',
-          color: dangerColor,
-          fontSize: 26 + 'rpx',
-        }"
-        >该组件未配置数据，因此改模块在正式环境将不显示</view>
+            background: noticeBackgroundColor,
+            textAlign: 'center',
+            color: dangerColor,
+            fontSize: 26 + 'rpx',
+          }">该组件未配置数据，因此改模块在正式环境将不显示</view>
       </view>
       <!--notice end-->
       <view class="jfb-base-card__body-tab">
@@ -145,10 +144,7 @@
                   :color="mainColor"
                   icon="iconyouhuiquan1-011"
                 ></xd-font-icon>
-                <view class="login_style" :style="{
-                  backgroundColor: '#FFFFFF',
-                  ...loginStyle
-                }">{{ tabIndex === 1 ? login_name : "转换" }}</view>
+                <view class="login_style" :style="loginStyle">{{ tabIndex === 1 ? login_name : "转换" }}</view>
               </view>
               <view class="jfb-base-card__body-card-item-right">
                 <view class="jfb-base-card__body-card-item-right-top">
@@ -180,14 +176,7 @@
                       购买其他物品可抵：{{ item.other_card_point }}
                     </view>
                   </view>
-                  <view
-                    @click.stop="toDetail(item)"
-                    :style="{
-                      backgroundColor: mainColor,
-                      ...lookStyle
-                    }"
-                    >查看</view
-                  >
+                  <view @click.stop="toDetail(item)" :style="lookStyle">查看</view>
                 </view>
               </view>
             </view>
@@ -263,7 +252,7 @@ export default {
       jfbAuthorize: (state) => state.jfbAuthorize,
     }),
     loginStyle(){
-      let style = {};
+      let style = { backgroundColor: '#FFFFFF'};
       if(this.login_text_size) style['fontSize'] = this.login_text_size + 'rpx';
       if(this.login_text_color) style['color'] = this.login_text_color;
       if(this.login_text_bg_color) style['backgroundColor'] = this.login_text_bg_color;
@@ -271,11 +260,11 @@ export default {
       return style;
     },
     lookStyle(){
-      let style = {};
+      let style = { backgroundColor: this.mainColor};
       if(this.look_text_size) style['fontSize'] = this.look_text_size + 'rpx';
       if(this.look_text_color) style['color'] = this.look_text_color;
       if(this.look_text_bg_color) style['backgroundColor'] = this.look_text_bg_color;
-      if(this.look_text_radius) style['borderRadius'] = this.look_text_radius + 'rpx'
+      if(this.look_text_radius) style['borderRadius'] = this.look_text_radius + 'rpx';
       return style;
     }
   },

package/src/components/JfbBaseCardBindV2/JfbBaseCardBindV2.vue

@@ -46,7 +46,6 @@
       </xd-form>
       <xd-button class="confirm_btn" width="540rpx" type="primary" @click="handleBindCard">确定</xd-button>
       <view class="warm_tip">温馨提示：如果只有密码，无需输入票券号</view>
-      {{backUrl}}
     </view>
   </view>
 </template>
@@ -154,9 +153,6 @@
           })
           return;
         }
-        this.handleBindSuccess();
-        return;
-
         jfbRootExec("pwdCardBind", {
           vm: this,
           data: this.cardForm

package/src/components/JfbBaseConDialog/Attr.js

@@ -11,20 +11,6 @@ export default {
     //let isHide = typeof data['isHide'] === 'boolean' ? data['isHide']:false;
 
     return [
-      // {
-      //   label: '是否隐藏弹框(仅预览模式生效):',
-      //   ele: 'xd-radio',
-      //   valueKey: 'isHide',
-      //   groupKey:'content',
-      //   value: isHide,
-      //   placeholder: '请选择是否隐藏弹框',
-      //   multiple: false,
-      //   className: 'input60',
-      //   list: [
-      //     { label: '是', value: true },
-      //     { label: '否', value: false },
-      //   ]
-      // },
       {
         label: '选取优惠券列表路径:',
         ele: 'xd-select-pages-path',
@@ -43,7 +29,7 @@ export default {
         ele: 'xd-radio',
         valueKey: 'type',
         groupKey:'content',
-        value: data['type']||1,
+        value: data['type'] || 1,
         placeholder: '请选择活动提示方式',
         multiple: false,
         className: 'input60',
@@ -77,6 +63,19 @@ export default {
         className: 'input60',
         unit: '小时'
       },
+      {
+        label: '是否隐藏弹框(仅预览模式生效):',
+        ele: 'xd-radio',
+        valueKey: 'is_hide_dailog',
+        groupKey:'content',
+        value: data['is_hide_dailog'] || 'N',
+        placeholder: '请选择是否隐藏弹框',
+        className: 'input60',
+        list: [
+          { label: '是', value: 'Y' },
+          { label: '否', value: 'N' },
+        ]
+      },
     ].filter(i=>i)
   },
   advanced: [],

package/src/components/JfbBaseConDialog/JfbBaseConDialog.vue

@@ -98,7 +98,7 @@ export default {
       currentBtnImage: "",
       currentIndex: 0,
       isShow: false,
-      type: "",
+      type: 1,
       isPreview: false, //是否预览
       activity_id: "",
       backgroundColor: "",
@@ -111,6 +111,9 @@ export default {
       timer: null,
       timeNum: 0,
 
+      //预览是否显示弹窗
+      is_preview_hide_dailog: false,
+
     };
   },
   computed: {
@@ -121,6 +124,13 @@ export default {
       if(JSON.stringify(value) === JSON.stringify(oloValue)) return;
       if (this.$configProject['isPreview']) this.init(value)
     },
+    is_preview_hide_dailog(value){
+      if(value === true) this.isShow = false;
+      else {
+        storage.remove(this.containerId);
+        this.onJfbLoad();
+      }
+    },
   },
   created() {
     this.isPreview = this.$configProject.isPreview;
@@ -136,11 +146,8 @@ export default {
       this.list_url = getContainerPropsValue(value, "content.list_url", {value: "",}).value;
       this.distribution_method = getContainerPropsValue(value, "content.distribution_method", "homed");
       this.type = getContainerPropsValue(value, "content.type", 1);
-      this.isHide = false;
       this.time = Number(getContainerPropsValue(value, "content.time", 3));
-      if (this.isPreview) {
-        this.isShow = !this.isHide;
-      }
+      this.is_preview_hide_dailog = getContainerPropsValue(value, "content.is_hide_dailog", 'N') === 'Y';
     },
 
     //领取优惠券
@@ -175,6 +182,7 @@ export default {
     },
 
     getResult() {
+      debugger
       jfbRootExec("getCouponResult", {
         vm: this,
         data: {
@@ -272,7 +280,11 @@ export default {
         this.couponList = list;
         this.couponOther = other;
         if(res.can_take === "Y" && res.has_times === "Y" && list.length > 0){
-          this.isShow = true;
+          if (this.isPreview) {
+            debugger
+            console.log(getContainerPropsValue(value, "content.is_show_dailog", 'Y'))
+            this.isShow = getContainerPropsValue(value, "content.is_show_dailog", 'Y') === 'N';
+          }else this.isShow = true;
         }else{
           this.handleCardBindClose();
         }
@@ -297,7 +309,7 @@ export default {
 
       //预览模式
       if(this.isPreview) {
-        this.getDialogList();
+        if(!this.is_preview_hide_dailog) this.getDialogList();
         return;
       }
 
@@ -348,9 +360,8 @@ export default {
     },
 
     handleClose() {
-      debugger
       //切换下一张，没有下一张，关闭
-      if (this.currentIndex == this.list.length - 1 || this.type == 2) {
+      if (this.currentIndex === (this.list.length - 1) || this.type === 2) {
         this.isShow = false;
         return;
       }
@@ -365,8 +376,7 @@ export default {
     },
 
     handleChange(type) {
-      this.currentIndex =
-        type === "left" ? this.currentIndex - 1 : this.currentIndex + 1;
+      this.currentIndex = type === "left" ? this.currentIndex - 1 : this.currentIndex + 1;
       //不小于0，不大于数组长度
       this.currentIndex = Math.max(
         0,
@@ -386,7 +396,6 @@ export default {
         this.dispatchData = data;
         this.getDialogList();
       }
-      console.log('onJfbCustomEvent',action, data);
     }
   },
 };

package/src/components/JfbBaseNotice/Attr.js

@@ -6,7 +6,7 @@
  */
 export default {
   style: [],
-  content: (data) => {
+  content: (data={}) => {
     if (!data.style) data.style = '1';
     const checkNotice = ()=>{
       let temp = false;
@@ -21,7 +21,6 @@ export default {
     const checkScroll = ()=>{
       return data.style !== '2'
     }
-
     return [
       {
         label: '内容配置:',
@@ -265,7 +264,19 @@ export default {
         inline:false,
         notice:'预览模式点击使用“<span style="color:red">弹窗显示</span>”会重新触发页面刷新，可点击弹出遮罩层进行关闭功能'
       },
-
+      {
+        label: '是否隐藏弹框(仅预览模式生效):',
+        ele: 'xd-radio',
+        valueKey: 'is_hide_dailog',
+        groupKey:'content',
+        value: data['is_hide_dailog'] || 'N',
+        placeholder: '请选择是否隐藏弹框',
+        className: 'input60',
+        list: [
+          { label: '是', value: 'Y' },
+          { label: '否', value: 'N' },
+        ]
+      },
       {
         ele: 'title',
         label: '静态显示',
@@ -418,7 +429,6 @@ export default {
         inline: false,
         notice: '内容边距设置，<span style="color: red">单位：像素</span>。默认值：0像素',
       },
-
       {
         ele: 'title',
         label: '弹窗显示',

package/src/components/JfbBaseNotice/JfbBaseNotice.vue

@@ -211,6 +211,7 @@
         scrollMargin:{},
 
         backgroundColor: '',
+        is_hide_dailog:'N',
       }
     },
     watch: {
@@ -278,7 +279,14 @@
 
       getScrollType(){
         return this.num > 1
-      }
+      },
+
+      is_hide_dailog(value){
+        if(value === 'N') {
+          storage.remove(this.containerId);
+          this.onJfbLoad();
+        }
+      },
 
     },
     created() {
@@ -319,6 +327,7 @@
           this.speed = Number(getContainerPropsValue(container, 'content.speed', 30));
         }
         else this.num = 1;
+        this.is_hide_dailog = getContainerPropsValue(container, 'content.is_hide_dailog', 'N');
       },
 
       handlePop(){
@@ -382,11 +391,12 @@
           clearTimeout(this.timer);
           this.timer = null
         }
+
         this.timer = setTimeout(()=>{
           //弹窗模式
           if(this.style === '3') {
             if(this.isPreview) {
-              this.getContent();
+              if(this.is_hide_dailog === 'N') this.getContent();
             }
             else {
               if(!storage.get(this.containerId)) this.getContent()

package/src/components/JfbBaseSuccess/JfbBaseSuccess.vue

@@ -91,8 +91,7 @@
                 "
                 class="jfb-base-success__body-card jfb-base-success__body-cashier"
               >
-                <view class="jfb-base-success__body-cashier-text"
-                  >{{info.codes[0].show_type === "qrcode" ? "二维码" : "条形码" }}</view>
+                <view class="jfb-base-success__body-cashier-text">{{info.codes[0].show_type === "qrcode" ? "二维码" : "条形码" }}</view>
                   <view style="position: relative">
                     <image
                       :style="{
@@ -103,9 +102,12 @@
                     ></image>
                     <image v-if="info.codes[0].logo&&info.codes[0].show_type === 'qrcode'" class="logo-icon" :src="info.codes[0].logo"></image>
                   </view>
-                <view v-if="info.codes[0].can_read_password" class="jfb-base-success__body-cashier-password" @click="showPassword = true">
-                  {{ showPassword ? info.codes[0].can_read_code : "查看密码" }}
-                </view>
+                <view
+                  v-if="info.codes[0].can_read_password"
+                  class="jfb-base-success__body-cashier-password"
+                  @click="showPassword = true"
+                  :style="{borderRadius: jfbListRadius + 'rpx', color:btnTextColor, backgroundColor:btnBgColor, borderColor:btnBorderColor}"
+                >{{ showPassword ? info.codes[0].can_read_code : "查看密码" }}</view>
                 <view v-else class="jfb-base-success__body-cashier-text">{{ info.codes[0].can_read_code }}</view>
                 <view v-if="info.codes[0].refund_tip_text" style="color:red;font-size:24rpx;text-align:center;margin-top:10rpx">{{info.codes[0].refund_tip_text}}</view>
                 <view
@@ -598,7 +600,7 @@ export default {
       }
 
       //设置码状态
-      //info.codes = [info.codes[3]]
+      //info.codes = [info.codes[0]]
       info.codes =
         info.codes &&
         info.codes.map((item) => {
@@ -634,8 +636,8 @@ export default {
         jfbRootExec("getMallProductDetail", {
           vm: this,
           data: {
-            xnamespace: "cake" || info.product.business_code,
-            product_id: 60004641 || info.product.product_id,
+            xnamespace: (info.product && info.product.business_code) || 'cake',
+            product_id: (info.product && info.product.product_id) || 60004641,
           },
         })
           .then((res) => {

package/src/components/JfbBaseSuccess/Mock.js

@@ -55,6 +55,14 @@ module.exports = {
         "password": "",
         "can_read_password": "",
         "show_type": "url"
+      },
+      {
+        "code": "https://sandbox-website-05.jufubao.cn/apply/system/card/detail?card_number=101001000007228",
+        "can_read_code": "https://sandbox-website-05.jufubao.cn/apply/system/card/detail?card_number=101001000007228",
+        "code_url": "//sandbox-img.jufubao.cn/uploads/20230531/aed3f3d2d6932c6bc31b065c7ede7fb7.png",
+        "password": "10004",
+        "can_read_password": "密码:10004",
+        "show_type": "qrcode-pass"
       }
     ],
     "custom_content":{

package/src/components/JfbBaseWallet/Attr.js

@@ -11,6 +11,7 @@ export default {
         label: '更改分类label(可排序):',
         ele: 'xd-set-sort-label',
         valueKey: 'newLabel',
+        groupKey:'content',
         value: data['newLabel'] || null,
         disabled: false,
         defaultValue: data['newLabel'],
@@ -20,7 +21,7 @@ export default {
             label: "票券",
             value: 'card',
             sort: 1
-          }, 
+          },
           {
             icon: "iconyuanbao",
             label: "元宝",
@@ -39,36 +40,41 @@ export default {
         label: '是否展示票券入口:',
         ele: 'xd-radio',
         valueKey: 'isCard',
+        groupKey:'content',
         value: data['isCard'] || 'Y',
         list: [
           { "label": "是", "value": 'Y' },
           { "label": "否", "value": 'N' },
         ]
       },
-      {
-        label: '票券跳转路径:',
-        ele: 'xd-select-pages-path',
-        valueKey: 'cardPath',
-        value: data['cardPath'] || {},
-        setting: {
-          router: XdBus.getParentApi('getPagesTree')
-        },
-        inline: false,
-      },
+
       {
         label: '是否展示元宝入口:',
         ele: 'xd-radio',
         valueKey: 'isYuanbao',
+        groupKey:'content',
         value: data['isYuanbao'] || 'Y',
         list: [
           { "label": "是", "value": 'Y' },
           { "label": "否", "value": 'N' },
         ]
       },
+      {
+        label: '是否展示积分入口:',
+        ele: 'xd-radio',
+        valueKey: 'isIntegral',
+        groupKey:'content',
+        value: data['isIntegral'] || 'Y',
+        list: [
+          { "label": "是", "value": 'Y' },
+          { "label": "否", "value": 'N' },
+        ]
+      },
       {
         label: '元宝跳转路径:',
         ele: 'xd-select-pages-path',
         valueKey: 'yuanbaoPath',
+        groupKey:'advanced',
         value: data['yuanbaoPath'] || {},
         setting: {
           router: XdBus.getParentApi('getPagesTree')
@@ -76,18 +82,20 @@ export default {
         inline: false,
       },
       {
-        label: '是否展示积分入口:',
-        ele: 'xd-radio',
-        valueKey: 'isIntegral',
-        value: data['isIntegral'] || 'Y',
-        list: [
-          { "label": "是", "value": 'Y' },
-          { "label": "否", "value": 'N' },
-        ]
+        label: '票券跳转路径:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'cardPath',
+        groupKey:'advanced',
+        value: data['cardPath'] || {},
+        setting: {
+          router: XdBus.getParentApi('getPagesTree')
+        },
+        inline: false,
       },
       {
         label: '积分跳转路径:',
         ele: 'xd-select-pages-path',
+        groupKey:'advanced',
         valueKey: 'integralPath',
         value: data['integralPath'] || {},
         setting: {

package/src/components/JfbBaseWalletDetail/Attr.js

@@ -0,0 +1,12 @@
+'use strict';
+
+/**
+ * @description 当表单组件中有联动操作时候，使用方法进行返回
+ */
+export default {
+  style: [],
+  content: (data) => {
+    return [].filter(i=>i)
+  },
+  advanced: [],
+};

package/src/components/JfbBaseWalletDetail/JfbBaseWalletDetailMixin.js

@@ -1,18 +1,30 @@
 'use strict';
 
 
+//@AttrImport
+import Attr from "./Attr";
+//@EndAttrImport
+
 
 export default {
   data() {
     return {
       //#ifdef H5
       
+      //@AttrData
+      Attr:{}, //对外开发编辑属性
+      //@EndAttrData
+      
       // #endif
       cssRoot: 'jfb-base-wallet-detail'
     }
   },
   created() {
     
+    //@AttrDataCreated
+    this.Attr = this.$xdUniHelper.customClone(Attr);
+    //@EndAttrDataCreated
+    
 
   },
 }

package/src/components/JfbBaseWalletIndex/Attr.js

@@ -11,15 +11,17 @@ export default {
         label: '钱包详情跳转路径:',
         ele: 'xd-select-pages-path',
         valueKey: 'walletDetailPath',
+        groupKey:'advanced',
         value: data['walletDetailPath'] || {},
         setting: {
           router: XdBus.getParentApi('getPagesTree')
         },
         inline: false,
-      }, 
+      },
       {
         label: '账单详情跳转路径:',
         ele: 'xd-select-pages-path',
+        groupKey:'advanced',
         valueKey: 'billDetailPath',
         value: data['billDetailPath'] || {},
         setting: {

package/src/components/JfbBaseWalletItem/Attr.js

@@ -11,16 +11,18 @@ export default {
         label: '账单详情跳转路径:',
         ele: 'xd-select-pages-path',
         valueKey: 'billDetailPath',
+        groupKey:'advanced',
         value: data['billDetailPath'] || {},
         setting: {
           router: XdBus.getParentApi('getPagesTree')
         },
         inline: false,
-      }, 
+      },
       {
         label: '有效期列表跳转路径:',
         ele: 'xd-select-pages-path',
         valueKey: 'effectivePath',
+        groupKey:'advanced',
         value: data['effectivePath'] || {},
         setting: {
           router: XdBus.getParentApi('getPagesTree')