jufubao-base 1.0.119-beta2 → 1.0.119-beta4

package/src/components/JfbBaseSaasLogin/saaslogin_copy.vue

@@ -0,0 +1,410 @@
+<template>
+  <view
+    class="jfb-base-saas-login"
+    @click="handleEditxSelect"
+    :class="{ editx : isEditx && active }"
+  >
+    <!--#ifdef H5-->
+    <view
+      class="jfb-base-saas-login__edit"
+      :class="{ editx : isEditx && active }"
+      v-if="isEditx && active"
+    >
+      <view class="jfb-base-saas-login__edit-icon" @click="delEdit">删除</view>
+    </view>
+    <!-- #endif -->
+    <view class="jfb-base-saas-login__body" :style="{
+      minHeight: layoutInfo.bodyMinHeightPx + 'px'
+    }">
+      <view class="login_form_wrap">
+        <xd-form
+          label-width="130"
+          label-align="right"
+          content-align="left"
+          :border="true"
+          paddingBetween="40"
+        >
+          <xd-form-item class="form-item"
+            label="手机号"
+            content-align="left"
+          >
+            <xd-form-input
+              v-model="accountForm.phone_number"
+              placeholder="请输入11位手机号"
+            />
+          </xd-form-item>
+          <xd-form-item
+            label="验证码"
+            content-align="left"
+          >
+            <view class="flex align-center">
+              <xd-form-input
+                v-model="accountForm.verification_code"
+                placeholder="请输入验证码"
+              />
+              <view
+                class="get_code"
+                @click="reGetCode"
+                :style="{ color: mainColor }"
+                >{{ time ? time + "秒后获取" : "获取验证码" }}
+              </view>
+            </view>
+          </xd-form-item>
+          <!-- <xd-form-item
+            label="密码"
+            content-align="left"
+          >
+            <xd-form-input
+              type="password"
+              v-model="accountForm.password"
+              placeholder="请输入密码"
+            />
+          </xd-form-item> -->
+        </xd-form>
+
+        <view class="form-group" style="padding-bottom:0">
+          <xd-form-checkbox
+            class="xd-form-checkbox"
+            v-model="panel_2_checked"
+            mode="default"
+            multiple
+            :localdata="[{ value: 1, text: '登录即同意《隐私政策》《用户服务协议》' },]"
+          >
+            <template slot="a1">
+              <view>
+                <text>请阅读并同意</text>
+                <text @click.stop="handlePrivacy('privacy_privacy')" :style="{color: mainColor}">《隐私政策》</text>
+                <text @click.stop="handlePrivacy('privacy_service')" :style="{color: mainColor}">《用户服务协议》</text>
+              </view>
+            </template>
+          </xd-form-checkbox>
+        </view>
+        <view class="form-group">
+          <xd-button
+            style="flex: 1"
+            type="primary"
+            radius="10rpx"
+            :disabled="!panelTwoIsChecked"
+            @click="doLoginForm"
+          >登录</xd-button>
+        </view>
+        <!-- <view
+          class="forget_password"
+          @click="toValidPhone"
+        >忘记密码</view> -->
+      </view>
+      <view class="not_login">暂不登录，去逛逛</view>
+      <xd-dailog :show.sync="dialogShow" title="">
+        <view class="dia_title">您在多个企业任职<br/>请选择本次要访问的企业</view>
+        <view class="company_list">
+          <view class="company_item" v-for="(item, i) in companyList" :key="i" @click="toHome(item)">
+            <view class="_name">{{ item.company_name }}</view>
+            <xd-font-icon icon="iconxiangyou_xian" :size="30"></xd-font-icon>
+          </view>
+        </view>
+        <view slot="btn"></view>
+      </xd-dailog>
+    </view>
+  </view>
+</template>
+
+<script>
+  import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
+  import XdButton from "@/components/XdButton/XdButton";
+  import XdFormCheckbox from "@/components/XdFormCheckbox/XdFormCheckbox";
+  import XdFormInput from "@/components/XdFormInput/XdFormInput";
+  import XdForm from "@/components/XdForm/XdForm";
+  import XdFormItem from "@/components/XdFormItem/XdFormItem";
+  import XdDailog from "@/components/XdDailog/XdDailog"
+  import { jfbRootExec } from "@/utils/xd.event";
+  import JfbBaseSaasLoginMixin from "./JfbBaseSaasLoginMixin";
+  import { getContainerPropsValue } from "@/utils/xd.base";
+  import componentsMixins from "@/mixins/componentsMixins";
+  import extsMixins from "@/mixins/extsMixins";
+  export default {
+    name: "JfbBaseSaasLogin",
+    components: {
+      XdFontIcon,
+      XdButton,
+      XdFormCheckbox,
+      XdFormInput,
+      XdForm,
+      XdFormItem,
+      XdDailog
+    },
+    mixins: [
+      componentsMixins, extsMixins, JfbBaseSaasLoginMixin
+    ],
+    computed: {
+      panelTwoIsChecked() {
+        return this.panel_2_checked.includes(1);
+      },
+    },
+    data() {
+      return {
+        accountForm: {
+          phone_number: "",
+          password: "",
+          verification_code: ""
+        },
+        time: 0,
+        panel_2_checked: "",
+        redirect_url: "", //401回跳地址
+        dialogShow: false,
+        companyList: [],
+
+        //面板
+        callback_url: "", //面板配置登录完跳转地址
+        forget_pwd_url: "", //忘记密码跳转地址
+      }
+    },
+    watch: {
+      container(value) {
+        this.init(value)
+      }
+    },
+    created() {
+      this.init(this.container);
+    },
+    methods: {
+      onJfbLoad(options) {
+        this.redirect_url = options.redirect_url ? Base64.decode(options.redirect_url): '';
+      },
+      /**
+       * @description 监听事件变化
+       * @param container {object} 业务组件对象自己
+       */
+      init(container) {
+        this.callback_url = getContainerPropsValue(container, "content.callback_url", {value: ''}).value;
+        this.forget_pwd_url = getContainerPropsValue(container, "content.forget_pwd_url", {value: ''}).value;
+      },
+      doLoginForm() {
+        const { phone_number, password, verification_code } = this.accountForm;
+        let err_tip = "";
+        if (!phone_number) err_tip = "手机号不能为空";
+        else if (!verification_code) err_tip = "验证码不能为空";
+        if (err_tip) {
+          return uni.showToast({
+            title: err_tip,
+            icon: "none",
+          });
+        }
+
+        this.$xdShowLoading({})
+        jfbRootExec("sassLogin", {
+          vm: this,
+          data: {
+            biz_name: "login",
+            phone_number: phone_number,
+            valid_code: verification_code,
+          },
+        })
+          .then((res) => {
+            this.$xdHideLoading()
+            // this.jfbAuthorize.setAllToken(res);
+            // this.toHomeAfterLogin();
+            if(res.list.length === 0){
+              uni.showToast({
+                title: '该用户没有所属企业',
+                duration: 2000
+              });
+            }
+            else if(res.list.length > 1){
+              this.companyList = res.list;
+              this.dialogShow = true;
+            }else{
+              this.toHome(res.list[0])
+            }
+          })
+          .catch(error => {
+            this.$xdHideLoading()
+            this.$xdLog.catch(error)
+          });
+      },
+      toHome(item){
+        this.$xdUniHelper.redirectTo({
+          url: `/apply/main/saas/home?company_id=${item.company_id}`
+        });
+        // this.toHomeAfterLogin();
+      },
+      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,
+        });
+      },
+      //跳转忘记密码
+      toValidPhone() {
+        this.$xdUniHelper.navigateTo({
+          url: this.forget_pwd_url,
+        });
+      },
+      handlePrivacy(code){
+        let params = `page_id=${this.pageAttr["page_id"]}`;
+        params = `${params}&container_id=${this.containerId}${code}`;
+        this.$xdUniHelper.navigateTo({
+          url: `/pages/content/content?${params}`
+        })
+      },
+      reGetCode() {
+        if (this.time > 0) return;
+        const { phone_number } = this.accountForm;
+        if (!/^1[3-9]\d{9}$/.test(phone_number)) {
+          uni.showToast({
+            title: "请填写正确的手机号",
+            icon: "none",
+          });
+          return false;
+        }
+        this.$xdShowLoading({});
+        jfbRootExec("sendMsg", {
+          vm: this,
+          data: {
+            phone_number,
+            biz_name: "login",
+          },
+        }).then((res) => {
+          this.$xdHideLoading();
+          this.time = 120;
+          this.interval = setInterval(() => {
+            this.time--;
+            if (this.time === 0) {
+              clearTimeout(this.interval);
+            }
+          }, 1000);
+        }).catch((error) => {
+          this.$xdHideLoading();
+          console.error(error);
+          this.$xdLog.catch(error)
+        });
+      },
+      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)
+        this.$xdUniHelper.navigateBack();
+      },
+      onJfbUpdate(...data) {
+        console.log('event.onJfbUpdate', data)
+      },
+      onJfbCustomEvent(options) {
+        console.log('event.onJfbReachBottom', options)
+      },
+    }
+  }
+
+</script>
+
+<style scoped lang="less">
+  @import "./JfbBaseSaasLoginLess.less";
+
+  .jfb-base-saas-login {
+    border: 1px dashed rgba(0, 0, 0, 0);
+    box-sizing: border-box;
+    &__body{
+      position: relative;
+      .dia_title{
+        color: #333333;
+        font-size: 32rpx;
+        font-weight: 500;
+        margin: 60rpx 0;
+      }
+      .company_list{
+        .company_item{
+          display: flex;
+          justify-content: space-between;
+          background: #FE7A63;
+          border-radius: 60rpx;
+          padding: 20rpx 48rpx;
+          color: #FFFFFF;
+          margin: 20rpx 0;
+          ._name{
+            flex: 1;
+            width: 100rpx;
+            overflow: hidden;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+          }
+        }
+      }
+      .not_login{
+        position: absolute;
+        bottom: 200rpx;
+        text-align: center;
+        width: 100%;
+        color: #FE7A63;
+        font-size: 24rpx;
+      }
+      .xd-form-checkbox {
+        /deep/ .checklist-content .checklist-text {
+          font-size: 26rpx !important;
+        }
+      }
+      .xd-form-checkbox {
+        /deep/ .checklist-box {
+          margin: 0;
+        }
+      }
+      .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;
+        margin-right: unit(20,rpx);
+      }
+      .form-item {
+        /deep/ .uni-forms-item {
+          padding-left: unit(30rpx) !important;
+        }
+      }
+      /deep/ .uni-forms-item__label {
+        .label-text {
+          font-size: 26rpx;
+          color: #a6a6a6;
+        }
+      }
+      /deep/ .uni-easyinput__placeholder-class {
+        font-size: 26rpx;
+        color: #d4d4d4;
+      }
+      .forget_password {
+        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>

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

@@ -66,7 +66,8 @@
     },
     methods: {
       onJfbLoad(options) {
-        this.p_getNewsList("news")
+        let position_id = options.position_id;
+        this.p_getNewsList(position_id)
       },
       /**
        * @description 监听事件变化

package/src/components/JfbBaseSassPhoneCollect/Api.js

@@ -11,6 +11,33 @@
  * @type {*[]}
  */
 module.exports = [
+  {
+    mapFnName: "phoneAuth",
+    title: "三方登入 - 手机号认证",
+    path: "/saas/v1/login/phone-auth",
+    isRule: false,
+    data: {
+      access_code: ['临时访问标识', 'String', true],
+      valid_code: ['验证码', 'String', true],
+    },
+    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>