jufubao-base 1.0.145-beta2 → 1.0.145-beta4

package/package.json

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

package/src/common/ICB.SDK.js

@@ -0,0 +1,78 @@
+'use strict';
+
+const ICB_SDK = require('@/common/paysdk/ICB.SDK');
+
+class ICB {
+  constructor() {
+    this.ICB_APP = ICB_SDK;
+    this.fail(false)
+  }
+
+  /**
+   * @description 获取版本号
+   * @return {*}
+   */
+  version(){
+    return this.ICB_APP.elifeVer()
+  }
+
+  fail(notExc=true){
+    // if(typeof window.WebViewJavascriptBridge === "undefined"){
+    //   console.warn('初始化工商银行e生活SDK失败');
+    //   if(notExc) throw new Error('初始化工商银行e生活SDK失败');
+    // }
+  }
+
+  /**
+   * @description 获取用户登录方式
+   * @param callback {Function} 成功回调函数
+   */
+  login(callback){
+    this.fail();
+
+    this.ICB_APP.merLogin(callback)
+  }
+
+  /**
+   * @description 第三方显示或隐藏tabBar
+   * @param show 默认值：true
+   */
+  showBar(show = true){
+    this.fail();
+    this.ICB_APP.showToolBar(show);
+  }
+
+  /**
+   * @description 第三方返回APP
+   */
+  back(){
+    this.fail();
+    this.ICB_APP.back();
+  }
+
+  /**
+   * @description 拨打电话
+   * @param tel 电话号码
+   */
+  callPhone(tel){
+    if(!tel){
+      console.warn(`拨打电话号码不能为空,电话号码:${tel}`);
+      throw new Error('拨打电话号码不能为空');
+    }
+    this.fail();
+    this.ICB_APP.callPhoneNumber(tel);
+  }
+
+  /**
+   * @description 是否隐藏第三方的头
+   * @param show
+   */
+  showThirdNavigation(show = true){
+    this.fail();
+    if(show) this.ICB_APP.showThirdWebviewNavigation()
+    else  this.ICB_APP.hideThirdWebviewNavigation()
+  }
+
+}
+
+module.exports = new ICB();

package/src/components/JfbBaseCard/JfbBaseCard.vue

@@ -18,7 +18,7 @@
     <!-- #endif -->
     <view class="jfb-base-card__body">
       <view class="jfb-base-card__body-cut">
-        <template v-if="isWx">
+        <template v-if="isQrCode">
           <view
             class="jfb-base-card__body-cut-item"
             @click="handleScan"
@@ -226,10 +226,11 @@ import JfbBaseCardMixin from "./JfbBaseCardMixin";
 import componentsMixins from "@/mixins/componentsMixins";
 import extsMixins from "@/mixins/extsMixins";
 import { mapState, mapActions } from "vuex";
-import { getContainerPropsValue, isWechat } from "@/utils/xd.base";
+import { getContainerPropsValue, isWechat,isQrCode } from "@/utils/xd.base";
 import XdNoticeBar from "@/components/XdNoticeBar/XdNoticeBar";
 import { Base64 } from "js-base64";
 const Color = require("color");
+
 export default {
   name: "JfbBaseCard",
   components: {
@@ -293,7 +294,7 @@ export default {
       isPreview: false,
       noticeStatus: false,
 
-      isWx: true,
+      isQrCode: true,
       cutIndex: 1,
       tabIndex: 1,
       offsetIndex:0,//第几页
@@ -340,10 +341,9 @@ export default {
     this.init(this.container);
     this.noticeBackgroundColor = Color(this.warningColor).alpha(0.2).toString();
     this.isPreview = this.$configProject.isPreview;
+    this.isQrCode = isQrCode(this);
 
     //#ifdef H5
-    this.isWx = this.isPreview || isWechat();
-
     if (!this.$configProject.isPreview) {
       jfbRootExec("getH5WxAuthorize", {
         vm: this,

package/src/components/JfbBaseCardBindV2/JfbBaseCardBindV2.vue

@@ -21,6 +21,7 @@
             <view
               class="scan_icon"
               @click="doScanCode"
+              v-if="isQrCode"
             >
               <xd-font-icon icon="iconsaoma1"></xd-font-icon>
             </view>
@@ -58,7 +59,7 @@
   import XdButton from "@/components/XdButton/XdButton"
   import { jfbRootExec } from "@/utils/xd.event";
   import JfbBaseCardBindV2Mixin from "./JfbBaseCardBindV2Mixin";
-  import { getContainerPropsValue } from "@/utils/xd.base";
+  import { getContainerPropsValue,isQrCode } from "@/utils/xd.base";
   import componentsMixins from "@/mixins/componentsMixins";
   import extsMixins from "@/mixins/extsMixins";
   import { mapState } from "vuex"
@@ -91,6 +92,7 @@
         validImageAPIUrl: "",
         backUrl: "",
         inCallbackUrlOrg:'',//是否带有回调地址
+        isQrCode: false,
       }
     },
     watch: {
@@ -99,6 +101,7 @@
       }
     },
     created() {
+      this.isQrCode = isQrCode(this)
       this.init(this.container);
       this.validImageAPIUrl = this.brandInfo['api_host'] + '/common/v1/valid_code/image/show'
 
@@ -176,7 +179,6 @@
           success: res => {
             let result = res.resultStr;
             this.cardForm.card_qrcode = result;
-
             jfbRootExec("qrCardBind", {
               vm: this,
               data: {

package/src/components/JfbBaseCardEntry/JfbBaseCardEntry.vue

@@ -18,7 +18,7 @@
     <!-- #endif -->
     <view class="jfb-base-card-entry__body">
       <view class="jfb-base-card-entry__body-cut">
-        <template v-if="isWx">
+        <template v-if="isQrCode">
           <view
             class="jfb-base-card-entry__body-cut-item"
             @click="handleScan"
@@ -383,7 +383,7 @@ import extsMixins from "@/mixins/extsMixins";
 import colorCardMixins from "@/mixins/colorCardMixins";
 import cardListMixins from "@/mixins/cardListMixins";
 import { mapState, mapActions } from "vuex";
-import { getContainerPropsValue, isWechat } from "@/utils/xd.base";
+import { getContainerPropsValue, isWechat,isQrCode } from "@/utils/xd.base";
 import XdNoticeBar from "@/components/XdNoticeBar/XdNoticeBar";
 import { Base64 } from "js-base64";
 const Color = require("color");
@@ -434,7 +434,6 @@ export default {
       noticeStatus: false,
       loadingCardList: true,
 
-      isWx: true,
       cutIndex: 1,
       tabIndex: 1,
       isBack: null, //是否使用返回键
@@ -454,6 +453,7 @@ export default {
       showDisabled: 'Y',
       showCardList: false,
       showIndex:false,
+      isQrCode: false,
 
       //活动
       dialogEvent: false,
@@ -466,7 +466,7 @@ export default {
     this.isPreview = this.$configProject.isPreview;
 
     //#ifdef H5
-    this.isWx = this.isPreview || isWechat();
+    this.isQrCode = isQrCode(this);
     if (!this.$configProject.isPreview) {
       jfbRootExec("getH5WxAuthorize", {
         vm: this,

package/src/components/JfbBaseLogin/Api.js

@@ -23,6 +23,18 @@ module.exports = [
       phone_number_collect_url: ['收集手机号地址', 'String', '是'],
     }
   },
+  {
+    mapFnName: 'userBaseLoginIcb',
+    title: '工行e生活登录',
+    path: '/passport/v1/user/login-icbc',
+    isRule: false,
+    data: {
+      encrypted_params: ['用户登录信息', 'String', '必选'],
+      provider_id: ['登录方式id', 'Number', '必选'],
+    },
+    isConsole: true,
+    disabled: true,
+  },
   {
     mapFnName: 'phoneLogin',
     title: "手机号登录",

package/src/components/JfbBaseLogin/JfbBaseLogin.vue

@@ -30,8 +30,7 @@
             type="primary"
             radius="20rpx"
             @click="doLoginAuth"
-            >快捷登录</xd-button
-          >
+            >{{h5FastLoginName}}</xd-button>
           <!-- #endif -->
           <!--#ifdef MP-->
           <xd-button
@@ -50,8 +49,7 @@
               type="primary"
               radius="20rpx"
               @click="doLoginAccount"
-              >账号登录
-            </xd-button>
+              >账号登录</xd-button>
           </view>
 
           <view class="protocol">
@@ -217,7 +215,9 @@ import {
   getAllPath,
   getDomainAllPath,
   getLocalJumpOutSiteCallbackUrl,
+  isThirdLogin
 } from "@/utils/xd.base";
+import icb from "@/common/ICB.SDK";
 
 export default {
   name: "JfbBaseLogin",
@@ -236,6 +236,7 @@ export default {
       //体验模式
       dialogPreview: false,
       previewAccout: '',
+      h5FastLoginName:'快捷登录',
 
       showStep: 1,
       panel_1_checked: "",
@@ -286,7 +287,7 @@ export default {
     };
   },
   computed: {
-    ...mapState(["jfbAuthorize","siteInfo"]),
+    ...mapState(["jfbAuthorize","siteInfo",'loginParams']),
     panelIsChecked() {
       return this.panel_1_checked.includes(1);
     },
@@ -316,7 +317,7 @@ export default {
     this.init(this.container);
     this.base = this.jfbAuthorize.getBasePath(this);
     this.site_logo = getServiceUrl(this.projectAttr["site_logo"]);
-    this.$xdLog.setProject('JfbBaseLogin', 'JfbBaseLogin.create.done')
+    this.$xdLog.setProject('JfbBaseLogin', 'JfbBaseLogin.create.done');
   },
 
   methods: {
@@ -362,35 +363,20 @@ export default {
 
 
     onJfbLoad(options) {
+      this.$xdLog.setProject('JfbBaseLogin', 'JfbBaseLogin.onJfbLoad.start')
       this.redirect_url = options.redirect_url ? Base64.decode(options.redirect_url): '';
       this.isDebugPreview = options['x-test'] === 'jfb-tiyan';
       // #ifdef MP-WEIXIN
       this.authWxMpListProviders();
       // #endif
-      this.$xdLog.setProject('JfbBaseLogin', 'JfbBaseLogin.onJfbLoad.start')
+
       // #ifdef H5
-      try{
-        this.authH5ListProviders();
-      }catch (error) {
+      try{ this.authH5ListProviders();}
+      catch (error) {
         this.$xdLog.setProject('JfbBaseLogin', 'JfbBaseLogin.onJfbLoad.error');
         this.$xdLog.setARMSError(error);
       }
       //#endif
-
-      // if (options.isDebug === "1") {
-      //   getAllPath(this, "main/play/index");
-      //   getDomainAllPath(this, "main/play/index");
-      //   getLocalJumpOutSiteCallbackUrl(
-      //     this,
-      //     { customParams: 1 },
-      //     false,
-      //     "main/play/index"
-      //   );
-      //
-      //   getAllPath(this);
-      //   getDomainAllPath(this);
-      //   getLocalJumpOutSiteCallbackUrl(this, { customParams: 1 }, false);
-      // }
     },
 
     /**
@@ -425,6 +411,11 @@ export default {
       if (res.quick_enabled) {
         this.hasAuthLogin = true;
         this.quickLogin = res.quick;
+
+        //工行处理
+        if(this.quickLogin.login_platform_code === 'icbc') {
+          this.h5FastLoginName = '工银e生活登录'
+        }
       }
       if (res.others.length > 0) {
         this.hasAccountLogin = true;
@@ -485,8 +476,7 @@ export default {
               //需要授权操作
               if (res.auth_code) {
                 let { redirect_url, callback_url } = this;
-                if (redirect_url)
-                  redirect_url = redirect_url;
+                if (redirect_url) redirect_url = redirect_url;
                 let url = Base64.encodeURI(
                   redirect_url || callback_url || this.settings.index
                 );
@@ -550,12 +540,12 @@ export default {
       };
 
       this.$xdLog.setProject('JfbBaseLogin', 'JfbBaseLogin.onJfbLoad.loading..');
-
       jfbRootExec("listSiteProvider", {
         vm: this,
         data: params,
       })
         .then((res) => {
+          console.log('listSiteProvider',res)
           this.handleAuthResult(res);
         })
         .catch((error) => {
@@ -603,12 +593,59 @@ export default {
     setAccountLoginType(type) {
       this.accountLoginType = type;
     },
+
+    /**
+     * @description 工行e生活处理
+     */
+    icbcLogin(){
+      //无三方用户登录信息
+      if(!this.loginParams) {
+        this.status = false;
+        console.warn(`无三方用户登录信息`);
+        throw new Error('无三方用户登录信息');
+      }
+
+      console.warn(`LoginParams.use: ${this.loginParams}`)
+      this.$xdShowLoading({});
+      jfbRootExec("userBaseLoginIcb", {
+        vm: this,
+        data:{
+          encrypted_params: this.loginParams,
+          provider_id: this.quickLogin.provider_id
+        },
+      })
+        .then(res=>{
+          this.$xdHideLoading();
+          this.$xdUniHelper.redirectTo({
+            url:  this.redirect_url || this.$settings.index,
+          },false, true);
+        })
+        .catch(err=>{
+          this.$xdHideLoading();
+          console.error(err);
+        })
+    },
+
     //h5授权登录
     doLoginAuth() {
       if(this.isFastLoginStatus) return;
       this.isFastLoginStatus = true;
-      const { provider_id, login_platform_code, is_redirect, redirect_url } = this.quickLogin;
-      location.href = redirect_url;
+
+      //工行处理
+      if(this.quickLogin && this.quickLogin.login_platform_code === 'icbc'){
+        window['ICBC_SDK']['merLogin']((res)=>{
+          console.log('ICBC_SDK',res);
+          this.icbcLogin(res)
+        })
+        return;
+      }
+
+      //跳转到第三方进行授权
+      if(this.quickLogin.is_redirect === 'Y') {
+        const { redirect_url } = this.quickLogin;
+        location.href = redirect_url;
+      }
+
     },
 
     //小程序授权登录
@@ -707,6 +744,7 @@ export default {
           });
       }
     },
+
     toHomeAfterLogin() {
       let { redirect_url, callback_url } = this;
       if (redirect_url) redirect_url = redirect_url;