Merge remote-tracking branch 'origin/dev_goblin' into dev_goblin

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/goblin/category/category.html

@@ -145,14 +145,14 @@
                 <span><em style="color:red">*</em>一级分类：</span>
                 <input class="form-control" id="firstTypeIpt" type="text">
                 <select class="form-control" name="tagType" id="firstTypeSelect" style="display: none;">
-                    <option value="">全部</option>
+                    <option value="" style="display: none;">全部</option>
                 </select>
             </div>
             <div class="selectClassifyOne selectClassifyOne2" style="display: none;">
                 <span><em style="color:red">*</em>二级分类：</span>
                 <input class="form-control" id="secondTypeIpt" type="text">
                 <select class="form-control" name="tagType" id="secondTypeSelect">
-                    <option value="">全部</option>
+                    <option value=""  style="display: none;">全部</option>
                 </select>
             </div>
             <div class="selectClassifyOne selectClassifyOne3" style="display: none;">
@@ -363,10 +363,10 @@
                     str += `<option value="${item.cateId}">${item.name}</option>`
                 })
                 if (!parentsId) {
-                    $("#firstTypeSelect").empty().append('<option value="">全部</option>');
+                    $("#firstTypeSelect").empty().append('<option value=""  style="display: none;">全部</option>');
                     $("#firstTypeSelect").append(str);
                 } else {
-                    $("#secondTypeSelect").empty().append('<option value="">全部</option>');
+                    $("#secondTypeSelect").empty().append('<option value=""  style="display: none;">全部</option>');
                     $("#secondTypeSelect").append(str);
                 }
             }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/goblin/store/info.html

@@ -201,8 +201,8 @@
         </div> -->
     </div>
     <div class="content_footer">
-        <button class="btn btn-primary" onclick="auditAccept()">审核通过</button>
-        <button class="btn btn-danger" style="margin: 0 12px" onclick="auditReject()">驳回</button>
+        <button class="btn btn-primary" type="button" onclick="auditAccept()">审核通过</button>
+        <button class="btn btn-danger" type="button" style="margin: 0 12px" onclick="auditReject()">驳回</button>
         <input id="reason" class="form-control" placeholder="请输入驳回原因" type="text">
     </div>
 </form>
@@ -237,14 +237,21 @@
     // var r = window.location.search.substr(1).match(reg);
     // console.log(r, storeId, '取到没')
     let storeId = storeInfo.storeId;
-
+    if (storeInfo.status == 3 || storeInfo.status == 2) {
+        $(".content_footer").hide();
+    }
 
 
     /* 店铺审核:通过 */
     function auditAccept() {
         if (!acceptFlg) {
             $.modal.confirm("确认要通过该店铺申请吗？", function() {
-                $.operate.post(prefix + "/audit/accept", { "storeId": storeId });
+                $.operate.post(prefix + "/audit/accept", { "storeId": storeId }, function (res) {
+                    console.log(res)
+                    if (res.code == 0) {
+                        $(".content_footer").hide();    
+                    }
+                });
             });
         }
     }
@@ -256,7 +263,11 @@
             if (!value) {
                 return layer.msg('请填写原因！')
             }
-            $.operate.post(prefix + "/audit/reject", { "storeId": storeId, "reason": value });
+            $.operate.post(prefix + "/audit/reject", { "storeId": storeId, "reason": value }, function (res) {
+                if (res.code == 0) {
+                    $(".content_footer").hide();    
+                }
+            });
         }
     }