jufubao-base 1.0.25 → 1.0.26

package/package.json

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

package/src/components/JfbBaseLogin/JfbBaseLogin.vue

@@ -278,6 +278,13 @@
       reGetCode(){
         if(this.time > 0) return;
         const { phone_number } = this.accountForm;
+        if(!/^1[3-9]\d{9}$/.test(phone_number)){
+          uni.showToast({
+            title: "请填写正确的手机号",
+            icon: 'none'
+          });
+          return false;
+        }
 
         console.log("jfbRootExec: sendMsg");
         jfbRootExec('sendMsg', {
@@ -342,6 +349,17 @@
       doLoginForm(){
         const { accountLoginType } = this;
         const { phone_number, verification_code, password } = this.accountForm;
+        let err_tip = "";
+        if(!phone_number) err_tip = "手机号不能为空";
+        else if(accountLoginType == "phone" && !verification_code) err_tip = "验证码不能为空";
+        else if(accountLoginType == "pwd" && !password) err_tip = "密码不能为空";
+        if(err_tip){
+          return uni.showToast({
+            title: err_tip,
+            icon: 'none'
+          })
+        }
+
         if(accountLoginType == "phone"){
           //表单接口登录
           jfbRootExec('phoneLogin', {

package/src/components/JfbBaseLoginForgetPwd/JfbBaseLoginForgetPwd.vue

@@ -136,6 +136,13 @@
       reGetCode(){
         if(this.time > 0) return;
         const { phone_number } = this.resetForm;
+        if(!/^1[3-9]\d{9}$/.test(phone_number)){
+          uni.showToast({
+            title: "请填写正确的手机号",
+            icon: 'none'
+          });
+          return false;
+        }
 
         jfbRootExec('sendMsg', {
           vm: this,
@@ -154,6 +161,13 @@
         })
       },
       toResetPassword(){
+        const { verification_code, phone_number } = this.resetForm;
+        if(!verification_code || !phone_number){
+          return uni.showToast({
+            title: "填写手机号跟验证码",
+            icon: 'none'
+          })
+        }
         jfbRootExec("verifyPhoneCode", {
           vm: this,
           data: this.resetForm
@@ -175,9 +189,9 @@
       // onJfbHide(options) {
       //   console.log('event.onJfbHide', options)
       // },
-      // onJfbBack(options) {
-      //   console.log('event.onJfbBack', options)
-      // },
+      onJfbBack(options) {
+        this.$xdUniHelper.navigateBack();
+      },
     }
   }
 

package/src/components/JfbBaseLoginSetPwd/JfbBaseLoginSetPwd.vue

@@ -130,6 +130,10 @@
         this.pwd_type = getContainerPropsValue(value, 'content.pwd_type');
       },
       doSetPassword(){
+        const { password, confirm_password } = this.resetForm;
+        if(!password || !confirm_password) return uni.showToast({title: "请输入密码",icon: 'none'});
+        if(password !== confirm_password) return uni.showToast({title: "密码不一致",icon: 'none'});
+
         let typeFn = "resetPwd"
         if(this.pwd_type == 1) typeFn = "setPwd"
         jfbRootExec(typeFn, {
@@ -141,20 +145,20 @@
           })
         })
       },
-      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)
-      },
+      // 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)
+        this.$xdUniHelper.navigateBack();
       },
     }
   }

package/src/components/JfbBasePhoneCollect/JfbBasePhoneCollect.vue

@@ -145,6 +145,13 @@
       reGetCode(){
         if(this.time > 0) return;
         const { phone_number } = this.accountForm;
+        if(!/^1[3-9]\d{9}$/.test(phone_number)){
+          uni.showToast({
+            title: "请填写正确的手机号",
+            icon: 'none'
+          });
+          return false;
+        }
 
         console.log("jfbRootExec: sendMsg");
         jfbRootExec('sendMsg', {
@@ -166,6 +173,8 @@
       doLoginForm(){
         const {  provider_id } = this;
         const { phone_number, verification_code } = this.accountForm;
+        if(!phone_number || !verification_code) return uni.showToast({title: "手机号跟验证码不能为空",icon: 'none'});
+        
         jfbRootExec('phoneCollect', {
           vm: this,
           data: {
@@ -193,9 +202,9 @@
       // onJfbHide(options) {
       //   console.log('event.onJfbHide', options)
       // },
-      // onJfbBack(options) {
-      //   console.log('event.onJfbBack', options)
-      // },
+      onJfbBack(options) {
+        this.$xdUniHelper.navigateBack();
+      },
     }
   }
 

package/src/components/JfbBasePhoneLogin/JfbBasePhoneLogin.vue

@@ -148,6 +148,13 @@
       reGetCode(){
         if(this.time > 0) return;
         const { phone_number } = this.accountForm;
+        if(!/^1[3-9]\d{9}$/.test(phone_number)){
+          uni.showToast({
+            title: "请填写正确的手机号",
+            icon: 'none'
+          });
+          return false;
+        }
 
         console.log("jfbRootExec: sendMsg");
         jfbRootExec('sendMsg', {
@@ -169,6 +176,7 @@
       doLoginForm(){
         const { auth_code, provider_id } = this;
         const { phone_number, verification_code } = this.accountForm;
+        if(!phone_number || !verification_code) return uni.showToast({title: "手机号跟验证码不能为空",icon: 'none'});
         jfbRootExec('phoneLogin', {
           vm: this,
           data: {
@@ -197,9 +205,9 @@
       // onJfbHide(options) {
       //   console.log('event.onJfbHide', options)
       // },
-      // onJfbBack(options) {
-      //   console.log('event.onJfbBack', options)
-      // },
+      onJfbBack(options) {
+        this.$xdUniHelper.navigateBack();
+      },
     }
   }
 

package/src/components/JfbBaseTestApi/JfbBaseTestApi.vue

@@ -14,19 +14,32 @@
     </view>
     <!-- #endif -->
     <view class="jfb-base-test-api__body">
-      <view>JfbBaseTestApi</view>
+      <view>
+        <xd-button @click="getUserStatus" type="primary">获取用户登陆状态</xd-button>
+      </view>
+      <view>
+        <xd-button @click="getCardStatus" type="primary">获取用户登陆卡状态</xd-button>
+      </view>
+      <view>
+        <xd-button @click="handleGetByIdCardDetail('101001000005193')" type="primary">获取登陆('101001000005193')</xd-button>
+      </view>
     </view>
   </view>
 </template>
 
 <script>
   import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
-  import { jfbRootExec } from "@/utils/xd.event";
+  import XdButton from "@/components/XdButton/XdButton";
+  import {
+    jfbRootExec,
+    jfbRootFnExec
+  } from "@/utils/xd.event";
   import JfbBaseTestApiMixin from "./JfbBaseTestApiMixin";
   export default {
     name: "JfbBaseTestApi",
     components: {
-      XdFontIcon
+      XdFontIcon,
+      XdButton
     },
     mixins: [
       JfbBaseTestApiMixin
@@ -39,23 +52,54 @@
     },
     created() {
 
-      //todo
+      console.log('created.api', this.pageAttr.permission['can_card'])
     },
     methods: {
       onJfbLoad(options) {
-        console.log('222')
-        jfbRootExec('getListBindCard', {
+      
+      
+      },
+      getUserStatus(){
+         jfbRootFnExec(this, 'checkLoginAndCardLogin')(
+           true,
+           'login',
+           false,//是否自动跳转到用户登陆页
+         )
+           .then(status=>{
+             console.log(status)
+           })
+           .catch(error=>{
+             console.log(error)
+           });
+      },
+      getCardStatus() {
+        jfbRootFnExec(this, 'checkLoginAndCardLogin')(
+          true || this.pageAttr.permission['can_card'], //是否免登陆
+          'card', //检查卡类型
+          false,//是否自动跳转到卡登陆页
+        )
+          .then(status => {
+            this.$xdHideLoading();
+            console.log(status)
+          })
+          .catch(error => {
+            console.log(error)
+          });
+      },
+      handleGetByIdCardDetail(number){
+        jfbRootExec('getByIdCardDetail', {
           vm: this,
           data: {
-            ...options
-          },
+            card_number: number,
+          }
         })
-          .then(res=>{
+          .then(res => {
             console.log(res)
           })
-          .catch()
-      },
-
+          .catch(err => {
+            console.error(err)
+          })
+      }
     }
   }
 
@@ -67,7 +111,7 @@
   .jfb-base-test-api {
     &__body{
       & > view {
-        height: unit(250, rpx);
+        margin: unit(20, rpx);
       }
     }
   }