jufubao-base 1.0.159 → 1.0.160-beta1

package/src/components/JfbBaseCardBindV2/JfbBaseCardBindV2.vue

@@ -17,7 +17,11 @@
       <xd-form class="form-wrap" content-align="left" :paddingBetween="0">
         <xd-form-item content-align="left" labelWidth="60" leftIcon="iconpiao">
           <view class="card_wrap">
-            <xd-form-input v-model="cardForm.card_number"  placeholder="请输入票券号"></xd-form-input>
+            <xd-form-input
+              class="card_wrap_input"
+              v-model="cardForm.card_number"
+              placeholder="请输入票券号"
+            ></xd-form-input>
             <view
               class="scan_icon"
               @click="doScanCode"
@@ -64,6 +68,9 @@
   import extsMixins from "@/mixins/extsMixins";
   import { mapState } from "vuex"
   export default {
+    //#ifdef MP-WEIXIN
+    options: { styleIsolation: 'shared' },
+    //#endif
     name: "JfbBaseCardBindV2",
     components: {
       XdFontIcon,
@@ -96,8 +103,9 @@
       }
     },
     watch: {
-      container(value) {
-        this.init(value)
+      container(value,oldValue) {
+        if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
+        if (this.$configProject['isPreview']) this.init(value)
       }
     },
     created() {
@@ -136,7 +144,6 @@
         this.backUrl = getContainerPropsValue(container, "content.backUrl", {value: "/system/card/login"}).value;
       },
       handleBindSuccess(){
-        debugger
         this.$xdAlert({
           content: "绑定成功",
           close: () => {
@@ -173,6 +180,7 @@
       },
 
       doScanCode(){
+        //#ifdef H5
         this.jwxSDK.scanQRCode({
           needResult: 1,
           scanType: ["qrCode", "barCode"],
@@ -197,28 +205,35 @@
               content: err.errMsg,
             });
           }
-        })
-      },
-      onJfbScroll(options) {
-        console.log('event.onJfbScroll', options)
-      },
-      onJfbReachBottom(options) {
-        console.log('event.onJfbReachBottom', options)
-      },
-      onJfbShow(options) {
-        console.log('event.onJfbShow', options)
-      },
-      onJfbHide(options) {
-        console.log('event.onJfbHide', options)
+        });
+        //#endif
+        //#ifdef MP-WEIXIN
+        uni.scanCode({
+          scanType: ["qrCode"],
+          success: (res) => {
+            this.cardForm.card_qrcode = res.result;
+            jfbRootExec("qrCardBind", {
+              vm: this,
+              data: {
+                card_qrcode: res.result
+              }
+            }).then(res => {
+              this.handleBindSuccess()
+            }).catch(err => {
+              this.$xdLog.catch(err)
+            })
+          },
+          fail: (error) => {
+            this.$xdAlert({
+              content: error.errMsg,
+            });
+          },
+        });
+        //#endif
       },
+
       onJfbBack(options) {
-        console.log('event.onJfbBack', options)
-      },
-      onJfbUpdate(...data) {
-        console.log('event.onJfbUpdate', data)
-      },
-      onJfbCustomEvent(options) {
-        console.log('event.onJfbReachBottom', options)
+        this.$xdUniHelper.redirectBack()
       },
     }
   }
@@ -233,7 +248,7 @@
       padding: 40rpx;
 
       .form-wrap{
-        /deep/ .uni-forms-item__inner{
+        & /deep/ .uni-forms-item__inner {
           border-bottom: 1px solid #EEEEEE;
           padding-bottom: 0;
           margin-bottom: 24rpx;
@@ -243,14 +258,30 @@
       .card_wrap{
         display: flex;
         align-items: center;
+        justify-content: space-between;
+
+        & > .card_wrap_input {
+          flex: 1;
+        }
+        & > .scan_icon, & > .capture {
+          flex-shrink: 0;
+        }
       }
       .img_wrap{
         display: flex;
         align-items: center;
+        justify-content: space-between;
+
+        & > .card_wrap_input {
+          flex: 1;
+        }
+
         .capture{
           width: 180rpx;
-          height: 80rpx;
+          height: 66rpx;
+          margin-left: 10rpx;
           background: #DDD;
+          flex-shrink: 0;
         }
       }
       .confirm_btn{

package/src/components/JfbBaseCardDetail/JfbBaseCardDetail.vue

@@ -126,7 +126,7 @@ export default {
   data() {
     return {
       userInfo: null, //用户信息（暂时不可用）
-      
+
       info: null,
       valueKey: [
         {
@@ -169,7 +169,7 @@ export default {
       brandLogo:
         "data:image/png;base64,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",
       isBrandLogo: false,
-      
+
       isShowUnbind: false, //是否启动绑定按钮
     };
   },
@@ -184,11 +184,11 @@ export default {
           console.warn(options["x-params"]);
         }
       }
-      
+
       this.$nextTick(() => {
         this.card_number = options.card_number;
         this.init();
-    
+
         // if (card_number) {
         //   this.card_number = card_number;
         //   if (this.brandInfo['is_enable_pay_password'] === 'N') {
@@ -245,7 +245,7 @@ export default {
       //   }
       // }
     },
-    
+
     onJfbUnload() {
       this.timeStr = ""
       if (this.timeer) {
@@ -265,7 +265,7 @@ export default {
         clearTimeout(this.refrushTimeer);
       }
     },
-    
+
     onJfbBack(options) {
       if (this.timeer) {
         clearTimeout(this.timeer);
@@ -275,7 +275,7 @@ export default {
       }
       this.$xdUniHelper.navigateBack();
     },
-    
+
     setInval(time) {
       console.log("pppppp", time);
       this.timeer = setInterval(() => {
@@ -293,16 +293,15 @@ export default {
         }
       }, 1000);
     },
-    
+
     handleUnBindCard() {
       this.$xdConfirm({
-        $vm: this,
+        styles: this.styles,
         content: "您确定要解除绑定卡券吗",
         title: "系统提示",
         width: "80%",
         isTitle: true,
         zIndex: 2000,
-        vm: this,
         success: (res) => {
           if (res.confirm) {
             this.timeStr = ""
@@ -333,7 +332,7 @@ export default {
         },
       });
     },
-    
+
     refrush() {
       if (this.stopTimer) return;
       if (this.time >= this.maxTime) {
@@ -377,7 +376,7 @@ export default {
           .catch();
       }, time);
     },
-    
+
     init() {
       this.detail();
       this.refrush();
@@ -386,7 +385,7 @@ export default {
       }
       this.backUrl = getContainerPropsValue( this.container,  "content.back_url", { value: "" }).value;
     },
-    
+
     /**
      * @description 获取卡详情
      */
@@ -412,7 +411,7 @@ export default {
           if (res["is_show_qrcode_logo"] === "Y") {
             this.isBrandLogo = true;
           }
-          
+
           this.isShowUnbind = (res["is_can_unbind"] === 'Y' || res["is_can_unbind"] === undefined);
         })
         .catch((err) => {
@@ -423,7 +422,7 @@ export default {
     handleOnClose() {
       this.editShow = false;
     },
-    
+
     handlePwdOnSubmit(val) {
       this.password = val;
       this.init();

package/src/components/JfbBaseCardDetailEntry/Attr.js

@@ -4,6 +4,28 @@ export default {
   style: [],
   advanced: [],
   content: [
+    {
+      label: '选择综合入口类型:',
+      ele: 'xd-site-select-list',
+      valueKey: 'entryGroupId',
+      value: 'default',
+      placeholder: '请选择综合入口类型',
+      multiple: false,
+      groupKey:'content',
+      className: 'input50',
+      rules: [
+        {required: true, message: '请选择综合入口类型', trigger: ['blur', 'change']}
+      ],
+      handleCustom({action, data}) {
+        XdBus.getParentApi('getEntryGroupOption')({key: Date.now()})
+          .then(res => {
+            data.cb(res.list)
+          })
+          .catch(error => {
+            console.error(error);
+          });
+      },
+    },
     {
       label: '票券解绑成功回跳地址:',
       ele: 'xd-select-pages-path',