blk装修审核

@@ -39,7 +39,7 @@
                     <div id="decorationCheck" style="display: none; text-align: right; margin-top: -10px">
                     <div id="decorationCheck" style="display: none; text-align: right; margin-top: -10px">
                         <input id="checkOk" type="button" class="btn btn-primary delay-btn" value="审核通过">
                         <input id="checkOk" type="button" class="btn btn-primary delay-btn" value="审核通过">
                         <input id="checkNo" type="button" class="btn btn-danger delay-btn" value="驳回">
                         <input id="checkNo" type="button" class="btn btn-danger delay-btn" value="驳回">
-                        <input type="button" class="btn btn-default " value="返回" onclick="location.href='/supplier/shop/decoration'">
+                        <input type="button" class="btn btn-default " value="返回" onclick="location.href='/supplier/check/index'">
                     </div>
                     </div>
                 </div>
                 </div>
             </div>
             </div>

@@ -91,7 +91,19 @@ var g = new common.grid({
         {display: "更新时间", name: "updateTime"},
         {display: "更新时间", name: "updateTime"},
         {
         {
             display: "状态", name: "checkStatus", render: function (item) {
             display: "状态", name: "checkStatus", render: function (item) {
-            return ENUM.status[item.checkStatus];
+            var status = '';
+
+            if (t.active == "1"){
+                if(item.checkStatus){
+                    status += "YOHO店铺" + ENUM.status[item.checkStatus] + "<br>";
+                }
+                if(item.blkCheckStatus){
+                    status += "BLK店铺" + ENUM.status[item.blkCheckStatus];
+                }
+            }else {
+                status = ENUM.status[item.checkStatus];
+            }
+            return status;
         }
         }
         },
         },
         {
         {