jufubao-base 1.0.23 → 1.0.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.23",
+  "version": "1.0.25",
   "private": false,
   "description": "聚福宝业务组件基础插件包",
   "main": "index.js",
@@ -14,6 +14,7 @@
     "create": "node ./commands/create.pack.js",
     "change": "node ./commands/change.pack",
     "release": "node ./commands/npmignore && npm publish",
+    "view": "node ./commands/update.preview.js base",
     "init": "cross-env isLocal=false node ./commands.js",
     "init.local": "cross-env isLocal=true node ./commands.js",
     "coder": "node ./build/commands/coder.js",
@@ -47,8 +48,8 @@
     "color": "^3.1.3",
     "core-js": "^2.6.5",
     "flyio": "^0.6.2",
-    "gxd-commands-bussiness": "^1.0.8",
-    "gxd-uni-library-editx": "1.0.2",
+    "gxd-commands-bussiness": "^1.0.12",
+    "gxd-uni-library-editx": "1.0.4",
     "jweixin-module": "^1.6.0",
     "md5": "^2.3.0",
     "path-to-regexp": "^6.2.1",

package/src/components/JfbBaseLogin/Api.js

@@ -71,6 +71,7 @@ module.exports = [
     isRule: false,
     data: {
       phone_number: ['手机号', 'String', '必选'],
+      biz_name: ['业务名称', 'String', '必选']
     },
     isConsole: true,
     disabled: true,
@@ -121,15 +122,4 @@ module.exports = [
     isConsole: true,
     disabled: true,
   },
-  {
-    mapFnName: "sendMsg",
-    title: "发送手机验证码",
-    path: "/common/v1/valid_code/sms/send",
-    isRule: false,
-    data: {
-      phone_number: ['手机号', 'Number', '必填']
-    },
-    isConsole: true,
-    disabled: true
-  }
 ];

package/src/components/JfbBaseLogin/Attr.js

@@ -4,6 +4,50 @@ export default {
   style: [],
   advanced: [],
   content: [
+    {
+      label: '登录成功跳转地址:', //label
+      ele: 'xd-select-pages-path', //package 名称
+      valueKey: 'callback_url', //form[valueKey]
+      placeholder: '请选择登录成功跳转地址',
+      value: null,
+      setting: {
+        router: XdBus.getParentData('getPagesTree'),
+      },
+      inline: false,
+    },
+    {
+      label: '手机号登录地址:', //label
+      ele: 'xd-select-pages-path', //package 名称
+      valueKey: 'phone_number_login_url', //form[valueKey]
+      placeholder: '请选择手机号登录地址',
+      value: null,
+      setting: {
+        router: XdBus.getParentData('getPagesTree'),
+      },
+      inline: false,
+    },
+    {
+      label: '收集手机号地址:', //label
+      ele: 'xd-select-pages-path', //package 名称
+      valueKey: 'phone_number_collect_url', //form[valueKey]
+      placeholder: '请选择收集手机号地址',
+      value: null,
+      setting: {
+        router: XdBus.getParentData('getPagesTree'),
+      },
+      inline: false,
+    },
+    {
+      label: '忘记密码跳转地址:', //label
+      ele: 'xd-select-pages-path', //package 名称
+      valueKey: 'forget_pwd_url', //form[valueKey]
+      placeholder: '请选择跳转地址',
+      value: null,
+      setting: {
+        router: XdBus.getParentData('getPagesTree'),
+      },
+      inline: false,
+    },
     {
       label: '是否展示忘记密码:', //label
       ele: 'xd-radio', //package 名称

package/src/components/JfbBaseLogin/JfbBaseLogin.vue

@@ -22,6 +22,9 @@
           />
         </view>
         <view class="login_types">
+          <!--#ifdef H5-->
+          <xd-button v-if="hasAuthLogin" type="primary" radius="10rpx" @click="doLoginAuth">快捷登录</xd-button>
+          <!-- #endif -->
           <!--#ifdef MP-->
           <xd-button
             v-if="hasAuthLogin"
@@ -68,7 +71,7 @@
             @click="setAccountLoginType('pwd')"
           >密码登录<text :style="{background: mainColor}"></text></view>
         </view>
-        
+
         <xd-form label-width="128"
           style="margin-top: 40rpx;"
           label-align="right"
@@ -141,109 +144,6 @@
           @click="toNotLoginHome"
         >暂不登录，去逛逛</view>
       </view>
-      <view
-        v-if="showStep == 3"
-        class="panel-forget-password"
-      >
-        <view class="form-group">
-          <view style="font-size: 36rpx;">请输入手机号</view>
-          <view style="font-size:26rpx;color: #A6A6A6;">为了您的账号安全，请先验证手机号</view>
-        </view>
-        <xd-form
-          label-width="120"
-          style="margin-top: 40rpx;"
-          label-align="right"
-          content-align="left"
-          :border="true"
-        >
-          <xd-form-item
-            label="手机号"
-            content-align="left"
-          >
-            <xd-form-input
-              v-model="resetForm.phone_number"
-              placeholder="请输入11位手机号"
-            />
-          </xd-form-item>
-          <xd-form-item
-            label="验证码"
-            content-align="left"
-          >
-            <view class="flex align-center">
-              <xd-form-input
-                v-model="resetForm.verification_code"
-                placeholder="请输入验证码"
-              />
-              <view
-                class="get_code"
-                @click="reGetCode"
-		style="{color:mainColor}"
-              >{{time ? time + '秒后获取':'获取验证码'}}</view>
-            </view>
-          </xd-form-item>
-        </xd-form>
-        <view class="form-group">
-          <xd-button
-            type="primary"
-            radius="10rpx"
-            @click="toResetPassword"
-          >确定</xd-button>
-        </view>
-        <view class="forget_tip">
-          <view>亲爱的用户，为了您的账户安全请联系管理员，或拨打客服热线</view>
-          <view class="contact_phone">400-800-9503</view>
-          <xd-button
-            type="primary"
-            style="width: 360rpx;"
-          >知道了</xd-button>
-        </view>
-      </view>
-      <view
-        v-if="showStep == 4"
-        class="panel-reset-password"
-      >
-        <view class="form-group">
-          <view style="font-size: 36rpx;">手机号{{resetForm.phone_number}}</view>
-          <view style="font-size:26rpx;color: #A6A6A6;">请输入新密码并牢记</view>
-        </view>
-        <xd-form
-          label-width="220rpx"
-          style="margin-top: 40rpx;"
-          label-align="right"
-          content-align="left"
-          :border="true"
-        >
-          <xd-form-item
-            label="输入新密码"
-            content-align="left"
-          >
-            <xd-form-input
-              v-model="resetForm.password"
-              type="password"
-              placeholder="请输入新密码"
-            />
-          </xd-form-item>
-          <xd-form-item
-            label="确认新密码"
-            content-align="left"
-          >
-            <view class="flex align-center">
-              <xd-form-input
-                v-model="resetForm.confirm_password"
-                type="password"
-                placeholder="请再次输入新密码"
-              />
-            </view>
-          </xd-form-item>
-        </xd-form>
-        <view class="form-group">
-          <xd-button
-            type="primary"
-            radius="10rpx"
-            @click="doResetPassword"
-          >确定</xd-button>
-        </view>
-      </view>
     </view>
   </view>
 </template>
@@ -305,7 +205,12 @@
           "account": "用户登录",
           "dingding": "钉钉登录"
         },
-        quickLogin: null
+        quickLogin: null,
+        redirect_url: "", //401回跳地址
+        callback_url: "", //面板配置登录完跳转地址
+        phone_number_login_url: "", //授权登录后的手机登录地址
+        phone_number_collect_url: "", //授权登录后的手机号手机地址
+        forget_pwd_url: "", //忘记密码跳转地址
       }
     },
     computed: {
@@ -322,23 +227,35 @@
     created() {
       this.init(this.container);
       //todo
-      // this.p_getListProviders();
     },
     
     methods: {
+      onJfbLoad(options) {
+        this.redirect_url = options.redirect_url;
+        this.p_getListProviders();
+      },
       init(value) {
-        console.log("init: ", value);
-        console.log("content", value.component.props.content);
+        this.callback_url = getContainerPropsValue(value, 'content.callback_url').value;
+        this.phone_number_login_url = getContainerPropsValue(value, 'content.phone_number_login_url').value;
+        this.phone_number_collect_url = getContainerPropsValue(value, 'content.phone_number_collect_url').value;
+        this.forget_pwd_url = getContainerPropsValue(value, 'content.forget_pwd_url').value;
       },
       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: 'http://sandbox-editx.jufubao.cn/editx',
-            phone_number_login_url: 'http://sandbox-editx.jufubao.cn/editx',
-            phone_number_collect_url: 'http://sandbox-editx.jufubao.cn/editx'
+            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){
@@ -435,7 +352,6 @@
               verification_code
             },
           }).then(res => {
-            // location.href = this.phoneLogin.redirect_url;
             this.toHomeAfterLogin();
           })
         }else if(accountLoginType == "pwd"){
@@ -447,70 +363,42 @@
               password: password
             }
           }).then(res => {
-            // location.href = this.pwdLogin.redirect_url;
             this.toHomeAfterLogin();
           })
         }
 
       },
       toHomeAfterLogin(){
-        let {redirect_url} = this.$route.query;
+        let {redirect_url, callback_url} = this;
         if(redirect_url) redirect_url = decodeURIComponent(redirect_url);
-        redirect_url = redirect_url || this.settings.index;
         this.$xdUniHelper.redirectTo({
-          url: redirect_url
+          url: redirect_url || callback_url || this.settings.index
         })
       },
-      
+
       //暂不登录， 去逛逛
       toNotLoginHome(){
         //location.href = not_login_home_url;
       },
-      //验证手机号通过 -> 去重新设置密码
-      toResetPassword(){
-        this.showStep = 4;
-        // const {verification_code, phone_number} = this.resetForm;
-        // jfbRootExec('verifyPhoneCode', {
-        //   vm: this,
-        //   data: {
-        //     verification_code,
-        //     phone_number
-        //   }
-        // }).then(res => {
-        //   this.showStep = 4;
-        // })
 
-      },
-      //接口重设密码
-      doResetPassword(){
-        jfbRootExec("forgetPwd", {
-          vm: this,
-          data: this.resetForm
-        }).then(res => {
-          //重新设置成功
-        })
-
-      },
       //跳转验证手机号页面
       toValidPhone(){
-        this.showStep = 3;
-      },
-      onJfbLoad(options) {
-        console.log('event.onJfbLoad');
-        this.p_getListProviders();
-      },
-      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)
+        this.$xdUniHelper.navigateTo({
+          url: this.forget_pwd_url
+        })
       },
+      // 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);
         if(this.showStep > 1) this.showStep--;

package/src/components/JfbBaseLoginForgetPwd/Api.js

@@ -0,0 +1,36 @@
+'use strict';
+
+/**
+ * @description API模型
+ * 建议：Ffff=>模块  Xxxx=>自定义名字
+ * 获取单记录(getByIdFfffXxxx)
+ * 获取列表记录(getByListFfffXxxx)
+ * 添加列表记录(addFfffXxxxx)
+ * 删除列表记录(removeFfffXxxxx|deleteFfffXxxx)
+ * 更新列表记录(updateFfffXxxxx)
+ * @type {*[]}
+ */
+module.exports = [
+  {
+    mapFnName: 'sendMsg',
+    title: '发送验证码',
+    path: '/common/v1/valid_code/sms/send',
+    isRule: false,
+    data: {
+      phone_number: ['手机号', 'String', '必选'],
+      biz_name: ['业务名称', 'String', '必选']
+    },
+    isConsole: true,
+    disabled: true,
+  },
+  {
+    mapFnName: "verifyPhoneCode",
+    title: "验证手机验证码",
+    path: "/passport/v1/user/check-forget-password-verification-code",
+    isRule: false,
+    params: {
+      phone_number: ['手机号', 'String', '必填'],
+      verification_code: ['验证码', 'String', 'false']
+    }
+  },
+];

package/src/components/JfbBaseLoginForgetPwd/Attr.js

@@ -0,0 +1,35 @@
+'use strict';
+
+export default {
+  style: [],
+  advanced: [],
+  content: [
+    {
+      label: '客服热线:', //label
+      ele: 'el-input', //package 名称
+      type: 'text',
+      valueKey: 'tell_hot', //form[valueKey]
+      value: '', //v-model
+      placeholder: '请输入客服电话号码',
+      classNmae: 'input40', //样式名称 //input100,input80,input70,input60,input50,input40,input30,input20,
+      rules: [
+        {
+          required: true,
+          message: '请输入客服电话号码',
+          trigger: 'blur'
+        },
+      ]
+    },
+    {
+      label: '重新设置密码地址:', //label
+      ele: 'xd-select-pages-path', //package 名称
+      valueKey: 'reset_pwd_url', //form[valueKey]
+      placeholder: '请选择跳转地址',
+      value: null,
+      setting: {
+        router: XdBus.getParentData('getPagesTree'),
+      },
+      inline: false,
+    },
+  ],
+}

package/src/components/JfbBaseLoginForgetPwd/JfbBaseLoginForgetPwd.vue

@@ -0,0 +1,245 @@
+<template>
+  <view
+    class="jfb-base-login-forget-pwd"
+    @click="handleSelect"
+    :class="{ editx : isEditx && active }"
+  >
+    <!--#ifdef H5-->
+    <view
+      class="jfb-base-login-forget-pwd__edit"
+      :class="{ editx : isEditx && active }"
+      v-if="isEditx && active"
+    >
+      <view class="jfb-base-login-forget-pwd__edit-icon" @click="delEdit">删除</view>
+    </view>
+    <!-- #endif -->
+    <view class="jfb-base-login-forget-pwd__body">
+      <view
+        class="panel-forget-password"
+      >
+        <view class="form-group">
+          <view style="font-size: 36rpx;">请输入手机号</view>
+          <view style="font-size:26rpx;color: #A6A6A6;">为了您的账号安全，请先验证手机号</view>
+        </view>
+        <xd-form
+          label-width="126"
+          style="margin-top: 40rpx;"
+          label-align="right"
+          content-align="left"
+          :border="true"
+        >
+          <xd-form-item
+            label="手机号"
+            content-align="left"
+          >
+            <xd-form-input
+              v-model="resetForm.phone_number"
+              placeholder="请输入11位手机号"
+            />
+          </xd-form-item>
+          <xd-form-item
+            label="验证码"
+            content-align="left"
+          >
+            <view class="flex align-center">
+              <xd-form-input
+                v-model="resetForm.verification_code"
+                placeholder="请输入验证码"
+              />
+              <view
+                class="get_code"
+                @click="reGetCode"
+		            style="{color:mainColor}"
+              >{{time ? time + '秒后获取':'获取验证码'}}</view>
+            </view>
+          </xd-form-item>
+        </xd-form>
+        <view class="form-group">
+          <xd-button
+            type="primary"
+            radius="10rpx"
+            @click="toResetPassword"
+          >确定</xd-button>
+        </view>
+        <view class="forget_tip">
+          <view>亲爱的用户，为了您的账户安全请联系管理员，或拨打客服热线</view>
+          <view class="contact_phone">{{tell_hot}}</view>
+          <xd-button
+            type="primary"
+            style="width: 360rpx;"
+          >知道了</xd-button>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+  import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
+  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,
+      XdFormItem,
+      XdForm,
+      XdFormInput,
+      XdButton
+    },
+    mixins: [
+      JfbBaseLoginForgetPwdMixin
+    ],
+    data() {
+      return {
+        resetForm: {
+          phone_number: "",
+          verification_code: "",
+        },
+        time: 0,
+        interval: null,
+        tell_hot: "",
+        reset_pwd_url: "",
+        //todo
+      }
+    },
+    watch: {
+      container(value) {
+        this.init(value)
+      }
+    },
+    created() {
+      this.init(this.container);
+
+      //todo
+    },
+    methods: {
+      onJfbLoad(options) {
+
+      },
+      /**
+       * @description 监听事件变化
+       * @param container {object} 业务组件对象自己
+       */
+      init(value) {
+        this.tell_hot = getContainerPropsValue(value, 'content.tell_hot');
+        this.reset_pwd_url = getContainerPropsValue(value, 'content.reset_pwd_url').value;
+        //this.bgcolor = getContainerPropsValue(value, 'content.bgcolor', '#fff');
+        //this.height = getContainerPropsValue(value, 'content.height', 10);
+      },
+      reGetCode(){
+        if(this.time > 0) return;
+        const { phone_number } = this.resetForm;
+
+        jfbRootExec('sendMsg', {
+          vm: this,
+          data: {
+            phone_number,
+            biz_name: "passport-password"
+          }
+        }).then(res => {
+          this.time = 120;
+          this.interval = setInterval(() => {
+            this.time--;
+            if(this.time == 0){
+              clearTimeout(this.interval);
+            }
+          }, 1000)
+        })
+      },
+      toResetPassword(){
+        jfbRootExec("verifyPhoneCode", {
+          vm: this,
+          data: this.resetForm
+        }).then(res => {
+          this.$xdUniHelper.navigateTo({
+            url: this.reset_pwd_url + "?" + this.$xdUniHelper.jsonToParams(this.resetForm)
+          })
+        })
+      },
+      // 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)
+      // },
+    }
+  }
+
+</script>
+
+<style scoped lang="less">
+  @import "./JfbBaseLoginForgetPwdLess.less";
+
+  .jfb-base-login-forget-pwd {
+    &__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>