订单查询

src/components/login.vue

@@ -122,7 +122,7 @@
                                     );
                                     window.localStorage.setItem(
                                         "zptoken",
-                                        response.data.data.userName
+                                        response.data.data.name
                                     );
                                     window.localStorage.setItem(
                                         "personInfo",

src/components/order.vue

@@ -3,8 +3,8 @@
         <el-row>
             <el-col :span="24">
 
-<!--                <el-button type="primary" @click="getRows">搜索</el-button>-->
-<!--                <el-button type="warning" @click="refreshTable">清空</el-button>-->
+                <!--                <el-button type="primary" @click="getRows">搜索</el-button>-->
+                <!--                <el-button type="warning" @click="refreshTable">清空</el-button>-->
             </el-col>
         </el-row>
         <el-table :data="tableData" ref="table" :height="autoHeight" border stripe v-loading="loading"
@@ -12,136 +12,59 @@
             <el-table-column type="index" label="排序" width="80"></el-table-column>
             <el-table-column
                     prop="orderCode"
-                    label="订单"
+                    label="订单号"
                     align="center">
             </el-table-column>
             <el-table-column
-                    prop="masterOrderCode"
-                    label="主订单"
+                    prop="customerName"
+                    label="买家"
                     align="center">
             </el-table-column>
             <el-table-column
-                    prop="price"
-                    label="订单价格"
-                    align="center">
-            </el-table-column>
-            <el-table-column
-                    prop="freightPrice"
-                    label="运费"
-                    align="center">
-            </el-table-column>
-            <el-table-column
-                    prop="status"
-                    label="订单状态"
-                    align="center">
-            </el-table-column>
-            <el-table-column
-                    prop="presaleStatus"
-                    label="预售订单状态"
-                    align="center">
-            </el-table-column>
-            <el-table-column
-                    prop="evaluationStatus"
-                    label="评价状态"
-                    align="center">
-            </el-table-column>
-            <el-table-column
-                    prop="payType"
-                    label="支付类型"
-                    align="center">
-            </el-table-column>
-
-            <el-table-column
-                    prop="cancelReson"
-                    label="订单取消原因"
-                    align="center">
-            </el-table-column>
-            <el-table-column
-                    prop="predepositPay"
-                    label="是否预存款支付"
-                    align="center">
-            </el-table-column>
-            <el-table-column
-                    prop="source"
-                    label="订单来源"
-                    align="center">
-            </el-table-column>
-            <el-table-column
-                    prop="waybillCode"
-                    label="运单号"
+                    prop="createTime"
+                    label="下单时间"
                     align="center">
             </el-table-column>
             <el-table-column
                     prop="orderType"
                     label="订单类型"
                     align="center">
+                <template slot-scope="scope">
+                    {{orderTypeOptions[scope.row.orderType].label}}
+                </template>
             </el-table-column>
             <el-table-column
-                    prop="createTime"
-                    label="创建时间"
-                    align="center">
-            </el-table-column>
-            <el-table-column
-                    prop="payTime"
-                    label="支付时间"
-                    align="center">
-            </el-table-column>
-            <el-table-column
-                    prop="deliveryTime"
-                    label="发货时间"
-                    align="center">
-            </el-table-column>
-            <el-table-column
-                    prop="receivingTime"
-                    label="确认收货时间"
-                    align="center">
-            </el-table-column>
-            <el-table-column
-                    prop="cancelTime"
-                    label="订单取消时间"
-                    align="center">
-            </el-table-column>
-            <el-table-column
-                    prop="modifyTime"
-                    label="修改时间"
-                    align="center">
-            </el-table-column>
-            <el-table-column
-                    prop="evaluationTime"
-                    label="订单评价时间"
-                    align="center">
-            </el-table-column>
-
-
-            <el-table-column
-                    prop="dealerId"
-                    label="经销商id"
-                    align="center">
-            </el-table-column>
-            <el-table-column
-                    prop="dealerInfo"
-                    label="经销商信息"
+                    prop="originalPrice"
+                    label="订单总额"
                     align="center">
             </el-table-column>
             <el-table-column
-                    prop="payChannel"
-                    label="订单支付渠道"
+                    prop="status"
+                    label="订单状态"
                     align="center">
+                <template slot-scope="scope">
+                    {{orderStatusOptions[scope.row.status-1].label}}
+                </template>
             </el-table-column>
             <el-table-column
-                    prop="skuType"
-                    label="商品类型"
+                    prop="payType"
+                    label="支付方式	"
                     align="center">
+                <template slot-scope="scope">
+                    {{payTypeOptions[scope.row.payType].label}}
+                </template>
             </el-table-column>
-
             <el-table-column
-                    prop="incomingUrl"
-                    label="来源"
+                    prop="source"
+                    label="来源	"
                     align="center">
+                <template slot-scope="scope">
+                    {{sourceOptions[scope.row.source-1].label}}
+                </template>
             </el-table-column>
-
             <el-table-column label="操作 " width="160px" fixed="right" align="center">
                 <template slot-scope="scope">
+                    <el-button type="success" round >查看</el-button>
 
                 </template>
             </el-table-column>
@@ -180,11 +103,83 @@
                     loanStatus: '',  // 状态
                     downPaymentRate: ''  // 比例
                 },
-                queryData: {
-
-                },
+                queryData: {},
+                sourceOptions: [
+                    {
+                        value: '1',
+                        label: "pc"
+                    }, {
+                        value: '2',
+                        label: "h5"
+                    }, {
+                        value: '3',
+                        label: "app"
+                    }
+                ],
+                payTypeOptions: [
+                    {
+                        value: '0',
+                        label: "在线支付"
+                    }, {
+                        value: '1',
+                        label: "货到付款"
+                    }
+                ],
+                orderStatusOptions: [
+                    {
+                        value: '1',
+                        label: "待付款"
+                    }, {
+                        value: '2',
+                        label: "代发货"
+                    }, {
+                        value: '3',
+                        label: "代收货"
+                    }, {
+                        value: '4',
+                        label: "已完成"
+                    }, {
+                        value: '5',
+                        label: "取消订单"
+                    }, {
+                        value: '6',
+                        label: "退款通过"
+                    }, {
+                        value: '7',
+                        label: "退货通过"
+                    },
+                ],
+                orderTypeOptions: [
+                    {
+                        value: '0',
+                        label: "普通订单"
+                    }, {
+                        value: '1',
+                        label: "定金预售订单"
+                    }, {
+                        value: '2',
+                        label: "2全款预售订单"
+                    }, {
+                        value: '3',
+                        label: "拼团订单"
+                    }, {
+                        value: '4',
+                        label: "众筹全款"
+                    }, {
+                        value: '5',
+                        label: "众筹1元"
+                    }, {
+                        value: '6',
+                        label: "众筹无回报"
+                    }, {
+                        value: '7',
+                        label: "虚拟商品订单"
+                    }, {
+                        value: '8',
+                        label: "社区团购订单"
+                    }
+                ]
 
-                refundState: '',
             };
         },
         computed: {