jufubao-base 1.0.401 → 1.0.403-beta2

package/get.package.path.js

@@ -8,11 +8,11 @@
  */
 const getPackagePath = (threePackagePath, packname = 'gxd-commands-bussiness')=>{
   if(packname === 'gxd-commands-bussiness') {
-    return `/Users/shiyonggao/home/root/Base-Jufubao/xd-commands-bussiness/${threePackagePath}`;
+    return `/Users/shiyonggao/Desktop/code/BASE/UNIAPP/xd-commands-bussiness/${threePackagePath}`;
   }
 
   if (packname === 'gxd-uni-library-editx') {
-    return `/Users/shiyonggao/home/root/Base-Jufubao/xd-uni-library-editx/${threePackagePath}`;
+    return `/Users/shiyonggao/Desktop/code/BASE/UNIAPP/xd-uni-library-editx/${threePackagePath}`;
   }
 
 };

package/package.json

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

package/src/components/JfbBaseCard/JfbBaseCard.vue

@@ -145,10 +145,8 @@
               :key="index"
               @click="handleBindLogin(item)"
               class="jfb-base-card__body-card-item"
-              :style="{
-                backgroundColor:(item['is_login'] === 'Y'? mainBorderColor : '#fff'),
-                border:`1px solid ${item['is_login'] === 'Y'? mainSubBorderColor:'#eeeeee'}`
-              }"
+              :class="{error_status: item['card_status'] && item['card_status'] !== 'Y'}"
+              :style="[itemStyleCom(item)]"
             >
               <view class="jfb-base-card__body-card-item-left" v-if="showLoginBtn">
                 <xd-font-icon
@@ -184,6 +182,7 @@
                       :color="mainColor"
                     ></xd-font-icon>
                     <view class="card_name_text">{{ item.card_type_name }}</view>
+                    <view class="card_status_error" v-if="item['card_status'] && item['card_status'] !== 'Y'">{{item.card_status_name}}</view>
                   </view>
                   <view>
                     <view>{{ item.card_number }}{{showIndex?(':' + index):''}}</view>
@@ -446,6 +445,26 @@ export default {
 
   },
   methods: {
+    itemStyleCom(item){
+      let def =  {
+        backgroundColor:(item['is_login'] === 'Y'? this.mainBorderColor : '#fff'),
+        border:`1px solid ${item['is_login'] === 'Y'? this.mainSubBorderColor:'#eeeeee'}`
+      };
+
+      //有票券状态节点
+      if(item.card_status){
+        if(item.card_status !== 'Y') return {
+          WebkitFilter: 'grayscale(100%)',
+          filter: 'grayscale(100%)',
+          cursor: 'not-allowed',
+          opacity: 0.5,
+          ...def,
+        }
+        else return def
+      }
+      //兼容老数据
+      return def
+    },
     init(container){
       //设置
       this.cardLayout = getContainerPropsValue(container,"content.cardLayout","1");
@@ -570,6 +589,12 @@ export default {
     handleBindLogin(item) {
       if(this.$configProject.isPreview) return;
       if(!this.showLoginBtn) return;
+
+      //已设置票券状态
+      if(item.card_status) {
+        if(item.card_status !== 'Y') return;
+      }
+
       //普通卡
       if (this.tabIndex === 1) {
         //无效卡
@@ -627,6 +652,14 @@ export default {
     },
 
     toDetail(item) {
+      if(this.$configProject.isPreview) return;
+
+      //已设置票券状态
+      if(item.card_status) {
+        if(item.card_status !== 'Y') return;
+      }
+
+
       this.$xdUniHelper.navigateTo(
         {
           url: `${this.detailUrl}?card_number=${item["card_number"]}`,
@@ -863,8 +896,6 @@ export default {
       }
     }
 
-
-
     &-dialog {
       position: fixed;
       top: 0;
@@ -1006,6 +1037,20 @@ export default {
         border-radius: unit(20, rpx);
         margin-bottom: unit(30, rpx);
         background: #fff;
+        &.error_status {
+          position: relative;
+          overflow: hidden;
+          &::after {
+            content: "";
+            position: absolute;
+            opacity: 1;
+            top: 0;
+            left: 0;
+            right: 0;
+            bottom: 0;
+            background-color: rgba(0,0,0,.2);
+          }
+        }
 
         &-left {
           width: unit(200, rpx);
@@ -1028,6 +1073,19 @@ export default {
           &-top {
             border-bottom: unit(2, rpx) solid #eeeeee;
             padding: unit(30, rpx) unit(20, rpx);
+            position:relative;
+
+            .card_status_error {
+              background: #888;
+              border-radius: 0 0 0 8rpx;
+              font-size: 28rpx;
+              line-height: 64rpx;
+              color: #fff;
+              position: absolute;
+              top: 0;
+              right: 0;
+              padding: 0 48rpx;
+            }
 
             & > view:nth-child(1) {
               display: flex;