jufubao-base 1.0.132-beta1 → 1.0.132-beta2

package/src/components/JfbBasePosterType/JfbBasePosterType.vue

@@ -13,19 +13,19 @@
       <view class="jfb-base-poster-type__edit-icon" @click="delEdit">删除</view>
     </view>
     <!-- #endif -->
-    <view
-			class="jfb-base-poster-type__body"
-			v-if="noData"
-			:style="{
-				margin: margin,
-				backgroundColor: bgColor,
-				borderRadius: bgRadius + 'rpx'
-			}
-		">
-			<four-screen
-				:config="getConfig"
-				:content="info"
-			></four-screen>
+    <view class="jfb-base-poster-type__body" v-if="noData">
+      <view class="x-line"></view>
+      <view
+        class="jfb-base-poster-cont"
+        :style="{
+          margin: margin,
+          backgroundColor: bgColor,
+          borderRadius: bgRadius + 'rpx'
+        }"
+      >
+        <four-screen :config="getConfig" :content="info"></four-screen>
+      </view>
+
     </view>
   </view>
 </template>
@@ -41,7 +41,6 @@
   import getServiceUrl from '@/common/getServiceUrl'
 	import XdImage from "@/components/XdImage/XdImage";
   import XdSwiper from "@/components/XdSwiper/XdSwiper";
-  import Screen from "./Screen";
   import FourScreen from "./FourScreen";
   import XdSwiperDot from "./XdSwiperDot";
   export default {
@@ -50,7 +49,6 @@
       XdFontIcon,
       XdImage,
       XdSwiper,
-      Screen,
       FourScreen,
       XdSwiperDot
     },
@@ -69,15 +67,11 @@
         jdRows: 1, //行
         cells: 4, //列
         shadow: false, //是否设置阴影
+        shadowColor:'rgba(0,0,0,.3)',
         radius: '20', //10/20/40 ， 小/中/大
 				timer: null,
 				info: [],
-        mS: {
-          top: 0,
-					bottom: 0,
-					left: 0,
-					right: 0
-				},
+        mS: {},
 				isPreview: false,
 				noData:false,
 
@@ -85,26 +79,6 @@
         textColor: '#333',
         bgColor:'rgba(0,0,0,0)',
         bgRadius: 0,
-
-				test: {
-          "content_id": "KpBbUKdj4aBejwe7Fh1ki",
-          "position_id": "QCk3PmoyQmOWRP1SxnYR3",
-          "partner_id": 0,
-          "site_id": "",
-          "content_name": "测试.",
-          "image_url": "//dummyimage.com/200x200",
-          "redirect_type": "EMP",
-          "redirect_type_name": "无链接",
-          "redirect_data": "",
-          "sort": "",
-          "status": "",
-          "start_time": "",
-          "end_time": "",
-          "op_user_id": "",
-          "created_time": 0,
-          "updated_time": 0
-        }
-
       }
     },
 		computed: {
@@ -124,18 +98,24 @@
           jdRows: this.jdRows,
           cells: this.cells,
           shadow: this.shadow,
+          shadowColor: this.shadowColor,
           textColor: this.textColor,
 				}
 			},
       margin(){
-        return `${this.mS.top||0}rpx ${this.mS.right||0}rpx ${this.mS.bottom||0}rpx ${this.mS.left||0}rpx`
+        let str = `${this.checkValue(this.mS.top, 0)}rpx`;
+        str = `${str} ${this.checkValue(this.mS.right, 0)}rpx`;
+        str = `${str} ${this.checkValue(this.mS.bottom, 0)}rpx`;
+        str = `${str} ${this.checkValue(this.mS.left, 0)}rpx`;
+        return str
 			},
       dotStyleData() {
       	return {}
       }
 		},
     watch: {
-      container(value) {
+      container(value,oloValue) {
+        if(JSON.stringify(value) === JSON.stringify(oloValue)) return;
         this.init(value);
         if(this.timer) clearTimeout(this.timer);
         this.timer = setTimeout(()=>{
@@ -152,7 +132,6 @@
         this.current = e.detail.current;
       },
       handleClick(item, index){
-        debugger
         this.current = index;
         const handle = (data) => {
           try {
@@ -197,12 +176,6 @@
 			},
       handleOne(list){
         this.info = this.handleImage(list);
-        console.log('this.info',this.info)
-			},
-			getDefualtValue(key){
-        if (key === 'margin') {
-          return {top: 0, bottom: 0, left: 0, right: 0}
-        }
 			},
 
       /**
@@ -211,7 +184,6 @@
        */
       init(container) {
         this.radius = getContainerPropsValue(container, 'content.radius', '20');
-        this.padding = 0;
         this.poster = getContainerPropsValue(container, 'content.nav', {});
         if (this.poster.position) {
           this.posterPosition = this.poster.position
@@ -225,13 +197,15 @@
         this.carouselTime = Number(getContainerPropsValue(container, 'content.carouselTime', 5)) * 1000;
         this.useNumber = getContainerPropsValue(container, 'content.number', 1);
         this.shadow = getContainerPropsValue(container, 'content.shadow', 2);
-        this.mS = getContainerPropsValue(container, 'content.margin', {top: 0, left: 0, bottom:0, right: 0});
+        this.shadowColor = getContainerPropsValue(container, 'content.shadowColor', 'rgba(0,0,0,.3)');
+        this.mS = getContainerPropsValue(container, 'content.margin', {});
 
         //样式设置
         this.textColor = getContainerPropsValue(container, 'content.textColor', '#333');
         this.bgColor = getContainerPropsValue(container, 'content.bgColor','rgba(0,0,0,0)');
         this.bgRadius = getContainerPropsValue(container, 'content.bgRadius', '0');
 
+
       },
 
       onJfbLoad(options) {
@@ -247,9 +221,10 @@
         })
           .then(res => {
             if (res.list.length === 0 && this.isPreview) {
+              let testData = this.$xdUniHelper.cloneDeep(this['posterTest']);
               let temp = [];
               for (let i = 0; i < this.useNumber; i++) {
-                temp.push({...this.test, content_id: i, content_name: `${this.test.content_name}(${i})`})
+                temp.push({...testData, content_id: i, content_name: `${testData.content_name}(${i})`})
               }
               res.list = temp
             }
@@ -261,7 +236,6 @@
           })
       },
 
-
       onJfbUpdate(data){
         this.onJfbLoad(this.params);
 			}
@@ -276,11 +250,14 @@
 
   .jfb-base-poster-type {
     &__body{
-			box-sizing: border-box;
-			overflow: hidden;
-			justify-content: center;
-			align-items: center;
-			display: flex;
+      & > view.jfb-base-poster-cont {
+        box-sizing: border-box;
+        overflow: hidden;
+        justify-content: center;
+        align-items: center;
+        display: flex;
+      }
+
     }
 		&__one.notCarousel {
 			position: relative;

package/src/components/JfbBasePosterType/JfbBasePosterTypeLess.less

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

package/src/components/JfbBaseRecharge/Attr.js

@@ -8,38 +8,31 @@ export default {
   content: (data) => {
     return [
       {
-        label: '券号框自定义文案:',
+        label: '票券框自定义文案:',
         ele: 'el-input',
         type: 'text',
         valueKey: 'card_num_placeholder',
+        groupKey:'content',
         value: data.card_num_placeholder||'',
-        placeholder: '请输入券号框自定义文案',
+        placeholder: '请输入票券框自定义文案',
         className: 'input80'
       },
       {
-        label: '充值点数自定义文案:',
+        label: '票券充值点数自定义文案:',
         ele: 'el-input',
         type: 'text',
         valueKey: 'point_placeholder',
+        groupKey:'content',
         value: data.point_placeholder || '',
-        placeholder: '请输入充值点数自定义文案',
+        placeholder: '请输入票券充值点数自定义文案',
         className: 'input80'
       },
-      {
-        label: '支付路径:', //label
-        ele: 'xd-select-pages-path', //package 名称
-        valueKey: 'payPath', //form[valueKey]
-        placeholder: '请选择支付路径',
-        value: data['payPath'] || {},
-        setting: {
-          router: XdBus.getParentApi('getPagesTree'),
-        },
-        inline: false,
-      },
+
       {
         label: '注意事项:',
         ele: 'xd-site-news',
         valueKey: 'notice',
+        groupKey:'content',
         value: data.notice || null,
         className: 'input70',
         setting: {
@@ -60,7 +53,10 @@ export default {
           }
 
           //获取返回参数(场景类型名称为必填)
-          let loading = XdBus.getParentApi('loading')({});
+          //let loading = XdBus.getParentApi('loading')({});
+
+          //获取返回参数(场景类型名称为必填)
+          let loading = { close(){}}
 
           //获取显示内容
           if (action === 'screen') {
@@ -104,6 +100,7 @@ export default {
 
           //使用内容分类
           if (action === 'cmsPublishEditxContent') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('cmsPublishEditxContent')(data.params)
               .then(res => {
                 console.log('cmsPublishEditxContent', res)
@@ -118,6 +115,7 @@ export default {
 
           //位置列表
           if (action === 'getListPostion') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('getListNewsPosition')(data.params)
               .then(res => {
                 loading.close();
@@ -131,6 +129,7 @@ export default {
 
           //位置创建
           if (action === 'addPostion') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('addNewsPosition')(data.params)
               .then(res => {
                 loading.close();
@@ -145,6 +144,7 @@ export default {
 
           //位置编辑
           if (action === 'editPostion') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('updateNewsPosition')(data.params)
               .then(res => {
                 loading.close();
@@ -159,6 +159,7 @@ export default {
 
           //位置删除
           if (action === 'deleltePostion') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('deleteNewsPosition')(data.params)
               .then(res => {
                 loading.close();
@@ -173,6 +174,7 @@ export default {
 
           //获取广告位内容列表
           if (action === 'getListContent') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('getListNewsContent')(data.params)
               .then(res => {
                 loading.close();
@@ -186,6 +188,7 @@ export default {
 
           //广告内容创建
           if (action === 'addContent') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('addNewsContent')(data.params)
               .then(res => {
                 loading.close();
@@ -200,6 +203,7 @@ export default {
 
           //广告内容编辑
           if (action === 'editContent') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('updateNewsContent')(data.params)
               .then(res => {
                 loading.close();
@@ -214,6 +218,7 @@ export default {
 
           //广告内容删除
           if (action === 'deleteContent') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('deleteNewsContent')(data.params)
               .then(res => {
                 loading.close();
@@ -228,6 +233,7 @@ export default {
 
           //内容发布
           if (action === 'publish') {
+            loading = XdBus.getParentApi('loading')({});
             console.log('publish', data.params)
             XdBus.getParentApi('cmsPublishContent')(data.params)
               .then(res => {
@@ -242,19 +248,25 @@ export default {
 
           //通知页面进行刷新
           if (action === 'update') {
+            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('getXdBusUpdateView')('onUpdateView', {});
             loading.close()
           }
         },
+      },
+      {
+        label: '票券支付路径:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'payPath',
+        groupKey:'advanced',
+        placeholder: '请选择票券支付路径',
+        value: data['payPath'] || {},
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
         inline: false,
-        notice: '',
-        rules: [
-          {required: true, message: '请配置温馨提示内容', trigger: 'change'},
-        ],
       },
     ].filter(i=>i)
   },
-  advanced: [
-    
-  ],
+  advanced: [ ],
 };

package/src/components/JfbBaseRecharge/JfbBaseRecharge.vue

@@ -42,10 +42,16 @@
           >
         </view>
       </view>
-      <view style="font-size: 30rpx; padding: 0rpx 40rpx 40rpx 40rpx">
-        <view style="color: #666666">注意事项:</view>
-        <view v-html="content"></view>
+      <view class="xd-notice-content" v-if="content">
+        <view>注意事项:</view>
+        <view v-html="content" class="prod_info"></view>
       </view>
+      <view
+        v-if="isPreview && statusContent === true && content === '' "
+        class="xd-notice"
+        :style="{ color: dangerColor,fontSize: 24 + 'rpx',backgroundColor:noticeBgc }"
+      >注意事项未配置数据，因此改模块在正式环境将不显示</view>
+      <view class="bottom_btn-mask"></view>
     </view>
   </view>
 </template>
@@ -58,6 +64,7 @@ import JfbBaseRechargeMixin from "./JfbBaseRechargeMixin";
 import { getContainerPropsValue } from "@/utils/xd.base";
 import componentsMixins from "@/mixins/componentsMixins";
 import extsMixins from "@/mixins/extsMixins";
+import Color from "color";
 export default {
   name: "JfbBaseRecharge",
   components: {
@@ -68,13 +75,19 @@ export default {
   data() {
     return {
       card_num_placeholder: "",
-      card_pwd_placeholder: "",
-      content: "",
+      point_placeholder: "",
+
       cardNumber: "",
       card_point: "",
       payPath: "",
       amount: "",
-      timer:null
+      timer:null,
+
+      //提示文案
+      isPreview: false,
+      content: "",
+      statusContent: false,
+      noticeBgc:'',
     };
   },
   watch: {
@@ -91,6 +104,8 @@ export default {
     },
   },
   created() {
+    this.isPreview = this.$configProject.isPreview;
+    this.noticeBgc = Color(this.dangerColor).alpha(0.1).toString();
     this.init(this.container);
   },
   methods: {
@@ -125,8 +140,10 @@ export default {
         },
       })
         .then((res) => {
-          this.content = res.list[0].content;
-          console.log(this.content, "this.content");
+          if(res && res.list && res.list.length > 0) {
+            this.content = res.list[0].content;
+          }
+          this.statusContent = true;
         })
         .catch((error) => {
           console.error(error);
@@ -216,6 +233,35 @@ export default {
         margin-bottom: unit(30, rpx);
       }
     }
+
+    .xd-notice-content {
+      padding: 0 40rpx 40rpx 40rpx;
+      & > view:first-child {
+        font-size: 32rpx;
+        font-weight: 500;
+        color: #333;
+        margin-bottom: 20rpx;
+      }
+      & > view:last-child {
+        line-height: 44rpx;
+        font-size: 26rpx;
+        color: #666;
+        /deep/ img, /deep/ image{
+          max-width: 100% !important;
+          height: auto !important;
+          margin: 22rpx 0;
+        }
+
+        /deep/ *{
+          max-width: 100% !important;
+        }
+      }
+    }
+    .xd-notice {
+      margin-top: unit(20, rpx);
+      padding: unit(40, rpx);
+      border-radius: unit(15, rpx)
+    }
   }
 }
 </style>

package/src/components/JfbBaseRecharge/JfbBaseRechargeLess.less

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