提交待测试

Areas/Admin/Controllers/MainServer/MerchantDepositReturnsController.cs

@@ -58,7 +58,7 @@ namespace MySystem.Areas.Admin.Controllers
             Dictionary<string, string> Fields = new Dictionary<string, string>();
 
             Fields.Add("AlipayAccountNo", "1"); //支付宝账号
-            Fields.Add("OrderNo", "1"); //退押订单号
+            Fields.Add("SeoKeyword", "1"); //退押订单号
 
             string condition = " and Status>-1";
 

Areas/Admin/Controllers/MainServer/PosMerchantInfoListController.cs

@@ -166,7 +166,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// 商户列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexsData(PosMerchantInfo data, string MerIdcardNo, string MerchantName, string PhoneNo, int ShowFlag = 0, int page = 1, int limit = 30)
+        public JsonResult IndexsData(PosMerchantInfo data, int page = 1, int limit = 30)
         {
 
 
@@ -175,13 +175,7 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("KqSnNo", "1"); //快钱SN号
             Fields.Add("MerIdcardNo", "1"); //身份证号
 
-            if (ShowFlag == 0)
-            {
-                Dictionary<string, object> objs = new Dictionary<string, object>();
-                return Json(objs);
-            }
-
-            string condition = " and Status>-1 and StandardStatus=100";
+            string condition = " and Status>-1 and StandardStatus=4 and StandardMonths=10";
 
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("PosMerchantInfo", Fields, "Id desc", "0", page, limit, condition);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;

wwwroot/layuiadmin/modules_main/PosMerchantInfosList_Admin.js

@@ -269,25 +269,18 @@ layui.config({
     //监听搜索
     form.on('submit(LAY-list-front-search)', function (data) {
         var field = data.field;
-        field.ShowFlag = 1;
-        if (field.MerIdcardNo == "" && field.MerchantName == "" && field.MerchantMobile == "") {
-            layer.alert('请输入查询条件');
-        }
-        else {
-            //执行重载
-            table.reload('LAY-list-manage', {
-                where: null,
-                page: {
-                    curr: 1
-                }
-            });
-        }
+        //执行重载
+        table.reload('LAY-list-manage', {
+            where: field,
+            page: {
+                curr: 1
+            }
+        });
     });
     form.on('submit(LAY-list-front-searchall)', function (data) {
         var field = data.field;
-        field.ShowFlag = 1;
         table.reload('LAY-list-manage', {
-            where: field,
+            where: null,
             page: {
                 curr: 1
             }