Merge branch 'test6.9.1' of http://git.yoho.cn/fe/yohobuy-portal-fe2 into test6.9.1

@@ -81,6 +81,7 @@ module.exports=function(app) {
             pageName: "搜索资源位直通车管理"
             pageName: "搜索资源位直通车管理"
         }
         }
     });
     });
+    app.post("/categorySource/queryCategorySourceList","salecategory_queryCategorySourceList");
     app.post("/categorySource/insertCategorySourceLink","salecategory_insertCategorySourceLink");
     app.post("/categorySource/insertCategorySourceLink","salecategory_insertCategorySourceLink");
     app.post("/categorySource/deleteCategorySourceLink","salecategory_deleteCategorySourceLink");
     app.post("/categorySource/deleteCategorySourceLink","salecategory_deleteCategorySourceLink");
 }
 }

@@ -28,6 +28,7 @@ module.exports={
                 {name: 'orderBy', type: 'Number'},
                 {name: 'orderBy', type: 'Number'},
                 {name: 'brandIds', type: 'String'},
                 {name: 'brandIds', type: 'String'},
                 {name: 'icon', type: 'String'},
                 {name: 'icon', type: 'String'},
+                {name: 'iconSelected', type: 'String'},
                 {name: 'productSkns', type: 'String'}
                 {name: 'productSkns', type: 'String'}
             ]
             ]
         },
         },
@@ -43,6 +44,7 @@ module.exports={
                 {name: 'orderBy', type: 'Number'},
                 {name: 'orderBy', type: 'Number'},
                 {name: 'brandIds', type: 'String'},
                 {name: 'brandIds', type: 'String'},
                 {name: 'icon', type: 'String'},
                 {name: 'icon', type: 'String'},
+                {name: 'iconSelected', type: 'String'},
                 {name: 'productSkns', type: 'String'}
                 {name: 'productSkns', type: 'String'}
 
 
             ]
             ]

@@ -155,7 +155,8 @@ module.exports={
             title: "搜索资源位直通车列表",
             title: "搜索资源位直通车列表",
             url: '/categorySource/queryCategorySourceList',
             url: '/categorySource/queryCategorySourceList',
             params: [
             params: [
-                {name: 'sourceId', type: 'number'},
+                {name: 'state', type: 'number'},
+                {name: 'sourceName', type: 'string'},
                 {name: 'categoryId', type: 'number'}
                 {name: 'categoryId', type: 'number'}
             ]
             ]
         },
         },

@@ -119,6 +119,12 @@
                 <input type="file" id="icon" name="icon" value="{icon}" data-field="icon" />
                 <input type="file" id="icon" name="icon" value="{icon}" data-field="icon" />
             </div>
             </div>
         </div>
         </div>
+        <div class="form-group">
+            <label class="col-sm-2 control-label">选后中图片</label>
+            <div class="col-sm-10">
+                <input type="file" id="iconSelected" iconSelected="icon" value="{iconSelected}" data-field="icon" />
+            </div>
+        </div>
     </div>
     </div>
 </script>
 </script>
 
 

@@ -11,7 +11,7 @@ var EMUN = {
 
 
 var g = new common.grid({
 var g = new common.grid({
 	el: "#basicTable",
 	el: "#basicTable",
-	params: function() {
+	parms: function() {
 		return {
 		return {
 			state: 0,
 			state: 0,
 			sourceName: common.util.__input("sourceName"),
 			sourceName: common.util.__input("sourceName"),
@@ -39,7 +39,7 @@ var g = new common.grid({
 		display: '操作',
 		display: '操作',
 		name: '',
 		name: '',
 		render: function(item) {
 		render: function(item) {
-			if (item.isSelected == 1) {
+			if (item.state == 1) {
 				return '<a class="btn btn-xs btn-danger remove-btn" data-title="' + item.sourceName + '" _id="' + item.sourceId + '" href="javascript:;">取消选中</a>';
 				return '<a class="btn btn-xs btn-danger remove-btn" data-title="' + item.sourceName + '" _id="' + item.sourceId + '" href="javascript:;">取消选中</a>';
 			} else {
 			} else {
 				return '<a class="btn btn-xs btn-warning open-btn" data-title="' + item.sourceName + '" _id="' + item.sourceId + '" href="javascript:;">选中</a>';
 				return '<a class="btn btn-xs btn-warning open-btn" data-title="' + item.sourceName + '" _id="' + item.sourceId + '" href="javascript:;">选中</a>';
@@ -50,7 +50,7 @@ var g = new common.grid({
 });
 });
 
 
 
 
-g.init('/searchLabel/productSearchLabelList');
+g.init('/categorySource/queryCategorySourceList');
 
 
 //筛选
 //筛选
 $(document).on('click', '#filter-btn', function () {
 $(document).on('click', '#filter-btn', function () {
@@ -63,7 +63,7 @@ $(document).on('click', '#all-btn', function () {
 
 
 var sc = new common.grid({
 var sc = new common.grid({
     el: "#basicTable",
     el: "#basicTable",
-    params: function() {
+	parms: function() {
         return {
         return {
 			state: 1,
 			state: 1,
             categoryId: getCategoryId()
             categoryId: getCategoryId()