jufubao-base 1.0.212-beta89 → 1.0.213-beta1

package/package.json

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

package/src/components/JfbBaseConPhone/JfbBaseConPhone.vue

@@ -131,7 +131,7 @@
           <view class="h_sub">请务必由本人签收，字迹工整</view>
         </view>
         <view class="sign_box">
-          <xd-signature ref="signatureRef" v-if="showSignatureRef"></xd-signature>
+          <xd-signature ref="signatureRef" backgroundColor="#fff" v-if="showSignatureRef"></xd-signature>
         </view>
         <view slot="btn" class="btn_wrap">
           <xd-button style="width: 220rpx;" @click="clearSign">重写</xd-button>

package/src/components/JfbBasePhoneCollect/JfbBasePhoneCollect.vue

@@ -41,6 +41,18 @@
               'margin-top': '40rpx'
             }"
         >
+          <xd-form-item 
+            v-if="isCollectUsername"
+            class="form-item"
+            :class="[inputStyle]" 
+            :labelWidth="labelWidth" 
+            label="姓名" 
+            content-align="left">
+            <xd-form-input
+              v-model="accountForm.user_name"
+              placeholder="请输入姓名"
+            />
+          </xd-form-item>
           <xd-form-item 
             class="form-item"
             :class="[inputStyle]" 
@@ -131,6 +143,9 @@ import XdFormInput from "@/components/XdFormInput/XdFormInput";
 import XdButton from "@/components/XdButton/XdButton";
 import XdFormCheckbox from "@/components/XdFormCheckbox/XdFormCheckbox";
 import JfbBasePhoneCollectMixin from "./JfbBasePhoneCollectMixin";
+//#ifdef H5
+import cookie from "@/common/cookie";
+//#endif
 
 export default {
   // #ifdef MP-WEIXIN
@@ -159,6 +174,7 @@ export default {
       provider_id: "",
       callback_url: "",
       is_show_skip: "Y",
+      isCollectUsername: false,
 
       inputStyle: "linear", //输入框样式 linear:线性  face: 面性
       formBorderColor: "#F9F9F9", //
@@ -294,6 +310,9 @@ export default {
   },
   created() {
     this.init(this.container);
+    // #ifdef H5
+    this.isCollectUsername = !!cookie.get("JFB-IS-COLLECT-NAME");
+    // #endif
   },
   methods: {
     handlePrivacy(code) {
@@ -413,8 +432,9 @@ export default {
     },
     doLoginForm() {
       const { provider_id } = this;
-      const { phone_number, verification_code } = this.accountForm;
+      const { phone_number, verification_code, user_name } = this.accountForm;
       if (!phone_number || !verification_code) return uni.showToast({ title: "手机号跟验证码不能为空", icon: "none" });
+      if(this.isCollectUsername && !user_name) return uni.showToast({ title: "用户名不能为空", icon: "none" });
 
       this.$xdShowLoading({})
       jfbRootExec("phoneCollect", {
@@ -423,6 +443,7 @@ export default {
           provider_id,
           phone_number,
           verification_code,
+          user_name,
         },
       }).then((res) => {
         this.$xdHideLoading()

package/src/components/JfbBasePhoneLogin/JfbBasePhoneLogin.vue

@@ -43,6 +43,19 @@
             'margin-top': '40rpx',
           }"
         >
+          <xd-form-item
+            v-if="isCollectUsername"
+            class="form-item"
+            :class="[inputStyle]"
+            :labelWidth="labelWidth"
+            label="姓名"
+            content-align="left"
+          >
+            <xd-form-input
+              v-model="accountForm.user_name"
+              placeholder="请输入姓名"
+            />
+          </xd-form-item>
           <xd-form-item
             class="form-item"
             :class="[inputStyle]"
@@ -134,6 +147,9 @@ import XdForm from "@/components/XdForm/XdForm";
 import XdFormInput from "@/components/XdFormInput/XdFormInput";
 import XdButton from "@/components/XdButton/XdButton";
 import XdFormCheckbox from "@/components/XdFormCheckbox/XdFormCheckbox";
+//#ifdef H5
+import cookie from "@/common/cookie";
+//#endif
 
 export default {
   // #ifdef MP-WEIXIN
@@ -162,6 +178,7 @@ export default {
       auth_code: "",
       provider_id: "",
       callback_url: "",
+      isCollectUsername: false,
 
       inputStyle: "linear", //输入框样式 linear:线性  face: 面性
       formBorderColor: "#F9F9F9", //
@@ -305,6 +322,9 @@ export default {
   },
   created() {
     this.init(this.container);
+    // #ifdef H5
+    this.isCollectUsername = !!cookie.get("JFB-IS-COLLECT-NAME");
+    // #endif
   },
   methods: {
     handlePrivacy(code) {
@@ -489,9 +509,13 @@ export default {
     },
     doLoginForm() {
       const { auth_code, provider_id } = this;
-      const { phone_number, verification_code } = this.accountForm;
-      if (!phone_number || !verification_code)
+      const { phone_number, verification_code, user_name } = this.accountForm;
+      if (!phone_number || !verification_code){
         return uni.showToast({ title: "手机号跟验证码不能为空", icon: "none" });
+      }
+      if(this.isCollectUsername && !user_name){
+        return uni.showToast({ title: "用户名不能为空", icon: "none" });
+      }
       this.$xdShowLoading({});
       jfbRootExec("phoneLogin", {
         vm: this,
@@ -500,6 +524,7 @@ export default {
           provider_id,
           phone_number,
           verification_code,
+          user_name
         },
       })
         .then((res) => {