jufubao-base 1.0.130-beta5 → 1.0.131

package/src/components/JfbBaseRechargeSuccess/JfbBaseRechargeSuccessLess.less

@@ -13,8 +13,9 @@
 
 //start
 .jfb-base-recharge-success {
+  border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(100, rpx);
+  min-height: unit(50, rpx);
 
   &__body{
       position: relative;
@@ -22,21 +23,21 @@
       z-index: 2
   }
 
-  &.editx,&:hover {
+  &.editx {
     position: relative;
-    z-index: 3;
-    &::after {
-      border: 2rpx dashed blue;
-      content: " ";
-      position: absolute;
-      top:0;
-      left:0;
-      bottom:0;
-      right:0;
-      z-index: 4;
-      cursor: pointer;
-    }
+    border: 1px dashed blue;
+    box-sizing: border-box;
+    z-index: 3
+
+  }
 
+  &:hover {
+    border: 1px dashed blue;
+  }
+
+  &.noBorder {
+    border-color: rgba(0,0,0,0);
+    border-width: 0;
   }
 
 
@@ -71,9 +72,9 @@
 
 /**notPreview**/
 .jfb-base-recharge-success {
-  //&:before {
-    //content: " ";
-    //display: table;
-  //}
+  &:before {
+    content: " ";
+    display: table;
+  }
 }
 /**endNotPreview**/

package/src/components/JfbBaseSearch/Api.js

@@ -0,0 +1,60 @@
+'use strict';
+
+/**
+ * @description API模型
+ * 建议：Ffff=>模块  Xxxx=>自定义名字
+ * 获取单记录(getByIdFfffXxxx)
+ * 获取列表记录(getByListFfffXxxx)
+ * 添加列表记录(addFfffXxxxx)
+ * 删除列表记录(removeFfffXxxxx|deleteFfffXxxx)
+ * 更新列表记录(updateFfffXxxxx)
+ * @type {*[]}
+ */
+module.exports = [
+  {
+    mapFnName: 'getByIdFilmSquate', //自定义方法名字（必选）
+    title: '获取电影广场列表',
+    path: '/api/account/film/list-film-square',
+    isRule: false,
+    params: {
+      last_key: ['当前页', 'Number', '必选'],
+      page_size: ['每页数量', 'Number', '必选'],
+    },
+    isConsole: true,
+    disabled: true,
+  },
+  {
+    mapFnName: 'updateFilmPaiqiDate', //自定义方法名字（必选）
+    title: '更新排期',
+    path: '/api/account/film/paiqi-date',
+    isRule: false,
+    params: {
+      film_id: ['电影id', 'Number', '必选'],
+      cinema_id: ['影院id', 'Number', '必选'],
+    },
+    isConsole: true,
+    disabled: true,
+  },
+  {
+    mapFnName: 'removeFilmAddress', //自定义方法名字（必选）
+    title: '删除我的配送地址',
+    path: '/api/account/film/paiqi-date',
+    isRule: false,
+    params: {
+      film_id: ['电影id', 'Number', '必选'],
+    },
+    isConsole: true,
+    disabled: true,
+  },
+  {
+    mapFnName: 'addFilmcart',  //自定义方法名字（必选）
+    title: '添加购物车',
+    path: '/api/account/film/paiqi-date',
+    isRule: false,
+    params: {
+      film_id: ['电影id', 'Number', '必选'],
+    },
+    isConsole: true,
+    disabled: true,
+  },
+];

package/src/components/JfbBaseSearch/Attr.js

@@ -1,12 +1,154 @@
 'use strict';
 
-/**
- * @description 当表单组件中有联动操作时候，使用方法进行返回
- */
 export default {
   style: [],
-  content: [],
-  advanced: [
+  advanced: [],
+  content: [
+    //文本信息
+    {
+      label: '标题名称:', //label
+      ele: 'el-input', //package 名称
+      type: 'text',
+      valueKey: 'title', //form[valueKey]
+      value: '', //v-model
+      placeholder: '请输入标题名称',
+      classNmae: 'input40', //样式名称 //input100,input80,input70,input60,input50,input40,input30,input20,
+      disabled: true,
+      rules: [
+        {
+          required: true,
+          type: 'url',
+          message: '请输入域名地址',
+          trigger: 'blur'
+        },
+      ]
+    },
 
+    //远程获取内容选择
+    {
+      label: '跳转路径:', //label
+      ele: 'xd-select-list', //package 名称
+      valueKey: 'jumpToLink', //form[valueKey]
+      value: '', //v-model
+      placeholder: '请选择加盟商',
+      multiple: false, //多选
+      collapseTags: false,
+      remoteApi: '/api/editx/pages',
+      remote: true,
+    },
+
+    //本地固定内容选择
+    {
+      label: '选择内容:', //label
+      ele: 'xd-select-list', //package 名称
+      valueKey: 'select', //form[valueKey]
+      value: '', //v-model
+      placeholder: '请选择选择内容',
+      multiple: false, //多选
+      remote: false,
+      list: [
+        {"label": "订单详情", "value": '/main/order/order'},
+        {"label": "购物车详情", "value": '/main/cart/cart'},
+        {"label": "商品详情", "value": '/main/product/product'},
+        {"label": "商品分类", "value": '/main/producttype/producttype'},
+      ],
+    },
+
+    //本地固定单选选择
+    {
+      label: '单选列表（固定）:', //label
+      ele: 'xd-radio', //package 名称
+      valueKey: 'radio_status_list', //form[valueKey]
+      value: 6, //v-model
+      disabled: true,
+      rules: [
+        {required: true, message: '请选择', trigger: ['blur', 'change']}
+      ],
+      list: [
+        {"label": "万利达集团", "value": 4},
+        {"label": "中国联通", "value": 5},
+        {"label": "中国移动", "value": 6},
+        {"label": "味多美", "value": 7},
+      ]
+    },
+
+    //远程固定单选选择
+    {
+      label: '单选列表（固定）:', //label
+      ele: 'xd-radio', //package 名称
+      valueKey: 'radio_status_list', //form[valueKey]
+      value: 6, //v-model
+      disabled: false,
+      remoteApi: '/api/editx/pages',
+      remote: true,
+      rules: [
+        {required: true, message: '请选择', trigger: ['blur', 'change']}
+      ],
+    },
+
+    //本地固定多选选择
+    {
+      label: '多选列表（固定）:', //label
+      ele: 'xd-check', //package 名称
+      valueKey: 'xd-check_list', //form[valueKey]
+      value: 6, //v-model
+      disabled: true,
+      rules: [
+        {required: true, message: '请选择', trigger: ['blur', 'change']}
+      ],
+      list: [
+        {"label": "万利达集团", "value": 4},
+        {"label": "中国联通", "value": 5},
+        {"label": "中国移动", "value": 6},
+        {"label": "味多美", "value": 7},
+      ]
+    },
+
+    //远程多选选选择
+    {
+      label: '多选列表:', //label
+      ele: 'xd-check', //package 名称
+      valueKey: 'xd-check_remote-list', //form[valueKey]
+      value: 6, //v-model
+      disabled: false,
+      remoteApi: '/api/editx/pages',
+      remote: true,
+      rules: [
+        {required: true, message: '请选择', trigger: ['blur', 'change']}
+      ],
+    },
+
+    //状态(二选一)单选选择
+    {
+      label: '状态(二选一):', //label
+      ele: 'xd-radio-status', //package 名称
+      valueKey: 'radio_status', //form[valueKey]
+      value: 'Y', //v-model
+      isall: true,
+      disabled: true,
+      backValueType: '', //返回值类型 1=>返回（Y,N）2=> [true|false] 3=>[1,0] 4=>[1,2]
+      placeholder: '请选择',
+      list: 'status', //status=>状态  best=>推荐  associate=>关联 yes=>是否 open=> 是否开启  check=>审核
+    },
+
+    //文本信息
+    {
+      label: '标题名称:', //label
+      ele: 'el-input', //package 名称
+      type: 'text',
+      valueKey: 'title', //form[valueKey]
+      value: '', //v-model
+      placeholder: '请输入标题名称',
+      classNmae: 'input40', //样式名称 //input100,input80,input70,input60,input50,input40,input30,input20,
+      disabled: true,
+      rules: [
+        {
+          required: true,
+          type: 'url',
+          message: '请输入域名地址',
+          trigger: 'blur'
+        },
+      ]
+    },
   ],
-};
+}

package/src/components/JfbBaseSearch/JfbBaseSearch.vue

@@ -41,7 +41,10 @@
     },
     mixins: [componentsMixins,extsMixins,JfbBaseSearchMixin],
     data() {
-      return {}
+      return {
+
+        //todo
+      }
     },
     watch: {
       container(value) {
@@ -50,27 +53,53 @@
     },
     created() {
       this.init(this.container);
-      // this.$xdAlert({
-      //   content:'此组件已弃用，请勿使用',
-      //   time:4000,
-      //   type:'error'
-      // })
+
+      //todo
     },
     methods: {
       onJfbLoad(options) {
+        console.log(this.layoutInfo, 'layoutInfolayoutInfolayoutInfo')
+        // jfbRootExec('baiduUserLogin', {
+
+        //   vm: this,//   data: {
+
+        //     account: 'gaoshiyong',//     password: '123456789',//     type: 3,//     ...options
+
+        //   }
+
+        // }).then().catch()
       },
       /**
        * @description 监听事件变化
        * @param container {object} 业务组件对象自己
        */
-      init(container) {
+      init(value) {
+
+        //this.bgcolor = getContainerPropsValue(value, 'content.bgcolor', '#fff');
 
+        //this.height = getContainerPropsValue(value, 'content.height', 10);
       },
       handleSelect(select) {
+        console.log(select,'6666666')
         this.$xdRoot.$emit('onUserLocation', select);
         this.$xdUniHelper.navigateBack()
       },
-
+      onJfbScroll(options) {
+        console.log('event.onJfbScroll', options)
+      },
+      onJfbReachBottom(options) {
+        console.log('event.onJfbReachBottom', options)
+      },
+      onJfbShow(options) {
+        console.log('event.onJfbShow', options)
+      },
+      onJfbHide(options) {
+        console.log('event.onJfbHide', options)
+      },
+      onJfbBack(options) {
+        this.$xdUniHelper.navigateBack()
+        console.log('event.onJfbBack', options)
+      },
     }
   }
 

package/src/components/JfbBaseSearch/JfbBaseSearchLess.less

@@ -13,8 +13,9 @@
 
 //start
 .jfb-base-search {
+  border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(100, rpx);
+  min-height: unit(50, rpx);
 
   &__body{
       position: relative;
@@ -22,21 +23,21 @@
       z-index: 2
   }
 
-  &.editx,&:hover {
+  &.editx {
     position: relative;
-    z-index: 3;
-    &::after {
-      border: 2rpx dashed blue;
-      content: " ";
-      position: absolute;
-      top:0;
-      left:0;
-      bottom:0;
-      right:0;
-      z-index: 4;
-      cursor: pointer;
-    }
+    border: 1px dashed blue;
+    box-sizing: border-box;
+    z-index: 3
+
+  }
 
+  &:hover {
+    border: 1px dashed blue;
+  }
+
+  &.noBorder {
+    border-color: rgba(0,0,0,0);
+    border-width: 0;
   }
 
 
@@ -71,9 +72,9 @@
 
 /**notPreview**/
 .jfb-base-search {
-  //&:before {
-    //content: " ";
-    //display: table;
-  //}
+  &:before {
+    content: " ";
+    display: table;
+  }
 }
 /**endNotPreview**/

package/src/components/JfbBaseSearch/Mock.js

@@ -0,0 +1,5 @@
+'use strict';
+
+module.exports = {
+  aaaa: {}
+}

package/src/components/JfbBaseSetPwd/Attr.js

@@ -1,9 +1,150 @@
 'use strict';
 
-export default {
-  style: [],
-  advanced: [],
-  content: [
+export default [
+  //文本信息
+  {
+    label: '标题名称:', //label
+    ele: 'el-input', //package 名称
+    type: 'text',
+    valueKey: 'title', //form[valueKey]
+    value: '', //v-model
+    placeholder: '请输入标题名称',
+    classNmae: 'input40', //样式名称 //input100,input80,input70,input60,input50,input40,input30,input20,
+    disabled: true,
+    rules: [
+      {
+        required: true,
+        type: 'url',
+        message: '请输入域名地址',
+        trigger: 'blur'
+      },
+    ]
+  },
 
-  ],
-}
+  //远程获取内容选择
+  {
+    label: '跳转路径:', //label
+    ele: 'xd-select-list', //package 名称
+    valueKey: 'jumpToLink', //form[valueKey]
+    value: '', //v-model
+    placeholder: '请选择加盟商',
+    multiple: false, //多选
+    collapseTags: false,
+    remoteApi: '/api/editx/pages',
+    remote: true,
+  },
+
+  //本地固定内容选择
+  {
+    label: '选择内容:', //label
+    ele: 'xd-select-list', //package 名称
+    valueKey: 'select', //form[valueKey]
+    value: '', //v-model
+    placeholder: '请选择选择内容',
+    multiple: false, //多选
+    remote: false,
+    list: [
+      {"label": "订单详情", "value": '/main/order/order'},
+      {"label": "购物车详情", "value": '/main/cart/cart'},
+      {"label": "商品详情", "value": '/main/product/product'},
+      {"label": "商品分类", "value": '/main/producttype/producttype'},
+    ],
+  },
+
+  //本地固定单选选择
+  {
+    label: '单选列表（固定）:', //label
+    ele: 'xd-radio', //package 名称
+    valueKey: 'radio_status_list', //form[valueKey]
+    value: 6, //v-model
+    disabled: true,
+    rules: [
+      {required: true, message: '请选择', trigger: ['blur', 'change']}
+    ],
+    list: [
+      {"label": "万利达集团", "value": 4},
+      {"label": "中国联通", "value": 5},
+      {"label": "中国移动", "value": 6},
+      {"label": "味多美", "value": 7},
+    ]
+  },
+
+  //远程固定单选选择
+  {
+    label: '单选列表（固定）:', //label
+    ele: 'xd-radio', //package 名称
+    valueKey: 'radio_status_list', //form[valueKey]
+    value: 6, //v-model
+    disabled: false,
+    remoteApi: '/api/editx/pages',
+    remote: true,
+    rules: [
+      {required: true, message: '请选择', trigger: ['blur', 'change']}
+    ],
+  },
+
+  //本地固定多选选择
+  {
+    label: '多选列表（固定）:', //label
+    ele: 'xd-check', //package 名称
+    valueKey: 'xd-check_list', //form[valueKey]
+    value: 6, //v-model
+    disabled: true,
+    rules: [
+      {required: true, message: '请选择', trigger: ['blur', 'change']}
+    ],
+    list: [
+      {"label": "万利达集团", "value": 4},
+      {"label": "中国联通", "value": 5},
+      {"label": "中国移动", "value": 6},
+      {"label": "味多美", "value": 7},
+    ]
+  },
+
+  //远程多选选选择
+  {
+    label: '多选列表:', //label
+    ele: 'xd-check', //package 名称
+    valueKey: 'xd-check_remote-list', //form[valueKey]
+    value: 6, //v-model
+    disabled: false,
+    remoteApi: '/api/editx/pages',
+    remote: true,
+    rules: [
+      {required: true, message: '请选择', trigger: ['blur', 'change']}
+    ],
+  },
+
+  //状态(二选一)单选选择
+  {
+    label: '状态(二选一):', //label
+    ele: 'xd-radio-status', //package 名称
+    valueKey: 'radio_status', //form[valueKey]
+    value: 'Y', //v-model
+    isall: true,
+    disabled: true,
+    backValueType: '', //返回值类型 1=>返回（Y,N）2=> [true|false] 3=>[1,0] 4=>[1,2]
+    placeholder: '请选择',
+    list: 'status', //status=>状态  best=>推荐  associate=>关联 yes=>是否 open=> 是否开启  check=>审核
+  },
+
+  //文本信息
+  {
+    label: '标题名称:', //label
+    ele: 'el-input', //package 名称
+    type: 'text',
+    valueKey: 'title', //form[valueKey]
+    value: '', //v-model
+    placeholder: '请输入标题名称',
+    classNmae: 'input40', //样式名称 //input100,input80,input70,input60,input50,input40,input30,input20,
+    disabled: true,
+    rules: [
+      {
+        required: true,
+        type: 'url',
+        message: '请输入域名地址',
+        trigger: 'blur'
+      },
+    ]
+  },
+]

package/src/components/JfbBaseSetPwd/JfbBaseSetPwdLess.less

@@ -13,8 +13,9 @@
 
 //start
 .jfb-base-set-pwd {
+  border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(100, rpx);
+  min-height: unit(50, rpx);
 
   &__body{
       position: relative;
@@ -22,21 +23,21 @@
       z-index: 2
   }
 
-  &.editx,&:hover {
+  &.editx {
     position: relative;
-    z-index: 3;
-    &::after {
-      border: 2rpx dashed blue;
-      content: " ";
-      position: absolute;
-      top:0;
-      left:0;
-      bottom:0;
-      right:0;
-      z-index: 4;
-      cursor: pointer;
-    }
+    border: 1px dashed blue;
+    box-sizing: border-box;
+    z-index: 3
+
+  }
 
+  &:hover {
+    border: 1px dashed blue;
+  }
+
+  &.noBorder {
+    border-color: rgba(0,0,0,0);
+    border-width: 0;
   }
 
 
@@ -71,9 +72,9 @@
 
 /**notPreview**/
 .jfb-base-set-pwd {
-  //&:before {
-    //content: " ";
-    //display: table;
-  //}
+  &:before {
+    content: " ";
+    display: table;
+  }
 }
 /**endNotPreview**/