增加商品订单详情

.drone.yml

@@ -5,11 +5,12 @@ name: default
 steps:
 
   - name: install-node
-    image: node:16.10.0
+    image: node:16.12.2
     commands:
       - npm config set registry https://registry.npmmirror.com
       - yarn config set registry https://registry.npmmirror.com
-      - yarn 
+      - yarn config list
+      - yarn install
       - yarn build:test
 
   - name: zip-dist

src/views/operationManage/orderManage/orderDetail.vue

@@ -167,6 +167,47 @@
       </el-table-column>
     </el-table>
 
+    <div class="title" v-if="isStudy">研学用户信息</div>
+    <el-table
+      :data="persons"
+      tooltip-effect="dark"
+      v-if="isStudy"
+      border
+      v-loading="loading"
+      style="width: 100%"
+    >
+      <el-table-column
+        align="center"
+        label="类型"
+        prop="label"
+        show-overflow-tooltip
+      >
+      </el-table-column>
+      <el-table-column
+        prop="userName"
+        align="center"
+        label="名称"
+        show-overflow-tooltip
+      >
+    
+      </el-table-column>
+      <el-table-column
+        prop="phone"
+        align="center"
+        label="电话"
+        show-overflow-tooltip
+      >
+      </el-table-column>
+      <el-table-column
+        prop="idCard"
+        align="center"
+        label="身份证"
+        show-overflow-tooltip
+      >
+      </el-table-column>
+    
+    </el-table>
+
     <template v-if="tableData[0].goodsList[0].verifyModel">
 
         <div class="title">核销信息</div>
@@ -281,7 +322,7 @@
 </template>
 
 <script>
-import {auditRefund,transfer,orderDetail,subOrdersConfirm} from '@/api/order'
+import {auditRefund,transfer,orderDetail,subOrdersConfirm,getReserve} from '@/api/order'
   import {timeFormat} from '@/utils/index'
     export default {
         data() {
@@ -322,7 +363,9 @@ import {auditRefund,transfer,orderDetail,subOrdersConfirm} from '@/api/order'
                     },
                 ],
                 tableData: [],
-                goodsTypeObj:{}
+                goodsTypeObj:{},
+                persons:[],
+                isStudy:false
             }
         },
         computed: {
@@ -575,7 +618,24 @@ import {auditRefund,transfer,orderDetail,subOrdersConfirm} from '@/api/order'
                     this.loading = false
                      if(res.state == 'Success'){
                         this.tableData = [res.content];
-                     }
+                        
+                         // 判断是否为研学订单
+                        if(res.content?.goodsList[0]?.goodsInfo?.isStudy){
+                            getReserve(id).then(res=>{
+                            this.persons.push({
+                                label:'预定人',
+                                userName:res.content.reserveName,
+                                phone:res.content.reservePhone,
+                                idCard:'/'
+                            })
+                            this.persons = this.persons.concat(res.content.persons.map(e=>{
+                                e.label = '出游人'
+                                return e
+                            }))
+                            this.isStudy = true
+                            })
+                        }
+                    }
                 })
             }
         },