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

@@ -116,7 +116,6 @@ function __ajax(options,callback){
 	});
 	});
 	var pagecm = Handlebars.compile($("#pagenation-template").html().replace(/\\/g, ''));
 	var pagecm = Handlebars.compile($("#pagenation-template").html().replace(/\\/g, ''));
 
 
-	;
 	$('#pagewrapper').html(pagecm({
 	$('#pagewrapper').html(pagecm({
 		totalPages: $('#totalPages').text(),
 		totalPages: $('#totalPages').text(),
 		number:$('#number').text()
 		number:$('#number').text()

@@ -28,6 +28,10 @@ exports.init=function(){
                             callback&&callback();
                             callback&&callback();
                         }
                         }
                      });
                      });
+                    setTimeout(function(){
+                        location.href="/supplier/storeadmin/index";
+                    },800)
+                     
                 } else {
                 } else {
                     $.gritter.add({
                     $.gritter.add({
                         title: '提交失败',
                         title: '提交失败',

@@ -11,7 +11,7 @@ exports.init=function(){
 	var g=new grid({
 	var g=new grid({
 		el:'#storeadmin_Tabel',
 		el:'#storeadmin_Tabel',
 		columns:[
 		columns:[
-            {display:"ID",name:"shopsId"},
+            {display:"ID",name:"id"},
             {display:"店铺名称",name:"shopName"},
             {display:"店铺名称",name:"shopName"},
             {display:"店铺管理员",name:"adminName"},
             {display:"店铺管理员",name:"adminName"},
             {display:"创建时间",name:"createTime"},
             {display:"创建时间",name:"createTime"},

@@ -19,12 +19,19 @@ exports.res = [{
 },{
 },{
     // 新增颜色
     // 新增颜色
     route: '/erpproduct/size/addColor',   
     route: '/erpproduct/size/addColor',   
-    method: 'POST',
-    url:"/product/addSize",
-    isJsonRaw:true,
+    method: 'GET',
+    view:'pages/product/addColor',
+    src:'/product/color'
+},{
+    // 新增颜色
+    route: '/erpproduct/size/addColor/:id',   
+    method: 'GET',
+    view:'pages/product/addColor',
+    isJsonRaw:true,  
     params:[
     params:[
-        {name: 'colorName', type: 'String'}
-    ]
+        {name: 'id', type: 'Number'}
+    ],
+    src:'/product/color'
 },{
 },{
     // 修改颜色
     // 修改颜色
     route: '/erpproduct/size/updateColor',   
     route: '/erpproduct/size/updateColor',   

@@ -5,9 +5,8 @@ exports.res = [{
     // 产品管理【尺寸】页面渲染
     // 产品管理【尺寸】页面渲染
     route: '/erpproduct/size/index',
     route: '/erpproduct/size/index',
     method: 'GET',
     method: 'GET',
-    view: 'pages/product/siez-chart',
+    view: 'pages/product/siezChart',
     url:'/product/querySizeList',        
     url:'/product/querySizeList',        
-    noApi: true,
     params: [
     params: [
         {name: 'curPage', type: 'Number',def:1},
         {name: 'curPage', type: 'Number',def:1},
         {name: 'pageSize', type: 'Number',def:10}
         {name: 'pageSize', type: 'Number',def:10}
@@ -17,7 +16,7 @@ exports.res = [{
     // 产品管理【尺寸】页面分页渲染
     // 产品管理【尺寸】页面分页渲染
     route: '/erpproduct/size/index/:curPage',
     route: '/erpproduct/size/index/:curPage',
     method: 'GET',
     method: 'GET',
-    view: 'pages/product/siez-chart',
+    view: 'pages/product/siezChart',
     url:'/product/querySizeList',        
     url:'/product/querySizeList',        
     noApi: true,
     noApi: true,
     params: [
     params: [

+<div class="pageheader">
+    <div class="media">
+        <div class="pageicon pull-left">
+            <i class="fa fa-th-list"></i>
+        </div>
+        <div class="media-body">
+            <ul class="breadcrumb">
+                <li><a href=""><i class="glyphicon glyphicon-home"></i></a></li>
+                <li><a href="">颜色管理</a></li>
+                <li>颜色管理</li>
+            </ul>
+
+            <div>
+                <div style="width: 30%;float: left;">
+                    <h4>添加颜色</h4>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+  
+
+<div class="contentpanel">
+    <div class="panel panel-default" style="margin-bottom:10px;">
+        <div class="container" style="margin-top:10px;">
+            <div class="row" style="margin-bottom:10px;">
+                <div class="col-xs-10 col-sm-10 col-md-10 col-lg-10">
+                    <div class="form-group">
+                        <label for="input" class="col-sm-2 control-label">颜色名称:</label>
+                        <div class="col-sm-8">
+                            <input type="text" name="" id="siezName" class="form-control" value="" required="required" pattern="" title="">
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label for="input" class="col-sm-2 control-label">颜色代码:</label>
+                        <div class="col-sm-8">
+                            <input type="text" name="" id="siezName" class="form-control" value="" required="required" pattern="" title="">
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label for="input" class="col-sm-2 control-label">颜色值:</label>
+                        <div class="col-sm-8">
+                        </div>
+                    </div>
+                    <button type="button" class="col-sm-offset-3 btn btn-info">保存</button>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>

@@ -23,7 +23,7 @@
     <div class="panel panel-default" style="margin-bottom:10px;">
     <div class="panel panel-default" style="margin-bottom:10px;">
         <div class="panel-body">
         <div class="panel-body">
             <div class="row">
             <div class="row">
-                <a class="btn btn-info" >添加颜色</a>
+                <a href="/erpproduct/size/addColor" class="btn btn-info" >添加颜色</a>
             </div>
             </div>
         </div>
         </div>
             <table class="table table-striped table-bordered responsive dataTable no-footer">
             <table class="table table-striped table-bordered responsive dataTable no-footer">
@@ -44,7 +44,7 @@
                         <td>{{colorName}}</td>
                         <td>{{colorName}}</td>
                         <td>{{colorCode}}</td>
                         <td>{{colorCode}}</td>
                         <td><img src="{{colorValue}}"></td>
                         <td><img src="{{colorValue}}"></td>
-                        <td><a class="btn btn-info getsize" data-id="{{id}}" >操作</a></td>
+                        <td><a href="/erpproduct/size/addColor/{{id}}" class="btn btn-info getsize" >操作</a></td>
                     </tr>
                     </tr>
                     {{/data.list}}
                     {{/data.list}}
                 </tbody>
                 </tbody>