jufubao-base 1.0.134-beta9 → 1.0.134

package/src/components/JfbBaseCardShift/Attr.js

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

package/src/components/JfbBaseCardShift/JfbBaseCardShift.vue

@@ -152,32 +152,17 @@ export default {
         });
         return;
       }
-
-      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();
-          }
-        }
-      });
+      jfbRootExec("changeCardBind", {
+        vm: this,
+        data: {
+          card_number: this.card_number,
+        },
+      })
+        .then((res) => {
+          this.success = true;
+          this.changeNumber = res["to_card_number"];
+        })
+        .catch();
     },
     handleToLink() {
       this.$xdUniHelper.navigateTo({

package/src/components/JfbBaseCardShift/JfbBaseCardShiftLess.less

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

package/src/components/JfbBaseCardShiftEntry/Attr.js

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