From ee87e55b63664710b8f01de7dd1e1d8c733cdda9 Mon Sep 17 00:00:00 2001
From: yuanteng <1876787513@qq.com>
Date: Tue, 5 Nov 2024 16:45:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E8=AE=A2=E5=8D=95=E8=BF=98?=
 =?UTF-8?q?=E6=9C=89=E4=BA=9B=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Orders/OrderList.vue       | 108 ++++++----
 src/views/Orders/orderOperations.vue |   4 +-
 src/views/test.vue                   | 293 ++++++++++++++++++++++-----
 3 files changed, 319 insertions(+), 86 deletions(-)

diff --git a/src/views/Orders/OrderList.vue b/src/views/Orders/OrderList.vue
index 05cb174..827a3e3 100644
--- a/src/views/Orders/OrderList.vue
+++ b/src/views/Orders/OrderList.vue
@@ -1,6 +1,6 @@
 <template>
 <div>
-  <el-input style="width: 200px; height: 30px; margin-right: 10px;" suffix-icon="Search" placeholder="请输入商品名称"
+  <el-input style="width: 200px; height: 30px; margin-right: 10px;" suffix-icon="Search" placeholder="请输入订单编号"
             v-model="name"></el-input>
   <el-button class="ml-5" type="primary" @click="load" style="height: 25px;">搜索</el-button>
   <el-button type="warning" @click="reset" style="height:25px">重置</el-button>
@@ -15,18 +15,43 @@
       </template>
     </el-popconfirm>
   </div>
+  <!-- 数据展示层 -->
   <el-table :data="tableData" border stripe header-cell-class-name="headerBg"
             :cell-style="{ 'text-align': 'center', 'font-size': '16px' }" @selection-change="handleSelectionChange"
             :header-cell-style="{ 'text-align': 'center' }">
-    <el-table-column type="selection" width="55"></el-table-column>
-    <el-table-column prop="id" label="订单id" width="80"></el-table-column>
+    <el-table-column type="selection" width="55" fixed="left"></el-table-column>
+    <el-table-column prop="id" label="订单编号" width="80"></el-table-column>
     <el-table-column prop="userId" label="用户id"></el-table-column>
-    <el-table-column prop="orderNumber" label="订单编号" width="180"></el-table-column>
+    <el-table-column prop="orderNumber" label="订单编号" width="150"></el-table-column>
+    <!-- 商品信息需要发第二次请求 -->
+    <el-table-column  label="所购买的商品" width="100">  
+      <el-table-column label="展开所有商品" type="expand" width="100">
+        <el-table :data="orderDetail">
+            <el-table-column label="商品编号" prop="id" />
+            <el-table-column label="商品名称" prop="orderDetail[num].type" />
+            <el-table-column label="商品图片" prop="orderDetail[num].price" />
+            <el-table-column label="类别" prop="city" />
+            <el-table-column label="商品单价" prop="address" />
+            <el-table-column label="是否是限定商品" prop="zip" />
+            <el-table-column label="数量" prop="address" />
+          </el-table>
+      </el-table-column>
+    </el-table-column>
+    <el-table-column label="地址信息快照" width="180">
+      <el-table-column prop="addressSnapshot.name" label="收货人" />
+      <el-table-column prop="addressSnapshot.phone" label="手机号" />
+      <el-table-column prop="addressSnapshot.region" label="地区" />
+      <el-table-column prop="addressSnapshot.detailAddress" label="详细地址" />
+    </el-table-column>
+    <el-table-column label="优惠卷信息快照" width="50">
+      <el-table-column prop="couponSnapshot.name" label="优惠卷名称" />
+      <el-table-column prop="couponSnapshot.conditionAmount" label="优惠金额" />
+    </el-table-column>
     <el-table-column prop="totalAmount" label="订单总金额"></el-table-column>
     <el-table-column prop="orderStatus" label="订单状态"></el-table-column>
-    <el-table-column label="操作" width="250px">
+    <el-table-column label="操作" width="120px" fixed="right">
       <template #default="scope">
-        <el-button size="small" @click="ReviseOrView(scope.$index, scope.row , 0)">
+        <el-button size="small" @click="showDetail(scope.$index, scope.row , 0)">
           详情
         </el-button>
         <el-popconfirm class="ml-5" confirm-button-text='确定' cancel-button-text='取消' icon="InfoFilled" icon-color="red"
@@ -42,12 +67,17 @@
     </el-table-column>
   </el-table>
   <div style="padding: 10px 0">
-    <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-                   :current-page="searchParams.current" :page-size="searchParams.pageSize" :page-sizes="[5, 10, 15, 20]"
-                   :small="null" :disabled="null" :background="null" layout="total, sizes, prev, pager, next, jumper"
+    <el-pagination @size-change="handleSizeChange" 
+                   @current-change="handleCurrentChange"
+                   :current-page="searchParams.current" 
+                   :page-size="searchParams.pageSize" 
+                   :page-sizes="[5, 10, 15, 20]"
+                   :small="null" :disabled="null" 
+                   :background="null" 
+                   layout="total, sizes, prev, pager, next, jumper"
                    :total="total" />
   </div>
-  <el-dialog title="订单详情信息" v-model="orderList" width="60%">
+  <!-- <el-dialog title="订单详情信息" v-model="orderList" width="60%">
     <el-form label-width="100px" size="default">
       <el-form-item label="订单id">
         <el-input v-model="orderList.id" autocomplete="off"></el-input>
@@ -95,14 +125,14 @@
         <el-button style="height: 30px" type="primary" @click=save>确认</el-button>
       </div>
     </template>
-   </el-dialog>
+   </el-dialog> -->
 </template>
 
 <script lang="ts" setup>
-import {ref} from "vue";
+import {onMounted, ref} from "vue";
 import myAxios from "@/api/myAxios";
 import {ElMessage} from "element-plus";
-const tableData : any= ref([]);
+const tableData : any= ref([]);  //表单展示数据
 const total = ref(0);
 const title = ref('')
 const editForm : any = ref({});
@@ -112,6 +142,13 @@ const searchParams: any = ref({ //封装分页
   current: 1, //当前页码
   pageSize: 5 //每页显示条数
 })
+const num  = ref(0)
+const orderDetail : any = ref([])  //订单中的商品明细，多个商品
+//订单列表
+const orderList = ref([{}])
+onMounted(()=>{  
+  getOrderList()  //页面加载获取订单列表
+})
 const handleSizeChange = (newSize: any) => {
   searchParams.value.pageSize = newSize //新的页面数
   getOrderList()
@@ -121,14 +158,29 @@ const handleCurrentChange = (Current: any) => {
   getOrderList()
 }
 const handleSelectionChange = (row: any) => {
-  id.value = JSON.parse(JSON.stringify(row));
+  // id.value = JSON.parse(JSON.stringify(row));
 }
 const getOrderList = async () => {
   try {
     const res = await myAxios.post('/order/list/page', { ...searchParams.value});
+    console.log('订单信息--->',res.data);
     if (res.data.code === 1) {
-      orderList.value = res.data.data.records;
+      tableData.value = res.data.data.records;
       total.value = parseInt(res.data.data.total)
+      console.log('tableData-->',tableData.value);
+      //获取订单记录成功后，获取订单详情记录
+      console.log('数组长度--->',tableData.value.length);
+      for(let key in tableData.value) {
+        num.value = parseInt(key)
+        const resOrderDetail = await myAxios.post('/order/list/item',{id:tableData.value[key].id})  //获取订单中详情记录
+        if( resOrderDetail.data.code === 1 ) {
+          orderDetail.value[num.value] = resOrderDetail.data.data  //订单中的商品明细，多个商品
+        }
+        console.log('请求返回的resOrderDetail--->',resOrderDetail.data);
+        console.log('第',key,'次返回的orderDetail-->',orderDetail.value[num.value]);
+        console.log('总的orderDetail-->',orderDetail.value);
+      }
+      // console.log(orderDetail.value);
     } else {
       ElMessage({
         message: '获取数据失败',
@@ -140,36 +192,16 @@ const getOrderList = async () => {
     });
   }
 }
-const orderList = ref({
-  id:'',
-  userId:'',
-  addressSnapshot:{
-    name:'',
-    phone:'',
-    region:'',
-    detailAddress:''
-  },
-  couponSnapshot:{
-    name:'',
-    conditionAmount:''
-  },
-  totalAmount:'',
-  orderStatus:'',
-  createTime:'',
-  updateTime:'',
-  isDelete:'',
-  orderNumber:'',
-})
 const delBatch =()=>{
   //批量删除
 }
-const ReviseOrView = (index: number, row: any , flag : number) => {
-title.value = "编辑商品"
+const showDetail = (index: number, row: any , flag : number) => {
+title.value = "订单详情"
   DialogVisible.value = true;
   editForm.value = row;
 };
 const deleteProduct = async (index: number) => {
-  console.log(typeof index)
+  // console.log(typeof index)
   const res = await myAxios.post('/goods/delete', { id: index })
   console.log(res)
   if (res.data.code === 1) {
diff --git a/src/views/Orders/orderOperations.vue b/src/views/Orders/orderOperations.vue
index 75e37dd..40a63ec 100644
--- a/src/views/Orders/orderOperations.vue
+++ b/src/views/Orders/orderOperations.vue
@@ -1,4 +1,4 @@
-<!--<template>-->
+<!-- <template>-->
 <!--<div>-->
 <!--  <el-input style="width: 200px; height: 30px; margin-right: 10px;" suffix-icon="Search" placeholder="请输入商品名称"-->
 <!--            v-model="id"></el-input>-->
@@ -164,4 +164,4 @@
 
 <!--<style lang="scss" scoped>-->
 
-<!--</style>-->
+<!--</style> -->
diff --git a/src/views/test.vue b/src/views/test.vue
index e76e800..f68b5b4 100644
--- a/src/views/test.vue
+++ b/src/views/test.vue
@@ -1,51 +1,252 @@
 <template>
-  <div>
-    <div
-      v-for="(item, index) in items" 
-      :key="index" 
-      class="box" 
-      @click="changeColor(index)" 
-      :style="getBoxStyle(index)"
-    >
-      {{ item }} 
-    </div>
-  </div>
+  switch parent border: <el-switch v-model="parentBorder" /> switch child
+  border: <el-switch v-model="childBorder" />
+  <el-table :data="tableData" :border="parentBorder" style="width: 100%">
+    <el-table-column type="expand">
+      <template #default="props">
+        <div m="4">
+          <p m="t-0 b-2">State: {{ props.row.state }}</p>
+          <p m="t-0 b-2">City: {{ props.row.city }}</p>
+          <p m="t-0 b-2">Address: {{ props.row.address }}</p>
+          <p m="t-0 b-2">Zip: {{ props.row.zip }}</p>
+          <h3>Family</h3>
+          <el-table :data="props.row.family" :border="childBorder">
+            <el-table-column label="Name" prop="name" />
+            <el-table-column label="State" prop="state" />
+            <el-table-column label="City" prop="city" />
+            <el-table-column label="Address" prop="address" />
+            <el-table-column label="Zip" prop="zip" />
+          </el-table>
+        </div>
+      </template>
+    </el-table-column>
+    <el-table-column label="Date" prop="date" />
+    <el-table-column label="Name" prop="name" />
+  </el-table>
 </template>
 
-<script>
-import { ref } from 'vue';
+<script lang="ts" setup>
+import { ref } from 'vue'
 
-export default {
-  setup() {
-    const items = ref(['Box 1', 'Box 2', 'Box 3']);
-    const currentColor = ref(null);
-
-    const changeColor = (index) => {
-      currentColor.value = index;
-    };
-
-    const getBoxStyle = (index) => ({
-      backgroundColor: currentColor.value === index ? 'lightblue' : 'gray'
-    });
-
-    return {
-      items,
-      changeColor,
-      getBoxStyle,
-    };
+const parentBorder = ref(false)
+const childBorder = ref(false)
+const tableData = [
+  {
+    date: '2016-05-03',
+    name: 'Tom',
+    state: 'California',
+    city: 'San Francisco',
+    address: '3650 21st St, San Francisco',
+    zip: 'CA 94114',
+    family: [
+      {
+        name: 'Jerry',
+        state: 'California',
+        city: 'San Francisco',
+        address: '3650 21st St, San Francisco',
+        zip: 'CA 94114',
+      },
+      {
+        name: 'Spike',
+        state: 'California',
+        city: 'San Francisco',
+        address: '3650 21st St, San Francisco',
+        zip: 'CA 94114',
+      },
+      {
+        name: 'Tyke',
+        state: 'California',
+        city: 'San Francisco',
+        address: '3650 21st St, San Francisco',
+        zip: 'CA 94114',
+      },
+    ],
   },
-};
-</script>
-
-<style>
-.box {
-  width: 200px;
-  height: 100px;
-  color: black;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  cursor: pointer;
-  margin: 5px 0;
-}
-</style>
+  {
+    date: '2016-05-02',
+    name: 'Tom',
+    state: 'California',
+    city: 'San Francisco',
+    address: '3650 21st St, San Francisco',
+    zip: 'CA 94114',
+    family: [
+      {
+        name: 'Jerry',
+        state: 'California',
+        city: 'San Francisco',
+        address: '3650 21st St, San Francisco',
+        zip: 'CA 94114',
+      },
+      {
+        name: 'Spike',
+        state: 'California',
+        city: 'San Francisco',
+        address: '3650 21st St, San Francisco',
+        zip: 'CA 94114',
+      },
+      {
+        name: 'Tyke',
+        state: 'California',
+        city: 'San Francisco',
+        address: '3650 21st St, San Francisco',
+        zip: 'CA 94114',
+      },
+    ],
+  },
+  {
+    date: '2016-05-04',
+    name: 'Tom',
+    state: 'California',
+    city: 'San Francisco',
+    address: '3650 21st St, San Francisco',
+    zip: 'CA 94114',
+    family: [
+      {
+        name: 'Jerry',
+        state: 'California',
+        city: 'San Francisco',
+        address: '3650 21st St, San Francisco',
+        zip: 'CA 94114',
+      },
+      {
+        name: 'Spike',
+        state: 'California',
+        city: 'San Francisco',
+        address: '3650 21st St, San Francisco',
+        zip: 'CA 94114',
+      },
+      {
+        name: 'Tyke',
+        state: 'California',
+        city: 'San Francisco',
+        address: '3650 21st St, San Francisco',
+        zip: 'CA 94114',
+      },
+    ],
+  },
+  {
+    date: '2016-05-01',
+    name: 'Tom',
+    state: 'California',
+    city: 'San Francisco',
+    address: '3650 21st St, San Francisco',
+    zip: 'CA 94114',
+    family: [
+      {
+        name: 'Jerry',
+        state: 'California',
+        city: 'San Francisco',
+        address: '3650 21st St, San Francisco',
+        zip: 'CA 94114',
+      },
+      {
+        name: 'Spike',
+        state: 'California',
+        city: 'San Francisco',
+        address: '3650 21st St, San Francisco',
+        zip: 'CA 94114',
+      },
+      {
+        name: 'Tyke',
+        state: 'California',
+        city: 'San Francisco',
+        address: '3650 21st St, San Francisco',
+        zip: 'CA 94114',
+      },
+    ],
+  },
+  {
+    date: '2016-05-08',
+    name: 'Tom',
+    state: 'California',
+    city: 'San Francisco',
+    address: '3650 21st St, San Francisco',
+    zip: 'CA 94114',
+    family: [
+      {
+        name: 'Jerry',
+        state: 'California',
+        city: 'San Francisco',
+        address: '3650 21st St, San Francisco',
+        zip: 'CA 94114',
+      },
+      {
+        name: 'Spike',
+        state: 'California',
+        city: 'San Francisco',
+        address: '3650 21st St, San Francisco',
+        zip: 'CA 94114',
+      },
+      {
+        name: 'Tyke',
+        state: 'California',
+        city: 'San Francisco',
+        address: '3650 21st St, San Francisco',
+        zip: 'CA 94114',
+      },
+    ],
+  },
+  {
+    date: '2016-05-06',
+    name: 'Tom',
+    state: 'California',
+    city: 'San Francisco',
+    address: '3650 21st St, San Francisco',
+    zip: 'CA 94114',
+    family: [
+      {
+        name: 'Jerry',
+        state: 'California',
+        city: 'San Francisco',
+        address: '3650 21st St, San Francisco',
+        zip: 'CA 94114',
+      },
+      {
+        name: 'Spike',
+        state: 'California',
+        city: 'San Francisco',
+        address: '3650 21st St, San Francisco',
+        zip: 'CA 94114',
+      },
+      {
+        name: 'Tyke',
+        state: 'California',
+        city: 'San Francisco',
+        address: '3650 21st St, San Francisco',
+        zip: 'CA 94114',
+      },
+    ],
+  },
+  {
+    date: '2016-05-07',
+    name: 'Tom',
+    state: 'California',
+    city: 'San Francisco',
+    address: '3650 21st St, San Francisco',
+    zip: 'CA 94114',
+    family: [
+      {
+        name: 'Jerry',
+        state: 'California',
+        city: 'San Francisco',
+        address: '3650 21st St, San Francisco',
+        zip: 'CA 94114',
+      },
+      {
+        name: 'Spike',
+        state: 'California',
+        city: 'San Francisco',
+        address: '3650 21st St, San Francisco',
+        zip: 'CA 94114',
+      },
+      {
+        name: 'Tyke',
+        state: 'California',
+        city: 'San Francisco',
+        address: '3650 21st St, San Francisco',
+        zip: 'CA 94114',
+      },
+    ],
+  },
+]
+</script>
\ No newline at end of file