vipamount

@@ -57,7 +57,7 @@ var g = new common.grid({
         }},
         {display: '状态', render: function(item) {
             var html = ENUM.status[item.status]||'全部';
-            if (item.reason) {
+            if (item.reason && item.status == 2 || item.status == 4) {
                 html += '<p style="color:red;">(' + item.reason + ')</p>';
             }
             return html;
@@ -156,7 +156,7 @@ $('#basicTable').on('click', '.apply-cancel', function() {
         }
         return {
             id:item.id,
-            status: 3,
+            status: 4,
             reason:reason
         };
     }

@@ -33,7 +33,7 @@ var g = new common.grid({
     	{display: '操作', render: function(item) {
     		if (item.validFlag == 1) {
     			$('#add-btn').addClass('disabled');
-                return '<a class="btn btn-info end-btn" data-id="' + item.id + '" href="javascript:;">结束</a>';
+                return '<a class="btn btn-info end-btn" data-id="' + item.id + '" href="javascript:;">停止</a>';
     		} else {
     			return '活动已结束';
     		}
@@ -41,7 +41,7 @@ var g = new common.grid({
     	}}
     ]
 });
-g.init($("#gridurl").val());
+/*g.init($("#gridurl").val());*/
 
 $('#basicTable').on('click', '.end-btn', function() {
 	var activeId = $(this).data('id');
@@ -52,7 +52,16 @@ $('#basicTable').on('click', '.end-btn', function() {
         	id: activeId
         }
     }, function(res){
-        $('#add-btn').removeAttr('disabled');
+        $('#add-btn').removeClass('disabled');
         g.reload();
     });
-});
\ No newline at end of file
+});
+
+common.util.__ajax({
+    url: $("#gridurl").val(),
+    data:{
+        status: 1
+    }
+}, function(res){
+    console.log(res);
+}, true);
\ No newline at end of file

-exports.domain = require('../config/common.js').domain;
-//exports.domain = 'http://172.16.6.240:8088/platform';
+//exports.domain = require('../config/common.js').domain;
+exports.domain = 'http://172.16.6.240:8088/platform';
 
 //路由配置
 exports.res = [

-exports.domain = require('../config/common.js').domain;
+//exports.domain = require('../config/common.js').domain;
 //exports.domain = 'http://172.16.6.240:8088/platform';
-//exports.domain = 'http://172.16.6.162:8088/platform';
+exports.domain = 'http://172.16.6.162:8088/platform';
 
 //营销管理路由配置
 exports.res = [
@@ -391,22 +391,35 @@ exports.res = [
         //vip累计金额翻倍 -> 列表数据
         route: '/market/vipamount/list',
         method: 'POST',
-        url: '/activity/queryActivityList',
-        isJsonRaw: true,
-        params: [
-            {
-                name: 'type',
-                type: 'Number'
+        //url: '/activity/queryActivityList',
+        apis: {
+            data: {
+                url:'/activity/queryActivityList',
+                params: [
+                    {
+                        name: 'type',
+                        type: 'Number'
+                    },
+                    {
+                        name: 'size',
+                        type: 'Number'
+                    },
+                    {
+                        name: 'page',
+                        type: 'Number'
+                    }
+                ],
+                isJsonRaw: true
             },
-            {
-                name: 'size',
-                type: 'Number'
-            },
-            {
-                name: 'page',
-                type: 'Number'
+            data2: {
+                url: '/activity/queryActivityList',
+                params:[
+                    {name: 'status', type: 'Number'}
+                ],
+                isJsonRaw: true
             }
-        ]
+        }
+        
     }, 
     {
         //vip累计金额翻倍 -> 添加页面渲染