Bladeren bron

Merge branch 'xinyan' into dev

xinyan 6 maanden geleden
bovenliggende
commit
f2be2c1cb9

+ 1 - 1
src/views/score-statistics/Columns.ts

@@ -18,5 +18,5 @@ export const scoreStatisticsColumns = [
 	},
 	{ field: 'review_date', title: '评论日期', minWidth: 'auto' },
 	{ field: 'launch_date', title: '发布日期', minWidth: 'auto' },
-	{ field: 'avg_score', title: '平均评分',  minWidth: 150 ,slots: { default: 'avg_score' }},
+	{ field: 'avg_score', title: '平均评分',  minWidth: 120 ,slots: { default: 'avg_score' }},
 ];

+ 1 - 1
src/views/score-statistics/components/LineChart.vue

@@ -33,7 +33,7 @@ const option: any = {
 	// 	source: [],
 	// },
 	title: {
-		left: '0%',
+		left: '-0.2%',
 		text: '每月平均评分',
 		textStyle: {
 			fontSize: '16px',

+ 6 - 4
src/views/score-statistics/components/MonthlyRating.vue

@@ -5,15 +5,15 @@
 			<div style="display: flex; align-items: baseline; justify-content: space-between">
 				<div style="display: flex; gap: 25px; margin-bottom: 10px">
 					<div>
-						<span style="font-size: 14px; padding-right: 4px; color: #95969a">ASIN:</span>
+						<span style="font-size: 14px; padding-right: 4px; color: #95969a;font-weight: 500">ASIN </span>
 						<el-input v-model="searchAsin" clearable style="width: 180px" @change="fetchData"></el-input>
 					</div>
 					<div>
-						<span style="font-size: 14px; padding-right: 4px; color: #95969a">SKU:</span>
+						<span style="font-size: 14px; padding-right: 4px; color: #95969a;font-weight: 500">SKU </span>
 						<el-input v-model="searchSku" clearable style="width: 180px" @change="fetchData"></el-input>
 					</div>
 					<div>
-						<span style="font-size: 14px; color: #95969a">时间选择:</span>
+						<span style="font-size: 14px; color: #95969a;font-weight: 500">时间选择 </span>
 						<el-date-picker
 							v-model="asinMonthDate"
 							:clearable="false"
@@ -33,7 +33,9 @@
 				<vxe-grid :cell-style="cellStyle" :header-cell-style="headerStyle" show-overflow="tooltip" v-bind="gridOptions" v-on="gridEvents">
 					<template #avg_score="{ row }">
 						<template v-if="row.avg_score !== null && row.avg_score !== undefined && row.avg_score !== ''">
-							<el-rate v-if="row.avg_score > 0" v-model="row.avg_score" show-score :colors="['#FF0000', '#FF9900', '#67C23A']" disabled text-color="#1e293b" />
+							<el-tooltip v-if="row.avg_score > 0" :content="row.avg_score" placement="top" :show-after="300">
+								<el-rate v-if="row.avg_score > 0" v-model="row.avg_score"  :colors="['#FF0000', '#FF9900', '#67C23A']" disabled text-color="#1e293b" />
+							</el-tooltip>
 							<span v-else>{{ row.avg_score }}</span>
 						</template>
 						<template v-else>

+ 22 - 6
src/views/system/login/index.vue

@@ -4,6 +4,8 @@ import { storeToRefs } from 'pinia';
 import { useThemeConfig } from '/@/stores/themeConfig';
 import { NextLoading } from '/@/utils/loading';
 import AnsjerImg from '/@/assets/asj.png';
+import { SystemConfigStore } from '/@/stores/systemConfig';
+import pinia from '/@/stores';
 
 // 引入组件
 const Account = defineAsyncComponent(() => import('/@/views/system/login/component/account.vue'));
@@ -13,6 +15,22 @@ const Scan = defineAsyncComponent(() => import('/@/views/system/login/component/
 // 定义变量内容
 const storesThemeConfig = useThemeConfig();
 const { themeConfig } = storeToRefs(storesThemeConfig);
+const stores = SystemConfigStore(pinia);
+const { systemConfig }: { systemConfig: any } = storeToRefs(stores);
+console.log("=>(index.vue:20) systemConfig", systemConfig.value);
+const keepRecord = computed(() => {
+	return systemConfig.value['login.keep_record'];
+});
+const helpUrl = computed(() => {
+	return systemConfig.value['login.help_url'];
+});
+const privacyUrl= computed(() => {
+	return systemConfig.value['login.privacy_url'];
+});
+const clauseUrl = computed(() => {
+	return systemConfig.value['login.clause_url'];
+});
+
 const state = reactive({
 	tabsActiveName: 'account',
 	isScan: false,
@@ -96,13 +114,11 @@ onMounted(() => {
 		<div class="login-authorization">
 			<p>Copyright © 2023-2024 Ansjer 版权所有</p>
 			<p class="la-other">
-				<a href="https://beian.miit.gov.cn" target="_blank">晋ICP备18005113号-3</a>
-				|
-				<a href="https://django-vue-admin.com" target="_blank">帮助</a>
-				|
-				<a href="#">隐私</a>
+				<a href="https://beian.miit.gov.cn" target="_blank">{{keepRecord}}</a>
 				|
-				<a href="#">条款</a>
+				<a :href="helpUrl || '#'" target="_blank">帮助</a> |
+				<a :href="privacyUrl || '#'" target="_blank">隐私</a> |
+				<a :href="clauseUrl || '#'" target="_blank">条款</a>
 			</p>
 		</div>
 	</div>