jufubao-base 1.0.147 → 1.0.148

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);