篮球场扫码入场

src/api/device.js

@@ -11,6 +11,14 @@ export function reconnect(id) {
   return http.post('/device/reconnect/' + id)
 }
 
+export function adminEnter(id) {
+  return http.post('/device/admin/enter/' + id)
+}
+
+export function adminOut(id) {
+  return http.post('/device/admin/out/' + id)
+}
+
 /**
  * 删除门禁设备
  */

src/views/device/index.vue

@@ -18,14 +18,14 @@
   <Pagination uri="/devices" :request-params="params" ref="pagination">
 
       <!-- 设备名称 -->
-      <el-table-column align="center" label="名称">
+      <el-table-column align="center" label="门禁序列号">
         <template scope="scope">
           <span>{{scope.row.name}}</span>
         </template>
       </el-table-column>
 
       <!-- 视频流地址 -->
-      <el-table-column align="center" label="视频流地址">
+      <el-table-column align="center" label="设备IP地址">
         <template scope="scope">
           <span>{{scope.row.stream}}</span>
         </template>
@@ -46,9 +46,9 @@
 
     <el-table-column label="操作" align="center" width="150">
       <template scope="scope">
-        <el-button size="small" type="text" @click="handleEdit(scope.row.id)">编辑</el-button>
-        <el-button size="small" type="text" class="danger" @click="handleDelete(scope.row)">删除</el-button>
-        <el-button size="small" v-if="scope.row.status == 0" type="text" @click="handleReconnect(scope.row.id)">重新连接</el-button>
+        <el-button size="small" type="text" @click="handleEnter(scope.row.id)">管理员进场</el-button>
+        <el-button size="small" type="text" class="danger" @click="handleOut(scope.row.id)">管理员出场</el-button>
+<!--        <el-button size="small" v-if="scope.row.status == 0" type="text" @click="handleReconnect(scope.row.id)">重新连接</el-button>-->
       </template>
     </el-table-column>
   </Pagination>
@@ -56,7 +56,7 @@
 </template>
 
 <script>
-import { remove, reconnect } from '@/api//device'
+import { remove, reconnect ,adminEnter,adminOut} from '@/api//device'
 import waves from '@/directive/waves.js'// 水波纹指令
 import Pagination from '@/components/Pagination'
 import { findVenueByType } from '@/api//venue'
@@ -102,6 +102,18 @@ export default {
         this.handleSearch()
       })
     },
+
+    handleEnter(id) {
+      adminEnter(id).then(response => {
+        this.handleSearch()
+      })
+    },
+
+    handleOut(id) {
+      adminOut(id).then(response => {
+        this.handleSearch()
+      })
+    },
     /**
      * 搜索门禁设备
      */

src/views/member/edit.vue

@@ -30,13 +30,13 @@
             </el-table-column>
 
             <!-- 支付状态 -->
-            <el-table-column align="center" label="支付状态">
-              <template scope="scope">
-                <span v-if="scope.row.payStatus === -1">已取消</span>
-                <span v-if="scope.row.payStatus === 0">未支付</span>
-                <span v-if="scope.row.payStatus === 1">已支付</span>
-              </template>
-            </el-table-column>
+<!--            <el-table-column align="center" label="支付状态">-->
+<!--              <template scope="scope">-->
+<!--                <span v-if="scope.row.payStatus === -1">已取消</span>-->
+<!--                <span v-if="scope.row.payStatus === 0">未支付</span>-->
+<!--                <span v-if="scope.row.payStatus === 1">已支付</span>-->
+<!--              </template>-->
+<!--            </el-table-column>-->
 
             <!-- 入场支付订单 -->
             <el-table-column align="center" label="订单">
@@ -48,20 +48,28 @@
             <!-- 入场支付方式 -->
             <el-table-column align="center" label="支付方式">
               <template scope="scope">
-                <span v-if="scope.row.payType === 1">微信支付</span>
-                <span v-if="scope.row.payType === 2">会员卡</span>
+                <span v-if="scope.row.payType === 1">N/A</span>
+                <span v-if="scope.row.payType === 2">余额</span>
+                <span v-if="scope.row.payType === 3">会员卡</span>
               </template>
             </el-table-column>
 
+          <el-table-column align="center" label="类型">
+            <template scope="scope">
+              <span v-if="scope.row.type === 1">出场</span>
+              <span v-if="scope.row.type === 0">入场</span>
+            </template>
+          </el-table-column>
+
             <!-- 价格 -->
-            <el-table-column align="center" label="价格">
-              <template scope="scope">
-                <span>{{scope.row.price}}</span>
-              </template>
-            </el-table-column>
+<!--            <el-table-column align="center" label="价格">-->
+<!--              <template scope="scope">-->
+<!--                <span>{{scope.row.price}}</span>-->
+<!--              </template>-->
+<!--            </el-table-column>-->
 
             <!-- 进场时间 -->
-            <el-table-column align="center" label="进场时间">
+            <el-table-column align="center" label="扫码时间">
               <template scope="scope">
                 <span>{{scope.row.createdTime | parseTime('{y}-{m}-{d} {h}:{i}')}}</span>
               </template>
@@ -82,7 +90,7 @@
             <!-- 类型 -->
             <el-table-column align="center" label="类型">
               <template scope="scope">
-                <span v-if="scope.row.type === 1">进场</span>
+                <span v-if="scope.row.type === 1">扫码订单</span>
                 <span v-if="scope.row.type === 2">购买会员卡</span>
                 <span v-if="scope.row.type === 3">购买课程</span>
                 <span v-if="scope.row.type === 4">充值</span>

src/views/member/enter/veneu/log/edit.vue

@@ -11,6 +11,8 @@
             <el-col :span="8" class="span-fost">用户昵称:</el-col>
             <span v-text="form.nickname" @click="handleEdit(form.memberId)" style="cursor:pointer;color: blue;"></span>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="8">
             <el-col :span="8" class="span-fost">场馆类型: </el-col>
             <span v-if="form.veneuType === 1">篮球馆</span>
@@ -18,43 +20,44 @@
             <span v-if="form.veneuType === 2">足球场</span>
           </el-col>
         </el-row>
+<!--          <el-col :span="8">-->
+<!--            <el-col :span="8" class="span-fost">支付状态: </el-col>-->
+<!--            <span v-if="form.payStatus === -1">已取消</span>-->
+<!--            <span v-if="form.payStatus === 0">未支付</span>-->
+<!--            <span v-if="form.payStatus === 1">已支付</span>-->
+<!--          </el-col>-->
         <el-row>
           <el-col :span="8">
-            <el-col :span="8" class="span-fost">支付状态: </el-col>
-            <span v-if="form.payStatus === -1">已取消</span>
-            <span v-if="form.payStatus === 0">未支付</span>
-            <span v-if="form.payStatus === 1">已支付</span>
-          </el-col>
-          <el-col :span="8">
-            <el-col :span="8" class="span-fost">订单号: </el-col>
-            <span v-text="form.orderSn"></span>
+            <el-col :span="8" class="span-fost">订单号码: </el-col>
+            <el-col :span="8" v-text="form.orderSn"></el-col>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="8">
-            <el-col :span="8" class="span-fost">场馆: </el-col>
+            <el-col :span="8" class="span-fost">场馆名称: </el-col>
             <span v-text="form.name"></span>
           </el-col>
-          <el-col :span="8">
-            <el-col :span="8" class="span-fost">进场价格: </el-col>
-            <span v-text="form.price"></span>
-          </el-col>
+<!--          <el-col :span="8">-->
+<!--            <el-col :span="8" class="span-fost">进场价格: </el-col>-->
+<!--            <span v-text="form.price"></span>-->
+<!--          </el-col>-->
         </el-row>
+<!--        <el-row>-->
+<!--          <el-col :span="8">-->
+<!--            <el-col :span="8" class="span-fost">下单时间: </el-col>-->
+<!--            <span>{{form.createdTime | parseTime('{y}-{m}-{d} {h}:{i}')}}</span>-->
+<!--          </el-col>-->
+<!--          <el-col :span="8">-->
+<!--            <el-col :span="8" class="span-fost">外部订单号: </el-col>-->
+<!--            <span v-text="form.tradeSn"></span>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
         <el-row>
           <el-col :span="8">
-            <el-col :span="8" class="span-fost">下单时间: </el-col>
-            <span>{{form.createdTime | parseTime('{y}-{m}-{d} {h}:{i}')}}</span>
-          </el-col>
-          <el-col :span="8">
-            <el-col :span="8" class="span-fost">外部订单号: </el-col>
-            <span v-text="form.tradeSn"></span>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="8">
-            <el-col :span="8" class="span-fost">入场支付方式: </el-col>
-            <span v-if="form.payType === 1">微信支付</span>
-            <span v-if="form.payType === 2">会员卡</span>
+            <el-col :span="8" class="span-fost">支付方式: </el-col>
+            <span v-if="form.payType === 1">N/A</span>
+            <span v-if="form.payType === 2">余额</span>
+            <span v-if="form.payType === 3">会员卡</span>
           </el-col>
         </el-row>
       </el-card>