jufubao-base 1.0.146 → 1.0.148-beta1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.146",
+  "version": "1.0.148-beta1",
   "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/common/authorize.js

@@ -4,11 +4,15 @@
 import cookie from "@/common/cookie";
 //#endif
 import storage from "@/common/storage";
+
 const settings = require('./../../settings');
 import Vue from 'vue';
+
 let __jfbAuthorize = null;
 import store from "@/store";
 
+import {Base64} from 'js-base64';
+
 class JfbAuthorize {
   /**
    * @description 构造函数
@@ -18,20 +22,27 @@ class JfbAuthorize {
    * @param options.cardPath {String} 购物登录地址 【选填】
    * @param options.LoginPath  {String} 用户登录地址 【选填】
    */
-  constructor(options){
+  constructor(options) {
     this.siteId = options.siteId;
     this.xSite = options.xSite;
     this.cardPath = options.cardPath;
     this.LoginPath = options.LoginPath;
+    this.jumpToTimer = null;
+    this.maxTime = 10;
 
-    this.config = Object.assign({},{
+    this.config = Object.assign({}, {
       'user': 'JFB-CSRF-TOKEN-{siteID}',
       'card': 'JFB-CARD-TOKEN-{siteID}',
       'refresh': 'JFB-REFRESH-TOKEN-{siteID}',
       'access': 'JFB-ACCESS-TOKEN',
-    }, settings.token? settings.token: {});
+      'bizCode': 'JFB-CARD-CODE-{siteID}',
+      'userAll':'JFB-USER-ALL-{siteID}',
+    }, settings.token ? settings.token : {});
   }
 
+  doMain() {
+    return [''].concat(window.location.host.split('.').slice(-2)).join('.');
+  }
 
 
   /**
@@ -39,10 +50,10 @@ class JfbAuthorize {
    * @param key {String} {String} 设置cookie/storage键值，其值：card|user|refresh|access， 默认：user，【选填】
    * @returns {string|*}
    */
-  getTokenKeyword(key){
+  getTokenKeyword(key) {
     if (!this.config[key]) key = 'user';
-    if(key === 'access') return this.config.access;
-    else{
+    if (key === 'access') return this.config.access;
+    else {
       return `${this.config[key].replace("{siteID}", this.siteId)}`;
     }
   }
@@ -82,13 +93,16 @@ class JfbAuthorize {
    * @param options {Object} 可选项，{expires: 1, domain: ''}, 过期时间单位：小时
    */
   removeToken(key, options = {}) {
+    let codeKey =  this.getTokenKeyword('bizCode');
     key = this.getTokenKeyword(key);
     //#ifdef H5
     cookie.remove(key, options);
-    console.warn(`cookie.key=${key}`);
+    cookie.remove(codeKey, options);
+    cookie.remove(key, {domain: this.doMain()});
+    cookie.remove(codeKey, {domain: this.doMain()});
     //#endif
-    console.warn(`storage.key=${key}`);
     storage.remove(key);
+    storage.remove(codeKey);
   }
 
   /**
@@ -113,10 +127,10 @@ class JfbAuthorize {
    * @description h5中获取base
    * @param $vm {Vue}
    */
-  getBasePath($vm){
+  getBasePath($vm) {
     let base = '';
     //#ifdef H5
-    base =  $vm.$router.history.base;
+    base = $vm.$router.history.base;
     //#endif
     return base;
   }
@@ -124,8 +138,10 @@ class JfbAuthorize {
   /**
    * @description 跳转到卡登陆页面
    * @param $vm {Vue}
+   * @param callbackUrl {String} 返回参数
    */
-  jumpToCardLogin($vm){
+
+  jumpToCardLogin($vm, callbackUrl) {
     let redirect_url = '';
     if (store.state.configProject.platform === 'mp.weixin') {
       redirect_url = $vm['$xdUniHelper'].parseURL().source;
@@ -133,25 +149,87 @@ class JfbAuthorize {
     if (store.state.configProject.platform === 'h5') {
       redirect_url = $vm.$route.fullPath;
     }
+
+
+    //登陆地址与当前项目不再同一个app中处理
+    //#ifdef H5
+    if (!this.checkUrlIsCameDir(this.cardPath)) {
+      redirect_url = `@site_domain@/${store.state.brandInfo.deploy_dir}${redirect_url}`
+    }
+    //#endif
+
+    if (callbackUrl) redirect_url = callbackUrl;
+
+    if (!this.cardPath) {
+      console.error(this.cardPath);
+      $vm.$xdAlert({
+        content: "请设置卡登陆页面地址"
+      })
+      throw new Error('请设置卡登陆页面地址');
+    }
+
+    //设置页面过滤卡
+    let business_code = '';
+    if(store.state.pageBusinessCode) {
+      business_code = `&jfb_business_code=${store.state.pageBusinessCode}`;
+    }
+
     $vm['$xdUniHelper'].redirectTo({
-      url: this.cardPath + `?inCallback=${encodeURIComponent(redirect_url)}`,
+      url: this.cardPath + `?inCallback=${Base64.encodeURI(redirect_url)}${business_code}`,
     });
   }
 
+  checkUrlIsCameDir(url) {
+    url = url.replace('@site_domain@', '').split('/');
+    console.log('checkUrlIsCameDir', url)
+    console.log('checkUrlIsCameDir', store.state.brandInfo)
+    return url.length === 5 && url[1] === store.state.brandInfo.deploy_dir;
+  }
+
   /**
    * @description 跳转到用户登陆页面
    * @param $vm {Vue}
+   * @param isRedirect {boolean}
    */
-  jumpToUserLogin($vm) {
+  jumpToUserLogin($vm,isRedirect = true) {
     let redirect_url = '';
-    if(store.state.configProject.platform === 'mp.weixin') {
+    if (store.state.configProject.platform === 'mp.weixin') {
       redirect_url = $vm['$xdUniHelper'].parseURL().source;
     }
     if (store.state.configProject.platform === 'h5') {
       redirect_url = $vm.$route.fullPath;
     }
+    if(!isRedirect) redirect_url = '';
+
+    //#ifdef H5
+    //登陆地址与当前项目不再同一个app中处理
+    if(!this.checkUrlIsCameDir(this.LoginPath)) {
+      if(redirect_url) {
+        redirect_url = `@site_domain@/${store.state.brandInfo.deploy_dir}${redirect_url}`;
+      }
+      else {
+        redirect_url = `@site_domain@/${store.state.brandInfo.deploy_dir}/`;
+      }
+    }
+    //#endif
+
+    //判断是否有登陆地址
+    let LoginPath = redirect_url;
+    if (LoginPath.indexOf(this.LoginPath) === -1) {
+      LoginPath = this.LoginPath + `?redirect_url=${Base64.encodeURI(redirect_url)}`;
+    }
+
+    if (!this.LoginPath) {
+      console.error(this.LoginPath);
+      $vm.$xdAlert({
+        content: "请设置用户登陆页面地址"
+      })
+      throw new Error('请设置用户登陆页面地址');
+    }
+
+    console.warn(`jumpToUserLogin.redirect.url: ${redirect_url} , login: ${LoginPath}`)
     $vm['$xdUniHelper'].redirectTo({
-      url: this.LoginPath + `?redirect_url=${encodeURIComponent(redirect_url)}`,
+      url: LoginPath,
     });
   }
 
@@ -162,17 +240,55 @@ class JfbAuthorize {
    * @param isAutoJump {Boolean} 是否自己跳转 默认值：true
    * @return {boolean} true 已登陆或者免登 false 未登陆
    */
-  checkCardLogin(canCard = false, $vm, isAutoJump=true){
-    if(!canCard) return true;
+  checkCardLogin(canCard = false, $vm, isAutoJump = true) {
+    let isSpecialPages = $vm['isSpecialPages'];
+
+    //免卡登陆
+    if (!canCard) {
+      return true;
+    }
+
+
     if (!this.getToken('card')) {
-      if(isAutoJump) {
-        this.jumpToCardLogin($vm);
+      $vm.isCardLogined = false;
+      if (isAutoJump) {
+       //需要特殊处理，在设置强制卡的时候需要也可以免卡登陆模式，但是需要进行卡检查
+       if(isSpecialPages) return true;
+       else this.jumpToCardLogin($vm);
       }
       return false;
     }
+
+    //已登陆卡
+    $vm.isCardLogined = true;
     return true;
   }
 
+  checkLoginCardSupportBizCode(canCard = false, $vm, isAutoJump = true){
+    if (!canCard) return true;
+
+    //未获取业务线直接跳回卡登陆页面
+    let bizCode = this.getToken('bizCode')
+    if (!bizCode) {
+      if (isAutoJump) {
+        this.jumpToCardLogin($vm);
+      }
+      return false;
+    }
+    //
+    else{
+      let bizCodeArr = bizCode.split(',');
+      let currentBizCode = store.state.xnamespace;
+      if(bizCodeArr.includes(currentBizCode)) {
+        return true
+      }
+      if (isAutoJump) {
+        this.jumpToCardLogin($vm);
+      }
+      return false;
+    }
+  }
+
   /**
    * @description 用户已登录信息
    * @param canSign {Boolean} 检查是否用登录信息 默认：false
@@ -180,21 +296,34 @@ class JfbAuthorize {
    * @param isAutoJump {Boolean} 是否自己跳转 默认值：true
    * @return {Promise} true: 已登陆或者未启用，false：未登陆或刷新token已过期获取（从新交换token）
    */
-  checkUserLogin(canSign, $vm, isAutoJump=true) {
-    return new Promise((resolve, reject)=>{
+  checkUserLogin(canSign, $vm, isAutoJump = true) {
+    return new Promise((resolve, reject) => {
+      let isSpecialPages = $vm['isSpecialPages'];
+
       //免登陆操作
       if (!canSign) resolve(true);
 
-      //用户登陆判断
+      //用户登陆判断crf
       let userToken = this.getToken('user');
       //用户刷新token
       let refreshToken = this.getToken('refresh');
 
       //用户未登陆
-      if(!userToken && !refreshToken) {
+      if (!userToken && !refreshToken) {
+        $vm.isLogined = false;
+
+        //需要自动跳转到登陆页面
         if (isAutoJump) {
+          //需要特殊处理，在设置强制登陆的时候需要也可以免登陆模式，但是需要进行登陆检查
+          if(isSpecialPages){
+            resolve(true);
+            return
+          }
+
           this.jumpToUserLogin($vm);
+          return;
         }
+
         resolve(false);
         return
       }
@@ -202,31 +331,58 @@ class JfbAuthorize {
       //去刷新token
       if (!userToken) store.dispatch('userRefreshToken')
         .then(res => {
+          $vm.isLogined = true;
           resolve(true);
         })
-        .catch(error=>{
+        .catch(error => {
+          $vm.isLogined = false;
+
           if (isAutoJump) {
+            //需要特殊处理，在设置强制登陆的时候需要也可以免登陆模式，但是需要进行登陆检查
+            if(isSpecialPages){
+              resolve(true);
+              return
+            }
+
             this.jumpToUserLogin($vm);
+            return;
           }
+
           resolve(false);
         });
-      else{
+
+      //已登陆
+      else {
+        $vm.isLogined = true;
         resolve(true);
       }
     });
   }
 
+
+
   /**
    * @description 客户端设置所有token
    * @param result
    * @param cb {Function|null}
    */
-  setAllToken(result,cb = null){
+  setAllToken(result, cb = null) {
+
     //#ifdef MP-WEIXIN
-    this.setToken('user', result['csrf_token'], {expires: result['csrf_token_expire_in']/60/60});
+    if(result['csrf_token_expire_in']) result['csrf_token_expire_in'] = Number(result['csrf_token_expire_in']);
+    if(result['access_token_expire_in']) result['access_token_expire_in'] = Number(result['access_token_expire_in']);
+    if(result['refresh_token_expire_in']) result['refresh_token_expire_in'] = Number(result['refresh_token_expire_in']);
+    this.setToken('user', result['csrf_token'], {expires: result['csrf_token_expire_in'] / 60 / 60});
     this.setToken('access', result['access_token'], {expires: result['access_token_expire_in'] / 60 / 60})
     this.setToken('refresh', result['refresh_token'], {expires: result['refresh_token_expire_in'] / 60 / 60})
-    if(typeof cb === 'function') cb();
+    this.setToken('userAll',result,{expires: result['csrf_token_expire_in'] / 60 / 60})
+    if (typeof cb === 'function') cb();
+    //#endif
+  }
+
+  setCardToken(result,cb){
+    //#ifdef MP-WEIXIN
+    if (typeof cb === 'function') cb();
     //#endif
   }
 
@@ -234,14 +390,12 @@ class JfbAuthorize {
    * @description 客户端删除所有token
    * @param cb {Function|null}
    */
-  removeAllToken(cb=null){
+  removeAllToken(cb = null) {
     //#ifdef MP-WEIXIN
     this.removeToken('user');
     this.removeToken('access');
     this.removeToken('refresh');
-    if (store.state.jfbAuthorize !== null) {
-      store.state.jfbAuthorize.setAllToken(res)
-    }
+    this.removeToken('userAll');
     //#endif
   }
 }
@@ -254,7 +408,7 @@ class JfbAuthorize {
  * @param options.LoginPath  {String} 用户登录地址 【选填】
  */
 export default function (options) {
-  if(__jfbAuthorize !== null) return __jfbAuthorize;
+  if (__jfbAuthorize !== null) return __jfbAuthorize;
   return __jfbAuthorize = new JfbAuthorize(options);
 }
 

package/src/components/JfbBaseAfterOrderList/JfbBaseAfterOrderList.vue

@@ -394,7 +394,7 @@ export default {
             flex: none;
           }
         }
-        & > :last-child{
+        & > view:last-child{
           .skeleton-wrap &{
             .skeleton-item(300rpx);
           }

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,
@@ -442,7 +442,7 @@ export default {
         uni.scanCode({
           scanType: ["qrCode"],
           success: (res) => {
-            let path = this.getUrlCallback(`${this.confirmUrl}?qrcode=${encodeURIComponent(res.resultStr)}`)
+            let path = this.getUrlCallback(`${this.confirmUrl}?qrcode=${encodeURIComponent(res.result)}`)
             this.$xdUniHelper.navigateTo({
               url: path,
             });
@@ -490,9 +490,10 @@ export default {
             this.$xdHideLoading();
             //#ifdef MP-WEIXIN
             if (this.jfbAuthorize !== null) {
-              this.jfbAuthorize.setToken("card", res["card_token"], {
-                expires: res["card_expire_in"] / 60 / 60,
-              });
+              this.jfbAuthorize.setCardToken(res);
+              // this.jfbAuthorize.setToken("card", res["card_token"], {
+              //   expires: res["card_expire_in"] / 60 / 60,
+              // });
             }
             //#endif
 

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/JfbBaseCardDetailEntry/JfbBaseCardDetailEntry.vue

@@ -367,9 +367,7 @@ export default {
             this.$xdHideLoading();
             //#ifdef MP-WEIXIN
             if (this.jfbAuthorize !== null) {
-              this.jfbAuthorize.setToken("card", res["card_token"], {
-                expires: res["card_expire_in"] / 60 / 60,
-              });
+              this.jfbAuthorize.setCardToken(res);
               this.handleToApp(entry);
             }
             //#endif

package/src/components/JfbBaseCardDisabled/JfbBaseCardDisabled.vue

@@ -121,7 +121,7 @@ export default {
   },
   created() {
     this.init(this.container);
-    
+
   },
   methods: {
     onJfbLoad(options) {
@@ -195,9 +195,9 @@ export default {
      * @param container {object} 业务组件对象自己
      */
     init(container) {},
-    
+
     onJfbBack(options) {
-      console.log("event.onJfbBack", options);
+      this.$xdUniHelper.navigateBack();
     },
   },
 };

package/src/components/JfbBaseCardDisabledEntry/JfbBaseCardDisabledEntry.vue

@@ -41,7 +41,7 @@
                 <div class="card-list__content">
                   <view>
                     <text>券号：</text>
-                    <text>{{item.card_number}}</text>
+                    <text>{{item.card_number}}{{isShowIndex?`--${item.index}`:''}}</text>
                   </view>
                 </div>
                 <view class="card-list__date">
@@ -169,8 +169,8 @@ export default {
   mixins: [componentsMixins, extsMixins, JfbBaseCardDisabledEntryMixin, colorCardMixins, cardListMixins],
   data() {
     return {
-      disableList: [],
-      isShowUnbind: false
+      isShowUnbind: false,
+      isShowIndex:false,
     };
   },
   computed:{
@@ -191,9 +191,11 @@ export default {
   },
   methods: {
     onJfbLoad(options) {
+      this.isShowIndex = options['show_index'] === '1';
       this.getCardList();
     },
 
+
     getCardList() {
       this.$xdShowLoading({});
       jfbRootExec("getDisableCardListEntry", {vm: this, data: {is_all: "Y", is_show_entry_settings: 'Y'},})
@@ -233,14 +235,16 @@ export default {
         vm: this,
         success: (res) => {
           if (res.confirm) {
-            let cardIds = this.disableList.map(item=>{
+            let cardIds = this.cardOrgList.map(item=>{
               return item.card_number + ''
             });
+            debugger
             jfbRootExec("batchDisabledCardUnbindEntry", {vm: this, data: {card_numbers: cardIds.join(','),},})
               .then((res) => {
                 this.$xdAlert({
                   content: "全部失效票券已解绑",
                   close: () => {
+                    this.clearData();
                     this.getCardList();
                   },
                 });
@@ -275,6 +279,7 @@ export default {
                 this.$xdAlert({
                   content: "票券已解绑",
                   close: () => {
+                    this.clearData();
                     this.getCardList();
                   },
                 });
@@ -295,7 +300,7 @@ export default {
     init(container) {},
 
     onJfbBack(options) {
-      console.log("event.onJfbBack", options);
+      this.$xdUniHelper.navigateBack();
     },
 
   },