特殊供应商

src/main/java/com/caimei/modules/user/dao/NewCmShopDao.java

@@ -37,4 +37,10 @@ public interface NewCmShopDao extends CrudDao<NewCmShop> {
     void insertSplitCode(SplitCode splitCode);
 
     List<SplitCode> findSplitCode(Integer shopID);
+
+    void insertSepcial(NewCmShop newCmShop);
+
+    void offline(NewCmShop newCmShop);
+
+    void online(NewCmShop newCmShop);
 }

src/main/java/com/caimei/modules/user/entity/NewCmShop.java

@@ -81,7 +81,7 @@ public class NewCmShop extends DataEntity<NewCmShop> {
     private String splitCode;  //列表页回显
     private String socialCreditCode; //统一社会信用代码
     private Integer shopType;//供应商类别，普通1，新品供应商2，二手供应商3
-
+    private String cardNumber; //收款卡号
     /**
      * 非持久化字段
      **/
@@ -112,6 +112,14 @@ public class NewCmShop extends DataEntity<NewCmShop> {
         this.checkMan = checkMan;
     }
 
+    public String getCardNumber() {
+        return cardNumber;
+    }
+
+    public void setCardNumber(String cardNumber) {
+        this.cardNumber = cardNumber;
+    }
+
     public Integer getShopType() {
         return shopType;
     }

src/main/java/com/caimei/modules/user/service/NewCmShopService.java

@@ -292,4 +292,46 @@ public class NewCmShopService extends CrudService<NewCmShopDao, NewCmShop> {
         super.delete(newCmShop);
     }
 
+    @Transactional(readOnly = false)
+    public void saveSpecial(NewCmShop newCmShop) {
+        List<SplitCode> splitCodes = newCmShop.getSplitCodes();
+        if (null != newCmShop.getShopID() && newCmShop.getShopID() > 0) {
+            //有id修改
+            newCmShopDao.update(newCmShop);
+            //删除旧分帐号
+            newCmShopDao.deleteSplitCode(newCmShop.getShopID());
+            if (null != splitCodes && splitCodes.size() > 0) {
+                for (SplitCode splitCode : splitCodes) {
+                    if (StringUtils.isNotBlank(splitCode.getSplitCode())) {
+                        splitCode.setShopId(newCmShop.getShopID());
+                        //增加新分帐号
+                        newCmShopDao.insertSplitCode(splitCode);
+                    }
+                }
+            }
+        }else{
+            //保存
+            newCmShopDao.insertSepcial(newCmShop);
+            if (null != splitCodes && splitCodes.size() > 0) {
+                for (SplitCode splitCode : splitCodes) {
+                    if (StringUtils.isNotBlank(splitCode.getSplitCode())) {
+                        splitCode.setShopId(newCmShop.getShopID());
+                        //增加新分帐号
+                        newCmShopDao.insertSplitCode(splitCode);
+                    }
+                }
+            }
+        }
+
+    }
+
+    @Transactional(readOnly = false)
+    public void offline(NewCmShop newCmShop) {
+        newCmShopDao.offline(newCmShop);
+    }
+
+    @Transactional(readOnly = false)
+    public void online(NewCmShop newCmShop) {
+        newCmShopDao.online(newCmShop);
+    }
 }

src/main/java/com/caimei/modules/user/web/NewCmShopController.java

@@ -5,6 +5,7 @@ import com.caimei.modules.opensearch.CoreServiceUitls;
 import com.caimei.modules.sys.utils.CmMsgUtils;
 import com.caimei.modules.sys.utils.SMSUtils;
 import com.caimei.modules.user.dao.CmUserDao;
+import com.caimei.modules.user.dao.NewCmShopDao;
 import com.caimei.modules.user.entity.CmMessage;
 import com.caimei.modules.user.entity.CmOperationUser;
 import com.caimei.modules.user.entity.CmUser;
@@ -62,6 +63,8 @@ public class NewCmShopController extends BaseController {
     private CmOperationUserService cmOperationUserService;
     @Autowired
     private CmUserDao cmUserDao;
+    @Autowired
+    private NewCmShopDao newCmShopDao;
 
     @ModelAttribute
     public NewCmShop get(@RequestParam(required = false) String id) {
@@ -84,6 +87,8 @@ public class NewCmShopController extends BaseController {
         if (null != newCmShop.getEndTime() && !"".equals(newCmShop.getEndTime()) && !newCmShop.getEndTime().endsWith("23:59:59")) {
             newCmShop.setEndTime(newCmShop.getEndTime() + " 23:59:59");
         }
+        //屏蔽特殊供应商
+        newCmShop.setShopType(1);
         Page<NewCmShop> page = newCmShopService.findPage(new Page<NewCmShop>(request, response), newCmShop);
         model.addAttribute("page", page);
         return "modules/user/newCmShopList";
@@ -95,16 +100,59 @@ public class NewCmShopController extends BaseController {
         newCmShop.setShopType(2);
         Page<NewCmShop> page = newCmShopService.findPage(new Page<NewCmShop>(request, response), newCmShop);
         model.addAttribute("page", page);
+        model.addAttribute("newCmShop",newCmShop);
         model.addAttribute("shopType",2);
         return "modules/user/cmNewProductShopList";
     }
 
     @RequestMapping(value = "/special/new/edit")
     public String specialEdit(NewCmShop newCmShop, HttpServletRequest request, HttpServletResponse response, Model model) {
-        model.addAttribute("shopType",2);
+        if(null!=newCmShop.getShopID()){
+            newCmShop.setSplitCodes(newCmShopDao.findSplitCode(newCmShop.getShopID()));
+        }
+        model.addAttribute("newCmShop",newCmShop);
         return "modules/user/cmNewProductShopEdit";
     }
 
+    @RequestMapping(value = "/special/new/save")
+    public String specialSave(NewCmShop newCmShop, HttpServletRequest request, HttpServletResponse response, Model model) {
+        newCmShopService.saveSpecial(newCmShop);
+        if(2==newCmShop.getShopType()){
+            model.addAttribute("newCmShop",newCmShop);
+            model.addAttribute("shopType",2);
+            return "redirect:" + Global.getAdminPath() + "/user/newCmShop/special/new?repage";
+        }else{
+            model.addAttribute("newCmShop",newCmShop);
+            model.addAttribute("shopType",3);
+            return "redirect:" + Global.getAdminPath() + "/user/newCmShop/special/second?repage";
+        }
+    }
+
+    @RequestMapping(value = "/special/offline")
+    public String specialOffline(NewCmShop newCmShop, HttpServletRequest request, HttpServletResponse response, Model model) {
+        //下线
+        newCmShopService.offline(newCmShop);
+        if(2==newCmShop.getShopType()){
+            model.addAttribute("shopType",2);
+            return "redirect:" + Global.getAdminPath() + "/user/newCmShop/special/new?repage";
+        }else{
+            model.addAttribute("shopType",3);
+            return "redirect:" + Global.getAdminPath() + "/user/newCmShop/special/second?repage";
+        }
+    }
+
+    @RequestMapping(value = "/special/online")
+    public String specialOnline(NewCmShop newCmShop, HttpServletRequest request, HttpServletResponse response, Model model) {
+        //上线
+        newCmShopService.online(newCmShop);
+        if(2==newCmShop.getShopType()){
+            model.addAttribute("shopType",2);
+            return "redirect:" + Global.getAdminPath() + "/user/newCmShop/special/new?repage";
+        }else{
+            model.addAttribute("shopType",3);
+            return "redirect:" + Global.getAdminPath() + "/user/newCmShop/special/second?repage";
+        }
+    }
 
     @RequestMapping(value = "/special/second")
     public String secondList(NewCmShop newCmShop, HttpServletRequest request, HttpServletResponse response, Model model) {
@@ -113,6 +161,7 @@ public class NewCmShopController extends BaseController {
         Page<NewCmShop> page = newCmShopService.findPage(new Page<NewCmShop>(request, response), newCmShop);
         model.addAttribute("page", page);
         model.addAttribute("shopType",3);
+        model.addAttribute("newCmShop",newCmShop);
         return "modules/user/cmNewProductShopList";
     }
 

src/main/resources/mappings/modules/user/NewCmShopMapper.xml

@@ -6,7 +6,7 @@
 		a.shopID AS "shopID",
 		a.checkMan as "checkMan",
 		a.userID AS "userID",
-		u.name AS "name",
+		ifnull(u.name,a.name) AS "name",
 		u.userName AS "sname",
 		a.logo AS "logo",
 		a.legalPerson AS "legalPerson",
@@ -23,7 +23,7 @@
 		a.turnover AS "turnover",
 		a.linkMan AS "linkMan",
 		a.contractPhone AS "contractPhone",
-		u.bindMobile AS "contractMobile",
+		ifnull(u.bindMobile,a.contractMobile) AS "contractMobile",
 		a.contractEmail AS "contractEmail",
 		a.fax AS "fax",
 		a.zipCode AS "zipCode",
@@ -57,6 +57,7 @@
 		a.socialCreditCode AS "socialCreditCode",
 		u.email,
 		u.source AS "source",
+		a.shopType AS "shopType",
 		d.name AS "province",c.name AS "city",b.name AS "town"
 	</sql>
 
@@ -136,9 +137,7 @@
 		FROM shop a
 		<include refid="newCmShopJoins"/>
 		<where>
-
-
-</where>
+		</where>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
 				ORDER BY ${page.orderBy}
@@ -175,7 +174,7 @@
     </insert>
 
 
-	<insert id="insert" parameterType="NewCmShop"  keyProperty="id" useGeneratedKeys="true">
+	<insert id="insert" parameterType="NewCmShop"  keyProperty="shopID" useGeneratedKeys="true">
 		INSERT INTO shop(
 			userID,
 			name,
@@ -216,7 +215,8 @@
 			medicalPracticeLicenseImg2,
 			medicalPracticeLicenseImg3,
 			mainpro,
-			socialCreditCode
+			socialCreditCode,
+		    shopType
 		) VALUES (
 			#{userID},
 			#{name},
@@ -257,7 +257,8 @@
 			#{medicalPracticeLicenseImg2},
 			#{medicalPracticeLicenseImg3},
 			#{mainpro},
-			#{socialCreditCode}
+			#{socialCreditCode},
+		    #{shopType}
 		)
 	</insert>
 	<insert id="insertSplitCode">
@@ -265,6 +266,10 @@
 		(shopId, commercialCode, codeDetail)
 		values (#{shopId},#{splitCode},#{codeRemark})
 	</insert>
+	<insert id="insertSepcial" parameterType="NewCmShop"  keyProperty="shopID" useGeneratedKeys="true">
+		insert into shop(name,linkMan,contractMobile,status,addTime,shopType)
+		VALUES (#{name},#{linkMan},#{contractMobile},#{status},now(),2)
+	</insert>
 	<update id="update">
 		UPDATE shop
 		<set>
@@ -416,4 +421,10 @@
 		update shop set rebateAmount = (rebateAmount - #{balancePayFee})
 		where shopID = #{shopID}
 	</update>
+	<update id="offline">
+		update shop set status = 91 where shopID = #{shopID}
+	</update>
+	<update id="online">
+		update shop set status = 90 where shopID= #{shopID}
+	</update>
 </mapper>

src/main/webapp/WEB-INF/views/modules/user/cmNewProductShopEdit.jsp

@@ -29,44 +29,63 @@
 <body>
 <ul class="nav nav-tabs">
     <li><a href="${ctx}/user/newCmShop/special/new">新品供应商</a></li>
-    <li class="active"><a href="${ctx}/user/newCmShop/special/new">添加新品供应商</a></li>
+    <li class="active"><a href="${ctx}/user/newCmShop/special/new/edit?id=${newCmShop.shopID}">${not empty newCmShop.shopID?'编辑':'添加'}特殊供应商</a></li>
 </ul>
 <br/>
-<form:form id="inputForm" modelAttribute="newCmShop" action="${ctx}/user/newCmShop/special/new" method="post"
+<form:form id="inputForm" modelAttribute="newCmShop" action="${ctx}/user/newCmShop/special/new/save" method="post"
            class="form-horizontal">
     <sys:message content="${message}"/>
-
+    <form:hidden path="shopID"/>
+    <form:hidden path="shopType"/>
     <div class="control-group">
         <label class="control-label"><font color="red">*</font>供应商名称：</label>
         <div class="controls">
-            <form:input path="name" htmlEscape="false" maxlength="15" class="input-medium"/>
+            <c:if test="${newCmShop.shopType eq 3}">
+                ${newCmShop.name}
+            </c:if>
+            <c:if test="${newCmShop.shopType eq 2}">
+                <form:input path="name" htmlEscape="false" maxlength="25" class="input-xlarge required"/>
+            </c:if>
         </div>
     </div>
     <div class="control-group">
         <label class="control-label"><font color="red">*</font>联系人：</label>
         <div class="controls">
-            <form:input path="linkMan" htmlEscape="false" maxlength="15" class="input-medium"/>
+            <c:if test="${newCmShop.shopType eq 3}">
+                ${newCmShop.linkMan}
+            </c:if>
+            <c:if test="${newCmShop.shopType eq 2}">
+            <form:input path="linkMan" htmlEscape="false" maxlength="15" class="input-xlarge required"/>
+            </c:if>
         </div>
     </div>
     <div class="control-group">
         <label class="control-label"><font color="red">*</font>手机号：</label>
         <div class="controls">
-            <form:input path="contractMobile" htmlEscape="false" type="number" maxlength="15" class="input-medium"/>
+            <c:if test="${newCmShop.shopType eq 3}">
+                ${newCmShop.contractMobile}
+            </c:if>
+            <c:if test="${newCmShop.shopType eq 2}">
+            <form:input path="contractMobile" htmlEscape="false" type="number" maxlength="15" class="input-xlarge required"/>
+            </c:if>
         </div>
     </div>
     <div class="control-group">
+        <c:if test="${newCmShop.shopType eq 2}">
         <label class="control-label"><font color="red">*</font>状态：</label>
         <div class="controls">
-            <form:select path="status" class="input-medium">
+
+            <form:select path="status" class="input-xlarge required">
                 <form:option value="" label="请选择"/>
-                <form:options items="${fns:getDictList('shop_status')}" itemLabel="label" itemValue="value"
-                              htmlEscape="false"/>
+                <form:option value="90" label="已上线" selected="selected" htmlEscape="false"/>
+                <form:option value="91" label="已下线" htmlEscape="false"/>
             </form:select>
         </div>
+        </c:if>
     </div>
     <div class="control-group">
         <tr>
-            <th><b>线上分账账号：</b></th>
+            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<th><b>线上分账账号：</b></th>
             <td colspan="3" class="params">
                 <div id="addParamsItems">
                         <%--相关参数层--%>

src/main/webapp/WEB-INF/views/modules/user/cmNewProductShopList.jsp

@@ -1,38 +1,48 @@
 <%@ page contentType="text/html;charset=UTF-8" %>
-<%@ include file="/WEB-INF/views/include/taglib.jsp"%>
+<%@ include file="/WEB-INF/views/include/taglib.jsp" %>
 <html>
 <head>
-	<title>供应商信息管理</title>
-	<meta name="decorator" content="default"/>
-	<style type="text/css">
-		.table th{text-align: center;}
-		.table td{text-align: center;}
-	</style>
+    <title>供应商信息管理</title>
+    <meta name="decorator" content="default"/>
+    <style type="text/css">
+        .table th {
+            text-align: center;
+        }
+
+        .table td {
+            text-align: center;
+        }
+    </style>
     <style>
-        .modal{
+        .modal {
             width: 900px;
             margin-left: -450px;
         }
-        #medicalPracticeLicenseImg1Preview,#medicalPracticeLicenseImg2Preview,#medicalPracticeLicenseImg3Preview{
+
+        #medicalPracticeLicenseImg1Preview, #medicalPracticeLicenseImg2Preview, #medicalPracticeLicenseImg3Preview {
             display: inline-block;
         }
 
         .reg-row .new-tag.active {
             border: 1px solid #de5801;
         }
+
         .reg-row {
             margin-bottom: 20px;
         }
+
         .reg-row .reg-label {
             display: inline-block;
             width: 120px;
             text-align: right;
             font-size: 13px;
         }
+
         .the-oradio {
             display: inline-block;
             vertical-align: top;
         }
+
         .the-oradio div {
             width: 85px;
             display: inline-block;
@@ -40,20 +50,24 @@
             color: #666;
             /* margin-right: 25px; */
         }
+
         .the-oradio div input[type="radio"] {
             width: 17px;
             height: 17px;
             margin-right: 5px;
             vertical-align: text-top;
         }
+
         .med-option {
             display: block;
             margin: 10px 0 0 125px;
         }
-		.smed-option{
-			margin: 20px 0 20px 123px;
-			display: block;
-		}
+
+        .smed-option {
+            margin: 20px 0 20px 123px;
+            display: block;
+        }
+
         .reg-row .business-license {
             position: relative;
             display: inline-block;
@@ -62,16 +76,20 @@
             border-radius: 6px;
             margin: 18px 0 0 125px;
         }
-        #medicalPracticeLicenseImgPreview{
+
+        #medicalPracticeLicenseImgPreview {
             display: inline-block;
         }
-        .qualification{
+
+        .qualification {
             margin-top: 20px;
         }
+
         .reg-row .tags-area {
             display: inline-block;
             width: 420px;
         }
+
         .reg-row .new-tag {
             display: inline-block;
             width: 70px;
@@ -88,9 +106,11 @@
             white-space: nowrap;
             cursor: pointer;
         }
+
         .reg-row .tags-operate {
             margin-left: 125px;
         }
+
         .reg-row .reg-input {
             width: 336px;
             height: 32px;
@@ -99,12 +119,14 @@
             border: 1px solid #dcdcdc;
             border-radius: 6px;
         }
+
         .reg-row .tags-operate .tag-input {
             width: 159px;
             margin-right: 13px;
             display: none;
             vertical-align: top;
         }
+
         .reg-row .tags-operate .tag-add {
             /*height: 32px;*/
             line-height: 20px;
@@ -112,20 +134,28 @@
             margin-bottom: 0;
             vertical-align: top;
         }
-        .reg-row .tags-area{
+
+        .reg-row .tags-area {
             vertical-align: top;
         }
+
         .tag-add {
             display: none;
         }
-		#myModal2{display: none;}
-		.modal-body{
-			max-height: 300px !important;
-		}
-		.modal.fade.in{
-			top: 0 !important;
-		}
-		#auditBox .auditCheckBox {
+
+        #myModal2 {
+            display: none;
+        }
+
+        .modal-body {
+            max-height: 300px !important;
+        }
+
+        .modal.fade.in {
+            top: 0 !important;
+        }
+
+        #auditBox .auditCheckBox {
             width: 250px;
             margin: 0 auto;
         }
@@ -145,136 +175,154 @@
             border: 1px solid #666;
             border-radius: 5px;
         }
-		.auditNote{
-			width: 250px;
-			height: 50px;
-			margin: 0 auto;
-		}
+
+        .auditNote {
+            width: 250px;
+            height: 50px;
+            margin: 0 auto;
+        }
+
         #auditBox .auditCheckBox input:checked + span {
             background-color: #E6633A
         }
     </style>
-	<script type="text/javascript">
-		$(document).ready(function() {
+    <script type="text/javascript">
+        $(document).ready(function () {
+
+        });
 
-		});
-		function page(n,s){
-			$("#pageNo").val(n);
-			$("#pageSize").val(s);
-			$("#searchForm").submit();
-        	return false;
+        function page(n, s) {
+            $("#pageNo").val(n);
+            $("#pageSize").val(s);
+            $("#searchForm").submit();
+            return false;
         }
-	</script>
+    </script>
 
 </head>
 <body>
 <ul class="nav nav-tabs">
-		<c:if test="${shopType eq 2}"><li class="active"><a href="${ctx}/user/newCmShop/special/new">新品供应商</a></li></c:if>
-		<c:if test="${shopType eq 3}"><li><a href="${ctx}/user/newCmShop/special/new">新品供应商</a></li></c:if>
-		<c:if test="${shopType eq 3}"><li class="active"><a href="${ctx}/user/newCmShop/special/second">二手供应商</a></li></c:if>
-		<c:if test="${shopType eq 2}"><li><a href="${ctx}/user/newCmShop/special/second">二手供应商</a></li></c:if>
+    <c:if test="${shopType eq 2}">
+        <li class="active"><a href="${ctx}/user/newCmShop/special/new">新品供应商</a></li>
+    </c:if>
+    <c:if test="${shopType eq 3}">
+        <li><a href="${ctx}/user/newCmShop/special/new">新品供应商</a></li>
+    </c:if>
+    <c:if test="${shopType eq 3}">
+        <li class="active"><a href="${ctx}/user/newCmShop/special/second">二手供应商</a></li>
+    </c:if>
+    <c:if test="${shopType eq 2}">
+        <li><a href="${ctx}/user/newCmShop/special/second">二手供应商</a></li>
+    </c:if>
 </ul>
-<form:form id="searchForm" modelAttribute="newCmShop" action="${ctx}/user/newCmShop/special/new" method="post" class="breadcrumb form-search">
-		<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
-		<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
-	<div class="ul-form">
+<form:form id="searchForm" modelAttribute="newCmShop"
+           action="${ctx}/user/newCmShop/special/${shopType eq 2?'new':'second'}" method="post"
+           class="breadcrumb form-search">
+    <input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
+    <input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+    <div class="ul-form">
         <div class="flex-wrap">
-			<div class="item">
-				<label>供应商ID:</label>
-					<form:input path="shopID" htmlEscape="false" maxlength="10" class="input-medium"/>
-				<label>公司名称：</label>
-					<form:input path="name" htmlEscape="false" maxlength="50" class="input-medium"/>
+            <div class="item">
+                <label>供应商ID:</label>
+                <form:input path="shopID" htmlEscape="false" maxlength="10" class="input-medium"/>
+                <label>公司名称：</label>
+                <form:input path="name" htmlEscape="false" maxlength="50" class="input-medium"/>
+            </div>
+            <div class="item">
+                <label> 状态：</label>
+                <form:select path="status" class="input-medium">
+                    <form:option value="" label="请选择"/>
+                    <form:option value="90" label="已上线"/>
+                    <form:option value="91" label="已下线"/>
+                </form:select>
+                <label>手机号：</label>
+                <form:input path="contractMobile" htmlEscape="false" maxlength="100" class="input-medium"/>
             </div>
-			<div class="item">
-				 <label>  状态：</label>
-				<form:select path="status" class="input-medium">
-					<form:option value="" label="请选择"/>
-					<form:options items="${fns:getDictList('shop_status')}" itemLabel="label" itemValue="value"
-								  htmlEscape="false"/>
-				</form:select>
-				 <label>手机号：</label>
-					<form:input path="contractMobile" htmlEscape="false" maxlength="100" class="input-medium"/>
+            <div class="item">
+                <label>联系人：</label>
+                <form:input path="linkMan" htmlEscape="false" maxlength="100" class="input-medium"/>
             </div>
-			<div class="item">
-				 <label>联系人：</label>
-				<form:input path="linkMan" htmlEscape="false" maxlength="100" class="input-medium"/>
+            <div class="item">
+                &nbsp;&nbsp;<input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/>
+                <c:if test="${shopType eq 2}">
+                    &nbsp;&nbsp;&nbsp;&nbsp;<input class="btn btn-primary" onclick="window.location='${ctx}/user/newCmShop/special/new/edit'" value="添加新品供应商"/>
+                </c:if>
             </div>
-			<div class="item">
-				&nbsp;&nbsp;<input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/>
-			</div>
-		</div>
-	</div>
+        </div>
+    </div>
 </form:form>
 <sys:message content="${message}"/>
 <table id="contentTable" class="table table-striped table-bordered table-condensed">
-		<thead>
-			<tr>
-				<th>供应商ID</th>
-				<th>供应商名称</th>
-				<th>联系人</th>
-				<th>手机号</th>
-				<c:if test="${shopType eq 3}">
-				<th>收款卡号</th>
-				</c:if>
-				<th>状态</th>
-				<th>线上分帐号</th>
-				<th>添加时间</th>
-				<th>操作</th>
-			</tr>
-		</thead>
-		<tbody>
-		<c:forEach items="${page.list}" var="newCmShop">
-			<tr>
-				<td>
-					${newCmShop.shopID}
-				</td>
-				<td>
-					${newCmShop.name}
-				</td>
-				<td>
-					${newCmShop.linkMan}
-				</td>
-				<td>
-					${newCmShop.contractMobile}
-				</td>
-				<c:if test="${shopType eq 3}">
-				<td>
-
-				</td>
-				</c:if>
-				<td>
-					<c:if test="${newCmShop.status eq 3}">
-						<font color="black">待审核</font>
-					</c:if>
-					<c:if test="${newCmShop.status eq 90}">
-						<font color="green">已上线</font>
-					</c:if>
-					<c:if test="${newCmShop.status eq 91}">
-						<font color="red">已下线</font>
-					</c:if>
-					<c:if test="${newCmShop.status eq 92}">
-						<font color="red" <c:if test="${not empty newCmShop.auditNote}">onclick="alertx('审核未通过原因：'+'${newCmShop.auditNote}')"</c:if> style="cursor:pointer;text-decoration: underline" >审核未通过</font>
-					</c:if>
-
-					<c:if test="${newCmShop.status eq 90}">
-						<a href="javascript:void(0);" onclick="offline(${newCmShop.userID})">下线</a>
-					</c:if>
-					<c:if test="${newCmShop.status eq 91}">
-						<a href="javascript:void(0);" onclick="online(${newCmShop.userID})">上线</a>
-					</c:if>
-				</td>
-				<td>
-					${newCmShop.splitCode}
-				</td>
-				<td>
-					${newCmShop.addTime}
-				</td>
-				<td>
-					<a href="${ctx}/user/newCmShop/special/new/edit?id=${newCmShop.shopID}">编辑</a>
-				</td>
-			</tr>
-		</c:forEach>
-		</tbody>
+    <thead>
+    <tr>
+        <th>供应商ID</th>
+        <th>供应商名称</th>
+        <th>联系人</th>
+        <th>手机号</th>
+        <c:if test="${shopType eq 3}">
+            <th>收款卡号</th>
+        </c:if>
+        <th>状态</th>
+        <th>线上分帐号</th>
+        <th>添加时间</th>
+        <th>操作</th>
+    </tr>
+    </thead>
+    <tbody>
+    <c:forEach items="${page.list}" var="newCmShop">
+        <tr>
+            <td>
+                    ${newCmShop.shopID}
+            </td>
+            <td>
+                    ${newCmShop.name}
+            </td>
+            <td>
+                    ${newCmShop.linkMan}
+            </td>
+            <td>
+                    ${newCmShop.contractMobile}
+            </td>
+            <c:if test="${shopType eq 3}">
+                <td>
+
+                </td>
+            </c:if>
+            <td>
+                <c:if test="${newCmShop.status eq 3}">
+                    <font color="black">待审核</font>
+                </c:if>
+                <c:if test="${newCmShop.status eq 90}">
+                    <font color="green">已上线</font>
+                </c:if>
+                <c:if test="${newCmShop.status eq 91}">
+                    <font color="red">已下线</font>
+                </c:if>
+                <c:if test="${newCmShop.status eq 92}">
+                    <font color="red"
+                          <c:if test="${not empty newCmShop.auditNote}">onclick="alertx('审核未通过原因：'+'${newCmShop.auditNote}')"</c:if>
+                          style="cursor:pointer;text-decoration: underline">审核未通过</font>
+                </c:if>
+
+                <c:if test="${newCmShop.status eq 90}">
+                    <a href="javascript:void(0);" onclick="offline(${newCmShop.shopID})">下线</a>
+                </c:if>
+                <c:if test="${newCmShop.status eq 91}">
+                    <a href="javascript:void(0);" onclick="online(${newCmShop.shopID})">上线</a>
+                </c:if>
+            </td>
+            <td>
+                    ${newCmShop.splitCode}
+            </td>
+            <td>
+                    ${newCmShop.addTime}
+            </td>
+            <td>
+                <a href="${ctx}/user/newCmShop/special/new/edit?id=${newCmShop.shopID}">编辑</a>
+            </td>
+        </tr>
+    </c:forEach>
+    </tbody>
 </table>
 <div class="pagination">${page}</div>
 <!-- 模态框（Modal）供应商暂存 -->
@@ -289,8 +337,8 @@
                 <div class="reg-row">
                     <label class="reg-label" for=""><span class="require-xin">*</span>会所类型：</label>
                     <div class="smedical-radio the-oradio">
-                        <div class="smed-beauty"><input  name="firstShopType" value="1" type="radio"/>医疗</div>
-                        <div class="sraw-beauty"><input  name="firstShopType" value="2" type="radio"/>非医疗</div>
+                        <div class="smed-beauty"><input name="firstShopType" value="1" type="radio"/>医疗</div>
+                        <div class="sraw-beauty"><input name="firstShopType" value="2" type="radio"/>非医疗</div>
                     </div>
                     <span class="err-tip"></span>
                     <div class="smed-option the-oradio" style="display: none">
@@ -303,16 +351,22 @@
                     <div class="squalification reg-row" style="display: none">
                         <label class="reg-label" for=""><span class="require-xin">*</span>资质：</label>
                         <div style="display: inline-block;margin-right: 10px">
-                            <input id="medicalPracticeLicenseImg1" name="url" type="hidden" maxlength="255" class="input-xlarge ">
-                            <sys:ckfinder input="medicalPracticeLicenseImg1" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
+                            <input id="medicalPracticeLicenseImg1" name="url" type="hidden" maxlength="255"
+                                   class="input-xlarge ">
+                            <sys:ckfinder input="medicalPracticeLicenseImg1" type="images" uploadPath="/photo"
+                                          selectMultiple="false" maxWidth="100" maxHeight="100"/>
                         </div>
                         <div class="two-up" style="display: none;margin-left: 123px;margin-right: 10px">
-                            <input id="medicalPracticeLicenseImg2" name="url" type="hidden" maxlength="255" class="input-xlarge ">
-                            <sys:ckfinder input="medicalPracticeLicenseImg2" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
+                            <input id="medicalPracticeLicenseImg2" name="url" type="hidden" maxlength="255"
+                                   class="input-xlarge ">
+                            <sys:ckfinder input="medicalPracticeLicenseImg2" type="images" uploadPath="/photo"
+                                          selectMultiple="false" maxWidth="100" maxHeight="100"/>
                         </div>
                         <div class="there-up" style="display:none;margin-left: 123px;margin-right: 0">
-                            <input id="medicalPracticeLicenseImg3" name="url" type="hidden" maxlength="255" class="input-xlarge ">
-                            <sys:ckfinder input="medicalPracticeLicenseImg3" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
+                            <input id="medicalPracticeLicenseImg3" name="url" type="hidden" maxlength="255"
+                                   class="input-xlarge ">
+                            <sys:ckfinder input="medicalPracticeLicenseImg3" type="images" uploadPath="/photo"
+                                          selectMultiple="false" maxWidth="100" maxHeight="100"/>
                         </div>
                         <button class="go-up">点击继续上传</button>
                     </div>
@@ -342,59 +396,59 @@
 </div>
 <%--js--%>
 <script>
-    $(document).ready(function() {
+    $(document).ready(function () {
 
         //供应商默认主营内容
-        var html='';
-        html+='<span class="new-tag up-club-tag" data-typeName="产品">产品</span>',
-		html+='<span class="new-tag up-club-tag" data-typeName="仪器">仪器</span>',
-		html+='<span class="new-tag up-club-tag" data-typeName="服务">服务</span>';
+        var html = '';
+        html += '<span class="new-tag up-club-tag" data-typeName="产品">产品</span>',
+            html += '<span class="new-tag up-club-tag" data-typeName="仪器">仪器</span>',
+            html += '<span class="new-tag up-club-tag" data-typeName="服务">服务</span>';
         $('#shopArea').html(html);
         //供应商
-        $('.smedical-radio div input[name="firstShopType"]').on('click',function () {
+        $('.smedical-radio div input[name="firstShopType"]').on('click', function () {
             var nameval = $(this).val();
-            if(nameval == '1'){
+            if (nameval == '1') {
                 $('.smed-option').show();
-            }else if(nameval == '2'){
+            } else if (nameval == '2') {
                 $('.smed-option,.squalification,.epart').hide();
-                $('input[name="secondShopType"]').attr('checked',false);
+                $('input[name="secondShopType"]').attr('checked', false);
             }
         });
         //医疗二级选择
-        $('input[name="secondShopType"]').on('click',function () {
+        $('input[name="secondShopType"]').on('click', function () {
             var nameVal = $(this).val();
-            if(nameVal == '1'){
+            if (nameVal == '1') {
                 $('.squalification').hide()
-            }else if(nameVal == '2'){
+            } else if (nameVal == '2') {
                 $('.squalification').hide()
-            }else if(nameVal == '3'){
+            } else if (nameVal == '3') {
                 $('.squalification').show()
-            }else if(nameVal == '4'){
+            } else if (nameVal == '4') {
                 $('.squalification').hide()
             }
         });
         //点击继续上传
-        var record ='';
-        $('.go-up').on('click',function () {
-            if(record == 1){
-                if($('#medicalPracticeLicenseImg2').val() != ''){
-                    $('.there-up').css({'display':'inline-block'});
+        var record = '';
+        $('.go-up').on('click', function () {
+            if (record == 1) {
+                if ($('#medicalPracticeLicenseImg2').val() != '') {
+                    $('.there-up').css({'display': 'inline-block'});
                     record = 2
-                }else {
+                } else {
                     alertx('请上传资质')
                     _util.hideTip($('.err-tip'));
                 }
-            }else if(record == 2){
+            } else if (record == 2) {
                 alertx('只需要上传三张资质');
 //					$('.go-up').hide();
             } else {
-                if($('#medicalPracticeLicenseImg1').val() != ''){
-                    $('.two-up').css({'display':'inline-block'});
+                if ($('#medicalPracticeLicenseImg1').val() != '') {
+                    $('.two-up').css({'display': 'inline-block'});
                     record = 1;
-                }else if($('#medicalPracticeLicenseImg2').val() != ''){
-                    $('.there-up').css({'display':'inline-block'});
+                } else if ($('#medicalPracticeLicenseImg2').val() != '') {
+                    $('.there-up').css({'display': 'inline-block'});
                     record = 2
-                }else {
+                } else {
                     alertx('请上传资质')
                     _util.hideTip($('.err-tip'));
                     record = ''
@@ -403,61 +457,61 @@
         });
         //供应商品项选择
         var opts = {
-            $tag:$('.up-shop-tag'),
-            $tagArea:$('#shopArea'),
-            $mainPro:$('#sMainPro'),
-            $other:$('#shopOther'),
-            $input:$('#shopInput'),
-            $add:$('#shopAdd'),
-            $type:'shop'
+            $tag: $('.up-shop-tag'),
+            $tagArea: $('#shopArea'),
+            $mainPro: $('#sMainPro'),
+            $other: $('#shopOther'),
+            $input: $('#shopInput'),
+            $add: $('#shopAdd'),
+            $type: 'shop'
         };
         _util.getTags(opts);
-        $('#confirm').on('click',function () {
+        $('#confirm').on('click', function () {
             //公司类型
-            if(!$('input[name="firstShopType"]').is(':checked')){
+            if (!$('input[name="firstShopType"]').is(':checked')) {
                 $('input[name="firstShopType"]').parents('.smedical-radio').next().show().html('请选择公司类型');
                 _util.hideTip($('.err-tip'));
                 return false
-            }else if($('input[name="firstShopType"]:checked').val() == 1){
-                if(!$('input[name="secondShopType"]').is(':checked')){
+            } else if ($('input[name="firstShopType"]:checked').val() == 1) {
+                if (!$('input[name="secondShopType"]').is(':checked')) {
                     $('input[name="secondShopType"]').parents('.smed-option').find('.err-tip').show().html('请选择公司类型');
                     _util.hideTip($('.err-tip'));
                     return false
                 }
             }
-            if($('input[name="secondShopType"]:checked').val() == 3){
+            if ($('input[name="secondShopType"]:checked').val() == 3) {
                 // 会所资质
-                if($('#medicalPracticeLicenseImg1').val() == ''){
+                if ($('#medicalPracticeLicenseImg1').val() == '') {
                     alertx('请上传资质')
                 }
 
-                if($('.two-up').css('display')!='none'){
-                    if($('#medicalPracticeLicenseImg2').val() == ''){
+                if ($('.two-up').css('display') != 'none') {
+                    if ($('#medicalPracticeLicenseImg2').val() == '') {
                         alertx('请上传资质')
                         return false
                     }
                 }
-                if($('.there-up').css('display')!='none'){
-                    if($('#medicalPracticeLicenseImg3').val() == ''){
+                if ($('.there-up').css('display') != 'none') {
+                    if ($('#medicalPracticeLicenseImg3').val() == '') {
                         alertx('请上传资质')
                         return false
                     }
                 }
             }
-            if($('#sMainPro').val() == ''){
+            if ($('#sMainPro').val() == '') {
                 alertx('请选择主营内容')
                 return false
             }
             var params = {
-                mainpro:$('#sMainPro').val(),
-                shopID:$(this).attr('data-id'),
-                flagC:$(this).attr('data-flag')
-			};
-            if($('input[name="firstShopType"]:checked').val() == 1){
+                mainpro: $('#sMainPro').val(),
+                shopID: $(this).attr('data-id'),
+                flagC: $(this).attr('data-flag')
+            };
+            if ($('input[name="firstShopType"]:checked').val() == 1) {
                 params.firstShopType = 1;//公司分类
-                params.secondShopType =$('input[name="secondShopType"]:checked').val();//二级分类
-                if($('input[name="secondShopType"]:checked').val() == 3){
-                    if($('#medicalPracticeLicenseImg1').val() != ''){
+                params.secondShopType = $('input[name="secondShopType"]:checked').val();//二级分类
+                if ($('input[name="secondShopType"]:checked').val() == 3) {
+                    if ($('#medicalPracticeLicenseImg1').val() != '') {
                         params.medicalPracticeLicenseImg1 = $('#medicalPracticeLicenseImg1').val();//资质
                         // if($('#medicalPracticeLicenseImg2').val() != ''){
                         //     params.medicalPracticeLicenseImg2 = $('#qualification2').val();//资质
@@ -466,90 +520,90 @@
                         //     }
                         // }
                     }
-                    if($('#medicalPracticeLicenseImg2').val() != '') {
+                    if ($('#medicalPracticeLicenseImg2').val() != '') {
                         params.medicalPracticeLicenseImg2 = $('#medicalPracticeLicenseImg2').val();//资质
-					}
-					if($('#medicalPracticeLicenseImg3').val() != '') {
+                    }
+                    if ($('#medicalPracticeLicenseImg3').val() != '') {
                         params.medicalPracticeLicenseImg3 = $('#medicalPracticeLicenseImg3').val();//资质
-					}
+                    }
 
                 }
-            }else {
+            } else {
                 params.firstShopType = 2;//公司分类
             }
             $.ajax({
                 type: "post",
                 url: "${ctx}/user/newCmShop/editShopType",
                 data: params,
-                success : function (res) {
-                    if(res.errcode == '1') {
+                success: function (res) {
+                    if (res.errcode == '1') {
                         alertx(res.errmsg);
                     }
-                    if(res.errcode == '0') {
+                    if (res.errcode == '0') {
                         console.log(res.data);
                         window.location.href = res.data;
                     }
                 },
-                error : function (res) {
+                error: function (res) {
                 }
             });
         })
     });
     var _util = {
         // 隐藏输入错误提示（参数为提示元素）
-        hideTip : function($ele){
+        hideTip: function ($ele) {
             setTimeout(function () {
                 $ele.hide();
             }, 5000);
         },
-        setTags:function (opts) {
+        setTags: function (opts) {
             var tagArr = [];
-            opts.$tagArea.find('.new-tag.active').each(function(i,v){
+            opts.$tagArea.find('.new-tag.active').each(function (i, v) {
                 var _typeName = $(v).attr('data-typeName');
                 tagArr.push(_typeName);
                 opts.$mainPro.val(tagArr.join('/'));
             })
         },
-        getTags:function (opts) {
-            opts.$tagArea.on('click','.new-tag',function(){
+        getTags: function (opts) {
+            opts.$tagArea.on('click', '.new-tag', function () {
                 var $this = $(this);
                 $this.toggleClass('active');
                 _util.setTags(opts);
             })
-            opts.$other.on('click',function(){
-                opts.$input.css('display','inline-block');
-                opts.$add.css('display','inline-block');
+            opts.$other.on('click', function () {
+                opts.$input.css('display', 'inline-block');
+                opts.$add.css('display', 'inline-block');
             })
-            opts.$add.on('click',function(){
+            opts.$add.on('click', function () {
                 var _tag = $.trim(opts.$input.val());
-                if(_tag){
+                if (_tag) {
                     var flag = false;
-                    opts.$tagArea.find('.new-tag').each(function(i,v){
+                    opts.$tagArea.find('.new-tag').each(function (i, v) {
                         var _name = $(v).attr('data-typeName');
-                        if(_tag == _name){
-                            flag=true;
+                        if (_tag == _name) {
+                            flag = true;
                             return false;
-                        }else{
-                            if(i==opts.$tagArea.find('.new-tag').length){
-                                flag=false;
+                        } else {
+                            if (i == opts.$tagArea.find('.new-tag').length) {
+                                flag = false;
                             }
                         }
 
                     })
-                    if(flag){
-                        opts.$tagArea.find('.new-tag').each(function(i,v){
+                    if (flag) {
+                        opts.$tagArea.find('.new-tag').each(function (i, v) {
                             var _name = $(v).attr('data-typeName');
-                            if(_tag == _name){
+                            if (_tag == _name) {
                                 $(v).addClass('active');
 //                                layer.tips('该类型已存在',opts.$add);
                                 alertx('该类型已存在')
-                                flag=true;
+                                flag = true;
                                 return false;
                             }
 
                         })
-                    }else{
-                        opts.$tagArea.append('<span class="new-tag up-'+opts.$type+'-tag active" data-typeName="'+_tag+'">'+_tag+'</span> ');
+                    } else {
+                        opts.$tagArea.append('<span class="new-tag up-' + opts.$type + '-tag active" data-typeName="' + _tag + '">' + _tag + '</span> ');
                         _util.setTags(opts);
                         opts.$input.val('');
                         return;
@@ -560,12 +614,12 @@
     }
 </script>
 <script>
-    $(document).ready(function() {
-        $('.shopType').on('click',function () {
-            $('#confirm').attr('data-id',$(this).attr('data-shopID'))
-            $('#confirm').attr('data-flag',$(this).attr('data-flag'))
+    $(document).ready(function () {
+        $('.shopType').on('click', function () {
+            $('#confirm').attr('data-id', $(this).attr('data-shopID'))
+            $('#confirm').attr('data-flag', $(this).attr('data-flag'))
             $('#myModal2').modal();
-             var that = $(this);
+            var that = $(this);
             // var flag = that.attr("data-flag");
             // $('#confirm').attr('data-flag',flag)
             // var shopID = that.attr("data-shopID");
@@ -584,55 +638,55 @@
                 var medicalPracticeLicenseImg3 = json["medicalPracticeLicenseImg3"];
                 var mainpro = json["mainpro"];
                 if (firstShopType) {
-                    $('input[name="firstShopType"]').parent('div').eq(firstShopType-1).find('input').attr("checked","checked")
-                    $('input[name="firstShopType"]').parent('div').eq(firstShopType-1).find('input').click();
-                    if(secondShopType){
-                        $('input[name="secondShopType"]').parent('div').eq(secondShopType-1).find('input').attr("checked","checked")
-                        $('input[name="secondShopType"]').parent('div').eq(secondShopType-1).find('input').click();
+                    $('input[name="firstShopType"]').parent('div').eq(firstShopType - 1).find('input').attr("checked", "checked")
+                    $('input[name="firstShopType"]').parent('div').eq(firstShopType - 1).find('input').click();
+                    if (secondShopType) {
+                        $('input[name="secondShopType"]').parent('div').eq(secondShopType - 1).find('input').attr("checked", "checked")
+                        $('input[name="secondShopType"]').parent('div').eq(secondShopType - 1).find('input').click();
                     }
-                    if(medicalPracticeLicenseImg1){
+                    if (medicalPracticeLicenseImg1) {
                         $('#medicalPracticeLicenseImg1').val(medicalPracticeLicenseImg1);
-                        $('#medicalPracticeLicenseImg1Preview').find('li').html('<img style="max-width:100px;max-height:100px;_height:100px;border:0;padding:3px;" src="'+medicalPracticeLicenseImg1+'" />')
+                        $('#medicalPracticeLicenseImg1Preview').find('li').html('<img style="max-width:100px;max-height:100px;_height:100px;border:0;padding:3px;" src="' + medicalPracticeLicenseImg1 + '" />')
                     }
-                    if(medicalPracticeLicenseImg2){
-                        $('.two-up').css({'display':'inline-block'});
+                    if (medicalPracticeLicenseImg2) {
+                        $('.two-up').css({'display': 'inline-block'});
                         $('#medicalPracticeLicenseImg2').val(medicalPracticeLicenseImg2);
-                        $('#medicalPracticeLicenseImg2Preview').find('li').html('<img style="max-width:100px;max-height:100px;_height:100px;border:0;padding:3px;" src="'+medicalPracticeLicenseImg2+'" />')
+                        $('#medicalPracticeLicenseImg2Preview').find('li').html('<img style="max-width:100px;max-height:100px;_height:100px;border:0;padding:3px;" src="' + medicalPracticeLicenseImg2 + '" />')
                     }
-                    if(medicalPracticeLicenseImg3){
-                        $('.there-up').css({'display':'inline-block'});
+                    if (medicalPracticeLicenseImg3) {
+                        $('.there-up').css({'display': 'inline-block'});
                         $('#medicalPracticeLicenseImg3').val(medicalPracticeLicenseImg3);
-                        $('#medicalPracticeLicenseImg3Preview').find('li').html('<img style="max-width:100px;max-height:100px;_height:100px;border:0;padding:3px;" src="'+medicalPracticeLicenseImg3+'" />')
+                        $('#medicalPracticeLicenseImg3Preview').find('li').html('<img style="max-width:100px;max-height:100px;_height:100px;border:0;padding:3px;" src="' + medicalPracticeLicenseImg3 + '" />')
                     }
 
-                    if(mainpro){
+                    if (mainpro) {
                         var span_ = $('#shopArea').find('span');
                         var mainpro_ = mainpro.split('/');
-                        var html='';
+                        var html = '';
                         var defaultVal = [];
                         var resArr = [];
-                        var html='';
+                        var html = '';
                         $('#shopArea').html('');
-                        for(var i=0; i<span_.length;i++) {
+                        for (var i = 0; i < span_.length; i++) {
                             defaultVal.push(span_[i].textContent);
                         }
                         var concatArr = defaultVal.concat(mainpro_);
-                        for(var i=0; i<concatArr.length; i++) {
-                            if(resArr.indexOf(concatArr[i]) == -1) {
+                        for (var i = 0; i < concatArr.length; i++) {
+                            if (resArr.indexOf(concatArr[i]) == -1) {
                                 resArr.push(concatArr[i]);
-                                html += '<span class="new-tag up-club-tag '+concatArr[i]+'" data-typeName="'+concatArr[i]+'">'+concatArr[i]+'</span>';
+                                html += '<span class="new-tag up-club-tag ' + concatArr[i] + '" data-typeName="' + concatArr[i] + '">' + concatArr[i] + '</span>';
                             }
                         }
                         $('#shopArea').append(html);
-                        for(var i=0; i<mainpro_.length; i++) {
-                            $('.'+mainpro_[i]).addClass('active');
+                        for (var i = 0; i < mainpro_.length; i++) {
+                            $('.' + mainpro_[i]).addClass('active');
                         }
                     }
                 }
                 var spanSp = $('#shopArea').find('span');
                 console.log(spanSp)
-                spanSp.each(function (i,l) {
-                    if($(this).hasClass('active')){
+                spanSp.each(function (i, l) {
+                    if ($(this).hasClass('active')) {
                         $('#sMainPro').val($(this).text())
                     }
                 });
@@ -669,6 +723,7 @@
         };
         $.jBox(html, {title: "确定修改密码？", submit: submit});
     }
+
     //修改手机号码
     function updateMobile(id) {
         var regMobile = /^1[3,4,5,6,7,8,9]\d{9}$/;
@@ -693,111 +748,111 @@
         $.jBox(html, {title: "确定修改手机号码？", submit: submit});
     }
 
-    function offline(userId) {
-    	$.jBox.confirm("确定下线该供应商吗?","提示",function(v,h,f){
-    		if(v === 1){
-    			window.location.href="${ctx}/user/newCmShop/offline?userID="+userId;
-    		}
-    	} ,{ buttons: {  '确定': 1,'取消':2}});
-	}
-
-	function online(userId) {
-		$.jBox.confirm("确定上线该供应商吗？","提示",function(v,h,f){
-    		if(v === 1){
-    			window.location.href="${ctx}/user/newCmShop/online?userID="+userId;
-    		}
-    	} ,{ buttons: {  '确定': 1,'取消':2}});
-	}
-
-	/**
-* 供应商审核
-* */
-function auditShop(shopId,userId,townID,address,name,linkMan,contractMobile) {
-	if(null == townID || "" == townID || "" == address || null == address){
-		alertx("地址尚未填写，请先编辑地址再进行审核");
-		return;
-	}
-	if(null == name || "" == name){
-		alertx("公司名称尚未填写，请先编辑公司名称再进行审核");
-		return;
-	}
-	if(null == linkMan || "" == linkMan){
-		alertx("联系人尚未尚未填写，请先编辑联系人再进行审核");
-		return;
-	}
-	if(null == contractMobile || "" == contractMobile){
-		alertx("手机号尚未填写，请先编辑手机号再进行审核");
-		return;
-	}
-	var html = "<div id='auditBox'>"
-                        + "   <div class='bd-row'>"
-                        + "       <span><font color='red'>*</font>审核：</span>"
-                        + "       <select name='auditStatus' id='auditStatus'>"
-                        + "           <option value='1'>审核通过</option>"
-                        + "           <option value='2'>审核未通过</option>"
-                        + "       <select/>"
-                        + "   </div>"
-                        + "   <div id='auditNopass' style='display: none;'>"
-                        + "       <div class='bd-row'>"
-                        + "           <span><font color='red'>*</font>原因：</span>"
-                        + "           <div class='auditCheckBox'>"
-                        + "               <label><input name='auditCheckBox' type='checkbox' value='入驻资质不达标'><span>入驻资质不达标</span></label>"
-                        + "               <label><input name='auditCheckBox' type='checkbox' value='品牌评估不通过'><span>品牌评估不通过</span></label>"
-                        + "               <label><input name='auditCheckBox' type='checkbox' value='相关证照不清晰'><span>相关证照不清晰</span></label>"
-                        + "               <label><input name='auditCheckBox' type='checkbox' value='企业经营异常'><span>企业经营异常</span></label>"
-                        + "               <label><input name='auditCheckBox' type='checkbox' value='其他'><span>其他</span></label>"
-                        + "           </div>"
-                        + "       </div>"
-                        + "       <div class='bd-row'>"
-                        + "           <span></span>"
-                        + "           <div class='auditNote'>"
-                        + "               <textarea name='auditNote' placeholder='可以补充其它原因，最多50个字'></textarea>"
-                        + "               <p class='err-tip' style='display:none;margin-left:-55px;color:red;'>请选择审核未通过的原因</p>"
-                        + "           </div>"
-                        + "       </div>"
-                        + "   </div>"
-                        + "</div>";
-                    var submit = function (v, h, f) {
-                        if (f.auditStatus == '') {
-                            $.jBox.tip("请选择状态", 'error', {focusId: "auditStatus"});
-                            return false;
-                        } else if (f.auditStatus == 2 && f.auditNote == '' && !f.auditCheckBox) {
-                            $.jBox.tip("请选择审核未通过的原因", 'error', {focusId: "auditNote"});
-                            return false;
-                        } else if (f.auditStatus == 2 && f.auditNote.length > 50) {
-                            $.jBox.tip("内容过长", 'error', {focusId: "auditNote"});
-                            return false;
-                        }
-                        var auditText = f.auditCheckBox ? (f.auditCheckBox.toString() + ',' + f.auditNote) : f.auditNote;
-
-                        $.post("${ctx}/user/newCmShop/auditShopInfo", {
-                            'auditStatus': f.auditStatus,
-                            'shopId': shopId,
-                            'userId': userId,
-                            'auditNote': auditText
-                        }, function (data) {
-                        console.log( data.success)
-                        console.log( true == data.success)
-                            if (true == data.success) {
-                                $.jBox.tip(data.msg, 'info');
-                                // $("#searchForm").submit();
-                                window.location.href = "${ctx}/user/newCmShop/";
-                            } else {
-                                $.jBox.tip(data.msg, 'error');
-                            }
-                        }, "JSON");//这里返回的类型有：json,html,xml,text
-                    };
-                    $.jBox(html, {title: "审核", submit: submit});
-}
-
-// 审核
-$(document).on("change", "#auditStatus", function () {
-			if ($("#auditStatus").val() == 2) {
-				$("#auditNopass").show();
-			} else {
-				$("#auditNopass").hide();
-			}
-});
+    function offline(shopID) {
+        $.jBox.confirm("确定下线该供应商吗?", "提示", function (v, h, f) {
+            if (v === 1) {
+                window.location.href = "${ctx}/user/newCmShop/special/offline?shopID=" + shopID + "&shopType=" +${shopType};
+            }
+        }, {buttons: {'确定': 1, '取消': 2}});
+    }
+
+    function online(shopID) {
+        $.jBox.confirm("确定上线该供应商吗？", "提示", function (v, h, f) {
+            if (v === 1) {
+                window.location.href = "${ctx}/user/newCmShop/special/online?shopID=" + shopID + "&shopType=" +${shopType};
+            }
+        }, {buttons: {'确定': 1, '取消': 2}});
+    }
+
+    /**
+     * 供应商审核
+     * */
+    function auditShop(shopId, userId, townID, address, name, linkMan, contractMobile) {
+        if (null == townID || "" == townID || "" == address || null == address) {
+            alertx("地址尚未填写，请先编辑地址再进行审核");
+            return;
+        }
+        if (null == name || "" == name) {
+            alertx("公司名称尚未填写，请先编辑公司名称再进行审核");
+            return;
+        }
+        if (null == linkMan || "" == linkMan) {
+            alertx("联系人尚未尚未填写，请先编辑联系人再进行审核");
+            return;
+        }
+        if (null == contractMobile || "" == contractMobile) {
+            alertx("手机号尚未填写，请先编辑手机号再进行审核");
+            return;
+        }
+        var html = "<div id='auditBox'>"
+            + "   <div class='bd-row'>"
+            + "       <span><font color='red'>*</font>审核：</span>"
+            + "       <select name='auditStatus' id='auditStatus'>"
+            + "           <option value='1'>审核通过</option>"
+            + "           <option value='2'>审核未通过</option>"
+            + "       <select/>"
+            + "   </div>"
+            + "   <div id='auditNopass' style='display: none;'>"
+            + "       <div class='bd-row'>"
+            + "           <span><font color='red'>*</font>原因：</span>"
+            + "           <div class='auditCheckBox'>"
+            + "               <label><input name='auditCheckBox' type='checkbox' value='入驻资质不达标'><span>入驻资质不达标</span></label>"
+            + "               <label><input name='auditCheckBox' type='checkbox' value='品牌评估不通过'><span>品牌评估不通过</span></label>"
+            + "               <label><input name='auditCheckBox' type='checkbox' value='相关证照不清晰'><span>相关证照不清晰</span></label>"
+            + "               <label><input name='auditCheckBox' type='checkbox' value='企业经营异常'><span>企业经营异常</span></label>"
+            + "               <label><input name='auditCheckBox' type='checkbox' value='其他'><span>其他</span></label>"
+            + "           </div>"
+            + "       </div>"
+            + "       <div class='bd-row'>"
+            + "           <span></span>"
+            + "           <div class='auditNote'>"
+            + "               <textarea name='auditNote' placeholder='可以补充其它原因，最多50个字'></textarea>"
+            + "               <p class='err-tip' style='display:none;margin-left:-55px;color:red;'>请选择审核未通过的原因</p>"
+            + "           </div>"
+            + "       </div>"
+            + "   </div>"
+            + "</div>";
+        var submit = function (v, h, f) {
+            if (f.auditStatus == '') {
+                $.jBox.tip("请选择状态", 'error', {focusId: "auditStatus"});
+                return false;
+            } else if (f.auditStatus == 2 && f.auditNote == '' && !f.auditCheckBox) {
+                $.jBox.tip("请选择审核未通过的原因", 'error', {focusId: "auditNote"});
+                return false;
+            } else if (f.auditStatus == 2 && f.auditNote.length > 50) {
+                $.jBox.tip("内容过长", 'error', {focusId: "auditNote"});
+                return false;
+            }
+            var auditText = f.auditCheckBox ? (f.auditCheckBox.toString() + ',' + f.auditNote) : f.auditNote;
+
+            $.post("${ctx}/user/newCmShop/auditShopInfo", {
+                'auditStatus': f.auditStatus,
+                'shopId': shopId,
+                'userId': userId,
+                'auditNote': auditText
+            }, function (data) {
+                console.log(data.success)
+                console.log(true == data.success)
+                if (true == data.success) {
+                    $.jBox.tip(data.msg, 'info');
+                    // $("#searchForm").submit();
+                    window.location.href = "${ctx}/user/newCmShop/";
+                } else {
+                    $.jBox.tip(data.msg, 'error');
+                }
+            }, "JSON");//这里返回的类型有：json,html,xml,text
+        };
+        $.jBox(html, {title: "审核", submit: submit});
+    }
+
+    // 审核
+    $(document).on("change", "#auditStatus", function () {
+        if ($("#auditStatus").val() == 2) {
+            $("#auditNopass").show();
+        } else {
+            $("#auditNopass").hide();
+        }
+    });
 
 </script>
 </body>