jufubao-base 1.0.145-beta2 → 1.0.145-beta21

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();
     },
 
   },

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="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,
@@ -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/JfbBaseCardInfo/JfbBaseCardInfo.vue

@@ -171,7 +171,7 @@ export default {
       return this.fixedStyle({ height: 0, zIndex: 111 });
     },
     isShowBalance(){
-      if(this.info.is_expired === "Y"){
+      if(this.info && this.info.is_expired === "Y"){
         return this.is_show_balance === "Y";
       }
       return true;
@@ -492,6 +492,7 @@ export default {
       height: unit(320, rpx);
       display: flex;
       align-items: center;
+      justify-content: center;
     }
   }
 }

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

@@ -136,10 +136,18 @@
               return item;
             }
 
-            let jumpUrl = item.path;
-            //#ifdef H5
-            jumpUrl = `//${host}/${dir}${path}`;
-            //#endif
+            let jumpUrl = path;
+            //域名相同并且应用路径不相同时候处理
+            if(host ===this.projectAttr.host
+              && this.projectAttr['deploy_dir'] !== dir
+            ){
+              jumpUrl = `//${host}/${dir}${path}`;
+              //#ifdef MP-WEIXIN
+              jumpUrl = `https:${jumpUrl}`;
+              //#endif
+            }
+
+
 
             if(item['redirect_data']['fixed_business_code'] === '') {
               item['redirect_data']['path'] = `${jumpUrl}?x-common=${nsp}&vs=${new Date().getTime()}`
@@ -149,6 +157,7 @@
             }
             return item;
           });
+          console.log( this.entryList)
           if(res.list.length === 1) this.toLink(this.entryList[0]);
           if(res.list.length === 0) {
             this.$xdAlert({content: '当前票券暂无支持服务'})

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/Attr.js

@@ -539,6 +539,18 @@ export default {
       },
       inline: false,
     },
-
+    {
+      label: '小程序手机号授权登录地址:', //label
+      ele: 'xd-select-pages-path', //package 名称
+      valueKey: 'mpAuthPhoneUrl', //form[valueKey]
+      groupKey: 'advanced',
+      placeholder: '请选择跳转地址',
+      value: null,
+      setting: {
+        router: XdBus.getParentApi('getPagesTree'),
+      },
+      notice: "首次快捷登录，将自动跳转至该地址",
+      inline: false,
+    },
   ]
 }

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">
@@ -98,7 +96,7 @@
             :border="true"
             paddingBetween="40"
           >
-            <xd-form-item class="form-item" label="手机号" content-align="left">
+            <xd-form-item class="form-item" label="手机号" :labelWidth="160" content-align="left">
               <xd-form-input
                 v-model="accountForm.phone_number"
                 placeholder="请输入11位手机号"
@@ -107,6 +105,7 @@
             <xd-form-item
               v-if="accountLoginType === 'phone'"
               label="验证码"
+              :labelWidth="160"
               content-align="left"
             >
               <view class="flex align-center">
@@ -125,6 +124,7 @@
             <xd-form-item
               v-if="accountLoginType === 'pwd'"
               label="密码"
+              :labelWidth="160"
               content-align="left"
             >
               <xd-form-input
@@ -217,6 +217,7 @@ import {
   getAllPath,
   getDomainAllPath,
   getLocalJumpOutSiteCallbackUrl,
+  isThirdLogin
 } from "@/utils/xd.base";
 
 export default {
@@ -236,6 +237,7 @@ export default {
       //体验模式
       dialogPreview: false,
       previewAccout: '',
+      h5FastLoginName:'快捷登录',
 
       showStep: 1,
       panel_1_checked: "",
@@ -283,10 +285,11 @@ export default {
       isDebugPreview: false,
 
       isFastLoginStatus: false,
+      mpAuthPhoneUrl: "",
     };
   },
   computed: {
-    ...mapState(["jfbAuthorize","siteInfo"]),
+    ...mapState(["jfbAuthorize","siteInfo",'loginParams']),
     panelIsChecked() {
       return this.panel_1_checked.includes(1);
     },
@@ -316,7 +319,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 +365,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);
-      // }
     },
 
     /**
@@ -415,6 +403,7 @@ export default {
       this.phone_number_collect_url = getContainerPropsValue(value, "content.phone_number_collect_url", {value: ''}).value;
       this.forget_pwd_url = getContainerPropsValue(value, "content.forget_pwd_url", {value: ''}).value;
       this.error_callback_url = getContainerPropsValue(value, "content.error_url", {value: ''}).value;
+      this.mpAuthPhoneUrl = getContainerPropsValue(value, "content.mpAuthPhoneUrl", {value: '/system/login/wxauthorize'}).value;
       this.isPreview = getContainerPropsValue(value, "content.isPreview", 'N');
     },
 
@@ -425,6 +414,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;
@@ -482,23 +476,28 @@ 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 (res.auth_code) {
-                let { redirect_url, callback_url } = this;
-                if (redirect_url)
-                  redirect_url = redirect_url;
-                let url = Base64.encodeURI(
-                  redirect_url || callback_url || this.settings.index
-                );
                 this.$xdUniHelper.navigateTo({
-                  url: `/system/login/wxauthorize?auth_code=${res.auth_code}&provider_id=${this.quickLogin.provider_id}&url=${url}`,
+                  url: `${this.mpAuthPhoneUrl}?auth_code=${res.auth_code}&provider_id=${this.quickLogin.provider_id}&url=${url}`,
                 });
               }
               //无需授权直接进行登录
               else {
                 if (this.jfbAuthorize !== null) {
                   this.jfbAuthorize.setAllToken(res["login_info"], () => {
-                    this.toHomeAfterLogin();
+                    //需要收集手机号码
+                    if(res['is_collect_phone_number'] === 'Y'){
+                      this.$xdUniHelper.navigateTo({
+                        url: `${this.mpAuthPhoneUrl}?provider_id=${this.quickLogin.provider_id}&url=${url}`,
+                      });
+                    }
+                    else{
+                      this.toHomeAfterLogin();
+                    }
                   });
                 }
               }
@@ -550,12 +549,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 +602,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,9 +753,9 @@ 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,
       });
@@ -767,7 +813,7 @@ export default {
       padding: 40rpx 70rpx;
     }
     .form-item {
-      /deep/ .uni-forms-item {
+      ::v-deep .uni-forms-item {
         padding-left: unit(30rpx) !important;
       }
     }
@@ -777,6 +823,12 @@ export default {
       margin-right: unit(20,rpx);
     }
     .panel-login-auth {
+      /deep/ .uni-forms-item__label {
+        .label-text {
+          font-size: 26rpx;
+          color: #a6a6a6;
+        }
+      }
       .logo-wrap {
         text-align: center;
         margin: unit(165,rpx) 0;

package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue

@@ -239,8 +239,8 @@
                 :key="Dindex"
                 class="jfb-base-order-detail__body-delivery-bottom-item"
               >
-                <view :style="{width: '130rpx'}">
-                  <text v-html="Ditem.label"></text>
+                <view style="width: 130rpx;display: flex;">
+                  <view v-html="Ditem.label"></view>
                   <text v-if="Ditem.label">:</text>
                 </view>
                 <view v-html="Ditem.value"></view>
@@ -563,10 +563,10 @@
             class="jfb-base-order-detail__body-order"
           >
             <view :style="{ fontWeight: item.style }">
-              <view
-              ><text v-html="item.label"></text
-              ><text v-if="item.label">：</text></view
-              >
+              <view style="display: flex;">
+                <view v-html="item.label"></view>
+                <text v-if="item.label">：</text>
+              </view>
               <view v-html="item.value"></view>
             </view>
             <view

package/src/components/JfbBaseOrderList/JfbBaseOrderList.vue

@@ -96,7 +96,7 @@
               <view
                 class="jfb-base-order-list__body-order-item-content"
                 v-for="(Sitem, Sindex) in item.products"
-                :key="getKey(Sitem.product_id,Sindex)"
+                :key="Sitem.key"
                 v-if="(item['isOpen'] === false && Sindex < showLen) || item['isOpen']">
                 <image
                   :src="Sitem.product_thumb"
@@ -175,7 +175,7 @@
               class="jfb-base-order-list__body-order-item-pay"
               v-if="item.buttons.length"
             >
-              <view v-for="(btn,index) in item.buttons" :key="btn.action+index">
+              <view v-for="(btn,index) in item.buttons" :key="btn.key">
                 <xd-button
                   :type="getBtnType(btn.action)"
                   size="mini"
@@ -457,12 +457,17 @@ export default {
           console.log(res.list, "list");
           let list = res.list.map((item) => {
             item["isOpen"] = false;
-            item.products = item.products.map((prod) => {
+            item.products = item.products.map((prod, i) => {
+              prod['key'] = prod.product_id + i;
               prod["product_thumb"] = prod.product_thumb
                 ? getServiceUrl(prod.product_thumb)
                 : "";
               return prod;
             });
+            item.buttons = item.buttons.map((btn, i) => {
+              btn["key"] = btn.action + i;
+              return btn;
+            })
             item["created_time_text"] = this.$xdUniHelper.getDate(
               item["created_time"] * 1000
             ).fullTime;