git 提交

@@ -468,7 +468,7 @@ $(document).on("click", "#goodsSelectBtn", function () {
 			callback: function () {
 			callback: function () {
 				Bll.module.contentData.data = goodsgird.selected.map(function (item, index) {
 				Bll.module.contentData.data = goodsgird.selected.map(function (item, index) {
 					return {
 					return {
-						src: item.images_url+'?imageMogr2/thumbnail/{width}x{height}/extent/{width}x{height}/background/d2hpdGU=/position/center/quality/90',
+						src: item.images_url,//+'?imageMogr2/thumbnail/{width}x{height}/extent/{width}x{height}/background/d2hpdGU=/position/center/quality/90',
 						id: item.product_skn,
 						id: item.product_skn,
 						product_skc: item.product_skc
 						product_skc: item.product_skc
 					}
 					}
@@ -485,8 +485,9 @@ $(document).on("click", "#goodsSelectBtn", function () {
 });
 });
 //点击“添加组”按钮（添加商品组）
 //点击“添加组”按钮（添加商品组）
 $(document).on("click", "#goodsaddBtn", function () {
 $(document).on("click", "#goodsaddBtn", function () {
+	var item=$.extend(true,{},Button[4].data[0]);
 	if(Bll.module.contentData.data[0].list.length){
 	if(Bll.module.contentData.data[0].list.length){
-		Bll.module.contentData.data.push(Button[4].data[0]);
+		Bll.module.contentData.data.push(item);
 	}
 	}
 	Bll.__render("#groupsgoods", "template_dialog_remgoodsgroup", Bll.module);
 	Bll.__render("#groupsgoods", "template_dialog_remgoodsgroup", Bll.module);
 });
 });
@@ -502,7 +503,7 @@ $(document).on("click", ".goodsSelectBtn", function () {
 			callback: function () {
 			callback: function () {
 				goodsgird.selected.forEach(function (item, i) {
 				goodsgird.selected.forEach(function (item, i) {
 					Bll.module.contentData.data[index].list[i] = {
 					Bll.module.contentData.data[index].list[i] = {
-						src: item.images_url+'?imageMogr2/thumbnail/{width}x{height}/extent/{width}x{height}/background/d2hpdGU=/position/center/quality/90',
+						src: item.images_url,//+'?imageMogr2/thumbnail/{width}x{height}/extent/{width}x{height}/background/d2hpdGU=/position/center/quality/90'
 						id: item.product_skn,
 						id: item.product_skn,
 						product_skc: item.product_skc,
 						product_skc: item.product_skc,
 						maxSortId: item.max_sort_id
 						maxSortId: item.max_sort_id
@@ -581,11 +582,11 @@ $(document).on("click", "#submit", function() {
 
 
 /*选择分类 自动切换 图片类型*/
 /*选择分类 自动切换 图片类型*/
 var TypeAToT={
 var TypeAToT={
-	"潮品":"1",
-	"搭配":"2",
-	"话题":"1",
-	"潮人":"2",
-	"小贴士":"1"
+	"潮品":"2",
+	"搭配":"1",
+	"话题":"2",
+	"潮人":"1",
+	"小贴士":"2"
 };
 };
 
 
 $(document).on("change","#maxSortId",function(){
 $(document).on("change","#maxSortId",function(){
@@ -629,6 +630,9 @@ $(document).on("click","#brandAutoBtn",function(){
 			if(res.code==200){
 			if(res.code==200){
 				var map={};
 				var map={};
 				console.log(res.data.list);
 				console.log(res.data.list);
+				if(res.data.list.length==0){
+					common.util.__tip("没有查询到符合的品牌");
+				}
 				res.data.list.forEach(function(item,index){
 				res.data.list.forEach(function(item,index){
 					map[item.product_skn]={
 					map[item.product_skn]={
 						id:item.brand_id,
 						id:item.brand_id,

@@ -90,7 +90,7 @@
         <div class="form-group">
         <div class="form-group">
             <label class="col-sm-2 control-label">封面图:</label>
             <label class="col-sm-2 control-label">封面图:</label>
             <div class="col-sm-8">
             <div class="col-sm-8">
-                <input type="file" name="coverImage" id="coverImage" value="[[coverImage]]" />
+                <input type="file" name="coverImage" id="coverImage" value="[[coverImage]]" required placeholder="封面图" />
             </div>
             </div>
         </div>
         </div>
         <div class="form-group">
         <div class="form-group">