Merge branch 'v2' of http://git.ycjcjy.com/yunzhi/crm_pc into v2

src/pages/member/components/MemberCardInfo.jsx

@@ -36,7 +36,7 @@ export default (props) => {
     {
       title: "开卡日期",
       dataIndex: "bizDate",
-      render: (it) => (it ? moment(it).format("YYYY-MM-DD HH:mm:ss") : ""),
+      render: (it) => (it == '-' ? '-' : moment(it).format("YYYY-MM-DD HH:mm:ss")),
     },
     {
       title: "总时长",
@@ -45,9 +45,9 @@ export default (props) => {
     {
       title: "截止日期",
       dataIndex: "expireTime",
-      render: (it) => (it ? moment(it).format("YYYY-MM-DD HH:mm:ss") : ""),
+      render: (it) => (it == '-' ? '-' : moment(it).format("YYYY-MM-DD HH:mm:ss")),
     },
-    { 
+    {
       title: "操作",
       valueType: "option",
       key: "option",