Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop

@@ -4,8 +4,8 @@ exports.domain = require('../config/common.js').domain;
 
 //营销管理路由配置
 exports.res = [
-//{route: '/-p-l-a-t-f-o-r-m/3',method:"GET"}//此模块上线将此删除
-    {
+    //{route: '/-p-l-a-t-f-o-r-m/3',method:"GET"}//此模块上线将此删除
+    /*{
         //营销码管理 -> 页面渲染
         route: '/market/coupon/index',
         method: 'GET',
@@ -374,7 +374,7 @@ exports.res = [
                 type: 'Number'
             }
         ]
-    },
+    },*/
     {
         //vip累计金额翻倍 -> 列表页面渲染
         route: '/market/vipamount/index',
@@ -387,86 +387,73 @@ exports.res = [
             createUrl: '/market/vipamount/add',
             gridurl: '/market/vipamount/list'
         }
-    },
-    {
+    }, {
         //vip累计金额翻倍 -> 列表数据
         route: '/market/vipamount/list',
         method: 'POST',
         //url: '/activity/queryActivityList',
         apis: {
             vipList: {
-                url:'/activity/queryActivityList',
-                params: [
-                    {
-                        name: 'type',
-                        type: 'Number'
-                    },
-                    {
-                        name: 'size',
-                        type: 'Number'
-                    },
-                    {
-                        name: 'page',
-                        type: 'Number'
-                    }
-                ],
+                url: '/activity/queryActivityList',
+                params: [{
+                    name: 'type',
+                    type: 'Number'
+                }, {
+                    name: 'size',
+                    type: 'Number'
+                }, {
+                    name: 'page',
+                    type: 'Number'
+                }],
                 isJsonRaw: true
             },
             activity: {
                 url: '/activity/queryActivityList',
-                params:[
-                    {name: 'status', type: 'Number',def: 0}
-                ],
+                params: [{
+                    name: 'status',
+                    type: 'Number',
+                    def: 0
+                }],
                 isJsonRaw: true
             }
         }
-        
-    }, 
-    {
+
+    }, {
         //vip累计金额翻倍 -> 添加页面渲染
         route: '/market/vipamount/add',
         method: 'GET',
         view: 'pages/market/vipamount-edit',
-        src:'/market/vipamount-edit',
+        src: '/market/vipamount-edit',
         data: {
             action: '/market/vipamount/save',
         }
-    },
-    {
+    }, {
         //vip累计金额翻倍 -> 添加编辑活动
         route: '/market/vipamount/save',
         method: 'POST',
         url: '/activity/saveActivity',
         isJsonRaw: true,
-        params: [
-            {
-                name: 'id',
-                type: 'Number'
-            },
-            {
-                name: 'num',
-                type: 'Number'
-            },
-            {
-                name: 'title',
-                type: 'String'
-            },
-            {
-                name: 'startTime',
-                type: 'Number'
-            },
-            {
-                name: 'endTime',
-                type: 'Number'
-            },
-            {
-                name: 'type',
-                type: 'Number'
-            },
-            {
-                name: 'status',
-                type: 'Number'
-            }
-        ]
+        params: [{
+            name: 'id',
+            type: 'Number'
+        }, {
+            name: 'num',
+            type: 'Number'
+        }, {
+            name: 'title',
+            type: 'String'
+        }, {
+            name: 'startTime',
+            type: 'Number'
+        }, {
+            name: 'endTime',
+            type: 'Number'
+        }, {
+            name: 'type',
+            type: 'Number'
+        }, {
+            name: 'status',
+            type: 'Number'
+        }]
     }
 ]
\ No newline at end of file