Merge branch 'dev' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into ymf

src/views/home/data_tables.vue

@@ -57,8 +57,14 @@
         <!-- <el-table-column label="区域id" prop="areaId"></el-table-column> -->
         <el-table-column label="区域名称" prop="areaName"></el-table-column>
         <!-- <el-table-column label="门店id" prop="shopId"></el-table-column> -->
-        <el-table-column label="台桌id" prop="tableId"></el-table-column>
+        <el-table-column label="台桌号" prop="tableId"></el-table-column>
-        <el-table-column label="订单数量" prop="orderCount"></el-table-column>
+        <el-table-column label="订单数量" prop="orderCount">
+          <template v-slot="scope">
+            <div class="cursor-pointer" @click="toTableOrderList(scope.row)">
+              {{ scope.row.orderCount }}
+            </div>
+          </template>
+        </el-table-column>
         <el-table-column label="订单金额" prop="orderAmount"></el-table-column>
         
       </el-table>
@@ -127,6 +133,16 @@ export default {
     this.getTableData();
   },
   methods: {
+    //携带table id跳转到订单列表页面
+    toTableOrderList(data){
+      console.log(data)
+      this.$router.push({
+        path:'/order_manage/order_list',
+        query:{
+          tableName: data.tableName
+        }
+     })
+    },
     // 导出Excel
     async downloadHandle() {
       try {
@@ -254,6 +270,9 @@ export default {
 </script>
 
 <style scoped lang="scss">
+.cursor-pointer{
+  cursor: pointer;
+}
 .collect_wrap {
   display: flex;
   gap: 14px;

src/views/order_manage/order_list.vue

@@ -258,6 +258,9 @@ export default {
     }
   },
   mounted() {
+    if(this.$route.query.tableName){
+      this.query.tableName = this.$route.query.tableName
+    }
     this.resetQuery = { ...this.query };
     this.tbShopPayTypeGet();
     this.getTableData();

src/views/user_manage/user_list.vue

@@ -27,22 +27,23 @@
             <div class="card">
                 <!-- <div class="title">统计数据</div> -->
                 <div class="row">
-                    <div class="item">
+                    <!-- <div class="item">
-                        <!-- <div class="t">用户数</div>
+                        <div class="t">用户数</div>
-                        <div class="n">13</div> -->
+                        <div class="n">13</div>
-                    </div>
+                    </div> -->
                     <div class="item">
                         <div class="t">会员数</div>
-                        <div class="n">{{ shopInfo.userTotal }}</div>
+                        <div class="n">{{ shopInfo.userTotal||0 }}</div>
                     </div>
                     <div class="item">
                         <div class="t">会员余额</div>
-                        <div class="n">{{ shopInfo.chageTotal }}</div>
+                        <div class="n">{{ shopInfo.balanceTotal||0 }}</div>
                     </div>
                     <div class="item">
-                        <!-- <div class="t">总积分</div>
+                        <div class="t">充值金额</div>
-                        <div class="n">0</div> -->
+                        <div class="n">{{ shopInfo.chageTotal||0 }}</div>
                     </div>
+                 
                 </div>
             </div>
         </div>
@@ -99,6 +100,7 @@
         </div>
         <div class="head-container">
             <el-pagination :total="tableData.total" :current-page="tableData.page + 1" :page-size="tableData.size"
+                @size-change="sizeChange"
                 @current-change="paginationChange" layout="total, sizes, prev, pager, next, jumper"></el-pagination>
         </div>
     </div>
@@ -107,6 +109,7 @@
 <script>
 import { queryAllShopUser ,queryAllShopInfo} from '@/api/shop'
 import dayjs from 'dayjs'
+let cacheData = {}
 export default {
     data() {
         return {
@@ -115,6 +118,7 @@ export default {
                 isVip: 1
             },
             shopInfo:{
+                balanceTotal:0,
                 userTotal:0,
                 chageTotal:0
             },
@@ -133,6 +137,7 @@ export default {
         }
     },
     mounted() {
+        cacheData={...this.query}
         this.getTableData()
         this.getShopInfo()
     },
@@ -140,12 +145,16 @@ export default {
         // 获取商家用户概述信息
         async getShopInfo(){
             try {
-                const res = await queryAllShopInfo({isVip:1})
+                const res = await queryAllShopInfo(this.query)
                 this.shopInfo=res
             } catch (error) {
                 console.log(error)
             }
         },
+        sizeChange(){
+            this.tableData.page=0
+            this.getTableData()
+        },
         // 切换状态
         async statusChange(e, row) {
             try {
@@ -172,8 +181,17 @@ export default {
         // 获取商品列表
         async getTableData() {
             this.tableData.loading = true
+            //用于当页码为2以及以上查询条件更改时重置页码
+            if(cacheData.isVip!==this.query.isVip){
+                this.tableData.page=0
+            }
+            cacheData.isVip=this.query.isVip
             try {
-                const res = await queryAllShopUser(this.query)
+                const res = await queryAllShopUser({
+                    ...this.query,
+                    size:this.tableData.size,
+                    page:this.tableData.page+1
+                })
                 this.tableData.loading = false
                 this.tableData.data = res.content
                 this.tableData.total = res.totalElements