jufubao-base 1.0.56-beta2011 → 1.0.56-beta2013

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.56-beta2011",
+  "version": "1.0.56-beta2013",
   "private": false,
   "description": "聚福宝业务组件基础插件包",
   "main": "index.js",
@@ -50,7 +50,7 @@
     "core-js": "^2.6.5",
     "flyio": "^0.6.2",
     "gxd-commands-bussiness": "^1.0.12",
-    "gxd-uni-library-editx": "1.0.13-beta5",
+    "gxd-uni-library-editx": "1.0.13-beta7",
     "jweixin-module": "^1.6.0",
     "md5": "^2.3.0",
     "path-to-regexp": "^6.2.1",

package/src/components/JfbBaseCardDetail/JfbBaseCardDetail.vue

@@ -247,6 +247,17 @@ export default {
     },
     
     onJfbUnload() {
+      this.timeStr = ""
+      if (this.timeer) {
+        clearTimeout(this.timeer);
+      }
+      if (this.refrushTimeer) {
+        clearTimeout(this.refrushTimeer);
+      }
+    },
+
+    onJfbHide(options) {
+      this.timeStr = ""
       if (this.timeer) {
         clearTimeout(this.timeer);
       }
@@ -294,6 +305,7 @@ export default {
         vm: this,
         success: (res) => {
           if (res.confirm) {
+            this.timeStr = ""
             clearTimeout(this.timeer);
             clearTimeout(this.refrushTimeer);
             this.stopTimer = true;
@@ -369,6 +381,9 @@ export default {
     init() {
       this.detail();
       this.refrush();
+      if(this.$configProject.isPreview) {
+        this.timeStr = "01分19秒"
+      }
       this.backUrl = getContainerPropsValue( this.container,  "content.back_url", { value: "" }).value;
     },
     
@@ -388,7 +403,9 @@ export default {
             res["other_card_point"] = this.$xdUniHelper.divisionFloatNumber(res.other_card_point, 100);
           }
           this.info = res;
-          this.setInval(this.info.card_qrcode_expire);
+          if(!this.$configProject.isPreview) {
+            this.setInval(this.info.card_qrcode_expire);
+          }
           this.show = false;
 
           //显示按钮

package/src/components/JfbBaseCardDetailEntry/JfbBaseCardDetailEntry.vue

@@ -55,9 +55,7 @@
           :key="index"
         >
         <view> {{ item.label }}： </view>
-          <xd-unit v-if="item.type === 'price'&&info.unit==='点'" fontSize="28" :price="info[item.key]">
-          </xd-unit>
-          <view :style="{color:mainColor,fontWeight:500}" v-else-if="item.type === 'price'&&info.unit==='次'">
+          <view :style="{color:mainColor,fontWeight:500}" v-if="item.type === 'price'">
             {{ info[item.key] }}
             <text>{{info.unit}}</text>
           </view>
@@ -108,7 +106,6 @@
         <!-- 靠底支付 -->
         <view class="fixe_bottom" :style="prod_bottom">
           <!-- <xd-button
-          radius="8rpx"
           size="small"
           type="primary">
           消费记录
@@ -116,7 +113,6 @@
           <xd-button
           v-if="info.is_exchange==='Y'"
           @click="handleToShift"
-          radius="8rpx"
           size="small"
           type="primary">
           券转换
@@ -124,7 +120,6 @@
           <xd-button
           v-if="isShowUnbind"
           @click="handleUnBindCard"
-          radius="8rpx"
           size="small"
           type="primary">
           解除绑定
@@ -311,6 +306,9 @@ export default {
               return item
             })
           }
+          if(res.other_card_point===0 || res.card_point_type === 1) {
+            this.valueKey.splice(1,1)
+          }
           this.info = res;
           if(!this.$configProject.isPreview) {
             this.setInval(this.info.card_qrcode_expire);
@@ -545,13 +543,13 @@ export default {
       font-weight: 700;
       color: #fff;
       position: relative;
-      height: unit(260,rpx);
+      min-height: unit(260,rpx);
 
       &-wrap {
         width: unit(700, rpx);
         border-radius: unit(16, rpx);
         background-size: 100%;
-        height: 100%;
+        min-height: unit(260,rpx);
         display: flex;
         flex-direction: column;
         justify-content: center;
@@ -563,6 +561,11 @@ export default {
         align-content: center;
         padding-bottom: unit(32, rpx);
         padding-left: unit(40,rpx);
+
+        & > view:first-child {
+          flex-basis: unit(120,rpx);
+          flex-shrink: 0;
+        }
       }
     }
 

package/src/components/JfbBaseCardInfoEntry/JfbBaseCardInfoEntry.vue

@@ -49,7 +49,6 @@
         <view class="fixe_bottom" :style="prod_bottom">
           <xd-button
             type="primary"
-            radius="8rpx"
             width="360rpx"
             @click="handleGetInfo"
             >确认</xd-button
@@ -95,9 +94,7 @@
             :key="index"
           >
           <view> {{ item.label }}： </view>
-          <xd-unit v-if="item.type === 'price'&&info.unit==='点'" fontSize="28" :price="info[item.key]">
-          </xd-unit>
-          <view :style="{color:mainColor,fontWeight:500}" v-else-if="item.type === 'price'&&info.unit==='次'">
+          <view :style="{color:mainColor,fontWeight:500}" v-if="item.type === 'price'">
             {{ info[item.key] }}
             <text>{{info.unit}}</text>
           </view>
@@ -136,7 +133,6 @@
         <view :style="{ height: '100rpx' }"></view>
         <view class="fixe_bottom" :style="prod_bottom">
           <xd-button
-            radius="8rpx"
             type="primary"
             width="360rpx"
             @click="handleToLink"
@@ -218,7 +214,23 @@ export default {
   },
   created() {},
   methods: {
-    handleToLink(path) {
+    handleToLink() {
+      if(this.info.card_point===0) {
+        this.$xdConfirm({
+        $vm: this,
+        content: "票券余额为0，是否确认绑定?",
+        width: "80%",
+        success: (res) => {
+          if (res.confirm) {
+           this.handleToBind()
+          }
+        },
+      });
+      return 
+      }
+      this.handleToBind()
+    },
+    handleToBind() {
       if (this.qrcode) {
         jfbRootExec("qrCardBindEntry", {
           vm: this,
@@ -320,6 +332,9 @@ export default {
               item['image_url'] = getServiceUrl(item['image_url'])
               return item
             })
+          }
+          if(res.other_card_point===0 || res.card_point_type === 1) {
+            this.valueKey.splice(1,1);
           }
             this.headerBg = this.getCardThemes(res.card_type_name);
             this.showInfo = true;
@@ -357,6 +372,9 @@ export default {
               return item
             })
           }
+          if(res.other_card_point===0 || res.card_point_type === 1) {
+            this.valueKey.splice(1,1);
+          }
           this.headerBg = this.getCardThemes(res.card_type_name);
           this.showInfo = true;
           this.showForm = false;
@@ -448,13 +466,13 @@ export default {
       font-weight: 700;
       color: #fff;
       position: relative;
-      height: unit(260,rpx);
+      min-height: unit(260,rpx);
 
       &-wrap {
         width: unit(700, rpx);
         border-radius: unit(16, rpx);
         background-size: 100%;
-        height: 100%;
+        min-height: unit(260,rpx);
         display: flex;
         flex-direction: column;
         justify-content: center;
@@ -466,6 +484,11 @@ export default {
         align-content: center;
         padding-bottom: unit(32, rpx);
         padding-left: unit(40,rpx);
+
+        & > view:first-child {
+          flex-basis: unit(120,rpx);
+          flex-shrink: 0;
+        }
       }
     }
 

package/src/components/JfbBaseCardInfoEntry/JfbBaseCardInfoEntryMixin.js

@@ -16,7 +16,7 @@ export default {
       //@EndAttrData
       
       // #endif
-      cssRoot: ''
+      cssRoot: 'jfb-base-card-info-entry'
     }
   },
   created() {

package/src/components/JfbBaseCardMergeEntry/JfbBaseCardMergeEntryMixin.js

@@ -10,21 +10,21 @@ export default {
   data() {
     return {
       //#ifdef H5
-
+      
       //@AttrData
       Attr:{}, //对外开发编辑属性
       //@EndAttrData
-
+      
       // #endif
       cssRoot: 'jfb-base-card-merge-entry'
     }
   },
   created() {
-
+    
     //@AttrDataCreated
     this.Attr = this.$xdUniHelper.customClone(Attr);
     //@EndAttrDataCreated
-
+    
 
   },
 }

package/src/components/JfbBaseCardShiftEntry/JfbBaseCardShiftEntry.vue

@@ -50,7 +50,7 @@
             <view>{{info.card_type_name}}</view>
           </view>
           <view
-            style="padding-bottom: 0px"
+            style="padding-bottom: 20rpx"
             class="jfb-base-card-shift-entry__body-header-item"
           >
             <view>券号：</view>
@@ -71,10 +71,8 @@
           v-for="(item, index) in valueKey"
           :key="index"
         >
-          <view> {{ item.label }}： </view>
-          <xd-unit v-if="item.type === 'price'&&info.unit==='点'" fontSize="28" :price="info[item.key]">
-          </xd-unit>
-          <view :style="{color:mainColor,fontWeight:500}" v-else-if="item.type === 'price'&&info.unit==='次'">
+        <view> {{ item.label }}： </view>
+          <view :style="{color:mainColor,fontWeight:500}" v-if="item.type === 'price'">
             {{ info[item.key] }}
             <text>{{info.unit}}</text>
           </view>
@@ -106,10 +104,8 @@
           v-for="(item, index) in changeValueKey"
           :key="index"
         >
-          <view> {{ item.label }}： </view>
-          <xd-unit v-if="item.type === 'price'&&info.unit==='点'" fontSize="28" :price="info[item.key]">
-          </xd-unit>
-          <view :style="{color:mainColor,fontWeight:500}" v-else-if="item.type === 'price'&&info.unit==='次'">
+        <view> {{ item.label }}： </view>
+          <view :style="{color:mainColor,fontWeight:500}" v-if="item.type === 'price'">
             {{ info[item.key] }}
             <text>{{info.unit}}</text>
           </view>
@@ -130,7 +126,6 @@
           <xd-button
           @click="handleChange"
           width="500rpx"
-          radius="8rpx" 
           type="primary">
           转换
         </xd-button>
@@ -298,6 +293,10 @@ export default {
               temp[key] = res[key];
             }
           });
+          if(res.other_card_point===0 || res.card_point_type === 1) {
+            this.valueKey.splice(1,1);
+            this.changeValueKey.splice(1,1)
+          }
           this.headerBg = this.getCardThemes(res);
           this.info = temp;
         })
@@ -330,19 +329,16 @@ export default {
       font-weight: 700;
       color: #fff;
       position: relative;
-      height: unit(260,rpx);
+      min-height: unit(260,rpx);
 
       &__title {
         height: unit(56, rpx);
         display: flex;
         justify-content: flex-start;
         align-items: center;
-        position: absolute;
-        top: 0;
-        left: 0;
+
     
       & > view {
-        padding: 0 unit(80, rpx);
         font-size: unit(24, rpx);
         line-height: unit(56, rpx);
         background: rgba(102, 102, 102, 0.4);
@@ -357,7 +353,7 @@ export default {
         width: unit(700, rpx);
         border-radius: unit(16, rpx);
         background-size: 100%;
-        height: 100%;
+        min-height: 100%;
         display: flex;
         flex-direction: column;
         justify-content: center;
@@ -369,6 +365,11 @@ export default {
         align-content: center;
         padding-bottom: unit(32, rpx);
         padding-left: unit(40,rpx);
+
+        & > view:first-child {
+          flex-basis: unit(120,rpx);
+          flex-shrink: 0;
+      }
       }
     }
 

package/src/components/JfbBaseCardShiftEntry/JfbBaseCardShiftEntryMixin.js

@@ -10,21 +10,21 @@ export default {
   data() {
     return {
       //#ifdef H5
-
+      
       //@AttrData
       Attr:{}, //对外开发编辑属性
       //@EndAttrData
-
+      
       // #endif
       cssRoot: 'jfb-base-card-shift-entry'
     }
   },
   created() {
-
+    
     //@AttrDataCreated
     this.Attr = this.$xdUniHelper.customClone(Attr);
     //@EndAttrDataCreated
-
+    
 
   },
 }

package/src/mixins/colorCardMixins.js

@@ -51,7 +51,7 @@ export default {
     getCardGroupItem(list, allEntry) {
       list.map(item => {
         //设置卡片样式
-        item['theme'] = this.getCardThemes(item['card_type_name'] + item['card_type']);
+        item['theme'] = this.getCardThemes(item['card_type_name']);
         item['entries'] = this.getEntry(item['business_codes'], allEntry)
       });
       return list