jufubao-base 1.0.133 → 1.0.134-beta10

package/src/components/JfbBaseCardEntry/Attr.js

@@ -4,76 +4,11 @@ export default {
   style: [],
   advanced: [],
   content: [
-    // {
-    //   label: '票券登陆文案:',
-    //   ele: 'el-input',
-    //   type: 'text',
-    //   valueKey: 'login_name',
-    //   value: '',
-    //   placeholder: '请输入票券登陆文案',
-    //   className: 'input80',
-    //   inline: false,
-    //   notice: '当未设置文案时候，前台页面显示为"<span style="color:red">登录</span>"'
-    // },
-    {
-      label: '失效卡列表地址:', //label
-      ele: 'xd-select-pages-path', //package 名称
-      valueKey: 'disabled_url', //form[valueKey]
-      placeholder: '请选择失效卡列表地址',
-      value: null,
-      setting: {
-        router: XdBus.getParentApi('getPagesTree'),
-      },
-      inline: false,
-    },
-    {
-      label: '卡券详情地址:', //label
-      ele: 'xd-select-pages-path', //package 名称
-      valueKey: 'detail_url', //form[valueKey]
-      placeholder: '请选择卡券详情地址',
-      value: null,
-      setting: {
-        router: XdBus.getParentApi('getPagesTree'),
-      },
-      inline: false,
-    },
-    {
-      label: '卡券转换地址:', //label
-      ele: 'xd-select-pages-path', //package 名称
-      valueKey: 'change_url', //form[valueKey]
-      placeholder: '请选择卡券转换地址',
-      value: null,
-      setting: {
-        router: XdBus.getParentApi('getPagesTree'),
-      },
-      inline: false,
-    },
-    {
-      label: '卡券密码绑定地址:', //label
-      ele: 'xd-select-pages-path', //package 名称
-      valueKey: 'bind_url', //form[valueKey]
-      placeholder: '请选择卡券密码绑定地址',
-      value: null,
-      setting: {
-        router: XdBus.getParentApi('getPagesTree'),
-      },
-      inline: false,
-    },
-    {
-      label: '扫码绑定卡券确认地址:', //label
-      ele: 'xd-select-pages-path', //package 名称
-      valueKey: 'confirm_url', //form[valueKey]
-      placeholder: '请选择扫码绑定卡券确认地址',
-      value: null,
-      setting: {
-        router: XdBus.getParentApi('getPagesTree'),
-      },
-      inline: false,
-    },
     {
       label: '提示内容:',
       ele: 'xd-site-news',
       valueKey: 'notice',
+      groupKey:'content',
       value: null,
       className: 'input70',
       setting: {
@@ -94,7 +29,8 @@ export default {
         }
 
         //获取返回参数(场景类型名称为必填)
-        let loading = XdBus.getParentApi('loading')({});
+        //获取返回参数(场景类型名称为必填)
+        let loading = { close(){}}
 
         //获取显示内容
         if (action === 'screen') {
@@ -138,6 +74,7 @@ export default {
 
         //使用内容分类
         if (action === 'cmsPublishEditxContent') {
+          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('cmsPublishEditxContent')(data.params)
             .then(res => {
               console.log('cmsPublishEditxContent', res)
@@ -152,6 +89,7 @@ export default {
 
         //位置列表
         if (action === 'getListPostion') {
+          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('getListNewsPosition')(data.params)
             .then(res => {
               loading.close();
@@ -165,6 +103,7 @@ export default {
 
         //位置创建
         if (action === 'addPostion') {
+          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('addNewsPosition')(data.params)
             .then(res => {
               loading.close();
@@ -179,6 +118,7 @@ export default {
 
         //位置编辑
         if (action === 'editPostion') {
+          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('updateNewsPosition')(data.params)
             .then(res => {
               loading.close();
@@ -193,6 +133,7 @@ export default {
 
         //位置删除
         if (action === 'deleltePostion') {
+          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('deleteNewsPosition')(data.params)
             .then(res => {
               loading.close();
@@ -207,6 +148,7 @@ export default {
 
         //获取广告位内容列表
         if (action === 'getListContent') {
+          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('getListNewsContent')(data.params)
             .then(res => {
               loading.close();
@@ -220,6 +162,7 @@ export default {
 
         //广告内容创建
         if (action === 'addContent') {
+          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('addNewsContent')(data.params)
             .then(res => {
               loading.close();
@@ -234,6 +177,7 @@ export default {
 
         //广告内容编辑
         if (action === 'editContent') {
+          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('updateNewsContent')(data.params)
             .then(res => {
               loading.close();
@@ -248,6 +192,7 @@ export default {
 
         //广告内容删除
         if (action === 'deleteContent') {
+          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('deleteNewsContent')(data.params)
             .then(res => {
               loading.close();
@@ -262,6 +207,7 @@ export default {
 
         //内容发布
         if (action === 'publish') {
+          loading = XdBus.getParentApi('loading')({});
           console.log('publish', data.params)
           XdBus.getParentApi('cmsPublishContent')(data.params)
             .then(res => {
@@ -276,6 +222,7 @@ export default {
 
         //通知页面进行刷新
         if (action === 'update') {
+          loading = XdBus.getParentApi('loading')({});
           XdBus.getParentApi('getXdBusUpdateView')('onUpdateView', {});
           loading.close()
         }
@@ -283,5 +230,77 @@ export default {
       inline: false,
       notice: '请配置温馨提示内容，未配置的情况将不显示此模块',
     },
+    {
+      label: "是否展示核销二维码",
+      ele: "xd-radio",
+      valueKey: "isShowCode",
+      groupKey:'content',
+      value:"N",
+      list: [
+        {label: "是", value: "Y"},
+        {label: "否", value: "N"},
+      ]
+    },
+    {
+      label: '失效卡列表地址:',
+      ele: 'xd-select-pages-path',
+      valueKey: 'disabled_url',
+      groupKey:'advanced',
+      placeholder: '请选择失效卡列表地址',
+      value: null,
+      setting: {
+        router: XdBus.getParentApi('getPagesTree'),
+      },
+      inline: false,
+    },
+    {
+      label: '票券详情地址:',
+      ele: 'xd-select-pages-path',
+      valueKey: 'detail_url',
+      groupKey:'advanced',
+      placeholder: '请选择票券详情地址',
+      value: null,
+      setting: {
+        router: XdBus.getParentApi('getPagesTree'),
+      },
+      inline: false,
+    },
+    {
+      label: '票券转换地址:',
+      ele: 'xd-select-pages-path',
+      valueKey: 'change_url',
+      groupKey:'advanced',
+      placeholder: '请选择票券转换地址',
+      value: null,
+      setting: {
+        router: XdBus.getParentApi('getPagesTree'),
+      },
+      inline: false,
+    },
+    {
+      label: '票券密码绑定地址:',
+      ele: 'xd-select-pages-path',
+      valueKey: 'bind_url',
+      groupKey:'advanced',
+      placeholder: '请选择票券密码绑定地址',
+      value: null,
+      setting: {
+        router: XdBus.getParentApi('getPagesTree'),
+      },
+      inline: false,
+    },
+    {
+      label: '扫码绑定票券确认地址:',
+      ele: 'xd-select-pages-path',
+      valueKey: 'confirm_url',
+      groupKey:'advanced',
+      placeholder: '请选择扫码绑定票券确认地址',
+      value: null,
+      setting: {
+        router: XdBus.getParentApi('getPagesTree'),
+      },
+      inline: false,
+    },
+
   ],
 };

package/src/components/JfbBaseCardEntry/JfbBaseCardEntry.vue

@@ -177,7 +177,7 @@
                     <text>券号：</text>
                     <text>{{item.card_number}}</text>
                   </view>
-                  <view @click.stop="toDetail(item)">
+                  <view @click.stop="toDetail(item)" v-if="isShowCode === 'Y'">
                     <view>
                       <xd-font-icon icon="iconerweima" width="56" height="56" size="50" color="#fff"></xd-font-icon>
                     </view>
@@ -436,10 +436,11 @@ export default {
       tabIndex: 1,
       isBack: null, //是否使用返回键
       inCallback: null, //内部跳转地址
+      isShowCode: 'N',
 
 
       //页面跳转地址
-      login_name:'',//登陆文案
+      login_name:'',//登录文案
       changeUrl: "",
       bindUrl: "",
       detailUrl: "",
@@ -487,8 +488,8 @@ export default {
       this.bindUrl = getContainerPropsValue(container,"content.bind_url",{value: ""}).value;
       this.detailUrl = getContainerPropsValue(container,"content.detail_url",{value: ""}).value;
       this.confirmUrl = getContainerPropsValue(container,"content.confirm_url",{value: ""}).value;
-      //this.allEntryPath = getContainerPropsValue(container,"content.allEntryPath",{value: ""}).value;
       this.login_name = getContainerPropsValue(container, "content.login_name", "登录");
+      this.isShowCode = getContainerPropsValue(container, "content.isShowCode", "N");
     },
 
     handleToLink(path) {
@@ -572,7 +573,7 @@ export default {
      * @param item
      */
     handleBindLogin(item , entry) {
-      //卡券登陆
+      //卡券登录
       if (this.tabIndex === 1) {
         if (item["is_valid"] !== "Y") {
           return;
@@ -674,7 +675,7 @@ export default {
         }
       }
 
-      //登陆成功调整地址优先级
+      //登录成功调整地址优先级
       this.inCallback = inCallback || this.allEntryPath || this.settings.index;
       this.getContent();
 

package/src/components/JfbBaseCardEntry/JfbBaseCardEntryLess.less

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

package/src/components/JfbBaseCardInfo/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: {
@@ -16,9 +17,10 @@ export default {
       inline: false,
     },
     {
-      label: '我的票券跳转地址:', //label
-      ele: 'xd-select-pages-path', //package 名称
-      valueKey: 'my_card_url', //form[valueKey]
+      label: '我的票券跳转地址:',
+      ele: 'xd-select-pages-path',
+      valueKey: 'my_card_url',
+      groupKey:'advanced',
       placeholder: '请选择我的票券跳转地址',
       value: null,
       setting: {
@@ -26,12 +28,24 @@ export default {
       },
       inline: false,
     },
+    {
+      label: "票券过期是否展示余额",
+      ele: "xd-radio",
+      valueKey: "is_show_balance",
+      groupKey:'content',
+      value: "N",
+      list: [
+        {label: "是", value: "Y"},
+        {label: "否", value: "N"},
+      ]
+    },
     {
       label: '券号框自定义文案:',
       ele: 'el-input',
       type: 'text',
       valueKey: 'card_num_placeholder',
       value: '',
+      groupKey:'content',
       placeholder: '请输入券号框自定义文案',
       className: 'input80'
     },
@@ -39,20 +53,12 @@ export default {
       label: '密码框自定义文案:',
       ele: 'el-input',
       type: 'text',
+      groupKey:'content',
       valueKey: 'card_pwd_placeholder',
       value: '',
       placeholder: '请输入密码框自定义文案',
       className: 'input80'
     },
-    {
-      label: "票券过期是否展示余额",
-      ele: "xd-radio",
-      valueKey: "is_show_balance",
-      value: "N",
-      list: [
-        {label: "是", value: "Y"},
-        {label: "否", value: "N"},
-      ]
-    }
+
   ],
 };

package/src/components/JfbBaseCardInfo/JfbBaseCardInfoLess.less

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

package/src/components/JfbBaseCardInfoEntry/Attr.js

@@ -5,10 +5,11 @@ export default {
   advanced: [],
   content: [
     {
-      label: '卡绑定成功回跳地址:', //label
-      ele: 'xd-select-pages-path', //package 名称
-      valueKey: 'back_url', //form[valueKey]
-      placeholder: '请选择卡绑定成功回跳地址',
+      label: '票券绑定成功回跳地址:',
+      ele: 'xd-select-pages-path',
+      valueKey: 'back_url',
+      groupKey:'advanced',
+      placeholder: '请选择票券绑定成功回跳地址',
       value: null,
       setting: {
         router: XdBus.getParentApi('getPagesTree'),
@@ -16,9 +17,10 @@ export default {
       inline: false,
     },
     {
-      label: '我的票券跳转地址:', //label
-      ele: 'xd-select-pages-path', //package 名称
-      valueKey: 'my_card_url', //form[valueKey]
+      label: '我的票券跳转地址:',
+      ele: 'xd-select-pages-path',
+      valueKey: 'my_card_url',
+      groupKey:'advanced',
       placeholder: '请选择我的票券跳转地址',
       value: null,
       setting: {
@@ -27,27 +29,30 @@ export default {
       inline: false,
     },
     {
-      label: '券号框自定义文案:',
+      label: '票券号码框自定义文案:',
       ele: 'el-input',
       type: 'text',
       valueKey: 'card_num_placeholder',
+      groupKey:'content',
       value: '',
-      placeholder: '请输入券号框自定义文案',
+      placeholder: '请输入票券号码框自定义文案',
       className: 'input80'
     },
     {
-      label: '密码框自定义文案:',
+      label: '票券密码框自定义文案:',
       ele: 'el-input',
       type: 'text',
       valueKey: 'card_pwd_placeholder',
+      groupKey:'content',
       value: '',
-      placeholder: '请输入密码框自定义文案',
+      placeholder: '票券请输入密码框自定义文案',
       className: 'input80'
     },
     {
       label: "票券过期是否展示余额",
       ele: "xd-radio",
       valueKey: "is_show_balance",
+      groupKey:'content',
       value: "N",
       list: [
         {label: "是", value: "Y"},

package/src/components/JfbBaseCardInfoEntry/JfbBaseCardInfoEntryLess.less

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