jufubao-base 1.0.56-beta2014 → 1.0.56-beta2016

package/package.json

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

package/src/components/JfbBaseCardDetailEntry/JfbBaseCardDetailEntry.vue

@@ -518,7 +518,7 @@ export default {
     },
     handleToShift() {
       this.$xdUniHelper.navigateTo({
-          url: this.shift_url,
+          url: `${this.shift_url}?card_number=${this.info["card_number"]}`,
       });
     },
     onJfbBack(options) {

package/src/components/JfbBaseCardDisabledEntry/JfbBaseCardDisabledEntry.vue

@@ -65,8 +65,16 @@
           </view>
         </view>
       </view>
+      <view v-else>
+        <view class="jfb-base-card-disabled-entry__body-empty">
+          <view class="jfb-base-card-disabled-entry__body-empty-wrap">
+            <image :src="emptyBg"></image>
+            暂无票券
+          </view>
+        </view>
+      </view>
       <view class="bottom_btn-mask"></view>
-      <view class="bottom_btn" :style="prod_bottom">
+      <view v-if="disableList&&disableList.length>0" class="bottom_btn" :style="prod_bottom">
         <xd-button
           width="680rpx"
           radius="50rpx"
@@ -105,6 +113,9 @@ export default {
     prod_bottom() {
       return this.fixedStyle({height: 0, zIndex: 111});
     },
+    emptyBg() {
+        return this.getNoData();
+    },
   },
   watch: {
     container(value) {
@@ -112,8 +123,8 @@ export default {
     },
   },
   created() {
+    console.log(this.getNoData(),'this.getNoData()this.getNoData()');
     this.init(this.container);
-    
   },
   methods: {
     onJfbLoad(options) {
@@ -160,10 +171,10 @@ export default {
             let cardIds = this.disableList.map(item=>{
               return item.card_number + ''
             });
-            jfbRootExec("disabledCardUnbindEntry", {vm: this, data: {card_numbers: cardIds.join(','),},})
+            jfbRootExec("batchDisabledCardUnbindEntry", {vm: this, data: {card_numbers: cardIds.join(','),},})
               .then((res) => {
                 this.$xdAlert({
-                  content: "解绑成功",
+                  content: "全部失效票券已解绑",
                   close: () => {
                     this.getCardList();
                   },
@@ -197,7 +208,7 @@ export default {
             })
               .then((res) => {
                 this.$xdAlert({
-                  content: "解绑成功",
+                  content: "票券已解绑",
                   close: () => {
                     this.getCardList();
                   },
@@ -311,6 +322,29 @@ export default {
       }
     }
 
+    &-empty {
+      color: #888;
+      font-size: unit(24,rpx);
+      height: 60vh;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+
+      &-wrap {
+        display: flex;
+        flex-direction: column;
+
+        & > image {
+          width: unit(460,rpx);
+          height: unit(400,rpx);
+        }
+      }
+
+      & > view {
+        text-align: center;
+      }
+    }
+
     &-disabled {
       font-size: unit(28, rpx);
       color: #b8b7be;

package/src/components/JfbBaseCardEntry/JfbBaseCardEntry.vue

@@ -120,7 +120,8 @@
         :style="{ color: warningColor }"
         v-if="tabIndex === 2"
       >* 目前仅支持电影票兑换券进行转换</view>
-      <view
+      <view v-if="showList.length>0">
+        <view
         v-if="tabIndex === 2 || tabIndex === 1"
         class="jfb-base-card-entry__body-card"
       >
@@ -204,6 +205,15 @@
           </view>
         </view>
       </view>
+      </view>
+      <view v-else>
+        <view class="jfb-base-card-entry__body-empty">
+          <view class="jfb-base-card-entry__body-empty-wrap">
+            <image :src="emptyBg"></image>
+            暂无票券
+          </view>
+        </view>
+      </view>
       <view
         v-if="showDisabled==='Y'"
         @click="handleToDisabled"
@@ -263,6 +273,9 @@ export default {
     showList(){
       return this.tabIndex === 1 ? this.cardList: this.changeList
     },
+    emptyBg() {
+        return this.getNoData();
+    },
   },
   filters:{
     cutstr(val){
@@ -605,6 +618,29 @@ export default {
     padding: unit(30, rpx) unit(26, rpx);
     color: #333;
 
+    &-empty {
+      color: #888;
+      font-size: unit(24,rpx);
+      height: 60vh;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+
+      &-wrap {
+        display: flex;
+        flex-direction: column;
+
+        & > image {
+          width: unit(460,rpx);
+          height: unit(400,rpx);
+        }
+      }
+
+      & > view {
+        text-align: center;
+      }
+    }
+
     &-dialog {
       position: fixed;
       top: 0;

package/src/components/JfbBaseCardMergeEntry/JfbBaseCardMergeEntry.vue

@@ -40,7 +40,7 @@
           </view>
         </view>
         <view class="merge-item" :style="{background: themeInStyle['color']}">
-          <view class="merge-item-box" :style="{backgroundImage: 'url(//img.jufubao.cn/component/card/mergbg.jpg)'}">
+          <view class="merge-item-box" :style="{backgroundImage: `url(${themeInStyle})`}">
             <view class="merge-item-title">
               <xd-font-icon icon="iconzhuanru"></xd-font-icon>
               <view>转入的票券</view>
@@ -167,7 +167,7 @@ export default {
     },
     themeInStyle() {
       if (this.toSelect === null) {
-        return this.getCardThemes('2');
+        return this.getMergBg();
       } else {
         return this.getCardThemes(this.toSelect.name);
       }

package/src/components/JfbBaseCardShiftEntry/JfbBaseCardShiftEntry.vue

@@ -42,7 +42,7 @@
             icon="iconzhuanhuanshitu"
             style="margin-right:10rpx"
           ></xd-font-icon>
-            {{info.card_type_name}}
+            转换的票券
           </view>
         </view>
           <view style="padding-top:40rpx" class="jfb-base-card-shift-entry__body-header-item">
@@ -107,7 +107,7 @@
         <view> {{ item.label }}： </view>
           <view :style="{color:mainColor,fontWeight:500}" v-if="item.type === 'price'">
             {{ info[item.key] }}
-            <text>{{info.unit}}</text>
+            <text>点</text>
           </view>
           <view style="color: #333; font-weight: 500" v-else>
             {{ info[item.key] }}
@@ -297,7 +297,7 @@ export default {
             this.valueKey.splice(1,1);
             this.changeValueKey.splice(1,1)
           }
-          this.headerBg = this.getCardThemes(res);
+          this.headerBg = this.getCardThemes(res.card_type_name);
           this.info = temp;
         })
         .catch((err) => {});
@@ -339,6 +339,7 @@ export default {
 
     
       & > view {
+        padding: 0 unit(80, rpx);
         font-size: unit(24, rpx);
         line-height: unit(56, rpx);
         background: rgba(102, 102, 102, 0.4);