Переглянути джерело

✨ feat: 修改logo; 相关bug修复

WanGxC 1 рік тому
батько
коміт
30a68e889d

BIN
src/assets/ansjer_image.png


+ 3 - 3
src/layout/logo/index.vue

@@ -1,10 +1,10 @@
 <template>
 	<div class="layout-logo" v-if="setShowLogo" @click="onThemeConfigChange">
-		<img :src="logoMini" class="layout-logo-medium-img" />
-		<span style="font-size: x-large">{{ themeConfig.globalTitle }}</span>
+		<el-image style="width: 100px; height: 100px" src="src/assets/ansjer_image.png" fit="contain" />
+		<!-- <span style="font-size: x-large">{{ themeConfig.globalTitle }}</span> -->
 	</div>
 	<div class="layout-logo-size" v-else @click="onThemeConfigChange">
-		<img :src="logoMini" class="layout-logo-size-img" />
+		<img src="src/assets/ansjer_image.png" class="layout-logo-size-img" />
 	</div>
 </template>
 

+ 2 - 2
src/stores/themeConfig.ts

@@ -137,9 +137,9 @@ export const useThemeConfig = defineStore('themeConfig', {
 			 * 全局网站标题 / 副标题
 			 */
 			// 网站主标题(菜单导航、浏览器当前网页标题)
-			globalTitle: 'DVAdmin',
+			globalTitle: 'Ansjer',
 			// 网站副标题(登录页顶部文字)
-			globalViceTitle: 'DVAdmin',
+			globalViceTitle: 'Ansjer',
 			// 网站副标题(登录页顶部文字)
 			globalViceTitleMsg: '广告管理系统',
 			// 默认初始语言,可选值"<zh-cn|en|zh-tw>",默认 zh-cn

+ 6 - 9
src/views/adManage/sd/campaigns/CreateCampaigns/component/AdCampaign.vue

@@ -70,13 +70,12 @@
 </template>
 
 <script lang="ts" setup>
-import { onMounted, reactive, ref, watch, defineEmits } from 'vue'
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage } from 'element-plus'
 import { storeToRefs } from 'pinia'
+import { defineEmits, onMounted, reactive, ref, watch } from 'vue'
+import { getAdMixSelect, postCampaignsData } from '../api/index'
 import { useShopInfo } from '/@/stores/shopInfo'
-import { postCampaignsData, getAdMixSelect } from '../api/index'
-import emitter from '/@/utils/emitter'
 
 const shopInfo = useShopInfo()
 const { profile } = storeToRefs(shopInfo)
@@ -183,12 +182,10 @@ watch([respCampaignId, respCampaignName], () => {
   }
 })
 
-// function changeTargetType() {
-//   emitter.emit('send-targetType', targetType)
-// }
-function changeTargetType(value: string) {
-  targetType.value = value // 更新 targetType
-  emit('send-targetType', { type: targetType.value }) // 发送新的 targetType 值给父组件
+function changeTargetType(value: string) {    // 发送新的 targetType 值给父组件
+  targetType.value = value
+  emit('send-targetType', { type: targetType.value })
+  // emitter.emit('xxx', { type: targetType.value })
 }
 
 onMounted(() => {

+ 0 - 80
src/views/adManage/sd/campaigns/CreateCampaigns/component/ContentTarget.vue

@@ -182,84 +182,8 @@ watch(
   { immediate: true }
 )
 
-// 亚马逊受众tab的 下拉框和输入框
-// const audienceType = ref('1')
-// const audienceTypeOptions = [
-//   {
-//     value: '1',
-//     label: '所有受众',
-//   },
-//   {
-//     value: '2',
-//     label: '生活方式',
-//   },
-//   {
-//     value: '3',
-//     label: '兴趣',
-//   },
-//   {
-//     value: '4',
-//     label: '生活事件',
-//   },
-//   {
-//     value: '5',
-//     label: '场内客群',
-//   },
-// ]
-
-const keywordInput = ref('') // 关键词过滤输入框
-
-// 浏览再营销下的tab栏
 const viewsTabName = ref('advice')
-// const viewsLookBack = ref('7')
-// const viewsLookBackOptions = [
-//   {
-//     value: '7',
-//     label: '7天',
-//   },
-//   {
-//     value: '14',
-//     label: '14天',
-//   },
-//   {
-//     value: '30',
-//     label: '30天',
-//   },
-//   {
-//     value: '60',
-//     label: '60天',
-//   },
-//   {
-//     value: '90',
-//     label: '90天',
-//   },
-// ]
-
-// 购买再营销下的tab栏
 const purchasesTabName = ref('advice')
-// const purchasesLookBack = ref('7')
-// const purchasesLookBackOptions = [
-//   {
-//     value: '7',
-//     label: '7天',
-//   },
-//   {
-//     value: '14',
-//     label: '14天',
-//   },
-//   {
-//     value: '30',
-//     label: '30天',
-//   },
-//   {
-//     value: '60',
-//     label: '60天',
-//   },
-//   {
-//     value: '90',
-//     label: '90天',
-//   },
-// ]
 
 // 获取单个商品的搜索数据
 function handleSelectedCommodities(selectedCommodities) {
@@ -267,12 +191,9 @@ function handleSelectedCommodities(selectedCommodities) {
 
   addedTableData.value = addedTableData.value.filter((item) => item.source !== 'single' || selectedMap.has(item.asin))
 
-  // 遍历所有选中的商品
   selectedCommodities.forEach((commodity) => {
-    // 检查该商品是否已经存在于 addedTableData 中
     const exists = addedTableData.value.some((item) => item.asin === commodity.asin && item.source === 'single')
     if (!exists) {
-      // 如果不存在,则添加新商品到 addedTableData
       addedTableData.value.push({
         ...commodity,
         bid: bid.value,
@@ -372,7 +293,6 @@ const successCount = ref('')
 const failureCount = ref('')
 
 async function handleSave() {
-  console.log('addedTableData', addedTableData.value)
   const body = {
     profile_id: profile.value.profile_id,
     campaignId: respCampaignId.value,

+ 0 - 1
src/views/adManage/sd/campaigns/CreateCampaigns/index.vue

@@ -13,7 +13,6 @@ import AdGroup from './component/AdGroup.vue'
 import ContentTarget from './component/ContentTarget.vue'
 import CustomTarget from './component/CustomTarget.vue'
 
-
 const respCampaignId = ref('')
 const respCampaignName = ref('')
 const respAdGroupId = ref('')

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

@@ -2,11 +2,13 @@
 	<div class="login-container flex">
 		<div class="login-left">
 			<div class="login-left-logo">
-				<img :src="logoMini" />
-				<div class="login-left-logo-text">
+				<!-- <img src="src/assets/ansjer_image.png"/> -->
+				<el-image style="width: 110px; height: 110px" src="src/assets/ansjer_image.png" fit="contain" />
+				<!-- 登录页左上角logo后面的文字 -->
+				<!-- <div class="login-left-logo-text">
 					<span>{{ getThemeConfig.globalViceTitle }}</span>
 					<span class="login-left-logo-text-msg">{{ getThemeConfig.globalViceTitleMsg }}</span>
-				</div>
+				</div> -->
 			</div>
 			<div class="login-left-img">
 				<img :src="loginMain" />
@@ -42,8 +44,8 @@
 		</div>
 
 		<div class="login-authorization">
-			<p>Copyright © 2021-2022 django-vue-admin.com 版权所有</p>
-			<p class="la-other">
+			<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>
@@ -51,7 +53,7 @@
 				<a href="#">隐私</a>
 				|
 				<a href="#">条款</a>
-			</p>
+			</p> -->
 		</div>
 	</div>
 </template>
@@ -80,6 +82,7 @@ const state = reactive({
 
 // 获取布局配置信息
 const getThemeConfig = computed(() => {
+	console.log('11', getThemeConfig)
 	return themeConfig.value;
 });
 // 页面加载时