From cfcc0f400564a6cb762f162595df1617322fde88 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 01 十一月 2023 08:54:55 +0800
Subject: [PATCH] 商户认证代码

---
 cloud-server-management/src/main/webapp/WEB-INF/view/system/operator/OperatorUser_proportionAuth.html         |   12 
 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorUserController.java |   53 +++
 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java     |    2 
 cloud-server-management/src/main/webapp/static/modular/system/appUser/tAppUser.js                             |   18 
 cloud-server-management/src/main/webapp/static/modular/system/operator/operator.js                            |    5 
 cloud-server-management/src/main/webapp/WEB-INF/view/system/operatorUser/OperatorUser.html                    |  600 ++++++++-------------------------------------
 cloud-server-management/src/main/webapp/static/modular/system/operatorUser/operatorUser.js                    |   18 +
 cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TOperatorUserServiceImpl.java  |   41 ---
 8 files changed, 196 insertions(+), 553 deletions(-)

diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java
index 3751fd5..46f7658 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java
@@ -136,8 +136,10 @@
     @RequestMapping("/proportionAuth/{id}")
     public String proportionAuth(Model model,@PathVariable("id") Integer id) {
         model.addAttribute("id",id);
+        TOperator data = operatorService.getById(id);
         List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
         model.addAttribute("provinceList",list);
+        model.addAttribute("data",data);
         return PREFIX + "OperatorUser_proportionAuth.html";
     }
 
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorUserController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorUserController.java
index 8615a01..b4478f1 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorUserController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorUserController.java
@@ -81,12 +81,61 @@
     }
 
     @RequestMapping(value = "/mgtShopAuth", method = RequestMethod.POST)
-    @ApiOperation(value = "平台商户进件")
+    @ApiOperation(value = "微信平台商户进件")
     @ResponseBody
-    public Object mgtShopAuth() {
+    public Object mgtShopAuth(Integer operatorId,String aliasName, String name,String phone,
+                              String bodyType,String businessName,String businessNumber,String legalPerson,
+                              String legalRepresentative,String registerAddress,String businessTerm,String businessPicture,
+                              String businessEnd,String legalNumber,String accountType,
+                              Integer blBusinessFoeverFlag, String leagleNumber,String legalAddress,
+                              String legalTerm,String legalEnd, Integer lpIcForeverFlag,String legalFront,String legalBack,
+                              String legalPhone,String legalEmail, String settlementAccountType,String saBank,String saAccountName,
+                              String saBankProvinceCode,String saBankCityCode, String saBankName,String saNumber,String baPics,
+                              String baDesc,Integer owner, String uboName,String uboIdCard,String uboIcStartDate,String uboIcEndDate,
+                              String uboIcFront,String uboIcBack, String uboIcAddress) {
         MgtShopAuthDto mgtShopAuthDto = new MgtShopAuthDto();
         Integer userId = Objects.requireNonNull(UserExt.getUser()).getId();
+
         mgtShopAuthDto.setUserId(userId);
+        mgtShopAuthDto.setAuthId("1");
+        mgtShopAuthDto.setShopId(Long.valueOf(operatorId));
+        mgtShopAuthDto.setShopName(businessName);
+        mgtShopAuthDto.setShopownerName(name);
+        mgtShopAuthDto.setShopownerPhone(phone);
+        mgtShopAuthDto.setMainType(Integer.valueOf(bodyType));
+        mgtShopAuthDto.setBlShopName(businessName);
+        mgtShopAuthDto.setBlNumber(businessNumber);
+        mgtShopAuthDto.setBlCorporateName(legalRepresentative);
+        mgtShopAuthDto.setBlRegisteredAddress(registerAddress);
+        mgtShopAuthDto.setBlBusinessStartTime(businessTerm);
+        mgtShopAuthDto.setBlBusinessDeanline(businessEnd);
+        mgtShopAuthDto.setBlBusinessFoeverFlag(blBusinessFoeverFlag);
+        mgtShopAuthDto.setBlImage(businessPicture);
+        mgtShopAuthDto.setLpCorporateName(legalPerson);
+        mgtShopAuthDto.setLpIdCard(legalNumber);
+        mgtShopAuthDto.setLpIdAddress(legalAddress);
+        mgtShopAuthDto.setLpIcStartDate(legalTerm);
+        mgtShopAuthDto.setLpIcEndDate(legalEnd);
+        mgtShopAuthDto.setLpIcForeverFlag(lpIcForeverFlag);
+        mgtShopAuthDto.setLpIcFront(legalFront);
+        mgtShopAuthDto.setLpIcBack(legalBack);
+        mgtShopAuthDto.setLpMobilePhone(legalPhone);
+        mgtShopAuthDto.setLpContactEmail("法人邮箱");
+        mgtShopAuthDto.setSettlementAccountType(accountType);
+        mgtShopAuthDto.setSaBank("开户行");
+        mgtShopAuthDto.setSaAccountName("开户名称");
+        mgtShopAuthDto.setSaBankProvinceCode("开户所在省");
+        mgtShopAuthDto.setSaBankCityCode("开户所在市");
+        mgtShopAuthDto.setSaBankName("开户行全称");
+        mgtShopAuthDto.setSaNumber("银行卡号");
+        mgtShopAuthDto.setOwner(1);
+        mgtShopAuthDto.setUboName("ck");
+        mgtShopAuthDto.setUboIdCard("513701199910156123");
+        mgtShopAuthDto.setUboIcStartDate("2020-05-05");
+        mgtShopAuthDto.setUboIcEndDate("2025-05-05");
+        mgtShopAuthDto.setUboIcFront("受益人身份证正面");
+        mgtShopAuthDto.setUboIcBack("受益人身份证正面");
+        mgtShopAuthDto.setUboIcAddress("受益人居住地址");
         operatorUserService.mgtShopAuth(mgtShopAuthDto);
         return SUCCESS_TIP;
     }
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TOperatorUserServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TOperatorUserServiceImpl.java
index fea1d50..b24aa9e 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TOperatorUserServiceImpl.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/TOperatorUserServiceImpl.java
@@ -56,46 +56,7 @@
     }
     @Override
     public void mgtShopAuth(MgtShopAuthDto mgtShopAuthDto) {
-        mgtShopAuthDto.setUserId(1);
-        mgtShopAuthDto.setAuthId("1");
-        mgtShopAuthDto.setShopId(1L);
-        mgtShopAuthDto.setShopName("商户名称");
-        mgtShopAuthDto.setShopownerName("店主姓名");
-        mgtShopAuthDto.setShopownerPhone("17628220929");
-        mgtShopAuthDto.setMainType(1);
-        mgtShopAuthDto.setBlShopName("营业执照商户名称");
-        mgtShopAuthDto.setBlNumber("营业执照编号");
-        mgtShopAuthDto.setBlCorporateName("营业执照法人姓名");
-        mgtShopAuthDto.setBlRegisteredAddress("营业执照注册地址");
-        mgtShopAuthDto.setBlBusinessStartTime("2022-02-11");
-        mgtShopAuthDto.setBlBusinessDeanline("2025-05-09");
-        mgtShopAuthDto.setBlBusinessFoeverFlag(0);
-        mgtShopAuthDto.setBlImage("营业执照图片");
-        mgtShopAuthDto.setLpCorporateName("法人姓名");
-        mgtShopAuthDto.setLpIdCard("513701199910156123");
-        mgtShopAuthDto.setLpIdAddress("法人身份证地址");
-        mgtShopAuthDto.setLpIcStartDate("2020-05-05");
-        mgtShopAuthDto.setLpIcEndDate("2025-05-05");
-        mgtShopAuthDto.setLpIcForeverFlag(0);
-        mgtShopAuthDto.setLpIcFront("法人身份证正面");
-        mgtShopAuthDto.setLpIcBack("法人身份证背面");
-        mgtShopAuthDto.setLpMobilePhone("17628220929");
-        mgtShopAuthDto.setLpContactEmail("法人邮箱");
-        mgtShopAuthDto.setSettlementAccountType("2");
-        mgtShopAuthDto.setSaBank("开户行");
-        mgtShopAuthDto.setSaAccountName("开户名称");
-        mgtShopAuthDto.setSaBankProvinceCode("开户所在省");
-        mgtShopAuthDto.setSaBankCityCode("开户所在市");
-        mgtShopAuthDto.setSaBankName("开户行全称");
-        mgtShopAuthDto.setSaNumber("银行卡号");
-        mgtShopAuthDto.setOwner(1);
-        mgtShopAuthDto.setUboName("ck");
-        mgtShopAuthDto.setUboIdCard("513701199910156123");
-        mgtShopAuthDto.setUboIcStartDate("2020-05-05");
-        mgtShopAuthDto.setUboIcEndDate("2025-05-05");
-        mgtShopAuthDto.setUboIcFront("受益人身份证正面");
-        mgtShopAuthDto.setUboIcBack("受益人身份证正面");
-        mgtShopAuthDto.setUboIcAddress("受益人居住地址");
+
         OperatorAuth shopAuthentication = new OperatorAuth();
 
         if(mgtShopAuthDto.getBlBusinessFoeverFlag()!=null&&mgtShopAuthDto.getBlBusinessFoeverFlag()==1){
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/operator/OperatorUser_proportionAuth.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/operator/OperatorUser_proportionAuth.html
index 5434436..2f3f50e 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/operator/OperatorUser_proportionAuth.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/operator/OperatorUser_proportionAuth.html
@@ -47,10 +47,9 @@
         <div class="form-horizontal" id="carInfoForm">
             <h2>商户信息</h2>
             <div style="display: flex">
-                <span id="storeName"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                <span id="storeStaff"></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                <span id="storePhone"></span>
+                <h3>运营商名称:</h3><h3>${data.name}</h3>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
             </div>
+
             <h2>商户号信息</h2>
             </br>
             </br>
@@ -59,8 +58,8 @@
                 <div class="col-lg-6" style="">
                     <div class="form-group">
                         <label class="col-sm-4 control-label" >
-                            主题类型:<input checked type="radio" name="bodyType" value="IND_BIZ" onclick="updateHalf(1)">个人
-                            <input type="radio" name="bodyType" value="ENTERPRISE" onclick="updateHalf(2)">企业
+                            主题类型:<input checked type="radio" name="bodyType" value="1" onclick="updateHalf(1)">个人
+                            <input type="radio" name="bodyType" value="2" onclick="updateHalf(2)">企业
                         </label>
                     </div>
                     <div class="form-group" >
@@ -194,9 +193,8 @@
                     <div class="form-group">
                         <label class="col-sm-3 control-label">开户银行:</label>
                         <div class="col-sm-9">
-                            <select style="width: 300px" class="form-control" id="bank" name="bank">
+                            <select style="width: 150px" class="form-control" id="bank" onchange="TSite.oneChange(this)" name="bank">
                                 <option value="">选择开户银行</option>
-
                             </select>
                         </div>
                     </div>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/operatorUser/OperatorUser.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/operatorUser/OperatorUser.html
index 491d4db..31f91ba 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/operatorUser/OperatorUser.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/operatorUser/OperatorUser.html
@@ -1,491 +1,113 @@
-<!DOCTYPE html>
-<html lang="zh">
-<head>
-    <meta charset="UTF-8" />
-    <title>amis demo</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <meta
-            name="viewport"
-            content="width=device-width, initial-scale=1, maximum-scale=1"
-    />
-    <meta http-equiv="X-UA-Compatible" content="IE=Edge" />
-    <link rel="stylesheet" href="${ctxPath}/sdk/sdk.css" />
-    <link rel="stylesheet" href="${ctxPath}/sdk/helper.css" />
-    <link rel="stylesheet" href="${ctxPath}/sdk/iconfont.css" />
-    <!-- 这是默认主题所需的,如果是其他主题则不需要 -->
-    <!-- 从 1.1.0 开始 sdk.css 将不支持 IE 11,如果要支持 IE11 请引用这个 css,并把前面那个删了 -->
-    <!-- <link rel="stylesheet" href="sdk-ie11.css" /> -->
-    <!-- 不过 amis 开发团队几乎没测试过 IE 11 下的效果,所以可能有细节功能用不了,如果发现请报 issue -->
-    <style>
-        html,
-        body,
-        .app-wrapper {
-            position: relative;
-            width: 100%;
-            height: 100%;
-            margin: 0;
-            padding: 0;
-        }
-    </style>
-</head>
-<body>
-<div id="root" class="app-wrapper"></div>
-<script src="${ctxPath}/sdk/sdk.js"></script>
-<script type="text/javascript">
-    (function () {
-        let amis = amisRequire('amis/embed');
-        // 通过替换下面这个配置来生成不同页面
-        let amisJSON = {
-            "type": "page",
-            "title": "",
-            "regions": [
-                "body",
-                "toolbar",
-                "header"
-            ],
-            "body": [
-                {
-                    "type": "crud",
-                    "id": "u:e103c7434df8",
-                    "syncLocation": false,
-                    "api": {
-                        "method": "post",
-                        "url": "/operatorUser/listAll",
-                        "messages": {
-                        }
-                    },
-                    "columns": [
-                        {
-                            "label": "所在市",
-                            "type": "text",
-                            "name": "city",
-                            "id": "u:71aded278293"
-                        },
-                        {
-                            "label": "管理员姓名",
-                            "type": "text",
-                            "name": "adminName",
-                            "id": "u:22cab5368b85",
-                            "classNameExpr": "<%= data.courseName === '总计' ? 'bg-danger' : '' %>",
-                            "placeholder": "-"
-                        },
-                        {
-                            "label": "管理员手机号",
-                            "type": "text",
-                            "name": "adminPhone",
-                            "id": "u:100d93c3a7af",
-                            "classNameExpr": "<%= data.courseName === '总计' ? 'bg-danger' : '' %>",
-                            "placeholder": "-"
-                        },
-                        {
-                            "label": "认证平台",
-                            "type": "mapping",
-                            "name": "ptType",
-                            "id": "u:0529135bd40c",
-                            "placeholder": "-",
-                            "map": {
-                                "1": "支付宝",
-                                "2": "微信"
-                            }
-                        },
-                        {
-                            "label": "认证类型",
-                            "type": "mapping",
-                            "name": "regisType",
-                            "id": "u:89e54c565da1",
-                            "placeholder": "-",
-                            "map": {
-                                "1": "法人",
-                                "2": "个人"
-                            }
-                        },
-                        {
-                            "label": "分账比例",
-                            "type": "text",
-                            "name": "percent",
-                            "id": "u:9f3c838b4dce",
-                            "placeholder": "-",
-                            "classNameExpr": "<%= data.courseName === '总计' ? 'bg-danger' : '' %>"
-                        },
-                        {
-                            "type": "mapping",
-                            "name": "isPass",
-                            "label": "审核状态",
-                            "id": "u:89e54c565da1",
-                            "placeholder": "-",
-                            "map": {
-                                "1": "待审核",
-                                "2": "审核中",
-                                "3": "已通过",
-                                "4": "已拒绝"
-                            }
-                        },
-                        {
-                            "type": "operation",
-                            "id": "u:d69a8d60da29",
-                            "buttons": [
-                                {
-                                    "type": "button",
-                                    "label": "详情",
-                                    "onEvent": {
-                                        "click": {
-                                            "actions": [
-                                                {
-                                                    "args": {
-                                                        "options": {
-                                                            "silent": false
-                                                        },
-                                                        "api": {
-                                                            "url": "/ball/toRegister/$id",
-                                                            "method": "get"
-                                                        }
-                                                    },
-                                                    "actionType": "ajax"
-                                                }
-                                            ]
-                                        }
-                                    },
-                                    "id": "u:ed2016be790a",
-                                    "class": "link",
-                                    "level": "link"
-                                }
-                            ]
-                        }
-                    ],
-                    "bulkActions": [
-                        {
-                            "type": "button",
-                            "level": "danger",
-                            "label": "批量删除",
-                            "actionType": "ajax",
-                            "confirmText": "确定要删除?",
-                            "api": "/xxx/batch-delete",
-                            "id": "u:e179a3daeee8"
-                        },
-                        {
-                            "type": "button",
-                            "label": "批量编辑",
-                            "actionType": "dialog",
-                            "dialog": {
-                                "title": "批量编辑",
-                                "size": "md",
-                                "body": {
-                                    "type": "form",
-                                    "api": "/xxx/bacth-edit",
-                                    "body": [
-                                        {
-                                            "label": "字段1",
-                                            "text": "字段1",
-                                            "type": "input-text"
-                                        }
-                                    ]
-                                }
-                            },
-                            "id": "u:4bbe1e5df5ed"
-                        }
-                    ],
-                    "itemActions": [
-                        {
-                            "label": "分账比例",
-                            "type": "button",
-                            "id": "u:0120816fbcb0",
-                            "level": "info",
-                            "onEvent": {
-                                "click": {
-                                    "actions": [
-                                        {
-                                            "args": {
-                                            },
-                                            "dialog": {
-                                                "type": "dialog",
-                                                "title": "弹框标题",
-                                                "body": [
-                                                    {
-                                                        "type": "form",
-                                                        "title": "表单",
-                                                        "body": [
-                                                            {
-                                                                "label": "测试分账id",
-                                                                "type": "input-text",
-                                                                "name": "id",
-                                                                "id": "u:64ad701b83c3"
-                                                            },
-                                                            {
-                                                                "label": "支付宝分账比例",
-                                                                "type": "input-text",
-                                                                "name": "ali",
-                                                                "id": "u:91534896ba54"
-                                                            },
-                                                            {
-                                                                "label": "微信分账比例",
-                                                                "type": "input-text",
-                                                                "name": "text",
-                                                                "id": "u:4649d90555b1"
-                                                            }
-                                                        ],
-                                                        "api": {
-                                                            "url": "/ball/resSet",
-                                                            "method": "get"
-                                                        },
-                                                        "id": "u:01f28ccf4fb8"
-                                                    }
-                                                ],
-                                                "showCloseButton": true,
-                                                "showErrorMsg": true,
-                                                "showLoading": true,
-                                                "id": "u:073191c211be"
-                                            },
-                                            "actionType": "dialog"
-                                        }
-                                    ],
-                                    "weight": 0
-                                }
-                            }
-                        }
-                    ],
-                    "filterSettingSource": [
-                        "id",
-                        "customerName",
-                        "simName",
-                        "address",
-                        "industryId",
-                        "email",
-                        "createBy",
-                        "updateBy",
-                        "remark",
-                        "customerCode"
-                    ],
-                    "features": [
-                        "create",
-                        "filter",
-                        "bulkDelete",
-                        "view",
-                        "delete",
-                        "update",
-                        "bulkUpdate"
-                    ],
-                    "filterColumnCount": 3,
-                    "filterEnabledList": [
-                    ],
-                    "headerToolbar": [
-                        {
-                            "label": "新增",
-                            "type": "button",
-                            "actionType": "dialog",
-                            "level": "primary",
-                            "dialog": {
-                                "title": "新增",
-                                "body": {
-                                    "type": "form",
-                                    "api": {
-                                        "method": "post",
-                                        "url": "/ball/getRegisterList",
-                                        "messages": {
-                                        }
-                                    },
-                                    "body": [
-                                        {
-                                            "type": "input-text",
-                                            "name": "city",
-                                            "label": "所在市"
-                                        },
-                                        {
-                                            "type": "input-text",
-                                            "name": "adminName",
-                                            "label": "管理员姓名"
-                                        },
-                                        {
-                                            "type": "input-text",
-                                            "name": "adminPhone",
-                                            "label": "管理员手机号"
-                                        },
-                                        {
-                                            "type": "select",
-                                            "name": "ptType",
-                                            "label": "认证平台"
-                                        },
-                                        {
-                                            "type": "select",
-                                            "name": "regisType",
-                                            "label": "认证类型"
-                                        },
-                                        {
-                                            "type": "input-text",
-                                            "name": "percent",
-                                            "label": "分账比例"
-                                        },
-                                        {
-                                            "type": "select",
-                                            "name": "isPass",
-                                            "label": "审核状态"
-                                        },
-                                        {
-                                            "type": "input-operation"
-                                        }
-                                    ]
-                                }
-                            },
-                            "id": "u:7ab8ef9ba27f"
-                        },
-                        "bulkActions"
-                    ],
-                    "filter": {
-                        "title": "查询条件",
-                        "columnCount": 3,
-                        "mode": "horizontal",
-                        "body": [
-                            {
-                                "type": "input-city",
-                                "label": "城市选择",
-                                "name": "cityCode",
-                                "allowDistrict": false,
-                                "id": "u:16db9fd9fe42",
-                                "mode": "horizontal",
-                                "horizontal": {
-                                    "left": 3,
-                                    "right": 9
-                                },
-                                "className": ""
-                            },
-                            {
-                                "type": "input-date-range",
-                                "label": "日期范围",
-                                "name": "times",
-                                "id": "u:5ea0ab341c9e",
-                                "embed": false,
-                                "format": "YYYY-MM-DD",
-                                "inputFormat": "YYYY-MM-DD"
-                            },
-                            {
-                                "type": "input-text",
-                                "label": "管理员姓名",
-                                "name": "adminName",
-                                "id": "u:528726820775"
-                            },
-                            {
-                                "type": "select",
-                                "label": "认证平台",
-                                "name": "ptType",
-                                "options": [
-                                    {
-                                        "label": "全部",
-                                        "value": ""
-                                    },
-                                    {
-                                        "label": "支付宝",
-                                        "value": "1"
-                                    },
-                                    {
-                                        "label": "微信",
-                                        "value": "2"
-                                    }
-                                ],
-                                "id": "u:3f0a0a09ae17",
-                                "multiple": false
-                            },
-                            {
-                                "type": "select",
-                                "label": "认证类型",
-                                "name": "regisType",
-                                "options": [
-                                    {
-                                        "label": "全部",
-                                        "value": "全部"
-                                    },
-                                    {
-                                        "label": "法人",
-                                        "value": "1"
-                                    },
-                                    {
-                                        "label": "个人",
-                                        "value": "2"
-                                    }
-                                ],
-                                "id": "u:62ad230ae3e4",
-                                "multiple": false
-                            },
-                            {
-                                "type": "select",
-                                "label": "审核状态",
-                                "name": "isPass",
-                                "options": [
-                                    {
-                                        "label": "全部",
-                                        "value": "全部"
-                                    },
-                                    {
-                                        "label": "待审核",
-                                        "value": "1"
-                                    },
-                                    {
-                                        "label": "审核中",
-                                        "value": "2"
-                                    },
-                                    {
-                                        "label": "已通过",
-                                        "value": "3"
-                                    },
-                                    {
-                                        "label": "已拒绝",
-                                        "value": "4"
-                                    }
-                                ],
-                                "id": "u:b5833dda16af",
-                                "multiple": false
-                            }
-                        ],
-                        "id": "u:2c92f31a25d0",
-                        "name": "select1",
-                        "rules": [
-                        ]
-                    },
-                    "perPageAvailable": [
-                        10,
-                        20,
-                        50,
-                        100
-                    ],
-                    "messages": {
-                    },
-                    "footerToolbar": [
-                        {
-                            "type": "statistics",
-                            "align": "left"
-                        },
-                        {
-                            "type": "pagination",
-                            "align": "left"
-                        },
-                        {
-                            "type": "switch-per-page",
-                            "tpl": "内容",
-                            "align": "left"
-                        }
-                    ],
-                    "columnsTogglable": "auto",
-                    "pageField": "",
-                    "perPageField": "",
-                    "alwaysShowPagination": true,
-                    "loadDataOnce": true,
-                    "perPage": 5,
-                    "combineNum": 3
-                }
-            ],
-            "id": "u:b14a93e2aeb3"
-        };
+@layout("/common/_container.html"){
+<div class="row">
+    <div class="col-sm-12">
+        <div class="ibox float-e-margins">
+            <div class="ibox-title">
+                <h5>运营商商户管理</h5>
+            </div>
+            <div class="ibox-content">
+                <div class="row row-lg">
+                    <div class="col-sm-12">
+                        <div class="row">
+                            <div class="col-sm-3">
+                                <div class="input-group">
+                                    <div class="input-group-btn open">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button" aria-expanded="true">
+                                            所在省
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="pCode" onchange="TSite.oneChange(this)">
+                                        <option value="">选择省</option>
+                                        @for(obj in provinceList){
+                                        <option value="${obj.code}">${obj.name}</option>
+                                        @}
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group">
+                                    <div class="input-group-btn open">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button" aria-expanded="true">
+                                            所在市
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="cCode">
+                                        <option value="">请先选择省</option>
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <#NameCon id="name" name="管理员姓名:" />
+                            </div>
+                            <div class="col-sm-3">
+                                <#NameCon id="phone" name="管理员手机号:" />
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group">
+                                    <div class="input-group-btn open">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button" aria-expanded="true">
+                                            认证平台
+                                        </button>
+                                    </div>
+                                    <select style="width: 300px" class="form-control" id="platform" name = "platform">
+                                        <option value="">全部</option>
+                                        <option value="1">微信</option>
+                                        <option value="2">支付宝</option>
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group">
+                                    <div class="input-group-btn open">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button" aria-expanded="true">
+                                            认证类型
+                                        </button>
+                                    </div>
+                                    <select style="width: 300px" class="form-control" id="type" name = "platform">
+                                        <option value="">全部</option>
+                                        <option value="1">法人</option>
+                                        <option value="2">个人</option>
+                                    </select>
+                                </div>
+                            </div>
 
-        let amisScoped = amis.embed('#root', amisJSON);
-
-
-    })();
-
-    function test(){
-        console.log("测试成功")
-    }
-
-    var myButton = document.getElementById("ttt");
-    myButton.addEventListener("click",test);
+                            <div class="col-sm-3">
+                                <div class="input-group">
+                                    <div class="input-group-btn open">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button" aria-expanded="true">
+                                            审核状态
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="state" >
+                                        <option value="">全部</option>
+                                        <option value="1">待审核</option>
+                                        <option value="2">审核中</option>
+                                        <option value="2">已审核</option>
+                                        <option value="2">已拒绝</option>
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <#button name="搜索" icon="fa-search" clickFun="TSite.search()"/>
+                                <#button name="重置" icon="fa-trash" clickFun="TSite.resetSearch()" space="true"/>
+                            </div>
+                        </div>
+                        <div class="hidden-xs" id="TCompetitionTableToolbar" role="group">
+                            <#button name="分账比例" icon="fa-plus" clickFun="TSite.proportion()"/>
+                        </div>
+                        <#table id="TSiteTable"/>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<script src="${ctxPath}/modular/system/operatorUser/operatorUser.js"></script>
+<script>
+    laydate.render({
+        elem: '#createTime'
+        ,range: true
+        ,lang:"en"
+    });
 </script>
-
-</body>
-</html>
\ No newline at end of file
+@}
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/appUser/tAppUser.js b/cloud-server-management/src/main/webapp/static/modular/system/appUser/tAppUser.js
index 20495c9..fbfd161 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/appUser/tAppUser.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/appUser/tAppUser.js
@@ -565,14 +565,14 @@
     carPhoto.setUploadBarId("progressBar");
     carPhoto.init();
 
-    //提交信息
-    var ajax = new $ax(Feng.ctxPath + "/operatorUser/mgtShopAuth", function (data) {
-        Feng.success("添加成功!");
-        window.parent.Course.table.refresh();
-        CourseInfo.close();
-    }, function (data) {
-        Feng.error("添加失败!" + data.responseJSON.message + "!");
-    });
-    ajax.start();
+    // //提交信息
+    // var ajax = new $ax(Feng.ctxPath + "/operatorUser/mgtShopAuth", function (data) {
+    //     Feng.success("添加成功!");
+    //     window.parent.Course.table.refresh();
+    //     CourseInfo.close();
+    // }, function (data) {
+    //     Feng.error("添加失败!" + data.responseJSON.message + "!");
+    // });
+    // ajax.start();
 
 });
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/operator/operator.js b/cloud-server-management/src/main/webapp/static/modular/system/operator/operator.js
index bbc7112..6ab19c4 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/operator/operator.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/operator/operator.js
@@ -68,15 +68,14 @@
  * 商户号认证
  */
 TSite.Allocationratio = function (e) {
-    console.log("看看E");
-    console.log(e);
+
         var index = layer.open({
             type: 2,
             title: "商户认证",
             area: ['100%', '100%'], //宽高
             fix: false, //不固定
             maxmin: true,
-            content: Feng.ctxPath + '/operator/proportionAuth/' + e
+            content: Feng.ctxPath + '/operatorUser'
         });
         this.layerIndex = index;
 };
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/operatorUser/operatorUser.js b/cloud-server-management/src/main/webapp/static/modular/system/operatorUser/operatorUser.js
index fc0280a..07b3b45 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/operatorUser/operatorUser.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/operatorUser/operatorUser.js
@@ -122,9 +122,8 @@
         Feng.error("请上传法人身份证背面照");
         return;
     }
-// todo 确定银行列表
     if ("" == $("#bank").val() || null == $("#bank").val()){
-        Feng.error("请选择银行");
+        Feng.error("请输入开户银行");
         return;
     }
     if ("" == $("#pCode").val() || null == $("#pCode").val()){
@@ -201,19 +200,32 @@
     }
     if ($("#IDCardEnd").val()==""){
         ajax.set("legalEnd","forever");
+        ajax.set("lpIcForeverFlag", 0);
     }else{
         ajax.set("legalEnd",$("#IDCardEnd").val());
+        ajax.set("lpIcForeverFlag", 1);
     }
 
-    if(bodyType=="ENTERPRISE"){
+    if(bodyType=="2"){
         if ($("#bEnd").val()==""){
             console.log("永远")
             ajax.set("beneficiaryEnd","forever");
+
         }else{
             console.log("嗯嗯嗯")
             ajax.set("beneficiaryEnd",$("#bEnd").val());
         }
     }
+
+    var tradeT = document.getElementById('tradeE');
+    if (tradeT.checked) {
+        endTime.disabled = true;
+        endTime.value="";
+        ajax.set("blBusinessFoeverFlag", 1);
+    } else {
+        ajax.set("blBusinessFoeverFlag", 0);
+        endTime.disabled = false;
+    }
     ajax.set("businessTerm",        $("#tradeTime").val()    );
     ajax.set("name",        $("#name").val()    );
     ajax.set("phone",        $("#phone").val()    );

--
Gitblit v1.7.1