jufubao-base 1.0.159-beta9 → 1.0.160-beta1

package/package.json

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

package/src/components/JfbBaseCardEntry/JfbBaseCardEntry.vue

@@ -470,9 +470,9 @@ export default {
     this.init(this.container);
     this.noticeBackgroundColor = Color(this.warningColor).alpha(0.2).toString();
     this.isPreview = this.$configProject.isPreview;
+    this.isQrCode = isQrCode(this);
 
     //#ifdef H5
-    this.isQrCode = isQrCode(this);
     if (!this.$configProject.isPreview) {
       jfbRootExec("getH5WxAuthorize", {
         vm: this,
@@ -559,7 +559,7 @@ export default {
         uni.scanCode({
           scanType: ["qrCode"],
           success: (res) => {
-            let path = this.getUrlCallback(`${this.confirmUrl}?qrcode=${encodeURIComponent(res.resultStr)}`)
+            let path = this.getUrlCallback(`${this.confirmUrl}?qrcode=${encodeURIComponent(res.result)}`)
             this.$xdUniHelper.navigateTo({
               url:path,
             });

package/src/components/JfbBaseCardInfo/JfbBaseCardInfo.vue

@@ -31,6 +31,7 @@
           <view class="jfb-base-card-info__body-form">
             <view class="jfb-base-card-info__body-form-label">票券密码</view>
             <input
+              class="mp"
               max="18"
               :password="isPassword"
               v-model="card_password"
@@ -70,9 +71,7 @@
           <view v-if="isShowBalance" class="jfb-base-card-info__body-residue">
             <view class="jfb-base-card-info__body-residue-wrap">
               <view class="jfb-base-card-info__body-residue-label">
-                <view :style="{ color: '#242424', fontSize: '28rpx' }"
-                  >剩余元宝</view
-                >
+                <view :style="{ color: '#242424', fontSize: '28rpx' }">剩余元宝</view>
               </view>
               <view class="jfb-base-card-info__body-residue-value">
                 <xd-unit
@@ -227,7 +226,6 @@ export default {
       }
 
       let path = this.getUrlCallback(this.my_card_url || this.backUrl);
-
       //有优惠券处理
       if(this.hasCon){
         this.toShowCouponDialog();
@@ -292,13 +290,15 @@ export default {
     },
     onJfbLoad(options) {
       this.init();
+
       this.qrcode = options.qrcode;
+
       //#ifdef MP-WEIXIN
       if(options.qrcode) {
         this.qrcode = decodeURIComponent(options.qrcode);
       }
-
       //#endif
+
       if(options.inCallback) {
         this.inCallbackUrlOrg = options.inCallback;
       }
@@ -421,7 +421,6 @@ export default {
         display: flex;
         justify-content: center;
         align-items: center;
-        width: 72rpx;
         height: 72rpx
       }
 

package/src/components/JfbBaseCardInfoEntry/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',