From 74b43485c9903ad4da800ac773afb677698d6030 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E5=9F=8E?=
 <141405260+17521612761@users.noreply.github.com>
Date: Tue, 17 Dec 2024 10:07:49 +0800
Subject: [PATCH] =?UTF-8?q?uniapp=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91?=
 =?UTF-8?q?=EF=BC=9A=E9=A6=96=E9=A1=B5=E5=BC=B9=E6=A1=86=E5=B9=BF=E5=91=8A?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CoreShop/core/enum/home.enum.ts           | 140 ++++++++++--------
 .../components/home-adpop/home-adpop.vue      |  74 +++++----
 2 files changed, 121 insertions(+), 93 deletions(-)

diff --git a/CoreCms.Net.Uni-App/CoreShop/core/enum/home.enum.ts b/CoreCms.Net.Uni-App/CoreShop/core/enum/home.enum.ts
index 35865558..87d4e0de 100644
--- a/CoreCms.Net.Uni-App/CoreShop/core/enum/home.enum.ts
+++ b/CoreCms.Net.Uni-App/CoreShop/core/enum/home.enum.ts
@@ -1,75 +1,87 @@
 export enum WidgetCodeEnum {
-	/** 图片 */
-	imgSingle = 'imgSingle',
-	/** 服务商品 */
-	service = 'service',
-	/** 图片轮播 */
-	imgSlide = 'imgSlide',
-	/** 公告 */
-	notice = 'notice',
-	/** 优惠券 */
-	coupon = 'coupon',
-	/** 拼团 */
-	pinTuan = 'pinTuan',
-	/** 搜索 */
-	search = 'search',
-	/** 宫格自定义导航 */
-	navBar = 'navBar',
-	/** 商品选项卡 */
-	goodTabBar = 'goodTabBar',
-	/** 文章 */
-	article = 'article',
-	/** 文章分类 */
-	articleClassify = 'articleClassify',
-	/** 视频 */
-	video = 'video',
-	/** 商品 */
-	goods = 'goods',
-	/** 浏览记录 */
-	record = 'record',
-	/** 空格 */
-	blank = 'blank',
-	/** 多行文本输入区 */
-	textarea = 'textarea',
-	/** 图片集 */
-	imgWindow = 'imgWindow',
-	/** 文本内容 */
-	content = 'content',
-	/** 团购 */
-	groupPurchase = 'groupPurchase',
-	/** 秒杀 */
-	seckill = 'seckill',
-	/** 弹窗广告 */
-	adpop = 'adpop',
+    /** 图片 */
+    imgSingle = 'imgSingle',
+    /** 服务商品 */
+    service = 'service',
+    /** 图片轮播 */
+    imgSlide = 'imgSlide',
+    /** 公告 */
+    notice = 'notice',
+    /** 优惠券 */
+    coupon = 'coupon',
+    /** 拼团 */
+    pinTuan = 'pinTuan',
+    /** 搜索 */
+    search = 'search',
+    /** 宫格自定义导航 */
+    navBar = 'navBar',
+    /** 商品选项卡 */
+    goodTabBar = 'goodTabBar',
+    /** 文章 */
+    article = 'article',
+    /** 文章分类 */
+    articleClassify = 'articleClassify',
+    /** 视频 */
+    video = 'video',
+    /** 商品 */
+    goods = 'goods',
+    /** 浏览记录 */
+    record = 'record',
+    /** 空格 */
+    blank = 'blank',
+    /** 多行文本输入区 */
+    textarea = 'textarea',
+    /** 图片集 */
+    imgWindow = 'imgWindow',
+    /** 文本内容 */
+    content = 'content',
+    /** 团购 */
+    groupPurchase = 'groupPurchase',
+    /** 秒杀 */
+    seckill = 'seckill',
+    /** 弹窗广告 */
+    adpop = 'adpop',
 }
 
 
 /** nav页面导航类型 */
 export enum NavLinkEnum {
-	/** URL链接 */
-	urlLink = 1,
-	/** 商品 */
-	shop = 2,
-	/** 文章 */
-	article = 3,
-	/** 文章分类 */
-	articleCategory = 4,
-	/** 智能表单 */
-	intelligentForms = 5,
-	/** 商品分类 */
-	shopCategory = 6,
-	/** 跳转小程序 */
-	wxMiNiProgram = 7,
+    /** URL链接 */
+    urlLink = 1,
+    /** 商品 */
+    shop = 2,
+    /** 文章 */
+    article = 3,
+    /** 文章分类 */
+    articleCategory = 4,
+    /** 智能表单 */
+    intelligentForms = 5,
+    /** 商品分类 */
+    shopCategory = 6,
+    /** 跳转小程序 */
+    wxMiNiProgram = 7,
 };
 
 /** 底部导航栏 */
 export enum RouteSwitchTabEnum {
-	/** 首页 */
-	home = 'home',
-	/** 商品分类 */
-	classify = 'classify',
-	/** 购物车 */
-	cart = 'cart',
-	/** 个人中心 */
-	member = 'member',
+    /** 首页 */
+    home = 'home',
+    /** 商品分类 */
+    classify = 'classify',
+    /** 购物车 */
+    cart = 'cart',
+    /** 个人中心 */
+    member = 'member',
+}
+
+/** 底部导航栏页面路由 */
+export enum RouteSwitchNameEnum {
+    /** 首页 */
+    home = '/pages/home/home',
+    /** 商品分类 */
+    classify = '/pages/classify/classify',
+    /** 购物车 */
+    cart = '/pages/cart/cart',
+    /** 个人中心 */
+    member = '/pages/member/member',
 }
\ No newline at end of file
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-adpop/home-adpop.vue b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-adpop/home-adpop.vue
index 10dd4a4b..3f3cb5f7 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-adpop/home-adpop.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-adpop/home-adpop.vue
@@ -1,39 +1,55 @@
 <template>
-	<view class="adpop-box" v-if="state.show">
-		<view class="img-box">
-			<image class="img" :src="shopConfigStore.config.indexPopupWindowImageUrl" mode="widthFix"></image>
-			<view class="btn" @click="hanldeCloseAdpop">
-				<image class="icon" :src="handleStaticResources('/static/images/icon/icon-close.png')"></image>
-			</view>
-		</view>
-	</view>
+    <view class="adpop-box" v-if="state.show">
+        <view class="img-box">
+            <image class="img" @click="handleJumpPopupUrl" :src="shopConfigStore.config.indexPopupWindowImageUrl"
+                mode="widthFix"></image>
+            <view class="btn" @click="hanldeCloseAdpop">
+                <image class="icon" :src="handleStaticResources('/static/images/icon/icon-close.png')"></image>
+            </view>
+        </view>
+    </view>
 </template>
 <script setup lang="ts">
-	import { reactive, onMounted } from 'vue';
-	import type { ShopConfigStoreType } from '@/core/models';
-	import { useShopConfigStore } from '@/core/store';
-	import { ShowPopupWindowEnum } from '@/core/enum';
-	import { handleStaticResources } from '@/core/utils';
+    import { reactive, onMounted } from 'vue';
+    import type { ShopConfigStoreType } from '@/core/models';
+    import { useShopConfigStore } from '@/core/store';
+    import { ShowPopupWindowEnum, RouteSwitchNameEnum } from '@/core/enum';
+    import { handleStaticResources, handleRouteNavigateTo } from '@/core/utils';
+    // 获取项目配置
+    const shopConfigStore : ShopConfigStoreType = useShopConfigStore();
 
-	// 获取项目配置
-	const shopConfigStore : ShopConfigStoreType = useShopConfigStore();
+    const state = reactive<{
+        show : boolean,
+    }>({
+        show: false,
+    })
 
-	const state = reactive<{
-		show : boolean,
-	}>({
-		show: false,
-	})
+    const hanldeCloseAdpop = () => {
+        state.show = !state.show;
+    }
 
-	const hanldeCloseAdpop = () => {
-		state.show = !state.show;
-	}
+    onMounted(() => {
+        if (shopConfigStore.config.showIndexPopupWindow === ShowPopupWindowEnum.yes) {
+            state.show = true;
+        }
+    })
 
-	onMounted(() => {
-		if (shopConfigStore.config.showIndexPopupWindow === ShowPopupWindowEnum.yes) {
-			state.show = true;
-		}
-	})
+    const handleJumpPopupUrl = () => { 
+        if(!shopConfigStore.config.indexPopupWindowHrefUrl){
+            return ;
+        }
+        
+        if (shopConfigStore.config.indexPopupWindowHrefUrl === RouteSwitchNameEnum.home ||
+            shopConfigStore.config.indexPopupWindowHrefUrl === RouteSwitchNameEnum.classify ||
+            shopConfigStore.config.indexPopupWindowHrefUrl === RouteSwitchNameEnum.cart ||
+            shopConfigStore.config.indexPopupWindowHrefUrl === RouteSwitchNameEnum.member) {
+            uni.switchTab({ url: shopConfigStore.config.indexPopupWindowHrefUrl });
+            return;
+        }
+        
+        handleRouteNavigateTo(shopConfigStore.config.indexPopupWindowHrefUrl)
+    }
 </script>
 <style lang="scss" scoped>
-	@import './home-adpop.scss';
+    @import './home-adpop.scss';
 </style>
\ No newline at end of file