Merge branch '2.0' of http://git.zonelife.cn:3000/IT/admin-manage into 2.0

.drone.yml

@@ -0,0 +1,64 @@
+kind: pipeline
+type: docker
+name: default
+
+steps:
+
+  - name: install-node
+    image: node:16.10.0
+    commands:
+      - npm config set registry https://registry.npmmirror.com
+      - yarn config set registry https://registry.npmmirror.com
+      - yarn config list
+      - yarn config set proxy http://192.168.1.5:10809 -g
+      - yarn config set https-proxy http://192.168.1.5:10809 -g
+      - yarn install
+      - yarn build:test
+
+  - name: zip-dist
+    image: alpine:3.12
+    commands:
+      - apk add zip
+      - zip -r dist.zip dist
+
+  - name: push
+    image: appleboy/drone-scp
+    settings:
+      host:
+        from_secret: TestServerIP
+      port:
+        from_secret: Port
+      username: root
+      password: 
+        from_secret: TestServerPwd
+      command_timeout: 3m
+      target: /opt/docker/other/nginx/html/
+      source:
+        - dist.zip
+      status:
+        - success
+
+  - name: deploy
+    image: appleboy/drone-ssh
+    settings:
+      host:
+        from_secret: TestServerIP
+      username: root
+      password: 
+        from_secret: TestServerPwd
+      port:
+        from_secret: Port
+      script:
+        - 'cd /opt/docker/other/nginx/html'
+        - 'unzip dist.zip'
+        - 'rm -rf dist.zip'
+        - 'rm -rf admin'
+        - 'mv dist admin'
+        - 'docker exec nginx nginx -s reload'
+      status:
+        - success
+trigger:
+  branch:
+    - 2.0
+  event:
+    - push

src/api/order.js

@@ -113,3 +113,10 @@ export function orderCount(data) {
   })
 }
 
+// 获取出游信息
+// /goodsReserve/getReserve
+export function getReserve(orderNo) {
+	return request({
+		url: '/zswl-cloud-shop/goodsReserve/getReserve?orderNo='+orderNo,
+	})
+}

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: {
@@ -583,7 +626,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
+                            })
+                        }
+                    }
                 })
             }
         },

src/views/operationManage/orderManage/payDetail.vue

@@ -113,11 +113,52 @@
       >
       </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>
   </div>
 </template>
 
 <script>
-import { orderDetail } from "@/api/order";
+import { orderDetail,getReserve } from "@/api/order";
   import {timeFormat} from '@/utils/index'
 
 export default {
@@ -147,6 +188,8 @@ export default {
         },
       ],
       tableData: [],
+      persons:[],
+      isStudy:false
     };
   },
   filters: {
@@ -234,6 +277,22 @@ export default {
         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
+						})
+          }
         }
       });
     },