店铺创建

@@ -285,7 +285,7 @@ edit.prototype={
             }
             }
         };
         };
         callback&&callback(options);
         callback&&callback(options);
-        //$.ajax(options);
+        $.ajax(options);
         return false;
         return false;
     },
     },
     __listen:function(key,o,callback){
     __listen:function(key,o,callback){

@@ -375,7 +375,7 @@ var submit=function(callback){
             res=res.data;
             res=res.data;
             if(res.code=="200"){
             if(res.code=="200"){
                 e.$tip('提交成功',function(){
                 e.$tip('提交成功',function(){
-                    location.href="/limit/index";
+                    location.href="/supplier/store/index";
                 },'growl-success');
                 },'growl-success');
             }else{
             }else{
                 e.$tip(res.message);
                 e.$tip(res.message);
@@ -392,12 +392,12 @@ var submit=function(callback){
 //提交
 //提交
 $(".btn-success").click(function(){
 $(".btn-success").click(function(){
     submit(function(item){
     submit(function(item){
-        item.status=200;
+        item.onCheck=1;
     });
     });
 });
 });
 //暂存
 //暂存
-$(".btn-success").click(function(){
+$(".btn-cun").click(function(){
     submit(function(item){
     submit(function(item){
-        item.status=100;
+        item.onCheck=0;
     });
     });
 });
 });

@@ -24,4 +24,45 @@ $('#basicTable').on('click', '#tongguo', function() {
 
 
 $('#basicTable').on('click', '#bohui', function() {
 $('#basicTable').on('click', '#bohui', function() {
     Bll.toast("您确定要驳回审核吗？","/Shops/ShopsRest/checkReject");
     Bll.toast("您确定要驳回审核吗？","/Shops/ShopsRest/checkReject");
-});
+});
+
+var Bll={
+    addInput:function(label,name){
+        var $input=$("<input />");
+        $input.attr("type","text");
+        $input.attr("name",name);
+        $input.attr("placeholder",label);
+        $input.addClass("form-control");
+        $input.css("margin-bottom","15px");
+        $("#"+name).append($input);
+    }
+}
+
+var ENUM={
+    shopNature:{1:'旗舰店',2:'直营店'},
+    shopsType:{1:'单品店',2:'多品店'},
+    checkStatus:{100:'暂存',200:'审核中',300:'通过',900:'驳回'}
+}
+for(var key in ENUM){
+    var me=$("#"+key);
+    me.parent("div").html(ENUM[key][me.val()]);
+}
+$("#otherUrl").add("#websiteUrl").add("#shopAddress").each(function(){
+    var data=JSON.parse($(this).val());
+    var me=$(this).parent();
+    $.each(data,function(i,item){
+        me.append("<p>"+item+"</p>");
+    });
+});
+
+var g2=new common.grid({
+    el:"#updateBrand",
+    columns:[
+        {display:"品牌","name":"brandName"},
+        {display:"供应商","name":"supplierName"}
+    ]
+});
+if($("#shopRelation").val()){
+    var a=JSON.parse($("#shopRelation").val());
+    g2.init();
+}

@@ -62,3 +62,5 @@ var $ = require('jquery'),
             return Bll.model({isFreeze:"N"});
             return Bll.model({isFreeze:"N"});
         });
         });
     });
     });
+
+

-ul{margin-top:0}.admin-icon-yellow{color:#ffbe40}.admin-header{font-size:1.4rem;margin-bottom:0}.admin-header-list a:hover :after{content:none}.admin-main{background:#f3f3f3}.admin-menu{position:fixed;z-index:10;bottom:30px;right:20px}.admin-sidebar{width:260px;min-height:100%;float:left;border-right:1px solid #cecece}.admin-sidebar-list{margin-bottom:0}.admin-sidebar-list li a{color:#5c5c5c;padding-left:24px}.admin-sidebar-list li:first-child{border-top:none}.admin-sidebar-sub{margin-top:0;margin-bottom:0;box-shadow:0 16px 8px -15px #e2e2e2 inset;background:#ececec;padding-left:24px}.admin-sidebar-sub li:first-child{border-top:1px solid #dedede}.admin-sidebar-panel{margin:10px}.admin-content{width:auto;overflow:hidden;height:100%;background:#fff}.admin-content-list{border:1px solid #e9ecf1;margin-top:0}.admin-content-list li{border:1px solid #e9ecf1;border-width:0 1px;margin-left:-1px}.admin-content-list li:first-child{border-left:none}.admin-content-list li:last-child{border-right:none}.admin-content-table a{color:#535353}.admin-content-file{margin-bottom:0;color:#666}.admin-content-file p{margin:0 0 5px 0;font-size:1.4rem}.admin-content-file li{padding:10px 0}.admin-content-file li:first-child{border-top:none}.admin-content-file li:last-child{border-bottom:none}.admin-content-file li .am-progress{margin-bottom:4px}.admin-content-file li .am-progress-bar{line-height:14px}.admin-content-task{margin-bottom:0}.admin-content-task li{padding:5px 0;border-color:#eee}.admin-content-task li:first-child{border-top:none}.admin-content-task li:last-child{border-bottom:none}.admin-task-meta{font-size:1.2rem;color:#999}.admin-task-bd{font-size:1.4rem;margin-bottom:5px}.admin-content-comment{margin-bottom:0}.admin-content-comment .am-comment-bd{font-size:1.4rem}.admin-content-pagination{margin-bottom:0}.admin-content-pagination li a{padding:4px 8px}@media only screen and (min-width: 641px){.admin-sidebar{display:block;position:static;background:none}.admin-offcanvas-bar{position:static;width:auto;background:none;-webkit-transform:translate3d(0, 0, 0);-ms-transform:translate3d(0, 0, 0);transform:translate3d(0, 0, 0)}.admin-offcanvas-bar:after{content:none}}@media only screen and (max-width: 640px){.admin-sidebar{width:inherit}.admin-offcanvas-bar{background:#f3f3f3}.admin-offcanvas-bar:after{background:#BABABA}.admin-sidebar-list a:hover,.admin-sidebar-list a:active{-webkit-transition:background-color .3s ease;transition:background-color .3s ease;background:#E4E4E4}.admin-content-list li{padding:10px;border-width:1px 0;margin-top:-1px}.admin-content-list li:first-child{border-top:none}.admin-content-list li:last-child{border-bottom:none}.admin-form-text{text-align:left !important}}.user-info{margin-bottom:15px}.user-info .am-progress{margin-bottom:4px}.user-info p{margin:5px}.user-info-order{font-size:1.4rem}.error-log .am-pre-scrollable{max-height:40rem}.table-main{font-size:1.4rem;padding:.5rem}.table-main button{background:#fff}.table-check{width:30px}.table-id{width:50px}@media only screen and (max-width: 640px){.table-select{margin-top:10px;margin-left:5px}}.gallery-list li{padding:10px}.gallery-list a{color:#666}.gallery-list a:hover{color:#3bb4f2}.gallery-title{margin-top:6px;font-size:1.4rem}.gallery-desc{font-size:1.2rem;margin-top:4px}.page-404{background:#fff;border:none;width:200px;margin:0 auto}.fixed-layout,.fixed-layout body{height:100%;overflow:hidden}.fixed-layout .admin-header{position:fixed;top:0;left:0;right:0;z-index:1500}.fixed-layout .admin-main{position:relative;height:100%;padding-top:51px}.fixed-layout .admin-content,.fixed-layout .admin-sidebar{height:100%;overflow-x:hidden;overflow-y:scroll}.fixed-layout .admin-sidebar.am-active{z-index:1600}input[type=file]{display:block;opacity:0;height:60px;width:100px;position:absolute;z-index:99}.form-horizontal .form-group{margin-left:0px;margin-right:0px}.datepicker{display:none;position:absolute;padding:4px;margin-top:1px;direction:ltr}.datepicker.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;float:left;display:none;min-width:160px;list-style:none;background-color:#fff;border:1px solid rgba(0,0,0,0.2);border-radius:5px;box-shadow:0 5px 10px rgba(0,0,0,0.2);background-clip:padding-box;*border-right-width:2px;*border-bottom-width:2px;color:#333;font-size:13px;line-height:18px}.datepicker.dropdown-menu th{padding:4px 5px}.datepicker.dropdown-menu td{padding:4px 5px}.datepicker table{border:0;margin:0;width:auto}.datepicker table tr td span{display:block;width:23%;height:54px;line-height:54px;float:left;margin:1%;cursor:pointer}.datepicker td{text-align:center;width:20px;height:20px;border:0;font-size:12px;padding:4px 8px;background:#fff;cursor:pointer}.datepicker td.active.day,.datepicker td.active.year{background:#2ba6cb}.datepicker td.old,.datepicker td.new{color:#999}.datepicker td span.active{background:#2ba6cb}.datepicker td.day.disabled{color:#ccc}.datepicker th{text-align:center;width:20px;height:20px;border:0;font-size:12px;padding:4px 8px;background:#fff;cursor:pointer}.datepicker th.active.day,.datepicker th.active.year{background:#2ba6cb}.datepicker th.date-switch{width:145px}.datepicker th span.active{background:#2ba6cb}.datepicker .cw{font-size:10px;width:12px;padding:0 2px 0 5px;vertical-align:middle}.datepicker.days div.datepicker-days{display:block}.datepicker.months div.datepicker-months{display:block}.datepicker.years div.datepicker-years{display:block}.datepicker thead tr:first-child th{cursor:pointer}.datepicker thead tr:first-child th.cw{cursor:default;background-color:transparent}.datepicker tfoot tr:first-child th{cursor:pointer}.datepicker-inline{width:220px}.datepicker-rtl{direction:rtl}.datepicker-rtl table tr td span{float:right}.datepicker-dropdown{top:0;left:0}.datepicker-dropdown:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-bottom-color:1px solid rgba(0,0,0,0.2);position:absolute;top:-7px;left:6px}.datepicker-dropdown:after{content:'';display:inline-block;border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid #fff;position:absolute;top:-6px;left:7px}.datepicker>div,.datepicker-dropdown::before,.datepicker-dropdown::after{display:none}.datepicker-close{position:absolute;top:-30px;right:0;width:15px;height:30px;padding:0;display:none}.table-striped .datepicker table tr td,.table-striped .datepicker table tr th{background-color:transparent}.panel-default .panel-heading{border-top:1px solid #e7e7e7}.red{color:red;font-family:bold}input[type=date],input[type=time],input[type=datetime-local],input[type=month]{line-height:0 !important}.show-grid{padding:10px}.brandBtn-group{width:150px;float:left;margin-right:8px}.brandBtn-group-lg{width:280px}.contentpanel td a{margin:0 3px}.mainwrapper .toggle-table tr{cursor:pointer}.mainwrapper .toggle-table tr.level1 td:nth-of-type(1){text-indent:2px}.mainwrapper .toggle-table tr.level2 td:nth-of-type(1){text-indent:15px}.mainwrapper .toggle-table tr.level3 td:nth-of-type(1){text-indent:30px}.pattrscroll{background:#F7F7F7}.pattrscroll ul{padding-left:0}.pattrscroll li{cursor:pointer}.mainwrapper .list-group-item.level1{text-indent:2px}.mainwrapper .list-group-item.level2{text-indent:15px}.mainwrapper .list-group-item.level3{text-indent:30px}.attr-item-active{background:#428bca;color:#fff}.pannel-scroll{height:500px;overflow-y:scroll;overflow-x:hidden}.attr-select{display:block;height:40px;line-height:40px;border:1px solid #ccc;border-radius:3px}#limit-table-box table{vertical-align:middle}#limit-table-box table th,#limit-table-box table td{text-align:center;vertical-align:middle}#limit-table-box table div.checkbox label{height:13px}#limit-table-box table .cover-img{width:100px}#limit-table-box table .width50{width:50px;text-align:center}.height40{height:40px;line-height:40px}.edit-cover-img{width:100px;margin:0 15px;float:left}.quota-text,.quota-img,.quota-video{width:300px;margin-bottom:15px}.quota-text img,.quota-img img,.quota-video img{width:100%}#text-editor{width:100%;max-width:100%;min-width:100%;height:300px;max-height:300px;min-height:300px}.product-detail input[type="text"]{width:100px}.main-table{-display:none}.bulk-import{display:none}#upload-input{display:inline-block;position:static;opacity:1;width:auto;height:auto}.excel-model{display:inline-block;width:110px;height:48px;line-height:48px;padding:0 0 0 50px;margin:0 200px;background:url(../images/excel.png) no-repeat left center}.panel-input{display:inline-block;width:100%}.panel-col,.panel-col2{float:left;width:150px;margin:0 10px}.panel-col2{width:280px}
+ul{margin-top:0}.admin-icon-yellow{color:#ffbe40}.admin-header{font-size:1.4rem;margin-bottom:0}.admin-header-list a:hover :after{content:none}.admin-main{background:#f3f3f3}.admin-menu{position:fixed;z-index:10;bottom:30px;right:20px}.admin-sidebar{width:260px;min-height:100%;float:left;border-right:1px solid #cecece}.admin-sidebar-list{margin-bottom:0}.admin-sidebar-list li a{color:#5c5c5c;padding-left:24px}.admin-sidebar-list li:first-child{border-top:none}.admin-sidebar-sub{margin-top:0;margin-bottom:0;box-shadow:0 16px 8px -15px #e2e2e2 inset;background:#ececec;padding-left:24px}.admin-sidebar-sub li:first-child{border-top:1px solid #dedede}.admin-sidebar-panel{margin:10px}.admin-content{width:auto;overflow:hidden;height:100%;background:#fff}.admin-content-list{border:1px solid #e9ecf1;margin-top:0}.admin-content-list li{border:1px solid #e9ecf1;border-width:0 1px;margin-left:-1px}.admin-content-list li:first-child{border-left:none}.admin-content-list li:last-child{border-right:none}.admin-content-table a{color:#535353}.admin-content-file{margin-bottom:0;color:#666}.admin-content-file p{margin:0 0 5px 0;font-size:1.4rem}.admin-content-file li{padding:10px 0}.admin-content-file li:first-child{border-top:none}.admin-content-file li:last-child{border-bottom:none}.admin-content-file li .am-progress{margin-bottom:4px}.admin-content-file li .am-progress-bar{line-height:14px}.admin-content-task{margin-bottom:0}.admin-content-task li{padding:5px 0;border-color:#eee}.admin-content-task li:first-child{border-top:none}.admin-content-task li:last-child{border-bottom:none}.admin-task-meta{font-size:1.2rem;color:#999}.admin-task-bd{font-size:1.4rem;margin-bottom:5px}.admin-content-comment{margin-bottom:0}.admin-content-comment .am-comment-bd{font-size:1.4rem}.admin-content-pagination{margin-bottom:0}.admin-content-pagination li a{padding:4px 8px}@media only screen and (min-width: 641px){.admin-sidebar{display:block;position:static;background:none}.admin-offcanvas-bar{position:static;width:auto;background:none;-webkit-transform:translate3d(0, 0, 0);-ms-transform:translate3d(0, 0, 0);transform:translate3d(0, 0, 0)}.admin-offcanvas-bar:after{content:none}}@media only screen and (max-width: 640px){.admin-sidebar{width:inherit}.admin-offcanvas-bar{background:#f3f3f3}.admin-offcanvas-bar:after{background:#BABABA}.admin-sidebar-list a:hover,.admin-sidebar-list a:active{-webkit-transition:background-color 0.3s ease;transition:background-color 0.3s ease;background:#E4E4E4}.admin-content-list li{padding:10px;border-width:1px 0;margin-top:-1px}.admin-content-list li:first-child{border-top:none}.admin-content-list li:last-child{border-bottom:none}.admin-form-text{text-align:left !important}}.user-info{margin-bottom:15px}.user-info .am-progress{margin-bottom:4px}.user-info p{margin:5px}.user-info-order{font-size:1.4rem}.error-log .am-pre-scrollable{max-height:40rem}.table-main{font-size:1.4rem;padding:.5rem}.table-main button{background:#fff}.table-check{width:30px}.table-id{width:50px}@media only screen and (max-width: 640px){.table-select{margin-top:10px;margin-left:5px}}.gallery-list li{padding:10px}.gallery-list a{color:#666}.gallery-list a:hover{color:#3bb4f2}.gallery-title{margin-top:6px;font-size:1.4rem}.gallery-desc{font-size:1.2rem;margin-top:4px}.page-404{background:#fff;border:none;width:200px;margin:0 auto}.fixed-layout,.fixed-layout body{height:100%;overflow:hidden}.fixed-layout .admin-header{position:fixed;top:0;left:0;right:0;z-index:1500}.fixed-layout .admin-main{position:relative;height:100%;padding-top:51px}.fixed-layout .admin-content,.fixed-layout .admin-sidebar{height:100%;overflow-x:hidden;overflow-y:scroll}.fixed-layout .admin-sidebar.am-active{z-index:1600}input[type=file]{display:block;opacity:0;height:60px;width:100px;position:absolute;z-index:99}.form-horizontal .form-group{margin-left:0px;margin-right:0px}.datepicker{display:none;position:absolute;padding:4px;margin-top:1px;direction:ltr}.datepicker.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;float:left;display:none;min-width:160px;list-style:none;background-color:#fff;border:1px solid rgba(0,0,0,0.2);border-radius:5px;box-shadow:0 5px 10px rgba(0,0,0,0.2);background-clip:padding-box;*border-right-width:2px;*border-bottom-width:2px;color:#333;font-size:13px;line-height:18px}.datepicker.dropdown-menu th{padding:4px 5px}.datepicker.dropdown-menu td{padding:4px 5px}.datepicker table{border:0;margin:0;width:auto}.datepicker table tr td span{display:block;width:23%;height:54px;line-height:54px;float:left;margin:1%;cursor:pointer}.datepicker td{text-align:center;width:20px;height:20px;border:0;font-size:12px;padding:4px 8px;background:#fff;cursor:pointer}.datepicker td.active.day,.datepicker td.active.year{background:#2ba6cb}.datepicker td.old,.datepicker td.new{color:#999}.datepicker td span.active{background:#2ba6cb}.datepicker td.day.disabled{color:#ccc}.datepicker th{text-align:center;width:20px;height:20px;border:0;font-size:12px;padding:4px 8px;background:#fff;cursor:pointer}.datepicker th.active.day,.datepicker th.active.year{background:#2ba6cb}.datepicker th.date-switch{width:145px}.datepicker th span.active{background:#2ba6cb}.datepicker .cw{font-size:10px;width:12px;padding:0 2px 0 5px;vertical-align:middle}.datepicker.days div.datepicker-days{display:block}.datepicker.months div.datepicker-months{display:block}.datepicker.years div.datepicker-years{display:block}.datepicker thead tr:first-child th{cursor:pointer}.datepicker thead tr:first-child th.cw{cursor:default;background-color:transparent}.datepicker tfoot tr:first-child th{cursor:pointer}.datepicker-inline{width:220px}.datepicker-rtl{direction:rtl}.datepicker-rtl table tr td span{float:right}.datepicker-dropdown{top:0;left:0}.datepicker-dropdown:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-bottom-color:1px solid rgba(0,0,0,0.2);position:absolute;top:-7px;left:6px}.datepicker-dropdown:after{content:'';display:inline-block;border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid #fff;position:absolute;top:-6px;left:7px}.datepicker>div,.datepicker-dropdown::before,.datepicker-dropdown::after{display:none}.datepicker-close{position:absolute;top:-30px;right:0;width:15px;height:30px;padding:0;display:none}.table-striped .datepicker table tr td,.table-striped .datepicker table tr th{background-color:transparent}.panel-default .panel-heading{border-top:1px solid #e7e7e7}.red{color:red;font-family:bold}input[type=date],input[type=time],input[type=datetime-local],input[type=month]{line-height:0 !important}.show-grid{padding:10px}.brandBtn-group{width:150px;float:left;margin-right:8px}.brandBtn-group-lg{width:280px}.contentpanel td a{margin:0 3px}.mainwrapper .toggle-table tr{cursor:pointer}.mainwrapper .toggle-table tr.level1 td:nth-of-type(1){text-indent:2px}.mainwrapper .toggle-table tr.level2 td:nth-of-type(1){text-indent:15px}.mainwrapper .toggle-table tr.level3 td:nth-of-type(1){text-indent:30px}.pattrscroll{background:#F7F7F7}.pattrscroll ul{padding-left:0}.pattrscroll li{cursor:pointer}.mainwrapper .list-group-item.level1{text-indent:2px}.mainwrapper .list-group-item.level2{text-indent:15px}.mainwrapper .list-group-item.level3{text-indent:30px}.attr-item-active{background:#428bca;color:#fff}.pannel-scroll{height:500px;overflow-y:scroll;overflow-x:hidden}.attr-select{display:block;height:40px;line-height:40px;border:1px solid #ccc;border-radius:3px}#limit-table-box table{vertical-align:middle}#limit-table-box table th,#limit-table-box table td{text-align:center;vertical-align:middle}#limit-table-box table div.checkbox label{height:13px}#limit-table-box table .cover-img{width:100px}#limit-table-box table .width50{width:50px;text-align:center}.height40{height:40px;line-height:40px}.edit-cover-img{width:100px;margin:0 15px;float:left}.quota-text,.quota-img,.quota-video{width:300px;margin-bottom:15px}.quota-text img,.quota-img img,.quota-video img{width:100%}#text-editor{width:100%;max-width:100%;min-width:100%;height:300px;max-height:300px;min-height:300px}.product-detail input[type="text"]{width:100px}.main-table{-display:none}.bulk-import{display:none}#upload-input{display:inline-block;position:static;opacity:1;width:auto;height:auto}.excel-model{display:inline-block;width:110px;height:48px;line-height:48px;padding:0 0 0 50px;margin:0 200px;background:url(../images/excel.png) no-repeat left center}.panel-input{display:inline-block;width:100%}.panel-col,.panel-col2{float:left;width:150px;margin:0 10px}.panel-col2{width:280px}

@@ -149,14 +149,14 @@ exports.res = [{
             {name:"shopsId",type:"Number"},
             {name:"shopsId",type:"Number"},
             {name:"shopName",type:"String"},
             {name:"shopName",type:"String"},
             {name:"shopDomain",type:"String"},
             {name:"shopDomain",type:"String"},
-            {name:"shopNature",type:"String"},
+            {name:"shopNature",type:"Number"},
             
             
             {name:"websiteUrl",type:"String"},
             {name:"websiteUrl",type:"String"},
             {name:"otherUrl",type:"String"},
             {name:"otherUrl",type:"String"},
             {name:"shopAddress",type:"String"},
             {name:"shopAddress",type:"String"},
 
 
             {name:"createPid",type:"Number"},
             {name:"createPid",type:"Number"},
-            
+
             {name:"shopsType",type:"Number"},
             {name:"shopsType",type:"Number"},
             {name:"shopLogo",type:"String"},
             {name:"shopLogo",type:"String"},
             {name:"shopIntro",type:"String"},
             {name:"shopIntro",type:"String"},
@@ -175,7 +175,9 @@ exports.res = [{
         data:{
         data:{
             pageTitel:"创建店铺",
             pageTitel:"创建店铺",
             action:'/store/add',
             action:'/store/add',
-            data:{}
+            data:{
+                shopId:0
+            }
         }
         }
     }, {// 新增店铺数据
     }, {// 新增店铺数据
         route: '/store/add',
         route: '/store/add',
@@ -183,9 +185,10 @@ exports.res = [{
         url: '/ShopsRest/addShops',
         url: '/ShopsRest/addShops',
         isJsonRaw: true,
         isJsonRaw: true,
         params:[
         params:[
+            {name:"shopId",type:"Number",def:0},
             {name:"shopName",type:"String"},
             {name:"shopName",type:"String"},
             {name:"shopDomain",type:"String"},
             {name:"shopDomain",type:"String"},
-            {name:"shopNature",type:"String"},
+            {name:"shopNature",type:"Number"},
             {name:"createPid",type:"Number"},
             {name:"createPid",type:"Number"},
             {name:"shopsType",type:"Number"},
             {name:"shopsType",type:"Number"},
             {name:"shopLogo",type:"String"},
             {name:"shopLogo",type:"String"},

@@ -145,7 +145,7 @@
 				</div>
 				</div>
 
 
 				<button type="button" data-oncheck='1' class="check btn btn-success">提交审核</button>
 				<button type="button" data-oncheck='1' class="check btn btn-success">提交审核</button>
-				<button type="button" data-oncheck='2' class="check btn btn-info">暂存</button>
+				<button type="button" data-oncheck='2' class="check btn btn-info btn-cun">暂存</button>
 				<button onclick="history.go(-1);" type="button" class="btn btn-danger">取消</button>
 				<button onclick="history.go(-1);" type="button" class="btn btn-danger">取消</button>
 			</div>
 			</div>
 		</div>
 		</div>

@@ -32,7 +32,9 @@
 
 
 			<div class="row show-grid">
 			<div class="row show-grid">
 				<div class="col-xs-3 col-sm-3 col-md-3 col-lg-3">店铺性质：</div>
 				<div class="col-xs-3 col-sm-3 col-md-3 col-lg-3">店铺性质：</div>
-				<div class="col-xs-8 col-sm-8 col-md-8 col-lg-8"></div>
+				<div class="col-xs-8 col-sm-8 col-md-8 col-lg-8">
+					<input type="hidden" id="shopNature" value="{{shopNature}}" />
+				</div>
 			</div>
 			</div>
 			<div class="row show-grid">
 			<div class="row show-grid">
 				<div class="col-xs-3 col-sm-3 col-md-3 col-lg-3">店铺域名：</div>
 				<div class="col-xs-3 col-sm-3 col-md-3 col-lg-3">店铺域名：</div>
@@ -40,22 +42,25 @@
 			</div>
 			</div>
 			<div class="row show-grid">
 			<div class="row show-grid">
 				<div class="col-xs-3 col-sm-3 col-md-3 col-lg-3">官网地址：</div>
 				<div class="col-xs-3 col-sm-3 col-md-3 col-lg-3">官网地址：</div>
-				<div id='otherUrlValue' class="col-xs-8 col-sm-8 col-md-8 col-lg-8"></div>
-				<input id="otherUrl" type="hidden" value="{{ otherUrl}}">
+				<div id='otherUrlValue' class="col-xs-8 col-sm-8 col-md-8 col-lg-8">
+					<input id="otherUrl" type="hidden" value="{{ otherUrl}}">
+				</div>
 			</div>
 			</div>
 			<div class="row show-grid">
 			<div class="row show-grid">
 				<div class="col-xs-3 col-sm-3 col-md-3 col-lg-3">其他平台网址：</div>
 				<div class="col-xs-3 col-sm-3 col-md-3 col-lg-3">其他平台网址：</div>
-				<div id="websiteUrlValue" class="col-xs-8 col-sm-8 col-md-8 col-lg-8"></div>
-				<input id="websiteUrl" type="hidden" value="{{ websiteUrl}}">
+				<div id="websiteUrlValue" class="col-xs-8 col-sm-8 col-md-8 col-lg-8">
+					<input id="websiteUrl" type="hidden" value="{{ websiteUrl}}">
+				</div>
 			</div>
 			</div>
 			<div class="row show-grid">
 			<div class="row show-grid">
 				<div class="col-xs-3 col-sm-3 col-md-3 col-lg-3">代表实体店：</div>
 				<div class="col-xs-3 col-sm-3 col-md-3 col-lg-3">代表实体店：</div>
-				<div id="shopAddressValue" class="col-xs-8 col-sm-8 col-md-8 col-lg-8"></div>
-				<input id="shopAddress" type="hidden" value="{{ shopAddress}}">
+				<div id="shopAddressValue" class="col-xs-8 col-sm-8 col-md-8 col-lg-8">
+					<input id="shopAddress" type="hidden" value="{{ shopAddress}}">	
+				</div>
 			</div>
 			</div>
 			<div class="row show-grid">
 			<div class="row show-grid">
 				<div class="col-xs-3 col-sm-3 col-md-3 col-lg-3">店铺logo：</div>
 				<div class="col-xs-3 col-sm-3 col-md-3 col-lg-3">店铺logo：</div>
-				<div class="col-xs-8 col-sm-8 col-md-8 col-lg-8"><img src="{{ shopLogo}}"></div>
+				<div class="col-xs-8 col-sm-8 col-md-8 col-lg-8"><img src="{{ shopLogo}}" width="120" height="80"></div>
 			</div>
 			</div>
 			<div class="row show-grid">
 			<div class="row show-grid">
 				<div class="col-xs-3 col-sm-3 col-md-3 col-lg-3">店铺简介：</div>
 				<div class="col-xs-3 col-sm-3 col-md-3 col-lg-3">店铺简介：</div>
@@ -63,31 +68,19 @@
 			</div>
 			</div>
 			<div class="row show-grid">
 			<div class="row show-grid">
 				<div class="col-xs-3 col-sm-3 col-md-3 col-lg-3">店铺状态：</div>
 				<div class="col-xs-3 col-sm-3 col-md-3 col-lg-3">店铺状态：</div>
-				<div class="col-xs-8 col-sm-8 col-md-8 col-lg-8">{{ shopsType}}</div>
+				<div class="col-xs-8 col-sm-8 col-md-8 col-lg-8">
+					<input id="checkStatus" type="hidden" value="{{ checkStatus}}">	
+				</div>
 			</div>
 			</div>
 			<div class="row show-grid">
 			<div class="row show-grid">
 				<div class="col-xs-3 col-sm-3 col-md-3 col-lg-3">店铺模式：</div>
 				<div class="col-xs-3 col-sm-3 col-md-3 col-lg-3">店铺模式：</div>
-				<div class="col-xs-8 col-sm-8 col-md-8 col-lg-8">{{ shopNature}}</div>
+				<div class="col-xs-8 col-sm-8 col-md-8 col-lg-8">
+					<input id="shopsType" type="hidden" value="{{ shopsType}}">	
+				</div>
 			</div>
 			</div>
 			<div class="row show-grid">
 			<div class="row show-grid">
-				<div class="col-xs-9 col-sm-9 col-md-9 col-lg-9">
-					<table class="table table-bordered">
-						<thead>
-							<tr>
-								<th>品牌</th>
-								<th>供应商</th>
-							</tr>
-						</thead>
-						<tbody>
-						{{# shopRelationList}}
-							<tr>
-								<td>{{ brandName}}</td>
-								<td>{{ supplierName}}</td>
-							</tr>
-						{{/ shopRelationList}}
-						</tbody>
-					</table>
-				</div>
+				<div id="baseTable"></div>
+				<input type="hidden" id="shopRelation" value="{{shopRelation}}" />
 			</div>
 			</div>
 				{{# btn}}
 				{{# btn}}
 					<a class="btn btn-primary btn-xs" id="tongguo">审核通过</a>
 					<a class="btn btn-primary btn-xs" id="tongguo">审核通过</a>
@@ -99,38 +92,3 @@
 	</div>
 	</div>
 </div>
 </div>
 {{/data}}
 {{/data}}
-<!-- <div class="modal fade" id="modal-id">
-	<div class="modal-dialog">
-		<div class="modal-content">
-			<div class="modal-header">
-				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-				<h4 class="modal-title">温馨提示</h4>
-			</div>
-			<div class="modal-body">
-				您确定要通过审核吗？
-			</div>
-			<div class="modal-footer">
-				<button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
-				<button type="button" class="btn btn-primary">确定</button>
-			</div>
-		</div>
-	</div>
-</div>
-
-<div class="modal fade" id="modal-id">
-	<div class="modal-dialog">
-		<div class="modal-content">
-			<div class="modal-header">
-				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-				<h4 class="modal-title">温馨提示</h4>
-			</div>
-			<div class="modal-body">
-				您确定要驳回审核吗？
-			</div>
-			<div class="modal-footer">
-				<button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
-				<button type="button" class="btn btn-primary">确定</button>
-			</div>
-		</div>
-	</div>
-</div> -->