Merge remote-tracking branch 'origin/release/2.0' into release/2.0

@@ -128,11 +128,6 @@ export default function() {
                     const row = params.row;
                     const row = params.row;
                     const vs = row.productVipStatus;
                     const vs = row.productVipStatus;
                     const vsMap = {
                     const vsMap = {
-                        0: {
-                            type: 'primary',
-                            text: '启用',
-                            event: this.enableVipPrice
-                        },
                         1: {
                         1: {
                             type: 'error',
                             type: 'error',
                             text: '禁用',
                             text: '禁用',
@@ -145,6 +140,10 @@ export default function() {
                         }
                         }
                     };
                     };
 
 
+                    if (vs === 0) {
+                        return (<span>-</span>);
+                    }
+
                     return (
                     return (
                         <i-button
                         <i-button
                             type={vsMap[vs].type}
                             type={vsMap[vs].type}