商户

src/main/resources/templates/sys/fx/merchantAdd.html

@@ -122,7 +122,7 @@ dtext{
 			</li>
 			
 			<li>
-				<label>套餐：套餐模式<b>*</b></label>
+				<label>套餐：服务包类型<b>*</b></label>
 				<div class="vocation" style="margin-right: 5px; width: 345px">
 					<select name="signType" id="signType" class="select1"  > 
 						<option value="0" th:selected="${merchant.signType==0 ? true : false}">合同签约模式（旧模式）</option>
@@ -135,25 +135,25 @@ dtext{
 			</li>
 
 			<li>
-				<label><b >【合同签约模式】</b>签约时间：<b >*</b></label>
+				<label>合同时间：<b >*</b></label>
 				<input type="hidden"  id="minDate" value="2020-01-01" >
-				<input type="text" id="signTime" name="signTime"  onfocus="WdatePicker({dateFmt:'yyyy-MM-dd',minDate:'#F{$dp.$D(\'minDate\')}'})" autocomplete="off" th:value="${#dates.format(merchant.signTime, 'yyyy-MM-dd')}" class="scinput date_width " placeholder="开始时间">
+				<input type="text" id="signTime" name="signTime"  onfocus="WdatePicker({dateFmt:'yyyy-MM-dd',minDate:'#F{$dp.$D(\'minDate\')}'})" autocomplete="off" th:value="${#dates.format(merchant.signTime, 'yyyy-MM-dd')}" class="scinput date_width " placeholder="合同开始时间">
 				&nbsp;&nbsp;&nbsp;~~&nbsp;&nbsp;
-				<input type="text" id="endSignTime" name="endSignTime"   onfocus="WdatePicker({dateFmt:'yyyy-MM-dd',minDate:'#F{$dp.$D(\'signTime\')}'})"  autocomplete="off" th:value="${#dates.format(merchant.endSignTime, 'yyyy-MM-dd')}" class="scinput date_width" placeholder="结束时间">
+				<input type="text" id="endSignTime" name="endSignTime"   onfocus="WdatePicker({dateFmt:'yyyy-MM-dd',minDate:'#F{$dp.$D(\'signTime\')}'})"  autocomplete="off" th:value="${#dates.format(merchant.endSignTime, 'yyyy-MM-dd')}" class="scinput date_width" placeholder="合同结束时间">
 			</li>
 			
 			<li>
-				<label><b >【套餐模式】</b>套餐购买月份：<b>*</b></label>
+				<label><b >【服务包模式】</b>充值月份数：<b>*</b></label>
 				<input type="number" id="libServiceMonth" min="0" class="dfinput fl" name="libServiceMonth" th:value="${merchant.libServiceMonth!=null ? merchant.libServiceMonth : 0}"/>
 			</li>
 			
 			<li>
-				<label><b >【套餐模式】</b>结算时间：<b >*</b></label>
-				<input type="text"  class="dfinput fl"  id="nextSummaryTime" name="nextSummaryTime"  onfocus="WdatePicker({dateFmt:'yyyy-MM-dd',autoPickDate:true,minDate:'%y-%M-%d'})" autocomplete="off" th:value="${#dates.format(merchant.nextSummaryTime, 'yyyy-MM-dd')}" placeholder="结算时间">
+				<label><b >【服务包模式】</b>激活时间：<b >*</b></label>
+				<input type="text"  class="dfinput fl"  id="nextSummaryTime" name="nextSummaryTime"  onfocus="WdatePicker({dateFmt:'yyyy-MM-dd',autoPickDate:true,minDate:'%y-%M-%d'})" autocomplete="off" th:value="${#dates.format(merchant.nextSummaryTime, 'yyyy-MM-dd')}" placeholder="激活时间">
 			</li>
 			
 			<li>
-				<label>签约数量【练习册用】：<b>*</b></label>
+				<label>签约数量（练习册用）：<b>*</b></label>
 				<input type="text" id="signService" class="dfinput fl" name="signService" th:value="${merchant.signService!=null ? merchant.signService : 0}"/>
 			</li>
 			
@@ -163,7 +163,7 @@ dtext{
 			</li>
 			
 			<li >
-				<label>上级商户【上级渠道】<b >*</b></label>
+				<label>上级渠道<b >*</b></label>
 				<div class="vocation" style="margin-right: 5px; width: 345px">
 					<select name="parentposcode" id="parentposcode" class="select1" th:disabled="${merchant.id!=null || curMerchant.orgCode ne 'SSJ-FX' ? 'true' : 'false'}" > 
 						<option th:if="${merchant.id==null || merchant.parentPosCode=='' || merchant.parentPosCode==null }" data-orgcode="" data-id="" value="" >无商户上级</option>

src/main/resources/templates/sys/fx/merchantAllList.html

@@ -176,9 +176,9 @@
 		    	<th style="width: 60px;">机构塾币/套餐人数</th>
 		    	<th style="width: 60px;">平台塾币</th>
 <!-- 		    	<th style="width: 60px;">合同硬件采购数量</th> -->
-		    	<th style="max-width: 160px;" >签约时间/套餐时间</th>
-		    	<th>购买/已结算(月份)</th>
-		    	<th style="width: 60px;" >下个结算日</th>
+		    	<th style="max-width: 160px;" >合同时间</th>
+		    	<th>充值/已结算(月份)</th>
+		    	<th style="width: 60px;" >激活时间</th>
 		        <th  >操作</th> 
 		    </tr> 
 		</thead>