jufubao-base 1.0.133 → 1.0.134-beta10

package/src/components/JfbBaseCardShift/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-site-news',
       valueKey: 'notice',
+      groupKey:'content',
       value: null,
       className: 'input70',
       setting: {
@@ -39,7 +41,8 @@ export default {
         }
 
         //获取返回参数(场景类型名称为必填)
-        let loading = XdBus.getParentApi('loading')({});
+        //获取返回参数(场景类型名称为必填)
+        let loading = { close(){}}
 
         //获取显示内容
         if (action === 'screen') {
@@ -83,6 +86,7 @@ export default {
 
         //使用内容分类
         if (action === 'cmsPublishEditxContent') {
+          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('cmsPublishEditxContent')(data.params)
             .then(res => {
               console.log('cmsPublishEditxContent', res)
@@ -97,6 +101,7 @@ export default {
 
         //位置列表
         if (action === 'getListPostion') {
+          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('getListNewsPosition')(data.params)
             .then(res => {
               loading.close();
@@ -110,6 +115,7 @@ export default {
 
         //位置创建
         if (action === 'addPostion') {
+          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('addNewsPosition')(data.params)
             .then(res => {
               loading.close();
@@ -124,6 +130,7 @@ export default {
 
         //位置编辑
         if (action === 'editPostion') {
+          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('updateNewsPosition')(data.params)
             .then(res => {
               loading.close();
@@ -138,6 +145,7 @@ export default {
 
         //位置删除
         if (action === 'deleltePostion') {
+          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('deleteNewsPosition')(data.params)
             .then(res => {
               loading.close();
@@ -152,6 +160,7 @@ export default {
 
         //获取广告位内容列表
         if (action === 'getListContent') {
+          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('getListNewsContent')(data.params)
             .then(res => {
               loading.close();
@@ -165,6 +174,7 @@ export default {
 
         //广告内容创建
         if (action === 'addContent') {
+          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('addNewsContent')(data.params)
             .then(res => {
               loading.close();
@@ -179,6 +189,7 @@ export default {
 
         //广告内容编辑
         if (action === 'editContent') {
+          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('updateNewsContent')(data.params)
             .then(res => {
               loading.close();
@@ -193,6 +204,7 @@ export default {
 
         //广告内容删除
         if (action === 'deleteContent') {
+          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('deleteNewsContent')(data.params)
             .then(res => {
               loading.close();
@@ -207,6 +219,7 @@ export default {
 
         //内容发布
         if (action === 'publish') {
+          loading = XdBus.getParentApi('loading')({});
           console.log('publish', data.params)
           XdBus.getParentApi('cmsPublishContent')(data.params)
             .then(res => {
@@ -221,6 +234,7 @@ export default {
 
         //通知页面进行刷新
         if (action === 'update') {
+          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('getXdBusUpdateView')('onUpdateView', {});
           loading.close()
         }

package/src/components/JfbBaseCardShift/JfbBaseCardShift.vue

@@ -152,17 +152,32 @@ export default {
         });
         return;
       }
-      jfbRootExec("changeCardBind", {
-        vm: this,
-        data: {
-          card_number: this.card_number,
-        },
-      })
-        .then((res) => {
-          this.success = true;
-          this.changeNumber = res["to_card_number"];
-        })
-        .catch();
+
+      let card_number =  this.card_number;
+      if(this.$configProject.isPreview) card_number = '101001000005193';
+      let content = `您要将<view style="color:red">【${card_number}】</view>进行转换操作吗？`;
+      this.$xdConfirm({
+        title: "是否确认转换",
+        isHtml: true,
+        $vm: this,
+        content:content,
+        success:(action)=>{
+          if(action.confirm) {
+            jfbRootExec("changeCardBind", {
+              vm: this,
+              data: {
+                card_number: this.card_number,
+              },
+            })
+              .then((res) => {
+                debugger
+                this.success = true;
+                this.changeNumber = res["to_card_number"];
+              })
+              .catch();
+          }
+        }
+      });
     },
     handleToLink() {
       this.$xdUniHelper.navigateTo({

package/src/components/JfbBaseCardShift/JfbBaseCardShiftLess.less

@@ -13,9 +13,8 @@
 
 //start
 .jfb-base-card-shift {
-  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 {
-  &:before {
-    content: " ";
-    display: table;
-  }
+  //&:before {
+    //content: " ";
+    //display: table;
+  //}
 }
 /**endNotPreview**/

package/src/components/JfbBaseCardShift/Mock.js

@@ -0,0 +1,21 @@
+'use strict';
+
+module.exports = {
+  getByIdCardDetail: {
+    "card_number": "101001000005193",
+    "card_point": 100000000,
+    "card_type_name": "聚福宝福卡测试蛋糕",
+    "end_time": "2024-10-31 23:59:59",
+    "card_status": "Y",
+    "card_status_name": "开启",
+    "card_qrcode": "h.jufubao.HASDRcFaNi72jTf",
+    "card_qrcode_expire": 600,
+    "unit": "点",
+    "main_product_name": "",
+    "other_card_point": 0,
+    "is_exchange": "N",
+    "exchange_card_type_name": "福券",
+    "exchange_card_point": 90000000,
+    "request_id": "e73cd28f702858a7"
+  },
+}

package/src/components/JfbBaseCardShiftEntry/Attr.js

@@ -6,11 +6,12 @@ export default {
   content: (data) => {
     return [
       {
-        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: data.back_url || null,
+        value: data['back_url'] || null,
         setting: {
           router: XdBus.getParentApi('getPagesTree'),
         },
@@ -20,6 +21,7 @@ export default {
         label: '提示内容:',
         ele: 'xd-site-news',
         valueKey: 'notice',
+        groupKey:'content',
         value: data.notice || null,
         className: 'input70',
         setting: {
@@ -38,10 +40,10 @@ export default {
             //当一个插件中出现使用内容分类时候需要设置code值，在页面引用时候容器id + code进行拼接
             //data.params = Object.assign({}, data.params, {code: 'g_test_id'});
           }
-  
+
           //获取返回参数(场景类型名称为必填)
-          let loading = XdBus.getParentApi('loading')({});
-  
+          let loading = { close(){}}
+
           //获取显示内容
           if (action === 'screen') {
             XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_bucket_content_tip'})
@@ -53,9 +55,9 @@ export default {
                 console.error(error);
                 loading.close();
               });
-  
+
           }
-  
+
           //获取返回参数(广告位高度必选项)
           if (action === 'getNewsInfo') {
             XdBus.getParentApi('cmsGetPublishEditxContent')(data.params)
@@ -68,7 +70,7 @@ export default {
                 console.error(error);
               });
           }
-  
+
           //获取产品业务线列表
           if (action === 'namespace') {
             XdBus.getParentApi('getOptionsNamespaces')({})
@@ -81,9 +83,10 @@ export default {
                 console.error(error);
               });
           }
-  
+
           //使用内容分类
           if (action === 'cmsPublishEditxContent') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('cmsPublishEditxContent')(data.params)
               .then(res => {
                 console.log('cmsPublishEditxContent', res)
@@ -95,9 +98,10 @@ export default {
                 console.error(error);
               });
           }
-  
+
           //位置列表
           if (action === 'getListPostion') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('getListNewsPosition')(data.params)
               .then(res => {
                 loading.close();
@@ -108,9 +112,10 @@ export default {
                 console.error(error);
               });
           }
-  
+
           //位置创建
           if (action === 'addPostion') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('addNewsPosition')(data.params)
               .then(res => {
                 loading.close();
@@ -122,9 +127,10 @@ export default {
                 data.cb(false)
               });
           }
-  
+
           //位置编辑
           if (action === 'editPostion') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('updateNewsPosition')(data.params)
               .then(res => {
                 loading.close();
@@ -136,9 +142,10 @@ export default {
                 data.cb(false)
               });
           }
-  
+
           //位置删除
           if (action === 'deleltePostion') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('deleteNewsPosition')(data.params)
               .then(res => {
                 loading.close();
@@ -150,9 +157,10 @@ export default {
                 data.cb(false)
               });
           }
-  
+
           //获取广告位内容列表
           if (action === 'getListContent') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('getListNewsContent')(data.params)
               .then(res => {
                 loading.close();
@@ -163,9 +171,10 @@ export default {
                 console.error(error);
               });
           }
-  
+
           //广告内容创建
           if (action === 'addContent') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('addNewsContent')(data.params)
               .then(res => {
                 loading.close();
@@ -177,9 +186,10 @@ export default {
                 data.cb(false)
               });
           }
-  
+
           //广告内容编辑
           if (action === 'editContent') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('updateNewsContent')(data.params)
               .then(res => {
                 loading.close();
@@ -191,9 +201,10 @@ export default {
                 data.cb(false)
               });
           }
-  
+
           //广告内容删除
           if (action === 'deleteContent') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('deleteNewsContent')(data.params)
               .then(res => {
                 loading.close();
@@ -205,9 +216,10 @@ export default {
                 data.cb(false)
               });
           }
-  
+
           //内容发布
           if (action === 'publish') {
+            loading = XdBus.getParentApi('loading')({});
             console.log('publish', data.params)
             XdBus.getParentApi('cmsPublishContent')(data.params)
               .then(res => {
@@ -219,18 +231,14 @@ export default {
                 console.error(error);
               });
           }
-  
+
           //通知页面进行刷新
           if (action === 'update') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('getXdBusUpdateView')('onUpdateView', {});
             loading.close()
           }
         },
-        inline: false,
-        notice: '',
-        rules: [
-          {required: true, message: '请配置温馨提示内容', trigger: 'change'},
-        ],
       },
     ].filter(i=>i)
   },