Merge branch 'test6.9.5' into gray

@@ -302,8 +302,13 @@
                 <div class="form-group">
                     <label class="col-sm-2 control-label">SKN除外</label>
                     <div class="col-sm-4">
+                        [[if couponType == 6]]
+                        <textarea class="form-control observe" prompt="SKN除外" data-field="sknExclude"
+                                  placeholder="skn用换行或英文逗号分隔" style="resize: none">[[sknExclude]]</textarea>
+                        [[else]]
                         <textarea class="form-control observe" prompt="SKN除外" data-field="sknExclude"
                                   placeholder="skn用换行或英文逗号分隔" style="resize: none" [[if status==1]] disabled [[/if]]>[[sknExclude]]</textarea>
+                        [[/if]]
                     </div>
                 </div>
                 [[/if]]

@@ -157,7 +157,9 @@ module.exports={
             params: [
                 {name: 'state', type: 'number'},
                 {name: 'sourceName', type: 'string'},
-                {name: 'categoryId', type: 'number'}
+                {name: 'categoryId', type: 'number'},
+                {name: 'page', type: 'number'},
+                {name: 'size', type: 'number'}
             ]
         },
         insertCategorySourceLink:{

@@ -207,11 +207,11 @@ var g = new common.grid({
             //    HtmArr.push('<a data-index="' + items.__index + '" href="JavaScript:;" class="btn btn-success btn-xs info-toHomePage">同步逛频道</a>');
             //}
             
-            if (items.hasToGrass == 1) {
-                HtmArr.push('<a data-index="' + items.__index + '" href="JavaScript:;" class="btn btn-warning btn-xs">已同步到种草</a>');
-            } else {
-                HtmArr.push('<a data-index="' + items.__index + '" href="JavaScript:;" class="btn btn-success btn-xs info-syncToGrass">同步到种草</a>');
-            }
+            // if (items.hasToGrass == 1) {
+            //     HtmArr.push('<a data-index="' + items.__index + '" href="JavaScript:;" class="btn btn-warning btn-xs">已同步到种草</a>');
+            // } else {
+            //     HtmArr.push('<a data-index="' + items.__index + '" href="JavaScript:;" class="btn btn-success btn-xs info-syncToGrass">同步到种草</a>');
+            // }
 
             return HtmArr.join('');
         }
@@ -351,24 +351,24 @@ $(document).on('click', '.info-sticky-cancel', function () {
 });
 
 //同步到种草
-$(document).on('click', '.info-syncToGrass', function () {
-    var item = g.rows[$(this).data("index")];
-
-    common.util.__ajax({
-        url: '/guang/article/syncArticleToGrass',
-        data: {
-            id: item.id
-        }
-    }, function (res) {
-
-        if (res.code == 200) {
-            common.util.__tip('同步成功', 'success');
-            g.reload();
-        } else {
-            common.util.__tip(res.message);
-        }
-    });
-});
+// $(document).on('click', '.info-syncToGrass', function () {
+//     var item = g.rows[$(this).data("index")];
+
+//     common.util.__ajax({
+//         url: '/guang/article/syncArticleToGrass',
+//         data: {
+//             id: item.id
+//         }
+//     }, function (res) {
+
+//         if (res.code == 200) {
+//             common.util.__tip('同步成功', 'success');
+//             g.reload();
+//         } else {
+//             common.util.__tip(res.message);
+//         }
+//     });
+// });
 
 //同步到逛频道
 $(document).on('click', '.info-toHomePage', function () {

@@ -157,7 +157,9 @@ module.exports={
             params: [
                 {name: 'state', type: 'number'},
                 {name: 'sourceName', type: 'string'},
-                {name: 'categoryId', type: 'number'}
+                {name: 'categoryId', type: 'number'},
+                {name: 'page', type: 'number'},
+                {name: 'size', type: 'number'}
             ]
         },
         insertCategorySourceLink:{