jufubao-base 1.0.145-beta14 → 1.0.145-beta21

package/package.json

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

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

@@ -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/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/JfbBaseCardEntry/JfbBaseCardEntry.vue

@@ -592,9 +592,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/JfbBaseCardV2/JfbBaseCardV2.vue

@@ -226,9 +226,7 @@
             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);
             }
             //#endif
 

package/src/components/JfbBaseCardV3/JfbBaseCardV3.vue

@@ -175,9 +175,7 @@
               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);
               }
               //#endif
 

package/src/components/JfbBaseLogin/JfbBaseLogin.vue

@@ -477,11 +477,8 @@ export default {
           })
             .then((res) => {
               let { redirect_url, callback_url } = this;
-              if (redirect_url)
-                redirect_url = redirect_url;
-              let url = Base64.encodeURI(
-                redirect_url || callback_url || this.settings.index
-              );
+              //if (redirect_url) redirect_url = redirect_url;
+              let url = Base64.encodeURI(redirect_url || callback_url || this.settings.index);
               //需要授权操作
               if (res.auth_code) {
                 this.$xdUniHelper.navigateTo({
@@ -490,15 +487,15 @@ export default {
               }
               //无需授权直接进行登录
               else {
-
                 if (this.jfbAuthorize !== null) {
                   this.jfbAuthorize.setAllToken(res["login_info"], () => {
                     //需要收集手机号码
-                    if(res.is_collect_phone_number === 'Y'){
+                    if(res['is_collect_phone_number'] === 'Y'){
                       this.$xdUniHelper.navigateTo({
                         url: `${this.mpAuthPhoneUrl}?provider_id=${this.quickLogin.provider_id}&url=${url}`,
                       });
-                    }else{
+                    }
+                    else{
                       this.toHomeAfterLogin();
                     }
                   });
@@ -759,7 +756,6 @@ export default {
 
     toHomeAfterLogin() {
       let { redirect_url, callback_url } = this;
-      if (redirect_url) redirect_url = redirect_url;
       this.$xdUniHelper.redirectTo({
         url: redirect_url || callback_url || this.settings.index,
       });

package/src/components/JfbBasePay/JfbBasePay.vue

@@ -100,10 +100,7 @@
       <view class="remain_pay" v-if="payInfo.channel_amount > 0">
         <view style="border-bottom: 2rpx solid #eee;" class="column-group">
           <view class="column-item" style="padding: 30rpx 60rpx">
-            <view class="column_label">
-              仍需支付
-              <view class="label_sub">（可使用多张票券支付）</view>
-            </view>
+            <view class="column_label">仍需支付<text class="label_sub">（可使用多张票券支付）</text></view>
             <view class="column_value text-primary">
               <xd-unit
                 :price="payInfo.channel_amount"
@@ -135,31 +132,25 @@
             class="pay_item"
           >
             <view class="icon">
-              <xd-font-icon
-                v-if="item.channel_code == 'wxpay'"
-                icon="iconwx"
-                size="64"
-                color="#25bc46"
-              ></xd-font-icon>
+              <image mode="scaleToFill" :src="item['channel_logo']" style="height:64rpx; width: 64rpx" />
             </view>
             <view class="pay_name">{{ item.channel_provider_name }}</view>
             <xd-radio
               @change="(flat) => handlerPayCheck(item.channel_provider_id, flat)"
-              :value="channel_provider_id == item.channel_provider_id"
+              :value="channel_provider_id === item.channel_provider_id"
               size="mini"
             ></xd-radio>
           </view>
         </view>
       </view>
       <view class="bottom_btn-mask"></view>
-      <view v-if="is_can_pay=='Y'" class="bottom_btn" :style="prod_bottom">
+      <view v-if="is_can_pay==='Y'" class="bottom_btn" :style="prod_bottom">
         <xd-button
           width="360rpx"
           type="primary"
           radius="50rpx"
           @click="doThirdPay"
-          >确认支付</xd-button
-        >
+        >确认支付</xd-button>
       </view>
     </view>
   </view>
@@ -336,7 +327,6 @@ export default {
           item["end_time"] = this.getTimeFormat(item.end_time);
           return item;
         });
-        //this.cardList = [...this.cardList,...this.cardList,...this.cardList,...this.cardList,...this.cardList]
       });
     },
     p_getListUserPayChannel() {
@@ -590,7 +580,7 @@ export default {
       .remain_header {
         display: flex;
         justify-content: space-between;
-        padding: 16rpx 60rpx 0;
+        padding: 30rpx 60rpx 0;
         color: #999999;
         font-size: 24rpx;
       }
@@ -607,8 +597,8 @@ export default {
           width: 64rpx;
           height: 64rpx;
           border-radius: 32rpx;
-          // background: #DDD;
           margin-right: 30rpx;
+          overflow: hidden;
         }
         .pay_name {
           flex: 1;