Merge branch 'feature/会员分组' into master

src/components/dm-new-member-group/table.vue

@@ -28,10 +28,12 @@
           <p class="h-18">{{ scope.row.latestUpdateTime | formatTimeHMS }}</p>
         </template>
       </el-table-column>
-      <el-table-column label="到期时间" v-if="activeName != 2" min-width="120px" prop="recentUpdateDate">
-        <template slot-scope="scope">
-          <p class="h-18">{{ scope.row.recentUpdateDate | formatTimeYMD }}</p>
-          <p class="h-18">{{ scope.row.recentUpdateDate | formatTimeHMS }}</p>
+      <el-table-column label="到期时间" v-if="activeName != 2" min-width="120px">
+        <template slot-scope="{ row }">
+          <p class="h-18" v-if="!row.isRealTime">{{ row.effectiveDate | formatTimeYMD }}</p>
+          <p class="h-18" v-else>--</p>
+          <p class="h-18" v-if="!row.isRealTime">{{ row.effectiveDate | formatTimeHMS }}</p>
+          <p class="h-18" v-else>--</p>
         </template>
       </el-table-column>
     </el-table>