jufubao-base 1.0.24 → 1.0.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.24",
+  "version": "1.0.25",
   "private": false,
   "description": "聚福宝业务组件基础插件包",
   "main": "index.js",

package/src/components/JfbBaseLogin/JfbBaseLogin.vue

@@ -242,13 +242,20 @@
       },
       p_getListProviders(){
         let providers = this.projectAttr.login_providers || '62fde99f2583a19c58fd937b,62fde9432583a19c58fd937a';
+        let {redirect_url, callback_url} = this;
+        try{
+          let redirectURL = new URL(decodeURIComponent(redirect_url));
+          redirect_url = redirectURL.href;
+        }catch(e){
+          redirect_url = location.origin + redirect_url;
+        }
         jfbRootExec("listSiteProvider", {
           vm: this,
           data: {
             providers: providers,
-            callback_url: this.callback_url,
-            phone_number_login_url: this.phone_number_login_url,
-            phone_number_collect_url: this.phone_number_collect_url
+            callback_url: redirect_url || (location.origin + this.settings.index),
+            phone_number_login_url: location.origin + this.phone_number_login_url,
+            phone_number_collect_url: location.origin + this.phone_number_collect_url
           }
         }).then(res => {
           if(res.quick_enabled){

package/src/components/JfbBaseLoginForgetPwd/Attr.js

@@ -12,11 +12,9 @@ export default {
       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/JfbBaseLoginForgetPwd/JfbBaseLoginForgetPwd.vue

@@ -22,7 +22,7 @@
           <view style="font-size:26rpx;color: #A6A6A6;">为了您的账号安全，请先验证手机号</view>
         </view>
         <xd-form
-          label-width="120"
+          label-width="126"
           style="margin-top: 40rpx;"
           label-align="right"
           content-align="left"
@@ -79,10 +79,19 @@
   import { jfbRootExec } from "@/utils/xd.event";
   import JfbBaseLoginForgetPwdMixin from "./JfbBaseLoginForgetPwdMixin";
   import { getContainerPropsValue } from "@/utils/xd.base";
+  import XdFormItem from "@/components/XdFormItem/XdFormItem";
+  import XdForm from "@/components/XdForm/XdForm";
+  import XdFormInput from "@/components/XdFormInput/XdFormInput";
+  import XdButton from "@/components/XdButton/XdButton";
+  
   export default {
     name: "JfbBaseLoginForgetPwd",
     components: {
-      XdFontIcon
+      XdFontIcon,
+      XdFormItem,
+      XdForm,
+      XdFormInput,
+      XdButton
     },
     mixins: [
       JfbBaseLoginForgetPwdMixin
@@ -132,7 +141,7 @@
           vm: this,
           data: {
             phone_number,
-            biz_name: "login" //todo
+            biz_name: "passport-password"
           }
         }).then(res => {
           this.time = 120;
@@ -178,8 +187,59 @@
   @import "./JfbBaseLoginForgetPwdLess.less";
 
   .jfb-base-login-forget-pwd {
-    &__body{
+    &__body {
+      .xd-form-checkbox {
+        /deep/ .checklist-content .checklist-text {
+          font-size: 26rpx !important;
+        }
+      }
+
+      .form-group {
+        padding: 20rpx 70rpx;
+      }
+
+      .get_code {
+        color: @xd-base-color;
+        font-size: 24rpx;
+      }
+      .panel-forget-password {
+        /deep/ .uni-forms-item__label {
+          .label-text {
+            font-size: 26rpx;
+            color: #A6A6A6;
+          }
+        }
+        /deep/ .uni-easyinput__placeholder-class {
+          font-size: 26rpx;
+          color: #D4D4D4;
+        }
 
+        .forget_tip {
+          box-sizing: border-box;
+          width: 600rpx;
+          border-radius: 10rpx;
+          box-shadow: 0px 0px 20px 0px #00000019;
+          padding: 64rpx 46rpx;
+          margin: 200rpx auto;
+          text-align: center;
+          font-size: 32rpx;
+
+          .contact_phone {
+            color: @xd-base-color;
+            font-size: 56rpx;
+            margin: 20rpx 0 30rpx;
+          }
+        }
+      }
     }
   }
+  .flex{
+    display: flex;
+  }
+  .flex-sub{
+    flex: 1;
+  }
+  .align-center{
+    align-items: center;
+  }
 </style>

package/src/components/JfbBaseLoginSetPwd/Api.js

@@ -14,7 +14,7 @@ module.exports = [
   {
     mapFnName: 'setPwd',
     title: '重新设置密码',
-    path: '/passport/v1/user/set-password',//编的
+    path: '/passport/v1/user/update-password',
     isRule: false,
     data: {
       password: ['密码', 'String', '必选'],
@@ -27,7 +27,7 @@ module.exports = [
   {
     mapFnName: 'resetPwd',
     title: '重新设置密码',
-    path: '/passport/v1/user/update-password',
+    path: '/passport/v1/user/forget-password',
     isRule: false,
     data: {
       password: ['密码', 'String', '必选'],

package/src/components/JfbBaseLoginSetPwd/JfbBaseLoginSetPwd.vue

@@ -68,10 +68,20 @@
   import { jfbRootExec } from "@/utils/xd.event";
   import JfbBaseLoginSetPwdMixin from "./JfbBaseLoginSetPwdMixin";
   import { getContainerPropsValue } from "@/utils/xd.base";
+  import XdFormItem from "@/components/XdFormItem/XdFormItem";
+  import XdForm from "@/components/XdForm/XdForm";
+  import XdFormInput from "@/components/XdFormInput/XdFormInput";
+  import XdButton from "@/components/XdButton/XdButton";
+  
+  
   export default {
     name: "JfbBaseLoginSetPwd",
     components: {
-      XdFontIcon
+      XdFontIcon,
+      XdFormItem,
+      XdForm,
+      XdFormInput,
+      XdButton
     },
     mixins: [
       JfbBaseLoginSetPwdMixin
@@ -155,8 +165,30 @@
   @import "./JfbBaseLoginSetPwdLess.less";
 
   .jfb-base-login-set-pwd {
-    &__body{
+    &__body {
+      .xd-form-checkbox {
+        /deep/ .checklist-content .checklist-text {
+          font-size: 26rpx !important;
+        }
+      }
+
+      .form-group {
+        padding: 20rpx 70rpx;
+      }
+      .panel-reset-password {
+        /deep/ .uni-forms-item__label {
+          width: 185rpx !important;
 
+          .label-text {
+            font-size: 26rpx;
+            color: #A6A6A6;
+          }
+        }
+        /deep/ .uni-easyinput__placeholder-class {
+          font-size: 26rpx;
+          color: #D4D4D4;
+        }
+      }
     }
   }
 </style>

package/src/components/JfbBasePhoneCollect/JfbBasePhoneCollect.vue

@@ -81,10 +81,21 @@
   import { jfbRootExec } from "@/utils/xd.event";
   import JfbBasePhoneCollectMixin from "./JfbBasePhoneCollectMixin";
   import { getContainerPropsValue } from "@/utils/xd.base";
+  import XdFormItem from "@/components/XdFormItem/XdFormItem";
+  import XdForm from "@/components/XdForm/XdForm";
+  import XdFormInput from "@/components/XdFormInput/XdFormInput";
+  import XdButton from "@/components/XdButton/XdButton";
+  import XdFormCheckbox from "@/components/XdFormCheckbox/XdFormCheckbox"
+  
   export default {
     name: "JfbBasePhoneCollect",
     components: {
-      XdFontIcon
+      XdFontIcon,
+      XdFormItem,
+      XdForm,
+      XdFormInput,
+      XdButton,
+      XdFormCheckbox
     },
     mixins: [
       JfbBasePhoneCollectMixin
@@ -194,8 +205,60 @@
   @import "./JfbBasePhoneCollectLess.less";
 
   .jfb-base-phone-collect {
-    &__body{
+    border: 1px dashed rgba(0, 0, 0, 0);
+    box-sizing: border-box;
 
+    &__body {
+      .xd-form-checkbox {
+        /deep/ .checklist-content .checklist-text {
+          font-size: 26rpx !important;
+        }
+      }
+
+      .form-group {
+        padding: 20rpx 70rpx;
+      }
+
+      .get_code {
+        color: @xd-base-color;
+        font-size: 24rpx;
+      }
+      .panel-login-password {
+
+        /deep/ .uni-forms-item__label {
+          .label-text {
+            font-size: 26rpx;
+            color: #A6A6A6;
+          }
+        }
+
+        /deep/ .uni-easyinput__placeholder-class {
+          font-size: 26rpx;
+          color: #D4D4D4;
+        }
+
+
+        .not_login {
+          position: fixed;
+          width: 100%;
+          text-align: center;
+          bottom: 100rpx;
+          font-size: 24rpx;
+          color: #FE7A63;
+        }
+      }
     }
   }
+
+  .flex {
+    display: flex;
+  }
+
+  .flex-sub {
+    flex: 1;
+  }
+
+  .align-center {
+    align-items: center;
+  }
 </style>

package/src/components/JfbBasePhoneCollect/JfbBasePhoneCollectMixin.js

@@ -1,9 +1,5 @@
 'use strict';
 
-//@AttrImport
-import Attr from "./Attr";
-//@EndAttrImport
-
 import {getContainerPropsValue} from "@/utils/xd.base";
 export default {
   props: {
@@ -92,10 +88,6 @@ export default {
       containerId: null, //容器ID
       //#ifdef H5
       
-      //@AttrData
-      Attr:{}, //对外开发编辑属性
-      //@EndAttrData
-      
       active: false, //是否选择当前状态
       isEditx: true, //当前为Editx模式
       edit: false, //是否开启编辑模式
@@ -113,10 +105,6 @@ export default {
   },
   created() {
     
-    //@AttrDataCreated
-    this.Attr = this.$xdUniHelper.customClone(Attr);
-    //@EndAttrDataCreated
-    
 
     //设置插件cid
     if (this.cid) {

package/src/components/JfbBasePhoneLogin/JfbBasePhoneLogin.vue

@@ -60,6 +60,7 @@
         </view>
         <view class="form-group">
           <xd-button
+            :disabled="!panelIsChecked"
             style="flex: 1;"
             type="primary"
             radius="10rpx"
@@ -81,10 +82,21 @@
   import { jfbRootExec } from "@/utils/xd.event";
   import JfbBasePhoneLoginMixin from "./JfbBasePhoneLoginMixin";
   import { getContainerPropsValue } from "@/utils/xd.base";
+  import XdFormItem from "@/components/XdFormItem/XdFormItem";
+  import XdForm from "@/components/XdForm/XdForm";
+  import XdFormInput from "@/components/XdFormInput/XdFormInput";
+  import XdButton from "@/components/XdButton/XdButton";
+  import XdFormCheckbox from "@/components/XdFormCheckbox/XdFormCheckbox"
+  
   export default {
     name: "JfbBasePhoneLogin",
     components: {
-      XdFontIcon
+      XdFontIcon,
+      XdForm,
+      XdFormItem,
+      XdFormInput,
+      XdButton,
+      XdFormCheckbox
     },
     mixins: [
       JfbBasePhoneLoginMixin
@@ -167,7 +179,7 @@
           },
         }).then(res => {
           let { callback_url } = this;
-          if(callback_url) redirect_url = decodeURIComponent(callback_url);
+          if(callback_url) callback_url = decodeURIComponent(callback_url);
           this.$xdUniHelper.redirectTo({
             url: callback_url || this.settings.index
           })
@@ -197,8 +209,93 @@
   @import "./JfbBasePhoneLoginLess.less";
 
   .jfb-base-phone-login {
-    &__body{
-
+    &__body {
+      .xd-form-checkbox {
+        /deep/ .checklist-content .checklist-text {
+          font-size: 26rpx !important;
+        }
+      }
+    
+      .form-group {
+        padding: 20rpx 70rpx;
+      }
+    
+      .get_code {
+        color: @xd-base-color;
+        font-size: 24rpx;
+      }
+      .panel-login-password {
+        /deep/ .uni-forms-item__label {
+          .label-text {
+            font-size: 26rpx;
+            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;
+                width: 90rpx;
+                border-radius: 6rpx;
+                left: 50%;
+                bottom: 0;
+                transform: translateX(-50%);
+              }
+            }
+          }
+        }
+      
+        .forget_password {
+          font-size: 24rpx;
+          color: #A6A6A6;
+          text-align: right;
+          margin: 20rpx 70rpx 0 0;
+        
+        }
+      
+        .not_login {
+          position: fixed;
+          width: 100%;
+          text-align: center;
+          bottom: 100rpx;
+          font-size: 24rpx;
+          color: #FE7A63;
+        }
+      }
     }
   }
+  .flex{
+    display: flex;
+  }
+  .flex-sub{
+    flex: 1;
+  }
+  .align-center{
+    align-items: center;
+  }
 </style>

package/src/components/JfbBasePhoneLogin/JfbBasePhoneLoginMixin.js

@@ -1,9 +1,5 @@
 'use strict';
 
-//@AttrImport
-import Attr from "./Attr";
-//@EndAttrImport
-
 import {getContainerPropsValue} from "@/utils/xd.base";
 export default {
   props: {
@@ -92,10 +88,6 @@ export default {
       containerId: null, //容器ID
       //#ifdef H5
       
-      //@AttrData
-      Attr:{}, //对外开发编辑属性
-      //@EndAttrData
-      
       active: false, //是否选择当前状态
       isEditx: true, //当前为Editx模式
       edit: false, //是否开启编辑模式
@@ -113,10 +105,6 @@ export default {
   },
   created() {
     
-    //@AttrDataCreated
-    this.Attr = this.$xdUniHelper.customClone(Attr);
-    //@EndAttrDataCreated
-    
 
     //设置插件cid
     if (this.cid) {

package/src/components/JfbBasePhoneCollect/Attr.js

@@ -1,154 +0,0 @@
-'use strict';
-
-export default {
-  style: [],
-  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/JfbBasePhoneLogin/Attr.js

@@ -1,154 +0,0 @@
-'use strict';
-
-export default {
-  style: [],
-  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'
-        },
-      ]
-    },
-  ],
-}