jufubao-base 1.0.388 → 1.0.389

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.388",
+  "version": "1.0.389",
   "private": false,
   "description": "聚福宝业务组件基础插件包",
   "main": "index.js",
@@ -90,7 +90,6 @@
     "mini-css-extract-plugin": "^1.1.1",
     "mini-types": "*",
     "miniprogram-api-typings": "*",
-    "node-sass": "^4.0.0",
     "postcss-comment": "^2.0.0",
     "require-context": "^1.1.0",
     "sass": "^1.29.0",

package/src/components/JfbBasePhoneLogin/Api.js

@@ -22,6 +22,10 @@ module.exports = [
       auth_code: ['临时授权码', 'String', '否'],  //临时授权码,如果是快捷第一次登录，需要传
       raw_data: ['小程序手机号加密前的数据', 'String', null], //小程序手机号加密前的数据，如果传了手机号可以不传
       provider_id: ['登录方式id', 'Number', '必选'],
+      is_check_saas_company: ['是否验证SaaS公司', 'String', null],
+      saas_company_id: ['SaaS公司ID', 'String', null],
+      saas_user_name: ['用户姓名', 'String', null],
+      saas_job_number: ['工号', 'String', null],
     },
     isConsole: true,
     disable: true,

package/src/components/JfbBasePhoneLogin/Attr.js

@@ -475,6 +475,40 @@ export default {
         placeholder: "请输入验证码自定义提示语",
         className: 'input80',
       },
+      {
+        label: "是否开启公司验证",
+        ele: "xd-radio",
+        valueKey: "is_check_saas_company",
+        value: data['is_check_saas_company'] || "N",
+        groupKey: "content",
+        list: [
+          { label: '开启', value: 'Y' },
+          { label: '关闭', value: 'N' },
+        ]
+      },
+      data['is_check_saas_company'] && data['is_check_saas_company'] === 'Y' && {
+        label: "",
+        ele: "el-input",
+        valueKey: "saas_company_id",
+        value: data['saas_company_id'] || "",
+        groupKey: "content",
+        placeholder: "请输入公司ID",
+        className: 'input80',
+      },
+      data['is_check_saas_company'] && data['is_check_saas_company'] === 'Y' && {
+        label: '验证内容:',
+        ele: 'xd-select-list',
+        valueKey: 'verify_content',
+        groupKey: 'content',
+        className: 'input80',
+        value: data['verify_content'] || '',
+        multiple: true,
+        placeholder: "请选择验证内容",
+        list: [
+          { "label": "姓名", "value": 'name' },
+          { "label": "工号", "value": 'code_id' },
+        ]
+      },
       {
         ele: "title",
         label: "表单样式配置",
@@ -927,6 +961,6 @@ export default {
         inline: false,
         notice: '设置外边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
       },
-    ]
+    ].filter(i => i)
   }
 }

package/src/components/JfbBasePhoneLogin/JfbBasePhoneLogin.vue

@@ -57,6 +57,32 @@
               placeholder="请输入姓名"
             />
           </xd-form-item>
+          <xd-form-item
+            v-if="verify_content && verify_content.includes('name')"
+            class="form-item"
+            :class="[inputStyle]"
+            :labelWidth="labelWidth"
+            label="姓名"
+            content-align="left"
+          >
+            <xd-form-input
+              v-model="accountForm.saas_user_name"
+              placeholder="请输入姓名"
+            />
+          </xd-form-item>
+          <xd-form-item
+            v-if="verify_content && verify_content.includes('code_id')"
+            class="form-item"
+            :class="[inputStyle]"
+            :labelWidth="labelWidth"
+            label="工号"
+            content-align="left"
+          >
+            <xd-form-input
+              v-model="accountForm.saas_job_number"
+              placeholder="请输入工号"
+            />
+          </xd-form-item>
           <xd-form-item
             class="form-item"
             :class="[inputStyle]"
@@ -187,6 +213,9 @@ export default {
       accountForm: {
         phone_number: "",
         verification_code: "",
+        saas_user_name: "",
+        saas_job_number: "",
+        user_name: "",
       },
       jfbTimeer: 0,
       interval: null,
@@ -198,6 +227,9 @@ export default {
       share_code: "",
       phonePlaceholder:'', //
       codePlaceholder:'', //
+      verify_content: '',
+      is_check_saas_company: 'N',
+      saas_company_id: '',
 
       inputStyle: "linear", //输入框样式 linear:线性  face: 面性
       formBorderColor: "#F9F9F9", //
@@ -497,6 +529,9 @@ export default {
         this.labelPosition = "top";
         this.labelAlign = "left";
       }
+      this.verify_content = getContainerPropsValue(value, "content.verify_content", "");
+      this.is_check_saas_company = getContainerPropsValue(value, "content.is_check_saas_company", "N");
+      this.saas_company_id = getContainerPropsValue(value, "content.saas_company_id", "");
       if (this.$configProject.isPreview) {
         this.formRenderKey = Date.now();
       }
@@ -584,8 +619,8 @@ export default {
       });
     },
     doLoginForm() {
-      const { auth_code, provider_id } = this;
-      const { phone_number, verification_code, user_name } = this.accountForm;
+      const { auth_code, provider_id, is_check_saas_company, saas_company_id } = this;
+      const { phone_number, verification_code, saas_user_name, saas_job_number,user_name } = this.accountForm;
       if (!phone_number || !verification_code){
         return this.$xdAlert({
           content: '手机号跟验证码不能为空',
@@ -602,6 +637,22 @@ export default {
           zIndex: 5000
         });
       }
+      if(is_check_saas_company === 'Y' && !saas_job_number && this.verify_content.includes('saas_job_number')){
+        return this.$xdAlert({
+          content: '工号不能为空',
+          time: 2500,
+          isClose: false,
+          zIndex: 5000
+        });
+      }
+       if(is_check_saas_company === 'Y' && !saas_user_name && this.verify_content.includes('namesaas_user_name')){
+        return this.$xdAlert({
+          content: '用户姓名不能为空',
+          time: 2500,
+          isClose: false,
+          zIndex: 5000
+        });
+      }
       this.$xdShowLoading({});
       jfbRootExec("phoneLogin", {
         vm: this,
@@ -611,6 +662,10 @@ export default {
           phone_number,
           verification_code,
           user_name,
+          is_check_saas_company,
+          saas_company_id,
+          saas_user_name,
+          saas_job_number,
           share_code: this.share_code
         },
       })