jufubao-base 1.0.147 → 1.0.148-beta1

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,17 @@
               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 +156,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: {
@@ -352,7 +355,10 @@ export default {
       this.$xdShowLoading({});
       try{
         const res = await this.loginPreview(this.previewAccout);
-        if(res) this.jfbAuthorize.setAllToken(res);
+        if(res){
+          this.jfbAuthorize.setAllToken(res);
+          this.jfbAuthorize.setCardToken(res['login_card_result'])
+        }
         this.toHomeAfterLogin();
         this.$xdHideLoading();
       }catch (e){
@@ -362,35 +368,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 +406,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 +417,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 +479,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 +552,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 +605,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 +756,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 +816,7 @@ export default {
       padding: 40rpx 70rpx;
     }
     .form-item {
-      /deep/ .uni-forms-item {
+      ::v-deep .uni-forms-item {
         padding-left: unit(30rpx) !important;
       }
     }
@@ -777,6 +826,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/JfbBaseNoticeBottom/JfbBaseNoticeBottom.vue

@@ -35,7 +35,6 @@
     data() {
       return {
 
-        //todo
       }
     },
     watch: {
@@ -45,50 +44,18 @@
     },
     created() {
       this.init(this.container);
-
-      //todo
     },
     methods: {
       onJfbLoad(options) {
 
-        // jfbRootExec('baiduUserLogin', {
-
-        //   vm: this,//   data: {
-
-        //     account: 'gaoshiyong',//     password: '123456789',//     type: 3,//     ...options
-
-        //   }
-
-        // }).then().catch()
       },
       /**
        * @description 监听事件变化
        * @param container {object} 业务组件对象自己
        */
       init(container) {
-
-        //this.bgcolor = getContainerPropsValue(container, 'content.bgcolor', '#fff');
-
-        //this.height = getContainerPropsValue(container, 'content.height', 10);
-      },
-      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)
-      },
-      onJfbBack(options) {
-        console.log('event.onJfbBack', options)
-      },
-      onJfbCustomEvent(options) {
-        console.log('event.onJfbReachBottom', options)
       },
+
     }
   }
 

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;

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;

package/src/components/JfbBasePosterType/JfbBasePosterType.vue

@@ -23,7 +23,7 @@
           borderRadius: bgRadius + 'rpx'
         }"
       >
-        <four-screen :config="getConfig" :content="info"></four-screen>
+        <four-screen style="width: 100%;" :config="getConfig" :content="info"></four-screen>
       </view>
 
     </view>

package/src/components/JfbBaseSearch/JfbBaseSearch.vue

@@ -17,16 +17,24 @@
     </view>
     <!-- #endif -->
     <view class="jfb-base-search__body" :style="{height:layoutInfo.bodyMinHeightRpx+'rpx'}" v-if="layoutInfo!==null">
+      <!--#ifdef H5-->
       <xd-baidu-search
         @onSelect="handleSelect"
       ></xd-baidu-search>
+      <!-- #endif -->
+
+      <!-- #ifdef MP-WEIXIN -->
+      base Search
+      <!-- #endif -->
     </view>
   </view>
 </template>
 
 <script>
   import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
+  // #ifdef H5
   import XdBaiduSearch from "./XdBaiduSearch";
+  // #endif
   import {jfbRootExec} from "@/utils/xd.event";
   import JfbBaseSearchMixin from "./JfbBaseSearchMixin";
   import componentsMixins from "@/mixins/componentsMixins";
@@ -37,7 +45,9 @@
     name: "JfbBaseSearch",
     components: {
       XdFontIcon,
-      XdBaiduSearch
+      // #ifdef H5
+      XdBaiduSearch,
+      // #endif
     },
     mixins: [componentsMixins,extsMixins,JfbBaseSearchMixin],
     data() {

package/src/components/JfbBaseWxAuthorize/Api.js

@@ -18,6 +18,19 @@ module.exports = [
     isConsole: true,
     disable: true,
   },
+  {
+    mapFnName: 'userPhoneCollect',
+    title: "收集手机号",
+    path: "/passport/v1/user/collect-phone-number",
+    isRule: false,
+    data: {
+      phone_number: ['手机号', 'String', null], //手机号
+      verification_code: ['手机验证码', 'String', null],
+      provider_id: ['登录方式id', 'Number', '必选'],
+    },
+    isConsole: true,
+    disable: true,
+  },
   {
     mapFnName: "getContentInfo",
     title: "获取内容列表",

package/src/components/JfbBaseWxAuthorize/Attr.js

@@ -19,6 +19,26 @@ export default {
         placeholder: '请选择文字颜色',
         classNmae: 'input80',
       },
+      {
+        abel: '授权收集手机号按钮文案:',
+        ele: 'el-input',
+        type: 'text',
+        valueKey: 'btnCollectPhoneText',
+        groupKey:'content',
+        value: data.btnCollectPhoneText || "授权手机号",
+        placeholder: '请输入授权收集手机号按钮文案',
+        className: 'input80',
+      },
+      {
+        abel: '授权登录按钮文案:',
+        ele: 'el-input',
+        type: 'text',
+        valueKey: 'btnLoginText',
+        groupKey:'content',
+        value: data.btnLoginText || "微信授权登录",
+        placeholder: '请输入授权按钮文案',
+        className: 'input80',
+      },
       {
         label: '授权按钮下面文案:',
         ele: 'el-input',