jufubao-base 1.0.158 → 1.0.159-beta1

package/package.json

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

package/src/common/authorize.js

@@ -4,13 +4,9 @@
 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 {
@@ -30,14 +26,25 @@ class JfbAuthorize {
     this.jumpToTimer = null;
     this.maxTime = 10;
 
+    //从地址栏中获取登录链接（webview）
+    //#ifdef H5
+    this.jfbLoginPath = cookie.get(`jfb-login-path-${this.siteId}`);
+    this.jfbCardPath = cookie.get(`jfb-card-path-${this.siteId}`);
+    this.jfbHost = cookie.get(`jfb-host-${this.siteId}`);
+    this.jfbDir = cookie.get(`jfb-dir-${this.siteId}`);
+    this.jfbAppType= cookie.get(`jfb-app-type-${this.siteId}`) || '';
+    //#endif
+
+
     this.config = Object.assign({}, {
       'user': 'JFB-CSRF-TOKEN-{siteID}',
-      'card': 'JFB-CARD-TOKEN-{siteID}',
       'refresh': 'JFB-REFRESH-TOKEN-{siteID}',
       'access': 'JFB-ACCESS-TOKEN',
-      'bizCode': 'JFB-CARD-CODE-{siteID}',
       'userAll':'JFB-USER-ALL-{siteID}',
-    }, settings.token ? settings.token : {});
+      'card': 'JFB-CARD-TOKEN-{siteID}',
+      'bizCode': 'JFB-CARD-CODE-{siteID}',
+      'cardExpire': 'JFB-CARD-EXPIRE-{siteID}',
+    }, settings.token ? settings.token : {}) ;
   }
 
   doMain() {
@@ -102,7 +109,7 @@ class JfbAuthorize {
     cookie.remove(codeKey, {domain: this.doMain()});
     //#endif
     storage.remove(key);
-    storage.remove(codeKey);
+    if(key === 'card') storage.remove(codeKey);
   }
 
   /**
@@ -136,103 +143,205 @@ class JfbAuthorize {
   }
 
   /**
-   * @description 跳转到卡登陆页面
-   * @param $vm {Vue}
-   * @param callbackUrl {String} 返回参数
+   * @description 检查是否在微信小程序webview环境下面
+   * @return {boolean}
    */
+  checkEnv(){
+    return window['__wxjs_environment'] === 'miniprogram'
+  }
 
-  jumpToCardLogin($vm, callbackUrl) {
-    let redirect_url = '';
-    if (store.state.configProject.platform === 'mp.weixin') {
-      redirect_url = $vm['$xdUniHelper'].parseURL().source;
-    }
-    if (store.state.configProject.platform === 'h5') {
-      redirect_url = $vm.$route.fullPath;
-    }
+  isCheckJfbWxDir(path){
+    path = path.replace('@site_domain@', '').split('/');
+    return path.length === 5 && path[1] === this.jfbDir;
+  }
 
+  /**
+   * @description 判断当前传入地址是否当前应用下面地址
+   * @param url
+   * @return {boolean} true =>不同应用  false=>相同应用
+   */
+  checkUrlIsNotCameDir(url) {
+    const urlArr = url.replace('@site_domain@', '').split('/');//pages/loading/loading | @site_domain@/$dir/main/mall/index
+    console.log('checkUrlIsNotCameDir.url', url,urlArr)
+    console.log('checkUrlIsNotCameDir.project', store.state.brandInfo)
+    return urlArr.length === 5 && urlArr[1] !== store.state.brandInfo.deploy_dir;
+  }
 
-    //登陆地址与当前项目不再同一个app中处理
-    //#ifdef H5
-    if (!this.checkUrlIsCameDir(this.cardPath)) {
-      redirect_url = `@site_domain@/${store.state.brandInfo.deploy_dir}${redirect_url}`
+  //#ifdef MP-WEIXIN
+  wxJumpToPath($vm,redirect_url, path, type = 'login'){
+    //微信小程序只能跳转应用内的地址
+    if(this.checkUrlIsNotCameDir(path)) {
+      let message = '请设置正确设置用户登录地址，微信小程序只能使用应用内地址';
+      if(type === 'card') message = '请设置正确设置用户票券登录地址，微信小程序只能使用应用内地址'
+      $vm.$xdAlert({content: message,time:4000})
+      throw new Error(message);
     }
-    //#endif
 
-    if (callbackUrl) redirect_url = callbackUrl;
+    let key = 'redirect_url';
+    let business_code = '';
 
-    if (!this.cardPath) {
-      console.error(this.cardPath);
-      $vm.$xdAlert({
-        content: "请设置卡登陆页面地址"
-      })
-      throw new Error('请设置卡登陆页面地址');
-    }
+    if(type === 'card'){
+      key = 'inCallback';
 
-    //设置页面过滤卡
-    let business_code = '';
-    if(store.state.pageBusinessCode) {
-      business_code = `&jfb_business_code=${store.state.pageBusinessCode}`;
+      //设置过滤业务线
+      if(store.state.pageBusinessCode) {
+        business_code = `&jfb_business_code=${store.state.pageBusinessCode}`;
+      }
     }
 
-    $vm['$xdUniHelper'].redirectTo({
-      url: this.cardPath + `?inCallback=${Base64.encodeURI(redirect_url)}${business_code}`,
-    });
+    let dir = store.state.brandInfo.deploy_dir;
+    let newPath = path.replace(`@site_domain@/${dir}/`, '/');
+
+    return  newPath + `?${key}=${Base64.encodeURI(redirect_url)}${business_code}`;
+  }
+  //#endif
+
+  delPathSpParams($vm,redirect_url){
+    redirect_url = redirect_url.replace(`@site_domain@`, '')
+    let project = store.state.brandInfo;
+    let newPath =  $vm.$xdUniHelper.parseURL(redirect_url);
+    let newParams = newPath.params;
+    if(newParams.ts) delete newParams.ts;
+    if(newParams.vs) delete newParams.vs;
+    if(newParams['lcdh']) delete newParams.lcdh;
+    if($vm.$xdUniHelper.isEmpty(newParams)) return `https://${project.host}${newPath.path}`
+    return `https://${project.host}${newPath.path}?${$vm.$xdUniHelper.jsonToParams(newParams)}`
   }
 
-  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;
+  getCardPath(CardPath,redirect_url,business_code){
+    return CardPath + `?inCallback=${Base64.encodeURI(redirect_url)}${business_code}`;
   }
 
+
   /**
    * @description 跳转到用户登陆页面
    * @param $vm {Vue}
    * @param isRedirect {boolean}
    */
   jumpToUserLogin($vm,isRedirect = true) {
+
     let redirect_url = '';
-    if (store.state.configProject.platform === 'mp.weixin') {
-      redirect_url = $vm['$xdUniHelper'].parseURL().source;
+    let LoginPath = '';
+
+    //设置登录成功回跳地址
+    if(isRedirect) {
+      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 (store.state.configProject.platform === 'h5') {
-      redirect_url = $vm.$route.fullPath;
+
+    //无配置登录地址地址提示
+    if (!this.LoginPath) {
+      $vm.$xdAlert({content: "请设置用户登陆页面地址"})
+      throw new Error('请设置用户登陆页面地址');
     }
-    if(!isRedirect) redirect_url = '';
+
+
+    //#ifdef MP-WEIXIN
+    LoginPath = this.wxJumpToPath($vm,redirect_url, this.LoginPath);
+    //#endif
 
     //#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}/`;
-      }
+    if(!this.checkUrlIsNotCameDir(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) {
+    //判断redirect_url是否为登陆地址？
+    if (redirect_url.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('请设置用户登陆页面地址');
+    //微信小程序webview环境直接返回小程序进行登录
+    if(this.checkEnv() && this.jfbLoginPath) {
+      //返回链接处理
+      if(redirect_url){
+        redirect_url = this.delPathSpParams($vm,redirect_url)
+      }
+
+      LoginPath = this.jfbLoginPath.replace(`@site_domain@/${this.jfbDir}/`, '/');
+      const jumpTo = LoginPath + `?redirect_url=${Base64.encodeURI(redirect_url)}`;
+      $vm['$xdUniHelper'].redirectTo({
+        url: `/pages/jumptomp/jumptomp?callback=${Base64.encodeURI(jumpTo)}`
+      });
+      return
     }
+    //#endif
 
-    console.warn(`jumpToUserLogin.redirect.url: ${redirect_url} , login: ${LoginPath}`)
     $vm['$xdUniHelper'].redirectTo({
       url: LoginPath,
     });
   }
 
+  /**
+   * @description 跳转到卡登陆页面
+   * @param $vm {Vue}
+   * @param callbackUrl {String} 返回参数
+   */
+  jumpToCardLogin($vm, callbackUrl) {
+    let redirect_url = '';
+    let CardPath = ''; //登录地址
+    let jumpPath = ''; //跳转地址
+
+    //设置返回地址
+    if (store.state.configProject.platform === 'mp.weixin')  redirect_url = $vm['$xdUniHelper'].parseURL().source;
+    if (store.state.configProject.platform === 'h5') redirect_url = $vm.$route.fullPath;
+
+
+    //#ifdef MP-WEIXIN
+    if (callbackUrl) redirect_url = callbackUrl;
+    jumpPath = this.wxJumpToPath($vm, redirect_url, this.cardPath, 'card');
+    //#endif
+
+    //#ifdef H5
+    CardPath = this.cardPath;
+
+    //当有callbackUrl参数时候，redirect_url地址直接使用callbackUrl参数
+    if (callbackUrl) redirect_url = callbackUrl;
+
+    //设置过滤业务线
+    let business_code = ''
+    if(store.state.pageBusinessCode) {
+      business_code = `&jfb_business_code=${store.state.pageBusinessCode}`;
+    }
+
+    //微信小程序webview模式处理(需要跳回微信小程序进行登录)
+    if(this.checkEnv()) {
+      if(this.jfbAppType === 'wxmp') {
+        const jumpTo = this.getCardPath(this.jfbCardPath, redirect_url, business_code)
+        $vm['$xdUniHelper'].redirectTo({
+          url: `/pages/jumptomp/jumptomp?callback=${Base64.encodeURI(jumpTo)}`
+        })
+        return;
+      }
+      else if(this.jfbAppType === 'h5') {
+        CardPath = this.jfbCardPath;
+      }
+    }
+
+    //无配置卡券登录页面
+    if (!CardPath) {
+      $vm.$xdAlert({content: "请设置卡登陆页面地址"})
+      throw new Error('请设置卡登陆页面地址');
+    }
+
+    //登陆地址与当前项目不再同一个app中处理
+    if (!this.checkEnv()) {
+      if(!this.checkUrlIsNotCameDir(this.cardPath)) {
+        redirect_url = `@site_domain@/${store.state.brandInfo.deploy_dir}${redirect_url}`
+      }
+    }
+
+    jumpPath = this.getCardPath(CardPath, redirect_url, business_code)
+    //#endif
+
+    //跳转到其他应用
+    console.warn(`jumpToCardLogin.path=${jumpPath}`);
+    $vm['$xdUniHelper'].redirectTo({
+      url: jumpPath,
+    });
+  }
+
   /**
    * @description 用户是否已登录卡信息
    * @param canCard {Boolean} 检查是否用登录购物车信息 默认：false
@@ -275,7 +384,7 @@ class JfbAuthorize {
       }
       return false;
     }
-    //
+    //当前登录卡券有业务线线
     else{
       let bizCodeArr = bizCode.split(',');
       let currentBizCode = store.state.xnamespace;
@@ -367,7 +476,6 @@ class JfbAuthorize {
    * @param cb {Function|null}
    */
   setAllToken(result, cb = null) {
-
     //#ifdef MP-WEIXIN
     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']);
@@ -380,14 +488,23 @@ class JfbAuthorize {
     //#endif
   }
 
+  /**
+   * @description 客户端设置所有卡登录信息
+   * @param result
+   * @param cb {Function|null}
+   */
   setCardToken(result,cb){
     //#ifdef MP-WEIXIN
+    if(result['card_expire_in']) result['card_expire_in'] = Number(result['card_expire_in']);
+    this.setToken('card',result['card_token'],{expires: result['card_expire_in'] / 60 / 60})
+    this.setToken('bizCode',result['business_codes'],{expires: result['card_expire_in'] / 60 / 60})
+    this.setToken('cardExpire',result['card_expire_time'],{expires: result['card_expire_in'] / 60 / 60})
     if (typeof cb === 'function') cb();
     //#endif
   }
 
   /**
-   * @description 客户端删除所有token
+   * @description 客户端删除用户所有token
    * @param cb {Function|null}
    */
   removeAllToken(cb = null) {
@@ -396,8 +513,22 @@ class JfbAuthorize {
     this.removeToken('access');
     this.removeToken('refresh');
     this.removeToken('userAll');
+    if (typeof cb === 'function') cb();
     //#endif
   }
+  /**
+   * @description 客户端删除用户所卡券信息
+   * @param cb {Function|null}
+   */
+  removeAllCardToken(cb=null){
+    //#ifdef MP-WEIXIN
+    this.removeToken('card');
+    this.removeToken('bizCode');
+    this.removeToken('cardExpire');
+    if (typeof cb === 'function') cb();
+    //#endif
+  }
+
 }
 
 /**

package/src/components/JfbBaseAddress/JfbBaseAddress.vue

@@ -327,7 +327,7 @@ export default {
       //     cancel: false,
       //     showClose: false,
       //     confirmText: "我知道了",
-      //     $vm: this
+      //     styles: this.styles,
       //   });
       //   return
       // }
@@ -458,7 +458,7 @@ export default {
           cancel: false,
           showClose: false,
           confirmText: "我知道了",
-          $vm: this
+          styles: this.styles,
         });
         return;
       }
@@ -469,7 +469,7 @@ export default {
         data: {
           address_nnid: item.address_nnid,
           is_select: "Y",
-          version: this.version          
+          version: this.version
         },
       })
         .then((res) => {
@@ -525,7 +525,7 @@ export default {
     handleDel(item) {
       console.log("handleDel", item);
       this.$xdConfirm({
-        $vm: this,
+        styles: this.styles,
         content: "确定删除当前配送地址吗?",
         width: "80%",
         success: (res) => {

package/src/components/JfbBaseAfterOrderDetail/JfbBaseAfterOrderDetail.vue

@@ -274,8 +274,9 @@ export default {
       // #ifndef H5
       uni.setClipboardData({
         data: text,
+        showToast: false,
         success: () => {
-          this.$xdAlert({ content: "复制成功" });
+          //this.$xdAlert({ content: "复制成功" });
         },
       });
       // #endif

package/src/components/JfbBaseBack/JfbBaseBack.vue

@@ -66,7 +66,7 @@
       this.init(this.container);
     },
     methods: {
-      
+
       /**
        * @description 监听事件变化
        * @param container {object} 业务组件对象自己
@@ -80,7 +80,7 @@
         this.shadow = (e.scrollTop > this.height ? this.height : e.scrollTop)/100;
         this.opacity = opacity < this.minOpacity ? this.minOpacity : opacity;
       },
-      
+
       onJfbBack() {
         this.$xdUniHelper.navigateBack();
       }
@@ -102,7 +102,7 @@
         height: unit(90, rpx);
         padding: 0 unit(10, rpx);
         position: relative;
-        
+
         &-icon {
           width: 1em;
           height: 1em;
@@ -112,12 +112,13 @@
           display: flex;
           justify-content: center;
           align-content: center;
+          align-items: center;
           flex-shrink: 0;
           position: relative;
           z-index: 2;
           background: #fff;
         }
-  
+
         &-text {
           font-size: unit(54, rpx);
           padding-right: 1em;
@@ -125,7 +126,7 @@
           position: relative;
           z-index: 2;
           color: #666;
-          
+
           & > view {
             width: 100%;
             text-align: center;
@@ -133,7 +134,7 @@
             font-size: unit(32, rpx);
           }
         }
-        
+
         &-bg {
           background: #fff;
           position: absolute;

package/src/components/JfbBaseCard/JfbBaseCard.vue

@@ -75,6 +75,7 @@
           :style="{ background: noticeBackgroundColor }"
         >
           <xd-notice-bar
+            style="width: 100%"
             :showIcon="true"
             :scrollable="true"
             :speed="20"
@@ -408,7 +409,9 @@ export default {
       })
         .then((res) => {
           if (res.list.length > 0) {
-            this.notice = res.list[0].content;
+            if(res.list && res.list.length > 0) {
+              this.notice = this.$xdUniHelper.filterHtml(res.list[0].content);
+            }
             this.noticeStatus = true;
           }
         })

package/src/components/JfbBaseCardBindV2/JfbBaseCardBindV2.vue

@@ -17,7 +17,11 @@
       <xd-form class="form-wrap" content-align="left" :paddingBetween="0">
         <xd-form-item content-align="left" labelWidth="60" leftIcon="iconpiao">
           <view class="card_wrap">
-            <xd-form-input v-model="cardForm.card_number"  placeholder="请输入票券号"></xd-form-input>
+            <xd-form-input
+              class="card_wrap_input"
+              v-model="cardForm.card_number"
+              placeholder="请输入票券号"
+            ></xd-form-input>
             <view
               class="scan_icon"
               @click="doScanCode"
@@ -64,6 +68,9 @@
   import extsMixins from "@/mixins/extsMixins";
   import { mapState } from "vuex"
   export default {
+    //#ifdef MP-WEIXIN
+    options: { styleIsolation: 'shared' },
+    //#endif
     name: "JfbBaseCardBindV2",
     components: {
       XdFontIcon,
@@ -136,7 +143,6 @@
         this.backUrl = getContainerPropsValue(container, "content.backUrl", {value: "/system/card/login"}).value;
       },
       handleBindSuccess(){
-        debugger
         this.$xdAlert({
           content: "绑定成功",
           close: () => {
@@ -173,6 +179,7 @@
       },
 
       doScanCode(){
+        //#ifdef H5
         this.jwxSDK.scanQRCode({
           needResult: 1,
           scanType: ["qrCode", "barCode"],
@@ -197,28 +204,35 @@
               content: err.errMsg,
             });
           }
-        })
-      },
-      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)
+        });
+        //#endif
+        //#ifdef MP-WEIXIN
+        uni.scanCode({
+          scanType: ["qrCode"],
+          success: (res) => {
+            this.cardForm.card_qrcode = res.result;
+            jfbRootExec("qrCardBind", {
+              vm: this,
+              data: {
+                card_qrcode: res.result
+              }
+            }).then(res => {
+              this.handleBindSuccess()
+            }).catch(err => {
+              this.$xdLog.catch(err)
+            })
+          },
+          fail: (error) => {
+            this.$xdAlert({
+              content: error.errMsg,
+            });
+          },
+        });
+        //#endif
       },
+
       onJfbBack(options) {
-        console.log('event.onJfbBack', options)
-      },
-      onJfbUpdate(...data) {
-        console.log('event.onJfbUpdate', data)
-      },
-      onJfbCustomEvent(options) {
-        console.log('event.onJfbReachBottom', options)
+        this.$xdUniHelper.redirectBack()
       },
     }
   }
@@ -233,7 +247,7 @@
       padding: 40rpx;
 
       .form-wrap{
-        /deep/ .uni-forms-item__inner{
+        & /deep/ .uni-forms-item__inner {
           border-bottom: 1px solid #EEEEEE;
           padding-bottom: 0;
           margin-bottom: 24rpx;
@@ -243,14 +257,30 @@
       .card_wrap{
         display: flex;
         align-items: center;
+        justify-content: space-between;
+
+        & > .card_wrap_input {
+          flex: 1;
+        }
+        & > .scan_icon, & > .capture {
+          flex-shrink: 0;
+        }
       }
       .img_wrap{
         display: flex;
         align-items: center;
+        justify-content: space-between;
+
+        & > .card_wrap_input {
+          flex: 1;
+        }
+
         .capture{
           width: 180rpx;
-          height: 80rpx;
+          height: 66rpx;
+          margin-left: 10rpx;
           background: #DDD;
+          flex-shrink: 0;
         }
       }
       .confirm_btn{