jufubao-base 1.0.219 → 1.0.220-beta2

package/package.json

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

package/src/components/JfbBasePhoneLogin/Api.js

@@ -38,4 +38,29 @@ module.exports = [
     isConsole: true,
     disabled: true,
   },
+  {
+    mapFnName: "checkSendStatus",
+    path: "/common/v1/valid_code/sms/check-send-status",
+    title: "校验验证码发送状态",
+    isRule: false,
+    data: {
+      phone_number: ['手机号', 'String', '必选'],
+      biz_name: ['业务名称', 'String', '必选']
+    },
+    isConsole: true,
+    disabled: true,
+  },
+  {
+    mapFnName: "loginJumpPhone",
+    path: "/passport/v1/user/login-jump-phone",
+    title: "授权登录（跳过手机号验证码）",
+    isRule: false,
+    data: {
+      phone_number: ['手机号', 'String', '必选'],
+      provider_id: ['登录方式id', 'Number', '必选'],
+      auth_code: ['临时授权码', 'String', '否'],
+    },
+    isConsole: true,
+    disabled: true,
+  }
 ];

package/src/components/JfbBasePhoneLogin/JfbBasePhoneLogin.vue

@@ -41,6 +41,7 @@
             '--placeholder-font-color': placeholderFont.color,
             '--placeholder-font-weight': placeholderFont.fontWeight,
             'margin-top': '40rpx',
+            '--main-color': mainColor,
           }"
         >
           <xd-form-item
@@ -131,6 +132,30 @@
           @click="toNotLoginHome"
         >暂不登录，去逛逛</view> -->
       </view>
+      <xd-dialog :show.sync="showDialog"
+        :showClose="false"
+        maskAutoClose
+        :showTitle="false">
+        <view class="p_dialog_content">
+          <view class="">
+            <xd-font-icon icon="iconmingchengtubiao" :size="48" color="#666"></xd-font-icon>
+          </view>
+          <view class="cont_text">检测到短信发送异常<br/>是否跳过手机号收集？</view>
+        </view>
+        <view slot="btn" class="btn_foot" style="background-color: #DDD;">
+          <view class="btn_item" :style="{
+            backgroundColor: '#FFF',
+          }"
+          @click="p_loginNotJump"
+          >不跳过</view>
+          <view class="btn_item" :style="{
+            backgroundColor: mainColor,
+            color: '#FFF'
+          }"
+          @click="p_loginJumpPhone"
+          >跳过</view>
+        </view>
+      </xd-dialog>
     </view>
   </view>
 </template>
@@ -147,6 +172,7 @@ import XdForm from "@/components/XdForm/XdForm";
 import XdFormInput from "@/components/XdFormInput/XdFormInput";
 import XdButton from "@/components/XdButton/XdButton";
 import XdFormCheckbox from "@/components/XdFormCheckbox/XdFormCheckbox";
+import XdDialog from "@/components/XdDailog/XdDailog";
 //#ifdef H5
 import cookie from "@/common/cookie";
 //#endif
@@ -164,6 +190,7 @@ export default {
     XdFormInput,
     XdButton,
     XdFormCheckbox,
+    XdDialog
   },
   mixins: [componentsMixins, extsMixins, JfbBasePhoneLoginMixin],
   data() {
@@ -179,6 +206,7 @@ export default {
       provider_id: "",
       callback_url: "",
       isCollectUsername: false,
+      showDialog: false,
 
       inputStyle: "linear", //输入框样式 linear:线性  face: 面性
       formBorderColor: "#F9F9F9", //
@@ -493,6 +521,7 @@ export default {
         },
       })
         .then((res) => {
+          this.p_checkSendStatus(phone_number);
           this.$xdHideLoading();
           this.jfbTimeer = 120;
           this.interval = setInterval(() => {
@@ -507,6 +536,44 @@ export default {
           this.$xdLog.catch(error);
         });
     },
+    p_checkSendStatus(phone_number){
+      jfbRootExec("checkSendStatus", {
+        vm: this,
+        data: {
+          phone_number
+        }
+      }).then(res => {
+        if(res.is_jump === 'Y'){
+          this.showDialog = true;
+        }
+      })
+    },
+    p_loginNotJump(){
+      this.showDialog = false;
+    },
+    p_loginJumpPhone(){
+      const { auth_code, provider_id } = this;
+      const { phone_number } = this.accountForm;
+      this.$xdShowLoading({});
+      jfbRootExec("loginJumpPhone", {
+        vm: this,
+        data: {
+          auth_code,
+          provider_id,
+          phone_number,
+        }
+      }).then(res => {
+        this.$xdHideLoading();
+        let { callback_url } = this;
+        if (callback_url) callback_url = decodeURIComponent(callback_url);
+        this.$xdUniHelper.redirectTo({
+          url: callback_url || this.settings.index,
+        });
+      }).catch((error) => {
+        this.$xdHideLoading();
+        this.$xdLog.catch(error);
+      });
+    },
     doLoginForm() {
       const { auth_code, provider_id } = this;
       const { phone_number, verification_code, user_name } = this.accountForm;
@@ -564,6 +631,35 @@ export default {
 
 .jfb-base-phone-login {
   &__body {
+    ::v-deep .xd-dailog__body-content{
+      padding: 2rpx;
+      overflow: hidden;
+    }
+    .p_dialog_content{
+      padding: 100rpx 0rpx;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      .cont_text{
+        text-align: left;
+        margin-left: 12rpx;
+        font-size: 32rpx;
+        color: #333;
+      }
+    }
+    .btn_foot{
+      width: 100%;
+      display: flex;
+      .btn_item{
+        flex: 1;
+        border: 1px solid #E5E5E5;
+        height: 96rpx;
+        line-height: 96rpx;
+        text-align: center;
+        font-size: 32rpx;
+      }
+    }
+  
       // #ifdef H5
     .form-item {
       ::v-deep &.uni-forms-item {