jufubao-base 1.0.128 → 1.0.130-beta2

package/src/components/JfbBaseCardShiftEntry/JfbBaseCardShiftEntryLess.less

@@ -13,9 +13,8 @@
 
 //start
 .jfb-base-card-shift-entry {
-  border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(50, rpx);
+  min-height: unit(100, rpx);
 
   &__body{
       position: relative;
@@ -23,21 +22,21 @@
       z-index: 2
   }
 
-  &.editx {
+  &.editx,&:hover {
     position: relative;
-    border: 1px dashed blue;
-    box-sizing: border-box;
-    z-index: 3
-
-  }
-
-  &:hover {
-    border: 1px dashed blue;
-  }
+    z-index: 3;
+    &::after {
+      border: 2rpx dashed blue;
+      content: " ";
+      position: absolute;
+      top:0;
+      left:0;
+      bottom:0;
+      right:0;
+      z-index: 4;
+      cursor: pointer;
+    }
 
-  &.noBorder {
-    border-color: rgba(0,0,0,0);
-    border-width: 0;
   }
 
 
@@ -72,9 +71,9 @@
 
 /**notPreview**/
 .jfb-base-card-shift-entry {
-  &:before {
-    content: " ";
-    display: table;
-  }
+  //&:before {
+    //content: " ";
+    //display: table;
+  //}
 }
 /**endNotPreview**/

package/src/components/JfbBaseCardShiftEntry/Mock.js

@@ -1,5 +1,6 @@
 'use strict';
 
 module.exports = {
-  getByIdCardDetailEntry:{"card_number":"171003500000390","card_point":900,"card_type_name":"一对一次卡（无限制）","end_time":"2024-09-30","card_status":"Y","card_status_name":"开启","card_qrcode":"\/\/sandbox-apis.jufubao.cn\/common\/v1\/image\/qrcode?code_content=h.161.4tzflzciaovkl5e","barcode":"\/\/sandbox-apis.jufubao.cn\/common\/v1\/image\/barcode?code_content=h.161.4tzflzciaovkl5e","card_qrcode_expire":600,"unit":"次","main_business_code_name":"","other_card_point":0,"is_exchange":"Y","exchange_card_type_name":"福券","exchange_card_point":26730,"card_point_type":1,"is_show_qrcode_logo":"Y","is_can_unbind":"Y","site_entry_settings":[],"business_codes":["movie","cake","video"],"request_id":"e27d6887c093c381"}
+  getByIdCardDetailEntry:{"card_number":"171003500000390","card_point":900,"card_type_name":"一对一次卡（无限制）","end_time":"2024-09-30","card_status":"Y","card_status_name":"开启","card_qrcode":"\/\/sandbox-apis.jufubao.cn\/common\/v1\/image\/qrcode?code_content=h.161.4tzflzciaovkl5e","barcode":"\/\/sandbox-apis.jufubao.cn\/common\/v1\/image\/barcode?code_content=h.161.4tzflzciaovkl5e","card_qrcode_expire":600,"unit":"次","main_business_code_name":"","other_card_point":0,"is_exchange":"Y","exchange_card_type_name":"福券","exchange_card_point":26730,"card_point_type":1,"is_show_qrcode_logo":"Y","is_can_unbind":"Y","site_entry_settings":[],"business_codes":["movie","cake","video"],"request_id":"e27d6887c093c381"},
+  changeCardBindEntry:{"name":"4545","number":123456,"piaoquanshengyu":"29次/点","status":"开启","zhuanhuan":"可转换","shengyu":"xxx点"}
 }

package/src/components/JfbBaseCardSweepInfo/Attr.js

@@ -5,9 +5,10 @@ export default {
   advanced: [],
   content: [
     {
-      label: '卡绑定成功回跳地址:', //label
-      ele: 'xd-select-pages-path', //package 名称
-      valueKey: 'back_url', //form[valueKey]
+      label: '卡绑定成功回跳地址:',
+      ele: 'xd-select-pages-path',
+      valueKey: 'back_url',
+      groupKey:'advanced',
       placeholder: '请选择卡绑定成功回跳地址',
       value: null,
       setting: {
@@ -19,6 +20,7 @@ export default {
       label: "票券过期是否展示余额",
       ele: "xd-radio",
       valueKey: "is_show_balance",
+      groupKey:'content',
       value: "N",
       list: [
         {label: "是", value: "Y"},

package/src/components/JfbBaseCardSweepInfo/JfbBaseCardSweepInfoLess.less

@@ -13,9 +13,8 @@
 
 //start
 .jfb-base-card-sweep-info {
-  border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(50, rpx);
+  min-height: unit(100, rpx);
 
   &__body{
       position: relative;
@@ -23,21 +22,21 @@
       z-index: 2
   }
 
-  &.editx {
+  &.editx,&:hover {
     position: relative;
-    border: 1px dashed blue;
-    box-sizing: border-box;
-    z-index: 3
-
-  }
-
-  &:hover {
-    border: 1px dashed blue;
-  }
+    z-index: 3;
+    &::after {
+      border: 2rpx dashed blue;
+      content: " ";
+      position: absolute;
+      top:0;
+      left:0;
+      bottom:0;
+      right:0;
+      z-index: 4;
+      cursor: pointer;
+    }
 
-  &.noBorder {
-    border-color: rgba(0,0,0,0);
-    border-width: 0;
   }
 
 
@@ -72,9 +71,9 @@
 
 /**notPreview**/
 .jfb-base-card-sweep-info {
-  &:before {
-    content: " ";
-    display: table;
-  }
+  //&:before {
+    //content: " ";
+    //display: table;
+  //}
 }
 /**endNotPreview**/

package/src/components/JfbBaseCardV2/Attr.js

@@ -12,6 +12,7 @@ export default {
         ele: 'el-input',
         type: 'text',
         valueKey: 'login_name',
+        groupKey: 'content',
         value: data['login_name'] || '',
         placeholder: '请输入票券登陆文案',
         className: 'input80',
@@ -19,22 +20,23 @@ export default {
         notice: '当未设置文案时候，前台页面显示未"登录"'
       },
       {
-        label: '边距设置:',
+        label: '填充设置:',
         ele: 'xd-margin-padding',
         valueKey: 'margin',
+        groupKey: 'style',
         value: data.margin || null,
-        disabled: false,
         setting: {
-          type: 'margin',
+          type: 'padding',
         },
-        placeholder: '请设置边距设置',
+        placeholder: '请设填充距设置',
         inline: false,
-        notice: '边距设置，<span style="color: red">单位：像素</span>。默认值：0像素',
+        notice: '填充设置，<span style="color: red">单位：像素</span>。默认值：20像素',
       },
       {
-        label: '卡券详情地址:', //label
-        ele: 'xd-select-pages-path', //package 名称
-        valueKey: 'cardInfoPath', //form[valueKey]
+        label: '卡券详情地址:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'cardInfoPath',
+        groupKey: 'advanced',
         placeholder: '请选择卡券详情地址',
         value: data.cardInfoPath || null,
         setting: {
@@ -43,10 +45,11 @@ export default {
         inline: false,
       },
       {
-        label: '卡券密码绑定地址:', //label
-        ele: 'xd-select-pages-path', //package 名称
-        valueKey: 'cardBindPath', //form[valueKey]
-        placeholder: '请选择卡券密码绑定地址',
+        label: '绑定新卡地址:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'cardBindPath',
+        groupKey: 'advanced',
+        placeholder: '请选择绑定新卡地址',
         value: data.cardBindPath || null,
         setting: {
           router: XdBus.getParentApi('getPagesTree'),
@@ -54,9 +57,10 @@ export default {
         inline: false,
       },
       {
-        label: '我的订单地址:', //label
-        ele: 'xd-select-pages-path', //package 名称
-        valueKey: 'orderListPath', //form[valueKey]
+        label: '我的订单地址:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'orderListPath',
+        groupKey: 'advanced',
         placeholder: '请选择我的订单地址',
         value: data.orderListPath || null,
         setting: {

package/src/components/JfbBaseCardV2/JfbBaseCardV2.vue

@@ -14,12 +14,11 @@
     </view>
     <!-- #endif -->
     <view class="jfb-base-card-v2__body">
-
       <view v-if="loadingCardList">
         <view
           class="jfb-base-card__body-card skeleton-card"
           :style="{
-            margin: marginUi,
+            padding: marginUi,
           }"
         >
           <view v-for="i in 4" :key="i" class="jfb-base-card__body-card-item">
@@ -104,8 +103,7 @@
           </view>
         </view>
       </template>
-
-      <view :style="{height: '50rpx'}"></view>
+      <view :style="{height:'128rpx'}"></view>
       <view class="bottom_fix" :style="button_bottom">
         <view>
           <xd-button type="primary" @click="toBindCard">绑定新卡</xd-button>
@@ -283,7 +281,6 @@
         left: 0;
         background: #FFFFFF;
 
-
         padding: 0 unit(24, rpx);
         box-sizing: border-box;
         box-shadow: 0px 0px 8rpx 0px rgba(179, 193, 196, 0.5);
@@ -295,6 +292,7 @@
           justify-content: center;
           align-items: center;
           padding: unit(24, rpx);
+          box-sizing: border-box;
         }
       }
     }

package/src/components/JfbBaseCardV2/JfbBaseCardV2Less.less

@@ -13,9 +13,8 @@
 
 //start
 .jfb-base-card-v2 {
-  border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(50, rpx);
+  min-height: unit(100, rpx);
 
   &__body{
       position: relative;
@@ -23,21 +22,21 @@
       z-index: 2
   }
 
-  &.editx {
+  &.editx,&:hover {
     position: relative;
-    border: 1px dashed blue;
-    box-sizing: border-box;
-    z-index: 3
-
-  }
-
-  &:hover {
-    border: 1px dashed blue;
-  }
+    z-index: 3;
+    &::after {
+      border: 2rpx dashed blue;
+      content: " ";
+      position: absolute;
+      top:0;
+      left:0;
+      bottom:0;
+      right:0;
+      z-index: 4;
+      cursor: pointer;
+    }
 
-  &.noBorder {
-    border-color: rgba(0,0,0,0);
-    border-width: 0;
   }
 
 
@@ -72,9 +71,9 @@
 
 /**notPreview**/
 .jfb-base-card-v2 {
-  &:before {
-    content: " ";
-    display: table;
-  }
+  //&:before {
+    //content: " ";
+    //display: table;
+  //}
 }
 /**endNotPreview**/

package/src/components/JfbBaseCardV3/Attr.js

@@ -12,6 +12,7 @@ export default {
         ele: 'el-input',
         type: 'text',
         valueKey: 'login_name',
+        groupKey:'content',
         value: data.login_name || null,
         placeholder: '请输入票券登陆文案',
         className: 'input80',
@@ -19,10 +20,11 @@ export default {
         notice: '当未设置文案时候，前台页面显示为"<span style="color:red">登录</span>"'
       },
       {
-        label: '卡券密码绑定地址:', //label
-        ele: 'xd-select-pages-path', //package 名称
-        valueKey: 'cardBindPath', //form[valueKey]
-        placeholder: '卡券密码绑定地址',
+        label: '绑定新票券地址:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'cardBindPath',
+        groupKey:'advanced',
+        placeholder: '请选择绑定新票券地址',
         value: data.cardBindPath || null,
         setting: {
           router: XdBus.getParentApi('getPagesTree'),
@@ -30,10 +32,11 @@ export default {
         inline: false,
       },
       {
-        label: '卡券转换地址:', //label
-        ele: 'xd-select-pages-path', //package 名称
-        valueKey: 'changeUrl', //form[valueKey]
-        placeholder: '请选择卡券转换地址',
+        label: '票券转换地址:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'changeUrl',
+        groupKey:'advanced',
+        placeholder: '请选择票券转换地址',
         value: data.changeUrl || null,
         setting: {
           router: XdBus.getParentApi('getPagesTree'),
@@ -41,10 +44,11 @@ export default {
         inline: false,
       },
       {
-        label: '卡券详情地址:', //label
-        ele: 'xd-select-pages-path', //package 名称
-        valueKey: 'detailUrl', //form[valueKey]
-        placeholder: '请选择卡券详情地址',
+        label: '票券详情地址:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'detailUrl',
+        groupKey:'advanced',
+        placeholder: '请选择票券详情地址',
         value: data.detailUrl || null,
         setting: {
           router: XdBus.getParentApi('getPagesTree'),

package/src/components/JfbBaseCardV3/JfbBaseCardV3.vue

@@ -227,7 +227,7 @@
         margin: 24rpx 0;
       }
       .card_list{
-        padding-bottom: 100rpx;
+        padding-bottom: 128rpx;
       }
       .empty_data{
         line-height: 250rpx;

package/src/components/JfbBaseCardV3/JfbBaseCardV3Less.less

@@ -13,9 +13,8 @@
 
 //start
 .jfb-base-card-v3 {
-  border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(50, rpx);
+  min-height: unit(100, rpx);
 
   &__body{
       position: relative;
@@ -23,21 +22,21 @@
       z-index: 2
   }
 
-  &.editx {
+  &.editx,&:hover {
     position: relative;
-    border: 1px dashed blue;
-    box-sizing: border-box;
-    z-index: 3
-
-  }
-
-  &:hover {
-    border: 1px dashed blue;
-  }
+    z-index: 3;
+    &::after {
+      border: 2rpx dashed blue;
+      content: " ";
+      position: absolute;
+      top:0;
+      left:0;
+      bottom:0;
+      right:0;
+      z-index: 4;
+      cursor: pointer;
+    }
 
-  &.noBorder {
-    border-color: rgba(0,0,0,0);
-    border-width: 0;
   }
 
 
@@ -72,9 +71,9 @@
 
 /**notPreview**/
 .jfb-base-card-v3 {
-  &:before {
-    content: " ";
-    display: table;
-  }
+  //&:before {
+    //content: " ";
+    //display: table;
+  //}
 }
 /**endNotPreview**/

package/src/components/JfbBaseCity/Attr.js

@@ -6,11 +6,9 @@
 export default {
   style: [],
   content: (data) => {
-    return [
-      
-    ].filter(i=>i)
+    return [ ].filter(i=>i)
   },
   advanced: [
-    
+
   ],
 };

package/src/components/JfbBaseCity/JfbBaseCityLess.less

@@ -13,9 +13,8 @@
 
 //start
 .jfb-base-city {
-  border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(50, rpx);
+  min-height: unit(100, rpx);
 
   &__body{
       position: relative;
@@ -23,21 +22,21 @@
       z-index: 2
   }
 
-  &.editx {
+  &.editx,&:hover {
     position: relative;
-    border: 1px dashed blue;
-    box-sizing: border-box;
-    z-index: 3
-
-  }
-
-  &:hover {
-    border: 1px dashed blue;
-  }
+    z-index: 3;
+    &::after {
+      border: 2rpx dashed blue;
+      content: " ";
+      position: absolute;
+      top:0;
+      left:0;
+      bottom:0;
+      right:0;
+      z-index: 4;
+      cursor: pointer;
+    }
 
-  &.noBorder {
-    border-color: rgba(0,0,0,0);
-    border-width: 0;
   }
 
 
@@ -72,9 +71,9 @@
 
 /**notPreview**/
 .jfb-base-city {
-  &:before {
-    content: " ";
-    display: table;
-  }
+  //&:before {
+    //content: " ";
+    //display: table;
+  //}
 }
 /**endNotPreview**/

package/src/components/{JfbBaseWalletDetail → JfbBaseClear}/Attr.js

@@ -11,6 +11,7 @@ export default {
     ].filter(i=>i)
   },
   advanced: [
+
   ],
 };
  

package/src/components/JfbBaseClear/JfbBaseClearLess.less

@@ -13,9 +13,8 @@
 
 //start
 .jfb-base-clear {
-  border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(50, rpx);
+  min-height: unit(100, rpx);
 
   &__body{
       position: relative;
@@ -23,21 +22,21 @@
       z-index: 2
   }
 
-  &.editx {
+  &.editx,&:hover {
     position: relative;
-    border: 1px dashed blue;
-    box-sizing: border-box;
-    z-index: 3
-
-  }
-
-  &:hover {
-    border: 1px dashed blue;
-  }
+    z-index: 3;
+    &::after {
+      border: 2rpx dashed blue;
+      content: " ";
+      position: absolute;
+      top:0;
+      left:0;
+      bottom:0;
+      right:0;
+      z-index: 4;
+      cursor: pointer;
+    }
 
-  &.noBorder {
-    border-color: rgba(0,0,0,0);
-    border-width: 0;
   }
 
 
@@ -72,9 +71,9 @@
 
 /**notPreview**/
 .jfb-base-clear {
-  &:before {
-    content: " ";
-    display: table;
-  }
+  //&:before {
+    //content: " ";
+    //display: table;
+  //}
 }
 /**endNotPreview**/

package/src/components/JfbBaseClear/JfbBaseClearMixin.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-clear'
     }
   },
   created() {
     
+    //@AttrDataCreated
+    this.Attr = this.$xdUniHelper.customClone(Attr);
+    //@EndAttrDataCreated
+    
 
   },
 }

package/src/components/JfbBaseConDialog/Api.js

@@ -17,7 +17,7 @@ module.exports = [
     disabled: true,
   },
   {
-    mapFnName: 'getCouponList', //自定义方法名字（必选）
+    mapFnName: 'getDialogCouponList', //自定义方法名字（必选）
     title: '获取优惠券列表',
     path: '/sms-coupon/v1/activity-prizes-user/list',
     isRule: false,