jufubao-base 1.0.169-beta21 → 1.0.169-beta22

package/package.json

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

package/src/components/JfbBaseLogin/Attr.js

@@ -775,6 +775,16 @@ export default {
         className: "input70",
         hidden: data.previewCurrent !== "account",
       },
+      {
+        label: '密码图标:',
+        ele: "el-input",
+        valueKey: "passwordIcon",
+        value: data.passwordIcon || "",
+        groupKey:'style',
+        placeholder: "请输入密码图标",
+        className: "input70",
+        hidden: data.previewCurrent !== "account",
+      },
       {
         label: "标签字体样式设置:",
         ele: "xd-font",

package/src/components/JfbBaseLogin/JfbBaseLogin.vue

@@ -175,6 +175,7 @@
               class="form-item"
               :class="[inputStyle]"
               label="密码"
+              :leftIcon="passwordIcon"
               :labelWidth="labelWidth"
               content-align="left"
             >
@@ -398,6 +399,7 @@ export default {
       },
       phoneIcon: "", //手机号登录输入框图标
       codeIcon: "", //验证码登录输入框图标
+      passwordIcon: "", //密码登录输入框图标
       inputStyle: "linear", //输入框样式 linear:线性  face: 面性
       formBorderColor: "#F9F9F9", //
       formBorderWidth: 1, //表单边框宽度
@@ -658,6 +660,7 @@ export default {
       this.authBtnPadding = getContainerPropsValue(value, "content.authBtnPadding", {top: 20, left: 20, right: 20, bottom: 20});
       this.phoneIcon = getContainerPropsValue(value, "content.phoneIcon", '');
       this.codeIcon = getContainerPropsValue(value, "content.codeIcon", '');
+      this.passwordIcon = getContainerPropsValue(value, "content.passwordIcon", '');
       this.inputStyle = getContainerPropsValue(value, "content.inputStyle", 'linear');
       this.formBorderColor = getContainerPropsValue(value, "content.formBorderColor", '#F9F9F9');
       this.formBorderWidth = getContainerPropsValue(value, "content.formBorderWidth", '1');

package/src/components/JfbBaseTfkCardBind/JfbBaseTfkCardBind.vue

@@ -589,6 +589,21 @@
         let valid_token = this.$xdUniHelper.randomChar(20);
         this.valid_token = valid_token;
       },
+      p_qrCardBind(result){
+        jfbRootExec("qrCardBind", {
+          vm: this,
+          data: {
+            card_qrcode: result,
+            is_show_pop: "Y"
+          }
+        }).then(res => {
+          console.log(res);
+          this.handlerAfterBindCard(res)
+        }).catch(err => {
+          console.log(err);
+          this.$xdLog.catch(err)
+        })
+      },
       doScanCode(){
         console.log("开始扫码");
         // #ifdef H5
@@ -596,7 +611,8 @@
           needResult: 1,
           scanType: ["qrCode"],
           success: res => {
-            this.$set(this.form, 'card_number', res.resultStr)
+            // this.$set(this.form, 'card_number', res.resultStr)
+            this.p_qrCardBind(res.resultStr)
           },
           fail: (error) => {
             if (typeof error === 'string') error = {error: error}
@@ -608,7 +624,8 @@
         // #ifdef MP
         uni.scanCode({
           success: res => {
-            this.$set(this.form, 'card_number', res.result)
+            // this.$set(this.form, 'card_number', res.result)
+            this.p_qrCardBind(res.result)
           },
           fail: (error) => {
             this.$xdLog.setARMSError(error)