jufubao-base 1.0.132-beta1 → 1.0.132-beta3

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,6 +436,7 @@ export default {
       tabIndex: 1,
       isBack: null, //是否使用返回键
       inCallback: null, //内部跳转地址
+      isShowCode: 'N',
 
 
       //页面跳转地址
@@ -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) {

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**/

package/src/components/JfbBaseCardMerge/Attr.js

@@ -8,9 +8,10 @@ export default {
   content: (data) => {
     return [
       {
-        label: '内容配置:',
+        label: '合并说明:',
         ele: 'xd-site-news',
         valueKey: 'notice',
+        groupKey:'content',
         value: data.notice || null,
         className: 'input70',
         setting: {
@@ -31,7 +32,8 @@ export default {
           }
 
           //获取返回参数(场景类型名称为必填)
-          let loading = XdBus.getParentApi('loading')({});
+          //获取返回参数(场景类型名称为必填)
+          let loading = { close(){}}
 
           //获取显示内容
           if (action === 'screen') {
@@ -75,6 +77,7 @@ export default {
 
           //使用内容分类
           if (action === 'cmsPublishEditxContent') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('cmsPublishEditxContent')(data.params)
               .then(res => {
                 console.log('cmsPublishEditxContent', res)
@@ -89,6 +92,7 @@ export default {
 
           //位置列表
           if (action === 'getListPostion') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('getListNewsPosition')(data.params)
               .then(res => {
                 loading.close();
@@ -102,6 +106,7 @@ export default {
 
           //位置创建
           if (action === 'addPostion') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('addNewsPosition')(data.params)
               .then(res => {
                 loading.close();
@@ -116,6 +121,7 @@ export default {
 
           //位置编辑
           if (action === 'editPostion') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('updateNewsPosition')(data.params)
               .then(res => {
                 loading.close();
@@ -130,6 +136,7 @@ export default {
 
           //位置删除
           if (action === 'deleltePostion') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('deleteNewsPosition')(data.params)
               .then(res => {
                 loading.close();
@@ -144,6 +151,7 @@ export default {
 
           //获取广告位内容列表
           if (action === 'getListContent') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('getListNewsContent')(data.params)
               .then(res => {
                 loading.close();
@@ -157,6 +165,7 @@ export default {
 
           //广告内容创建
           if (action === 'addContent') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('addNewsContent')(data.params)
               .then(res => {
                 loading.close();
@@ -171,6 +180,7 @@ export default {
 
           //广告内容编辑
           if (action === 'editContent') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('updateNewsContent')(data.params)
               .then(res => {
                 loading.close();
@@ -185,6 +195,7 @@ export default {
 
           //广告内容删除
           if (action === 'deleteContent') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('deleteNewsContent')(data.params)
               .then(res => {
                 loading.close();
@@ -199,6 +210,7 @@ export default {
 
           //内容发布
           if (action === 'publish') {
+            loading = XdBus.getParentApi('loading')({});
             console.log('publish', data.params)
             XdBus.getParentApi('cmsPublishContent')(data.params)
               .then(res => {
@@ -213,6 +225,7 @@ export default {
 
           //通知页面进行刷新
           if (action === 'update') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('getXdBusUpdateView')('onUpdateView', {});
             loading.close()
           }
@@ -220,10 +233,11 @@ export default {
         inline: false,
       },
       {
-        label: '卡券主页:', //label
-        ele: 'xd-select-pages-path', //package 名称
-        valueKey: 'cardPath', //form[valueKey]
-        placeholder: '请选择卡券主页地址',
+        label: '票券合并完成后跳转链接地址:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'cardPath',
+        groupKey:'advanced',
+        placeholder: '请选择票券合并完成后跳转链接地址',
         value: data.cardPath || null,
         setting: {
           router: XdBus.getParentApi('getPagesTree'),
@@ -232,6 +246,5 @@ export default {
       },
     ].filter(i=>i)
   },
-  advanced: [
-  ],
+  advanced: [],
 };

package/src/components/JfbBaseCardMerge/JfbBaseCardMerge.vue

@@ -57,14 +57,7 @@
               class="capture"
               @click="switchValidToken"
             >
-              <image
-                style="width: 100%; height: 100%"
-                :src="
-                  validImageAPIUrl +
-                  '?image_width=180&image_height=80&token=' +
-                  mergeForm.valid_token
-                "
-              />
+              <image style="width: 100%; height: 100%" :src="validImageAPIUrl +'?image_width=180&image_height=80&token=' + mergeForm.valid_token"/>
             </view>
           </view>
         </xd-form-item>
@@ -79,8 +72,8 @@
     <view
       v-if="isPreview && statusContent === true && content === '' "
       class="xd-notice"
-      :style="{ color: dangerColor,fontSize: 24 + 'rpx' }"
-    >温馨提示未配置数据，因此改模块在正式环境将不显示</view>
+      :style="{ color: dangerColor,fontSize: 24 + 'rpx',backgroundColor:noticeBgc }"
+    >温馨提示未配置数据，因此该模块在正式环境将不显示</view>
   </view>
 </template>
 
@@ -116,23 +109,24 @@ export default {
   data() {
     return {
       mergeForm: {},
-     
+
       fromList: [],
       toList: [],
       fromSelect: null,
       toSelect: null,
       randomKey: Date.now(),
-  
-  
+
+
       content: "",
       contentBackgroundColor: '',
-      
+
       selfMask: true,
       cardPath: '', //卡券主页
-      
+
       //提示文案
       isPreview: false,
       statusContent: false,
+      noticeBgc:'',
     };
   },
   computed: {
@@ -151,6 +145,7 @@ export default {
     this.switchValidToken();
     this.validImageAPIUrl = this.brandInfo["api_host"] + "/common/v1/valid_code/image/show";
     this.contentBackgroundColor = Color(this.warningColor).alpha(0.2).toString();
+    this.noticeBgc = Color(this.dangerColor).alpha(0.1).toString();
   },
   methods: {
     onJfbLoad(options) {
@@ -182,9 +177,10 @@ export default {
         },
       })
         .then((res) => {
-          this.content = res.list[0].content;
+          if(res.list.length > 0) {
+            this.content = res.list[0].content;
+          }
           this.statusContent = true;
-          console.log(this.content, "this.content");
         })
         .catch((error) => {
           console.error(error);
@@ -195,11 +191,7 @@ export default {
      * @param container {object} 业务组件对象自己
      */
     init(container) {
-      this.textColor = getContainerPropsValue(
-        container,
-        "content.textColor",
-        this.warningColor
-      );
+      this.textColor = getContainerPropsValue(container, "content.textColor", this.warningColor);
       this.cardPath = getContainerPropsValue(container, "content.cardPath", {value: ""}).value;
     },
     //刷新图片验证码
@@ -208,13 +200,6 @@ export default {
       this.$set(this.mergeForm, "valid_token", valid_token);
     },
     handleToSubmit() {
-      // if (!this.mergeForm.valid_code) {
-      //   uni.showToast({
-      //     title: "验证码不能为空！",
-      //     icon: "none",
-      //   });
-      //   return;
-      // }
       this.$xdConfirm({
         title: "是否确认合并卡",
         isHtml: true,
@@ -322,7 +307,7 @@ export default {
     .align-center {
       align-items: center;
     }
-    
+
     &-btn {
       padding-bottom: unit(20, rpx);
     }

package/src/components/JfbBaseCardMerge/JfbBaseCardMergeLess.less

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