jufubao-base 1.0.145-beta11 → 1.0.145-beta12

package/package.json

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

package/src/common/ICB.SDK.js

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

package/src/components/JfbBaseAfterOrderList/JfbBaseAfterOrderList.vue

@@ -394,7 +394,7 @@ export default {
             flex: none;
           }
         }
-        & > :last-child{
+        & > view:last-child{
           .skeleton-wrap &{
             .skeleton-item(300rpx);
           }

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="isWx">
+        <template v-if="isQrCode">
           <view
             class="jfb-base-card__body-cut-item"
             @click="handleScan"
@@ -226,10 +226,11 @@ import JfbBaseCardMixin from "./JfbBaseCardMixin";
 import componentsMixins from "@/mixins/componentsMixins";
 import extsMixins from "@/mixins/extsMixins";
 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");
+
 export default {
   name: "JfbBaseCard",
   components: {
@@ -293,7 +294,7 @@ export default {
       isPreview: false,
       noticeStatus: false,
 
-      isWx: true,
+      isQrCode: true,
       cutIndex: 1,
       tabIndex: 1,
       offsetIndex:0,//第几页
@@ -340,10 +341,9 @@ 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,
@@ -442,7 +442,7 @@ export default {
         uni.scanCode({
           scanType: ["qrCode"],
           success: (res) => {
-            let path = this.getUrlCallback(`${this.confirmUrl}?qrcode=${encodeURIComponent(res.resultStr)}`)
+            let path = this.getUrlCallback(`${this.confirmUrl}?qrcode=${encodeURIComponent(res.result)}`)
             this.$xdUniHelper.navigateTo({
               url: path,
             });

package/src/components/JfbBaseCardBindV2/JfbBaseCardBindV2.vue

@@ -21,6 +21,7 @@
             <view
               class="scan_icon"
               @click="doScanCode"
+              v-if="isQrCode"
             >
               <xd-font-icon icon="iconsaoma1"></xd-font-icon>
             </view>
@@ -58,7 +59,7 @@
   import XdButton from "@/components/XdButton/XdButton"
   import { jfbRootExec } from "@/utils/xd.event";
   import JfbBaseCardBindV2Mixin from "./JfbBaseCardBindV2Mixin";
-  import { getContainerPropsValue } from "@/utils/xd.base";
+  import { getContainerPropsValue,isQrCode } from "@/utils/xd.base";
   import componentsMixins from "@/mixins/componentsMixins";
   import extsMixins from "@/mixins/extsMixins";
   import { mapState } from "vuex"
@@ -91,6 +92,7 @@
         validImageAPIUrl: "",
         backUrl: "",
         inCallbackUrlOrg:'',//是否带有回调地址
+        isQrCode: false,
       }
     },
     watch: {
@@ -99,6 +101,7 @@
       }
     },
     created() {
+      this.isQrCode = isQrCode(this)
       this.init(this.container);
       this.validImageAPIUrl = this.brandInfo['api_host'] + '/common/v1/valid_code/image/show'
 
@@ -176,7 +179,6 @@
           success: res => {
             let result = res.resultStr;
             this.cardForm.card_qrcode = result;
-
             jfbRootExec("qrCardBind", {
               vm: this,
               data: {

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,

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/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,7 +217,9 @@ import {
   getAllPath,
   getDomainAllPath,
   getLocalJumpOutSiteCallbackUrl,
+  isThirdLogin
 } from "@/utils/xd.base";
+import icb from "@/common/ICB.SDK";
 
 export default {
   name: "JfbBaseLogin",
@@ -236,6 +238,7 @@ export default {
       //体验模式
       dialogPreview: false,
       previewAccout: '',
+      h5FastLoginName:'快捷登录',
 
       showStep: 1,
       panel_1_checked: "",
@@ -283,10 +286,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 +320,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 +366,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 +404,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 +415,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 +477,31 @@ 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 +553,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 +606,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,6 +757,7 @@ export default {
           });
       }
     },
+
     toHomeAfterLogin() {
       let { redirect_url, callback_url } = this;
       if (redirect_url) redirect_url = redirect_url;
@@ -767,7 +818,7 @@ export default {
       padding: 40rpx 70rpx;
     }
     .form-item {
-      /deep/ .uni-forms-item {
+      ::v-deep .uni-forms-item {
         padding-left: unit(30rpx) !important;
       }
     }
@@ -777,6 +828,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;

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',

package/src/components/JfbBaseWxAuthorize/JfbBaseWxAuthorize.vue

@@ -24,6 +24,7 @@
           }"
         >
         </view>
+        <view v-if="!auth_code" class="app-body__jump" @click="doJump">跳过</view>
         <view class="app-body__bottom">
           <view class="app-body__bottom-btn">
             <button
@@ -35,7 +36,7 @@
                 boxShadow: '0 5rpx 10rpx ' + mainColor
               }"
               @getphonenumber="decryptPhoneNumber"
-            >微信授权登录</button>
+            >{{ authBtnText }}</button>
             <button
               v-else
               @click="decryptPhoneNumber()"
@@ -43,7 +44,7 @@
                 background: mainColor,
                 boxShadow: '0 5rpx 10rpx ' + mainColor
               }"
-            >微信授权登录</button>
+            >{{ authBtnText }}</button>
           </view>
           <view class="app-body__bottom-tips" v-if="notice" v-html="notice" :style="{color: textColor}"></view>
           <view class="app-body__bottom-policy">
@@ -87,7 +88,7 @@
       return {
         isPreview: false,
         selectPolicy: false,
-        auth_code: null,
+        auth_code: null,  //有值说明未关联
         provider_id:null,
         nextUrl: null,
         showDialog: false,
@@ -98,11 +99,16 @@
         //面板
         bgImage: '', //背景图片
         notice: '', //授权按钮下面文案
-        textColor: '#fff'
+        textColor: '#fff',
+        btnLoginText: "",  //授权按钮文案
+        btnCollectPhoneText: "",  //授权收集手机号按钮文案
       }
     },
     computed:{
       ...mapState(['jfbAuthorize']),
+      authBtnText(){
+        return this.auth_code ? this.btnLoginText : this.btnCollectPhoneText;
+      }
     },
     watch: {
       container(value) {
@@ -127,6 +133,14 @@
         this.selectPolicy = !this.selectPolicy;
       },
 
+      doJump(){
+        if(!this.auth_code){
+          this.$xdUniHelper.redirectTo({
+            url: this.nextUrl
+          })
+        }
+      },
+
       decryptPhoneNumber(e) {
         if (e === undefined) {
           this.$xdConfirm({
@@ -146,6 +160,18 @@
         let {iv, encryptedData} = e.detail;
         let raw_data = JSON.stringify({iv, encryptedData});
 
+        //auth_code 临时授权码，走授权登录。 否则走授权收集手机号
+        if(this.auth_code){
+          this.p_userPhoneWxLogin(raw_data)
+        }else{
+          this.p_userPhoneCollect(raw_data)
+        }
+      },
+
+      /**
+       * @description 授权登录
+       */
+      p_userPhoneWxLogin(raw_data){
         jfbRootExec("userPhoneWxLogin", {
           vm: this,
           data: {
@@ -183,9 +209,30 @@
             zIndex: this.isPreview ? 2000 : 1400
           });
         })
-
       },
 
+      /**
+       * @description 授权收集手机号
+       */
+      p_userPhoneCollect(raw_data){
+        uni.login({
+          provider: "weixin",
+          success: (loginRes) => {
+            jfbRootExec("userPhoneCollect", {
+              vm: this,
+              data: {
+                raw_data,
+                third_auth_code: loginRes.code,
+                provider_id: this.provider_id,
+              }
+            }).then(res => {
+              this.$xdUniHelper.redirectTo({
+                url: this.nextUrl
+              })
+            })
+          }
+        })
+      },
 
       /**
        * @description 监听事件变化
@@ -195,6 +242,8 @@
         let bgImage = getContainerPropsValue(container, 'content.bgImage', {});
         if(bgImage.url) this.bgImage = getServiceUrl(bgImage.url);
         this.notice = getContainerPropsValue(container, 'content.notice', '');
+        this.btnLoginText = getContainerPropsValue(container, 'content.btnLoginText', '微信授权登录');
+        this.btnCollectPhoneText = getContainerPropsValue(container, 'content.btnCollectPhoneText', '获取手机号');
         this.textColor = getContainerPropsValue(container, 'content.textColor', '#fff');
       },
 
@@ -242,6 +291,12 @@
 
     }
 
+    &__jump {
+      position: absolute;
+      top: 40rpx;
+      right: 40rpx;
+    }
+
     &__bottom {
       position: absolute;
       bottom: unit(80, rpx);