update: 卡券状态

dist/css/card-package.e7490a21.css → dist/css/card-package.f600a92e.css

-.ml40[data-v-1c8276c7]{margin-left:40px}.filter-block[data-v-1c8276c7]{color:#303133;background:#f7f8fa;padding:20px;margin-bottom:20px}.filter-block span[data-v-1c8276c7]{margin-left:10px;margin-right:10px;line-height:20px}.card[data-v-1c8276c7]{padding-left:70px;min-height:60px;position:relative}.card img[data-v-1c8276c7]{position:absolute;left:0;top:0;width:60px;height:60px;border-radius:4px}.card .name[data-v-1c8276c7]{color:#303133;padding-top:8px;margin-bottom:7px;line-height:22px}.el-icon-delete[data-v-5a981894]{display:inline-block;font-size:17px;padding:9px;margin-right:10px;color:#909399;border:1px solid #e4e7ed;border-radius:50%;vertical-align:middle;cursor:pointer;position:relative;top:-60px}.el-icon-delete[data-v-5a981894]:hover{background:#fef0f0;border:1px solid #fbc4c4;color:#f5222d}
\ No newline at end of file
+.ml40[data-v-1c8276c7]{margin-left:40px}.filter-block[data-v-1c8276c7]{color:#303133;background:#f7f8fa;padding:20px;margin-bottom:20px}.filter-block span[data-v-1c8276c7]{margin-left:10px;margin-right:10px;line-height:20px}.card[data-v-1c8276c7]{padding-left:70px;min-height:60px;position:relative}.card img[data-v-1c8276c7]{position:absolute;left:0;top:0;width:60px;height:60px;border-radius:4px}.card .name[data-v-1c8276c7]{color:#303133;padding-top:8px;margin-bottom:7px;line-height:22px}.el-icon-delete[data-v-380caa2a]{display:inline-block;font-size:17px;padding:9px;margin-right:10px;color:#909399;border:1px solid #e4e7ed;border-radius:50%;vertical-align:middle;cursor:pointer;position:relative;top:-60px}.el-icon-delete[data-v-380caa2a]:hover{background:#fef0f0;border:1px solid #fbc4c4;color:#f5222d}
\ No newline at end of file

src/views/card/card-package/form.vue

@@ -197,28 +197,34 @@ export default {
   },
   methods: {
     renderStatus(row) {
-      let { _status } = mappingCardStatus(row);
-      let _cl = '';
-      // 1未生效、2使用中、3已过期、4已禁用
-      switch (_status) {
-        case 1:
-          _cl = 'state-point-loading-scale'; // 未生效 转换成使用中
-          _status = 2;
-          break;
-        case 2:
-          _cl = 'state-point-loading-scale'; // 使用中
-          break;
-        case 3:
-          _cl = 'state-point-default';
-          break;
-        case 4:
-          _cl = 'state-point-error'; // 已禁用已过期
-          break;
-        default:
-          _cl = 'state-point-default';
-          break;
+      if(row.welfareStatus == 2) {
+        return '<span class="state-point state-point-error">已删除</span>';
+      } else if(row.welfareStatus == 3) {
+        return '<span class="state-point state-point-error">已过期</span>';
+      } else {
+        let { _status } = mappingCardStatus(row);
+        let _cl = '';
+        // 1未生效、2使用中、3已过期、4已禁用
+        switch (_status) {
+          case 1:
+            _cl = 'state-point-loading-scale'; // 未生效 转换成使用中
+            _status = 2;
+            break;
+          case 2:
+            _cl = 'state-point-loading-scale'; // 使用中
+            break;
+          case 3:
+            _cl = 'state-point-default';
+            break;
+          case 4:
+            _cl = 'state-point-error'; // 已禁用已过期
+            break;
+          default:
+            _cl = 'state-point-default';
+            break;
+        }
+        return `<span class="state-point ${_cl}">${cardStatus[_status] || '未知状态'}</span>`;
       }
-      return `<span class="state-point ${_cl}">${cardStatus[_status] || '未知状态'}</span>`;
     },
     getRelationId() {
       getRelationId().then(res => {