jufubao-base 1.0.132-beta3 → 1.0.133

package/src/components/JfbBaseLoginForgetPwd/Attr.js

@@ -3,59 +3,52 @@
 export default {
   style: [],
   advanced: [],
-  content(data){
-    let showHotLine = 'N';
-    if(data.showHotLine) showHotLine = data.showHotLine;
-    return [
-      {
-        label: "是否弹出客服热线提示:",
-        ele: "xd-radio",
-        valueKey: "showHotLine",
-        groupKey: 'content',
-        value: showHotLine,
-        list: [
-          {label: "是", value: "Y"},
-          {label: "否", value: "N"}
-        ]
-      },
-      showHotLine === 'Y' && {
-        label: '客服热线:',
-        ele: 'el-input',
-        type: 'text',
-        groupKey: 'content',
-        valueKey: 'tell_hot',
-        value: data['tell_hot'],
-        placeholder: '请输入客服电话号码',
-        classNmae: 'input80',
-        rules: [
-          {
-            required: true,
-            message: '请输入客服电话号码',
-            trigger: 'blur'
+  content: [
+    {
+      label: '客服热线:', //label
+      ele: 'el-input', //package 名称
+      type: 'text',
+      valueKey: 'tell_hot', //form[valueKey]
+      value: '', //v-model
+      placeholder: '请输入客服电话号码',
+      classNmae: 'input80', //样式名称 //input100,input80,input70,input60,input50,input40,input30,input20,
+      rules: [
+        {
+          required: true,
+          message: '请输入客服电话号码',
+          trigger: 'blur'
+        },
+        {
+          validator: (rule, value, callback) => {
+            value = value.trim();
+            if (value.length > 15) callback('请输入正确的联系方式');
+            else callback()
           },
-          {
-            validator: (rule, value, callback) => {
-              value = value.trim();
-              if (value.length > 15) callback('请输入正确的联系方式');
-              else callback()
-            },
-            trigger: 'blur'
-          }
+          trigger: 'blur'
+        }
 
-        ]
-      },
-      {
-        label: '重新设置密码地址:',
-        ele: 'xd-select-pages-path',
-        valueKey: 'reset_pwd_url',
-        groupKey: 'advanced',
-        placeholder: '请选择跳转地址',
-        value: data.reset_pwd_url || null,
-        setting: {
-          router: XdBus.getParentApi('getPagesTree'),
-        },
-        inline: false,
+      ]
+    },
+    {
+      label: '重新设置密码地址:', //label
+      ele: 'xd-select-pages-path', //package 名称
+      valueKey: 'reset_pwd_url', //form[valueKey]
+      placeholder: '请选择跳转地址',
+      value: null,
+      setting: {
+        router: XdBus.getParentApi('getPagesTree'),
       },
-    ].filter(i=>i);
-  }
+      inline: false,
+    },
+    {
+      label: "是否弹出客服热线提示:",
+      ele: "xd-radio",
+      valueKey: "showHotLine",
+      value: "N",
+      list: [
+        {label: "是", value: "Y"},
+        {label: "否", value: "N"}
+      ]
+    }
+  ],
 }

package/src/components/JfbBaseLoginForgetPwd/JfbBaseLoginForgetPwd.vue

@@ -62,16 +62,14 @@
           >
         </view>
         <xd-dailog :show.sync="showHotLine" :cancel="false" :confirm="false"  :showClose="false" title="温馨提示">
-          <view class="phone">
-            <view>亲爱的用户，为了您的账户安全请联系管理员，或拨打客服热线</view>
-            <view class="contact_phone" :style="{color:mainColor}">{{ tell_hot }}</view>
+          <view>亲爱的用户，为了您的账户安全请联系管理员，或拨打客服热线</view>
+            <view class="contact_phone">{{ tell_hot }}</view>
             <xd-button
               type="primary"
               :bgColor="mainColor"
               style="width: 360rpx;margin-top: 30rpx;"
               @click="showHotLine=false"
             >知道了</xd-button>
-          </view>
         </xd-dailog>
       </view>
     </view>
@@ -205,6 +203,18 @@ export default {
         });
       });
     },
+    // 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();
     },
@@ -245,17 +255,7 @@ export default {
       }
 
     }
-    .phone {
-      .contact_phone {
-        padding-top: 20rpx;
-        font-size: 36rpx;
-        font-weight: 500;
-      }
-    }
   }
-
-
-
 }
 .flex {
   display: flex;

package/src/components/JfbBaseLoginForgetPwd/JfbBaseLoginForgetPwdLess.less

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

package/src/components/JfbBaseLoginSetPwd/Attr.js

@@ -5,10 +5,9 @@ export default {
   advanced: [],
   content: [
     {
-      label: "功能类型",
+      label: "类型",
       ele: "xd-radio",
       valueKey: "pwd_type",
-      groupKey: 'advanced',
       value: "1",
       list: [
         {label: "设置密码", value: "1"},
@@ -16,11 +15,10 @@ export default {
       ]
     },
     {
-      label: '设置密码成功跳转地址:',
-      ele: 'xd-select-pages-path',
-      valueKey: 'success_url',
+      label: '设置密码成功跳转地址:', //label
+      ele: 'xd-select-pages-path', //package 名称
+      valueKey: 'success_url', //form[valueKey]
       placeholder: '请选择跳转地址',
-      groupKey: 'advanced',
       value: null,
       setting: {
         router: XdBus.getParentApi('getPagesTree'),

package/src/components/JfbBaseLoginSetPwd/JfbBaseLoginSetPwdLess.less

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

package/src/components/JfbBaseMapOverlay/JfbBaseMapOverlayLess.less

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

package/src/components/JfbBaseMapSearch/Attr.js

@@ -7,6 +7,21 @@ export default {
   style: [],
   content: (data) => {
     return [
+      {
+        label: '背景颜色:', //label
+        ele: 'xd-color', //package 名称
+        valueKey: 'bgcolor', //form[valueKey]
+        value: data.bgcolor || '', //v-model
+        placeholder: '请输入占位框背景颜色',
+        classNmae: 'input80', //样式名称 //input100,input80,input70,input60,input50,input40,input30,input20,
+        rules: [
+          {
+            required: true,
+            message: '请输入占位框背景颜色',
+            trigger: 'blur'
+          },
+        ]
+      },
     ].filter(i=>i)
   },
   advanced: [

package/src/components/JfbBaseMapSearch/JfbBaseMapSearch.vue

@@ -55,6 +55,7 @@
         ak: "",
         centerPoint:[],
         status: false
+        //todo
       }
     },
     watch: {
@@ -65,6 +66,7 @@
     created() {
       this.init(this.container);
       this.uiAk = this.$settings.baiduAk || this.ak;
+      //todo
     },
     methods: {
       onJfbLoad(options) {
@@ -78,15 +80,37 @@
        * @param container {object} 业务组件对象自己
        */
       init(container) {
-
+        //this.height = getContainerPropsValue(container, 'content.height', 10);
       },
       handleMapSelect(select){
+				console.log("handleMapSelect", select);
         this.$bus.$emit('onUserLocation', select);
         this.$xdUniHelper.navigateBack()
 			},
       handleLocationSuccess(e){
         console.log("handleLocationSuccess", e);
       },
+      // 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) {
+        console.log('event.onJfbBack', options)
+      },
+      onJfbUpdate(...data) {
+        console.log('event.onJfbUpdate', data)
+      },
+      onJfbCustomEvent(options) {
+        console.log('event.onJfbReachBottom', options)
+      },
     }
   }
 

package/src/components/JfbBaseMapSearch/JfbBaseMapSearchLess.less

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

package/src/components/JfbBaseMergeUserCard/Attr.js

@@ -8,10 +8,9 @@ export default {
   content: (data) => {
     return [
       {
-        label: '找回成功跳转:',
-        ele: 'xd-select-pages-path',
-        valueKey: 'callback_url',
-        groupKey:'advanced',
+        label: '找回成功跳转:', //label
+        ele: 'xd-select-pages-path', //package 名称
+        valueKey: 'callback_url', //form[valueKey]
         value: data['callback_url'] || {},
         setting: {
           router: XdBus.getParentApi('getPagesTree')

package/src/components/JfbBaseMergeUserCard/JfbBaseMergeUserCardLess.less

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

package/src/components/JfbBaseMultipleExpress/Attr.js

@@ -8,10 +8,9 @@ export default {
   content: (data) => {
     return [
       {
-        label: '物流详情路径:',
-        ele: 'xd-select-pages-path',
-        valueKey: 'expressPath',
-        groupKey:'advanced',
+        label: '物流详情路径:', //label
+        ele: 'xd-select-pages-path', //package 名称
+        valueKey: 'expressPath', //form[valueKey]
         placeholder: '请选择物流详情路径',
         value: data.expressPath || {},
         setting: {

package/src/components/JfbBaseMultipleExpress/JfbBaseMultipleExpressLess.less

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