licailing 5 tahun lalu
induk
melakukan
569001c0bf

+ 4 - 1
src/main/java/com/izouma/dingdong/domain/Appraisal.java

@@ -37,7 +37,10 @@ public class Appraisal extends BaseEntity {
     private String goodsAppraise;
     private String goodsAppraise;
 
 
     @ApiModelProperty(value = "骑手评分", name = "riderScore")
     @ApiModelProperty(value = "骑手评分", name = "riderScore")
-    private Integer riderScore;
+    private Integer riderLike;
+
+    @ApiModelProperty(value = "骑手评分", name = "riderScore")
+    private Integer riderBad;
 
 
     @ApiModelProperty(value = "骑手评价", name = "riderAppraise")
     @ApiModelProperty(value = "骑手评价", name = "riderAppraise")
     private String riderAppraise;
     private String riderAppraise;

+ 2 - 0
src/main/java/com/izouma/dingdong/repo/OrderGoodsSpecRepo.java

@@ -10,4 +10,6 @@ public interface OrderGoodsSpecRepo extends JpaRepository<OrderGoodsSpec, Long>,
 
 
     List<OrderGoodsSpec> findAllByOrderId(Long orderId);
     List<OrderGoodsSpec> findAllByOrderId(Long orderId);
 
 
+    List<OrderGoodsSpec> findAllByGoodsId(Long goodsId);
+
 }
 }

+ 16 - 2
src/main/java/com/izouma/dingdong/service/AppraisalService.java

@@ -1,23 +1,30 @@
 package com.izouma.dingdong.service;
 package com.izouma.dingdong.service;
 
 
+import cn.hutool.core.collection.CollUtil;
 import com.izouma.dingdong.domain.Appraisal;
 import com.izouma.dingdong.domain.Appraisal;
+import com.izouma.dingdong.domain.OrderGoodsSpec;
 import com.izouma.dingdong.domain.OrderInfo;
 import com.izouma.dingdong.domain.OrderInfo;
 import com.izouma.dingdong.domain.merchant.AutomaticResponse;
 import com.izouma.dingdong.domain.merchant.AutomaticResponse;
+import com.izouma.dingdong.domain.merchant.Goods;
 import com.izouma.dingdong.exception.BusinessException;
 import com.izouma.dingdong.exception.BusinessException;
 import com.izouma.dingdong.repo.AppraisalRepo;
 import com.izouma.dingdong.repo.AppraisalRepo;
+import com.izouma.dingdong.repo.OrderGoodsSpecRepo;
 import com.izouma.dingdong.repo.OrderInfoRepo;
 import com.izouma.dingdong.repo.OrderInfoRepo;
 import com.izouma.dingdong.repo.merchant.AutomaticResponseRepo;
 import com.izouma.dingdong.repo.merchant.AutomaticResponseRepo;
+import com.izouma.dingdong.repo.merchant.GoodsRepo;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
+import java.util.List;
+
 @Service
 @Service
 @AllArgsConstructor
 @AllArgsConstructor
 public class AppraisalService {
 public class AppraisalService {
 
 
     private AppraisalRepo appraisalRepo;
     private AppraisalRepo appraisalRepo;
-
+    private GoodsRepo goodsRepo;
     private OrderInfoRepo orderInfoRepo;
     private OrderInfoRepo orderInfoRepo;
-
+    private OrderGoodsSpecRepo orderGoodsSpecRepo;
 
 
     /*
     /*
     客户评价
     客户评价
@@ -34,5 +41,12 @@ public class AppraisalService {
         return appraisalRepo.save(appraisal);
         return appraisalRepo.save(appraisal);
     }
     }
 
 
+    /*
+    按商品查找评价
+     */
+    public List<Appraisal> goodsAppraisals(Long goodsId) {
+
+        return null;
+    }
 
 
 }
 }

+ 5 - 6
src/main/java/com/izouma/dingdong/web/OrderInfoController.java

@@ -1,7 +1,8 @@
 package com.izouma.dingdong.web;
 package com.izouma.dingdong.web;
+
 import com.izouma.dingdong.domain.OrderInfo;
 import com.izouma.dingdong.domain.OrderInfo;
 import com.izouma.dingdong.dto.UserOrderDTO;
 import com.izouma.dingdong.dto.UserOrderDTO;
-import com.izouma.dingdong.repo.UserRepo;
+
 import com.izouma.dingdong.service.OrderInfoService;
 import com.izouma.dingdong.service.OrderInfoService;
 import com.izouma.dingdong.dto.PageQuery;
 import com.izouma.dingdong.dto.PageQuery;
 import com.izouma.dingdong.exception.BusinessException;
 import com.izouma.dingdong.exception.BusinessException;
@@ -12,8 +13,6 @@ import com.izouma.dingdong.utils.excel.ExcelUtils;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 
 
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
@@ -79,9 +78,9 @@ public class OrderInfoController extends BaseController {
 
 
     @GetMapping("/list")
     @GetMapping("/list")
     @ApiOperation("/按userId查订单")
     @ApiOperation("/按userId查订单")
-    public Page<OrderInfo> list(Long id){
-        List<OrderInfo> list = orderInfoService.my(id);
-        return new PageImpl<>(list);
+    public List<OrderInfo> list(Long id){
+        //        new PageImpl<>(list,toPageRequest(pageQuery),pageQuery.getSize())
+        return orderInfoService.my(id);
     }
     }
 
 
 }
 }

+ 8 - 0
src/main/vue/src/router.js

@@ -312,6 +312,14 @@ const router = new Router({
                         title: '退款申请',
                         title: '退款申请',
                     },
                     },
                 },
                 },
+/*                {
+                    path: '/userOrderList',
+                    name: 'UserOrderList',
+                    component: () => import(/!* webpackChunkName: "userOrderList" *!/ '@/views/UserOrderList.vue'),
+                    meta: {
+                        title: '用户订单',
+                    },
+                },*/
             ],
             ],
         },
         },
         {
         {

+ 107 - 102
src/main/vue/src/views/OrderInfoEdit.vue

@@ -2,103 +2,104 @@
     <div class="edit-view">
     <div class="edit-view">
         <el-form :model="formData" :rules="rules" ref="form" label-width="108px" label-position="right" size="small"
         <el-form :model="formData" :rules="rules" ref="form" label-width="108px" label-position="right" size="small"
                  style="max-width: 500px;">
                  style="max-width: 500px;">
-                <el-form-item prop="userId" label="用户ID">
-                            <el-input-number type="number" v-model="formData.userId"></el-input-number>
-                </el-form-item>
-                <el-form-item prop="userAddress" label="配送地址">
-                            <el-input v-model="formData.userAddress"></el-input>
-                </el-form-item>
-                <el-form-item prop="merchantId" label="商户ID">
-                            <el-input-number type="number" v-model="formData.merchantId"></el-input-number>
-                </el-form-item>
-                <el-form-item prop="goodsId" label="商品ID">
-                            <el-input-number type="number" v-model="formData.goodsId"></el-input-number>
-                </el-form-item>
-                <el-form-item prop="merchantStatus" label="商家状态">
-                            <el-input v-model="formData.merchantStatus"></el-input>
-                </el-form-item>
-                <el-form-item prop="merchantAddress" label="商家地址">
-                            <el-input v-model="formData.merchantAddress"></el-input>
-                </el-form-item>
-                <el-form-item prop="jobNumber" label="骑手工号">
-                            <el-input v-model="formData.jobNumber"></el-input>
-                </el-form-item>
-                <el-form-item prop="riderStatus" label="骑手状态">
-                            <el-select v-model="formData.riderStatus" clearable filterable  placeholder="请选择">
-                                <el-option
-                                        v-for="item in riderStatusOptions"
-                                        :key="item.value"
-                                        :label="item.label"
-                                        :value="item.value">
-                                </el-option>
-                            </el-select>
-                </el-form-item>
-                <el-form-item prop="totalAmount" label="总价">
-                            <el-input-number type="number" v-model="formData.totalAmount"></el-input-number>
-                </el-form-item>
-                <el-form-item prop="goodsAmount" label="商品总价">
-                            <el-input-number type="number" v-model="formData.goodsAmount"></el-input-number>
-                </el-form-item>
-                <el-form-item prop="deliveryAmount" label="配送费">
-                            <el-input-number type="number" v-model="formData.deliveryAmount"></el-input-number>
-                </el-form-item>
-                <el-form-item prop="realAmount" label="实付金额">
-                            <el-input-number type="number" v-model="formData.realAmount"></el-input-number>
-                </el-form-item>
-                <el-form-item prop="payMethod" label="支付方式">
-                            <el-select v-model="formData.payMethod" clearable filterable  placeholder="请选择">
-                                <el-option
-                                        v-for="item in payMethodOptions"
-                                        :key="item.value"
-                                        :label="item.label"
-                                        :value="item.value">
-                                </el-option>
-                            </el-select>
-                </el-form-item>
-                <el-form-item prop="cancel" label="取消订单">
-                            <el-switch v-model="formData.cancel"></el-switch>
-                </el-form-item>
-                <el-form-item prop="rated" label="已评价">
-                            <el-switch v-model="formData.rated"></el-switch>
-                </el-form-item>
-                <el-form-item prop="orderTime" label="下单时间">
-                            <el-date-picker
-                                    v-model="formData.orderTime"
-                                    type="datetime"
-                                    value-format="yyyy-MM-dd HH:mm:ss"
-                                    placeholder="选择日期时间">
-                            </el-date-picker>
-                </el-form-item>
-                <el-form-item prop="merchantOrderTime" label="商家接单时间">
-                            <el-date-picker
-                                    v-model="formData.merchantOrderTime"
-                                    type="datetime"
-                                    value-format="yyyy-MM-dd HH:mm:ss"
-                                    placeholder="选择日期时间">
-                            </el-date-picker>
-                </el-form-item>
-                <el-form-item prop="riderOrderTime" label="骑手接单时间">
-                            <el-date-picker
-                                    v-model="formData.riderOrderTime"
-                                    type="datetime"
-                                    value-format="yyyy-MM-dd HH:mm:ss"
-                                    placeholder="选择日期时间">
-                            </el-date-picker>
-                </el-form-item>
-                <el-form-item prop="userReceivedTime" label="用户收到时间">
-                            <el-date-picker
-                                    v-model="formData.userReceivedTime"
-                                    type="datetime"
-                                    value-format="yyyy-MM-dd HH:mm:ss"
-                                    placeholder="选择日期时间">
-                            </el-date-picker>
-                </el-form-item>
-                <el-form-item prop="isCoupon" label="使用优惠券">
-                            <el-switch v-model="formData.isCoupon"></el-switch>
-                </el-form-item>
+            <el-form-item prop="userId" label="用户ID">
+                <el-input-number type="number" v-model="formData.userId"></el-input-number>
+            </el-form-item>
+            <el-form-item prop="userAddress" label="配送地址">
+                <el-input v-model="formData.userAddress"></el-input>
+            </el-form-item>
+            <el-form-item prop="merchantId" label="商户ID">
+                <el-input-number type="number" v-model="formData.merchantId"></el-input-number>
+            </el-form-item>
+            <el-form-item prop="goodsId" label="商品ID">
+                <el-input-number type="number" v-model="formData.goodsId"></el-input-number>
+            </el-form-item>
+            <el-form-item prop="merchantStatus" label="商家状态">
+                <el-input v-model="formData.merchantStatus"></el-input>
+            </el-form-item>
+            <el-form-item prop="merchantAddress" label="商家地址">
+                <el-input v-model="formData.merchantAddress"></el-input>
+            </el-form-item>
+            <el-form-item prop="jobNumber" label="骑手工号">
+                <el-input v-model="formData.jobNumber"></el-input>
+            </el-form-item>
+            <el-form-item prop="riderStatus" label="骑手状态">
+                <el-select v-model="formData.riderStatus" clearable filterable placeholder="请选择">
+                    <el-option
+                            v-for="item in riderStatusOptions"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item prop="totalAmount" label="总价">
+                <el-input-number type="number" v-model="formData.totalAmount"></el-input-number>
+            </el-form-item>
+            <el-form-item prop="goodsAmount" label="商品总价">
+                <el-input-number type="number" v-model="formData.goodsAmount"></el-input-number>
+            </el-form-item>
+            <el-form-item prop="deliveryAmount" label="配送费">
+                <el-input-number type="number" v-model="formData.deliveryAmount"></el-input-number>
+            </el-form-item>
+            <el-form-item prop="realAmount" label="实付金额">
+                <el-input-number type="number" v-model="formData.realAmount"></el-input-number>
+            </el-form-item>
+            <el-form-item prop="payMethod" label="支付方式">
+                <el-select v-model="formData.payMethod" clearable filterable placeholder="请选择">
+                    <el-option
+                            v-for="item in payMethodOptions"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item prop="cancel" label="取消订单">
+                <el-switch v-model="formData.cancel"></el-switch>
+            </el-form-item>
+            <el-form-item prop="rated" label="已评价">
+                <el-switch v-model="formData.rated"></el-switch>
+            </el-form-item>
+            <el-form-item prop="orderTime" label="下单时间">
+                <el-date-picker
+                        v-model="formData.orderTime"
+                        type="datetime"
+                        value-format="yyyy-MM-dd HH:mm:ss"
+                        placeholder="选择日期时间">
+                </el-date-picker>
+            </el-form-item>
+<!--            <el-form-item prop="merchantOrderTime" label="商家接单时间">-->
+<!--                <el-date-picker-->
+<!--                        v-model="formData.merchantOrderTime"-->
+<!--                        type="datetime"-->
+<!--                        value-format="yyyy-MM-dd HH:mm:ss"-->
+<!--                        placeholder="选择日期时间">-->
+<!--                </el-date-picker>-->
+<!--            </el-form-item>-->
+<!--            <el-form-item prop="riderOrderTime" label="骑手接单时间">-->
+<!--                <el-date-picker-->
+<!--                        v-model="formData.riderOrderTime"-->
+<!--                        type="datetime"-->
+<!--                        value-format="yyyy-MM-dd HH:mm:ss"-->
+<!--                        placeholder="选择日期时间">-->
+<!--                </el-date-picker>-->
+<!--            </el-form-item>-->
+            <el-form-item prop="userReceivedTime" label="用户收到时间">
+                <el-date-picker
+                        v-model="formData.userReceivedTime"
+                        type="datetime"
+                        value-format="yyyy-MM-dd HH:mm:ss"
+                        placeholder="选择日期时间">
+                </el-date-picker>
+            </el-form-item>
+            <el-form-item prop="isCoupon" label="使用优惠券">
+                <el-switch v-model="formData.isCoupon"></el-switch>
+            </el-form-item>
             <el-form-item>
             <el-form-item>
                 <el-button @click="onSave" :loading="saving"
                 <el-button @click="onSave" :loading="saving"
-                           type="primary">保存</el-button>
+                           type="primary">保存
+                </el-button>
                 <el-button @click="onDelete" :loading="saving"
                 <el-button @click="onDelete" :loading="saving"
                            type="danger" v-if="formData.id">删除
                            type="danger" v-if="formData.id">删除
                 </el-button>
                 </el-button>
@@ -113,7 +114,7 @@
         created() {
         created() {
             if (this.$route.query.id) {
             if (this.$route.query.id) {
                 this.$http
                 this.$http
-                    .get('orderInfo/get/'+this.$route.query.id)
+                    .get('orderInfo/get/' + this.$route.query.id)
                     .then(res => {
                     .then(res => {
                         this.formData = res;
                         this.formData = res;
                     })
                     })
@@ -126,12 +127,16 @@
         data() {
         data() {
             return {
             return {
                 saving: false,
                 saving: false,
-                formData: {
-                },
-                rules: {
-                },
-                            riderStatusOptions:[{"label":"JIEDAN","value":"JIEDAN"},{"label":"QUCAN","value":"QUCAN"},{"label":"SONGCAN","value":"SONGCAN"},{"label":"WANCHENG","value":"WANCHENG"}],
-                            payMethodOptions:[{"label":"支付宝","value":"ALI_PAY"},{"label":"货到付款","value":"CASH_DELIVERY"},{"label":"信用卡","value":"CREDIT_CARD"}],
+                formData: {},
+                rules: {},
+                riderStatusOptions: [{"label": "接单", "value": "RECEIVED"}, {
+                    "label": "取餐",
+                    "value": "TAKE_MEAL"
+                }, {"label": "送餐", "value": "MEAL_DELIVERY"}, {"label": "完成", "value": "CARRY_OUT"}],
+                payMethodOptions: [{"label": "支付宝", "value": "ALI_PAY"}, {
+                    "label": "货到付款",
+                    "value": "CASH_DELIVERY"
+                }, {"label": "信用卡", "value": "CREDIT_CARD"}],
             }
             }
         },
         },
         methods: {
         methods: {

+ 17 - 17
src/main/vue/src/views/OrderInfoList.vue

@@ -136,7 +136,7 @@
                 search: "",
                 search: "",
                 url: "/orderInfo/all",
                 url: "/orderInfo/all",
                 downloading: false,
                 downloading: false,
-                        riderStatusOptions:[{"label":"JIEDAN","value":"JIEDAN"},{"label":"QUCAN","value":"QUCAN"},{"label":"SONGCAN","value":"SONGCAN"},{"label":"WANCHENG","value":"WANCHENG"}],
+                        riderStatusOptions:[{"label":"接单","value":"RECEIVED"},{"label":"取餐","value":"TAKE_MEAL"},{"label":"送餐","value":"MEAL_DELIVERY"},{"label":"完成","value":"CARRY_OUT"}],
                         payMethodOptions:[{"label":"支付宝","value":"ALI_PAY"},{"label":"货到付款","value":"CASH_DELIVERY"},{"label":"信用卡","value":"CREDIT_CARD"}],
                         payMethodOptions:[{"label":"支付宝","value":"ALI_PAY"},{"label":"货到付款","value":"CASH_DELIVERY"},{"label":"信用卡","value":"CREDIT_CARD"}],
             }
             }
         },
         },
@@ -171,22 +171,22 @@
                     this.$refs.table.clearSelection();
                     this.$refs.table.clearSelection();
                 }
                 }
             },
             },
-            addRow() {
-                this.$router.push({
-                    path: "/orderInfoEdit",
-                    query: {
-                    ...this.$route.query
-                    }
-                });
-            },
-            editRow(row) {
-                this.$router.push({
-                    path: "/orderInfoEdit",
-                    query: {
-                    id: row.id
-                    }
-                });
-            },
+            // addRow() {
+            //     this.$router.push({
+            //         path: "/orderInfoEdit",
+            //         query: {
+            //         ...this.$route.query
+            //         }
+            //     });
+            // },
+            // editRow(row) {
+            //     this.$router.push({
+            //         path: "/orderInfoEdit",
+            //         query: {
+            //         id: row.id
+            //         }
+            //     });
+            // },
             download() {
             download() {
                 this.downloading = true;
                 this.downloading = true;
                 this.$axios
                 this.$axios

+ 9 - 1
src/main/vue/src/views/UserList.vue

@@ -49,7 +49,7 @@
                 <template slot-scope="{row}">
                 <template slot-scope="{row}">
                     <el-button @click="editRow(row)" type="primary" size="mini"
                     <el-button @click="editRow(row)" type="primary" size="mini"
                         plain>详情</el-button>
                         plain>详情</el-button>
-                    <el-button @click="editRow(row)" type="primary" size="mini"
+                    <el-button @click="orderRow(row)" type="primary" size="mini"
                         plain>订单</el-button>
                         plain>订单</el-button>
                 </template>
                 </template>
             </el-table-column>
             </el-table-column>
@@ -112,6 +112,14 @@ export default {
                 }
                 }
             });
             });
         },
         },
+        orderRow(row) {
+            this.$router.push({
+                path: "/orderInfoList",
+                query: {
+                    id: row.id
+                }
+            });
+        },
         download() {
         download() {
             this.downloading = true;
             this.downloading = true;
             this.$axios
             this.$axios

+ 236 - 0
src/main/vue/src/views/UserOrderList.vue

@@ -0,0 +1,236 @@
+<template>
+  <div class="edit-view">
+    <!--        <div class="filters-container">
+                    <el-input placeholder="输入关键字" v-model="search" clearable
+                              class="filter-item"></el-input>
+                    <el-button @click="getData" type="primary" icon="el-icon-search"
+                               class="filter-item">搜索
+                    </el-button>
+                    <el-button @click="addRow" type="primary" icon="el-icon-plus"
+                               class="filter-item">添加
+                    </el-button>
+                    <el-button @click="download" type="primary" icon="el-icon-download"
+                               :loading="downloading" class="filter-item">导出EXCEL
+                    </el-button>
+    </div>-->
+    <el-table
+      :data="formData"
+      row-key="id"
+      ref="table"
+      header-row-class-name="table-header-row"
+      header-cell-class-name="table-header-cell"
+      row-class-name="table-row"
+      cell-class-name="table-cell"
+      :height="tableHeight"
+    >
+      <el-table-column v-if="multipleMode" align="center" type="selection" width="50"></el-table-column>
+      <el-table-column prop="id" label="ID" width="100"></el-table-column>
+      <el-table-column prop="userId" label="用户ID"></el-table-column>
+      <el-table-column prop="userAddress" label="配送地址"></el-table-column>
+      <el-table-column prop="merchantId" label="商户ID"></el-table-column>
+      <el-table-column prop="merchantStatus" label="商家状态"></el-table-column>
+      <el-table-column prop="jobNumber" label="骑手工号"></el-table-column>
+      <el-table-column prop="riderStatus" label="骑手状态" :formatter="riderStatusFormatter"></el-table-column>
+      <el-table-column prop="goodsAmount" label="商品总价"></el-table-column>
+      <el-table-column prop="deliveryAmount" label="配送费"></el-table-column>
+      <el-table-column prop="realAmount" label="实付金额"></el-table-column>
+      <el-table-column prop="payMethod" label="支付方式" :formatter="payMethodFormatter"></el-table-column>
+      <el-table-column prop="cancel" label="取消订单">
+        <template slot-scope="{row}">
+          <el-tag :type="row.cancel?'':'info'">{{row.cancel}}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column prop="rated" label="已评价">
+        <template slot-scope="{row}">
+          <el-tag :type="row.rated?'':'info'">{{row.rated}}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column prop="orderTime" label="下单时间" :formatter="datetimeFormatter"></el-table-column>
+      <!--                    <el-table-column prop="merchantOrderTime" label="商家接单时间"
+                                        :formatter="datetimeFormatter"
+            >
+                                </el-table-column>
+                                <el-table-column prop="riderOrderTime" label="骑手接单时间"
+                                        :formatter="datetimeFormatter"
+            >
+      </el-table-column>-->
+      <el-table-column prop="userReceivedTime" label="用户收到时间" :formatter="datetimeFormatter"></el-table-column>
+      <!--                    <el-table-column prop="isCoupon" label="使用优惠券"
+            >
+                                        <template slot-scope="{row}">
+                                            <el-tag :type="row.isCoupon?'false':'info'">{{row.isCoupon}}</el-tag>
+                                        </template>
+      </el-table-column>-->
+      <el-table-column label="操作" align="center" fixed="right" min-width="150">
+        <template slot-scope="{row}">
+          <!--<el-button @click="editRow(row)" type="primary" size="mini" plain>编辑</el-button>
+          <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button>-->
+          <el-button @click="editRow(row)" type="primary" size="mini" plain>详情</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--        <div class="pagination-wrapper">
+                    <el-pagination background @size-change="onSizeChange"
+                                   @current-change="onCurrentChange" :current-page="page"
+                                   :page-sizes="[10, 20, 30, 40, 50]" :page-size="pageSize"
+                                   layout="total, sizes, prev, pager, next, jumper"
+                                   :total="totalElements">
+                    </el-pagination>
+    </div>-->
+  </div>
+</template>
+<script>
+import { mapState } from "vuex";
+import pageableTable from "@/mixins/pageableTable";
+
+export default {
+  name: "UserOrderList",
+  props: ["id"],
+  //mixins: [pageableTable],
+  created() {
+    this.getData();
+  },
+  mounted() {
+    this.tableHeight = document
+      .querySelector(".el-table")
+      .getBoundingClientRect().height;
+  },
+  data() {
+    return {
+      multipleMode: false,
+      //search: "",
+      downloading: false,
+      formData: {},
+      riderStatusOptions: [
+        { label: "接单", value: "RECEIVED" },
+        {
+          label: "取餐",
+          value: "TAKE_MEAL"
+        },
+        { label: "送餐", value: "MEAL_DELIVERY" },
+        { label: "完成", value: "CARRY_OUT" }
+      ],
+      payMethodOptions: [
+        { label: "支付宝", value: "ALI_PAY" },
+        {
+          label: "货到付款",
+          value: "CASH_DELIVERY"
+        },
+        { label: "信用卡", value: "CREDIT_CARD" }
+      ]
+    };
+  },
+  computed: {
+    selection() {
+      return this.$refs.table.selection.map(i => i.id);
+    }
+  },
+  methods: {
+    riderStatusFormatter(row, column, cellValue, index) {
+      let selectedOption = this.riderStatusOptions.find(
+        i => i.value === cellValue
+      );
+      if (selectedOption) {
+        return selectedOption.label;
+      }
+      return "";
+    },
+    payMethodFormatter(row, column, cellValue, index) {
+      let selectedOption = this.payMethodOptions.find(
+        i => i.value === cellValue
+      );
+      if (selectedOption) {
+        return selectedOption.label;
+      }
+      return "";
+    },
+    // beforeGetData() {
+    //     if (this.search) {
+    //         return {search: this.search};
+    //     }
+    // },
+
+    getData() {
+      let data = {};
+      this.$http.get("/orderInfo/list", data).then(res => {
+        this.id = res.id;
+      });
+    },
+
+    toggleMultipleMode(multipleMode) {
+      this.multipleMode = multipleMode;
+      if (!multipleMode) {
+        this.$refs.table.clearSelection();
+      }
+    },
+    // addRow() {
+    //     this.$router.push({
+    //         path: "/orderInfoEdit",
+    //         query: {
+    //             ...this.$route.query
+    //         }
+    //     });
+    // },
+    // editRow(row) {
+    //     this.$router.push({
+    //         path: "/orderInfoEdit",
+    //         query: {
+    //             id: row.id
+    //         }
+    //     });
+    // },
+    download() {
+      this.downloading = true;
+      this.$axios
+        .get("/orderInfo/excel", {
+          responseType: "blob",
+          params: { size: 10000 }
+        })
+        .then(res => {
+          console.log(res);
+          this.downloading = false;
+          const downloadUrl = window.URL.createObjectURL(new Blob([res.data]));
+          const link = document.createElement("a");
+          link.href = downloadUrl;
+          link.setAttribute(
+            "download",
+            res.headers["content-disposition"].split("filename=")[1]
+          );
+          document.body.appendChild(link);
+          link.click();
+          link.remove();
+        })
+        .catch(e => {
+          console.log(e);
+          this.downloading = false;
+          this.$message.error(e.error);
+        });
+    },
+    operation1() {
+      this.$notify({
+        title: "提示",
+        message: this.selection
+      });
+    },
+    operation2() {
+      this.$message("操作2");
+    }
+    // deleteRow(row) {
+    //     this.$alert('删除将无法恢复,确认要删除么?', '警告', {type: 'error'}).then(() => {
+    //         return this.$http.post(`/orderInfo/del/${row.id}`)
+    //     }).then(() => {
+    //         this.$message.success('删除成功');
+    //         this.getData();
+    //     }).catch(action => {
+    //         if (action === 'cancel') {
+    //             this.$message.info('删除取消');
+    //         } else {
+    //             this.$message.error('删除失败');
+    //         }
+    //     })
+    // },
+  }
+};
+</script>
+<style lang="less" scoped>
+</style>