jufubao-base 1.0.61-beta5 → 1.0.61

package/src/components/JfbBaseCardInfoEntry/JfbBaseCardInfoEntry.vue

@@ -57,51 +57,29 @@
       </view>
 
       <view v-if="showInfo && info !== null">
-        <view
-          class="jfb-base-card-info-entry__body-header"
-          :style="{
-            background: headerBg.color,
-            backgroundSize: '100%',
-          }"
-        >
-          <view
-            class="jfb-base-card-info-entry__body-header-wrap"
-            :style="{
-              backgroundImage: `url(${headerBg.image})`,
-            }"
-          >
-            <view class="jfb-base-card-info-entry__body-header-item">
-              <view>券名：</view>
-              <view>{{ info.card_type_name }}</view>
+        <view class="card-list" :style="{
+            background: headerBg['color'],
+            backgroundSize: '100%'
+          }">
+                <view class="card-list-warp" :style="{backgroundImage: `url(${headerBg['image']})`}">
+            <view class="card-list__title"><view>{{info['card_type_name']}}</view></view>
+            <div class="card-list__content">
+              <view>
+                <text>券号：</text>
+                <text>{{info.card_number}}</text>
+              </view>
+            </div>
+            <view class="card-list__date">
+              <text>有效期：</text>
+              <text>{{info.end_time}}</text>
             </view>
-            <view
-              style="padding-bottom: 0px"
-              class="jfb-base-card-info-entry__body-header-item"
-            >
-              <view>券号：</view>
-              <view>{{ info.card_number }}</view>
+            <view class="card-list__yue">
+              <text>余额：</text>
+              <text>{{info.card_point}} {{ info.unit }}</text>
+            </view>
+            <view class="card-list__other" v-if="info.other_card_point && info.card_point_type === 2">
+              <view><text>购买其他物品可抵：</text><text>{{info.other_card_point}} {{ info.unit }}</text></view>
             </view>
-          </view>
-        </view>
-        <view class="jfb-base-card-info-entry__body-content">
-          <view
-            :class="
-              item.key === 'other_card_point'
-                ? 'jfb-base-card-info-entry__body-content-special'
-                : 'jfb-base-card-info-entry__body-content-item'
-            "
-            v-for="(item, index) in valueKey"
-            :key="index"
-          >
-          <view> {{ item.label }}： </view>
-          <view :style="{color:mainColor,fontWeight:500}" v-if="item.type === 'price'">
-            {{ info[item.key] }}
-            <text>{{info.unit}}</text>
-          </view>
-          <view style="color: #333; font-weight: 500" v-else>
-            {{ info[item.key] }}
-            <text v-if="item.type === 'type'">券</text>
-          </view>
           </view>
         </view>
         <view
@@ -115,7 +93,7 @@
             style="
               display: flex;
               align-content: center;
-              justify-content: center;
+              justify-content: flex-start;
             "
           >
             <view class="jfb-base-card-info-entry__body-business-content">
@@ -169,23 +147,6 @@ export default {
   data() {
     return {
       info: null,
-      valueKey: [
-        {
-          label: "票券余额",
-          key: "card_point",
-          type: "price",
-        },
-        {
-          label: "购买其他物品可抵",
-          key: "other_card_point",
-          type: "price",
-        },
-        {
-          label: "有效期限",
-          key: "end_time",
-          type: "normal",
-        },
-      ],
       card_number: "", //卡号
       card_password: "", //卡密码
       isPassword: true,
@@ -240,7 +201,7 @@ export default {
         })
           .then((res) => {
             this.$xdAlert({
-              content: "绑定成功",
+              content: "票券绑定成功",
               close: () => {
                 this.$xdUniHelper.redirectTo({
                   url: this.backUrl,
@@ -261,7 +222,7 @@ export default {
           .then((res) => {
             console.log(this.$xdAlert, "this.$xdAlertfsdfs");
             this.$xdAlert({
-              content: "绑定成功",
+              content: "票券绑定成功",
               close: () => {
                 this.$xdUniHelper.redirectTo({
                   url: this.backUrl,
@@ -328,14 +289,12 @@ export default {
               }
             });
             if(res && res.site_entry_settings && res.site_entry_settings.length>0) {
-            res.site_entry_settings = res.site_entry_settings.map(item=>{
+              temp.site_entry_settings = res.site_entry_settings.filter(item=>{
               item['image_url'] = getServiceUrl(item['image_url'])
-              return item
+              return res.business_codes.includes(item.business_code)
             })
           }
-          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.info = temp;
@@ -367,14 +326,11 @@ export default {
             }
           });
           if(res && res.site_entry_settings && res.site_entry_settings.length>0) {
-            res.site_entry_settings = res.site_entry_settings.map(item=>{
+            temp.site_entry_settings = res.site_entry_settings.filter(item=>{
               item['image_url'] = getServiceUrl(item['image_url'])
-              return item
+              return res.business_codes.includes(item.business_code)
             })
           }
-          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;
@@ -460,65 +416,216 @@ export default {
       left: 50%;
       transform: translate(-50rpx, -50rpx);
     }
-    &-header {
-      border-radius: unit(16, rpx);
-      font-size: unit(40, rpx);
+    .card-list {
+  overflow: hidden;
+  border-radius: unit(16, rpx);
+  margin-bottom: unit(30, rpx);
+  
+  &:last-child {
+    margin-bottom: 0;
+  }
+  
+  
+  &__title {
+    height: unit(56, rpx);
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+    
+    & > view {
+      padding: 0 unit(80, rpx);
+      font-size: unit(24, rpx);
+      line-height: unit(56, rpx);
+      background: rgba(102, 102, 102, 0.4);
+      color: #fff;
+      border-radius: 0 0 unit(16, rpx) 0;
+    }
+    
+  }
+  
+  &__content {
+    padding: unit(10, rpx) unit(40, rpx) 0;
+    height: unit(86, rpx);
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    
+    & > view:first-child {
+      font-size: unit(36, rpx);
+      line-height: unit(86, rpx);
+      color: #fff;
       font-weight: 700;
+    }
+    
+    & > view:nth-child(2) {
+      font-size: unit(24, rpx);
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      flex-flow: wrap;
+      flex-direction: column;
       color: #fff;
-      position: relative;
-      min-height: unit(260,rpx);
-
-      &-wrap {
-        width: unit(700, rpx);
-        border-radius: unit(16, rpx);
-        background-size: 100%;
-        min-height: unit(260,rpx);
-        display: flex;
-        flex-direction: column;
-        justify-content: center;
+    }
+  }
+  
+  &__date {
+    padding: 0 unit(40, rpx);
+    font-size: unit(28, rpx);
+    line-height: unit(32, rpx);
+    color: #fff;
+  }
+  
+  &__yue {
+    padding: unit(10, rpx) unit(40, rpx) 0;
+    font-size: unit(28, rpx);
+    line-height: unit(32, rpx);
+    color: #fff;
+    
+    & > text:nth-child(2) {
+      font-weight: 700;
+    }
+  }
+  
+  &__other {
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+    padding: unit(20, rpx) unit(40, rpx) 0;
+    margin-top: unit(0, rpx);
+    
+    & > view {
+      border-radius:unit(8, rpx);
+      background: rgba(255, 255, 255, 0.2);
+      height: unit(48, rpx);
+      line-height: unit(48, rpx);
+      display: flex;
+      justify-content: flex-start;
+      align-items: center;
+      font-weight: 400;
+      font-size: unit(24, rpx);
+      padding: 0 unit(20, rpx);
+      color: #fff;
+    }
+    
+    
+  }
+  
+  &__nodata {
+    padding: unit(20, rpx) unit(40, rpx) 0;
+    margin-top: unit(0, rpx);
+    color: #fff;
+    font-size: unit(28, rpx);
+  }
+  
+  &__entry {
+    padding: unit(20, rpx) unit(40, rpx) 0;
+    & > view {
+      line-height: unit(64, rpx);
+      text-align: center;
+      font-size: unit(26, rpx);
+      border-radius: unit(32, rpx);
+      background: rgba(255, 255, 255, 1);
+      box-shadow: 0 unit(4, rpx) unit(8, rpx) rgba(156, 62, 0, 0.11);
+      font-weight: 500;
+    }
+  }
+  
+  &__entrys {
+    margin: unit(20, rpx) unit(20, rpx) 0;
+    padding: unit(30, rpx);
+    border-radius: unit(16, rpx);
+    background: rgba(255, 255, 255, 1);
+    box-shadow: 0 unit(4, rpx) unit(8, rpx) rgba(156, 62, 0, 0.11);
+    
+    &-title {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+     
+      
+      & > view:first-child {
+        font-size: unit(28, rpx);
+        font-weight: 500;
+        flex: 1;
       }
-
-      &-item {
+      
+      & > view:nth-child(2) {
         display: flex;
         justify-content: flex-start;
-        align-content: center;
-        padding-bottom: unit(32, rpx);
-        padding-left: unit(40,rpx);
-
-        & > view:first-child {
-          flex-basis: unit(120,rpx);
-          flex-shrink: 0;
-        }
+        align-items: center;
+        flex-shrink: 0;
+        font-size: unit(20, rpx);
+        color: #999;
       }
     }
-
-    &-content {
-      background: #fff;
-      border-radius: unit(16, rpx);
-      padding: unit(38, rpx) 0;
-      margin-top: unit(24, rpx);
-
-      &-item {
-        display: flex;
-        color: #666;
-        justify-content: space-between;
-        align-content: center;
-        font-size: unit(28, rpx);
-        padding: unit(16, rpx) unit(48, rpx);
-      }
-
-      &-special {
+    
+    &-scroll {
+    
+    }
+  
+    &-item {
+      display: flex;
+      justify-content: flex-start;
+      align-items: center;
+      flex-flow: nowrap;
+      margin-left: unit(-14, rpx);
+      padding-top: unit(20, rpx);
+      
+      & > view {
+        width: unit(120, rpx);
+        margin-right: unit(10, rpx);
+        flex-shrink: 0;
         display: flex;
-        color: #666;
-        justify-content: space-between;
-        font-size: unit(24, rpx);
-        padding: unit(18, rpx) unit(24, rpx);
-        margin: 0 unit(24, rpx);
-        border-radius: unit(16, rpx);
-        background: #f9f9f9;
-        align-content: center;
+        justify-content: center;
+        flex-direction: column;
+        align-items: center;
+        
+        & > view:first-child {
+          width: unit(76, rpx);
+          height: unit(76, rpx);
+          overflow: hidden;
+    
+          & > image {
+            height: 100%;
+            width: 100%;
+          }
+        }
+        
+        & > view:nth-child(2) {
+          margin-top: unit(10, rpx);
+          font-size: unit(24, rpx);
+          line-height: unit(36, rpx);
+          margin-bottom: unit(10, rpx);
+        }
+        
+        & > view:nth-child(3) {
+          display: flex;
+          justify-content: flex-start;
+          align-items: center;
+          flex-shrink: 0;
+          font-size: unit(20, rpx);
+          color: #999;
+        }
+        
+        &:last-child {
+          margin-right: 0;
+        }
+        
       }
+      
+      
     }
+  }
+  
+  &-warp {
+    width: unit(700, rpx);
+    // min-height: unit(290, rpx);
+    position: relative;
+    border-radius: unit(16, rpx);
+    background-size: 100%;
+    padding-bottom: unit(20, rpx);
+  }
+}
 
     &-qrcode {
       text-align: center;

package/src/components/JfbBaseCardMergeEntry/JfbBaseCardMergeEntry.vue

@@ -264,7 +264,7 @@ export default {
         title: "是否确认合并票券",
         isHtml: true,
         $vm: this,
-        content: `<div class="label-value"><div><span>转出卡号：</span><span>${outHtml}</span></div><div><span>转入卡号：</span><span>${inHtml}</span></div></div>`,
+        content: `<div class="label-value"><div><span>转出票券：</span><span>${outHtml}</span></div><div><span>转入票券：</span><span>${inHtml}</span></div></div>`,
         success: (action) => {
           let params = {
             from_card_number: this.fromSelect.value,
@@ -277,12 +277,12 @@ export default {
             if(this.$configProject.isPreview) return;
             jfbRootExec("mergeCardEntry", { vm: this,data: params})
               .then((res) => {
-                this.$xdAlert({content: '合卡成功！'});
+                this.$xdAlert({content: '合卡成功！', time: 1000});
                 setTimeout(()=>{
                   this.$xdUniHelper.navigateTo({
                     url: this.cardPath
                   })
-                }, 1500);
+                }, 2000);
               })
               .catch((err) => {
                 this.$xdLog.catch(err)