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

@@ -16,8 +16,8 @@ exports.init=function(){
 	var g=new grid({
 		el:'#storeadmin_Tabel',        
         parms:function(){
-            var supplierid=$('#supplier-name').val(),
-                brandId = $('#brand-name').val();
+            var supplierid=!!~$.trim($('#supplier-name').val())?$('#supplier-name').val():"0",
+                brandId = !!~$.trim($('#brand-name').val())?$('#brand-name').val():"0";
             return {
                 "supplierId":supplierid,
                 "brandId":brandId,

@@ -27,10 +27,10 @@ exports.init = function() {
         $('.Add').eq(type).append(inputAdd);
     });
     new dropDown({
-        el: "#store-type"
+        el: "#shopNature"
     });
     new dropDown({
-        el: "#store-model"
+        el: "#shopsType"
     });
     new dropDown({
         el: "#brand-name",
@@ -44,7 +44,7 @@ exports.init = function() {
                     var check = $(this).closest('tr').html();
                     var brand = check.split('<td>')[check.split('<td>').length - 2];
                     var supplier = check.split('<td>')[check.split('<td>').length - 1];
-                    var table = '<tr><td>' + brand + '<td>' + supplier + '<td><button type="button" class="btn btn-danger btn-xs">删除</button></td></tr>';
+                    var table = '<tr><td>' + brand + '<td>' + supplier + '<td><button type="button" class="delete btn btn-danger btn-xs">删除</button></td></tr>';
                     $('#updateBrand tbody').append(table);
                 }
             })
@@ -54,7 +54,7 @@ exports.init = function() {
                     var check = $(this).closest('tr').html();
                     var brand = check.split('<td>')[check.split('<td>').length - 2];
                     var supplier = check.split('<td>')[check.split('<td>').length - 1];
-                    var table = '<tr><td>' + brand + '<td>' + supplier + '<td><button type="button" class="btn btn-danger btn-xs">删除</button></td></tr>';
+                    var table = '<tr><td>' + brand + '<td>' + supplier + '<td><button type="button" class="delete btn btn-danger btn-xs">删除</button></td></tr>';
                     $('#updateBrand tbody').append(table);
                 }
             })
@@ -198,4 +198,7 @@ exports.init = function() {
             }
         })
     })
+    $('#updateBrand').on('click','.delete',function(){
+        $(this).parents('tr').parent().remove()
+    })
 }
\ No newline at end of file

@@ -11,7 +11,7 @@ var env = process.env.NODE_ENV || 'development';
 var config = {
     'development':{
         redis:null,
-        domain:'http://192.168.102.215:8080/platform'
+        domain:'http://192.168.102.202:8081/platform'
     },
     'test': {
         redis: {

@@ -235,8 +235,6 @@ exports.res = [{
         method: 'POST',
         url:"/ShopsAdminRest/getUsersByIdentity",
         isJsonRaw:true,
-        url:'/ShopsAdminRest/getAdminRelationDetailById',
-        src:'/store/index',
         src:'/store/adminedit',
         params:[
             {name:"identity",type:"Number"}

@@ -56,7 +56,7 @@
 					<div class="col-sm-6">
 						<div class="input-group">
 							<input type="text"  form="storeForm" name="shopDomain" id="shopDomain" class="form-control" value="{{ shopDomain}}" placeholder="店铺域名" aria-describedby="basic-addon2">
-							<span class="input-group-addon" id="basic-addon2">@example.com</span>
+							<span class="input-group-addon" id="basic-addon2">.yohobuy.com</span>
 						</div>
 					</div>
 				</div>