jufubao-base 1.0.63-beta2 → 1.0.63-beta202

package/src/components/JfbBasePhoneLogin/JfbBasePhoneLogin.vue

@@ -48,7 +48,7 @@
                 class="get_code"
                 @click="reGetCode"
                 :style="{color: mainColor}"
-              >{{time ? time + '秒后获取':'获取验证码'}}</view>
+              >{{jfbTimeer ? jfbTimeer + '秒后获取':'获取验证码'}}</view>
             </view>
           </xd-form-item>
         </xd-form>
@@ -100,7 +100,7 @@
   import XdFormInput from "@/components/XdFormInput/XdFormInput";
   import XdButton from "@/components/XdButton/XdButton";
   import XdFormCheckbox from "@/components/XdFormCheckbox/XdFormCheckbox"
-  
+
   export default {
     name: "JfbBasePhoneLogin",
     components: {
@@ -119,7 +119,7 @@
           phone_number: '',
           verification_code: '',
         },
-        time: 0,
+        jfbTimeer: 0,
         interval: null,
         auth_code: "",
         provider_id: "",
@@ -157,7 +157,7 @@
           url: `/pages/content/content?${params}`
         })
       },
-      
+
       onJfbLoad(options) {
         this.auth_code = options.auth_code;
         this.provider_id = options.provider_id;
@@ -172,7 +172,11 @@
         //this.height = getContainerPropsValue(value, 'content.height', 10);
       },
       reGetCode(){
-        if(this.time > 0) return;
+        this.$xdLog.setProject('get.code.handle', {
+          time: this.time,
+          jfbTimeer: this.jfbTimeer
+        });
+        if(this.jfbTimeer > 0) return;
         const { phone_number } = this.accountForm;
         if(!/^1[3-9]\d{9}$/.test(phone_number)){
           uni.showToast({
@@ -191,10 +195,10 @@
           }
         }).then(res => {
           this.$xdHideLoading()
-          this.time = 120;
+          this.jfbTimeer = 120;
           this.interval = setInterval(() => {
-            this.time--;
-            if(this.time == 0){
+            this.jfbTimeer--;
+            if(this.jfbTimeer == 0){
               clearTimeout(this.interval);
             }
           }, 1000)
@@ -275,11 +279,11 @@
         margin-left: unit(20,rpx) !important;
       }
     }
-    
+
     .form-group {
       padding: 40rpx 70rpx;
     }
-    
+
       .get_code {
         color: @xd-base-color;
         font-size: 24rpx;
@@ -291,32 +295,32 @@
             color: #A6A6A6;
           }
         }
-      
+
         /deep/ .uni-easyinput__placeholder-class {
           font-size: 26rpx;
           color: #D4D4D4;
         }
-      
+
         .phone-login-type {
           display: flex;
           color: #808080;
           font-size: 32rpx;
           padding: 20rpx 70rpx;
           align-items: center;
-        
+
           ._item {
             margin: 0 30rpx;
             position: relative;
             line-height: 2;
-          
+
             &:first-child {
               margin-left: 0;
             }
-          
+
             &.active {
               color: #383838;
               font-size: 36rpx;
-            
+
               text {
                 position: absolute;
                 height: 6rpx;
@@ -329,15 +333,15 @@
             }
           }
         }
-      
+
         .forget_password {
           font-size: 24rpx;
           color: #A6A6A6;
           text-align: right;
           margin: 20rpx 70rpx 0 0;
-        
+
         }
-      
+
         .not_login {
           position: fixed;
           width: 100%;

package/src/components/JfbBaseVideo/Api.js

@@ -0,0 +1,19 @@
+'use strict';
+
+module.exports = [
+  {
+    mapFnName: 'getListVideoContent', //自定义方法名字（必选）
+    title: '获取内容',
+    path: '/cms/v1/ad-content',
+    isRule: false,
+    params: {
+      scene: ['使用场景', 'String', '选填'],
+      container_id: ['插件ID', 'String', '必填'],
+      page_id: ['页面ID', 'String', '必填'],
+      page_size: ['记录条数', 'Number', '必填'],
+    },
+    isConsole: true,
+    disabled: true,
+  },
+
+];

package/src/components/JfbBaseVideo/Attr.js

@@ -0,0 +1,346 @@
+'use strict';
+
+import console from "@dcloudio/uni-h5/src/core/helpers/console";
+
+/**
+ * @description 当表单组件中有联动操作时候，使用方法进行返回
+ */
+export default {
+  style:[],
+  content:(params)=>{
+    if(!params['isCarousel']) params['isCarousel'] = 1;
+    return [
+      {
+        label: '广告位置配置:', //label
+        ele: 'xd-site-poster', //package 名称
+        valueKey: 'poster', //form[valueKey]
+        className: 'input80',
+        value: params.poster || {},
+        setting: {
+          count: 1,
+          scene: {label: '广告', value: 'normal'}
+        },
+        handleCustom({action, data}) {
+          //设置场景参数
+          if(data) {
+            data.params = Object.assign({}, {scene: 'normal'}, data.params || {})
+          }
+
+          //获取显示内容
+          if (action === 'screenList') {
+            XdBus.getParentApi('getOptionsSettingList')({setting_id: 'editx_base_ad_split_screen'})
+              .then(res => {
+                data.cb(res['list'])
+              })
+              .catch(error => {
+                console.error(error);
+              });
+            return
+          }
+
+          //获取返回参数(广告位高度必选项)
+          if (action === 'getPosterInfo') {
+            XdBus.getParentApi('cmsGetPublishEditxContent')(data.params)
+              .then(res => {
+                data.cb({list: res.list, selectId: res.selected})
+              })
+              .catch(error => {
+                console.error(error);
+              });
+            return
+          }
+
+          //使用内容分类
+          if (action === 'cmsPublishEditxContent') {
+            XdBus.getParentApi('cmsPublishEditxContent')(data.params)
+              .then(res => {
+                data.cb(res)
+              })
+              .catch(error => {
+                console.error(error);
+              });
+            return
+          }
+
+          let loading = XdBus.getParentApi('loading')({});
+          //位置列表
+          if (action === 'getListPostion') {
+            XdBus.getParentApi('getListPosterPosition')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(res)
+              })
+              .catch(error => {
+                loading.close();
+                console.error(error);
+              });
+          }
+
+          //位置创建
+          if (action === 'addPostion') {
+            XdBus.getParentApi('addPosterPosition')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(true)
+              })
+              .catch(error => {
+                console.error(error);
+                loading.close();
+                data.cb(false)
+              });
+          }
+
+          //位置编辑
+          if (action === 'editPostion') {
+            XdBus.getParentApi('updatePosterPosition')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(true)
+              })
+              .catch(error => {
+                console.error(error);
+                loading.close();
+                data.cb(false)
+              });
+          }
+
+          //位置删除
+          if (action === 'deleltePostion') {
+            XdBus.getParentApi('deletePosterPosition')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(true)
+              })
+              .catch(error => {
+                console.error(error);
+                loading.close();
+                data.cb(false)
+              });
+          }
+
+          //获取广告位内容列表
+          if (action === 'getListContent') {
+            XdBus.getParentApi('getListPosterContent')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(res)
+              })
+              .catch(error => {
+                loading.close();
+                console.error(error);
+              });
+          }
+
+          //广告内容创建
+          if (action === 'addContent') {
+            XdBus.getParentApi('addPosterContent')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(true)
+              })
+              .catch(error => {
+                console.error(error);
+                loading.close();
+                data.cb(false)
+              });
+          }
+
+          //广告内容编辑
+          if (action === 'editContent') {
+            XdBus.getParentApi('updatePosterContent')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(true)
+              })
+              .catch(error => {
+                console.error(error);
+                loading.close();
+                data.cb(false)
+              });
+          }
+
+          //广告内容删除
+          if (action === 'deleteContent') {
+            XdBus.getParentApi('deletePosterContent')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(true)
+              })
+              .catch(error => {
+                console.error(error);
+                loading.close();
+                data.cb(false)
+              });
+          }
+
+          //获取广告内容跳转地址类型
+          if (action === 'jumpPosterContentType') {
+            XdBus.getParentApi('getOptionsSettingList')({setting_id: "cms_setting"})
+              .then(res => {
+                loading.close();
+                data.cb(res['redirect_type'])
+              })
+              .catch(error => {
+                loading.close();
+                console.error(error);
+              });
+          }
+
+          //发布
+          if (action === 'publish') {
+            console.log('publish', data.params)
+            XdBus.getParentApi('cmsPublishContent')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(res)
+              })
+              .catch(error => {
+                loading.close();
+                console.error(error);
+              });
+          }
+
+          //获取站内页面地址
+          if (action === 'router') {
+            loading.close()
+            return XdBus.getParentApi('getPagesTree');
+
+          }
+
+          //通知页面进行刷新
+          if(action === 'update') {
+            XdBus.getParentApi('getXdBusUpdateView')('onUpdateView', {});
+            loading.close()
+          }
+        },
+        inline: false,
+        notice: '',
+        rules: [
+          {required: true, message: '请选择广告位置', trigger: 'change'},
+        ],
+      },
+      params.poster && params.poster['type'] !== '1' && {
+        label: '广告位内容间距设置:',
+        ele: 'el-input',
+        type: 'number',
+        valueKey: 'padding',
+        value: params.padding || 0,
+        className: 'input40',
+        placeholder: '请广告位内容间距设置',
+        notice: '在使用通屏显示类型广告位之外的样式时，该属性生效，单位：像素（px）',
+        inline: false,
+      },
+      {
+        label: '广告圆角设置:',
+        ele: 'xd-site-select-list',
+        valueKey: 'radius',
+        value: params['radius'] || '20',
+        placeholder: '请选择广告圆角设置',
+        multiple: false,
+        className: 'input80',
+        handleCustom({action, data}) {
+          XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_radius'})
+            .then(res => {
+              data.cb(res.list)
+            })
+            .catch(error => {
+              console.error(error);
+            });
+        },
+      },
+      {
+        label: '广告位边距设置:',
+        ele: 'xd-margin-padding',
+        valueKey: 'margin',
+        value: params.margin || null,
+        disabled: false,
+        setting: {
+          type: 'margin',
+        },
+        placeholder: '请设置广告位边距设置',
+
+      },
+      {
+        label: '广告位置使用张数:',
+        ele: 'el-input',
+        type: 'number',
+        valueKey: 'number',
+        value: params.number || 1,
+        placeholder: '请输入广告位置使用张数',
+        className: 'input40',
+        unit: '张',
+        rules: [
+          {
+            required: true,
+            message: '请输入广告位置使用张数',
+            trigger: 'blur'
+          },
+        ]
+      },
+      {
+        label: '广告位显示方式:',
+        ele: 'xd-radio',
+        valueKey: 'isCarousel',
+        value: params['isCarousel'] || 1,
+        rules: [
+          {required: true, message: '请选择广告位显示方式', trigger: ['blur', 'change']}
+        ],
+        list: [
+          {"label": "焦点图显示", "value": 1},
+          {"label": "轮播图显示", "value": 2},
+        ]
+      },
+      params['isCarousel'] === 2 && {
+        label: '广告位轮播周期:',
+        ele: 'el-input',
+        type: 'number',
+        isKey: true,
+        valueKey: 'carouselTime',
+        value: params.carouselTime || 5,
+        placeholder: '请输入广告位轮播周期，单位秒',
+        className: 'input40',
+        unit: '秒',
+        rules: [
+          {
+            required: true,
+            message: '请输入广告位置高度',
+            trigger: 'blur'
+          },
+        ]
+      },
+      params['isCarousel'] === 2 && {
+        label: '广告显示dot类型:', //label
+        ele: 'xd-select-list', //package 名称
+        valueKey: 'dot_type', //form[valueKey]
+        value: params['dot_type'] || 'dot', //v-model
+        placeholder: '请选择广告显示dot类型',
+        multiple: false,
+        className: 'input80',
+        list:[
+          {label: '显示圆点', value: 'dot'},
+          {label: '显示长方形', value: 'default'},
+          {label: '显示圆点+长条', value: 'round'},
+          {label: '显示索引+标题', value: 'nav'},
+          {label: '显示索引', value: 'indexes'},
+        ],
+        notice: '在使用非通屏显示类型广告位之外的样式时，<span style="color: red">(显示索引+标题|显示索引)</span>使用"<span style="color: red">显示圆点</span>"',
+        inline: false,
+      },
+      params['isCarousel'] === 2 && {
+        label: '广告位内容显示行数:',
+        ele: 'xd-radio',
+        valueKey: 'rows',
+        value: params.rows || 1,
+        list: [
+          {"label": "一行", "value": 1},
+          {"label": "两行", "value": 2},
+        ]
+      },
+
+
+    ].filter(i=>i)
+  },
+  advanced: [
+
+  ],
+};