ymy il y a 1 an
Parent
commit
bf2a6ae33d

+ 10 - 10
src/components/mapMaker/index.vue

@@ -11,7 +11,7 @@
   const lng = ref(null) // 经度
   const lat = ref(null) //纬度
   const map = ref(null) //地图
-  const zoom = ref(12) //地图层级
+  const zoom = ref(13) //地图层级
   const emit = defineEmits();
   const _id = ref('')
   const geocoder = ref('');
@@ -139,17 +139,17 @@
     initMap()
   })
   // 接收数据
-onMounted(()=>{
-  $bus.on('areaEvent',(data)=>{
-    let area = data.area ? data.area : '';
-    if(area){
-      area = area.replaceAll('/','');
-      if(geocoder.value){
-        geocoder.value.getPoint(area, searchResult);
+  onMounted(()=>{
+    $bus.on('areaEvent',(data)=>{
+      let area = data.area ? data.area : '';
+      if(area){
+        area = area.replaceAll('/','');
+        if(geocoder.value){
+          geocoder.value.getPoint(area, searchResult);
+        }
       }
-    }
+    })
   })
-})
 
 </script>
 

+ 2 - 2
src/layout/components/Navbar.vue

@@ -33,9 +33,9 @@
               <router-link to="/user/profile">
                 <el-dropdown-item>个人中心</el-dropdown-item>
               </router-link>
-              <el-dropdown-item command="setLayout">
+              <!-- <el-dropdown-item command="setLayout">
                 <span>布局设置</span>
-              </el-dropdown-item>
+              </el-dropdown-item> -->
               <el-dropdown-item divided command="logout">
                 <span>退出登录</span>
               </el-dropdown-item>

+ 54 - 40
src/main.js

@@ -4,6 +4,7 @@ import Cookies from 'js-cookie'
 
 import ElementPlus from 'element-plus'
 import locale from 'element-plus/lib/locale/lang/zh-cn' // 中文语言
+import { ElMessageBox } from 'element-plus'
 
 import '@/assets/styles/index.scss' // global css
 import '@/assets/styles/page.scss' // global css
@@ -11,8 +12,9 @@ import App from './App'
 import store from './store'
 import router from './router'
 import directive from './directive' // directive
-
+import { getToken,setToken } from '@/utils/auth'
 import { getQueryObject } from '@/utils'
+import useUserStore from '@/store/modules/user'
 
 // 注册指令
 import plugins from './plugins' // plugins
@@ -119,7 +121,7 @@ app.use(ElementPlus, {
 // 修改 el-dialog 默认点击遮照为不关闭
 app._context.components.ElDialog.props.closeOnClickModal.default = false
 
-function importJS() { // 引入 "天地图"
+const importJS = () => { // 引入 "天地图"
   return new Promise((resolve) => {
     // const key = process.env.TMAP_KEY
     // const url = `http://api.tianditu.gov.cn/api?v=4.0&tk=873e4a15f0f80945cd0ba56f069c19bc`
@@ -144,52 +146,64 @@ function importJS() { // 引入 "天地图"
   })
 }
 
+
 const omsLogin = () => {
-  let params = getQueryObject();
-  const ticket = params.ticket;
-  const ssoToken = params.ssoToken;
-  if(ticket || ssoToken){
-    let data = {}
-    const url = ticket ? '/sso/doLoginByTicket' : '/sso/doLoginByToken'
-    if(ticket) {
-      data.ticket = ticket
-    }
-    if(ssoToken) {
-      data.token = ssoToken
-    }
-    store.dispatch('GetToken',{
-      url,data
-    }).then(() => {
-      unitVue()
-    }).catch(err => {
-      let msg = '未知错误,请联系管理员!'
-      if(err && err.msg) {
-        msg = err.msg
+  return new Promise((resolve) => {
+    let params = getQueryObject();
+    const ticket = params.ticket;
+    const ssoToken = params.ssoToken;
+    if(ticket || ssoToken){
+      let data = {}
+      const url = ticket ? '/sso/doLoginByTicket' : '/sso/doLoginByToken'
+      if(ticket) {
+        data.ticket = ticket
+      }
+      if(ssoToken) {
+        data.token = ssoToken
       }
-      MessageBox.alert(msg, '提示', {
-        confirmButtonText: '确定',
-        callback: () => {
-          store.dispatch('LogOut').then(() => {})
+      console.log('开始');
+      useUserStore().getTokenHandle({url:url,data:data})
+      // request({
+      //   url: url,
+      //   method:'get',
+      //   params:data
+      // })
+      .then(() => {
+        console.log('成功')
+        resolve(true)
+      }).catch(err =>{
+        let msg = '未知错误,请联系管理员!'
+        if(err && err.msg) {
+          msg = err.msg
         }
-      });
-    })
-  }else if(getToken()){
-    unitVue()
-  }else{
-    const redirect = location.origin
-    location.href = `${import.meta.env.VITE_APP_LOGIN_URL}?&redirect=${encodeURIComponent(redirect)}`
-  }
-}
-
-const unitVue = () => {
-  Promise.all([importJS()]).then(result => {
-    app.mount('#app')
+        ElMessageBox.alert(msg, '提示', {
+          confirmButtonText: '确定',
+          callback: () => {
+            store.dispatch('LogOut').then(() => {})
+          }
+        });
+      })
+    }
+    // else if(getToken()){
+    //   unitVue()
+    // }
+    // else{
+    //   const redirect = location.origin
+    //   location.href = `${import.meta.env.VITE_APP_LOGIN_URL}?&redirect=${encodeURIComponent(redirect)}`
+    // }
   })
+  
 }
 
+// const unitVue = () => {
+//   Promise.all([importJS()]).then(result => {
+//     app.mount('#app')
+//   })
+// }
+
 // omsLogin()
 
 Promise.all([importJS()]).then(result => {
-  app.mount('#app')
+  app.mount('#app');
 })
 

+ 40 - 42
src/permission.js

@@ -58,50 +58,48 @@ router.beforeEach((to, from, next) => {
       }
     // }
   } else {
-
-    // const redirect = location.origin
-    // location.href = `${import.meta.env.VITE_APP_LOGIN_URL}?&redirect=${encodeURIComponent(redirect)}`
-
-    // const params = getQueryObject()
-    // const ticket = params.ticket;
-    // const ssoToken = params.ssoToken;
-    // if(!ticket && !ssoToken){
-    //   const redirect = location.origin
-    //   location.href = `${import.meta.env.VITE_APP_LOGIN_URL}?&redirect=${encodeURIComponent(redirect)}`
-    // }else{
-    //   const url = ticket ? '/sso/doLoginByTicket' : '/sso/doLoginByToken'
-    //   let data = {}
-    //   if(ticket) {
-    //     data.ticket = ticket
-    //   }
-    //   if(ssoToken) {
-    //     data.token = ssoToken
-    //   }
-    //   useUserStore().GetToken({url,data}).then(() =>{
-    //     handle(to,next)
-    //   }).catch(err => {
-    //     let msg = '未知错误,请联系管理员!'
-    //     if(err && err.msg) {
-    //      msg = err.msg
-    //     }
-    //     ElMessageBox.alert(msg, '提示', {
-    //       confirmButtonText: '确定',
-    //       callback: () => {
-    //         const redirect = location.origin
-    //         location.href = `${import.meta.env.VITE_APP_LOGIN_URL}?&redirect=${encodeURIComponent(redirect)}`
-    //       }
-    //     })
-    //   })
-    // }
+    let params = getQueryObject();
+    const ticket = params.ticket;
+    const ssoToken = params.ssoToken;
+    if(ticket || ssoToken){
+      let data = {}
+      const url = ticket ? '/sso/doLoginByTicket' : '/sso/doLoginByToken'
+      if(ticket) {
+        data.ticket = ticket
+      }
+      if(ssoToken) {
+        data.token = ssoToken
+      }
+      // console.log('开始');
+      useUserStore().getTokenHandle({url:url,data:data})
+      .then(() => {
+        handle(to,next)
+      }).catch(err =>{
+        let msg = '未知错误,请联系管理员!'
+        if(err && err.msg) {
+          msg = err.msg
+        }
+        ElMessageBox.alert(msg, '提示', {
+          confirmButtonText: '确定',
+          callback: () => {
+            store.dispatch('LogOut').then(() => {})
+          }
+        });
+      })
+    }else{
+      const redirect = location.origin
+      location.href = `${import.meta.env.VITE_APP_LOGIN_URL}?&redirect=${encodeURIComponent(redirect)}`
+    }
+    
 
     // 没有token
-    if (whiteList.indexOf(to.path) > -1) {
-      // 在免登录白名单,直接进入
-      next()
-    } else {
-      next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
-      NProgress.done()
-    }
+    // if (whiteList.indexOf(to.path) > -1) {
+    //   // 在免登录白名单,直接进入
+    //   next()
+    // } else {
+    //   next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
+    //   NProgress.done()
+    // }
   }
 })
 

+ 25 - 21
src/router/index.js

@@ -26,27 +26,27 @@ import Layout from '@/layout'
 
 // 公共路由
 export const constantRoutes = [
-  {
-    path: '/redirect',
-    component: Layout,
-    hidden: true,
-    children: [
-      {
-        path: '/redirect/:path(.*)',
-        component: () => import('@/views/redirect/index.vue')
-      }
-    ]
-  },
-  {
-    path: '/login',
-    component: () => import('@/views/login'),
-    hidden: true
-  },
-  {
-    path: '/register',
-    component: () => import('@/views/register'),
-    hidden: true
-  },
+  // {
+  //   path: '/redirect',
+  //   component: Layout,
+  //   hidden: true,
+  //   children: [
+  //     {
+  //       path: '/redirect/:path(.*)',
+  //       component: () => import('@/views/redirect/index.vue')
+  //     }
+  //   ]
+  // },
+  // {
+  //   path: '/login',
+  //   component: () => import('@/views/login'),
+  //   hidden: true
+  // },
+  // {
+  //   path: '/register',
+  //   component: () => import('@/views/register'),
+  //   hidden: true
+  // },
   {
     path: "/:pathMatch(.*)*",
     component: () => import('@/views/error/404'),
@@ -57,6 +57,10 @@ export const constantRoutes = [
     component: () => import('@/views/error/401'),
     hidden: true
   },
+  // {
+  //   path: '*',
+  //   redirect: '/index'
+  // },
   {
     path: '',
     component: Layout,

+ 1 - 1
src/store/modules/user.js

@@ -30,7 +30,7 @@ const useUserStore = defineStore(
           })
         })
       },
-      GetToken(params) {
+      getTokenHandle(params) {
         return new Promise((resolve, reject) => {
           request({
             url: params.url,

+ 1 - 1
src/utils/auth.js

@@ -1,6 +1,6 @@
 import Cookies from 'js-cookie'
 
-const TokenKey = 'Admin-Token'
+const TokenKey = 'Admin_szzs-Token'
 
 export function getToken() {
   return Cookies.get(TokenKey)

+ 1 - 1
src/utils/request.js

@@ -19,7 +19,7 @@ const service = axios.create({
   // axios中请求配置有baseURL选项,表示请求URL公共部分
   baseURL: import.meta.env.VITE_APP_BASE_API,
   // 超时
-  timeout: 10000
+  timeout: 90000
 })
 
 // request拦截器

+ 32 - 0
src/views/base/adManage/components/rangTime.vue

@@ -0,0 +1,32 @@
+<template>
+  <div class="table">
+    {{ time01 }}<br>至<br>{{ time02 }}
+  </div>
+  
+</template>
+
+<script setup>
+  import { ref } from 'vue'
+  const { proxy } = getCurrentInstance();
+  const time01 = ref('')
+  const time02 = ref('')
+  const emit = defineEmits();
+  const props = defineProps({
+    propConfig:{},
+    propValue:{},
+    parentValue:{}
+  })
+
+  const setValue = () => {
+    time01.value = props.parentValue.planStartTime;
+    time02.value = props.parentValue.planEndTime;
+  }
+
+  if(props.parentValue){
+    setValue()
+  }
+</script>
+
+<style lang="scss" scoped>
+
+</style>

+ 7 - 4
src/views/base/adManage/index.vue

@@ -9,6 +9,7 @@
   const { proxy } = getCurrentInstance();
   import goodsImg from "./components/goodsImg.vue";
   import equipList from "./components/equipList.vue";
+  // import rangTime from './components/rangTime.vue';
   import {list,upDownShelves,detailHandle} from '@/api/base/adManage'
 
   const config = ref({
@@ -33,7 +34,7 @@
           component:'by-input',
           compConfig:{ 
             attr:{
-              placeholder:'请输入广告ID、广告名称、负责人、联系方式',
+              placeholder:'请输入广告名称、负责人、联系方式',
               prefixIcon:'vxe-icon-search'
             }
           }
@@ -113,7 +114,9 @@
       },
       {
         title:'时间',
-        field:'planCreateTime'
+        field:'planCreateTime',
+        // width:150,
+        // component:shallowRef(rangTime)
       },
       {
         title:'操作',
@@ -267,9 +270,9 @@
     delete data.time;
     list(data).then(res => {
       load.value = false;
-      proxy.$refs.view.setTableValue(res.data.list);
+      proxy.$refs.view.setTableValue(res.data.records);
       let page = {
-        pageNo: res.data.pageNum, //当前页
+        pageNo: res.data.current, //当前页
         pageSize: data.pageSize, //每页条数
         total: res.data.total //总条数
       };

+ 11 - 1
src/views/base/adPlan/components/auModal.vue

@@ -4,7 +4,7 @@
       <el-descriptions v-loading="load" :column="2">
         <el-descriptions-item label="商品信息">
           <div class="goods-info">
-            <el-image style="width: 60px; height: 60px" :src="value.goodsImg" fit="contain" />
+            <el-image style="width: 60px; height: 60px" :src="goodsImgHandle(value.goodsImg)" fit="contain" />
             <div class="goods-txt">
               <div class="goods-title">{{ value.goodsName }}</div>
               <div class="goods-price">¥{{ value.goodsPrice }}</div>
@@ -92,6 +92,16 @@
       load.value = false
     })
   }
+  const goodsImgHandle = path => {
+    let n = '';
+    if(path) {
+      try{
+        path = JSON.parse(path);
+        n = path.length > 0 ? path[0] : '';
+      }catch(e){}
+    }
+    return n;
+  }
 
   const loadData = v => {
     if(!v && !v.planId) return

+ 14 - 4
src/views/base/adPlan/components/auSuccess.vue

@@ -60,6 +60,10 @@
         align:'center'
       },
       columns:[{
+        title:'广告名称',
+        field:'planName',
+        width:150
+      },{
         title:'来源平台',
         field:'appName',
       },
@@ -87,8 +91,14 @@
       },
       {
         title:'申请时间',
+        width:140,
         field:'planCreateTime'
       },
+      {
+        title:'审核时间',
+        field:'auditTime',
+        width:150
+      },
       // {
       //   title:'操作',
       //   action:true,
@@ -195,12 +205,12 @@
     }
     list(data).then(res => {
       load.value = false;
-      let data = []
+      let datalist = []
       let page ={}
       if(res.data){
-        data = res.data.list?res.data.list:[];
+        datalist = res.data.records?res.data.records:[];
         page = {
-          pageNo: res.data.pageNum, //当前页
+          pageNo: res.data.current, //当前页
           pageSize: data.pageSize, //每页条数
           total: res.data.total //总条数
         };
@@ -211,7 +221,7 @@
           total: 0 //总条数
         };
       }
-      proxy.$refs.view.setTableValue(data);
+      proxy.$refs.view.setTableValue(datalist);
       proxy.$refs.view.setPage(page)
     }).catch(()=>{
       load.value = false;

+ 6 - 5
src/views/base/adPlan/components/auditView.vue

@@ -63,8 +63,8 @@
         align:'center'
       },
       columns:[{
-        title:'广告ID',
-        field:'planId',
+        title:'广告名称',
+        field:'planName',
         width:150
       },{
         title:'来源平台',
@@ -94,6 +94,7 @@
       },
       {
         title:'申请时间',
+        width:140,
         field:'planCreateTime'
       },
       {
@@ -208,10 +209,10 @@
     delete data.time;
     list(data).then(res => {
       load.value = false;
-      let data = []
+      let datalist = []
       let page ={}
       if(res.data){
-        data = res.data.list?res.data.list:[];
+        datalist = res.data.records?res.data.records:[];
         page = {
           pageNo: res.data.current, //当前页
           pageSize: data.pageSize, //每页条数
@@ -224,7 +225,7 @@
           total: 0 //总条数
         };
       }
-      proxy.$refs.view.setTableValue(data);
+      proxy.$refs.view.setTableValue(datalist);
       proxy.$refs.view.setPage(page)
     }).catch(()=>{
       load.value = false;

+ 14 - 4
src/views/base/adPlan/components/refuseView.vue

@@ -60,6 +60,10 @@
         align:'center'
       },
       columns:[{
+        title:'广告名称',
+        field:'planName',
+        width:150
+      },{
         title:'来源平台',
         field:'appName',
       },
@@ -87,8 +91,14 @@
       },
       {
         title:'申请时间',
+        width:140,
         field:'planCreateTime'
       },
+      {
+        title:'审核时间',
+        field:'auditTime',
+        width:150
+      },
       // {
       //   title:'操作',
       //   action:true,
@@ -195,12 +205,12 @@
     }
     list(data).then(res => {
       load.value = false;
-      let data = []
+      let datalist = []
       let page ={}
       if(res.data){
-        data = res.data.list?res.data.list:[];
+        datalist = res.data.records?res.data.records:[];
         page = {
-          pageNo: res.data.pageNum, //当前页
+          pageNo: res.data.current, //当前页
           pageSize: data.pageSize, //每页条数
           total: res.data.total //总条数
         };
@@ -211,7 +221,7 @@
           total: 0 //总条数
         };
       }
-      proxy.$refs.view.setTableValue(data);
+      proxy.$refs.view.setTableValue(datalist);
       proxy.$refs.view.setPage(page)
     }).catch(()=>{
       load.value = false;

+ 3 - 3
src/views/base/adPutIn/index.vue

@@ -32,7 +32,7 @@
           component:'by-input',
           compConfig:{ 
             attr:{
-              placeholder:'请输入设备ID、设备名称',
+              placeholder:'请输入设备名称',
               prefixIcon:'vxe-icon-search'
             }
           }
@@ -147,9 +147,9 @@
     delete data.time;
     list(data).then(res => {
       load.value = false;
-      proxy.$refs.view.setTableValue(res.data.list);
+      proxy.$refs.view.setTableValue(res.data.records);
       let page = {
-        pageNo: res.data.pageNum, //当前页
+        pageNo: res.data.current, //当前页
         pageSize: data.pageSize, //每页条数
         total: res.data.total //总条数
       };

+ 25 - 5
src/views/base/merchantManage/index.vue

@@ -34,7 +34,7 @@
           component:'by-input',
           compConfig:{ 
             attr:{
-              placeholder:'请输入商户ID、商户名称、联系人、联系方式',
+              placeholder:'请输入商户名称、联系人、联系方式',
               prefixIcon:'vxe-icon-search'
             }
           }
@@ -58,10 +58,10 @@
         // checkbox:true
       },
       columns:[
-      {
-        title:'商户ID',
-        field:'commercialId',
-      },
+      // {
+      //   title:'商户ID',
+      //   field:'commercialId',
+      // },
       {
         isDetail:true,
         title:'商户名称',
@@ -72,6 +72,26 @@
         field:'prove1',
         component:shallowRef(tableImg)
       },
+      {
+        title:'状态',
+        field:'state',
+        component:'textChange',
+        compConfig:{
+          attr:{
+            data:[{
+              label:'启用',
+              value:1,
+              backgroundColor:'#f0f9eb',
+              color:'#67c23a'
+            },{
+              label:'禁用',
+              value:0,
+              backgroundColor:'#fef0f0',
+              color:'#f56c6c'
+            }]
+          }
+        }
+      },
       {
         title:'关联小程序',
         field:'apps',

+ 4 - 4
src/views/base/orderManage/index.vue

@@ -34,7 +34,7 @@ const config = ref({
       {
         span:8,
         // labelWidth:16,
-        label:'单时间',
+        label:'单时间',
         prop:'time',
         component:'by-date',
         compConfig:{
@@ -100,7 +100,7 @@ const config = ref({
       field:'vendorName'
     },
     {
-      title:'单时间',
+      title:'单时间',
       field:'createTime'
     }]
   }
@@ -149,9 +149,9 @@ const requestList = data => {
   delete data.time;
   list(data).then(res => {
     load.value = false;
-    proxy.$refs.view.setTableValue(res.data.list);
+    proxy.$refs.view.setTableValue(res.data.recoeds);
     let page = {
-      pageNo: res.data.pageNum, //当前页
+      pageNo: res.data.current, //当前页
       pageSize: 20, //每页条数
       total: res.data.total //总条数
     };

+ 2 - 2
src/views/base/productManage/index.vue

@@ -139,9 +139,9 @@
     delete data.time;
     list(data).then(res => {
       load.value = false;
-      proxy.$refs.view.setTableValue(res.data.list);
+      proxy.$refs.view.setTableValue(res.data.records);
       let page = {
-        pageNo: res.data.pageNum, //当前页
+        pageNo: res.data.current, //当前页
         pageSize: 20, //每页条数
         total: res.data.total //总条数
       };

+ 5 - 4
src/views/base/shopManage/components/appletView.vue

@@ -50,14 +50,15 @@
         align:'center',
         // checkbox:true
       },
-      columns:[{
-        title:'应用ID',
-        field:'appkey',
-      },
+      columns:[
       {
         isDetail:true,
         title:'小程序名称',
         field:'appName',
+      },  
+      {
+        title:'应用ID',
+        field:'appkey',
       },
       {
         title:'所属商户',

+ 22 - 1
src/views/base/shopManage/components/mapRang.vue

@@ -8,14 +8,16 @@
 <script setup>
   import { computed,getCurrentInstance,nextTick, ref  } from "vue";
   const { proxy } = getCurrentInstance();
+  import $bus from '@/benyun/utils/bus.js'
   const value = ref('')
   const config = ref({})
   const lnglat = ref([])
   // const lng = ref(null) // 经度
   // const lat = ref(null) //纬度
   const map = ref(null) //地图
-  const zoom = ref(12) //地图层级
+  const zoom = ref(15) //地图层级
   const emit = defineEmits();
+  const geocoder = ref('');
   const _id = ref('')
   const handler = ref(null)
   const props = defineProps({
@@ -75,6 +77,7 @@
     if(map.value) return
     map.value = new T.Map(_id.value);
     map.value.centerAndZoom(new T.LngLat(109.411030,24.328160), zoom.value);
+    geocoder.value = new T.Geocoder();
     openHandler()
     if(callb) {
       callb()
@@ -112,7 +115,25 @@
     //向地图上添加面
     map.value.addOverLay(polygon);
     handler.value.close()
+    map.value.centerAndZoom(new T.LngLat(lnglat.value[0].lng,lnglat.value[0].lat), zoom.value);
   }
+  const searchResult = result => {
+    if(result.getStatus() == 0){
+			map.value.panTo(result.getLocationPoint(), zoom.value);
+		}
+  }
+  // 接收数据
+  onMounted(()=>{
+    $bus.on('areaEvent',(data)=>{
+      let area = data.area ? data.area : '';
+      if(area){
+        area = area.replaceAll('/','');
+        if(geocoder.value){
+          geocoder.value.getPoint(area, searchResult);
+        }
+      }
+    })
+  })
 
   defineExpose({
     getValue,getConfig,setConfig,clearValue,setValue

+ 5 - 5
src/views/base/shopManage/components/offlineShop.vue

@@ -141,11 +141,6 @@
               attr:{}
             }
           }],
-          [{
-            label:'范围',
-            prop:'point',
-            component:shallowRef(mapRang),
-          }],
           [{
             label:'负责人',
             prop:'principalName',
@@ -171,6 +166,11 @@
             prop:'addrInfo',
             component:'by-input'
           }],
+          [{
+            label:'范围',
+            prop:'point',
+            component:shallowRef(mapRang),
+          }],
           [{
             label:'标记',
             prop:'lnglat',

+ 3 - 3
src/views/base/userManage/index.vue

@@ -27,7 +27,7 @@
           component:'by-input',
           compConfig:{ 
             attr:{
-              placeholder:'请输入用户ID、用户名、手机号',
+              placeholder:'请输入用户名、手机号',
               prefixIcon:'vxe-icon-search'
             }
           }
@@ -143,9 +143,9 @@
     delete data.time;
     list(data).then(res => {
       load.value = false;
-      proxy.$refs.view.setTableValue(res.data.list);
+      proxy.$refs.view.setTableValue(res.data.records);
       let page = {
-        pageNo: res.data.pageNum, //当前页
+        pageNo: res.data.current, //当前页
         pageSize: data.pageSize, //每页条数
         total: res.data.total //总条数
       };

+ 2 - 2
src/views/components/scanModal.vue

@@ -124,9 +124,9 @@
     delete data.time;
     scanLog(data).then(res => {
       load.value = false;
-      proxy.$refs.view.setTableValue(res.data.list);
+      proxy.$refs.view.setTableValue(res.data.records);
       let page = {
-        pageNo: res.data.pageNum, //当前页
+        pageNo: res.data.current, //当前页
         pageSize: data.pageSize, //每页条数
         total: res.data.total //总条数
       };