大类/小类/banner/快速链接

src/main/java/com/izouma/awesomeadmin/dao/ServiceTypeDetailMapper.xml

@@ -11,6 +11,7 @@
                                 <result column="parent_id" property="parentId" jdbcType="INTEGER" />
                                 <result column="type_name" property="typeName" jdbcType="VARCHAR" />
                                 <result column="description" property="description" jdbcType="VARCHAR" />
+                                <result column="rank" property="rank" jdbcType="INTEGER" />
             </resultMap>
     <sql id="Base_Column_List" >
         <trim  suffixOverrides="," >
@@ -32,6 +33,8 @@
 
             description,
 
+            rank,
+
             </trim>
     </sql>
     <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
@@ -73,6 +76,9 @@
             </if>
                 <if test="description!= null" >
                 description,
+            </if>
+                <if test="rank!= null" >
+                rank,
             </if>
             </trim>
         <trim prefix="values (" suffix=")" suffixOverrides="," >
@@ -102,6 +108,9 @@
             </if>
                     <if test="description != null" >
                 #{description,jdbcType=VARCHAR},
+            </if>
+                    <if test="rank != null" >
+                #{rank,jdbcType=INTEGER},
             </if>
                 </trim>
     </insert>
@@ -134,6 +143,9 @@
             </if>
                      <if test="description != null" >
                description= #{description,jdbcType=VARCHAR},
+            </if>
+                     <if test="rank != null" >
+               rank= #{rank,jdbcType=INTEGER},
             </if>
                  </set>
         where id = #{id,jdbcType=INTEGER}
@@ -168,12 +180,16 @@
             </if>
                      <if test="record.description != null and !&quot;&quot;.equals(record.description)">
                 and  description = #{record.description}
+            </if>
+                     <if test="record.rank != null and !&quot;&quot;.equals(record.rank)">
+                and  rank = #{record.rank}
             </if>
                   <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
              <trim prefix="and (" suffix=")" prefixOverrides="OR" >
                                                                                                                                                                                                                                                                                                                                                                                                                                     OR  parent_id LIKE concat('%',#{record.searchKey},'%')
                                                                                                     OR  type_name LIKE concat('%',#{record.searchKey},'%')
                                                                                                     OR  description LIKE concat('%',#{record.searchKey},'%')
+                                                                                                    OR  rank LIKE concat('%',#{record.searchKey},'%')
                                                              </trim>
          </if>
 
@@ -259,12 +275,16 @@
             </if>
                     <if test="description != null and !&quot;&quot;.equals(description)">
                 and  description = #{description}
+            </if>
+                    <if test="rank != null and !&quot;&quot;.equals(rank)">
+                and  rank = #{rank}
             </if>
                     <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
                 <trim prefix="and (" suffix=")" prefixOverrides="OR" >
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 OR  parent_id LIKE concat('%',#{searchKey},'%')
                                                                                                                                                         OR  type_name LIKE concat('%',#{searchKey},'%')
                                                                                                                                                         OR  description LIKE concat('%',#{searchKey},'%')
+                                                                                                                                                        OR  rank LIKE concat('%',#{searchKey},'%')
                                                                                         </trim>
             </if>
 <if test="advancedQuery != null and !&quot;&quot;.equals(advancedQuery)">
@@ -349,6 +369,9 @@
             </if>
                      <if test="description != null and !&quot;&quot;.equals(description)">
                 and description = #{description}
+            </if>
+                     <if test="rank != null and !&quot;&quot;.equals(rank)">
+                and rank = #{rank}
             </if>
          
         </where>
@@ -364,7 +387,7 @@
         select <include refid="Base_Column_List"/> from service_type_detail
         <where>
             and del_flag = 'N'
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            </where>
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            </where>
         order by id desc
     </select>
 </mapper>

src/main/java/com/izouma/awesomeadmin/dao/UserOrderMapper.java

@@ -0,0 +1,33 @@
+package com.izouma.awesomeadmin.dao;
+
+import java.util.*;
+import com.izouma.awesomeadmin.datasource.DataSource;
+import org.springframework.stereotype.Repository;
+import com.izouma.awesomeadmin.model.UserOrder;
+
+
+/**
+*  Dao接口
+*/
+@Repository("com.zoumaframe.dao.UserOrderMapper")
+public interface UserOrderMapper{
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insertSelective(UserOrder record);
+
+    UserOrder selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(UserOrder record);
+
+    List<UserOrder> queryAllUserOrder(UserOrder record);
+
+    List<UserOrder> queryUserOrderByPage(Map<String, Object> parameter);
+
+    int delete(String id);
+
+    UserOrder queryUserOrder(UserOrder record);
+
+    List<UserOrder> query(UserOrder record);
+}
+

src/main/java/com/izouma/awesomeadmin/model/ProductInfo.java

@@ -25,6 +25,9 @@ public class ProductInfo{
     private Integer hotFlag;
     private Integer homeFlag;
     private Integer rank;
+    private Integer storeId;
+    private Integer typeFlag;
+    private Integer salesVolume;
 
 private String searchKey;
 
@@ -157,6 +160,27 @@ private String orderByStr;
     public void setRank(Integer rank){
         this.rank = rank;
     }
+    public Integer getStoreId(){
+        return this.storeId;
+    }
+
+    public void setStoreId(Integer storeId){
+        this.storeId = storeId;
+    }
+    public Integer getTypeFlag(){
+        return this.typeFlag;
+    }
+
+    public void setTypeFlag(Integer typeFlag){
+        this.typeFlag = typeFlag;
+    }
+    public Integer getSalesVolume(){
+        return this.salesVolume;
+    }
+
+    public void setSalesVolume(Integer salesVolume){
+        this.salesVolume = salesVolume;
+    }
 
 public String getSearchKey() {
     return searchKey;

src/main/java/com/izouma/awesomeadmin/model/ServiceTypeDetail.java

@@ -17,6 +17,7 @@ public class ServiceTypeDetail{
     private Integer parentId;
     private String typeName;
     private String description;
+    private Integer rank;
 
 private String searchKey;
 
@@ -93,6 +94,13 @@ private String orderByStr;
     public void setDescription(String description){
         this.description = description;
     }
+    public Integer getRank(){
+        return this.rank;
+    }
+
+    public void setRank(Integer rank){
+        this.rank = rank;
+    }
 
 public String getSearchKey() {
     return searchKey;

src/main/java/com/izouma/awesomeadmin/model/StoreInfo.java

@@ -30,6 +30,8 @@ public class StoreInfo{
     private String credit;
     private String useFlag;
     private Integer rank;
+    private Integer responseTime;
+    private Integer reworkRate;
 
 private String searchKey;
 
@@ -197,6 +199,20 @@ private String orderByStr;
     public void setRank(Integer rank){
         this.rank = rank;
     }
+    public Integer getResponseTime(){
+        return this.responseTime;
+    }
+
+    public void setResponseTime(Integer responseTime){
+        this.responseTime = responseTime;
+    }
+    public Integer getReworkRate(){
+        return this.reworkRate;
+    }
+
+    public void setReworkRate(Integer reworkRate){
+        this.reworkRate = reworkRate;
+    }
 
 public String getSearchKey() {
     return searchKey;

src/main/java/com/izouma/awesomeadmin/model/UserOrder.java

@@ -0,0 +1,251 @@
+package com.izouma.awesomeadmin.model;
+
+import java.math.BigDecimal;
+import java.util.*;
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+
+@JsonAutoDetect
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class UserOrder{
+    private Integer id;
+    private String delFlag;
+    private Date updateTime;
+    private String updateUser;
+    private Date createTime;
+    private String createUser;
+    private Integer userId;
+    private String orderCode;
+    private Integer storeId;
+    private String productType;
+    private Integer productId;
+    private String productName;
+    private String specification;
+    private BigDecimal unitPrice;
+    private Integer quantity;
+    private Integer userCouponId;
+    private BigDecimal offPrice;
+    private BigDecimal totlePrice;
+    private BigDecimal dealPrice;
+    private Integer payMode;
+    private Date payTime;
+    private String remark;
+    private String showFlag;
+    private Integer statusFlag;
+    private BigDecimal fee;
+
+private String searchKey;
+
+/**
+* and,test_name,like,value;or,remark,=,123
+*/
+private String advancedQuery;
+
+/**
+* column_name_,desc_;column_name_,asc
+*/
+private String orderByStr;
+
+    public Integer getId(){
+        return this.id;
+    }
+
+    public void setId(Integer id){
+        this.id = id;
+    }
+    public String getDelFlag(){
+        return this.delFlag;
+    }
+
+    public void setDelFlag(String delFlag){
+        this.delFlag = delFlag;
+    }
+    public Date getUpdateTime(){
+        return this.updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime){
+        this.updateTime = updateTime;
+    }
+    public String getUpdateUser(){
+        return this.updateUser;
+    }
+
+    public void setUpdateUser(String updateUser){
+        this.updateUser = updateUser;
+    }
+    public Date getCreateTime(){
+        return this.createTime;
+    }
+
+    public void setCreateTime(Date createTime){
+        this.createTime = createTime;
+    }
+    public String getCreateUser(){
+        return this.createUser;
+    }
+
+    public void setCreateUser(String createUser){
+        this.createUser = createUser;
+    }
+    public Integer getUserId(){
+        return this.userId;
+    }
+
+    public void setUserId(Integer userId){
+        this.userId = userId;
+    }
+    public String getOrderCode(){
+        return this.orderCode;
+    }
+
+    public void setOrderCode(String orderCode){
+        this.orderCode = orderCode;
+    }
+    public Integer getStoreId(){
+        return this.storeId;
+    }
+
+    public void setStoreId(Integer storeId){
+        this.storeId = storeId;
+    }
+    public String getProductType(){
+        return this.productType;
+    }
+
+    public void setProductType(String productType){
+        this.productType = productType;
+    }
+    public Integer getProductId(){
+        return this.productId;
+    }
+
+    public void setProductId(Integer productId){
+        this.productId = productId;
+    }
+    public String getProductName(){
+        return this.productName;
+    }
+
+    public void setProductName(String productName){
+        this.productName = productName;
+    }
+    public String getSpecification(){
+        return this.specification;
+    }
+
+    public void setSpecification(String specification){
+        this.specification = specification;
+    }
+    public BigDecimal getUnitPrice(){
+        return this.unitPrice;
+    }
+
+    public void setUnitPrice(BigDecimal unitPrice){
+        this.unitPrice = unitPrice;
+    }
+    public Integer getQuantity(){
+        return this.quantity;
+    }
+
+    public void setQuantity(Integer quantity){
+        this.quantity = quantity;
+    }
+    public Integer getUserCouponId(){
+        return this.userCouponId;
+    }
+
+    public void setUserCouponId(Integer userCouponId){
+        this.userCouponId = userCouponId;
+    }
+    public BigDecimal getOffPrice(){
+        return this.offPrice;
+    }
+
+    public void setOffPrice(BigDecimal offPrice){
+        this.offPrice = offPrice;
+    }
+    public BigDecimal getTotlePrice(){
+        return this.totlePrice;
+    }
+
+    public void setTotlePrice(BigDecimal totlePrice){
+        this.totlePrice = totlePrice;
+    }
+    public BigDecimal getDealPrice(){
+        return this.dealPrice;
+    }
+
+    public void setDealPrice(BigDecimal dealPrice){
+        this.dealPrice = dealPrice;
+    }
+    public Integer getPayMode(){
+        return this.payMode;
+    }
+
+    public void setPayMode(Integer payMode){
+        this.payMode = payMode;
+    }
+    public Date getPayTime(){
+        return this.payTime;
+    }
+
+    public void setPayTime(Date payTime){
+        this.payTime = payTime;
+    }
+    public String getRemark(){
+        return this.remark;
+    }
+
+    public void setRemark(String remark){
+        this.remark = remark;
+    }
+    public String getShowFlag(){
+        return this.showFlag;
+    }
+
+    public void setShowFlag(String showFlag){
+        this.showFlag = showFlag;
+    }
+    public Integer getStatusFlag(){
+        return this.statusFlag;
+    }
+
+    public void setStatusFlag(Integer statusFlag){
+        this.statusFlag = statusFlag;
+    }
+    public BigDecimal getFee(){
+        return this.fee;
+    }
+
+    public void setFee(BigDecimal fee){
+        this.fee = fee;
+    }
+
+public String getSearchKey() {
+    return searchKey;
+}
+
+public void setSearchKey(String searchKey) {
+    this.searchKey = searchKey;
+}
+
+public String getAdvancedQuery() {
+    return advancedQuery;
+}
+
+public void setAdvancedQuery(String advancedQuery) {
+    this.advancedQuery = advancedQuery;
+}
+
+public String getOrderByStr() {
+    return orderByStr;
+}
+
+public void setOrderByStr(String orderByStr) {
+    this.orderByStr = orderByStr;
+}
+
+}
+

src/main/java/com/izouma/awesomeadmin/service/UserOrderService.java

@@ -0,0 +1,27 @@
+package com.izouma.awesomeadmin.service;
+
+import java.util.*;
+import com.izouma.awesomeadmin.dto.Page;
+import com.izouma.awesomeadmin.model.UserOrder;
+
+
+/**
+*  service接口类
+*/
+public interface UserOrderService{
+
+    List<UserOrder> getUserOrderList(UserOrder record);
+
+    List<UserOrder> getUserOrderByPage(Page page, UserOrder record);
+
+    UserOrder getUserOrderById(String id);
+
+    UserOrder getUserOrder(UserOrder record);
+
+    boolean createUserOrder(UserOrder record);
+
+    boolean deleteUserOrder(String id);
+
+    boolean updateUserOrder(UserOrder record);
+}
+

src/main/java/com/izouma/awesomeadmin/service/impl/UserOrderServiceImpl.java

@@ -0,0 +1,137 @@
+package com.izouma.awesomeadmin.service.impl;
+
+import java.util.*;
+import org.apache.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.izouma.awesomeadmin.constant.AppConstant;
+import com.izouma.awesomeadmin.dto.Page;
+import com.izouma.awesomeadmin.model.UserOrder;
+import com.izouma.awesomeadmin.service.UserOrderService;
+import com.izouma.awesomeadmin.dao.UserOrderMapper;
+
+/**
+*  service接口实现类
+*/
+@Service
+public class UserOrderServiceImpl implements UserOrderService{
+
+    private static Logger logger = Logger.getLogger(UserOrderServiceImpl.class);
+
+    @Autowired
+    private UserOrderMapper userOrderMapper;
+
+    @Override
+    public List<UserOrder> getUserOrderList(UserOrder record) {
+
+        logger.info("getUserOrderList");
+        try {
+
+        return userOrderMapper.queryAllUserOrder(record);
+        } catch (Exception e) {
+        logger.error("getUserOrderList", e);
+        }
+
+        return null;
+    }
+    @Override
+    public List<UserOrder> getUserOrderByPage(Page page, UserOrder record) {
+
+        logger.info("getUserOrderByPage");
+        try {
+
+        Map<String, Object> parameter = new HashMap<String, Object>();
+        parameter.put("record", record);
+        parameter.put(AppConstant.PAGE, page);
+
+        return userOrderMapper.queryUserOrderByPage(parameter);
+        } catch (Exception e) {
+        logger.error("getUserOrderByPage", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public UserOrder getUserOrderById(String id) {
+
+        logger.info("getUserOrderyId");
+        try {
+
+            return userOrderMapper.selectByPrimaryKey(Integer.valueOf(id));
+        } catch (Exception e) {
+        logger.error("getUserOrderById", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public UserOrder getUserOrder(UserOrder record) {
+
+        logger.info("getUserOrder");
+        try {
+
+            return userOrderMapper.queryUserOrder(record);
+        } catch (Exception e) {
+        logger.error("getUserOrder", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public boolean createUserOrder(UserOrder record) {
+
+        logger.info("createUserOrder");
+        try {
+
+            int updates = userOrderMapper.insertSelective(record);
+
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+            logger.error("createUserOrder", e);
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean deleteUserOrder(String id) {
+
+        logger.info("deleteUserOrder");
+        try {
+
+             int updates = userOrderMapper.delete(id);
+
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+             logger.error("deleteUserOrder", e);
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean updateUserOrder(UserOrder record) {
+
+        logger.info("updateUserOrder");
+        try {
+
+            int updates = userOrderMapper.updateByPrimaryKeySelective(record);
+
+            if (updates > 0) {
+                 return true;
+            }
+        } catch (Exception e) {
+             logger.error("updateUserOrder", e);
+        }
+
+        return false;
+    }
+}
+

src/main/java/com/izouma/awesomeadmin/web/ProductInfoController.java

@@ -132,10 +132,10 @@ public class ProductInfoController {
         String sheetName = "product_info";
         String titleName = "商品信息数据表";
         String fileName = "商品信息表";
-        int columnNumber = 17;
-        int[] columnWidth = { 20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20 };
-        String[] columnName = {  "" ,   "删除标识" ,   "更新时间" ,   "更新人" ,   "创建时间" ,   "创建人" ,   "大类" ,   "小类" ,   "标题" ,   "主图" ,   "服务详情" ,   "库存" ,   "上下架" ,   "可用" ,   "热门" ,   "首页" ,   "排序"  };
-        String[][] dataList = new String[productInfos.size()][17];
+        int columnNumber = 20;
+        int[] columnWidth = { 20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20 };
+        String[] columnName = {  "" ,   "删除标识" ,   "更新时间" ,   "更新人" ,   "创建时间" ,   "创建人" ,   "大类" ,   "小类" ,   "标题" ,   "主图" ,   "服务详情" ,   "库存" ,   "上下架" ,   "可用" ,   "热门" ,   "首页" ,   "排序" ,   "店铺" ,   "类型" ,   "销量"  };
+        String[][] dataList = new String[productInfos.size()][20];
 
         for (int i = 0; i < productInfos.size(); i++) {
 
@@ -156,6 +156,9 @@ public class ProductInfoController {
                         dataList[i][14] = String.valueOf(productInfos.get(i).getHotFlag());
                         dataList[i][15] = String.valueOf(productInfos.get(i).getHomeFlag());
                         dataList[i][16] = String.valueOf(productInfos.get(i).getRank());
+                        dataList[i][17] = String.valueOf(productInfos.get(i).getStoreId());
+                        dataList[i][18] = String.valueOf(productInfos.get(i).getTypeFlag());
+                        dataList[i][19] = String.valueOf(productInfos.get(i).getSalesVolume());
                     }
 
 

src/main/java/com/izouma/awesomeadmin/web/ServiceTypeDetailController.java

@@ -132,10 +132,10 @@ public class ServiceTypeDetailController {
         String sheetName = "service_type_detail";
         String titleName = "服务小类数据表";
         String fileName = "服务小类表";
-        int columnNumber = 9;
-        int[] columnWidth = { 20,  20,  20,  20,  20,  20,  20,  20,  20 };
-        String[] columnName = {  "" ,   "删除标识" ,   "更新时间" ,   "更新人" ,   "创建时间" ,   "创建人" ,   "父类" ,   "类名" ,   "描述"  };
-        String[][] dataList = new String[serviceTypeDetails.size()][9];
+        int columnNumber = 10;
+        int[] columnWidth = { 20,  20,  20,  20,  20,  20,  20,  20,  20,  20 };
+        String[] columnName = {  "" ,   "删除标识" ,   "更新时间" ,   "更新人" ,   "创建时间" ,   "创建人" ,   "父类" ,   "类名" ,   "描述" ,   "排序"  };
+        String[][] dataList = new String[serviceTypeDetails.size()][10];
 
         for (int i = 0; i < serviceTypeDetails.size(); i++) {
 
@@ -148,6 +148,7 @@ public class ServiceTypeDetailController {
                         dataList[i][6] = String.valueOf(serviceTypeDetails.get(i).getParentId());
                         dataList[i][7] = String.valueOf(serviceTypeDetails.get(i).getTypeName());
                         dataList[i][8] = String.valueOf(serviceTypeDetails.get(i).getDescription());
+                        dataList[i][9] = String.valueOf(serviceTypeDetails.get(i).getRank());
                     }
 
 

src/main/java/com/izouma/awesomeadmin/web/StoreInfoController.java

@@ -132,10 +132,10 @@ public class StoreInfoController {
         String sheetName = "store_info";
         String titleName = "店铺信息数据表";
         String fileName = "店铺信息表";
-        int columnNumber = 22;
-        int[] columnWidth = { 20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20 };
-        String[] columnName = {  "" ,   "删除标识" ,   "更新时间" ,   "更新人" ,   "创建时间" ,   "创建人" ,   "用户ID" ,   "用户" ,   "店铺名称" ,   "服务类型" ,   "描述" ,   "头像" ,   "省" ,   "市" ,   "区" ,   "详细地址" ,   "银行卡号" ,   "开户行" ,   "开户人" ,   "信誉等级" ,   "可用" ,   "排序"  };
-        String[][] dataList = new String[storeInfos.size()][22];
+        int columnNumber = 24;
+        int[] columnWidth = { 20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20 };
+        String[] columnName = {  "" ,   "删除标识" ,   "更新时间" ,   "更新人" ,   "创建时间" ,   "创建人" ,   "用户ID" ,   "用户" ,   "店铺名称" ,   "服务类型" ,   "描述" ,   "头像" ,   "省" ,   "市" ,   "区" ,   "详细地址" ,   "银行卡号" ,   "开户行" ,   "开户人" ,   "信誉等级" ,   "可用" ,   "排序" ,   "响应时间" ,   "返片率"  };
+        String[][] dataList = new String[storeInfos.size()][24];
 
         for (int i = 0; i < storeInfos.size(); i++) {
 
@@ -161,6 +161,8 @@ public class StoreInfoController {
                         dataList[i][19] = String.valueOf(storeInfos.get(i).getCredit());
                         dataList[i][20] = String.valueOf(storeInfos.get(i).getUseFlag());
                         dataList[i][21] = String.valueOf(storeInfos.get(i).getRank());
+                        dataList[i][22] = String.valueOf(storeInfos.get(i).getResponseTime());
+                        dataList[i][23] = String.valueOf(storeInfos.get(i).getReworkRate());
                     }
 
 

src/main/java/com/izouma/awesomeadmin/web/UserOrderController.java

@@ -0,0 +1,176 @@
+package com.izouma.awesomeadmin.web;
+
+import java.util.*;
+
+import com.izouma.awesomeadmin.util.ExportExcelUtil;
+import org.apache.commons.lang.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresAuthentication;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import com.izouma.awesomeadmin.constant.AppConstant;
+import com.izouma.awesomeadmin.dto.Page;
+import com.izouma.awesomeadmin.dto.Result;
+import com.izouma.awesomeadmin.model.UserOrder;
+import com.izouma.awesomeadmin.service.UserOrderService;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+*  controller类
+*/
+@Controller
+@RequestMapping("/userOrder")
+public class UserOrderController {
+
+    @Autowired
+    private UserOrderService userOrderService;
+
+    /**
+    * <p>获取全部记录。</p>
+    */
+    @RequiresAuthentication
+    @RequestMapping(value = "/all", method = RequestMethod.GET)
+    @ResponseBody
+    public Result all(UserOrder record) {
+        List<UserOrder> pp = userOrderService.getUserOrderList(record);
+        return new Result(true, pp);
+    }
+
+    /**
+    * <p>根据Id。</p>
+    */
+    @RequestMapping(value = "/getUserOrder", method = RequestMethod.GET)
+    @ResponseBody
+    public Result getUserOrder(@RequestParam(required = false, value = "id") String id) {
+        UserOrder data = userOrderService.getUserOrderById(id);
+        return new Result(true, data);
+    }
+
+    /**
+    * <p>根据条件获取。</p>
+    */
+    @RequestMapping(value = "/getOne", method = RequestMethod.GET)
+    @ResponseBody
+    public Result getOne(UserOrder record) {
+        UserOrder data = userOrderService.getUserOrder(record);
+        return new Result(true, data);
+    }
+
+
+    /**
+    * <p>分页查询。</p>
+    */
+    @RequestMapping(value = "/page", method = RequestMethod.GET)
+    @ResponseBody
+    public Result page(Page page, UserOrder record) {
+        Map<String, Object> result = new HashMap<>();
+
+        List<UserOrder> pp =userOrderService.getUserOrderByPage(page, record);
+
+        result.put(AppConstant.PAGE, page);
+        result.put("pp", pp);
+        return new Result(true, result);
+    }
+
+
+    /**
+    * <p>保存。</p>
+    */
+    @RequestMapping(value = "/save", method = RequestMethod.POST)
+    @ResponseBody
+    public Result save(UserOrder record) {
+        boolean num = userOrderService.createUserOrder(record);
+        if (num) {
+        return new Result(true, record.getId());
+        }
+        return new Result(false, "保存异常");
+    }
+
+    /**
+    * <p>更新信息。</p>
+    */
+    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    @ResponseBody
+    public Result updateUserOrder(UserOrder record) {
+        boolean num = userOrderService.updateUserOrder(record);
+        if (num) {
+        return new Result(true, "保存成功");
+        }
+        return new Result(false, "保存异常");
+    }
+
+    /**
+    * <p>删除。</p>
+    */
+    @RequestMapping(value = "/del", method = RequestMethod.POST)
+    @ResponseBody
+    public Result deleteUserOrder(@RequestParam(required = true, value = "id") String id) {
+
+        boolean num = userOrderService.deleteUserOrder(id);
+        if (num) {
+        return new Result(true, "删除成功");
+        }
+        return new Result(false, "删除异常");
+    }
+
+    /**
+    * 导出Excel
+    * @param request
+    * @param response
+    * @param record
+    * @throws Exception
+    */
+    @RequestMapping(value = "/exportExcel", method = RequestMethod.GET)
+    @ResponseBody
+    public void exportExcel(HttpServletRequest request, HttpServletResponse response, UserOrder record) throws Exception {
+
+    List<UserOrder> userOrders = userOrderService.getUserOrderList(record);
+
+
+        String sheetName = "user_order";
+        String titleName = "用户订单数据表";
+        String fileName = "用户订单表";
+        int columnNumber = 25;
+        int[] columnWidth = { 20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20 };
+        String[] columnName = {  "" ,   "删除标识" ,   "更新时间" ,   "更新人" ,   "创建时间" ,   "创建人" ,   "用户" ,   "订单编码" ,   "店铺" ,   "商品类型" ,   "商品ID" ,   "商品名称" ,   "规格" ,   "单价" ,   "数量" ,   "优惠券" ,   "优惠金额" ,   "总价" ,   "成交价" ,   "支付方式" ,   "支付时间" ,   "备注" ,   "显示标识" ,   "状态" ,   "手续费"  };
+        String[][] dataList = new String[userOrders.size()][25];
+
+        for (int i = 0; i < userOrders.size(); i++) {
+
+                        dataList[i][0] = String.valueOf(userOrders.get(i).getId());
+                        dataList[i][1] = String.valueOf(userOrders.get(i).getDelFlag());
+                        dataList[i][2] = String.valueOf(userOrders.get(i).getUpdateTime());
+                        dataList[i][3] = String.valueOf(userOrders.get(i).getUpdateUser());
+                        dataList[i][4] = String.valueOf(userOrders.get(i).getCreateTime());
+                        dataList[i][5] = String.valueOf(userOrders.get(i).getCreateUser());
+                        dataList[i][6] = String.valueOf(userOrders.get(i).getUserId());
+                        dataList[i][7] = String.valueOf(userOrders.get(i).getOrderCode());
+                        dataList[i][8] = String.valueOf(userOrders.get(i).getStoreId());
+                        dataList[i][9] = String.valueOf(userOrders.get(i).getProductType());
+                        dataList[i][10] = String.valueOf(userOrders.get(i).getProductId());
+                        dataList[i][11] = String.valueOf(userOrders.get(i).getProductName());
+                        dataList[i][12] = String.valueOf(userOrders.get(i).getSpecification());
+                        dataList[i][13] = String.valueOf(userOrders.get(i).getUnitPrice());
+                        dataList[i][14] = String.valueOf(userOrders.get(i).getQuantity());
+                        dataList[i][15] = String.valueOf(userOrders.get(i).getUserCouponId());
+                        dataList[i][16] = String.valueOf(userOrders.get(i).getOffPrice());
+                        dataList[i][17] = String.valueOf(userOrders.get(i).getTotlePrice());
+                        dataList[i][18] = String.valueOf(userOrders.get(i).getDealPrice());
+                        dataList[i][19] = String.valueOf(userOrders.get(i).getPayMode());
+                        dataList[i][20] = String.valueOf(userOrders.get(i).getPayTime());
+                        dataList[i][21] = String.valueOf(userOrders.get(i).getRemark());
+                        dataList[i][22] = String.valueOf(userOrders.get(i).getShowFlag());
+                        dataList[i][23] = String.valueOf(userOrders.get(i).getStatusFlag());
+                        dataList[i][24] = String.valueOf(userOrders.get(i).getFee());
+                    }
+
+
+        ExportExcelUtil.ExportWithResponse(sheetName, titleName, fileName,
+        columnNumber, columnWidth, columnName, dataList, response);
+
+
+        }
+    }
+

src/main/vue/src/pages/BannerInfo.vue

@@ -1,35 +1,30 @@
 <template>
     <div>
-        <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right" size="small"
-                 style="max-width: 500px;">
-                                                                                                                                                                                                                                                                                                                                        <el-form-item prop="location" label="位置">
+        <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right" size="small" style="max-width: 500px;">
+            <el-form-item prop="location" label="位置">
                 <template>
-                    <el-select v-model="formData.location" clearable  placeholder="请选择" :disabled="'location'==subColumn">
-                        <el-option
-                                v-for="item in locationOptions"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value">
+                    <el-select v-model="formData.location" clearable placeholder="请选择" :disabled="'location'==subColumn">
+                        <el-option v-for="item in locationOptions" :key="item.value" :label="item.label" :value="item.value">
                         </el-option>
                     </el-select>
                 </template>
             </el-form-item>
-                                                                                                                                                                                                                        <el-form-item prop="title" label="标题">
+            <el-form-item prop="title" label="标题">
                 <el-input v-model="formData.title" :disabled="'title'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="subtitle" label="副标题">
+            <el-form-item prop="subtitle" label="副标题">
                 <el-input v-model="formData.subtitle" :disabled="'subtitle'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="url" label="跳转链接">
+            <el-form-item prop="url" label="跳转链接">
                 <el-input v-model="formData.url" :disabled="'url'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                         <el-form-item prop="imageUrl" label="图片">
-                 <single-upload v-model="formData.imageUrl" :disabled="'imageUrl'==subColumn"></single-upload>
-             </el-form-item>
-                                                                                                                                                                                <el-form-item prop="rank" label="排序">
+            <el-form-item prop="imageUrl" label="图片">
+                <single-upload v-model="formData.imageUrl" :disabled="'imageUrl'==subColumn"></single-upload>
+            </el-form-item>
+            <el-form-item prop="rank" label="排序">
                 <el-input v-model="formData.rank" :disabled="'rank'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                        <el-form-item>
+            <el-form-item>
                 <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
                 <el-button @click="onDelete" v-if="formData.id" type="danger">删除</el-button>
                 <el-button @click="$router.go(-1)">取消</el-button>
@@ -38,97 +33,112 @@
     </div>
 </template>
 <script>
-    import formValidator from '../formValidator'
+import formValidator from '../formValidator'
 
-    export default {
-        created() {
-            if (this.$route.query.column) {
-                this.subColumn = this.$route.query.column.split(',')[1];
-                this.subValue = this.$route.query.column.split(',')[0];
-            }
+export default {
+    created() {
+        if (this.$route.query.column) {
+            this.subColumn = this.$route.query.column.split(',')[1];
+            this.subValue = this.$route.query.column.split(',')[0];
+        }
+
+        if (this.$route.query.id) {
+            this.$http.get({
+                url: '/bannerInfo/getOne',
+                data: {
+                    id: this.$route.query.id
+                }
+            }).then(res => {
+                if (res.success) {
 
-            if (this.$route.query.id) {
-                this.$http.get({
-                    url: '/bannerInfo/getOne',
-                    data: {
-                        id: this.$route.query.id
-                    }
-                }).then(res => {
-                    if (res.success) {
 
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
-                        this.formData = res.data;
+                    this.formData = res.data;
 
                     if (this.$route.query.column) {
                         this.formData[this.subColumn] = this.subValue;
                     }
-                    }
-                })
-            }else {
-                if (this.$route.query.column) {
-                    this.formData[this.subColumn] = this.subValue;
                 }
+            })
+        } else {
+            if (this.$route.query.column) {
+                this.formData[this.subColumn] = this.subValue;
             }
+        }
 
-                                                                                                                                                                                                                                                                                                                                                                                                        },
-        data() {
-            return {
-                saving: false,
-                formData: {},
-                rules: {
-                                                                                                                                                                                                                        location:
+    },
+    data() {
+        return {
+            saving: false,
+            formData: {},
+            rules: {
+                location:
                     [
-                                                {required: true, message: '请输入 位置', trigger: 'blur'},
-                                                                    ],
-                                                                                                                                                                                },
-                                                                        locationOptions:[{ label: 'A', value: 'A' }, { label: 'B', value: 'B' },{ label: 'C', value: 'C' }],
-                                                                        subColumn: '',
+                        { required: true, message: '请输入 位置', trigger: 'blur' },
+                    ],
+            },
+            locationOptions: [
+                { label: '首页banner', value: '1' }, 
+                { label: '首页修图消息', value: '2' }, 
+                { label: '首页影楼消息', value: '4' },
+                { label: '首页样片消息', value: '5' },
+                { label: '首页营销消息', value: '6' },
+                { label: '首页周边消息', value: '7' },
+                { label: '修图banner', value: '8' },
+                { label: '影楼banner', value: '9' },
+                { label: '样片banner', value: '10' },
+                { label: '营销banner', value: '11' },
+                { label: '周边banner', value: '12' },
+                { label: '关于我们banner', value: '13' },
+                { label: '加入我们banner', value: '14' },
+                { label: '联系我们banner', value: '15' },
+                ],
+            subColumn: '',
             subValue: '',
         }
+    },
+    methods: {
+        onSave() {
+            this.$refs.form.validate((valid) => {
+                if (valid) {
+                    this.submit();
+                } else {
+                    return false;
+                }
+            });
         },
-        methods: {
-            onSave() {
-                this.$refs.form.validate((valid) => {
-                    if (valid) {
-                        this.submit();
-                    } else {
-                        return false;
-                    }
-                });
-            },
-            submit() {
-                var data = JSON.parse(JSON.stringify(this.formData));
-                this.$http.post({
-                    url: this.formData.id ? '/bannerInfo/update' : '/bannerInfo/save',
-                    data: data
-                }).then(res => {
-                    if (res.success) {
-                        this.$message.success('成功');
-                        this.$router.go(-1);
-                    } else {
-                        this.$message.warning('失败')
-                    }
-                });
-            },
-            onDelete() {
-                this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' }).then(() => {
-                    return this.$http.post({
+        submit() {
+            var data = JSON.parse(JSON.stringify(this.formData));
+            this.$http.post({
+                url: this.formData.id ? '/bannerInfo/update' : '/bannerInfo/save',
+                data: data
+            }).then(res => {
+                if (res.success) {
+                    this.$message.success('成功');
+                    this.$router.go(-1);
+                } else {
+                    this.$message.warning('失败')
+                }
+            });
+        },
+        onDelete() {
+            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' }).then(() => {
+                return this.$http.post({
                     url: '/bannerInfo/del',
                     data: { id: this.formData.id }
-                    })
-                }).then(() => {
-                    this.$message.success('删除成功');
-                    this.$router.go(-1);
-                }).catch(action => {
-                    if (action === 'cancel') {
-                        this.$message.info('删除取消');
-                    } else {
-                        this.$message.error('删除失败');
-                    }
                 })
-            },
-        }
+            }).then(() => {
+                this.$message.success('删除成功');
+                this.$router.go(-1);
+            }).catch(action => {
+                if (action === 'cancel') {
+                    this.$message.info('删除取消');
+                } else {
+                    this.$message.error('删除失败');
+                }
+            })
+        },
     }
+}
 </script>
 <style lang="less" scoped>
 </style>

src/main/vue/src/pages/BannerInfos.vue

@@ -1,25 +1,22 @@
 <template>
     <div>
         <div class="filters-container">
-        
+
             <el-input placeholder="关键字" size="small" v-model="filter1" clearable class="filter-item"></el-input>
             <el-button @click="searchData" type="primary" size="small" icon="el-icon-search" class="filter-item">搜索
             </el-button>
-            <el-button @click="showAdvancedQueryDialog = !showAdvancedQueryDialog" type="primary" size="small"
-                       icon="el-icon-search" class="filter-item">高级查询
+            <el-button @click="showAdvancedQueryDialog = !showAdvancedQueryDialog" type="primary" size="small" icon="el-icon-search" class="filter-item">高级查询
             </el-button>
-            <el-button @click="showTableSortDialog = !showTableSortDialog" type="primary" size="small"
-                       icon="el-icon-sort" class="filter-item">排序
+            <el-button @click="showTableSortDialog = !showTableSortDialog" type="primary" size="small" icon="el-icon-sort" class="filter-item">排序
             </el-button>
-            <el-button @click="$router.push({path:'/bannerInfo',query:{column:$route.query.column}})" type="primary"
-                       size="small" icon="el-icon-edit"
-                       class="filter-item">添加
+            <el-button @click="$router.push({path:'/bannerInfo',query:{column:$route.query.column}})" type="primary" size="small" icon="el-icon-edit" class="filter-item">添加
             </el-button>
             <el-button @click="exportExcel" type="primary" size="small" icon="el-icon-share" class="filter-item">导出EXCEL
             </el-button>
             <el-dropdown trigger="click" size="medium" class="table-column-filter">
                 <span>
-                  筛选数据<i class="el-icon-arrow-down el-icon--right"></i>
+                    筛选数据
+                    <i class="el-icon-arrow-down el-icon--right"></i>
                 </span>
                 <el-dropdown-menu slot="dropdown" class="table-column-filter-wrapper">
                     <el-checkbox v-for="item in tableColumns" :key="item.value" v-model="item.show">{{item.label}}
@@ -27,76 +24,36 @@
                 </el-dropdown-menu>
             </el-dropdown>
         </div>
-        <el-table
-                :data="tableData"
-                :height="tableHeight"
-                row-key="id"
-                ref="table">
-            <el-table-column
-                    v-if="multipleMode"
-                    align="center"
-                    type="selection"
-                    width="50">
+        <el-table :data="tableData" :height="tableHeight" row-key="id" ref="table">
+            <el-table-column v-if="multipleMode" align="center" type="selection" width="50">
+            </el-table-column>
+            <el-table-column type="index" min-width="50" align="center">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('location')" prop="location" label="位置" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('title')" prop="title" label="标题" min-width="100">
             </el-table-column>
-            <el-table-column
-                    type="index"
-                    min-width="50"
-                    align="center">
+
+            <el-table-column v-if="isColumnShow('subtitle')" prop="subtitle" label="副标题" min-width="100">
             </el-table-column>
-                                                                                                                                                                                                    
-                                            <el-table-column
-                                v-if="isColumnShow('location')"
-                                prop="location"
-                                label="位置"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('title')"
-                                prop="title"
-                                label="标题"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('subtitle')"
-                                prop="subtitle"
-                                label="副标题"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('url')"
-                                prop="url"
-                                label="跳转链接"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('imageUrl')"
-                                prop="imageUrl"
-                                label="图片"
-                                min-width="100">
-                            <template slot-scope="{row}">
-                                <img :src="row.imageUrl" @click="showImg(row.imageUrl)" style="width: 100px;height: 100px;vertical-align: middle;" />
-                            </template>
-
-                        </el-table-column>
-                                                                    
-                                            <el-table-column
-                                v-if="isColumnShow('rank')"
-                                prop="rank"
-                                label="排序"
-                                min-width="100">
-                        </el-table-column>
-                                                            <el-table-column
-                    label="操作"
-                    align="center"
-                    fixed="right"
-                    min-width="150"
-            >
+
+            <el-table-column v-if="isColumnShow('url')" prop="url" label="跳转链接" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('imageUrl')" prop="imageUrl" label="图片" min-width="100">
+                <template slot-scope="{row}">
+                    <img :src="row.imageUrl" @click="showImg(row.imageUrl)" style="width: 100px;height: 100px;vertical-align: middle;" />
+                </template>
+
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('rank')" prop="rank" label="排序" min-width="100">
+            </el-table-column>
+            <el-table-column label="操作" align="center" fixed="right" min-width="150">
                 <template slot-scope="scope">
-                            <el-button @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
+                    <el-button @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
                     <el-button @click="deleteRow(scope.row)" type="danger" size="mini" plain>删除</el-button>
                 </template>
             </el-table-column>
@@ -110,15 +67,7 @@
                     <el-button size="small" @click="toggleMultipleMode(false)">取消</el-button>
                 </el-button-group>
             </div>
-            <el-pagination
-                    background
-                    @size-change="pageSizeChange"
-                    @current-change="currentPageChange"
-                    :current-page="currentPage"
-                    :page-sizes="[10, 20, 30, 40, 50]"
-                    :page-size="pageSize"
-                    layout="total, sizes, prev, pager, next, jumper"
-                    :total="totalNumber">
+            <el-pagination background @size-change="pageSizeChange" @current-change="currentPageChange" :current-page="currentPage" :page-sizes="[10, 20, 30, 40, 50]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="totalNumber">
             </el-pagination>
         </div>
         <el-dialog title="高级查询" :visible.sync="showAdvancedQueryDialog">
@@ -139,16 +88,14 @@
                     <template slot-scope="{row}">
                         <el-select v-model="row.name">
 
-                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value"
-                                       :key="item.value"></el-option>
+                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value" :key="item.value"></el-option>
                         </el-select>
                     </template>
                 </el-table-column>
                 <el-table-column prop="searchMethod" label="搜索方式" width="150" align="center">
                     <template slot-scope="{row}">
                         <el-select v-model="row.searchMethod">
-                            <el-option v-for="item in searchMethods" :label="item" :value="item"
-                                       :key="item"></el-option>
+                            <el-option v-for="item in searchMethods" :label="item" :value="item" :key="item"></el-option>
                         </el-select>
                     </template>
                 </el-table-column>
@@ -178,8 +125,7 @@
                     <template slot-scope="{row}">
                         <el-select v-model="row.name">
 
-                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value"
-                                       :key="item.value"></el-option>
+                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value" :key="item.value"></el-option>
                         </el-select>
                     </template>
                 </el-table-column>
@@ -213,279 +159,278 @@
     </div>
 </template>
 <script>
-    import {mapState} from 'vuex'
-    import {format} from 'date-fns'
-    import zh from 'date-fns/locale/zh_cn'
-
-    export default {
-        created() {
+import { mapState } from 'vuex'
+import { format } from 'date-fns'
+import zh from 'date-fns/locale/zh_cn'
+
+export default {
+    created() {
+        this.getData();
+    },
+    data() {
+        return {
+            totalNumber: 0,
+            totalPage: 10,
+            currentPage: 1,
+            pageSize: 20,
+            tableData: [],
+            filter1: '',
+            filter2: '',
+            tableColumns: [
+                {
+                    label: '位置',
+                    value: 'location',
+                    show: true
+                },
+                {
+                    label: '标题',
+                    value: 'title',
+                    show: true
+                },
+                {
+                    label: '副标题',
+                    value: 'subtitle',
+                    show: true
+                },
+                {
+                    label: '跳转链接',
+                    value: 'url',
+                    show: true
+                },
+                {
+                    label: '图片',
+                    value: 'imageUrl',
+                    show: true
+                },
+                {
+                    label: '排序',
+                    value: 'rank',
+                    show: true
+                },
+            ],
+            multipleMode: false,
+            showAdvancedQueryDialog: false,
+            advancedQueryFields: [],
+            showTableSortDialog: false,
+            tableSortFields: [],
+            searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
+            advancedQueryColumns: [
+                {
+                    label: '位置',
+                    value: 'location'
+                },
+                {
+                    label: '标题',
+                    value: 'title'
+                },
+                {
+                    label: '副标题',
+                    value: 'subtitle'
+                },
+                {
+                    label: '跳转链接',
+                    value: 'url'
+                },
+                {
+                    label: '图片',
+                    value: 'image_url'
+                },
+                {
+                    label: '排序',
+                    value: 'rank'
+                },
+            ],
+            advancedQuerySearchKey: '',
+            orderByStr: '',
+            imgSrc: '',
+            imageDialogVisible: false,
+        }
+    },
+    computed: {
+        ...mapState(['tableHeight']),
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        pageSizeChange(size) {
+            this.currentPage = 1;
+            this.pageSize = size;
             this.getData();
         },
-        data() {
-            return {
-                totalNumber: 0,
-                totalPage: 10,
-                currentPage: 1,
-                pageSize: 20,
-                tableData: [],
-                filter1: '',
-                filter2: '',
-                tableColumns: [
-                                                                                                                                                                                                                                                                                                                                                {
-                                label: '位置',
-                                value: 'location',
-                                show: true
-                            },
-                                                                                                {
-                                label: '标题',
-                                value: 'title',
-                                show: true
-                            },
-                                                                                                {
-                                label: '副标题',
-                                value: 'subtitle',
-                                show: true
-                            },
-                                                                                                {
-                                label: '跳转链接',
-                                value: 'url',
-                                show: true
-                            },
-                                                                                                {
-                                label: '图片',
-                                value: 'imageUrl',
-                                show: true
-                            },
-                                                                                                {
-                                label: '排序',
-                                value: 'rank',
-                                show: true
-                            },
-                                                            ],
-                multipleMode: false,
-                showAdvancedQueryDialog: false,
-                advancedQueryFields: [],
-                showTableSortDialog: false,
-                tableSortFields: [],
-                searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
-                advancedQueryColumns: [
-                                                                                                                                                                                                                                                                                                                                                {
-                                label: '位置',
-                                value: 'location'
-                            },
-                                                                                                {
-                                label: '标题',
-                                value: 'title'
-                            },
-                                                                                                {
-                                label: '副标题',
-                                value: 'subtitle'
-                            },
-                                                                                                {
-                                label: '跳转链接',
-                                value: 'url'
-                            },
-                                                                                                {
-                                label: '图片',
-                                value: 'image_url'
-                            },
-                                                                                                {
-                                label: '排序',
-                                value: 'rank'
-                            },
-                                                            ],
-                advancedQuerySearchKey: '',
-                orderByStr: '',
-                imgSrc: '',
-                imageDialogVisible: false,
-            }
+        currentPageChange(page) {
+            this.currentPage = page;
+            this.getData();
         },
-        computed: {
-            ...mapState(['tableHeight']),
-            selection() {
-                return this.$refs.table.selection.map(i => i.id);
+        getData() {
+
+            var data = {
+                currentPage: this.currentPage,
+                pageNumber: this.pageSize,
+                searchKey: this.filter1,
+                advancedQuery: this.advancedQuerySearchKey,
+                orderByStr: this.orderByStr,
             }
-        },
-        methods: {
-            pageSizeChange(size) {
-                this.currentPage = 1;
-                this.pageSize = size;
-                this.getData();
-            },
-            currentPageChange(page) {
-                this.currentPage = page;
-                this.getData();
-            },
-            getData() {
-
-                var data = {
-                    currentPage: this.currentPage,
-                    pageNumber: this.pageSize,
-                    searchKey: this.filter1,
-                    advancedQuery: this.advancedQuerySearchKey,
-                    orderByStr: this.orderByStr,
-                }
 
-                if (this.$route.query.column) {
-                    var tempColumn = this.$route.query.column;
-                    data[tempColumn.split(',')[1]] = tempColumn.split(',')[0];
-                }
+            if (this.$route.query.column) {
+                var tempColumn = this.$route.query.column;
+                data[tempColumn.split(',')[1]] = tempColumn.split(',')[0];
+            }
 
-                this.$http.get({
-                    url: '/bannerInfo/page',
-                    data: data
-                }).then(res => {
-                    if (res.success) {
-                        this.totalNumber = res.data.page.totalNumber;
-                        this.tableData = res.data.pp;
-                    }
-                })
-            },
-            isColumnShow(column) {
-                var row = this.tableColumns.find(i => i.value === column);
-                return row ? row.show : false;
-            },
-            toggleMultipleMode(multipleMode) {
-                this.multipleMode = multipleMode;
-                if (!multipleMode) {
-                    this.$refs.table.clearSelection();
+            this.$http.get({
+                url: '/bannerInfo/page',
+                data: data
+            }).then(res => {
+                if (res.success) {
+                    this.totalNumber = res.data.page.totalNumber;
+                    this.tableData = res.data.pp;
                 }
-            },
-            editRow(row) {
-                this.$router.push({
-                    path: '/bannerInfo',
-                    query: {
-                        id: row.id,
-                        column: this.$route.query.column,
-                    }
-                })
-            },
-            operation1() {
-                this.$notify({
-                    title: '提示',
-                    message: this.selection
-                });
-            },
-            operation2() {
-                this.$message('操作2');
-            },
-            addField() {
-                this.advancedQueryFields.push({
-                    link: 'AND',
-                    name: '',
-                    searchMethod: '=',
-                    value: '',
-                });
-            },
-            removeField(i) {
-                if (this.advancedQueryFields.length > 0) {
-                    this.advancedQueryFields.splice(i, 1);
+            })
+        },
+        isColumnShow(column) {
+            var row = this.tableColumns.find(i => i.value === column);
+            return row ? row.show : false;
+        },
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.$refs.table.clearSelection();
+            }
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/bannerInfo',
+                query: {
+                    id: row.id,
+                    column: this.$route.query.column,
                 }
-            },
-            advancedQuery() {
+            })
+        },
+        operation1() {
+            this.$notify({
+                title: '提示',
+                message: this.selection
+            });
+        },
+        operation2() {
+            this.$message('操作2');
+        },
+        addField() {
+            this.advancedQueryFields.push({
+                link: 'AND',
+                name: '',
+                searchMethod: '=',
+                value: '',
+            });
+        },
+        removeField(i) {
+            if (this.advancedQueryFields.length > 0) {
+                this.advancedQueryFields.splice(i, 1);
+            }
+        },
+        advancedQuery() {
 
-                this.advancedQuerySearchKey = '';
+            this.advancedQuerySearchKey = '';
 
-                if (this.advancedQueryFields.length > 0) {
+            if (this.advancedQueryFields.length > 0) {
 
-                    var templist = [];
+                var templist = [];
 
-                    this.advancedQueryFields.forEach(item => {
-                        if (item.link && item.name && item.searchMethod && item.value) {
-                            var tempItem = item.link + '_,' + item.name + '_,' + item.searchMethod + '_,' + item.value;
-                            templist.push(tempItem);
-                        }
-                    })
+                this.advancedQueryFields.forEach(item => {
+                    if (item.link && item.name && item.searchMethod && item.value) {
+                        var tempItem = item.link + '_,' + item.name + '_,' + item.searchMethod + '_,' + item.value;
+                        templist.push(tempItem);
+                    }
+                })
 
-                    if (templist.length > 0) {
+                if (templist.length > 0) {
 
-                        this.advancedQuerySearchKey = templist.join('_;');
-                    }
+                    this.advancedQuerySearchKey = templist.join('_;');
                 }
+            }
 
-                this.getData();
-                this.showAdvancedQueryDialog = false;
-            },
-            addSortField() {
-                this.tableSortFields.push({
-                    name: '',
-                    order: 'asc',
-                });
-            },
-            removeSortField(i) {
-                if (this.tableSortFields.length > 0) {
-                    this.tableSortFields.splice(i, 1);
-                }
-            },
-            tableSortQuery() {
+            this.getData();
+            this.showAdvancedQueryDialog = false;
+        },
+        addSortField() {
+            this.tableSortFields.push({
+                name: '',
+                order: 'asc',
+            });
+        },
+        removeSortField(i) {
+            if (this.tableSortFields.length > 0) {
+                this.tableSortFields.splice(i, 1);
+            }
+        },
+        tableSortQuery() {
 
-                this.orderByStr = '';
+            this.orderByStr = '';
 
-                if (this.tableSortFields.length > 0) {
+            if (this.tableSortFields.length > 0) {
 
-                    var templist = [];
+                var templist = [];
 
-                    this.tableSortFields.forEach(item => {
-                        if (item.name && item.order) {
-                            var tempItem = item.name + '_,' + item.order;
-                            templist.push(tempItem);
-                        }
-                    })
+                this.tableSortFields.forEach(item => {
+                    if (item.name && item.order) {
+                        var tempItem = item.name + '_,' + item.order;
+                        templist.push(tempItem);
+                    }
+                })
 
-                    if (templist.length > 0) {
+                if (templist.length > 0) {
 
-                        this.orderByStr = templist.join('_;');
-                    }
+                    this.orderByStr = templist.join('_;');
                 }
+            }
 
-                this.getData();
-                this.showTableSortDialog = false;
-            },
-            exportExcel() {
-                window.location.href = this.$baseUrl + "/bannerInfo/exportExcel?searchKey="
-                        + this.filter1 + "&advancedQuery=" + this.advancedQuerySearchKey+"&orderByStr=" + this.orderByStr;
-            },
-            searchData() {
-                this.currentPage = 1;
-                this.getData();
-            },
-            deleteRow(row) {
-                this.$alert('删除将无法恢复，确认要删除么？', '警告', {type: 'error'}).then(() => {
-                    return this.$http.post({
-                        url: '/bannerInfo/del',
-                        data: {id: row.id}
-                    })
-                }).then(() => {
-                    this.$message.success('删除成功');
-                    this.getData();
-                }).catch(action => {
-                    if (action === 'cancel') {
-                        this.$message.info('删除取消');
-                    } else {
-                        this.$message.error('删除失败');
-                    }
+            this.getData();
+            this.showTableSortDialog = false;
+        },
+        exportExcel() {
+            window.location.href = this.$baseUrl + "/bannerInfo/exportExcel?searchKey="
+                + this.filter1 + "&advancedQuery=" + this.advancedQuerySearchKey + "&orderByStr=" + this.orderByStr;
+        },
+        searchData() {
+            this.currentPage = 1;
+            this.getData();
+        },
+        deleteRow(row) {
+            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' }).then(() => {
+                return this.$http.post({
+                    url: '/bannerInfo/del',
+                    data: { id: row.id }
                 })
-            },
-            DateTimeFormatter(row, column, cellValue) {
-                if (cellValue) {
-                    return format(cellValue, 'YYYY/MM/DD HH:mm', {locale: zh})
+            }).then(() => {
+                this.$message.success('删除成功');
+                this.getData();
+            }).catch(action => {
+                if (action === 'cancel') {
+                    this.$message.info('删除取消');
+                } else {
+                    this.$message.error('删除失败');
                 }
+            })
+        },
+        DateTimeFormatter(row, column, cellValue) {
+            if (cellValue) {
+                return format(cellValue, 'YYYY/MM/DD HH:mm', { locale: zh })
+            }
 
-            },
-            DateFormatter(row, column, cellValue) {
-                if (cellValue) {
-                    return format(cellValue, 'YYYY/MM/DD', {locale: zh})
-                }
+        },
+        DateFormatter(row, column, cellValue) {
+            if (cellValue) {
+                return format(cellValue, 'YYYY/MM/DD', { locale: zh })
+            }
 
-            },
-            showImg(img) {
-                this.imgSrc = img;
-                this.imageDialogVisible = true;
-            },
+        },
+        showImg(img) {
+            this.imgSrc = img;
+            this.imageDialogVisible = true;
+        },
 
-        }
     }
+}
 </script>
 <style lang="less" scoped>
-
 </style>

src/main/vue/src/pages/ProductInfo.vue

@@ -31,6 +31,15 @@
             </el-form-item>
                                                                                                                                                                                                                                                                                                                             <el-form-item prop="rank" label="排序">
                 <el-input v-model="formData.rank" :disabled="'rank'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="storeId" label="店铺">
+                <el-input v-model="formData.storeId" :disabled="'storeId'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="typeFlag" label="类型">
+                <el-input v-model="formData.typeFlag" :disabled="'typeFlag'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="salesVolume" label="销量">
+                <el-input v-model="formData.salesVolume" :disabled="'salesVolume'==subColumn"></el-input>
             </el-form-item>
                                                                                                                                                                                                                                                                                         <el-form-item>
                 <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
@@ -59,7 +68,7 @@
                 }).then(res => {
                     if (res.success) {
 
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
                         this.formData = res.data;
 
                     if (this.$route.query.column) {
@@ -73,14 +82,14 @@
                 }
             }
 
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                },
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    },
         data() {
             return {
                 saving: false,
                 formData: {},
                 rules: {
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                },
-                                                                                                                                                    subColumn: '',
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    },
+                                                                                                                                                                            subColumn: '',
             subValue: '',
         }
         },

src/main/vue/src/pages/ProductInfos.vue

@@ -124,6 +124,27 @@
                                 label="排序"
                                 min-width="100">
                         </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('storeId')"
+                                prop="storeId"
+                                label="店铺"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('typeFlag')"
+                                prop="typeFlag"
+                                label="类型"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('salesVolume')"
+                                prop="salesVolume"
+                                label="销量"
+                                min-width="100">
+                        </el-table-column>
                                                             <el-table-column
                     label="操作"
                     align="center"
@@ -320,6 +341,21 @@
                                 label: '排序',
                                 value: 'rank',
                                 show: true
+                            },
+                                                                                                {
+                                label: '店铺',
+                                value: 'storeId',
+                                show: true
+                            },
+                                                                                                {
+                                label: '类型',
+                                value: 'typeFlag',
+                                show: true
+                            },
+                                                                                                {
+                                label: '销量',
+                                value: 'salesVolume',
+                                show: true
                             },
                                                             ],
                 multipleMode: false,
@@ -372,6 +408,18 @@
                                                                                                 {
                                 label: '排序',
                                 value: 'rank'
+                            },
+                                                                                                {
+                                label: '店铺',
+                                value: 'store_id'
+                            },
+                                                                                                {
+                                label: '类型',
+                                value: 'type_flag'
+                            },
+                                                                                                {
+                                label: '销量',
+                                value: 'sales_volume'
                             },
                                                             ],
                 advancedQuerySearchKey: '',

src/main/vue/src/pages/ServiceTypeDetail.vue

@@ -10,6 +10,9 @@
             </el-form-item>
                                                                                                                                                                                                                                                                                                                             <el-form-item prop="description" label="描述">
                 <el-input v-model="formData.description" :disabled="'description'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="rank" label="排序">
+                <el-input v-model="formData.rank" :disabled="'rank'==subColumn"></el-input>
             </el-form-item>
                                                                                                                                                                                                                                                                                         <el-form-item>
                 <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
@@ -38,7 +41,7 @@
                 }).then(res => {
                     if (res.success) {
 
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
                         this.formData = res.data;
 
                     if (this.$route.query.column) {
@@ -52,7 +55,7 @@
                 }
             }
 
-                                                                                                                                                                                                                                                                                },
+                                                                                                                                                                                                                                                                                                            },
         data() {
             return {
                 saving: false,
@@ -66,8 +69,8 @@
                     [
                                                 {required: true, message: '请输入 类名', trigger: 'blur'},
                                                                     ],
-                                                                },
-                                                                                    subColumn: '',
+                                                                                            },
+                                                                                            subColumn: '',
             subValue: '',
         }
         },

src/main/vue/src/pages/ServiceTypeDetails.vue

@@ -47,7 +47,7 @@
                                             <el-table-column
                                 v-if="isColumnShow('id')"
                                 prop="id"
-                                label=""
+                                label="id"
                                 min-width="100">
                         </el-table-column>
                                                                                                                                                                                                             
@@ -71,6 +71,13 @@
                                 label="描述"
                                 min-width="100">
                         </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('rank')"
+                                prop="rank"
+                                label="排序"
+                                min-width="100">
+                        </el-table-column>
                                                             <el-table-column
                     label="操作"
                     align="center"
@@ -214,7 +221,7 @@
                 filter2: '',
                 tableColumns: [
                                                                         {
-                                label: '',
+                                label: 'id',
                                 value: 'id',
                                 show: true
                             },
@@ -232,6 +239,11 @@
                                 label: '描述',
                                 value: 'description',
                                 show: true
+                            },
+                                                                                                {
+                                label: '排序',
+                                value: 'rank',
+                                show: true
                             },
                                                             ],
                 multipleMode: false,
@@ -242,7 +254,7 @@
                 searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
                 advancedQueryColumns: [
                                                                         {
-                                label: '',
+                                label: 'id',
                                 value: 'id'
                             },
                                                                                                                                                                                                                                                                                                                             {
@@ -256,6 +268,10 @@
                                                                                                 {
                                 label: '描述',
                                 value: 'description'
+                            },
+                                                                                                {
+                                label: '排序',
+                                value: 'rank'
                             },
                                                             ],
                 advancedQuerySearchKey: '',

src/main/vue/src/pages/ServiceTypes.vue

@@ -47,7 +47,7 @@
                                             <el-table-column
                                 v-if="isColumnShow('id')"
                                 prop="id"
-                                label=""
+                                label="id"
                                 min-width="100">
                         </el-table-column>
                                                                                                                                                                                                             
@@ -110,7 +110,7 @@
                     min-width="150"
             >
                 <template slot-scope="scope">
-                    <el-button @click="$router.push({path:'/ServiceTypeDetails',query:{column:scope.row.id+',parent_id'}})" type="primary" size="small" plain>小类
+                    <el-button @click="$router.push({path:'/ServiceTypeDetails',query:{column:scope.row.id+',parentId'}})" type="primary" size="small" plain>小类
             </el-button>
                             <el-button @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
                     <el-button @click="deleteRow(scope.row)" type="danger" size="mini" plain>删除</el-button>
@@ -248,7 +248,7 @@
                 filter2: '',
                 tableColumns: [
                                                                         {
-                                label: '',
+                                label: 'id',
                                 value: 'id',
                                 show: true
                             },
@@ -296,7 +296,7 @@
                 searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
                 advancedQueryColumns: [
                                                                         {
-                                label: '',
+                                label: 'id',
                                 value: 'id'
                             },
                                                                                                                                                                                                                                                                                                                             {

src/main/vue/src/pages/StoreInfo.vue

@@ -49,6 +49,12 @@
             </el-form-item>
                                                                                                                                                                                                                                                                                                                             <el-form-item prop="rank" label="排序">
                 <el-input v-model="formData.rank" :disabled="'rank'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="responseTime" label="响应时间">
+                <el-input v-model="formData.responseTime" :disabled="'responseTime'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="reworkRate" label="返片率">
+                <el-input v-model="formData.reworkRate" :disabled="'reworkRate'==subColumn"></el-input>
             </el-form-item>
                                                                                                                                                                                                                                                                                         <el-form-item>
                 <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
@@ -77,7 +83,7 @@
                 }).then(res => {
                     if (res.success) {
 
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
                         this.formData = res.data;
 
                     if (this.$route.query.column) {
@@ -91,14 +97,14 @@
                 }
             }
 
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            },
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    },
         data() {
             return {
                 saving: false,
                 formData: {},
                 rules: {
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            },
-                                                                                                                                                                                            subColumn: '',
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    },
+                                                                                                                                                                                                            subColumn: '',
             subValue: '',
         }
         },

src/main/vue/src/pages/StoreInfos.vue

@@ -159,6 +159,20 @@
                                 label="排序"
                                 min-width="100">
                         </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('responseTime')"
+                                prop="responseTime"
+                                label="响应时间"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('reworkRate')"
+                                prop="reworkRate"
+                                label="返片率"
+                                min-width="100">
+                        </el-table-column>
                                                             <el-table-column
                     label="操作"
                     align="center"
@@ -380,6 +394,16 @@
                                 label: '排序',
                                 value: 'rank',
                                 show: true
+                            },
+                                                                                                {
+                                label: '响应时间',
+                                value: 'responseTime',
+                                show: true
+                            },
+                                                                                                {
+                                label: '返片率',
+                                value: 'reworkRate',
+                                show: true
                             },
                                                             ],
                 multipleMode: false,
@@ -452,6 +476,14 @@
                                                                                                 {
                                 label: '排序',
                                 value: 'rank'
+                            },
+                                                                                                {
+                                label: '响应时间',
+                                value: 'response_time'
+                            },
+                                                                                                {
+                                label: '返片率',
+                                value: 'rework_rate'
                             },
                                                             ],
                 advancedQuerySearchKey: '',

src/main/vue/src/pages/UserOrder.vue

@@ -0,0 +1,159 @@
+<template>
+    <div>
+        <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right" size="small"
+                 style="max-width: 500px;">
+                                                                                                                                                                                                                                    <el-form-item prop="userId" label="用户">
+                <el-input v-model="formData.userId" :disabled="'userId'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="orderCode" label="订单编码">
+                <el-input v-model="formData.orderCode" :disabled="'orderCode'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="storeId" label="店铺">
+                <el-input v-model="formData.storeId" :disabled="'storeId'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="productType" label="商品类型">
+                <el-input v-model="formData.productType" :disabled="'productType'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="productId" label="商品ID">
+                <el-input v-model="formData.productId" :disabled="'productId'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="productName" label="商品名称">
+                <el-input v-model="formData.productName" :disabled="'productName'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="specification" label="规格">
+                <el-input v-model="formData.specification" :disabled="'specification'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="unitPrice" label="单价">
+                <el-input v-model="formData.unitPrice" :disabled="'unitPrice'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="quantity" label="数量">
+                <el-input v-model="formData.quantity" :disabled="'quantity'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="userCouponId" label="优惠券">
+                <el-input v-model="formData.userCouponId" :disabled="'userCouponId'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="offPrice" label="优惠金额">
+                <el-input v-model="formData.offPrice" :disabled="'offPrice'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="totlePrice" label="总价">
+                <el-input v-model="formData.totlePrice" :disabled="'totlePrice'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="dealPrice" label="成交价">
+                <el-input v-model="formData.dealPrice" :disabled="'dealPrice'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="payMode" label="支付方式">
+                <el-input v-model="formData.payMode" :disabled="'payMode'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="payTime" label="支付时间">
+                <el-input v-model="formData.payTime" :disabled="'payTime'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="remark" label="备注">
+                <el-input v-model="formData.remark" :disabled="'remark'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="showFlag" label="显示标识">
+                <el-input v-model="formData.showFlag" :disabled="'showFlag'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="statusFlag" label="状态">
+                <el-input v-model="formData.statusFlag" :disabled="'statusFlag'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="fee" label="手续费">
+                <el-input v-model="formData.fee" :disabled="'fee'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                        <el-form-item>
+                <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
+                <el-button @click="onDelete" v-if="formData.id" type="danger">删除</el-button>
+                <el-button @click="$router.go(-1)">取消</el-button>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+<script>
+    import formValidator from '../formValidator'
+
+    export default {
+        created() {
+            if (this.$route.query.column) {
+                this.subColumn = this.$route.query.column.split(',')[1];
+                this.subValue = this.$route.query.column.split(',')[0];
+            }
+
+            if (this.$route.query.id) {
+                this.$http.get({
+                    url: '/userOrder/getOne',
+                    data: {
+                        id: this.$route.query.id
+                    }
+                }).then(res => {
+                    if (res.success) {
+
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
+                        this.formData = res.data;
+
+                    if (this.$route.query.column) {
+                        this.formData[this.subColumn] = this.subValue;
+                    }
+                    }
+                })
+            }else {
+                if (this.$route.query.column) {
+                    this.formData[this.subColumn] = this.subValue;
+                }
+            }
+
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                },
+        data() {
+            return {
+                saving: false,
+                formData: {},
+                rules: {
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                },
+                                                                                                                                                                                                                    subColumn: '',
+            subValue: '',
+        }
+        },
+        methods: {
+            onSave() {
+                this.$refs.form.validate((valid) => {
+                    if (valid) {
+                        this.submit();
+                    } else {
+                        return false;
+                    }
+                });
+            },
+            submit() {
+                var data = JSON.parse(JSON.stringify(this.formData));
+                this.$http.post({
+                    url: this.formData.id ? '/userOrder/update' : '/userOrder/save',
+                    data: data
+                }).then(res => {
+                    if (res.success) {
+                        this.$message.success('成功');
+                        this.$router.go(-1);
+                    } else {
+                        this.$message.warning('失败')
+                    }
+                });
+            },
+            onDelete() {
+                this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' }).then(() => {
+                    return this.$http.post({
+                    url: '/userOrder/del',
+                    data: { id: this.formData.id }
+                    })
+                }).then(() => {
+                    this.$message.success('删除成功');
+                    this.$router.go(-1);
+                }).catch(action => {
+                    if (action === 'cancel') {
+                        this.$message.info('删除取消');
+                    } else {
+                        this.$message.error('删除失败');
+                    }
+                })
+            },
+        }
+    }
+</script>
+<style lang="less" scoped>
+</style>

src/main/vue/src/pages/UserOrders.vue

@@ -0,0 +1,695 @@
+<template>
+    <div>
+        <div class="filters-container">
+        
+            <el-input placeholder="关键字" size="small" v-model="filter1" clearable class="filter-item"></el-input>
+            <el-button @click="searchData" type="primary" size="small" icon="el-icon-search" class="filter-item">搜索
+            </el-button>
+            <el-button @click="showAdvancedQueryDialog = !showAdvancedQueryDialog" type="primary" size="small"
+                       icon="el-icon-search" class="filter-item">高级查询
+            </el-button>
+            <el-button @click="showTableSortDialog = !showTableSortDialog" type="primary" size="small"
+                       icon="el-icon-sort" class="filter-item">排序
+            </el-button>
+            <el-button @click="$router.push({path:'/userOrder',query:{column:$route.query.column}})" type="primary"
+                       size="small" icon="el-icon-edit"
+                       class="filter-item">添加
+            </el-button>
+            <el-button @click="exportExcel" type="primary" size="small" icon="el-icon-share" class="filter-item">导出EXCEL
+            </el-button>
+            <el-dropdown trigger="click" size="medium" class="table-column-filter">
+                <span>
+                  筛选数据<i class="el-icon-arrow-down el-icon--right"></i>
+                </span>
+                <el-dropdown-menu slot="dropdown" class="table-column-filter-wrapper">
+                    <el-checkbox v-for="item in tableColumns" :key="item.value" v-model="item.show">{{item.label}}
+                    </el-checkbox>
+                </el-dropdown-menu>
+            </el-dropdown>
+        </div>
+        <el-table
+                :data="tableData"
+                :height="tableHeight"
+                row-key="id"
+                ref="table">
+            <el-table-column
+                    v-if="multipleMode"
+                    align="center"
+                    type="selection"
+                    width="50">
+            </el-table-column>
+            <el-table-column
+                    type="index"
+                    min-width="50"
+                    align="center">
+            </el-table-column>
+                                                                                                                                                                                                    
+                                            <el-table-column
+                                v-if="isColumnShow('userId')"
+                                prop="userId"
+                                label="用户"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('orderCode')"
+                                prop="orderCode"
+                                label="订单编码"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('storeId')"
+                                prop="storeId"
+                                label="店铺"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('productType')"
+                                prop="productType"
+                                label="商品类型"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('productId')"
+                                prop="productId"
+                                label="商品ID"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('productName')"
+                                prop="productName"
+                                label="商品名称"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('specification')"
+                                prop="specification"
+                                label="规格"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('unitPrice')"
+                                prop="unitPrice"
+                                label="单价"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('quantity')"
+                                prop="quantity"
+                                label="数量"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('userCouponId')"
+                                prop="userCouponId"
+                                label="优惠券"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('offPrice')"
+                                prop="offPrice"
+                                label="优惠金额"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('totlePrice')"
+                                prop="totlePrice"
+                                label="总价"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('dealPrice')"
+                                prop="dealPrice"
+                                label="成交价"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('payMode')"
+                                prop="payMode"
+                                label="支付方式"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('payTime')"
+                                prop="payTime"
+                                label="支付时间"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('remark')"
+                                prop="remark"
+                                label="备注"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('showFlag')"
+                                prop="showFlag"
+                                label="显示标识"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('statusFlag')"
+                                prop="statusFlag"
+                                label="状态"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('fee')"
+                                prop="fee"
+                                label="手续费"
+                                min-width="100">
+                        </el-table-column>
+                                                            <el-table-column
+                    label="操作"
+                    align="center"
+                    fixed="right"
+                    min-width="150"
+            >
+                <template slot-scope="scope">
+                            <el-button @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
+                    <el-button @click="deleteRow(scope.row)" type="danger" size="mini" plain>删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="pagination-wrapper">
+            <div class="multiple-mode-wrapper" v-if="0">
+                <el-button size="small" v-if="!multipleMode" @click="toggleMultipleMode(true)">批量编辑</el-button>
+                <el-button-group v-else>
+                    <el-button size="small" @click="operation1">批量操作1</el-button>
+                    <el-button size="small" @click="operation2">批量操作2</el-button>
+                    <el-button size="small" @click="toggleMultipleMode(false)">取消</el-button>
+                </el-button-group>
+            </div>
+            <el-pagination
+                    background
+                    @size-change="pageSizeChange"
+                    @current-change="currentPageChange"
+                    :current-page="currentPage"
+                    :page-sizes="[10, 20, 30, 40, 50]"
+                    :page-size="pageSize"
+                    layout="total, sizes, prev, pager, next, jumper"
+                    :total="totalNumber">
+            </el-pagination>
+        </div>
+        <el-dialog title="高级查询" :visible.sync="showAdvancedQueryDialog">
+            <el-button @click="addField" type="text" icon="el-icon-plus">添加</el-button>
+            <el-table :data="advancedQueryFields">
+
+                <el-table-column prop="link" label="链接符" align="center">
+                    <template slot-scope="{row}">
+                        <el-select placeholder="链接" size="small" v-model="row.link" class="filter-item">
+                            <el-option label="AND" value="AND">
+                            </el-option>
+                            <el-option label="OR" value="OR">
+                            </el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="name" label="字段" align="center">
+                    <template slot-scope="{row}">
+                        <el-select v-model="row.name">
+
+                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value"
+                                       :key="item.value"></el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="searchMethod" label="搜索方式" width="150" align="center">
+                    <template slot-scope="{row}">
+                        <el-select v-model="row.searchMethod">
+                            <el-option v-for="item in searchMethods" :label="item" :value="item"
+                                       :key="item"></el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="value" label="参数" align="center">
+                    <template slot-scope="{row}">
+                        <el-input v-model="row.value"></el-input>
+                    </template>
+                </el-table-column>
+                <el-table-column width="60" align="center">
+                    <template slot-scope="{ row, column, $index }">
+                        <el-button @click="removeField($index)" size="small" type="text">删除</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+
+            <span slot="footer" class="dialog-footer">
+
+                <el-button @click="advancedQuery" :loading="$store.state.fetchingData">确定</el-button>
+            </span>
+        </el-dialog>
+
+        <el-dialog title="排序" :visible.sync="showTableSortDialog">
+            <el-button @click="addSortField" type="text" icon="el-icon-plus">添加</el-button>
+            <el-table :data="tableSortFields">
+
+                <el-table-column prop="name" label="字段" align="center">
+                    <template slot-scope="{row}">
+                        <el-select v-model="row.name">
+
+                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value"
+                                       :key="item.value"></el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="order" label="排序" align="center">
+                    <template slot-scope="{row}">
+                        <el-select v-model="row.order">
+                            <el-option label="降序" value="desc">
+                            </el-option>
+                            <el-option label="升序" value="asc">
+                            </el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column width="60" align="center">
+                    <template slot-scope="{ row, column, $index }">
+                        <el-button @click="removeSortField($index)" size="small" type="text">删除</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+
+            <span slot="footer" class="dialog-footer">
+
+                <el-button @click="tableSortQuery" :loading="$store.state.fetchingData">确定</el-button>
+            </span>
+        </el-dialog>
+
+        <el-dialog title="查看图片" :visible.sync="imageDialogVisible" size="small">
+            <img width="100%" :src="imgSrc" alt="">
+        </el-dialog>
+
+    </div>
+</template>
+<script>
+    import {mapState} from 'vuex'
+    import {format} from 'date-fns'
+    import zh from 'date-fns/locale/zh_cn'
+
+    export default {
+        created() {
+            this.getData();
+        },
+        data() {
+            return {
+                totalNumber: 0,
+                totalPage: 10,
+                currentPage: 1,
+                pageSize: 20,
+                tableData: [],
+                filter1: '',
+                filter2: '',
+                tableColumns: [
+                                                                                                                                                                                                                                                                                                                                                {
+                                label: '用户',
+                                value: 'userId',
+                                show: true
+                            },
+                                                                                                {
+                                label: '订单编码',
+                                value: 'orderCode',
+                                show: true
+                            },
+                                                                                                {
+                                label: '店铺',
+                                value: 'storeId',
+                                show: true
+                            },
+                                                                                                {
+                                label: '商品类型',
+                                value: 'productType',
+                                show: true
+                            },
+                                                                                                {
+                                label: '商品ID',
+                                value: 'productId',
+                                show: true
+                            },
+                                                                                                {
+                                label: '商品名称',
+                                value: 'productName',
+                                show: true
+                            },
+                                                                                                {
+                                label: '规格',
+                                value: 'specification',
+                                show: true
+                            },
+                                                                                                {
+                                label: '单价',
+                                value: 'unitPrice',
+                                show: true
+                            },
+                                                                                                {
+                                label: '数量',
+                                value: 'quantity',
+                                show: true
+                            },
+                                                                                                {
+                                label: '优惠券',
+                                value: 'userCouponId',
+                                show: true
+                            },
+                                                                                                {
+                                label: '优惠金额',
+                                value: 'offPrice',
+                                show: true
+                            },
+                                                                                                {
+                                label: '总价',
+                                value: 'totlePrice',
+                                show: true
+                            },
+                                                                                                {
+                                label: '成交价',
+                                value: 'dealPrice',
+                                show: true
+                            },
+                                                                                                {
+                                label: '支付方式',
+                                value: 'payMode',
+                                show: true
+                            },
+                                                                                                {
+                                label: '支付时间',
+                                value: 'payTime',
+                                show: true
+                            },
+                                                                                                {
+                                label: '备注',
+                                value: 'remark',
+                                show: true
+                            },
+                                                                                                {
+                                label: '显示标识',
+                                value: 'showFlag',
+                                show: true
+                            },
+                                                                                                {
+                                label: '状态',
+                                value: 'statusFlag',
+                                show: true
+                            },
+                                                                                                {
+                                label: '手续费',
+                                value: 'fee',
+                                show: true
+                            },
+                                                            ],
+                multipleMode: false,
+                showAdvancedQueryDialog: false,
+                advancedQueryFields: [],
+                showTableSortDialog: false,
+                tableSortFields: [],
+                searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
+                advancedQueryColumns: [
+                                                                                                                                                                                                                                                                                                                                                {
+                                label: '用户',
+                                value: 'user_id'
+                            },
+                                                                                                {
+                                label: '订单编码',
+                                value: 'order_code'
+                            },
+                                                                                                {
+                                label: '店铺',
+                                value: 'store_id'
+                            },
+                                                                                                {
+                                label: '商品类型',
+                                value: 'product_type'
+                            },
+                                                                                                {
+                                label: '商品ID',
+                                value: 'product_id'
+                            },
+                                                                                                {
+                                label: '商品名称',
+                                value: 'product_name'
+                            },
+                                                                                                {
+                                label: '规格',
+                                value: 'specification'
+                            },
+                                                                                                {
+                                label: '单价',
+                                value: 'unit_price'
+                            },
+                                                                                                {
+                                label: '数量',
+                                value: 'quantity'
+                            },
+                                                                                                {
+                                label: '优惠券',
+                                value: 'user_coupon_id'
+                            },
+                                                                                                {
+                                label: '优惠金额',
+                                value: 'off_price'
+                            },
+                                                                                                {
+                                label: '总价',
+                                value: 'totle_price'
+                            },
+                                                                                                {
+                                label: '成交价',
+                                value: 'deal_price'
+                            },
+                                                                                                {
+                                label: '支付方式',
+                                value: 'pay_mode'
+                            },
+                                                                                                {
+                                label: '支付时间',
+                                value: 'pay_time'
+                            },
+                                                                                                {
+                                label: '备注',
+                                value: 'remark'
+                            },
+                                                                                                {
+                                label: '显示标识',
+                                value: 'show_flag'
+                            },
+                                                                                                {
+                                label: '状态',
+                                value: 'status_flag'
+                            },
+                                                                                                {
+                                label: '手续费',
+                                value: 'fee'
+                            },
+                                                            ],
+                advancedQuerySearchKey: '',
+                orderByStr: '',
+                imgSrc: '',
+                imageDialogVisible: false,
+            }
+        },
+        computed: {
+            ...mapState(['tableHeight']),
+            selection() {
+                return this.$refs.table.selection.map(i => i.id);
+            }
+        },
+        methods: {
+            pageSizeChange(size) {
+                this.currentPage = 1;
+                this.pageSize = size;
+                this.getData();
+            },
+            currentPageChange(page) {
+                this.currentPage = page;
+                this.getData();
+            },
+            getData() {
+
+                var data = {
+                    currentPage: this.currentPage,
+                    pageNumber: this.pageSize,
+                    searchKey: this.filter1,
+                    advancedQuery: this.advancedQuerySearchKey,
+                    orderByStr: this.orderByStr,
+                }
+
+                if (this.$route.query.column) {
+                    var tempColumn = this.$route.query.column;
+                    data[tempColumn.split(',')[1]] = tempColumn.split(',')[0];
+                }
+
+                this.$http.get({
+                    url: '/userOrder/page',
+                    data: data
+                }).then(res => {
+                    if (res.success) {
+                        this.totalNumber = res.data.page.totalNumber;
+                        this.tableData = res.data.pp;
+                    }
+                })
+            },
+            isColumnShow(column) {
+                var row = this.tableColumns.find(i => i.value === column);
+                return row ? row.show : false;
+            },
+            toggleMultipleMode(multipleMode) {
+                this.multipleMode = multipleMode;
+                if (!multipleMode) {
+                    this.$refs.table.clearSelection();
+                }
+            },
+            editRow(row) {
+                this.$router.push({
+                    path: '/userOrder',
+                    query: {
+                        id: row.id,
+                        column: this.$route.query.column,
+                    }
+                })
+            },
+            operation1() {
+                this.$notify({
+                    title: '提示',
+                    message: this.selection
+                });
+            },
+            operation2() {
+                this.$message('操作2');
+            },
+            addField() {
+                this.advancedQueryFields.push({
+                    link: 'AND',
+                    name: '',
+                    searchMethod: '=',
+                    value: '',
+                });
+            },
+            removeField(i) {
+                if (this.advancedQueryFields.length > 0) {
+                    this.advancedQueryFields.splice(i, 1);
+                }
+            },
+            advancedQuery() {
+
+                this.advancedQuerySearchKey = '';
+
+                if (this.advancedQueryFields.length > 0) {
+
+                    var templist = [];
+
+                    this.advancedQueryFields.forEach(item => {
+                        if (item.link && item.name && item.searchMethod && item.value) {
+                            var tempItem = item.link + '_,' + item.name + '_,' + item.searchMethod + '_,' + item.value;
+                            templist.push(tempItem);
+                        }
+                    })
+
+                    if (templist.length > 0) {
+
+                        this.advancedQuerySearchKey = templist.join('_;');
+                    }
+                }
+
+                this.getData();
+                this.showAdvancedQueryDialog = false;
+            },
+            addSortField() {
+                this.tableSortFields.push({
+                    name: '',
+                    order: 'asc',
+                });
+            },
+            removeSortField(i) {
+                if (this.tableSortFields.length > 0) {
+                    this.tableSortFields.splice(i, 1);
+                }
+            },
+            tableSortQuery() {
+
+                this.orderByStr = '';
+
+                if (this.tableSortFields.length > 0) {
+
+                    var templist = [];
+
+                    this.tableSortFields.forEach(item => {
+                        if (item.name && item.order) {
+                            var tempItem = item.name + '_,' + item.order;
+                            templist.push(tempItem);
+                        }
+                    })
+
+                    if (templist.length > 0) {
+
+                        this.orderByStr = templist.join('_;');
+                    }
+                }
+
+                this.getData();
+                this.showTableSortDialog = false;
+            },
+            exportExcel() {
+                window.location.href = this.$baseUrl + "/userOrder/exportExcel?searchKey="
+                        + this.filter1 + "&advancedQuery=" + this.advancedQuerySearchKey+"&orderByStr=" + this.orderByStr;
+            },
+            searchData() {
+                this.currentPage = 1;
+                this.getData();
+            },
+            deleteRow(row) {
+                this.$alert('删除将无法恢复，确认要删除么？', '警告', {type: 'error'}).then(() => {
+                    return this.$http.post({
+                        url: '/userOrder/del',
+                        data: {id: row.id}
+                    })
+                }).then(() => {
+                    this.$message.success('删除成功');
+                    this.getData();
+                }).catch(action => {
+                    if (action === 'cancel') {
+                        this.$message.info('删除取消');
+                    } else {
+                        this.$message.error('删除失败');
+                    }
+                })
+            },
+            DateTimeFormatter(row, column, cellValue) {
+                if (cellValue) {
+                    return format(cellValue, 'YYYY/MM/DD HH:mm', {locale: zh})
+                }
+
+            },
+            DateFormatter(row, column, cellValue) {
+                if (cellValue) {
+                    return format(cellValue, 'YYYY/MM/DD', {locale: zh})
+                }
+
+            },
+            showImg(img) {
+                this.imgSrc = img;
+                this.imageDialogVisible = true;
+            },
+
+        }
+    }
+</script>
+<style lang="less" scoped>
+
+</style>

src/main/vue/src/router/index.js

@@ -534,6 +534,16 @@ const router = new Router({
                     path: '/systemConfigs',
                     name: 'SystemConfigs',
                     component: () => import('../pages/SystemConfigs')
+                },
+                {
+                    path: '/userOrder',
+                    name: 'UserOrder',
+                    component: () => import('../pages/UserOrder')
+                },
+                {
+                    path: '/userOrders',
+                    name: 'UserOrders',
+                    component: () => import('../pages/UserOrders')
                 }
                 /**INSERT_LOCATION**/
             ]