jufubao-base 1.0.157-beta5 → 1.0.157-beta7

package/package.json

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

package/src/components/JfbBaseAddress/JfbBaseAddress.vue

@@ -327,7 +327,7 @@ export default {
       //     cancel: false,
       //     showClose: false,
       //     confirmText: "我知道了",
-      //     $vm: this
+      //     styles: this.styles,
       //   });
       //   return
       // }
@@ -458,7 +458,7 @@ export default {
           cancel: false,
           showClose: false,
           confirmText: "我知道了",
-          $vm: this
+          styles: this.styles,
         });
         return;
       }
@@ -469,7 +469,7 @@ export default {
         data: {
           address_nnid: item.address_nnid,
           is_select: "Y",
-          version: this.version          
+          version: this.version
         },
       })
         .then((res) => {
@@ -525,7 +525,7 @@ export default {
     handleDel(item) {
       console.log("handleDel", item);
       this.$xdConfirm({
-        $vm: this,
+        styles: this.styles,
         content: "确定删除当前配送地址吗?",
         width: "80%",
         success: (res) => {

package/src/components/JfbBaseBack/JfbBaseBack.vue

@@ -66,7 +66,7 @@
       this.init(this.container);
     },
     methods: {
-      
+
       /**
        * @description 监听事件变化
        * @param container {object} 业务组件对象自己
@@ -80,7 +80,7 @@
         this.shadow = (e.scrollTop > this.height ? this.height : e.scrollTop)/100;
         this.opacity = opacity < this.minOpacity ? this.minOpacity : opacity;
       },
-      
+
       onJfbBack() {
         this.$xdUniHelper.navigateBack();
       }
@@ -102,7 +102,7 @@
         height: unit(90, rpx);
         padding: 0 unit(10, rpx);
         position: relative;
-        
+
         &-icon {
           width: 1em;
           height: 1em;
@@ -112,12 +112,13 @@
           display: flex;
           justify-content: center;
           align-content: center;
+          align-items: center;
           flex-shrink: 0;
           position: relative;
           z-index: 2;
           background: #fff;
         }
-  
+
         &-text {
           font-size: unit(54, rpx);
           padding-right: 1em;
@@ -125,7 +126,7 @@
           position: relative;
           z-index: 2;
           color: #666;
-          
+
           & > view {
             width: 100%;
             text-align: center;
@@ -133,7 +134,7 @@
             font-size: unit(32, rpx);
           }
         }
-        
+
         &-bg {
           background: #fff;
           position: absolute;

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,10 +293,10 @@ export default {
         }
       }, 1000);
     },
-    
+
     handleUnBindCard() {
       this.$xdConfirm({
-        $vm: this,
+        styles: this.styles,
         content: "您确定要解除绑定卡券吗",
         title: "系统提示",
         width: "80%",
@@ -333,7 +333,7 @@ export default {
         },
       });
     },
-    
+
     refrush() {
       if (this.stopTimer) return;
       if (this.time >= this.maxTime) {
@@ -377,7 +377,7 @@ export default {
           .catch();
       }, time);
     },
-    
+
     init() {
       this.detail();
       this.refrush();
@@ -386,7 +386,7 @@ export default {
       }
       this.backUrl = getContainerPropsValue( this.container,  "content.back_url", { value: "" }).value;
     },
-    
+
     /**
      * @description 获取卡详情
      */
@@ -412,7 +412,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 +423,7 @@ export default {
     handleOnClose() {
       this.editShow = false;
     },
-    
+
     handlePwdOnSubmit(val) {
       this.password = val;
       this.init();

package/src/components/JfbBaseCardDetailEntry/JfbBaseCardDetailEntry.vue

@@ -439,7 +439,7 @@ export default {
     },
     handleUnBindCard() {
       this.$xdConfirm({
-        $vm: this,
+        styles: this.styles,
         content: "您确定要解除绑定票券吗",
         title: "系统提示",
         width: "80%",

package/src/components/JfbBaseCardDisabled/JfbBaseCardDisabled.vue

@@ -160,7 +160,7 @@ export default {
     },
     handleUnBindCard(item) {
       this.$xdConfirm({
-        $vm: this,
+        styles: this.styles,
         content: "您确定要解除绑定票券吗",
         title: "系统提示",
         width: "80%",

package/src/components/JfbBaseCardDisabledEntry/JfbBaseCardDisabledEntry.vue

@@ -11,7 +11,7 @@
       v-if="isEditx && active"
     >
       <view class="jfb-base-card-disabled-entry__edit-icon" @click="delEdit"
-        >删除</view
+      >删除</view
       >
     </view>
     <!-- #endif -->
@@ -88,6 +88,7 @@
             </view>
           </view>
         </view>
+        {{cardList }} --- {{cardList.length}}
       </view>
       <view class="computed-height">
         <view
@@ -178,7 +179,7 @@ export default {
       return this.fixedStyle({height: 0, zIndex: 111});
     },
     emptyBg() {
-        return this.getNoData();
+      return this.getNoData();
     },
   },
   watch: {
@@ -226,7 +227,7 @@ export default {
 
     handleAllUnBindCard(){
       this.$xdConfirm({
-        $vm: this,
+        styles: this.styles,
         content: "您确定要解除绑定所有票券吗？",
         title: "系统提示",
         width: "80%",
@@ -259,7 +260,7 @@ export default {
 
     handleUnBindCard(item) {
       this.$xdConfirm({
-        $vm: this,
+        styles: this.styles,
         content: "您确定要解除绑定票券吗？",
         title: "系统提示",
         width: "80%",

package/src/components/JfbBaseCardInfo/JfbBaseCardInfo.vue

@@ -37,15 +37,13 @@
               :placeholder="card_pwd_placeholder"
             />
             <xd-font-icon
-              @click="isPassword = !isPassword"
+              @click="handleIcon()"
               :icon="isPassword ? 'iconbiyan' : 'iconchakan'"
             ></xd-font-icon>
           </view>
         </view>
         <view class="jfb-base-card-info__body-footer" :style="prod_bottom">
-          <xd-button type="primary" width="360rpx" @click="handleGetInfo"
-            >确认</xd-button
-          >
+          <xd-button type="primary" width="360rpx" @click="handleGetInfo">确认</xd-button>
         </view>
       </view>
 
@@ -78,15 +76,12 @@
               <view
                 v-if="info.other_card_point && info.card_point_type !== 1"
                 class="jfb-base-card-info__body-residue-reach"
-                >购买其他物品可抵：{{ info.other_card_point }}</view
-              >
+              >购买其他物品可抵：{{ info.other_card_point }}</view>
             </view>
             <view
               class="jfb-base-card-info__body-residue-business"
               v-if="info.card_point_type !== 1"
-            >
-              所属业务线：{{ info.main_business_code_name }}
-            </view>
+            >所属业务线：{{ info.main_business_code_name }}</view>
           </view>
           <view :style="{ height: '100rpx' }"></view>
         </view>
@@ -129,18 +124,10 @@ export default {
           label: "票券号码",
           key: "card_number",
         },
-        // {
-        //   label: "票券类型",
-        //   key: "unit",
-        // },
         {
           label: "票券状态",
           key: "card_status_name",
         },
-        // {
-        //   label: "票券转换",
-        //   key: "is_exchange_name",
-        // },
         {
           label: "有效期",
           key: "end_time",
@@ -177,7 +164,7 @@ export default {
       return true;
     },
     showValueKey(){
-      if(this.info.is_expired === "Y"){
+      if(this.info && this.info.is_expired === "Y"){
         return this.valueKey.filter(item => item.key !== "end_time");
       }
       return this.valueKey;
@@ -185,6 +172,9 @@ export default {
   },
   created() {},
   methods: {
+    handleIcon(){
+      this.isPassword = !this.isPassword
+    },
     toShowCouponDialog(){
       if(this.info){
         jfbRootFnExec(this, 'onCustomEvent')("@showBaseConDialog", {user_card_number: this.info.card_number})
@@ -256,7 +246,7 @@ export default {
     //卡券已被自己绑定时的弹框
     handleBindConfirm(){
       this.$xdConfirm({
-        $vm: this,
+        styles: this.styles,
         width: '90%',
         content: '您已绑定该票券，无需再次绑定',
         confirmText: '我的票券',

package/src/components/JfbBaseCardInfoEntry/JfbBaseCardInfoEntry.vue

@@ -194,7 +194,7 @@ export default {
     handleToLink() {
       if(this.info.card_point===0) {
         this.$xdConfirm({
-        $vm: this,
+          styles: this.styles,
         content: "票券余额为0，是否确认绑定?",
         width: "80%",
         success: (res) => {
@@ -269,7 +269,7 @@ export default {
     //卡券已被自己绑定时的弹框
     handleBindConfirm(){
       this.$xdConfirm({
-        $vm: this,
+        styles: this.styles,
         width: '90%',
         content: '您已绑定该票券，无需再次绑定',
         confirmText: '我的票券',

package/src/components/JfbBaseCardMerge/JfbBaseCardMerge.vue

@@ -203,7 +203,7 @@ export default {
       this.$xdConfirm({
         title: "是否确认合并卡",
         isHtml: true,
-        $vm: this,
+        styles: this.styles,
         content: `转出卡号：${
           this.mergeForm.from_card_number
         }(剩余点数:${this.$xdUniHelper.divisionFloatNumber(

package/src/components/JfbBaseCardMergeEntry/JfbBaseCardMergeEntry.vue

@@ -40,8 +40,8 @@
           </view>
         </view>
         <view class="merge-item" :style="{background: themeInStyle['color']}">
-          <view class="merge-item-box" :style="{backgroundImage: `url(${themeInStyle})`}">
-            <view class="merge-item-title">
+          <view class="merge-item-box" :style="{backgroundImage: `url(//img.jufubao.cn/component/card/mergbg.jpg)`}">
+            <view class="merge-item-title" :style="{background: themeOutStyle['color']}">
               <xd-font-icon icon="iconzhuanru"></xd-font-icon>
               <view>转入的票券</view>
             </view>
@@ -91,7 +91,7 @@
           :key="disabledKey"
           :disabled="disabled"
           @click="handleToSubmit"
-          width="90%"
+          style="width: 90%"
           :type="disabled ?'info': 'primary'"
         >合并</xd-button>
       </view>
@@ -137,9 +137,10 @@ export default {
       toList: [],
       fromSelect: null,
       toSelect: null,
-      randomKey: Date.now(),
+      randomKey:'randomKey',
       valid_code:'',
       valid_token: 'valid_token',
+      toListLoading: true,
 
 
       content: "",
@@ -194,7 +195,6 @@ export default {
     this.switchValidToken();
     this.validImageAPIUrl = this.brandInfo["api_host"] + "/common/v1/valid_code/image/show";
     this.contentBackgroundColor = Color(this.warningColor).alpha(0.2).toString();
-
   },
   methods: {
     onJfbLoad(options) {
@@ -251,14 +251,6 @@ export default {
     },
 
     handleToSubmit() {
-      // if (!this.valid_code) {
-      //   uni.showToast({
-      //     title: "验证码不能为空！",
-      //     icon: "none",
-      //   });
-      //   return;
-      // }
-
       let outPrice = this.$xdUniHelper.divisionFloatNumber(this.fromSelect.card_point, 100);
       let outHtml = `${this.fromSelect.value}（剩余：${outPrice}）`;
       let inPrice = this.$xdUniHelper.divisionFloatNumber(this.toSelect.card_point, 100);
@@ -266,7 +258,7 @@ export default {
       this.$xdConfirm({
         title: "是否确认合并票券",
         isHtml: true,
-        $vm: this,
+        styles: this.styles,
         content: `<div class="label-value"><div><span>转出票券：</span><span>${outHtml}</span></div><div><span>转入票券：</span><span>${inHtml}</span></div></div>`,
         success: (action) => {
           let params = {
@@ -295,6 +287,8 @@ export default {
       });
     },
     handleChangeFrom(select) {
+      this.toListLoading = false;
+      this.randomKey = null;
       this.fromSelect = select.item;
       jfbRootExec("toCardListEntry", {vm: this, data: {card_number: select.item.value,},})
         .then((res) => {
@@ -308,7 +302,11 @@ export default {
               name: item.card_type_name
             };
           });
-          this.randomKey = Date.now();
+          this.randomKey = this.$xdUniHelper.randomChar(20);
+          setTimeout(()=>{
+            this.toListLoading = true;
+          },50)
+
         })
         .catch((err) => {
           this.$xdLog.catch(err)

package/src/components/JfbBaseCardShift/JfbBaseCardShift.vue

@@ -159,7 +159,7 @@ export default {
       this.$xdConfirm({
         title: "是否确认转换",
         isHtml: true,
-        $vm: this,
+        styles: this.styles,
         content:content,
         success:(action)=>{
           if(action.confirm) {

package/src/components/JfbBaseCardShiftEntry/JfbBaseCardShiftEntry.vue

@@ -219,7 +219,7 @@ export default {
       this.$xdConfirm({
         title: "是否确认转换",
         isHtml: true,
-        $vm: this,
+        styles: this.styles,
         content:content,
         success:(action)=>{
           if(action.confirm) {

package/src/components/JfbBaseCardSweepInfo/JfbBaseCardSweepInfo.vue

@@ -20,7 +20,7 @@
         <view>
           <view
             class="jfb-base-card-sweep-info__body-info"
-            v-for="(item, index) in showValueKey"
+            v-for="(item, index) in valueKey"
             :key="index"
           >
             <view class="jfb-base-card-sweep-info__body-info-label">{{item.label}}</view>
@@ -129,12 +129,6 @@ export default {
         return this.is_show_balance === "Y";
       }
       return true;
-    },
-    showValueKey(){
-      if(this.info.is_expired === "Y"){
-        return this.valueKey.filter(item => item.key !== "end_time");
-      }
-      return this.valueKey;
     }
   },
   created() {

package/src/components/JfbBaseEntry/Attr.js

@@ -7,6 +7,28 @@ export default {
   style: [],
   content: (data) => {
     return [
+      {
+        label: '选择综合入口类型:',
+        ele: 'xd-site-select-list',
+        valueKey: 'entryType',
+        value: data['entryType'],
+        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-radio',