调整商家管理版块

Areas/Admin/Controllers/MainServer/MerchantInfoController.cs

@@ -49,7 +49,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// 商户列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(MerchantInfo data, int page = 1, int limit = 30)
+        public JsonResult IndexData(MerchantInfo data, string AlipayPid, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
@@ -57,9 +57,12 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("Name", "1"); //名称
             Fields.Add("CreateDate", "3"); //时间
             Fields.Add("Mobile", "1"); //手机号
-            Fields.Add("AlipayPid", "1");
 
             string condition = " and Status>0";
+            if(!string.IsNullOrEmpty(AlipayPid))
+            {
+                condition += " and Id=(select Id from MerchantAddInfo where AlipayPid='" + AlipayPid + "')";
+            }
             if(data.Status > 0)
             {
                 int Status = data.Status;
@@ -92,6 +95,12 @@ namespace MySystem.Areas.Admin.Controllers
                 if(QueryCount == "0") dic["QueryCount"] = "待审核";
                 if(QueryCount == "1") dic["QueryCount"] = "待签约";
                 if(QueryCount == "2") dic["QueryCount"] = "已签约";
+
+                int Id = int.Parse(dic["Id"].ToString());
+                MerchantAddInfo add = db.MerchantAddInfo.FirstOrDefault(m => m.Id == Id) ?? new MerchantAddInfo();
+                dic["SubMchid"] = add.SubMchid;
+                dic["AlipayPid"] = add.AlipayPid;
+                dic["AlipayAuthToken"] = add.AlipayAuthToken;
             }
             return Json(obj);
         }
@@ -186,13 +195,7 @@ namespace MySystem.Areas.Admin.Controllers
 
             Fields.Add("Name", data.Name); //名称
             Fields.Add("Mobile", data.Mobile); //手机号
-            Fields.Add("Areas", data.Areas); //所在地区
             Fields.Add("Address", data.Address); //详细地址
-            Fields.Add("IsAuth", data.IsAuth); //是否认证
-            Fields.Add("TotalAmount", data.TotalAmount); //平台总收益
-            Fields.Add("TotalOrder", data.TotalOrder); //累计订单
-            Fields.Add("TotalCustomer", data.TotalCustomer); //累计客户
-            Fields.Add("TotalUser", data.TotalUser); //会员数
             if (!string.IsNullOrEmpty(data.LoginPwd)) //密码不为空就修改密码，否则不操作
             {
                 Fields.Add("LoginPwd", function.MD532(data.LoginPwd)); //登录密码

Areas/Admin/Views/MainServer/MerchantInfo/Edit.cshtml

@@ -49,25 +49,6 @@
                                     autocomplete="off" placeholder="请输入手机号">
                             </div>
                         </div>
-                        <div class="layui-form-item">
-                            <label class="layui-form-label">所在地区</label>
-                            <input type="hidden" id="Areas" name="Areas" value="@editData.Areas" />
-                            <div class="layui-input-inline">
-                                <select id="AreasProvince" lay-search="" lay-filter="AreasProvince">
-                                    <option value="">省</option>
-                                </select>
-                            </div>
-                            <div class="layui-input-inline">
-                                <select id="AreasCity" lay-search="" lay-filter="AreasCity">
-                                    <option value="">市</option>
-                                </select>
-                            </div>
-                            <div class="layui-input-inline">
-                                <select id="AreasArea" lay-search="" lay-filter="AreasArea">
-                                    <option value="">县/区</option>
-                                </select>
-                            </div>
-                        </div>
                         <div class="layui-form-item">
                             <label class="layui-form-label">详细地址</label>
                             <div class="layui-input-inline">
@@ -76,13 +57,6 @@
                                     placeholder="请输入详细地址">
                             </div>
                         </div>
-                        <div class="layui-form-item">
-                            <label class="layui-form-label">是否认证</label>
-                            <div class="layui-input-inline">
-                                <input type="checkbox" id="IsAuth" name="IsAuth" value="1" @(editData.IsAuth == 1 ?
-                                    "checked=checked" : "") lay-skin="switch" lay-filter="switchTest" title="开关">
-                            </div>
-                        </div>
                         <div class="layui-form-item">
                             <label class="layui-form-label">平台总收益</label>
                             <div class="layui-input-inline">
@@ -91,30 +65,6 @@
                                     placeholder="请输入平台总收益">
                             </div>
                         </div>
-                        <div class="layui-form-item">
-                            <label class="layui-form-label">累计订单</label>
-                            <div class="layui-input-inline">
-                                <input class="layui-input" type="text" id="TotalOrder" name="TotalOrder"
-                                    value="@editData.TotalOrder" maxlength="20" lay-verify="" autocomplete="off"
-                                    placeholder="请输入累计订单">
-                            </div>
-                        </div>
-                        <div class="layui-form-item">
-                            <label class="layui-form-label">累计客户</label>
-                            <div class="layui-input-inline">
-                                <input class="layui-input" type="text" id="TotalCustomer" name="TotalCustomer"
-                                    value="@editData.TotalCustomer" maxlength="20" lay-verify="" autocomplete="off"
-                                    placeholder="请输入累计客户">
-                            </div>
-                        </div>
-                        <div class="layui-form-item">
-                            <label class="layui-form-label">会员数</label>
-                            <div class="layui-input-inline">
-                                <input class="layui-input" type="text" id="TotalUser" name="TotalUser"
-                                    value="@editData.TotalUser" maxlength="20" lay-verify="" autocomplete="off"
-                                    placeholder="请输入会员数">
-                            </div>
-                        </div>
                         <div class="layui-form-item">
                             <label class="layui-form-label">登录密码</label>
                             <div class="layui-input-inline">
@@ -124,7 +74,7 @@
                         </div>
 
                     </div>
-                    <div class="layui-tab-item layui-show">
+                    <div class="layui-tab-item">
                         <div class="layui-form-item">
                             <label class="layui-form-label">授权Token</label>
                             <div class="layui-input-inline">
@@ -146,7 +96,7 @@
                             </div>
                         </div>
                     </div>
-                    <div class="layui-tab-item layui-show">
+                    <div class="layui-tab-item">
                         <div class="layui-form-item">
                             <label class="layui-form-label">状态</label>
                             <div class="layui-input-inline">

wwwroot/layuiadmin/modules_main/MerchantInfo_Admin.js

@@ -108,7 +108,6 @@ $('#CreateDate').val(value);
             ,{field:'TotalCustomer', width: 200, title:'累计客户', sort: true}
             ,{field:'TotalUser', width: 200, title:'会员数', sort: true}
 
-            , {field:'Sort', fixed: 'right', title:'排序', width:80, edit: 'text'}
             , { title: '操作', width:280, align: 'center', fixed: 'right', toolbar: '#table-list-tools' }
         ]]
         , where: {