Merge branch 'dev_vip修改'

@@ -60,10 +60,10 @@ var g = new common.grid({
             display: '操作',
             render: function (item) {
                 var HtmArr = [];
-                if(item.productVipStatus == 1){
-                    HtmArr.push('<a onclick="changeStatus('+item.productSKN+',2)" href="javascript:;" class="btn btn-danger">关闭</a>');
-                }else{
+                if(item.vipDiscountType == 3){
                     HtmArr.push('<a onclick="changeStatus('+item.productSKN+',1)" href="javascript:;" class="btn btn-info">开启</a>');
+                }else{
+                    HtmArr.push('<a onclick="changeStatus('+item.productSKN+',2)" href="javascript:;" class="btn btn-danger">关闭</a>');
                 }
                 return HtmArr.join('');
             }