Merge branch 'developerL' into developer

# Conflicts:
#	src/main/resources/mappings/modules/order/CmDiscernReceiptMapper.xml

src/main/java/com/caimei/modules/cmpage/web/CmImageController.java

@@ -66,7 +66,7 @@ public class CmImageController extends BaseController {
 
 		if(StringUtils.equals("5",cmImage.getFlag())){//首页广告图片（【顶层广告】【轮播图】【小专题】）
 			if(StringUtils.isEmpty(cmImage.getType())){
-				cmImage.getSqlMap().put("type", " AND (a.type=5 OR a.type=6 OR a.type=7)");
+				cmImage.getSqlMap().put("type", " AND (a.type=5 OR a.type=6 OR a.type=7 OR a.type=9)");
 			}
 			Page<CmImage> advertisePage = cmImageService.findPage(new Page<CmImage>(request, response), cmImage);
 			model.addAttribute("page", advertisePage);

src/main/java/com/caimei/modules/cmpage/web/CmPageCentreController.java

@@ -82,7 +82,7 @@ public class CmPageCentreController extends BaseController {
             return "modules/cmpage/cmPageDetailsCentreList";
         }
         //活动专题商品楼层
-        if ("6".equals(cmPageCentre.getType()) || "7".equals(cmPageCentre.getType())) {
+        if ("6".equals(cmPageCentre.getType()) || "7".equals(cmPageCentre.getType())|| "9".equals(cmPageCentre.getType())) {
             return "modules/cmpage/cmPageActivityCentreList";
         }
         //呵呵商城首页楼层
@@ -101,7 +101,7 @@ public class CmPageCentreController extends BaseController {
             return "modules/cmpage/cmPageDetailsCentreForm";
         }
         //活动专题商品楼层
-        if ("6".equals(cmPageCentre.getType()) || "7".equals(cmPageCentre.getType())) {
+        if ("6".equals(cmPageCentre.getType()) || "7".equals(cmPageCentre.getType())|| "9".equals(cmPageCentre.getType())) {
             return "modules/cmpage/cmPageActivityCentreForm";
         }
         //呵呵商城商品楼层
@@ -234,7 +234,7 @@ public class CmPageCentreController extends BaseController {
         if ("6".equals(newPageFloorContent.getType())) {
             return "modules/newhome/activityFloorContentForm";
         }
-        if ("7".equals(newPageFloorContent.getType())) {
+        if ("7".equals(newPageFloorContent.getType())||"9".equals(newPageFloorContent.getType())) {
             return "modules/newhome/beautyFloorContentForm";
         }
         if ("8".equals(newPageFloorContent.getType())) {

src/main/java/com/caimei/modules/cmpage/web/CmPageController.java

@@ -69,7 +69,7 @@ public class CmPageController extends BaseController {
     @RequestMapping(value = {"list", ""})
     public String list(CmPage cmPage, HttpServletRequest request, HttpServletResponse response, Model model) {
         if (StringUtils.equals("2", cmPage.getFlag())) {// 2网页列表（1项目详情/2二级列表/4自由页面/5分类详情/6活动专题/7云上美博会）
-            cmPage.getSqlMap().put("pageType", " AND (a.type=1 OR a.type=2 OR a.type=4 OR a.type=5 OR a.type=6 OR a.type=7)");
+            cmPage.getSqlMap().put("pageType", " AND (a.type=1 OR a.type=2 OR a.type=4 OR a.type=5 OR a.type=6 OR a.type=7 OR a.type=9)");
         }
         Page<CmPage> page = cmPageService.findPage(new Page<CmPage>(request, response), cmPage);
         model.addAttribute("page", page);
@@ -108,6 +108,10 @@ public class CmPageController extends BaseController {
         if (StringUtils.equals("27", cmPage.getFlag()) || StringUtils.equals("7", cmPage.getType())) {
             return "modules/cmpage/cmPageBeautyForm";
         }
+        // 快捷运营页面
+        if (StringUtils.equals("29", cmPage.getFlag()) || StringUtils.equals("9", cmPage.getType())) {
+            return "modules/cmpage/cmPageShortcutForm";
+        }
         return "modules/cmpage/cmLecturerPageForm";
     }
 

src/main/java/com/caimei/modules/newhome/entity/NewPageFirstNavigation.java

@@ -31,6 +31,13 @@ public class NewPageFirstNavigation extends DataEntity<NewPageFirstNavigation> {
      * 跳转链接
      */
     private String link;
+
+
+
+    /**
+     * 备注
+     */
+    private String remark;
     private String sort;        // 排序
     private String wwwEnabledStatus;        // Pc端状态 0停用 1启用
 
@@ -47,6 +54,14 @@ public class NewPageFirstNavigation extends DataEntity<NewPageFirstNavigation> {
         super(id);
     }
 
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
     public String getNavigationName() {
         return navigationName;
     }
@@ -107,4 +122,4 @@ public class NewPageFirstNavigation extends DataEntity<NewPageFirstNavigation> {
     public void setCrmEnabledStatus(String crmEnabledStatus) {
         this.crmEnabledStatus = crmEnabledStatus;
     }
-}
+}

src/main/java/com/caimei/modules/newhome/web/NewPageFirstNavigationController.java

@@ -68,6 +68,7 @@ public class NewPageFirstNavigationController extends BaseController {
     public String list(NewPageFirstNavigation newPageFirstNavigation, HttpServletRequest request, HttpServletResponse response, Model model) {
         Page<NewPageFirstNavigation> page = newPageFirstNavigationService.findPage(new Page<NewPageFirstNavigation>(request, response), newPageFirstNavigation);
         model.addAttribute("page", page);
+        model.addAttribute("newPageFirstNavigation", newPageFirstNavigation);
         return "modules/newhome/newPageFirstNavigationList";
     }
 
@@ -85,7 +86,9 @@ public class NewPageFirstNavigationController extends BaseController {
             return form(newPageFirstNavigation, model);
         }
         //判断如果已经存在10条数据则不允许添加(产品控制数量显示)
-        List<NewPageFirstNavigation> list = newPageFirstNavigationService.findList(new NewPageFirstNavigation());
+        NewPageFirstNavigation navigation = new NewPageFirstNavigation();
+        navigation.setType(newPageFirstNavigation.getType());
+        List<NewPageFirstNavigation> list = newPageFirstNavigationService.findList(navigation);
         if (StringUtils.isEmpty(newPageFirstNavigation.getId())) {
             if (CollectionUtils.isNotEmpty(list) && list.size() >= 10) {
                 addMessage(model, "最多添加10个主菜单！删除旧菜单后才能继续添加");
@@ -105,7 +108,7 @@ public class NewPageFirstNavigationController extends BaseController {
         }
         addMessage(redirectAttributes, "保存成功");
         cleanRedisCache();// 清理redis缓存
-        return "redirect:" + Global.getAdminPath() + "/newhome/newPageFirstNavigation/?repage";
+        return "redirect:" + Global.getAdminPath() + "/newhome/newPageFirstNavigation/?repage&type="+newPageFirstNavigation.getType();
     }
 
     @RequiresPermissions("newhome:newPageFirstNavigation:delete")
@@ -118,7 +121,7 @@ public class NewPageFirstNavigationController extends BaseController {
         newPageFirstNavigationService.delete(newPageFirstNavigation);
         addMessage(redirectAttributes, "删除成功");
         cleanRedisCache();// 清理redis缓存
-        return "redirect:" + Global.getAdminPath() + "/newhome/newPageFirstNavigation/?repage";
+        return "redirect:" + Global.getAdminPath() + "/newhome/newPageFirstNavigation/?repage&type="+newPageFirstNavigation.getType();
     }
 
     @RequiresPermissions("newhome:newPageFirstNavigation:edit")

src/main/java/com/caimei/modules/newhome/web/NewPageFloorController.java

@@ -402,7 +402,7 @@ public class NewPageFloorController extends BaseController {
         cleanRedisCache();
         addMessage(redirectAttributes, "保存成功");
         if (floorContent.getFloorId() != null) {
-            return "redirect:" + Global.getAdminPath() + "/newhome/newPageFloor/?repage";
+            return "redirect:" + Global.getAdminPath() + "/newhome/newPageFloor?repage";
         } else if (StringUtils.isNotBlank(floorContent.getFormType())) {
             if (floorContent.getRedirectFlag() == 1) {
                 return "redirect:" + Global.getAdminPath() + "/cmpage/cmPageCentre/?pageId=" + floorContent.getPageId() + "&type=" + floorContent.getFormType();

src/main/java/com/caimei/modules/order/service/NewOrderService.java

@@ -1299,8 +1299,11 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
             if (count > 1) {
                 newOrder.setRechargeGoods(3);
             }
+            BigDecimal payTotalFee=new BigDecimal(0);
             if (CollectionUtils.isNotEmpty(shopOrders)) {
                 for (NewShopOrder shopOrder : shopOrders) {
+                     payTotalFee = MathUtil.add(payTotalFee,shopOrder.getRealPay() != null ? shopOrder.getRealPay() : shopOrder.getNeedPayAmount());
+
                     BigDecimal add = MathUtil.add(shopOrder.getReceiptAmount(),cmDiscernReceiptService.findShoOrderIDReceipt(shopOrder.getShopOrderID()));
                     shopOrder.setReceiptAmount(add.doubleValue());
                     BigDecimal sub = MathUtil.sub((shopOrder.getRealPay() != null ? shopOrder.getRealPay() : shopOrder.getNeedPayAmount()).doubleValue()
@@ -1429,6 +1432,7 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
                 }
                 newOrder.setNewShopOrders(shopOrders);
             }
+            newOrder.setPayTotalFee(payTotalFee.doubleValue());
             if (CollectionUtils.isNotEmpty(list)) {
                 newOrder.setOrderProduct(list);
                 double freight = 0D;

src/main/java/com/caimei/modules/sys/utils/UploadImageUtils.java

@@ -33,7 +33,12 @@ public class UploadImageUtils {
     public static String getAbsolutePath(String imagePath) {
         if(StringUtils.isNotEmpty(imagePath)){
             String absolutePath = basedir + imagePath;
-            logger.info("----------上传绝对路径为："+ absolutePath);
+            if (Global.getConfig("cm.config").equals("dev")) {
+                if (absolutePath.indexOf("caimei365_manager_war_exploded2userfiles") != -1) {
+                    absolutePath=absolutePath.replace("caimei365_manager_war_exploded2userfiles", "userfiles");
+                }
+            }
+            logger.info("----------上传绝对路径为：" + absolutePath);
             return absolutePath;
         }else{
             return "";

src/main/resources/mappings/modules/cmpage/CmPageCentreMapper.xml

@@ -198,7 +198,7 @@
 		FROM
 		  new_page_floor_image a
 		  LEFT JOIN product p ON a.productId = p.productID
-		left join cm_organize_product_info copi on copi.productId = p.productID
+		left join cm_organize_product_info copi on copi.productId = p.productID and copi.productId = p.productID  and copi.organizeId=(SELECT SUBSTRING(groundMall, 1, 1)FROM product WHERE productID=p.productId)
 		  LEFT JOIN shop s on p.shopID = s.shopID
 		  left join cm_hehe_product chp on a.productId = chp.productId
 		WHERE
@@ -206,7 +206,7 @@
           <if test="type != null and type == '8'">
               and chp.id is not null
           </if>
-		group by p.productID
+		group by a.id
 	</select>
 
 	<select id="findPageTitle" resultType="java.lang.String">

src/main/resources/mappings/modules/hehe/CmHeheCollageMapper.xml

@@ -27,7 +27,7 @@
 		FROM cm_hehe_collage a
 		<include refid="cmHeheCollageJoins"/>
 		WHERE a.id = #{id}
-		group by p.productID
+-- 		group by p.productID
 	</select>
 
 	<select id="findList" resultType="CmHeheCollage">
@@ -50,7 +50,7 @@
 				and s.name like concat('%',#{shopName},'%')
 			</if>
 		</where>
-		group by p.productID
+-- 		group by p.productID
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
 				ORDER BY ${page.orderBy}
@@ -69,7 +69,7 @@
 		<where>
 
 		</where>
-		group by p.productID
+-- 		group by p.productID
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
 				ORDER BY ${page.orderBy}

src/main/resources/mappings/modules/newhome/NewPageFirstNavigationMapper.xml

@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.caimei.modules.newhome.dao.NewPageFirstNavigationDao">
-    
+
 	<sql id="newPageFirstNavigationColumns">
 		a.id AS "id",
 		a.navigationName AS "navigationName",
 		a.type AS "type",
 		a.icon AS "icon",
 		a.link AS "link",
+		a.remark AS "remark",
 		a.sort AS "sort",
 		a.wwwEnabledStatus AS "wwwEnabledStatus",
 		a.crmEnabledStatus AS "crmEnabledStatus",
@@ -19,18 +20,22 @@
 	</sql>
 
 	<select id="get" resultType="NewPageFirstNavigation">
-		SELECT 
+		SELECT
 			<include refid="newPageFirstNavigationColumns"/>
 		FROM new_page_first_navigation a
-		WHERE a.id = #{id}
+		WHERE a.id = #{id} and  a.delFlag = 0
 	</select>
-	
+
 	<select id="findList" resultType="NewPageFirstNavigation">
-		SELECT 
+		SELECT
 			<include refid="newPageFirstNavigationColumns"/>
 		FROM new_page_first_navigation a
 		<where>
-			
+			a.delFlag = 0
+			<if test="type != null and type != ''">
+				<if test="type == 0 ">and (a.type = 0 or a.type is null )</if>
+				<if test="type != 0 ">and a.type = #{type}</if>
+			</if>
 		</where>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
@@ -41,14 +46,19 @@
 			</otherwise>
 		</choose>
 	</select>
-	
+
 	<select id="findAllList" resultType="NewPageFirstNavigation">
-		SELECT 
+		SELECT
 			<include refid="newPageFirstNavigationColumns"/>
 		FROM new_page_first_navigation a
 		<where>
-			
-		</where>		
+			a.delFlag = 0
+			<if test="type != null and type != ''">
+				<if test="type == 0 ">and (a.type = 0 or a.type is null )</if>
+				<if test="type != 0 ">and a.type = #{type}</if>
+			</if>
+
+		</where>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
 				ORDER BY ${page.orderBy}
@@ -58,12 +68,13 @@
 			</otherwise>
 		</choose>
 	</select>
-	
+
 	<insert id="insert" parameterType="NewPageFirstNavigation"  keyProperty="id" useGeneratedKeys="true">
 		INSERT INTO new_page_first_navigation(
 			navigationName,
 			type,
 			link,
+			remark,
 			icon,
 			sort,
 			wwwEnabledStatus,
@@ -77,6 +88,7 @@
 			#{navigationName},
 			#{type},
 			#{link},
+			#{remark},
 			#{icon},
 			#{sort},
 			#{wwwEnabledStatus},
@@ -88,12 +100,13 @@
 			#{delFlag}
 		)
 	</insert>
-	
+
 	<update id="update">
-		UPDATE new_page_first_navigation SET 	
+		UPDATE new_page_first_navigation SET
 			navigationName = #{navigationName},
 			type = #{type},
 			link = #{link},
+			remark = #{remark},
 			icon = #{icon},
 			sort = #{sort},
 			wwwEnabledStatus = #{wwwEnabledStatus},
@@ -105,7 +118,7 @@
 			delFlag = #{delFlag}
 		WHERE id = #{id}
 	</update>
-	
+
 	<delete id="delete">
 		DELETE FROM new_page_first_navigation
 		WHERE id = #{id}
@@ -132,5 +145,5 @@
 		sort = #{sort}
 		WHERE id = #{id}
 	</update>
-	
-</mapper>
+
+</mapper>

src/main/resources/mappings/modules/newhome/NewPageFloorMapper.xml

@@ -229,10 +229,10 @@
 		FROM
 		  new_page_floor_image a
 		  LEFT JOIN product p ON a.productId = p.productID
-		  left join cm_organize_product_info copi on copi.productId = p.productID
+		  left join cm_organize_product_info copi on copi.productId = p.productID and copi.organizeId=(SELECT SUBSTRING(groundMall, 1, 1)FROM product WHERE productID=p.productId)
 		WHERE
 		  a.floorId = #{floorId}
-		group by p.productID
+-- 		group by p.productID
 	</select>
 
 	<insert id="insertFloorContent">

src/main/resources/mappings/modules/order/CmReturnedPurchaseProductMapper.xml

@@ -33,12 +33,12 @@
 			cs.organizeId as organizeId
 		FROM cm_returned_purchase_product a
 		left join cm_order_product b on a.orderProductID = b.orderProductID
-		left join cm_sku cs on b.skuId = cs.skuId
+		left join cm_sku cs on b.skuId = cs.skuId and cs.organizeId=b.organizeId
 		left join product c on c.productID = a.productID
 		left join shop d on d.shopID = a.shopID
 		<where>
 			  c.groundMall like CONCAT('%', cs.organizeId, '%')
-			and cs.organizeId=(SELECT SUBSTRING(groundMall, 1, 1)FROM product WHERE productID=cs.productId)
+-- 			and cs.organizeId=(SELECT SUBSTRING(groundMall, 1, 1)FROM product WHERE productID=cs.productId)
             <if test="returnedID != null and returnedID != ''">
                 AND a.returnedID = #{returnedID}
             </if>

src/main/resources/mappings/modules/order/OrderMapper.xml

@@ -124,7 +124,7 @@
         co.payableAmount AS payableAmount,
         co.orderTime AS orderTime,
         co.confirmTime AS confirmTime,
-        co.payTotalFee AS payTotalFee,
+        (select sum(IFNULL(realPay,needPayAmount))from cm_shop_order WHERE orderId =co.orderID) AS payTotalFee,
         co.payStatus AS payStatus,
         co.refundType AS refundType,
         co.sendOutStatus AS sendOutStatus,
@@ -1303,7 +1303,7 @@
         FROM cm_order_product cop
                  LEFT JOIN product p ON cop.productID = p.productID
                  left join cm_order co on co.orderID = cop.orderID
-                 left join cm_sku cs on cop.skuId = cs.skuId
+                 left join cm_sku cs on cop.skuId = cs.skuId and cop.organizeID=cs.organizeID
         WHERE cop.shopOrderID = #{shopOrderId}
           AND IF(co.userBeans = 0, 1 = 1, cop.shopid != 998)
         group by p.productID

src/main/resources/mappings/modules/order/OrderProductMapper.xml

@@ -556,12 +556,13 @@
                cs.organizeId      AS organizeId,
                cpo.touchPrice              AS touchPrice
         from cm_order_product cop
-                 left join cm_sku cs on cop.skuId = cs.skuId
+                 left join cm_sku cs on cop.skuId = cs.skuId and cs.organizeId=cop.organizeId
                  left join cm_promotions_order cpo on (cop.orderPromotionsId = cpo.id and cpo.mode = 1)
                  left join product p on p.productID = cop.productID
                  left join cm_order co on co.orderID = cop.orderID
                  left join user u on u.userID = co.userID
-        where cop.shopOrderID = #{shopOrderID}   and cs.organizeId=(SELECT SUBSTRING(groundMall, 1, 1)FROM product WHERE productID=cs.productId)
+        where cop.shopOrderID = #{shopOrderID}
+--           and cs.organizeId=(SELECT SUBSTRING(groundMall, 1, 1)FROM product WHERE productID=cs.productId)
         group by p.productID
     </select>
 

src/main/resources/mappings/modules/order/ShopOrderMapper.xml

@@ -689,7 +689,7 @@
     <select id="findPayOrderList" resultType="newShopOrder">
         select<include refid="shopOrderColumns"/>,
         co.payTotalFee AS payTotalFee,
-        co.status AS status,
+
         bou.name AS buyer,
         s.name AS shopName,
         c.name AS clubName,

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

@@ -142,7 +142,6 @@
         FROM product a
         <include refid="productJoins"/>
         <where>
-
               copi.organizeId=(SELECT SUBSTRING(groundMall, 1, 1)FROM product WHERE productID=a.productID)
             <if test="id !=null and id !=''">
                 AND a.productID=#{id}

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

@@ -164,7 +164,7 @@
                 AND p.name like concat('%',#{productName},'%')
             </if>
         </where>
-        group by p.productID
+--         group by p.productID
         ORDER BY accessTime DESC
     </select>
     <select id="pageType" resultType="com.caimei.modules.user.entity.CmPageType">

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

@@ -541,7 +541,7 @@
                 and ccr.reportID=#{reportID}
             </if>
         </where>
-        group by p.productID
+--         group by p.productID
         ORDER BY ADDTIME DESC
         <choose>
             <when test="page !=null and page.orderBy != null and page.orderBy != ''">
@@ -651,7 +651,7 @@
                 and ccr.addTime <![CDATA[  <  ]]> #{endAddTime}
             </if>
         </where>
-        group by p.productID
+--         group by p.productID
         ORDER BY ccr.`addTime` DESC
     </select>
 
@@ -698,7 +698,7 @@
             </if>
             and ccr.remarks IS NOT NULL
         </where>
-        group by p.productID
+--         group by p.productID
         ORDER BY ADDTIME DESC
     </select>
 

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

@@ -107,7 +107,7 @@
             </if>
             and ccr.remarks IS NOT NULL
         </where>
-        group by p.productID
+--         group by p.productID
         ORDER BY ADDTIME DESC
     </select>
     <select id="findClassName" resultType="java.lang.String">

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

@@ -35,7 +35,7 @@
 </head>
 <body>
 <ul class="nav nav-tabs">
-    <li><a href="${ctx}/cmpage/cmPageCentre/?pageId=${cmPageCentre.pageId}&type=${cmPageCentre.type}">${cmPageCentre.type eq 6?'活动专题商品楼层':'云上美博会商品楼层'}</a></li>
+    <li><a href="${ctx}/cmpage/cmPageCentre/?pageId=${cmPageCentre.pageId}&type=${cmPageCentre.type}">${cmPageCentre.type eq 6?'活动专题商品楼层':cmPageCentre.type eq 7?'云上美博会商品楼层':'快捷运营商品楼层'}</a></li>
     <li class="active"><a href="${ctx}/cmpage/cmPageCentre/form?pageId=${cmPageCentre.pageId}&type=${cmPageCentre.type}">${not empty cmPageCentre.id?'编辑':'添加'}</a></li>
 </ul><br/>
 <form:form id="inputForm" modelAttribute="cmPageCentre" action="${ctx}/cmpage/cmPageCentre/save" method="post" class="form-horizontal">
@@ -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>

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

@@ -110,7 +110,7 @@
 <body>
 <ul class="nav nav-tabs">
     <li><a href="${ctx}/cmpage/cmPage/?flag=2">网页列表</a></li>
-    <li class="active"><a href="${ctx}/cmpage/cmPageCentre/?pageId=${cmPageCentre.pageId}&type=${cmPageCentre.type}">${cmPageCentre.type eq 6?'活动专题商品楼层':'云上美博会商品楼层'}</a>
+    <li class="active"><a href="${ctx}/cmpage/cmPageCentre/?pageId=${cmPageCentre.pageId}&type=${cmPageCentre.type}">${cmPageCentre.type eq 6?'活动专题商品楼层':cmPageCentre.type eq 7?'云上美博会商品楼层':'快捷运营商品楼层'}</a>
     </li>
 </ul>
 <div>
@@ -193,4 +193,4 @@
 </table>
 <div class="pagination">${page}</div>
 </body>
-</html>
+</html>

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

@@ -59,11 +59,14 @@
                 }else if('7' == v){
                     //活动专题
                     location.href="${ctx}/cmpage/cmPage/form?&flag=27";
+                }else if('9' == v){
+                    //活动专题
+                    location.href="${ctx}/cmpage/cmPage/form?&flag=29";
                 }
                 return true;// close
             };
             // 自定义按钮
-            $.jBox.confirm("请选择需要新增的页面！！！", "新增网页", submit, { buttons: { '项目详情页面': 1, '二级列表页面': 2,'自由页面':4,'分类详情':5,'活动专题':6,'云上美博会':7} });
+            $.jBox.confirm("请选择需要新增的页面！！！", "新增网页", submit, { buttons: { '项目详情页面': 1, '二级列表页面': 2,'自由页面':4,'分类详情':5,'活动专题':6,'云上美博会':7,'快捷运营页面':9} });
         }
         //更新单个索引
         function updateIndex(id){
@@ -122,6 +125,7 @@
                     <label>【分类详情】适用于：产品和仪器两个大分类的详情页</label></br>
                     <label>【活动专题】适用于：展会/商城详情页</label></br>
                     <label>【云上美博会】适用于：专门的美博会内容页面</label>
+<%--                    <label>【快捷运营】适用于：专门的美博会内容页面</label>--%>
                     &nbsp&nbsp&nbsp&nbsp&nbsp<input type="button" class="btn btn-primary" value="新增页面" onclick="openwin()" />
                 </table>
                 <br>
@@ -146,6 +150,7 @@
             <form:option value="5" label="分类详情"/>
             <form:option value="6" label="活动专题"/>
             <form:option value="7" label="云上美博会"/>
+            <form:option value="9" label="快捷运营"/>
         </form:select>
         <label>标题：</label>
         <form:input path="title" htmlEscape="false" maxlength="50" class="input-medium"/>
@@ -217,7 +222,10 @@
                 <c:if test="${cmPage.type eq 7}">
                     <a href="${fns:getConfig('wwwServer')}product/beauty-${cmPage.id}.html" target="_blank">${fns:getConfig('wwwServer')}product/beauty-${cmPage.id}.html</a>
                 </c:if>
-                <c:if test="${cmPage.type ne 1 && cmPage.type ne 2 && cmPage.type ne 3 && cmPage.type ne 4 && cmPage.type ne 5 && cmPage.type ne 6 && cmPage.type ne 7}">
+                <c:if test="${cmPage.type eq 9}">
+                    <a href="${fns:getConfig('wwwServer')}quickOperation/operation-${cmPage.id}.html" target="_blank">${fns:getConfig('wwwServer')}quickOperation/operation-${cmPage.id}.html</a>
+                </c:if>
+                <c:if test="${cmPage.type ne 1 && cmPage.type ne 2 && cmPage.type ne 3 && cmPage.type ne 4 && cmPage.type ne 5 && cmPage.type ne 6 && cmPage.type ne 7&& cmPage.type ne 9 }">
                     <a href="${fns:getConfig('wwwServer')}cmpage/info-${cmPage.type}-${cmPage.id}.html" target="_blank">${fns:getConfig('wwwServer')}cmpage/info-${cmPage.type}-${cmPage.id}.html</a>
                 </c:if>
             </td>

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

@@ -0,0 +1,109 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/WEB-INF/views/include/taglib.jsp"%>
+<html>
+<head>
+    <title>新增快捷运营页面</title>
+    <meta name="decorator" content="default"/>
+    <script type="text/javascript">
+        $(document).ready(function() {
+            //$("#name").focus();
+            $("#inputForm").validate({
+                ignore:"",
+                submitHandler: function(form){
+                    loading('正在提交，请稍等...');
+                    form.submit();
+                },
+                errorContainer: "#messageBox",
+                errorPlacement: function(error, element) {
+                    $("#messageBox").text("输入有误，请先更正。");
+                    if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
+                        error.appendTo(element.parent().parent());
+                    } else {
+                        error.insertAfter(element);
+                    }
+                }
+            });
+            //获取选中项的value
+            var showBackgroundColor =  $('#showBackgroundColor');
+            var showBackgroundImg =  $('#showBackgroundImg');
+            var selectBgType = $('#selectBgType  option:selected').val();
+            //回旋赋值显示背景填充
+            showSelectText(selectBgType,showBackgroundColor,showBackgroundImg);
+            //选择背景填充类型
+            $("#selectBgType").on('change',function(){
+                showSelectText($(this).val(),showBackgroundColor,showBackgroundImg);
+            })
+            //颜色选择器
+            var color = $("#onchangeColor");
+            var colorInfo = $("#getColorValue");
+            $(color).on('change',function(){
+                colorInfo.val(color.val());
+            })
+        });
+        //判断显示背景颜色或背景图设置窗口fn
+        function showSelectText(val,colorDiv,imgDiv){
+            switch (val) {
+                case '' :
+                    colorDiv.hide(100);
+                    imgDiv.hide(100);
+                    break;
+                case '1' :
+                    colorDiv.show(100);
+                    imgDiv.hide(100);
+                    break;
+                case '2' :
+                    colorDiv.hide(100);
+                    imgDiv.show(100);
+                    break;
+            }
+        }
+    </script>
+</head>
+<body>
+<ul class="nav nav-tabs">
+    <li class="active"><a href="${ctx}/cmpage/cmPage/form?flag=28&id=${cmPage.id}">${empty cmPage.id?'新增':'编辑'}快捷运营<shiro:lacksPermission name="cmpage:cmPage:edit">查看</shiro:lacksPermission></a></li>
+</ul><br/>
+<form:form id="inputForm" modelAttribute="cmPage" action="${ctx}/cmpage/cmPage/save?flag=2&type=9" method="post" class="form-horizontal">
+    <form:hidden path="id"/>
+    <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">
+            <form:input path="title" htmlEscape="false" maxlength="50" class="input-xlarge required"/>
+        </div>
+    </div>
+    <div class="control-group">
+        <label class="control-label"><span class="help-inline"><font color="red">*</font> </span>PC端banner：</label>
+        <div class="controls">
+            <form:hidden id="headImage" path="headImage" htmlEscape="false" maxlength="255" class="input-xlarge required"/>
+            <sys:ckfinder input="headImage" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
+        </div>
+        <div class="controls" style="padding-top: 20px;">
+        <label style="color:#D0D0D0 ;">建议图片尺寸1920*480px</label>
+        </div>
+    </div>
+    <div class="control-group">
+        <label class="control-label"><span class="help-inline"></span>移动端banner：</label>
+        <div class="controls">
+            <form:hidden id="crmHeadImage" path="crmHeadImage" htmlEscape="false" maxlength="255" class="input-xlarge"/>
+            <sys:ckfinder input="crmHeadImage" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
+        </div>
+        <div class="controls" style="padding-top: 20px;">
+            <label style="color:#D0D0D0 ;">建议图片尺寸1000px*450px</label>
+        </div>
+    </div>
+    <div class="control-group">
+        <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" />
+            </form:select>
+        </div>
+    </div>
+    <div class="form-actions">
+        <shiro:hasPermission name="cmpage:cmPage:edit"><input id="btnSubmit" class="btn btn-primary" type="submit" value="保 存"/>&nbsp;</shiro:hasPermission>
+        <input id="btnCancel" class="btn" type="button" value="返 回" onclick="history.go(-1)"/>
+    </div>
+</form:form>
+</body>
+</html>

src/main/webapp/WEB-INF/views/modules/hehe/cmHeheCentreForm.jsp

@@ -65,7 +65,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>
@@ -75,4 +75,4 @@
     </div>
 </form:form>
 </body>
-</html>
+</html>

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

@@ -285,7 +285,7 @@
                         $(".Image4 .cancel-upload").click();
                         $(".Image5 .cancel-upload").click();
                     }
-                    $("#formType").val(7);
+                    $("#formType").val(${floorContent.type});
                     loading('正在提交，请稍等...');
                     form.submit();
                 },
@@ -311,7 +311,7 @@
     </c:if>
     <c:if test="${empty floorContent.floorId}">
         <li><a href="${ctx}/cmpage/cmPage/?flag=2">网页列表</a></li>
-        <li><a href="${ctx}/cmpage/cmPageCentre/?pageId=${floorContent.pageId}&type=7">云上美博会商品楼层</a></li>
+        <li><a href="${ctx}/cmpage/cmPageCentre/?pageId=${floorContent.pageId}&type=${floorContent.type}">${floorContent.type eq 7?'云上美博会商品楼层':'快捷运营商品楼层'}</a></li>
         <li class="active"><a
                 href="${ctx}/cmpage/cmPageCentre/goContentPage?pageId=${floorContent.pageId}&centreId=${floorContent.centreId}&type=${floorContent.type}">内容</a>
         </li>
@@ -567,7 +567,7 @@
                             <input class="btn btn-primary" id="showSelectBtn" style="width: 50px"
                                    onclick="showSelect('${ctx}/newhome/newPageFloor/addActivityImage')" value="添加"/>&nbsp;&nbsp;&nbsp;&nbsp;
                             <a class="btn btn-primary"
-                               href="${fns:getConfig('wwwServer')}cmpage/info-7-${floorContent.pageId}.html"
+                               href="${fns:getConfig('wwwServer')}cmpage/info-${floorContent.type}-${floorContent.pageId}.html"
                                target="_blank">一键预览</a>
                             <br><br>
                             <table id="adsImageTable" class="table table-striped table-bordered table-condensed"

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

@@ -163,18 +163,28 @@
 </head>
 <body>
 	<ul class="nav nav-tabs">
-		<li><a href="${ctx}/newhome/newPageFirstNavigation/">主菜单列表</a></li>
+		<li class=${newPageFirstNavigation.type==0?"active":""}><a href="${ctx}/newhome/newPageFirstNavigation?type=${newPageFirstNavigation.type}">主菜单列表</a></li>
+		<li class=${newPageFirstNavigation.type==2?"active":""}><a href="${ctx}/newhome/newPageFirstNavigation?type=${newPageFirstNavigation.type}">快捷运营菜单</a></li>
 		<li class="active"><a href="${ctx}/newhome/newPageFirstNavigation/form?id=${newPageFirstNavigation.id}">${not empty newPageFirstNavigation.id?'编辑':'添加'}</a></li>
 	</ul><br/>
 	<form:form id="inputForm" modelAttribute="newPageFirstNavigation" action="${ctx}/newhome/newPageFirstNavigation/save" method="post" class="form-horizontal">
 		<form:hidden path="id"/>
-		<sys:message content="${message}"/>		
+		<form:hidden path="type"/>
+		<sys:message content="${message}"/>
 		<div class="control-group">
-			<label class="control-label"><font color="red">*</font>主菜单名称：</label>
+			<label class="control-label"><font color="red">*</font><c:if test="${newPageFirstNavigation.type==0}">主</c:if>菜单名称：</label>
 			<div class="controls">
-				<form:input path="navigationName" htmlEscape="false" cssStyle="position: relative" maxlength="6" class="required input-xlarge "/>
+				<form:input path="navigationName" htmlEscape="false" cssStyle="position: relative" maxlength="5" class="required input-xlarge "/>
 			</div>
 		</div>
+		<c:if test="${newPageFirstNavigation.type!=0}">
+		<div class="control-group">
+			<label class="control-label"><c:if test="${newPageFirstNavigation.type==0}">主</c:if>菜单备注：</label>
+			<div class="controls">
+				<form:input path="remark" htmlEscape="false" cssStyle="position: relative" maxlength="8" class=" input-xlarge "/>
+			</div>
+		</div>
+		</c:if>
 		<div class="control-group iconBox">
 			<label class="control-label"><span class="help-inline"><font color="red">*</font> </span>图标：</label>
 			<div class="controls upload-content" id="iconBox">
@@ -201,7 +211,7 @@
 			<label class="control-label"><font color="red">*</font>网站状态：</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>
@@ -209,7 +219,7 @@
 			<label class="control-label"><font color="red">*</font>小程序状态：</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"/><%--label="${fns:getDictList('enabled_status')[0]}"--%>
 				</form:select>
 			</div>
 		</div>
@@ -219,4 +229,4 @@
 		</div>
 	</form:form>
 </body>
-</html>
+</html>

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

@@ -33,7 +33,7 @@
 						} else {
 							$.jBox.tip(data.msg,'error');
 						}
-						$("#searchForm").submit();
+						g();
 					},"JSON");//这里返回的类型有：json,html,xml,text
 				}
 				return;
@@ -54,7 +54,7 @@
 						} else {
 							$.jBox.tip(data.msg,'error');
 						}
-						$("#searchForm").submit();
+						g();
 					},"JSON");//这里返回的类型有：json,html,xml,text
 				}
 				return;
@@ -77,7 +77,7 @@
 				items.push($(this).val());
 			});
 			//保存批量排序
-			$.post("${ctx}/newhome/newPageFirstNavigation/batchSaveSort?sortList="+items, function(data) {
+			$.post("${ctx}/newhome/newPageFirstNavigation/batchSaveSort?type=${newPageFirstNavigation.type}&sortList="+items, function(data) {
 				if(true==data.success){
 					$.jBox.tip(data.msg, 'info');
 					setInterval(g,1000);
@@ -99,7 +99,7 @@
 
 		function g() {
 			//刷新页面
-			window.location.href="${ctx}/newhome/newPageFirstNavigation/";
+			window.location.href="${ctx}/newhome/newPageFirstNavigation?type=${newPageFirstNavigation.type}";
 		}
 
 		//修改排序值
@@ -112,13 +112,14 @@
 </head>
 <body>
 <ul class="nav nav-tabs">
-	<li class="active"><a href="${ctx}/newhome/newPageFirstNavigation/">主菜单列表</a></li>
+	<li class=${newPageFirstNavigation.type==0?"active":""}><a href="${ctx}/newhome/newPageFirstNavigation?type=0">主菜单列表</a></li>
+	<li class=${newPageFirstNavigation.type==2?"active":""}><a href="${ctx}/newhome/newPageFirstNavigation?type=2">快捷运营菜单</a></li>
 </ul>
-<form:form id="searchForm" modelAttribute="newPageFirstNavigation" action="${ctx}/newhome/newPageFirstNavigation/" method="post" class="breadcrumb form-search">
+<form:form id="searchForm" modelAttribute="newPageFirstNavigation" action="${ctx}/newhome/newPageFirstNavigation?type${newPageFirstNavigation.type}" method="get" class="breadcrumb form-search">
 	<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 	<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 	<input class="btn btn-primary" style="width:80px" onclick="batchSaveSort()" value="一键排序"/>&nbsp;&nbsp;&nbsp;&nbsp;
-	<input class="btn btn-primary" style="width:80px" onclick="window.location='${ctx}/newhome/newPageFirstNavigation/form'" value="添加主菜单"/>
+	<input class="btn btn-primary" style="width:${newPageFirstNavigation.type==0?80:120}px" onclick="window.location='${ctx}/newhome/newPageFirstNavigation/form?type=${newPageFirstNavigation.type}'" value="添加${newPageFirstNavigation.type==0?"主":"快捷运营"}菜单"/>
 	<input class="btn btn-primary" style="width:100px" onclick="updateStaticHome()" value="生成静态首页"/>
 	<div style="margin-top: 10px">
 		<label><font color="#a9a9a9">注：排序值越小越靠前</font></label>
@@ -129,7 +130,7 @@
 	<thead>
 	<tr>
 		<th>ID</th>
-		<th>主菜单名称</th>
+		<th><c:if test="${newPageFirstNavigation.type==0}">主</c:if>菜单名称</th>
 		<th>图标</th>
 		<th>跳转链接</th>
 		<th>网站状态</th>
@@ -194,12 +195,12 @@
 				<fmt:formatDate value="${newPageFirstNavigation.createDate}" pattern="yyyy-MM-dd HH:mm:ss"/>
 			</td>
 			<shiro:hasPermission name="newhome:newPageFirstNavigation:edit"><td>
-				<a href="${ctx}/newhome/newPageFirstNavigation/form?id=${newPageFirstNavigation.id}">编辑</a>
+				<a href="${ctx}/newhome/newPageFirstNavigation/form?id=${newPageFirstNavigation.id}&type=${newPageFirstNavigation.type}">编辑</a>
 				<%--<c:if test="${newPageFirstNavigation.type eq 0}">
 					<a href="${ctx}/newhome/newPageSecondaryNavigation/?firstNavigationId=${newPageFirstNavigation.id}">二级分类设置</a>
 				</c:if>--%>
 				<shiro:hasPermission name="newhome:newPageFirstNavigation:delete">
-					<a href="${ctx}/newhome/newPageFirstNavigation/delete?id=${newPageFirstNavigation.id}" onclick="return confirmx('确定删除该菜单吗？', this.href)">删除</a>
+					<a href="${ctx}/newhome/newPageFirstNavigation/delete?id=${newPageFirstNavigation.id}&type=${newPageFirstNavigation.type}" onclick="return confirmx('确定删除该菜单吗？', this.href)">删除</a>
 				</shiro:hasPermission>
 			</td></shiro:hasPermission>
 		</tr>

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

@@ -66,7 +66,7 @@
 			<label class="control-label"><span class="help-inline"><font color="red">*</font> </span>网站状态：</label>
 			<div class="controls">
 				<form:select path="wwwEnabledStatus" 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>
@@ -74,7 +74,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>

src/main/webapp/WEB-INF/views/modules/order/cmPayFormList.jsp

@@ -38,10 +38,11 @@
 </head>
 <body>
 	<ul class="nav nav-tabs">
-<%--		<li class="active"><a href="${ctx}/order/cmPayShop/">付款列表</a></li>--%>
-<%--		<shiro:hasPermission name="order:cmPayShop:view">--%>
-<%--            <li onclick="sessionStorage.removeItem('checkedIndexArr')"><a href="${ctx}/shopOrder/payOrderList?operatingMode=1">申请付款</a></li>--%>
-<%--			<li onclick="sessionStorage.removeItem('checkedIndexArr')"><a href="${ctx}/shopOrder/payOrderList?operatingMode=3">已付款子订单</a></li>--%>
+		<li class="active"><a href="${ctx}/order/cmPayShop/">付款列表</a></li>
+		<shiro:hasPermission name="order:cmPayShop:view">
+            <li onclick="sessionStorage.removeItem('checkedIndexArr')"><a href="${ctx}/shopOrder/payOrderList?operatingMode=1">申请付款</a></li>
+			<li onclick="sessionStorage.removeItem('checkedIndexArr')"><a href="${ctx}/shopOrder/payOrderList?operatingMode=3">已付款子订单</a></li>
+		</shiro:hasPermission>
 		<shiro:hasPermission name="order:cmPayShop:split">
 			<li><a href="${ctx}/shopOrder/splitList">子订单手动分账</a></li>
 		</shiro:hasPermission>

src/main/webapp/WEB-INF/views/modules/order/cmSettlementList.jsp

@@ -292,9 +292,9 @@
 </head>
 <body>
 <ul class="nav nav-tabs">
-<%--    <li><a href="${ctx}/order/cmPayShop">付款列表</a></li>--%>
-<%--    <li><a href="${ctx}/shopOrder/payOrderList?operatingMode=1">申请付款</a></li>--%>
-<%--    <li><a href="${ctx}/shopOrder/payOrderList?operatingMode=3">已付款子订单</a></li>--%>
+    <li><a href="${ctx}/order/cmPayShop">付款列表</a></li>
+    <li><a href="${ctx}/shopOrder/payOrderList?operatingMode=1">申请付款</a></li>
+    <li><a href="${ctx}/shopOrder/payOrderList?operatingMode=3">已付款子订单</a></li>
     <shiro:hasPermission name="order:cmPayShop:split">
         <li><a href="${ctx}/shopOrder/splitList">子订单手动分账</a></li>
     </shiro:hasPermission>

src/main/webapp/WEB-INF/views/modules/order/cmSplitAccountList.jsp

@@ -292,9 +292,9 @@
 </head>
 <body>
 <ul class="nav nav-tabs">
-<%--     <li><a href="${ctx}/order/cmPayShop">付款列表</a></li>--%>
-<%--     <li><a href="${ctx}/shopOrder/payOrderList?operatingMode=1">申请付款</a></li>--%>
-<%--     <li><a href="${ctx}/shopOrder/payOrderList?operatingMode=3">已付款子订单</a></li>--%>
+     <li><a href="${ctx}/order/cmPayShop">付款列表</a></li>
+     <li><a href="${ctx}/shopOrder/payOrderList?operatingMode=1">申请付款</a></li>
+     <li><a href="${ctx}/shopOrder/payOrderList?operatingMode=3">已付款子订单</a></li>
      <shiro:hasPermission name="order:cmPayShop:split">
          <li class="active tab-li"><a href="${ctx}/shopOrder/splitList">子订单手动分账</a></li>
      </shiro:hasPermission>

src/main/webapp/WEB-INF/views/modules/order/newOrderList.jsp

@@ -229,7 +229,7 @@
         <li>机构</li>
         <li>收货人</li>
         <li>订单来源</li>
-        <li>订单状态</li>
+<%--        <li>订单状态</li>--%>
         <li>收款状态</li>
         <li>付款状态</li>
         <li>发货状态</li>
@@ -238,7 +238,7 @@
         <li>订单金额</li>
         <li>返佣服务费</li>
         <li>下单时间</li>
-        <li>确认时间</li>
+<%--        <li>确认时间</li>--%>
         <li>操作</li>
     </ul>
     <c:forEach items="${page.list}" var="order">
@@ -296,13 +296,13 @@
             </li>
             <li>${order.receiver}</li>
             <li>${fns:getDictLabel(order.orderSource,"bp_orderSource","" )}</li>
-            <li class="sd-li">
-                <c:if test="${order.status eq 11 || order.status eq 12 || order.status eq 13 ||order.status eq 21 ||order.status eq 22 ||
-				order.status eq 23 || order.status eq 31 ||order.status eq 32 ||order.status eq 33}">
-                    交易中<br>(${fns:getDictLabel(order.status,"order_detail_status","" )})
-                </c:if>
-                <c:if test="${order.status eq 0 || order.status eq 4 || order.status eq 5 || order.status eq 6 || order.status eq 7}">${fns:getDictLabel(order.status,"order_detail_status","" )}</c:if>
-            </li>
+<%--            <li class="sd-li">--%>
+<%--                <c:if test="${order.status eq 11 || order.status eq 12 || order.status eq 13 ||order.status eq 21 ||order.status eq 22 ||--%>
+<%--				order.status eq 23 || order.status eq 31 ||order.status eq 32 ||order.status eq 33}">--%>
+<%--                    交易中<br>(${fns:getDictLabel(order.status,"order_detail_status","" )})--%>
+<%--                </c:if>--%>
+<%--                <c:if test="${order.status eq 0 || order.status eq 4 || order.status eq 5 || order.status eq 6 || order.status eq 7}">${fns:getDictLabel(order.status,"order_detail_status","" )}</c:if>--%>
+<%--            </li>--%>
             <li>
                 <c:if test="${order.receiptStatus == 1}">
                     <font color="red">待收款</font>
@@ -407,14 +407,14 @@
                 </c:if>
             </li>
             <li>${order.orderTime}</li>
-            <li>
-                <c:if test="${empty order.confirmTime}">
-                    ---
-                </c:if>
-                <c:if test="${not empty order.confirmTime}">
-                    ${order.confirmTime}
-                </c:if>
-            </li>
+<%--            <li>--%>
+<%--                <c:if test="${empty order.confirmTime}">--%>
+<%--                    -----%>
+<%--                </c:if>--%>
+<%--                <c:if test="${not empty order.confirmTime}">--%>
+<%--                    ${order.confirmTime}--%>
+<%--                </c:if>--%>
+<%--            </li>--%>
             <li class="operation-wrap">
                 <a href="${ctx}/order/detail?id=${order.orderID}&returnGoodsStutas=${order.returnGoodsStutas}">查看详情</a>
             </li>