机构画像修改文案

src/main/java/com/caimei/modules/product/dao/ProductDao.java

@@ -225,6 +225,8 @@ public interface ProductDao extends CrudDao<Product> {
 
     void deleteProductSkus(@Param("skuIds")List<Integer> skuIds,@Param("productId")Integer productId);
 
+    void deletePromotionSku(@Param("skuIds")List<Integer> skuIds,@Param("productId")Integer productId);
+
     String findProductIdBySku(String productId);
 
     Double getTouchPriceBySku(Integer skuId);

src/main/java/com/caimei/modules/product/service/CmPromotionService.java

@@ -312,7 +312,13 @@ public class CmPromotionService extends CrudService<CmPromotionDao, CmPromotion>
             // 单品优惠价的时候，删除优惠商品之前的优惠价（新增保存不会删除）
             cmPromotionDao.deleteOldTouchPrice(promotionId);
             // 保存新的sku优惠价
-            cmPromotion.getSkus().forEach(s -> cmPromotionDao.insertNewTouchPrice(s.getSkuId(), s.getTouchPrice(), promotionId));
+            ArrayList<Object> arrayList = new ArrayList<>();
+            cmPromotion.getSkus().forEach(s -> {
+                if (!arrayList.contains(s.getSkuId())) {
+                    cmPromotionDao.insertNewTouchPrice(s.getSkuId(), s.getTouchPrice(), promotionId);
+                    arrayList.add(s.getSkuId());
+                }
+            });
         }
 
         if (StringUtil.isNotBlank(cmPromotion.getProductIds())) {

src/main/java/com/caimei/modules/product/service/ProductService.java

@@ -512,6 +512,8 @@ public class ProductService extends CrudService<ProductDao, Product> {
                 }
             });
             productDao.deleteProductSkus(skuIds, product.getProductID());
+            // 删除促销活动sku
+            productDao.deletePromotionSku(skuIds, product.getProductID());
         }
     }
 

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

@@ -112,7 +112,7 @@ public class ClubPortraitService {
             if (cmPortrait.getEndTime().equals(endTime)) {
                 cmPortrait.setEndTime(dateFormat.format(date));
             }
-            int ordinary = 0, secondHand = 0, rebate = 0, partialRefund = 0, fullRefund = 0, closed = 0,total = 0;
+            int ordinary = 0, secondHand = 0, rebate = 0, partialRefund = 0,total = 0; //, fullRefund = 0, closed = 0
             double orderScopeTotalFee = 0.0;
             ArrayList<OrderPortrait> orderPortraits = new ArrayList<>();
             OrderPortrait orderPortrait = new OrderPortrait();
@@ -144,13 +144,13 @@ public class ClubPortraitService {
                         partialRefund++;
                     }
                     // 全部退款
-                    if ("2".equals(order.getRefundType()) && !"6".equals(order.getStatus())) {
+                    /*if ("2".equals(order.getRefundType()) && !"6".equals(order.getStatus())) {
                         fullRefund++;
                     }
                     // 已关闭
                     if ("6".equals(order.getStatus()) || StringUtils.isEmpty(order.getStatus())) {
                         closed++;
-                    }
+                    }*/
                     orderScopeTotalFee += order.getPayTotalFee();
                 }
                 /*cmPortrait.setOrderTotalAmount(orderList.get(0).getTotalMoney());
@@ -189,7 +189,7 @@ public class ClubPortraitService {
                     orderPortrait.setName("部分退款订单 【 0 %】 【" + partialRefund + "个】");
                 }
                 orderPortraits.add(orderPortrait);
-                orderPortrait = new OrderPortrait();
+                /*orderPortrait = new OrderPortrait();
                 orderPortrait.setValue(fullRefund);
                 if (fullRefund != 0) {
                     orderPortrait.setName("全部退款订单 【" + instance.format((float)fullRefund / (float) length * 100) + "%】 【" + fullRefund + "个】");
@@ -204,12 +204,12 @@ public class ClubPortraitService {
                 } else {
                     orderPortrait.setName("已关闭订单 【 0 %】 【" + closed + "个】");
                 }
-                orderPortraits.add(orderPortrait);
+                orderPortraits.add(orderPortrait);*/
 
                 cmPortrait.setOrderPortrait(orderPortraits);
             }
             // 总量
-            total = ordinary + secondHand + rebate + partialRefund + fullRefund + closed;
+            total = ordinary + secondHand + rebate + partialRefund; //  + fullRefund + closed
             cmPortrait.setOrderScopeNum(total);
             calendar.setTime(date);
             calendar.add(Calendar.DAY_OF_MONTH, -1);

src/main/resources/mappings/modules/product/ProductMapper.xml

@@ -1183,6 +1183,15 @@
         </foreach>
     </delete>
 
+    <delete id="deletePromotionSku">
+        DELETE from cm_promotion_sku
+        WHERE productId = #{productId}
+        and skuId not in
+        <foreach collection="skuIds" close=")" separator="," open="(" item="id">
+            #{id}
+        </foreach>
+    </delete>
+
     <select id="findProductIdBySku" resultType="java.lang.String">
         select productId from cm_sku where skuId=#{productId}
     </select>

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

@@ -3,8 +3,8 @@
 <mapper namespace="com.caimei.modules.user.dao.CmPortraitDao">
     <select id="selTotal" resultType="com.caimei.modules.user.entity.CmPortrait">
         SELECT
-                (SELECT COUNT(orderID) FROM cm_order WHERE clubID = #{clubID} AND orderTime <![CDATA[ < ]]> now()) AS orderTotal,
-                (SELECT SUM(payTotalFee) FROM cm_order WHERE clubID = #{clubID} AND orderTime <![CDATA[ < ]]> now()) AS orderTotalAmount,
+                (SELECT COUNT(orderID) FROM cm_order WHERE clubID = #{clubID} AND STATUS != 6 AND STATUS != 7 AND refundType != 2 AND orderTime <![CDATA[ < ]]> now()) AS orderTotal,
+                (SELECT SUM(payTotalFee) FROM cm_order WHERE clubID = #{clubID} AND STATUS != 6 AND STATUS != 7 AND refundType != 2 AND orderTime <![CDATA[ < ]]> now()) AS orderTotalAmount,
                 (SELECT COUNT(cbr.recordID) FROM cm_behavior_record cbr LEFT JOIN club c ON cbr.userID = c.userID WHERE cbr.pageType IN (8, 9) AND c.clubID = #{clubID} AND cbr.accessDate <![CDATA[ < ]]> now()) AS totalkeywords ,
                 (SELECT COUNT(remarks) FROM cm_club_remarks WHERE clubID = #{clubID} AND addTime <![CDATA[ < ]]> now()) AS remarksTotal
     </select>
@@ -44,8 +44,8 @@
     </select>
     <select id="selOrderList" resultType="com.caimei.modules.order.entity.NewOrder">
         SELECT
-               (SELECT COUNT(orderID) FROM cm_order WHERE clubID = #{clubID}) as numbers,
-                (SELECT SUM(payTotalFee) FROM cm_order WHERE clubID = #{clubID}) as totalMoney,
+               (SELECT COUNT(orderID) FROM cm_order WHERE clubID = #{clubID} AND STATUS != 6 AND STATUS != 7 AND refundType != 2) as numbers,
+                (SELECT SUM(payTotalFee) FROM cm_order WHERE clubID = #{clubID} AND STATUS != 6 AND STATUS != 7 AND refundType != 2) as totalMoney,
                clubID,
                secondHandOrderFlag,
                rebateFlag,
@@ -55,7 +55,7 @@
                orderTime
         FROM cm_order
         <where>
-             clubID = #{clubID}
+             clubID = #{clubID} AND STATUS != 6 AND STATUS != 7 AND refundType != 2
              <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
                  AND orderTime <![CDATA[ >= ]]> #{startTime} AND orderTime <![CDATA[ <= ]]> #{endTime}
              </if>

src/main/webapp/WEB-INF/views/modules/cmpage/cmAdvertiseImageForm.jsp

@@ -102,7 +102,7 @@
 			<label class="control-label">移动端状态：</label>
 			<div class="controls">
 				<form:select path="crmEnabledStatus" class="input-xlarge ">
-					<form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false" label="${fns:getDictList('enabled_status')[0]}"/>
+					<form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false" />
 				</form:select>
 			</div>
 		</div>
@@ -112,7 +112,7 @@
 			<label class="control-label">PC端状态：</label>
 			<div class="controls">
 				<form:select path="enabledStatus" class="input-xlarge ">
-					<form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false" label="${fns:getDictList('enabled_status')[0]}"/>
+					<form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false" />
 				</form:select>
 			</div>
 		</div>
@@ -122,4 +122,4 @@
 		</div>
 	</form:form>
 </body>
-</html>
+</html>

src/main/webapp/WEB-INF/views/modules/cmpage/cmImageForm.jsp

@@ -197,7 +197,7 @@
 			<label class="control-label">移动端状态：</label>
 			<div class="controls">
 				<form:select path="crmEnabledStatus" class="input-xlarge ">
-					<form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false" label="${fns:getDictList('enabled_status')[0]}"/>
+					<form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false" />
 				</form:select>
 			</div>
 		</div>
@@ -218,7 +218,7 @@
 			<label class="control-label">小程序端状态：</label>
 			<div class="controls">
 				<form:select path="appletsEnabledStatus" class="input-xlarge ">
-					<form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false" label="${fns:getDictList('enabled_status')[0]}"/>
+					<form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false" />
 				</form:select>
 			</div>
 		</div>
@@ -226,7 +226,7 @@
 			<label class="control-label">PC端状态：</label>
 			<div class="controls">
 				<form:select path="enabledStatus" class="input-xlarge ">
-					<form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false" label="${fns:getDictList('enabled_status')[0]}"/>
+					<form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false" />
 				</form:select>
 			</div>
 		</div>
@@ -236,4 +236,4 @@
 		</div>
 	</form:form>
 </body>
-</html>
+</html>

src/main/webapp/WEB-INF/views/modules/cmpage/cmPageActivityCentreForm.jsp

@@ -65,7 +65,7 @@
         <label class="control-label"><span class="help-inline"><font color="red">*</font> </span>PC端状态：</label>
         <div class="controls">
             <form:select path="enabledStatus" class="input-xlarge required">
-                <form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false" label="${fns:getDictList('enabled_status')[0]}"/>
+                <form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false" />
             </form:select>
         </div>
     </div>
@@ -83,4 +83,4 @@
     </div>
 </form:form>
 </body>
-</html>
+</html>

src/main/webapp/WEB-INF/views/modules/cmpage/cmPageActivityForm.jsp

@@ -138,7 +138,7 @@
         <label class="control-label">状态：</label>
         <div class="controls">
             <form:select path="enabledStatus" class="input-xlarge ">
-                <form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false" label="${fns:getDictList('enabled_status')[0]}"/>
+                <form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false" />
             </form:select>
         </div>
     </div>

src/main/webapp/WEB-INF/views/modules/cmpage/cmPageBeautyForm.jsp

@@ -132,7 +132,7 @@
         <label class="control-label">状态：</label>
         <div class="controls">
             <form:select path="enabledStatus" class="input-xlarge ">
-                <form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false" label="${fns:getDictList('enabled_status')[0]}"/>
+                <form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false" />
             </form:select>
         </div>
     </div>

src/main/webapp/WEB-INF/views/modules/cmpage/cmPageBigTopicFloorForm.jsp

@@ -33,7 +33,7 @@
 	</ul><br/>
 	<form:form id="inputForm" modelAttribute="cmPageBigTopicFloor" action="${ctx}/cmpage/cmPageBigTopicFloor/save?bigTopicId=${cmPageBigTopicFloor.bigTopicId}" method="post" class="form-horizontal">
 		<form:hidden path="id"/>
-		<sys:message content="${message}"/>		
+		<sys:message content="${message}"/>
 		<div class="control-group">
 			<label class="control-label"><font color="red">*</font> 标题：</label>
 			<div class="controls">
@@ -72,7 +72,7 @@
 			<label class="control-label">移动端状态：</label>
 			<div class="controls">
 				<form:select path="crmEnabledStatus" class="input-xlarge ">
-					<form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false" label="${fns:getDictList('enabled_status')[0]}"/>
+					<form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false" />
 				</form:select>
 			</div>
 		</div>
@@ -80,7 +80,7 @@
 			<label class="control-label">PC端状态：</label>
 			<div class="controls">
 				<form:select path="enabledStatus" class="input-xlarge ">
-					<form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false" label="${fns:getDictList('enabled_status')[0]}"/>
+					<form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false" />
 				</form:select>
 			</div>
 		</div>
@@ -90,4 +90,4 @@
 		</div>
 	</form:form>
 </body>
-</html>
+</html>

src/main/webapp/WEB-INF/views/modules/cmpage/cmPageBigTopicForm.jsp

@@ -32,7 +32,7 @@
 	</ul><br/>
 	<form:form id="inputForm" modelAttribute="cmPageBigTopic" action="${ctx}/cmpage/cmPageBigTopic/save" method="post" class="form-horizontal">
 		<form:hidden path="id"/>
-		<sys:message content="${message}"/>		
+		<sys:message content="${message}"/>
 		<div class="control-group">
 			<label class="control-label"><font color="red">*</font> 标题：</label>
 			<div class="controls">
@@ -61,7 +61,7 @@
 			<label class="control-label">移动端状态：</label>
 			<div class="controls">
 				<form:select path="crmEnabledStatus" class="input-xlarge ">
-					<form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false" label="${fns:getDictList('enabled_status')[0]}"/>
+					<form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false" />
 				</form:select>
 			</div>
 		</div>
@@ -69,7 +69,7 @@
 			<label class="control-label">PC端状态：</label>
 			<div class="controls">
 				<form:select path="enabledStatus" class="input-xlarge ">
-					<form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false" label="${fns:getDictList('enabled_status')[0]}"/>
+					<form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false" />
 				</form:select>
 			</div>
 		</div>
@@ -79,4 +79,4 @@
 		</div>
 	</form:form>
 </body>
-</html>
+</html>

src/main/webapp/WEB-INF/views/modules/cmpage/cmPageCentreForm.jsp

@@ -355,7 +355,7 @@
         <div class="controls">
             <form:select path="crmEnabledStatus" class="input-xlarge ">
                 <form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value"
-                              htmlEscape="false" label="${fns:getDictList('enabled_status')[0]}"/>
+                              htmlEscape="false" />
             </form:select>
         </div>
     </div>
@@ -364,7 +364,7 @@
         <div class="controls">
             <form:select path="enabledStatus" class="input-xlarge ">
                 <form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value"
-                              htmlEscape="false" label="${fns:getDictList('enabled_status')[0]}"/>
+                              htmlEscape="false" />
             </form:select>
         </div>
     </div>

src/main/webapp/WEB-INF/views/modules/cmpage/cmPageDetailsCentreForm.jsp

@@ -65,7 +65,7 @@
         <label class="control-label"><span class="help-inline"><font color="red">*</font> </span>PC端状态：</label>
         <div class="controls">
             <form:select path="enabledStatus" class="input-xlarge required">
-                <form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false" label="${fns:getDictList('enabled_status')[0]}"/>
+                <form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false" />
             </form:select>
         </div>
     </div>
@@ -73,7 +73,7 @@
         <label class="control-label"><span class="help-inline"><font color="red">*</font> </span>小程序状态：</label>
         <div class="controls">
             <form:select path="crmEnabledStatus" class="input-xlarge required">
-                <form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false" label="${fns:getDictList('enabled_status')[0]}"/>
+                <form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false" />
             </form:select>
         </div>
     </div>
@@ -83,4 +83,4 @@
     </div>
 </form:form>
 </body>
-</html>
+</html>

src/main/webapp/WEB-INF/views/modules/cmpage/cmPageDetailsForm.jsp

@@ -141,7 +141,7 @@
         <div class="controls">
             <form:select path="enabledStatus" class="input-xlarge ">
                 <form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value"
-                              htmlEscape="false" label="${fns:getDictList('enabled_status')[0]}"/>
+                              htmlEscape="false" />
             </form:select>
         </div>
     </div>

src/main/webapp/WEB-INF/views/modules/cmpage/cmPageFirstCategoryForm.jsp

@@ -32,7 +32,7 @@
 	</ul><br/>
 	<form:form id="inputForm" modelAttribute="cmPageFirstCategory" action="${ctx}/cmpage/cmPageFirstCategory/save" method="post" class="form-horizontal">
 		<form:hidden path="id"/>
-		<sys:message content="${message}"/>		
+		<sys:message content="${message}"/>
 		<div class="control-group">
 			<label class="control-label"><font color="red">*</font> 一级分类名称：</label>
 			<div class="controls">
@@ -49,7 +49,7 @@
 			<label class="control-label">移动端状态：</label>
 			<div class="controls">
 				<form:select path="crmEnabledStatus" class="input-xlarge ">
-					<form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false" label="${fns:getDictList('enabled_status')[0]}"/>
+					<form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false" />
 				</form:select>
 			</div>
 		</div>
@@ -57,7 +57,7 @@
 			<label class="control-label">PC端状态：</label>
 			<div class="controls">
 				<form:select path="enabledStatus" class="input-xlarge ">
-					<form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false" label="${fns:getDictList('enabled_status')[0]}"/>
+					<form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false" />
 				</form:select>
 			</div>
 		</div>
@@ -67,4 +67,4 @@
 		</div>
 	</form:form>
 </body>
-</html>
+</html>

src/main/webapp/WEB-INF/views/modules/cmpage/cmPageFreedomForm.jsp

@@ -183,7 +183,7 @@
         <label class="control-label">状态：</label>
         <div class="controls">
             <form:select path="enabledStatus" class="input-xlarge ">
-                <form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false" label="${fns:getDictList('enabled_status')[0]}"/>
+                <form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false" />
             </form:select>
         </div>
     </div>

src/main/webapp/WEB-INF/views/modules/cmpage/cmPageProjectDetailForm.jsp

@@ -347,7 +347,7 @@
         <label class="control-label">状态：</label>
         <div class="controls">
             <form:select path="enabledStatus" class="input-xlarge ">
-                <form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false" label="${fns:getDictList('enabled_status')[0]}"/>
+                <form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false" />
             </form:select>
         </div>
     </div>

src/main/webapp/WEB-INF/views/modules/cmpage/cmPageSecondaryCategoryForm.jsp

@@ -32,7 +32,7 @@
 	</ul><br/>
 	<form:form id="inputForm" modelAttribute="cmPageSecondaryCategory" action="${ctx}/cmpage/cmPageSecondaryCategory/save?firstCategoryId=${cmPageSecondaryCategory.firstCategoryId}" method="post" class="form-horizontal">
 		<form:hidden path="id"/>
-		<sys:message content="${message}"/>		
+		<sys:message content="${message}"/>
 		<div class="control-group">
 			<label class="control-label"><font color="red">*</font> 二级分类名称：</label>
 			<div class="controls">
@@ -58,7 +58,7 @@
 			<label class="control-label">移动端状态：</label>
 			<div class="controls">
 				<form:select path="crmEnabledStatus" class="input-xlarge ">
-					<form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false" label="${fns:getDictList('enabled_status')[0]}"/>
+					<form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false" />
 				</form:select>
 			</div>
 		</div>
@@ -66,7 +66,7 @@
 			<label class="control-label">PC端状态：</label>
 			<div class="controls">
 				<form:select path="enabledStatus" class="input-xlarge ">
-					<form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false" label="${fns:getDictList('enabled_status')[0]}"/>
+					<form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false" />
 				</form:select>
 			</div>
 		</div>
@@ -76,4 +76,4 @@
 		</div>
 	</form:form>
 </body>
-</html>
+</html>

src/main/webapp/WEB-INF/views/modules/cmpage/cmPageSecondaryForm.jsp

@@ -198,7 +198,7 @@
         <label class="control-label">状态：</label>
         <div class="controls">
             <form:select path="enabledStatus" class="input-xlarge ">
-                <form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false" label="${fns:getDictList('enabled_status')[0]}"/>
+                <form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false" />
             </form:select>
         </div>
     </div>

src/main/webapp/WEB-INF/views/modules/newhome/newPageCommodityTopicForm.jsp

@@ -84,7 +84,7 @@
 			<label class="control-label">PC端状态：</label>
 			<div class="controls">
 				<form:select path="wwwEnabledStatus" class="input-xlarge ">
-					<form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false" label="${fns:getDictList('enabled_status')[0]}"/>
+					<form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false" />
 				</form:select>
 			</div>
 		</div>
@@ -94,4 +94,4 @@
 		</div>
 	</form:form>
 </body>
-</html>
+</html>

src/main/webapp/WEB-INF/views/modules/newhome/newPageHomeimageForm.jsp

@@ -42,7 +42,7 @@
 	</ul><br/>
 	<form:form id="inputForm" modelAttribute="newPageHomeimage" action="${ctx}/newhome/newPageHomeimage/save" method="post" class="form-horizontal">
 		<form:hidden path="id"/>
-		<sys:message content="${message}"/>		
+		<sys:message content="${message}"/>
 
 
 
@@ -105,7 +105,7 @@
 			<label class="control-label">小程序状态：</label>
 			<div class="controls">
 				<form:select path="crmEnabledStatus" class="input-xlarge ">
-					<form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false" label="${fns:getDictList('enabled_status')[0]}"/>
+					<form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false" />
 				</form:select>
 			</div>
 		</div>
@@ -113,7 +113,7 @@
 			<label class="control-label">PC端状态：</label>
 			<div class="controls">
 				<form:select path="wwwEnabledStatus" class="input-xlarge ">
-					<form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false" label="${fns:getDictList('enabled_status')[0]}"/>
+					<form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false" />
 				</form:select>
 			</div>
 		</div>
@@ -123,4 +123,4 @@
 		</div>
 	</form:form>
 </body>
-</html>
+</html>

src/main/webapp/WEB-INF/views/modules/newhome/newPageQualitySupplierForm.jsp

@@ -38,7 +38,7 @@
 	</ul><br/>
 	<form:form id="inputForm" modelAttribute="newPageQualitySupplier" action="${ctx}/newhome/newPageQualitySupplier/save" method="post" class="form-horizontal">
 		<form:hidden path="id"/>
-		<sys:message content="${message}"/>		
+		<sys:message content="${message}"/>
 		<div class="control-group">
 			<label class="control-label"><span class="help-inline"><font color="red">*</font> </span>供应商名称：</label>
 			<div class="controls">
@@ -72,7 +72,7 @@
 			<label class="control-label"><span class="help-inline"><font color="red">*</font> </span>小程序端状态：</label>
 			<div class="controls">
 				<form:select path="crmEnabledStatus" class="input-xlarge ">
-					<form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false" label="${fns:getDictList('enabled_status')[0]}"/>
+					<form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false" />
 				</form:select>
 			</div>
 		</div>
@@ -80,7 +80,7 @@
 			<label class="control-label"><span class="help-inline"><font color="red">*</font> </span>PC端状态：</label>
 			<div class="controls">
 				<form:select path="wwwEnabledStatus" class="input-xlarge ">
-					<form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false" label="${fns:getDictList('enabled_status')[0]}"/>
+					<form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false" />
 				</form:select>
 			</div>
 		</div>
@@ -90,4 +90,4 @@
 		</div>
 	</form:form>
 </body>
-</html>
+</html>

src/main/webapp/WEB-INF/views/modules/newhome/newPageSecondaryNavigationForm.jsp

@@ -75,7 +75,7 @@
 			<label class="control-label">移动端状态：</label>
 			<div class="controls">
 				<form:select path="crmEnabledStatus" class="input-xlarge ">
-					<form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false" label="${fns:getDictList('enabled_status')[0]}"/>
+					<form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false" />
 				</form:select>
 			</div>
 		</div>
@@ -83,7 +83,7 @@
 			<label class="control-label">PC端状态：</label>
 			<div class="controls">
 				<form:select path="wwwEnabledStatus" class="input-xlarge ">
-					<form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false" label="${fns:getDictList('enabled_status')[0]}"/>
+					<form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false" />
 				</form:select>
 			</div>
 		</div>
@@ -93,4 +93,4 @@
 		</div>
 	</form:form>
 </body>
-</html>
+</html>

src/main/webapp/WEB-INF/views/modules/newhome/newPageSmallTopicForm.jsp

@@ -71,7 +71,7 @@
 			<label class="control-label">移动端状态：</label>
 			<div class="controls">
 				<form:select path="crmEnabledStatus" class="input-xlarge ">
-					<form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false" label="${fns:getDictList('enabled_status')[0]}"/>
+					<form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false" />
 				</form:select>
 			</div>
 		</div>
@@ -79,7 +79,7 @@
 			<label class="control-label">PC端状态：</label>
 			<div class="controls">
 				<form:select path="wwwEnabledStatus" class="input-xlarge ">
-					<form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false" label="${fns:getDictList('enabled_status')[0]}"/>
+					<form:options items="${fns:getDictList('enabled_status')}" itemLabel="label" itemValue="value" htmlEscape="false" />
 				</form:select>
 			</div>
 		</div>
@@ -89,4 +89,4 @@
 		</div>
 	</form:form>
 </body>
-</html>
+</html>

src/main/webapp/WEB-INF/views/modules/userNew/cmAgencyList.jsp

@@ -259,7 +259,7 @@
                         <font color="red">(超级会员)</font>
                     </c:if>
                     <c:if test="${newCmClubList.svipUserFlag ne 1}">
-                        <font color="red">(普通会员)</font>
+                        <font color="black">(普通会员)</font>
                     </c:if>
                 </c:if>
                 <c:if test="${newCmClubList.userIdentity eq 2}">