jufubao-base 1.0.133 → 1.0.134-beta10

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

package/src/components/JfbBaseCardMergeEntry/Attr.js

@@ -8,10 +8,11 @@ export default {
   content: (data) => {
     return [
       {
-        label: '内容配置:',
+        label: '合并票券说明:',
         ele: 'xd-site-news',
         valueKey: 'notice',
         value: data.notice || null,
+        groupKey:'content',
         className: 'input70',
         setting: {
           config: {
@@ -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'),

package/src/components/JfbBaseCardMergeEntry/JfbBaseCardMergeEntry.vue

@@ -83,8 +83,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 class="bottom_btn-mask"></view>
       <view class="bottom_btn" :style="prod_bottom">
         <xd-button
@@ -140,24 +140,25 @@ export default {
       randomKey: Date.now(),
       valid_code:'',
       valid_token: 'valid_token',
-  
-  
+
+
       content: "",
       contentBackgroundColor: '',
       cardPath: '', //卡券主页
-      
+
       //提示文案
       isPreview: false,
       statusContent: false,
       disabledKey: 'disabledKey',
       toPlaceholder:'选择转入票券',
+      noticeBgc:'',
     };
   },
   computed: {
     ...mapState({
       brandInfo: (state) => state.brandInfo,
     }),
-    
+
     themeOutStyle(){
       if(this.fromSelect === null) {
         return this.getCardThemes('1');
@@ -175,7 +176,7 @@ export default {
     prod_bottom() {
       return this.fixedStyle({height: 0, zIndex: 111});
     },
-    
+
     disabled(){
       this.disabledKey = Date.now();
       return this.fromSelect === null || this.toSelect === null;
@@ -189,9 +190,11 @@ export default {
   created() {
     this.init(this.container);
     this.isPreview = this.$configProject.isPreview;
+    this.noticeBgc = Color(this.dangerColor).alpha(0.1).toString();
     this.switchValidToken();
     this.validImageAPIUrl = this.brandInfo["api_host"] + "/common/v1/valid_code/image/show";
     this.contentBackgroundColor = Color(this.warningColor).alpha(0.2).toString();
+
   },
   methods: {
     onJfbLoad(options) {
@@ -241,12 +244,12 @@ export default {
       this.textColor = getContainerPropsValue(container, "content.textColor", this.warningColor);
       this.cardPath = getContainerPropsValue(container, "content.cardPath", {value: ""}).value;
     },
-    
+
     //刷新图片验证码
     switchValidToken() {
       this.valid_token = this.$xdUniHelper.randomChar(20);
     },
-    
+
     handleToSubmit() {
       // if (!this.valid_code) {
       //   uni.showToast({
@@ -255,7 +258,7 @@ export default {
       //   });
       //   return;
       // }
-      
+
       let outPrice = this.$xdUniHelper.divisionFloatNumber(this.fromSelect.card_point, 100);
       let outHtml = `${this.fromSelect.value}（剩余：${outPrice}）`;
       let inPrice = this.$xdUniHelper.divisionFloatNumber(this.toSelect.card_point, 100);
@@ -272,12 +275,12 @@ export default {
             // valid_code: this.valid_code,
             // valid_token: this.valid_token
           };
-          
+
           if (action.confirm) {
             if(this.$configProject.isPreview) return;
             jfbRootExec("mergeCardEntry", { vm: this,data: params})
               .then((res) => {
-                this.$xdAlert({content: '合卡成功！', time: 1000});
+                this.$xdAlert({content: '票券合并成功！', time: 1000});
                 setTimeout(()=>{
                   this.$xdUniHelper.navigateTo({
                     url: this.cardPath
@@ -341,7 +344,7 @@ export default {
     .capture {
       width: unit(160, rpx);
       height: unit(70, rpx);
-      
+
       & >image {
         width: 100%;
         height: 100%;
@@ -354,7 +357,7 @@ export default {
     .align-center {
       align-items: center;
     }
-    
+
     &-btn {
       padding-bottom: unit(20, rpx);
     }
@@ -368,21 +371,21 @@ export default {
     border-radius: unit(16, rpx);
     overflow: hidden;
     margin-bottom: unit(30, rpx);
-    
+
     &:last-child {
       margin-bottom: 0;
     }
-    
+
     &-box {
       background-size: 100%;
       background-repeat: no-repeat;
       background-position: top center;
-      
+
       & >view:nth-child(2) {
         padding: unit(40, rpx);
       }
     }
-    
+
     &-title {
       height: unit(50, rpx);
       background: rgba(102, 102, 102, 0.4);
@@ -391,13 +394,13 @@ export default {
       align-items: center;
       color: #fff;
       font-size: unit(24, rpx);
-      
+
       &>view:nth-child(2) {
         margin-left: unit(10, rpx);
       }
     }
-    
-    
+
+
   }
 }
 
@@ -406,13 +409,13 @@ export default {
   justify-content: space-between;
   align-items: center;
   padding: 0 unit(30, rpx);
-  
-  
+
+
   & > view:first-child, &> view:last-child {
     flex-shrink: 0;
     font-size: unit(32, rpx);
   }
-  
+
   & > view:nth-child(2) {
     flex: 1;
     margin: 0 unit(20, rpx);
@@ -435,7 +438,7 @@ export default {
   align-items: center;
   height: unit(120, rpx);
   background: #ffffff;
-  
+
   &-mask {
     height: unit(120, rpx);
   }

package/src/components/JfbBaseCardMergeEntry/JfbBaseCardMergeEntryLess.less

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