jufubao-base 1.0.145-beta4 → 1.0.146-beta31

package/package.json

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

package/src/components/JfbBaseAddress/XdAddress.vue

@@ -391,6 +391,10 @@ export default {
     },
 
     setReceiptRegionName() {
+      console.log(this.level,'apapappap');
+      this.city_name = this.city_name.splice(0, this.level+1);
+      this.city_code = this.city_code.splice(0, this.level+1);
+      // this.city_selected_data = this.city_selected_data.splice(0, this.level+1);
       this.receipt_region_name = this.city_name.join(this.citySeparator);
     },
 
@@ -423,10 +427,10 @@ export default {
     },
 
     selectCity(item) {
+      console.log(this.maxLevel,'this.maxLevel');
       if (this.level < this.maxLevel - 1) {
         this.level++;
       }
-
       //保存信息
       this.$set(this.city_name, this.level, item.label);
       this.$set(this.city_code, this.level, item.value);

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="isQrCode">
+        <template v-if="isWx">
           <view
             class="jfb-base-card__body-cut-item"
             @click="handleScan"
@@ -226,11 +226,10 @@ import JfbBaseCardMixin from "./JfbBaseCardMixin";
 import componentsMixins from "@/mixins/componentsMixins";
 import extsMixins from "@/mixins/extsMixins";
 import { mapState, mapActions } from "vuex";
-import { getContainerPropsValue, isWechat,isQrCode } from "@/utils/xd.base";
+import { getContainerPropsValue, isWechat } from "@/utils/xd.base";
 import XdNoticeBar from "@/components/XdNoticeBar/XdNoticeBar";
 import { Base64 } from "js-base64";
 const Color = require("color");
-
 export default {
   name: "JfbBaseCard",
   components: {
@@ -294,7 +293,7 @@ export default {
       isPreview: false,
       noticeStatus: false,
 
-      isQrCode: true,
+      isWx: true,
       cutIndex: 1,
       tabIndex: 1,
       offsetIndex:0,//第几页
@@ -341,9 +340,10 @@ 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,7 +21,6 @@
             <view
               class="scan_icon"
               @click="doScanCode"
-              v-if="isQrCode"
             >
               <xd-font-icon icon="iconsaoma1"></xd-font-icon>
             </view>
@@ -59,7 +58,7 @@
   import XdButton from "@/components/XdButton/XdButton"
   import { jfbRootExec } from "@/utils/xd.event";
   import JfbBaseCardBindV2Mixin from "./JfbBaseCardBindV2Mixin";
-  import { getContainerPropsValue,isQrCode } from "@/utils/xd.base";
+  import { getContainerPropsValue } from "@/utils/xd.base";
   import componentsMixins from "@/mixins/componentsMixins";
   import extsMixins from "@/mixins/extsMixins";
   import { mapState } from "vuex"
@@ -92,7 +91,6 @@
         validImageAPIUrl: "",
         backUrl: "",
         inCallbackUrlOrg:'',//是否带有回调地址
-        isQrCode: false,
       }
     },
     watch: {
@@ -101,7 +99,6 @@
       }
     },
     created() {
-      this.isQrCode = isQrCode(this)
       this.init(this.container);
       this.validImageAPIUrl = this.brandInfo['api_host'] + '/common/v1/valid_code/image/show'
 
@@ -179,6 +176,7 @@
           success: res => {
             let result = res.resultStr;
             this.cardForm.card_qrcode = result;
+
             jfbRootExec("qrCardBind", {
               vm: this,
               data: {

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,7 +235,7 @@ 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 + ''
             });
             jfbRootExec("batchDisabledCardUnbindEntry", {vm: this, data: {card_numbers: cardIds.join(','),},})
@@ -241,6 +243,7 @@ export default {
                 this.$xdAlert({
                   content: "全部失效票券已解绑",
                   close: () => {
+                    this.clearData();
                     this.getCardList();
                   },
                 });
@@ -275,6 +278,7 @@ export default {
                 this.$xdAlert({
                   content: "票券已解绑",
                   close: () => {
+                    this.clearData();
                     this.getCardList();
                   },
                 });

package/src/components/JfbBaseCardDisabledEntry/cardListMixins.js

@@ -65,6 +65,19 @@ export default {
 
     },
 
+    clearData(){
+      this.ajaxCardList = null;
+      this.cardOrgList = []
+      this.cardList = null;
+      this.cardPageNum = 0;
+      this.cardComputedList = [];
+      this.cardLoading = false;
+      this.cardNextTop = 0;
+      this.cardIndex = 0;
+      this.contentStatus = false;
+      this.hasContent = true;
+    },
+
     async handleCardComputed(paddingBottom=30){
       this.$xdShowLoading({});
       if(this.contentStatus === false)  await this.getBoxTop();
@@ -83,7 +96,6 @@ export default {
             return card
           });
           this.cardList = (this.cardList||[]).concat(arr);
-          this.cardPageNum++;
           this.$xdHideLoading();
         }).exec();
       })
@@ -102,6 +114,7 @@ export default {
         this.cardPageNum*this.cardPageLen,
         this.cardPageNum*this.cardPageLen + this.cardPageLen
       );
+      console.warn(`无效卡张数:${validCardList.length} 张，页码：第 ${this.cardPageNum} 页`);
       if(this.cardComputedList.length < this.cardPageLen) {
         this.hasContent = false;
       }
@@ -120,6 +133,7 @@ export default {
             this.cardPageNum*this.cardPageLen,
             this.cardPageNum*this.cardPageLen + this.cardPageLen
           );
+          console.warn(`无效卡张数:${this.cardOrgList.length} 张，页码：第 ${this.cardPageNum} 页`);
           this.handleCardComputed().then().catch();
           if(this.cardComputedList.length < this.cardPageLen) {
             this.hasContent = false;

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="isQrCode">
+        <template v-if="isWx">
           <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,isQrCode } from "@/utils/xd.base";
+import { getContainerPropsValue, isWechat } from "@/utils/xd.base";
 import XdNoticeBar from "@/components/XdNoticeBar/XdNoticeBar";
 import { Base64 } from "js-base64";
 const Color = require("color");
@@ -434,6 +434,7 @@ export default {
       noticeStatus: false,
       loadingCardList: true,
 
+      isWx: true,
       cutIndex: 1,
       tabIndex: 1,
       isBack: null, //是否使用返回键
@@ -453,7 +454,6 @@ 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.isQrCode = isQrCode(this);
+    this.isWx = this.isPreview || isWechat();
     if (!this.$configProject.isPreview) {
       jfbRootExec("getH5WxAuthorize", {
         vm: this,

package/src/components/JfbBaseLogin/Api.js

@@ -23,18 +23,6 @@ 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,7 +30,8 @@
             type="primary"
             radius="20rpx"
             @click="doLoginAuth"
-            >{{h5FastLoginName}}</xd-button>
+            >快捷登录</xd-button
+          >
           <!-- #endif -->
           <!--#ifdef MP-->
           <xd-button
@@ -49,7 +50,8 @@
               type="primary"
               radius="20rpx"
               @click="doLoginAccount"
-              >账号登录</xd-button>
+              >账号登录
+            </xd-button>
           </view>
 
           <view class="protocol">
@@ -215,9 +217,7 @@ import {
   getAllPath,
   getDomainAllPath,
   getLocalJumpOutSiteCallbackUrl,
-  isThirdLogin
 } from "@/utils/xd.base";
-import icb from "@/common/ICB.SDK";
 
 export default {
   name: "JfbBaseLogin",
@@ -236,7 +236,6 @@ export default {
       //体验模式
       dialogPreview: false,
       previewAccout: '',
-      h5FastLoginName:'快捷登录',
 
       showStep: 1,
       panel_1_checked: "",
@@ -287,7 +286,7 @@ export default {
     };
   },
   computed: {
-    ...mapState(["jfbAuthorize","siteInfo",'loginParams']),
+    ...mapState(["jfbAuthorize","siteInfo"]),
     panelIsChecked() {
       return this.panel_1_checked.includes(1);
     },
@@ -317,7 +316,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: {
@@ -363,20 +362,35 @@ 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);
+      // }
     },
 
     /**
@@ -411,11 +425,6 @@ 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;
@@ -476,7 +485,8 @@ 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
                 );
@@ -540,12 +550,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) => {
@@ -593,59 +603,12 @@ 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;
-
-      //工行处理
-      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;
-      }
-
+      const { provider_id, login_platform_code, is_redirect, redirect_url } = this.quickLogin;
+      location.href = redirect_url;
     },
 
     //小程序授权登录
@@ -744,7 +707,6 @@ export default {
           });
       }
     },
-
     toHomeAfterLogin() {
       let { redirect_url, callback_url } = this;
       if (redirect_url) redirect_url = redirect_url;

package/src/common/ICB.SDK.js

@@ -1,78 +0,0 @@
-'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();