From 9b3c411ed63fa0338a92cfcdd7589e58c05b7ea4 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 05 三月 2025 16:13:58 +0800
Subject: [PATCH] ll
---
admin/src/layouts/TableLayout.vue | 4 ++--
admin/src/views/platform/queueUp.vue | 4 ++--
h5/utils/config.js | 4 ++--
admin/src/views/business/reportRecord.vue | 4 ++--
admin/src/layouts/TableLayout1.vue | 4 ++--
h5/pages/login/login.vue | 2 +-
admin/src/components/common/Pagination.vue | 6 +++---
h5/pages/answer/answer.vue | 3 ++-
8 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/admin/src/components/common/Pagination.vue b/admin/src/components/common/Pagination.vue
index 85eb7ad..45cf075 100644
--- a/admin/src/components/common/Pagination.vue
+++ b/admin/src/components/common/Pagination.vue
@@ -41,15 +41,15 @@
<style lang="scss" scoped>
.table-pagination {
margin-left: -16px;
- padding: 16px 0px 16px 25px;
+ padding: 0px 0px 16px 25px;
text-align: left;
display: block;
z-index: 100;
width: -webkit-fill-available;
/* width: 80%; */
- position: fixed;
+ /* position: fixed;
bottom: 30px;
background-color: white;
- margin-right: 50px;
+ margin-right: 50px; */
}
</style>
diff --git a/admin/src/layouts/TableLayout.vue b/admin/src/layouts/TableLayout.vue
index c14a67a..4957763 100644
--- a/admin/src/layouts/TableLayout.vue
+++ b/admin/src/layouts/TableLayout.vue
@@ -164,10 +164,10 @@
z-index: 100;
width: -webkit-fill-available;
/* width: 80%; */
- position: fixed;
+ /* position: fixed;
bottom: 30px;
background-color: white;
- margin-right: 50px;
+ margin-right: 50px; */
}
}
}
diff --git a/admin/src/layouts/TableLayout1.vue b/admin/src/layouts/TableLayout1.vue
index 246c4cc..a5eedc4 100644
--- a/admin/src/layouts/TableLayout1.vue
+++ b/admin/src/layouts/TableLayout1.vue
@@ -165,10 +165,10 @@
z-index: 100;
width: -webkit-fill-available;
/* width: 80%; */
- position: fixed;
+ /* position: fixed;
bottom: 30px;
background-color: white;
- margin-right: 50px;
+ margin-right: 50px; */
}
}
}
diff --git a/admin/src/views/business/reportRecord.vue b/admin/src/views/business/reportRecord.vue
index 5fe8440..8286869 100644
--- a/admin/src/views/business/reportRecord.vue
+++ b/admin/src/views/business/reportRecord.vue
@@ -244,9 +244,9 @@
z-index: 100;
width: -webkit-fill-available;
/* width: 80%; */
- position: fixed;
+ /* position: fixed;
bottom: 30px;
background-color: white;
- margin-right: 50px;
+ margin-right: 50px; */
}
</style>
diff --git a/admin/src/views/platform/queueUp.vue b/admin/src/views/platform/queueUp.vue
index eb4b0b1..b8e6401 100644
--- a/admin/src/views/platform/queueUp.vue
+++ b/admin/src/views/platform/queueUp.vue
@@ -21,7 +21,7 @@
<span></span>
</div>
</div>
- <el-table class="mb20" v-loading="loading" :data="dataList" stripe row-key="id" default-expand-all>
+ <el-table v-loading="loading" :data="dataList" stripe row-key="id" default-expand-all>
<el-table-column type="index" label="搴忓彿" width="80" />
<el-table-column label="杞︾墝鍙�" width="130">
<template slot-scope="{ row }">
@@ -33,7 +33,7 @@
</div>
</template>
</el-table-column>
- <el-table-column prop="carrierName" label="杩愯緭鍏徃" min-width="120">
+ <el-table-column prop="carrierName" label="杩愯緭鍏徃" show-overflow-tooltip min-width="140">
<template v-slot="scope">
<span>{{ scope.row.carrierName || '-' }}</span>
</template>
diff --git a/h5/pages/answer/answer.vue b/h5/pages/answer/answer.vue
index 92d91bb..e9f232e 100644
--- a/h5/pages/answer/answer.vue
+++ b/h5/pages/answer/answer.vue
@@ -407,7 +407,8 @@
saveProblemsVO({
openId: this.$store.state.openId,
useType: '1',
- content: ''
+ content: '',
+ score: this.score
}).then(res => {
this.score = 0
uni.navigateTo({
diff --git a/h5/pages/login/login.vue b/h5/pages/login/login.vue
index d198595..a5c4bc1 100644
--- a/h5/pages/login/login.vue
+++ b/h5/pages/login/login.vue
@@ -41,7 +41,7 @@
export default {
data() {
return {
- code: ''
+ code: '11'
}
},
onLoad(option) {
diff --git a/h5/utils/config.js b/h5/utils/config.js
index 05ff784..08884a3 100644
--- a/h5/utils/config.js
+++ b/h5/utils/config.js
@@ -1,8 +1,8 @@
-// export const baseUrl = 'zhyq_interface/'
+export const baseUrl = 'zhyq_interface/'
// export const baseUrl = 'http://192.168.0.173/gateway_interface/'
// export const baseUrl = 'http://10.50.250.253:8088/gateway_interface/'
-export const baseUrl = 'https://atwl.ahzyssl.com/zhyq_interface/'
+// export const baseUrl = 'https://atwl.ahzyssl.com/zhyq_interface/'
export const app_url = 'https://atwl.ahzyssl.com/zhyq_h5/#/'
--
Gitblit v1.9.3