jufubao-third 1.0.22-beta6 → 1.0.22-beta8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-third",
-  "version": "1.0.22-beta6",
+  "version": "1.0.22-beta8",
   "private": false,
   "description": "聚福宝业务组件第三方购物平台包",
   "main": "index.js",

package/src/components/JfbThirdRideLand/JfbThirdRideLand.vue

@@ -1,7 +1,6 @@
 <template>
   <view
     class="jfb-third-ride-land"
-    :style="bgStyle"
     @click="handleEditxSelect"
     :class="{ editx : isEditx && active }"
   >
@@ -16,26 +15,14 @@
       </view>
     </view>
     <!-- #endif -->
-    <view class="jfb-third-ride-land__body" :style="bodyStyle">
-      <!-- 内容卡片 -->
-      <view class="jfb-third-ride-land__card" :style="cardStyle">
-        <xd-content-xss
-          v-if="contentHtml"
-          :html="contentHtml"
-        ></xd-content-xss>
-        <!-- 编辑预览态的占位提示 -->
-        <view v-else-if="isEditx && active" class="jfb-third-ride-land__card-placeholder">
-          服务须知内容为空，请在右侧属性面板编辑富文本内容
-        </view>
-      </view>
-
-      <!-- 底部按钮 -->
+    <view class="jfb-third-ride-land__body" :style="[bodyStyle, bgStyle]">
+      <view class="land_box" :style="cardStyle" v-html="contentHtml"></view>
       <view
-        class="jfb-third-ride-land__btn"
-        :class="{ 'jfb-third-ride-land__btn--disabled': btnDisabled }"
+        class="land_btn"
+        :class="{ 'land_btn--disabled': btnDisabled }"
         @click="handleBtnClick"
       >
-        <text class="jfb-third-ride-land__btn-text">{{ btnText }}{{ countdownText }}</text>
+        <text class="land_btn-text">{{ btnText }}{{ countdownText }}</text>
       </view>
     </view>
   </view>
@@ -43,7 +30,8 @@
 
 <script>
   import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
-  import XdContentXss from "@/components/XdContentXss/XdContentXss";
+  import { jfbRootExec } from "@/utils/xd.event";
+  import JfbThirdRideLandMixin from "./JfbThirdRideLandMixin";
   import { gCPVal } from "@/utils/xd.base";
   import componentsMixins from "@/mixins/componentsMixins";
   import extsMixins from "@/mixins/extsMixins";
@@ -51,15 +39,13 @@
   export default {
     name: "JfbThirdRideLand",
     components: {
-      XdFontIcon,
-      XdContentXss
+      XdFontIcon
     },
     mixins: [
-      componentsMixins, extsMixins
+      componentsMixins, extsMixins, JfbThirdRideLandMixin
     ],
     data() {
       return {
-        xnamespace: '',
         //内容
         contentHtml: '',
         btnText: '我已知晓',
@@ -68,7 +54,6 @@
         countdownLeft: 0,
         countdownTimer: null,
         //样式
-        bgColor: '',
         bgImage: '',
         margin: {},
         padding: {},
@@ -76,10 +61,9 @@
       }
     },
     computed: {
-      //页面背景（背景图 + 背景色）
+      //页面背景（背景图）
       bgStyle(){
         let style = {};
-        if(this.bgColor) style.backgroundColor = this.bgColor;
         if(this.bgImage) {
           style.backgroundImage = `url(${getServiceUrl(this.bgImage)})`;
           style.backgroundSize = '100% 100%';
@@ -90,11 +74,16 @@
       },
       //外边距
       bodyStyle(){
-        return {
+        let style = {
           padding: this.getMarginAndPadding(this.margin, 32)
+        };
+        //最小高度为窗口内容区高度
+        if(this.layoutInfo && this.layoutInfo.bodyMinHeightRpx) {
+          style.minHeight = this.layoutInfo.bodyMinHeightRpx + 'rpx';
         }
+        return style;
       },
-      //内容卡片
+      //内容卡片样式（内边距 + 圆角）
       cardStyle(){
         return {
           padding: this.getMarginAndPadding(this.padding, 32),
@@ -107,7 +96,7 @@
       },
       //倒计时文案
       countdownText(){
-        return this.btnDisabled ? ` (${this.countdownLeft}s)` : '';
+        return this.btnDisabled ? `（${this.countdownLeft}s）` : '';
       }
     },
     watch: {
@@ -118,24 +107,36 @@
     },
     created() {
       this.init(this.container);
+
+      //todo
     },
     beforeDestroy() {
       this.clearCountdown();
     },
     methods: {
+      onJfbLoad(options) {
+
+        // jfbRootExec('baiduUserLogin', {
+
+        //   vm: this,//   data: {
+
+        //     account: 'gaoshiyong',//     password: '123456789',//     type: 3,//     ...options
+
+        //   }
+
+        // }).then().catch()
+      },
       /**
        * @description 监听事件变化
        * @param container {object} 业务组件对象自己
        */
       init(container) {
         //内容
-        this.xnamespace = gCPVal(container, 'xnamespace', '');
         this.contentHtml = gCPVal(container, 'contentHtml', '');
         this.btnText = gCPVal(container, 'btnText', '我已知晓');
-        this.btnLink = gCPVal(container, 'btnLink', {value: ''});
+        this.btnLink = gCPVal(container, 'btnLink', {value: ''}).value;
         this.countdown = gCPVal(container, 'countdown', 0);
         //样式
-        this.bgColor = gCPVal(container, 'bgColor', '');
         let bgImageVal = gCPVal(container, 'bgImage', {});
         this.bgImage = bgImageVal && bgImageVal.url ? bgImageVal.url : '';
         this.margin = gCPVal(container, 'margin', 32, {sKey: 'marginStatus', fields: ['margin'], isPM: true});
@@ -173,12 +174,9 @@
       handleBtnClick(){
         if (this.$configProject['isPreview']) return;
         if(this.btnDisabled) return;
-        let url = this.btnLink && this.btnLink.value ? this.btnLink.value : '';
-        if(!url) return;
-        this.$xdUniHelper.navigateTo({ url });
-      },
-      onJfbLoad() {
-        // 倒计时依赖配置属性，已在 init 中启动
+        this.$xdUniHelper.navigateTo({
+          url: this.btnLink
+         });
       },
       onJfbScroll(options) {
         console.log('event.onJfbScroll', options)
@@ -203,55 +201,45 @@
       },
     }
   }
+
 </script>
 
 <style scoped lang="less">
   @import "./JfbThirdRideLandLess.less";
 
   .jfb-third-ride-land {
-    min-height: 100vh;
-
-    &__body {
-      box-sizing: border-box;
-    }
-
-    //内容卡片
-    &__card {
-      position: relative;
+    &__body{
       box-sizing: border-box;
-      background: #FFFFFF;
-      border-radius: 24rpx;
 
-      &-placeholder {
-        font-size: 26rpx;
-        color: #CCCCCC;
+      .land_box{
+        background: #FFFFFF;
       }
-    }
 
-    //底部按钮
-    &__btn {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      width: 448rpx;
-      margin: 48rpx auto 0;
-      padding: 26rpx 0;
-      background: #3A7BFB;
-      border-radius: 60rpx;
+      //底部按钮
+      .land_btn{
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        width: 448rpx;
+        margin: 48rpx auto 0;
+        padding: 30rpx 0;
+        background: #FFFFFF;
+        border-radius: 60rpx;
+
+        .land_btn-text {
+          color: #333333;
+          font-size: 28rpx;
+          letter-spacing: 2rpx;
+        }
 
-      &--disabled {
-        background: #E6E6E9;
+        &--disabled {
+          background: #E6E6E9;
 
-        .jfb-third-ride-land__btn-text {
-          color: #999999;
+          .land_btn-text {
+            color: #999999;
+          }
         }
       }
     }
-
-    &__btn-text {
-      color: #FFFFFF;
-      font-size: 28rpx;
-      letter-spacing: 2rpx;
-    }
   }
 </style>

package/src/components/JfbThirdRideLand/cusAttr/advanced.js

@@ -3,20 +3,20 @@
 export default (data, gValue, gColor, oldData) => {
   return [
     //高级
-    {
-      label: '按钮跳转链接',
-      groupKey:'advanced',
-      className: 'input100',
-      ele: 'xd-select-pages-path',
-      valueKey: 'btnLink',
-      placeholder: '请选择按钮跳转页面路径',
-      labelInline: true,
-      inline: false,
-      value: data['btnLink'] || null,
-      setting: {
-        mode:'new',
-        router: XdBus.getParentApi('getPagesTree')
-      },
-    },
+    // {
+    //   label: '按钮跳转',
+    //   groupKey:'advanced',
+    //   className: 'input100',
+    //   ele: 'xd-select-pages-path',
+    //   valueKey: 'btnLink',
+    //   placeholder: '请选择按钮跳转页面路径',
+    //   labelInline: true,
+    //   inline: false,
+    //   value: data['btnLink'] || null,
+    //   setting: {
+    //     mode:'new',
+    //     router: XdBus.getParentApi('getPagesTree')
+    //   },
+    // },
   ].filter(i=>i)
 }

package/src/components/JfbThirdRideLand/cusAttr/content.js

@@ -13,26 +13,6 @@ export default (data, gValue, gColor, oldData) => {
     type: ["jpg", "png", "jpeg", "gif"],
   };
   return [
-    //内容
-    {
-      label: "业务线",
-      ele: "xd-choose-namespace",
-      valueKey: "xnamespace",
-      value: dataVal({data, key:'xnamespace', dValue:"", gValue}),
-      groupKey:'content',
-      className: 'input80',
-      labelInline:true,
-      placeholder: '请选择业务线',
-      notice: '空继承上级业务线',
-      inline: false,
-      handleCustom: (cb) => {
-        XdBus.getParentApi('getOptionsNamespaces')()
-          .then(res => {
-            cb(res.list)
-          })
-          .catch();
-      }
-    },
     //富文本内容
     {
       label: "须知内容:",
@@ -54,6 +34,16 @@ export default (data, gValue, gColor, oldData) => {
       labelInline: true,
       className: 'input100',
     },
+    {
+      label: "按钮跳转链接",
+      ele: "el-input",
+      groupKey: 'content',
+      valueKey: "btnLink",
+      value: dataVal({data, key: 'btnLink', dValue: '', gValue}),
+      placeholder: '请输入按钮跳转链接',
+      labelInline: true,
+      className: 'input100',
+    },
     //倒计时秒数
     {
       label: '倒计时秒数:',

package/src/components/JfbThirdRideLand/cusAttr/style.js

@@ -13,8 +13,8 @@ export default (data, gValue, gColor, oldData) => {
       value: data.bgImage || {},
       defaultValue: data.bgImage || null,
       slot: true,
-      oneWidth: 355,
-      oneHeight: 355,
+      oneWidth: 750/4,
+      oneHeight: 1000/4,
       elinputClassName: 'input40',
       tipsformet: '上传文件格式：@imageType@，不超过@size@MB.建议宽度为<span style="color:red">750px</span>',
       type: ['jpg', 'png', 'jpeg'],
@@ -26,20 +26,6 @@ export default (data, gValue, gColor, oldData) => {
       maxlen: 1,
       labelInline: true,
     },
-    //背景色
-    {
-      label: '背景色:',
-      ele: 'xd-color',
-      groupKey: 'style',
-      valueKey: 'bgColor',
-      value: dataVal({data, key:'bgColor', dValue:'#E4F3FF', gValue}),
-      placeholder: '请选择页面背景色',
-      className: 'input80',
-      labelInline: true,
-      setting: {
-        showAlpha: true
-      },
-    },
     //外边距
     {
       label: '外边距',