jufubao-base 1.0.119-beta3 → 1.0.119-beta4

package/package.json

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

package/src/components/JfbBaseSaasBlessDetail/Attr.js

@@ -12,7 +12,7 @@ export default {
         ele: 'xd-select-pages-path', //package 名称
         valueKey: 'useTicketUrl', //form[valueKey]
         placeholder: '请选择使用祝福券跳转地址',
-        value: null,
+        value: data.useTicketUrl || null,
         setting: {
           router: XdBus.getParentApi('getPagesTree'),
         },

package/src/components/JfbBaseSaasBlessReceive/Attr.js

@@ -12,7 +12,7 @@ export default {
         ele: 'xd-select-pages-path', //package 名称
         valueKey: 'blessSignUrl', //form[valueKey]
         placeholder: '请选择祝福详情跳转地址',
-        value: null,
+        value: data.blessSignUrl || null,
         setting: {
           router: XdBus.getParentApi('getPagesTree'),
         },

package/src/components/JfbBaseSaasHome/Attr.js

@@ -12,7 +12,7 @@ export default {
         ele: 'xd-select-pages-path', //package 名称
         valueKey: 'newsListUrl', //form[valueKey]
         placeholder: '请选择新闻列表地址',
-        value: null,
+        value: data.newsListUrl ||null,
         setting: {
           router: XdBus.getParentApi('getPagesTree'),
         },
@@ -23,7 +23,7 @@ export default {
         ele: 'xd-select-pages-path', //package 名称
         valueKey: 'newsDetailUrl', //form[valueKey]
         placeholder: '请选择新闻详情地址',
-        value: null,
+        value: data.newsDetailUrl || null,
         setting: {
           router: XdBus.getParentApi('getPagesTree'),
         },

package/src/components/JfbBaseSaasLogin/JfbBaseSaasLogin.vue

@@ -327,23 +327,37 @@
           // if (!this.phoneLogin) this.accountLoginType = "pwd";
         }
       },
+      //快捷登录
+      doLoginAuth(){
+        const { quickLogin } = this;
+        //登录平台name 聚福宝 钉钉 企业微信
+        if(quickLogin.login_platform_name === 'DD'){
+          this.p_loginDing();
+        }else if(quickLogin.login_platform_name === 'QW'){
+          this.p_loginWxEnter();
+        }
+      },
       //企业微信登录
       p_loginWxEnter(){
-        let params = this.getReqParams();
-        params['code'] = "";  //企业微信code
-        jfbRootExec("loginWxEnter", {
-          vm: this,
-          data: params
-        }).then(res => {
-
-        })
+        const { quickLogin } = this;
+        location.href = quickLogin.redirect_url;
+        // let params = this.getReqParams();
+        // params['code'] = "";  //企业微信code
+        // jfbRootExec("loginWxEnter", {
+        //   vm: this,
+        //   data: params
+        // }).then(res => {
+        //   location.href = res.redirect_url;
+        // })
       },
-
       //获取钉钉免登码
       p_loginDing(){
+        const { quickLogin } = this;
+
         dd.getAuthCode({
-          corpId: 'ding12345xxx',
+          corpId: quickLogin.corp_id,
           success: (res) => {
+            console.log("钉钉授权成功", res);
             const { authCode } = res;
             jfbRootExec("loginDing", {
               vm: this,
@@ -359,12 +373,17 @@
                   url: `${phone_auth_callback_url}?access_code=${access_code}&phone_number=${phone_number}`
                 });
               }else{
-                this.toHomeAfterLogin();
+                //passport登录
+                this.p_passportSaasLogin({access_code})
               }
             })
           },
-          fail: () => {},
-          complete: () => {},
+          fail: () => {
+            console.error("钉钉授权失败")
+          },
+          complete: () => {
+            console.info("钉钉授权完成")
+          },
         })
       },
       //账号登录
@@ -410,14 +429,13 @@
           });
       },
       //选择企业后，需要passport登录
-      p_passportSaasLogin(item){
+      p_passportSaasLogin({access_code}){
         let redirect_url = this.handleRedirectUrl();
         const { phone_number, password, verification_code } = this.accountForm;
         jfbRootExec("passportSaasLogin", {
           vm: this,
           data: {
-            access_token: item.access_code,
-            redirect_url,
+            access_token: access_code,
             phone_number,
             valid_code: verification_code,
             biz_name: this.biz_name

package/src/components/JfbBaseSaasNewsList/Attr.js

@@ -12,7 +12,7 @@ export default {
         ele: 'xd-select-pages-path', //package 名称
         valueKey: 'newsDetailUrl', //form[valueKey]
         placeholder: '请选择新闻详情地址',
-        value: null,
+        value: data.newsDetailUrl || null,
         setting: {
           router: XdBus.getParentApi('getPagesTree'),
         },

package/src/components/JfbBaseSassPhoneCollect/Api.js

@@ -23,6 +23,21 @@ module.exports = [
     isConsole: true,
     disabled: true,
   },
+  {
+    mapFnName: "passportSaasLogin",
+    title: "saas用户登录",
+    path: "/passport-pb/v1/user/login-saas",
+    isRule: false,
+    params: {
+      access_token: ['access_token', 'String', true],
+      redirect_url: ['跳转地址', 'String', true],
+      phone_number: ['手机号', 'String', true],
+      valid_code: ['手机验证码', 'String', true],
+      biz_name: ['验证码校验参数', 'String', true]
+    },
+    isConsole: true,
+    disabled: true,
+  },
   {
     mapFnName: 'phoneCollect',
     title: "收集手机号",

package/src/components/JfbBaseSassPhoneCollect/JfbBaseSassPhoneCollect.vue

@@ -25,6 +25,7 @@
           <xd-form-item label="手机号" content-align="left">
             <xd-form-input
               v-model="accountForm.phone_number"
+              disabled
               placeholder="请输入11位手机号"
             />
           </xd-form-item>
@@ -43,7 +44,7 @@
             </view>
           </xd-form-item>
         </xd-form>
-        <view class="form-group" style="padding-bottom: 0">
+        <!-- <view class="form-group" style="padding-bottom: 0">
           <xd-form-checkbox
             class="xd-form-checkbox"
             v-model="panel_1_checked"
@@ -59,8 +60,8 @@
               </view>
             </template>
           </xd-form-checkbox>
-        </view>
-        <view class="form-group">
+        </view> -->
+        <!-- <view class="form-group">
           <xd-button
             style="flex: 1"
             type="primary"
@@ -69,11 +70,20 @@
             @click="doLoginForm"
             >登录</xd-button
           >
+        </view> -->
+        <view class="form-group">
+          <xd-button
+            style="flex: 1"
+            type="primary"
+            radius="10rpx"
+            @click="doLoginForm"
+            >确定</xd-button
+          >
         </view>
-        <view
+        <!-- <view
           class="jump_collect"
           @click="jumpCollect"
-        >跳过</view>
+        >跳过</view> -->
       </view>
     </view>
   </view>
@@ -111,6 +121,8 @@
           phone_number: "",
           verification_code: "",
         },
+        access_code: "",
+        phone_number: "",
         jfbTimeer: 0,
         interval: null,
         provider_id: "",
@@ -146,6 +158,9 @@
       onJfbLoad(options) {
         this.provider_id = options.provider_id;
         this.callback_url = options.callback_url;
+        this.access_code = options.access_code;
+        this.phone_number = options.phone_number;
+        this.$set(this.accountForm, 'phone_number', options.phone_number);
       },
       /**
        * @description 监听事件变化
@@ -205,17 +220,16 @@
         });
       },
       doLoginForm() {
-        const { provider_id } = this;
         const { phone_number, verification_code } = this.accountForm;
         if (!phone_number || !verification_code) return uni.showToast({ title: "手机号跟验证码不能为空", icon: "none" });
 
         this.$xdShowLoading({})
-        jfbRootExec("phoneCollect", {
+        jfbRootExec("phoneAuth", {
           vm: this,
           data: {
-            provider_id,
             phone_number,
-            verification_code,
+            valid_code: verification_code,
+            access_code: this.access_code
           },
         }).then((res) => {
           this.$xdHideLoading()
@@ -260,7 +274,76 @@
 
   .jfb-base-sass-phone-collect {
     &__body{
+      .xd-form-checkbox {
+        /deep/ .checklist-content .checklist-text {
+          font-size: 26rpx !important;
+        }
+      }
 
+      .xd-form-checkbox {
+        /deep/ .checklist-box {
+          margin: 0 !important;
+        }
+      }
+      .xd-form-checkbox {
+        /deep/ .checklist-group {
+          justify-content: center;
+        }
+      }
+
+      .xd-form-checkbox {
+        /deep/ .checklist-text {
+          margin-left: unit(20,rpx) !important;
+        }
+      }
+
+      .form-group {
+        padding: 40rpx 70rpx;
+      }
+
+      .get_code {
+        color: @xd-base-color;
+        font-size: 24rpx;
+      }
+      .panel-login-password {
+        /deep/ .uni-forms-item__label {
+          .label-text {
+            font-size: 26rpx;
+            color: #a6a6a6;
+          }
+        }
+
+        /deep/ .uni-easyinput__placeholder-class {
+          font-size: 26rpx;
+          color: #d4d4d4;
+        }
+
+        .not_login {
+          position: fixed;
+          width: 100%;
+          text-align: center;
+          bottom: 100rpx;
+          font-size: 24rpx;
+          color: #fe7a63;
+        }
+        .jump_collect{
+          font-size: 24rpx;
+          color: #a6a6a6;
+          text-align: right;
+          margin: 20rpx 70rpx 0 0;
+        }
+      }
     }
   }
+  .flex {
+    display: flex;
+  }
+
+  .flex-sub {
+    flex: 1;
+  }
+
+  .align-center {
+    align-items: center;
+  }
 </style>