From b63edc4977d58ebd464efada775a55af6bf5de6a Mon Sep 17 00:00:00 2001
From: riskcn <riskcn@163.com>
Date: Tue, 26 Nov 2024 22:36:36 +0800
Subject: [PATCH] 1126

---
 config/config.js                              |   2 +-
 pages/category/album.vue                      |  75 ++++-----
 pages/category/category.vue                   | 117 +++++++++-----
 pages/category/index.vue                      |  63 ++++----
 pages/category/video.vue                      |  68 ++++-----
 pages/detail/album.vue                        |  28 ++--
 pages/detail/index.vue                        |  24 ++-
 .../dist/cache/.vite/deps/_metadata.json      |  25 +--
 unpackage/dist/cache/.vite/deps/crypto-js.js  | 144 +++++++++---------
 9 files changed, 281 insertions(+), 265 deletions(-)

diff --git a/config/config.js b/config/config.js
index 9ed378b..49d7c57 100644
--- a/config/config.js
+++ b/config/config.js
@@ -1,7 +1,7 @@
 const config = {
 	siteName: '重庆枢纽港产业园',
 	baseUrl: 'http://apil.cqtlcm.com/api',
-	logo: 'http://static.cqtlcm.com/lh.jpg'
+	logo: 'http://static.cqtlcm.com/lh.png'
 }
 
 export default config;
\ No newline at end of file
diff --git a/pages/category/album.vue b/pages/category/album.vue
index 6b7ef95..79d4c89 100644
--- a/pages/category/album.vue
+++ b/pages/category/album.vue
@@ -4,42 +4,41 @@
 		<view class="banner">
 			<view class="img">
 				<image :src="topImg" mode="aspectFill" style="width: 100%;height: 100%;"></image>
-				<view class="topText tn-flex tn-ml-xl">
-					<view class="icon tn-mt-sm tn-shadow">
+				<view class="topText tn-flex tn-flex-center-between tn-w-full tn-p-lg">
+					<view class="icon">
 						<image :src="config.logo" mode="aspectFill" style="width: 100%;height: 100%;"></image>
 					</view>
-					<view class="title tn-ml tn-text-3xl tn-text-bold tn-mt">
-						{{config.siteName}}
+					<view class="title tn-text-xl tn-mt-xl">
+						#{{headerTitle}}
 					</view>
 				</view>
 			</view>
-			<view class="search tn-pl-sm tn-pr-sm tn-pt-xs tn-pb-xs" @click="showSearch">
-				<TnIcon name="search"></TnIcon>
-				<span class="tn-pl-xs">搜 索</span>
-			</view>
 		</view>
 		
-		<view class="container tn-shadow tn-m-sm  tn-radius">
-			<view class="topic tn-text-xl tn-text-bold tn-pt-sm tn-pb tn-border-bottom tn-grey-light_border tn-p-sm" style="letter-spacing: 4rpx;border-bottom-right-radius: 0;border-bottom-left-radius: 0;">
-				#{{headerTitle}}
+		<view class="container tn-shadow tn-radius">
+			<view class="search tn-p-sm tn-pb-0 tn-flex tn-flex-center-end">
+				<view class="search-btn tn-border tn-gray-dark_border tn-p-xs tn-pt-0 tn-pb-0 tn-text tn-gray-dark_text" @click="showSearch">
+					<TnIcon name="search"/>
+					<span class="tn-pl-xs">搜 索</span>
+				</view>
 			</view>
 			<view class="item tn-p-sm">
 				<TnWaterFall :data="articleList" mode="calc">
 				    <template #left="{ item }">
-				      <view class="image-data"  @click="toDetail(item)">
-						  <view class="tn-mb-xs tn-shadow">
+				      <view class="image-data tn-mb-sm"  @click="toDetail(item)">
+						  <view class="img-child tn-mb-xs tn-shadow tn-gray-dark_shadow">
 						  	<image class="image" :src="JSON.parse(item.image)[0]" mode="widthFix" />
-						  	<view class="title tn-text-center">
+						  	<view class="title tn-text-center tn-pt-xs tn-pb-xs">
 						  		{{item.title}}
 						  	</view>
 						  </view>
 				      </view>
 				    </template>
 				    <template #right="{ item }" >
-				      <view class="image-data tn-ml-xs"  @click="toDetail(item)">
-						  <view class="tn-mb-xs tn-shadow">
+				      <view class="image-data tn-ml-xs tn-mb-sm"  @click="toDetail(item)">
+						  <view class="img-child tn-mb-xs tn-shadow tn-gray-dark_shadow">
 						  	<image class="image" :src="JSON.parse(item.image)[0]" mode="widthFix" />
-						  	<view class="title tn-text-center">
+						  	<view class="title tn-text-center tn-pt-xs tn-pb-xs">
 						  		{{item.title}}
 						  	</view>
 						  </view>
@@ -81,6 +80,8 @@
 
 	const showPopup = ref(false)
 	
+	const hasMore = ref(true)
+	
 	const headerTitle = ref('');
 	
 	const searchValue = ref()
@@ -131,9 +132,6 @@
 				title:res.data.data.cateName
 			})
 			headerTitle.value = res.data.data.cateName
-			// if(res.data.data.image){
-			// 	topImg.value = res.data.data.image
-			// }
 		})
 	}
 	
@@ -146,7 +144,8 @@
 		}).then((res:any)=>{
 			articleList.value = articleList.value.concat(res.data.data.list)
 			loadmoreStatus.value = 'loadmore'	
-			if(res.data.data.list.length<10){
+			if(res.data.data.list.length < 10){
+				hasMore.value = false
 				loadmoreStatus.value = 'nomore'
 			}
 		})
@@ -183,8 +182,10 @@
 	}) 
 	
 	onReachBottom(() => {
-		params.page += 1
-		getList(params)
+		if(hasMore.value){
+			params.page += 1
+			getList(params)
+		}
 	}) 
 	
 	onMounted(()=>{
@@ -209,13 +210,11 @@
 					top: 100rpx;
 					left: 0;
 					.icon{
-						width: 100rpx;
-						height: 100rpx;
-						border-radius: 50%;
+						width: 220rpx;
+						height: 80rpx;
 					}
 					.title{
 						letter-spacing: 4rpx;
-						text-shadow: 6rpx 6rpx 8rpx #5c5c5c;
 					}
 				}
 			}
@@ -228,23 +227,25 @@
 				left: 0;
 				background:linear-gradient(180deg,rgba(255, 255, 255, 0.01),rgba(255, 255, 255, 0.9))
 			}
-			.search{
-				color: #fff;
-				position: absolute;
-				top: 20rpx;
-				right: 20rpx;
-				border-radius: 30rpx;
-				background-color: rgba(255, 255, 255, 0.5);
-			}
+		}
+		
+		.search-btn{
+			width: 150rpx;
+			border-radius: 40rpx;
+			padding-top: 4rpx;
+			padding-bottom: 5rpx;
 		}
 		
 		.container{
 			position: relative;
-			top: -130rpx;
+			top: -160rpx;
 			background-color: #FFF;
 			.item{
 				.image-data {
-				  width: calc(100% - 0rpx);
+				  width: calc(100% - 10rpx);
+				  .img-child{
+					  border-radius: 5rpx;
+				  }
 				  .image {
 						display: block;
 						width: 100%;
diff --git a/pages/category/category.vue b/pages/category/category.vue
index 41c4738..e734a36 100644
--- a/pages/category/category.vue
+++ b/pages/category/category.vue
@@ -3,21 +3,19 @@
 		<view class="banner">
 			<view class="img">
 				<image :src="topImg" mode="aspectFill" style="width: 100%;height: 100%;"></image>
-				<view class="topText tn-flex tn-ml-xl">
+				<view class="topText tn-flex tn-flex-center-between tn-w-full tn-p-lg">
 					<view class="icon tn-mt-sm">
 						<image :src="config.logo" mode="aspectFill" style="width: 100%;height: 100%;"></image>
 					</view>
-					<view class="title tn-ml tn-text-3xl tn-text-bold tn-mt">
-						{{config.siteName}}
+					<view class="title tn-text-xl tn-mt-xl">
+						#{{headerTitle}}
 					</view>
 				</view>
 			</view>
 		</view>	
-		<view class="content tn-radius tn-m-sm">
-			<view class="top tn-flex tn-flex-center-between tn-pt-sm tn-border-bottom tn-grey-light_border">
-				<view class="topic tn-text-xl tn-text-bold tn-pl-sm tn-pb-sm" style="letter-spacing: 4rpx;">
-					#{{headerTitle}}
-				</view>
+		<view class="content tn-radius">
+			<view class="top tn-flex tn-flex-center-between tn-border-bottom tn-grey-light_border">
+				
 				<view class="tabList tn-w-3-5">
 					<TnTabs v-model="currentTabIndex" :scroll="false" :bottom-shadow="false" active-color="tn-blue-dark" bar-color="tn-blue-dark" bg-color="rgba(255,255,255,0.001)">
 					    <TnTabsItem
@@ -28,6 +26,12 @@
 					    />
 					</TnTabs>
 				</view>
+				<view class="search tn-p-sm tn-flex tn-flex-center-end">
+					<view class="search-btn tn-border tn-gray-dark_border tn-p-xs tn-pt-0 tn-pb-0 tn-text tn-gray-dark_text" @click="showSearch">
+						<TnIcon name="search"/>
+						<span class="tn-pl-xs">搜 索</span>
+					</view>
+				</view>
 			</view>
 			
 			<view class="list tn-shadow tn-p-sm">
@@ -36,16 +40,16 @@
 					:key="index" 
 					@click="toDetail(item)">
 					<view class="left tn-flex tn-flex-column tn-pr-sm tn-flex-1">
-						<view class="title tn-text-md tn-text-ellipsis-2">
+						<view class="title tn-text-lg tn-text-ellipsis-2">
 							{{item.title}}
 						</view>
 						<view class="info tn-flex tn-flex-row tn-flex-center-between tn-text-xs">
-							<view class="author">
-								<TnIcon name="pushpin"/>{{item.user}}
-							</view>
 							<view class="time">
 								<TnIcon name="time"/>{{dayjs(item.createTime).format('YYYY-MM-DD')}}
 							</view>
+							<view class="author">
+								<TnIcon name="eye"/>{{item.addNum + item.clickNum}}
+							</view>
 						</view>
 					</view>
 					<view class="right tn-shadow tn-shadow-blur" style="border-radius: 6rpx;">
@@ -57,11 +61,21 @@
 				</view>
 			</view>
 		</view>
+		<TnPopup v-model="showPopup" open-direction="top" :radius="0">
+		    <view class="tn-pt-sm tn-pb-sm tn-pl-lg tn-pr-lg">
+				<TnSearchBox
+				    v-model="searchValue"
+					shape="round"
+				    @search="searchBtnClickEvent"
+					@clear="clearEvent"
+				  />
+			</view>
+		</TnPopup>
 	</view>
 </template>
 
 <script lang="ts" setup>
-	import { ref,onMounted } from 'vue';
+	import { ref,onMounted, reactive } from 'vue';
 	import { onLoad,onReachBottom } from "@dcloudio/uni-app";
 	import request from '@/utils/request';
 	import dayjs from "dayjs";
@@ -69,9 +83,9 @@
 	import TnTabsItem from '@/uni_modules/tuniaoui-vue3/components/tabs/src/tabs-item.vue'
 	import type { LoadmoreStatus } from '@tuniao/tnui-vue3-uniapp'
 	import TnLoadmore from '@/uni_modules/tuniaoui-vue3/components/loadmore/src/loadmore.vue'
+	import TnPopup from '@/uni_modules/tuniaoui-vue3/components/popup/src/popup.vue'
+	import TnSearchBox from '@/uni_modules/tuniaoui-vue3/components/search-box/src/search-box.vue'
 	import config from '@/config/config';
-	
-	const currentCate = ref()
 
 	const cateId = ref();
 	
@@ -79,17 +93,27 @@
 	
 	const topImg = ref('/static/index_top.jpg')
 	
-	const defaultImg = ref('http://static.cqtlcm.com/jujiao.jpg');
+	const defaultImg = ref('http://static.cqtlcm.com/lhdefault.jpg');
 	
 	const currentTabIndex = ref(0)
 	
+	const searchValue = ref()
+	
 	const cateList = ref()
 	
 	const hasMore = ref(true);
 	
-	const page = ref(1)
+	const showPopup = ref(false)
 	
-	const limit = ref(10)
+	const params = reactive<{
+		page?:number,
+		limit?:number,
+		cateId?:number,
+		keyword?:string
+	}>({
+		page:1,
+		limit:10
+	})
 	
 	const articleList = ref([])
 	
@@ -121,22 +145,37 @@
 			}
 		}).then(res=>{
 			cateList.value = res.data.data
-			currentCate.value = res.data.data[0].cateId
-			getArticleList(res.data.data[0].cateId)
+			params.cateId = res.data.data[0].cateId
+			getArticleList()
 		})
     }
 	
-	const getArticleList = (cateId:number) => {
+	const showSearch = () => {
+		showPopup.value = true
+	}
+	
+	const clearEvent = () => {
+		params.page = 1
+		params.keyword = undefined
+		articleList.value = []
+		getArticleList()
+	}
+	
+	const searchBtnClickEvent = (value:string) => {
+		params.page = 1;
+		params.keyword = value
+		articleList.value = [];
+		showPopup.value = false;
+		getArticleList()
+	}
+	
+	const getArticleList = () => {
 		loadmoreStatus.value = 'loading'
 		let url = '/front/content/list'
 		request({
 			url:url,
 			method:'GET',
-			data:{
-				'cateId':cateId,
-				'page':page.value,
-				'limit':limit.value
-			}
+			data:params
 		}).then(res=>{
 			if(res.data.data.list && res.data.data.list.length > 0){
 				res.data.data.list.forEach((item:any)=>{
@@ -145,7 +184,7 @@
 					}
 				})
 			}
-			if(res.data.data.list.length < limit.value){
+			if(res.data.data.list.length < params.limit){
 				loadmoreStatus.value = 'nomore'
 				hasMore.value = false
 			}
@@ -156,10 +195,11 @@
 	
 	const changeTab = (item:any) => {
 		articleList.value = []
-		page.value = 1
+		params.page = 1
 		hasMore.value = true
-		currentCate.value = item.cateId
-		getArticleList(item.cateId)
+		params.keyword = ''
+		params.cateId = item.cateId
+		getArticleList()
 	}
 	
 	const toDetail = (item:any) =>{
@@ -193,8 +233,8 @@
 	
 	onReachBottom(()=>{
 		if(hasMore.value){
-			page.value += 1
-			getArticleList(currentCate.value)
+			params.page += 1
+			getArticleList()
 		}else{
 			loadmoreStatus.value = 'nomore'
 		}
@@ -221,9 +261,8 @@
 					top: 100rpx;
 					left: 0;
 					.icon{
-						width: 100rpx;
-						height: 100rpx;
-						border-radius: 50%;
+						width: 220rpx;
+						height: 80rpx;
 					}
 					.title{
 						letter-spacing: 4rpx;
@@ -240,10 +279,16 @@
 				}
 			}
 		}
+		.search-btn{
+			width: 150rpx;
+			border-radius: 40rpx;
+			padding-top: 4rpx;
+			padding-bottom: 5rpx;
+		}
 		.content{
 			position: relative;
 			background-color: #FFF;
-			margin-top: -130rpx;
+			margin-top: -160rpx;
 			.top{
 				border-radius: 0;
 			}
diff --git a/pages/category/index.vue b/pages/category/index.vue
index 4b882c1..0183bfd 100644
--- a/pages/category/index.vue
+++ b/pages/category/index.vue
@@ -3,39 +3,38 @@
 		<view class="banner">
 			<view class="img">
 				<image :src="topImg" mode="aspectFill" style="width: 100%;height: 100%;"></image>
-				<view class="topText tn-flex tn-ml-xl">
-					<view class="icon tn-mt-sm">
+				<view class="topText tn-flex tn-flex-center-between tn-w-full tn-p-lg">
+					<view class="icon">
 						<image :src="config.logo" mode="aspectFill" style="width: 100%;height: 100%;"></image>
 					</view>
-					<view class="title tn-ml tn-text-3xl tn-text-bold tn-mt">
-						{{config.siteName}}
+					<view class="title tn-text-xl tn-mt-xl">
+						#{{headerTitle}}
 					</view>
 				</view>
 			</view>
-			<view class="search tn-pl-sm tn-pr-sm tn-pt-xs tn-pb-xs" @click="showSearch">
-				<TnIcon name="search"></TnIcon>
-				<span class="tn-pl-xs">搜 索</span>
-			</view>
+			
 		</view>
-		<div class="container tn-shadow tn-m-sm tn-p-sm tn-radius">
-			<view class="topic tn-text-xl tn-text-bold tn-pt-sm tn-pb tn-border-bottom tn-grey-light_border" style="letter-spacing: 4rpx;">
-				#{{headerTitle}}
+		<div class="container tn-shadow tn-p-sm tn-radius">
+			<view class="search tn-p-sm tn-pb-0 tn-flex tn-flex-center-end">
+				<view class="search-btn tn-border tn-gray-dark_border tn-p-xs tn-pt-0 tn-pb-0 tn-text tn-gray-dark_text" @click="showSearch">
+					<TnIcon name="search"/>
+					<span class="tn-pl-xs">搜 索</span>
+				</view>
 			</view>
 			<view class="item tn-flex tn-flex-center-between tn-p-sm tn-border-bottom tn-grey-light_border" 
 				v-for="(item,index) in articleList" 
 				:key="index" 
 				@click="toDetail(item)">
 				<view class="left tn-flex tn-flex-column tn-pr-sm tn-flex-1">
-					<view class="title tn-text-md tn-text-ellipsis-2">
+					<view class="title tn-text-lg tn-text-ellipsis-2">
 						{{item.title}}
 					</view>
 					<view class="info tn-flex tn-flex-row tn-flex-center-between tn-text-xs">
-						<view class="author">
-							<TnIcon name="pushpin"/>{{item.user}}
-						</view>
 						<view class="time">
 							<TnIcon name="time"/>{{dayjs(item.createTime).format('YYYY-MM-DD')}}
-							<!-- <TnIcon name="time"/>{{dayjs(item.createTime).locale('zh-cn').fromNow()}} -->
+						</view>
+						<view class="author">
+							<TnIcon name="eye"/>{{item.clickNum + item.addNum}}
 						</view>
 					</view>
 				</view>
@@ -66,20 +65,17 @@
 	import request from '@/utils/request';
 	import { onLoad,onReachBottom } from "@dcloudio/uni-app";
 	import dayjs from "dayjs";
-	// import 'dayjs/locale/zh-cn'
-	// import relativeTime from "dayjs/plugin/relativeTime";
 	import type { LoadmoreStatus } from '@tuniao/tnui-vue3-uniapp'
 	import TnLoadmore from '@/uni_modules/tuniaoui-vue3/components/loadmore/src/loadmore.vue'
 	import TnPopup from '@/uni_modules/tuniaoui-vue3/components/popup/src/popup.vue'
 	import TnSearchBox from '@/uni_modules/tuniaoui-vue3/components/search-box/src/search-box.vue'
 	import config from '@/config/config'
-	// dayjs.extend(relativeTime)
 	
 	const topImg = ref('/static/index_top.jpg')
 	
 	const headerTitle = ref('');
 	
-	const defaultImg = ref('http://static.cqtlcm.com/jujiao.jpg');
+	const defaultImg = ref('http://static.cqtlcm.com/lhdefault.jpg');
 	
 	const cateId = ref()
 	
@@ -134,9 +130,6 @@
 				title:res.data.data.cateName
 			})
 			headerTitle.value = res.data.data.cateName
-			// if(res.data.data.image){
-			// 	topImg.value = res.data.data.image
-			// }
 		})
 	}	
 		
@@ -223,13 +216,11 @@
 					top: 100rpx;
 					left: 0;
 					.icon{
-						width: 100rpx;
-						height: 100rpx;
-						border-radius: 50%;
+						width: 220rpx;
+						height: 80rpx;
 					}
 					.title{
 						letter-spacing: 4rpx;
-						text-shadow: 6rpx 6rpx 8rpx #5c5c5c;
 					}
 				}
 			}
@@ -242,19 +233,17 @@
 				left: 0;
 				background:linear-gradient(180deg,rgba(255, 255, 255, 0.01),rgba(255, 255, 255, 0.9))
 			}
-			.search{
-				color: #fff;
-				position: absolute;
-				top: 20rpx;
-				right: 20rpx;
-				border-radius: 30rpx;
-				background-color: rgba(255, 255, 255, 0.5);
-			}
+
+		}
+		.search-btn{
+			width: 150rpx;
+			border-radius: 40rpx;
+			padding-top: 4rpx;
+			padding-bottom: 5rpx;
 		}
-		
 		.container{
 			position: relative;
-			top: -130rpx;
+			top: -160rpx;
 			background-color: #FFF;
 			.topic{
 				border-radius: 0;
diff --git a/pages/category/video.vue b/pages/category/video.vue
index 2ea64f4..2aacbd1 100644
--- a/pages/category/video.vue
+++ b/pages/category/video.vue
@@ -4,26 +4,25 @@
 		<view class="banner">
 			<view class="img">
 				<image :src="topImg" mode="aspectFill" style="width: 100%;height: 100%;"></image>
-				<view class="topText tn-flex tn-ml-xl">
-					<view class="icon tn-mt-sm">
+				<view class="topText tn-flex tn-flex-center-between tn-w-full tn-p-lg">
+					<view class="icon">
 						<image :src="config.logo" mode="aspectFill" style="width: 100%;height: 100%;"></image>
 					</view>
-					<view class="title tn-ml tn-text-3xl tn-text-bold tn-mt">
-						{{config.siteName}}
+					<view class="title tn-text-xl tn-mt-xl">
+						#{{headerTitle}}
 					</view>
 				</view>
 			</view>
-			<view class="search tn-pl-sm tn-pr-sm tn-pt-xs tn-pb-xs" @click="showSearch">
-				<TnIcon name="search"></TnIcon>
-				<span class="tn-pl-xs">搜 索</span>
-			</view>
 		</view>
-		<view class="container tn-shadow tn-m-sm  tn-radius">
-			<view class="topic tn-text-xl tn-text-bold tn-pt-sm tn-pb tn-border-bottom tn-grey-light_border tn-p-sm" style="letter-spacing: 4rpx;border-bottom-right-radius: 0;border-bottom-left-radius: 0;">
-				#{{headerTitle}}
+		<view class="container tn-shadow tn-radius tn-pl-sm tn-pr-sm">
+			<view class="search tn-p-sm tn-pb-0 tn-flex tn-flex-center-end">
+				<view class="search-btn tn-border tn-gray-dark_border tn-p-xs tn-pt-0 tn-pb-0 tn-text tn-gray-dark_text" @click="showSearch">
+					<TnIcon name="search"/>
+					<span class="tn-pl-xs">搜 索</span>
+				</view>
 			</view>
-			<view class="item tn-radius tn-mb tn-mt tn-shadow" v-for="(item,index) in articleList" :key="index" @click="toDetail(item)">
-				<view class="cover tn-radius tn-p-sm">
+			<view class="item tn-mb tn-mt tn-shadow tn-gray-dark_shadow" v-for="(item,index) in articleList" :key="index" @click="toDetail(item)">
+				<view class="cover">
 					<image :src="JSON.parse(item.image)[0]" style="width: 100%;height: 100%;"></image>
 				</view>
 				<view class="wrap">
@@ -31,7 +30,7 @@
 						
 					</view>
 				</view>
-				<view class="title tn-text-center tn-pb-xs">
+				<view class="title tn-text-center tn-text-lg tn-pb-xs tn-pt-xs">
 					{{item.title}}
 				</view>
 			</view>
@@ -62,10 +61,13 @@
 	import TnSearchBox from '@/uni_modules/tuniaoui-vue3/components/search-box/src/search-box.vue'
 	import TnLoadmore from '@/uni_modules/tuniaoui-vue3/components/loadmore/src/loadmore.vue'
 	import config from '@/config/config.js'
+	
 	const loadmoreStatus = ref<LoadmoreStatus>('loadmore')
 	
 	const topImg = ref('/static/index_top.jpg')
 	
+	const  hasMore = ref(true)
+	
 	const showPopup = ref(false)
 	
 	const headerTitle = ref('')
@@ -113,9 +115,6 @@
 				title:res.data.data.cateName
 			})
 			headerTitle.value = res.data.data.cateName
-			// if(res.data.data.image){
-			// 	topImg.value = res.data.data.image
-			// }
 		})
 	}
 	
@@ -128,13 +127,14 @@
 		}).then((res:any)=>{
 			articleList.value = articleList.value.concat(res.data.data.list)
 			loadmoreStatus.value = 'loadmore'	
-			if(res.data.data.list.length<10){
+			if(res.data.data.list.length < 10){
 				loadmoreStatus.value = 'nomore'
+				hasMore.value = false
 			}
 		})
 	}
 	
-	const toDetail = (item) =>{
+	const toDetail = (item:any) =>{
 		if(item.type === 0){
 			let routeUrl = '/pages/detail/index'
 			if(item.template){
@@ -164,8 +164,10 @@
 	}) 
 	
 	onReachBottom(() =>{
-		params.page += 1
-		getList(params)
+		if(hasMore.value){
+			params.page += 1
+			getList(params)
+		}
 	}) 
 	
 	onMounted(() => {
@@ -191,13 +193,11 @@
 					top: 100rpx;
 					left: 0;
 					.icon{
-						width: 100rpx;
-						height: 100rpx;
-						border-radius: 50%;
+						width: 220rpx;
+						height: 80rpx;
 					}
 					.title{
 						letter-spacing: 4rpx;
-						text-shadow: 6rpx 6rpx 8rpx #5c5c5c;
 					}
 				}
 			}
@@ -210,24 +210,24 @@
 				left: 0;
 				background:linear-gradient(180deg,rgba(255, 255, 255, 0.01),rgba(255, 255, 255, 0.9))
 			}
-			.search{
-				color: #fff;
-				position: absolute;
-				top: 20rpx;
-				right: 20rpx;
-				border-radius: 30rpx;
-				background-color: rgba(255, 255, 255, 0.5);
-			}
+			
+		}
+		.search-btn{
+			width: 150rpx;
+			border-radius: 40rpx;
+			padding-top: 4rpx;
+			padding-bottom: 5rpx;
 		}
 		
 		.container{
 			position: relative;
-			top: -130rpx;
+			top: -160rpx;
 			background-color: #FFF;
 			.item{
 				.cover{
 					width: 100%;
 					height: 380rpx;
+					border-radius: 6rpx;
 				}
 			}
 		}
diff --git a/pages/detail/album.vue b/pages/detail/album.vue
index 8985c47..5b05bda 100644
--- a/pages/detail/album.vue
+++ b/pages/detail/album.vue
@@ -3,25 +3,25 @@
 		<view class="banner">
 			<view class="img">
 				<image :src="topImg" mode="aspectFill" style="width: 100%;height: 100%;"></image>
-				<view class="topText tn-flex tn-ml-xl">
-					<view class="icon tn-mt-sm">
+				<view class="topText tn-flex tn-flex-center-between tn-w-full tn-p-lg">
+					<view class="icon">
 						<image :src="config.logo" mode="aspectFill" style="width: 100%;height: 100%;"></image>
 					</view>
-					<view class="title tn-ml tn-text-3xl tn-text-bold tn-mt">
+					<view class="title tn-text-xl tn-mt-xl">
 						{{config.siteName}}
 					</view>
 				</view>
 			</view>
 		</view>	
 		
-		<view class="content">
+		<view class="content tn-radius tn-shadow tn-pt-sm tn-pl-xs tn-pr-xs">
 			<view class="title tn-text-bold tn-text-xl tn-text-center tn-p-sm">
 				{{detail.title}}
 			</view>
-			<view class="info tn-p-xs tn-flex tn-flex-center-around tn-border-bottom tn-grey-light_border">
+			<view class="info tn-p-xs tn-flex tn-flex-center-around tn-border-bottom tn-grey-light_border tn-gray-dark_text">
 				<view class="user tn-flex">
 					<view>
-						<tn-icon name="my-circle"></tn-icon>
+						<tn-icon name="my-love" size="28"/>
 					</view>
 					<view class="">
 						{{detail.user}}
@@ -29,15 +29,15 @@
 				</view>			
 				<view class="time tn-flex">
 					<view>
-						<tn-icon name="time"></tn-icon>
+						<tn-icon name="time" size="28"/>
 					</view>
 					<view class="">
-						{{detail.createTime}}
+						{{dayjs(detail.createTime).format('YYYY-MM-DD')}}
 					</view>
 				</view>
 				<view class="click tn-flex">
 					<view>
-						<tn-icon name="eye"></tn-icon>
+						<tn-icon name="eye"  size="28"/>
 					</view>
 					<view>
 						{{Number(detail.clickNum) + Number(detail.addNum)}}
@@ -59,6 +59,7 @@
 	import request from '@/utils/request';
 	import { onLoad } from "@dcloudio/uni-app";
 	import TnPhotoAlbum from '@/uni_modules/tuniaoui-vue3/components/photo-album/src/photo-album.vue'
+	import dayjs from 'dayjs';
 	import config from '@/config/config';
 	const topImg = ref('/static/index_top.jpg')
 	
@@ -87,7 +88,6 @@
 			if(res.data.data.image){
 				let images = JSON.parse(res.data.data.image)
 				detail.image = images
-				// topImg.value = images[0]
 			}else{
 				getMenuData(cateId)
 			}
@@ -133,13 +133,11 @@
 					top: 100rpx;
 					left: 0;
 					.icon{
-						width: 100rpx;
-						height: 100rpx;
-						border-radius: 50%;
+						width: 220rpx;
+						height: 80rpx;
 					}
 					.title{
 						letter-spacing: 4rpx;
-						text-shadow: 6rpx 6rpx 8rpx #5c5c5c;
 					}
 				}
 			}
@@ -156,7 +154,7 @@
 		.content{
 			background-color: #ffffff;
 			position: relative;
-			top:-130rpx;
+			top:-160rpx;
 		}
 	}
 </style>
\ No newline at end of file
diff --git a/pages/detail/index.vue b/pages/detail/index.vue
index 51db06a..d5b17c1 100644
--- a/pages/detail/index.vue
+++ b/pages/detail/index.vue
@@ -3,26 +3,26 @@
 		<view class="banner">
 			<view class="img">
 				<image :src="topImg" mode="aspectFill" style="width: 100%;height: 100%;"></image>
-				<view class="topText tn-flex tn-ml-xl">
-					<view class="icon tn-mt-sm">
+				<view class="topText tn-flex tn-flex-center-between tn-w-full tn-p-lg">
+					<view class="icon">
 						<image :src="config.logo" mode="aspectFill" style="width: 100%;height: 100%;"></image>
 					</view>
-					<view class="title tn-ml tn-text-3xl tn-text-bold tn-mt">
+					<view class="title tn-text-xl tn-mt-xl">
 						{{config.siteName}}
 					</view>
 				</view>
 			</view>
 		</view>
-		<view class="detail tn-m-sm tn-p-sm tn-radius tn-shadow">
-			<view class="title tn-text-bold tn-text-center tn-text-xl tn-p">
+		<view class="detail tn-p tn-radius tn-shadow">
+			<view class="title tn-text-bold tn-text-center tn-text-2xl tn-p-sm">
 				{{detail.title}}
 			</view>
 			<view class="info tn-flex tn-flex-center-between tn-pb-xs tn-pl tn-pr tn-gray-dark_text tn-border-bottom tn-grey-disabled_border tn-text-sm">
 				<view class="user">
-					<TnIcon name="pushpin"/>{{detail.user}}
+					<TnIcon name="my-love" size="28"/>{{detail.user}}
 				</view>
 				<view class="time">
-					<TnIcon name="time"/>{{detail.createTime}}
+					<TnIcon name="time" size="28"/>{{dayjs(detail.createTime).format('YYYY-MM-DD')}}
 				</view>
 			</view>
 			<view class="content tn-mt tn-text-lg" style="letter-spacing: 4rpx;">
@@ -37,6 +37,7 @@
 	import request from '@/utils/request';
 	import { onLoad } from "@dcloudio/uni-app";
 	import config from '@/config/config';
+	import dayjs from 'dayjs';
 	
 	const topImg = ref('/static/index_top.jpg')
 	
@@ -60,7 +61,6 @@
 		}).then(res=>{
 			if(res.data.data.image){
 				res.data.data.image = JSON.parse(res.data.data.image)
-				// topImg.value = res.data.data.image[0]
 			}
 			Object.assign(detail,res.data.data)
 			uni.setNavigationBarTitle({
@@ -93,13 +93,11 @@
 					top: 100rpx;
 					left: 0;
 					.icon{
-						width: 100rpx;
-						height: 100rpx;
-						border-radius: 50%;
+						width: 220rpx;
+						height: 80rpx;
 					}
 					.title{
 						letter-spacing: 4rpx;
-						text-shadow: 6rpx 6rpx 8rpx #5c5c5c;
 					}
 				}
 			}
@@ -116,7 +114,7 @@
 		.detail{
 			background-color: #fff;
 			position: relative;
-			top:-130rpx;
+			top:-160rpx;
 			.info{
 				border-radius: 0;
 			}
diff --git a/unpackage/dist/cache/.vite/deps/_metadata.json b/unpackage/dist/cache/.vite/deps/_metadata.json
index e51e09c..2e9f4f0 100644
--- a/unpackage/dist/cache/.vite/deps/_metadata.json
+++ b/unpackage/dist/cache/.vite/deps/_metadata.json
@@ -1,38 +1,23 @@
 {
-  "hash": "a88f8f2d",
-  "configHash": "e13971f2",
+  "hash": "644f7bc5",
+  "configHash": "cdbc5438",
   "lockfileHash": "220a6047",
-  "browserHash": "4eaf0e11",
+  "browserHash": "22c36b69",
   "optimized": {
     "crypto-js": {
       "src": "../../../../../node_modules/crypto-js/index.js",
       "file": "crypto-js.js",
-      "fileHash": "9cc7deff",
+      "fileHash": "f3a2aabd",
       "needsInterop": true
     },
     "dayjs": {
       "src": "../../../../../node_modules/dayjs/dayjs.min.js",
       "file": "dayjs.js",
-      "fileHash": "d3948691",
-      "needsInterop": true
-    },
-    "dayjs/locale/zh-cn": {
-      "src": "../../../../../node_modules/dayjs/locale/zh-cn.js",
-      "file": "dayjs_locale_zh-cn.js",
-      "fileHash": "81f78354",
-      "needsInterop": true
-    },
-    "dayjs/plugin/relativeTime": {
-      "src": "../../../../../node_modules/dayjs/plugin/relativeTime.js",
-      "file": "dayjs_plugin_relativeTime.js",
-      "fileHash": "10ab81c7",
+      "fileHash": "e00c7ac3",
       "needsInterop": true
     }
   },
   "chunks": {
-    "chunk-VATDREKL": {
-      "file": "chunk-VATDREKL.js"
-    },
     "chunk-TDUMLE5V": {
       "file": "chunk-TDUMLE5V.js"
     }
diff --git a/unpackage/dist/cache/.vite/deps/crypto-js.js b/unpackage/dist/cache/.vite/deps/crypto-js.js
index 4f745cf..c6a9570 100644
--- a/unpackage/dist/cache/.vite/deps/crypto-js.js
+++ b/unpackage/dist/cache/.vite/deps/crypto-js.js
@@ -16,9 +16,9 @@ var require_crypto = __commonJS({
   }
 });
 
-// ../../../../project/code/siteFront/node_modules/crypto-js/core.js
+// ../../../../Project/code/siteFront/node_modules/crypto-js/core.js
 var require_core = __commonJS({
-  "../../../../project/code/siteFront/node_modules/crypto-js/core.js"(exports, module) {
+  "../../../../Project/code/siteFront/node_modules/crypto-js/core.js"(exports, module) {
     (function(root, factory) {
       if (typeof exports === "object") {
         module.exports = exports = factory();
@@ -624,9 +624,9 @@ var require_core = __commonJS({
   }
 });
 
-// ../../../../project/code/siteFront/node_modules/crypto-js/x64-core.js
+// ../../../../Project/code/siteFront/node_modules/crypto-js/x64-core.js
 var require_x64_core = __commonJS({
-  "../../../../project/code/siteFront/node_modules/crypto-js/x64-core.js"(exports, module) {
+  "../../../../Project/code/siteFront/node_modules/crypto-js/x64-core.js"(exports, module) {
     (function(root, factory) {
       if (typeof exports === "object") {
         module.exports = exports = factory(require_core());
@@ -881,9 +881,9 @@ var require_x64_core = __commonJS({
   }
 });
 
-// ../../../../project/code/siteFront/node_modules/crypto-js/lib-typedarrays.js
+// ../../../../Project/code/siteFront/node_modules/crypto-js/lib-typedarrays.js
 var require_lib_typedarrays = __commonJS({
-  "../../../../project/code/siteFront/node_modules/crypto-js/lib-typedarrays.js"(exports, module) {
+  "../../../../Project/code/siteFront/node_modules/crypto-js/lib-typedarrays.js"(exports, module) {
     (function(root, factory) {
       if (typeof exports === "object") {
         module.exports = exports = factory(require_core());
@@ -926,9 +926,9 @@ var require_lib_typedarrays = __commonJS({
   }
 });
 
-// ../../../../project/code/siteFront/node_modules/crypto-js/enc-utf16.js
+// ../../../../Project/code/siteFront/node_modules/crypto-js/enc-utf16.js
 var require_enc_utf16 = __commonJS({
-  "../../../../project/code/siteFront/node_modules/crypto-js/enc-utf16.js"(exports, module) {
+  "../../../../Project/code/siteFront/node_modules/crypto-js/enc-utf16.js"(exports, module) {
     (function(root, factory) {
       if (typeof exports === "object") {
         module.exports = exports = factory(require_core());
@@ -1044,9 +1044,9 @@ var require_enc_utf16 = __commonJS({
   }
 });
 
-// ../../../../project/code/siteFront/node_modules/crypto-js/enc-base64.js
+// ../../../../Project/code/siteFront/node_modules/crypto-js/enc-base64.js
 var require_enc_base64 = __commonJS({
-  "../../../../project/code/siteFront/node_modules/crypto-js/enc-base64.js"(exports, module) {
+  "../../../../Project/code/siteFront/node_modules/crypto-js/enc-base64.js"(exports, module) {
     (function(root, factory) {
       if (typeof exports === "object") {
         module.exports = exports = factory(require_core());
@@ -1152,9 +1152,9 @@ var require_enc_base64 = __commonJS({
   }
 });
 
-// ../../../../project/code/siteFront/node_modules/crypto-js/enc-base64url.js
+// ../../../../Project/code/siteFront/node_modules/crypto-js/enc-base64url.js
 var require_enc_base64url = __commonJS({
-  "../../../../project/code/siteFront/node_modules/crypto-js/enc-base64url.js"(exports, module) {
+  "../../../../Project/code/siteFront/node_modules/crypto-js/enc-base64url.js"(exports, module) {
     (function(root, factory) {
       if (typeof exports === "object") {
         module.exports = exports = factory(require_core());
@@ -1271,9 +1271,9 @@ var require_enc_base64url = __commonJS({
   }
 });
 
-// ../../../../project/code/siteFront/node_modules/crypto-js/md5.js
+// ../../../../Project/code/siteFront/node_modules/crypto-js/md5.js
 var require_md5 = __commonJS({
-  "../../../../project/code/siteFront/node_modules/crypto-js/md5.js"(exports, module) {
+  "../../../../Project/code/siteFront/node_modules/crypto-js/md5.js"(exports, module) {
     (function(root, factory) {
       if (typeof exports === "object") {
         module.exports = exports = factory(require_core());
@@ -1450,9 +1450,9 @@ var require_md5 = __commonJS({
   }
 });
 
-// ../../../../project/code/siteFront/node_modules/crypto-js/sha1.js
+// ../../../../Project/code/siteFront/node_modules/crypto-js/sha1.js
 var require_sha1 = __commonJS({
-  "../../../../project/code/siteFront/node_modules/crypto-js/sha1.js"(exports, module) {
+  "../../../../Project/code/siteFront/node_modules/crypto-js/sha1.js"(exports, module) {
     (function(root, factory) {
       if (typeof exports === "object") {
         module.exports = exports = factory(require_core());
@@ -1541,9 +1541,9 @@ var require_sha1 = __commonJS({
   }
 });
 
-// ../../../../project/code/siteFront/node_modules/crypto-js/sha256.js
+// ../../../../Project/code/siteFront/node_modules/crypto-js/sha256.js
 var require_sha256 = __commonJS({
-  "../../../../project/code/siteFront/node_modules/crypto-js/sha256.js"(exports, module) {
+  "../../../../Project/code/siteFront/node_modules/crypto-js/sha256.js"(exports, module) {
     (function(root, factory) {
       if (typeof exports === "object") {
         module.exports = exports = factory(require_core());
@@ -1662,9 +1662,9 @@ var require_sha256 = __commonJS({
   }
 });
 
-// ../../../../project/code/siteFront/node_modules/crypto-js/sha224.js
+// ../../../../Project/code/siteFront/node_modules/crypto-js/sha224.js
 var require_sha224 = __commonJS({
-  "../../../../project/code/siteFront/node_modules/crypto-js/sha224.js"(exports, module) {
+  "../../../../Project/code/siteFront/node_modules/crypto-js/sha224.js"(exports, module) {
     (function(root, factory, undef) {
       if (typeof exports === "object") {
         module.exports = exports = factory(require_core(), require_sha256());
@@ -1707,9 +1707,9 @@ var require_sha224 = __commonJS({
   }
 });
 
-// ../../../../project/code/siteFront/node_modules/crypto-js/sha512.js
+// ../../../../Project/code/siteFront/node_modules/crypto-js/sha512.js
 var require_sha512 = __commonJS({
-  "../../../../project/code/siteFront/node_modules/crypto-js/sha512.js"(exports, module) {
+  "../../../../Project/code/siteFront/node_modules/crypto-js/sha512.js"(exports, module) {
     (function(root, factory, undef) {
       if (typeof exports === "object") {
         module.exports = exports = factory(require_core(), require_x64_core());
@@ -1989,9 +1989,9 @@ var require_sha512 = __commonJS({
   }
 });
 
-// ../../../../project/code/siteFront/node_modules/crypto-js/sha384.js
+// ../../../../Project/code/siteFront/node_modules/crypto-js/sha384.js
 var require_sha384 = __commonJS({
-  "../../../../project/code/siteFront/node_modules/crypto-js/sha384.js"(exports, module) {
+  "../../../../Project/code/siteFront/node_modules/crypto-js/sha384.js"(exports, module) {
     (function(root, factory, undef) {
       if (typeof exports === "object") {
         module.exports = exports = factory(require_core(), require_x64_core(), require_sha512());
@@ -2035,9 +2035,9 @@ var require_sha384 = __commonJS({
   }
 });
 
-// ../../../../project/code/siteFront/node_modules/crypto-js/sha3.js
+// ../../../../Project/code/siteFront/node_modules/crypto-js/sha3.js
 var require_sha3 = __commonJS({
-  "../../../../project/code/siteFront/node_modules/crypto-js/sha3.js"(exports, module) {
+  "../../../../Project/code/siteFront/node_modules/crypto-js/sha3.js"(exports, module) {
     (function(root, factory, undef) {
       if (typeof exports === "object") {
         module.exports = exports = factory(require_core(), require_x64_core());
@@ -2237,9 +2237,9 @@ var require_sha3 = __commonJS({
   }
 });
 
-// ../../../../project/code/siteFront/node_modules/crypto-js/ripemd160.js
+// ../../../../Project/code/siteFront/node_modules/crypto-js/ripemd160.js
 var require_ripemd160 = __commonJS({
-  "../../../../project/code/siteFront/node_modules/crypto-js/ripemd160.js"(exports, module) {
+  "../../../../Project/code/siteFront/node_modules/crypto-js/ripemd160.js"(exports, module) {
     (function(root, factory) {
       if (typeof exports === "object") {
         module.exports = exports = factory(require_core());
@@ -2708,9 +2708,9 @@ var require_ripemd160 = __commonJS({
   }
 });
 
-// ../../../../project/code/siteFront/node_modules/crypto-js/hmac.js
+// ../../../../Project/code/siteFront/node_modules/crypto-js/hmac.js
 var require_hmac = __commonJS({
-  "../../../../project/code/siteFront/node_modules/crypto-js/hmac.js"(exports, module) {
+  "../../../../Project/code/siteFront/node_modules/crypto-js/hmac.js"(exports, module) {
     (function(root, factory) {
       if (typeof exports === "object") {
         module.exports = exports = factory(require_core());
@@ -2815,9 +2815,9 @@ var require_hmac = __commonJS({
   }
 });
 
-// ../../../../project/code/siteFront/node_modules/crypto-js/pbkdf2.js
+// ../../../../Project/code/siteFront/node_modules/crypto-js/pbkdf2.js
 var require_pbkdf2 = __commonJS({
-  "../../../../project/code/siteFront/node_modules/crypto-js/pbkdf2.js"(exports, module) {
+  "../../../../Project/code/siteFront/node_modules/crypto-js/pbkdf2.js"(exports, module) {
     (function(root, factory, undef) {
       if (typeof exports === "object") {
         module.exports = exports = factory(require_core(), require_sha256(), require_hmac());
@@ -2913,9 +2913,9 @@ var require_pbkdf2 = __commonJS({
   }
 });
 
-// ../../../../project/code/siteFront/node_modules/crypto-js/evpkdf.js
+// ../../../../Project/code/siteFront/node_modules/crypto-js/evpkdf.js
 var require_evpkdf = __commonJS({
-  "../../../../project/code/siteFront/node_modules/crypto-js/evpkdf.js"(exports, module) {
+  "../../../../Project/code/siteFront/node_modules/crypto-js/evpkdf.js"(exports, module) {
     (function(root, factory, undef) {
       if (typeof exports === "object") {
         module.exports = exports = factory(require_core(), require_sha1(), require_hmac());
@@ -3004,9 +3004,9 @@ var require_evpkdf = __commonJS({
   }
 });
 
-// ../../../../project/code/siteFront/node_modules/crypto-js/cipher-core.js
+// ../../../../Project/code/siteFront/node_modules/crypto-js/cipher-core.js
 var require_cipher_core = __commonJS({
-  "../../../../project/code/siteFront/node_modules/crypto-js/cipher-core.js"(exports, module) {
+  "../../../../Project/code/siteFront/node_modules/crypto-js/cipher-core.js"(exports, module) {
     (function(root, factory, undef) {
       if (typeof exports === "object") {
         module.exports = exports = factory(require_core(), require_evpkdf());
@@ -3648,9 +3648,9 @@ var require_cipher_core = __commonJS({
   }
 });
 
-// ../../../../project/code/siteFront/node_modules/crypto-js/mode-cfb.js
+// ../../../../Project/code/siteFront/node_modules/crypto-js/mode-cfb.js
 var require_mode_cfb = __commonJS({
-  "../../../../project/code/siteFront/node_modules/crypto-js/mode-cfb.js"(exports, module) {
+  "../../../../Project/code/siteFront/node_modules/crypto-js/mode-cfb.js"(exports, module) {
     (function(root, factory, undef) {
       if (typeof exports === "object") {
         module.exports = exports = factory(require_core(), require_cipher_core());
@@ -3700,9 +3700,9 @@ var require_mode_cfb = __commonJS({
   }
 });
 
-// ../../../../project/code/siteFront/node_modules/crypto-js/mode-ctr.js
+// ../../../../Project/code/siteFront/node_modules/crypto-js/mode-ctr.js
 var require_mode_ctr = __commonJS({
-  "../../../../project/code/siteFront/node_modules/crypto-js/mode-ctr.js"(exports, module) {
+  "../../../../Project/code/siteFront/node_modules/crypto-js/mode-ctr.js"(exports, module) {
     (function(root, factory, undef) {
       if (typeof exports === "object") {
         module.exports = exports = factory(require_core(), require_cipher_core());
@@ -3740,9 +3740,9 @@ var require_mode_ctr = __commonJS({
   }
 });
 
-// ../../../../project/code/siteFront/node_modules/crypto-js/mode-ctr-gladman.js
+// ../../../../Project/code/siteFront/node_modules/crypto-js/mode-ctr-gladman.js
 var require_mode_ctr_gladman = __commonJS({
-  "../../../../project/code/siteFront/node_modules/crypto-js/mode-ctr-gladman.js"(exports, module) {
+  "../../../../Project/code/siteFront/node_modules/crypto-js/mode-ctr-gladman.js"(exports, module) {
     (function(root, factory, undef) {
       if (typeof exports === "object") {
         module.exports = exports = factory(require_core(), require_cipher_core());
@@ -3815,9 +3815,9 @@ var require_mode_ctr_gladman = __commonJS({
   }
 });
 
-// ../../../../project/code/siteFront/node_modules/crypto-js/mode-ofb.js
+// ../../../../Project/code/siteFront/node_modules/crypto-js/mode-ofb.js
 var require_mode_ofb = __commonJS({
-  "../../../../project/code/siteFront/node_modules/crypto-js/mode-ofb.js"(exports, module) {
+  "../../../../Project/code/siteFront/node_modules/crypto-js/mode-ofb.js"(exports, module) {
     (function(root, factory, undef) {
       if (typeof exports === "object") {
         module.exports = exports = factory(require_core(), require_cipher_core());
@@ -3853,9 +3853,9 @@ var require_mode_ofb = __commonJS({
   }
 });
 
-// ../../../../project/code/siteFront/node_modules/crypto-js/mode-ecb.js
+// ../../../../Project/code/siteFront/node_modules/crypto-js/mode-ecb.js
 var require_mode_ecb = __commonJS({
-  "../../../../project/code/siteFront/node_modules/crypto-js/mode-ecb.js"(exports, module) {
+  "../../../../Project/code/siteFront/node_modules/crypto-js/mode-ecb.js"(exports, module) {
     (function(root, factory, undef) {
       if (typeof exports === "object") {
         module.exports = exports = factory(require_core(), require_cipher_core());
@@ -3884,9 +3884,9 @@ var require_mode_ecb = __commonJS({
   }
 });
 
-// ../../../../project/code/siteFront/node_modules/crypto-js/pad-ansix923.js
+// ../../../../Project/code/siteFront/node_modules/crypto-js/pad-ansix923.js
 var require_pad_ansix923 = __commonJS({
-  "../../../../project/code/siteFront/node_modules/crypto-js/pad-ansix923.js"(exports, module) {
+  "../../../../Project/code/siteFront/node_modules/crypto-js/pad-ansix923.js"(exports, module) {
     (function(root, factory, undef) {
       if (typeof exports === "object") {
         module.exports = exports = factory(require_core(), require_cipher_core());
@@ -3916,9 +3916,9 @@ var require_pad_ansix923 = __commonJS({
   }
 });
 
-// ../../../../project/code/siteFront/node_modules/crypto-js/pad-iso10126.js
+// ../../../../Project/code/siteFront/node_modules/crypto-js/pad-iso10126.js
 var require_pad_iso10126 = __commonJS({
-  "../../../../project/code/siteFront/node_modules/crypto-js/pad-iso10126.js"(exports, module) {
+  "../../../../Project/code/siteFront/node_modules/crypto-js/pad-iso10126.js"(exports, module) {
     (function(root, factory, undef) {
       if (typeof exports === "object") {
         module.exports = exports = factory(require_core(), require_cipher_core());
@@ -3944,9 +3944,9 @@ var require_pad_iso10126 = __commonJS({
   }
 });
 
-// ../../../../project/code/siteFront/node_modules/crypto-js/pad-iso97971.js
+// ../../../../Project/code/siteFront/node_modules/crypto-js/pad-iso97971.js
 var require_pad_iso97971 = __commonJS({
-  "../../../../project/code/siteFront/node_modules/crypto-js/pad-iso97971.js"(exports, module) {
+  "../../../../Project/code/siteFront/node_modules/crypto-js/pad-iso97971.js"(exports, module) {
     (function(root, factory, undef) {
       if (typeof exports === "object") {
         module.exports = exports = factory(require_core(), require_cipher_core());
@@ -3971,9 +3971,9 @@ var require_pad_iso97971 = __commonJS({
   }
 });
 
-// ../../../../project/code/siteFront/node_modules/crypto-js/pad-zeropadding.js
+// ../../../../Project/code/siteFront/node_modules/crypto-js/pad-zeropadding.js
 var require_pad_zeropadding = __commonJS({
-  "../../../../project/code/siteFront/node_modules/crypto-js/pad-zeropadding.js"(exports, module) {
+  "../../../../Project/code/siteFront/node_modules/crypto-js/pad-zeropadding.js"(exports, module) {
     (function(root, factory, undef) {
       if (typeof exports === "object") {
         module.exports = exports = factory(require_core(), require_cipher_core());
@@ -4005,9 +4005,9 @@ var require_pad_zeropadding = __commonJS({
   }
 });
 
-// ../../../../project/code/siteFront/node_modules/crypto-js/pad-nopadding.js
+// ../../../../Project/code/siteFront/node_modules/crypto-js/pad-nopadding.js
 var require_pad_nopadding = __commonJS({
-  "../../../../project/code/siteFront/node_modules/crypto-js/pad-nopadding.js"(exports, module) {
+  "../../../../Project/code/siteFront/node_modules/crypto-js/pad-nopadding.js"(exports, module) {
     (function(root, factory, undef) {
       if (typeof exports === "object") {
         module.exports = exports = factory(require_core(), require_cipher_core());
@@ -4028,9 +4028,9 @@ var require_pad_nopadding = __commonJS({
   }
 });
 
-// ../../../../project/code/siteFront/node_modules/crypto-js/format-hex.js
+// ../../../../Project/code/siteFront/node_modules/crypto-js/format-hex.js
 var require_format_hex = __commonJS({
-  "../../../../project/code/siteFront/node_modules/crypto-js/format-hex.js"(exports, module) {
+  "../../../../Project/code/siteFront/node_modules/crypto-js/format-hex.js"(exports, module) {
     (function(root, factory, undef) {
       if (typeof exports === "object") {
         module.exports = exports = factory(require_core(), require_cipher_core());
@@ -4088,9 +4088,9 @@ var require_format_hex = __commonJS({
   }
 });
 
-// ../../../../project/code/siteFront/node_modules/crypto-js/aes.js
+// ../../../../Project/code/siteFront/node_modules/crypto-js/aes.js
 var require_aes = __commonJS({
-  "../../../../project/code/siteFront/node_modules/crypto-js/aes.js"(exports, module) {
+  "../../../../Project/code/siteFront/node_modules/crypto-js/aes.js"(exports, module) {
     (function(root, factory, undef) {
       if (typeof exports === "object") {
         module.exports = exports = factory(require_core(), require_enc_base64(), require_md5(), require_evpkdf(), require_cipher_core());
@@ -4242,9 +4242,9 @@ var require_aes = __commonJS({
   }
 });
 
-// ../../../../project/code/siteFront/node_modules/crypto-js/tripledes.js
+// ../../../../Project/code/siteFront/node_modules/crypto-js/tripledes.js
 var require_tripledes = __commonJS({
-  "../../../../project/code/siteFront/node_modules/crypto-js/tripledes.js"(exports, module) {
+  "../../../../Project/code/siteFront/node_modules/crypto-js/tripledes.js"(exports, module) {
     (function(root, factory, undef) {
       if (typeof exports === "object") {
         module.exports = exports = factory(require_core(), require_enc_base64(), require_md5(), require_evpkdf(), require_cipher_core());
@@ -5023,9 +5023,9 @@ var require_tripledes = __commonJS({
   }
 });
 
-// ../../../../project/code/siteFront/node_modules/crypto-js/rc4.js
+// ../../../../Project/code/siteFront/node_modules/crypto-js/rc4.js
 var require_rc4 = __commonJS({
-  "../../../../project/code/siteFront/node_modules/crypto-js/rc4.js"(exports, module) {
+  "../../../../Project/code/siteFront/node_modules/crypto-js/rc4.js"(exports, module) {
     (function(root, factory, undef) {
       if (typeof exports === "object") {
         module.exports = exports = factory(require_core(), require_enc_base64(), require_md5(), require_evpkdf(), require_cipher_core());
@@ -5106,9 +5106,9 @@ var require_rc4 = __commonJS({
   }
 });
 
-// ../../../../project/code/siteFront/node_modules/crypto-js/rabbit.js
+// ../../../../Project/code/siteFront/node_modules/crypto-js/rabbit.js
 var require_rabbit = __commonJS({
-  "../../../../project/code/siteFront/node_modules/crypto-js/rabbit.js"(exports, module) {
+  "../../../../Project/code/siteFront/node_modules/crypto-js/rabbit.js"(exports, module) {
     (function(root, factory, undef) {
       if (typeof exports === "object") {
         module.exports = exports = factory(require_core(), require_enc_base64(), require_md5(), require_evpkdf(), require_cipher_core());
@@ -5235,9 +5235,9 @@ var require_rabbit = __commonJS({
   }
 });
 
-// ../../../../project/code/siteFront/node_modules/crypto-js/rabbit-legacy.js
+// ../../../../Project/code/siteFront/node_modules/crypto-js/rabbit-legacy.js
 var require_rabbit_legacy = __commonJS({
-  "../../../../project/code/siteFront/node_modules/crypto-js/rabbit-legacy.js"(exports, module) {
+  "../../../../Project/code/siteFront/node_modules/crypto-js/rabbit-legacy.js"(exports, module) {
     (function(root, factory, undef) {
       if (typeof exports === "object") {
         module.exports = exports = factory(require_core(), require_enc_base64(), require_md5(), require_evpkdf(), require_cipher_core());
@@ -5361,9 +5361,9 @@ var require_rabbit_legacy = __commonJS({
   }
 });
 
-// ../../../../project/code/siteFront/node_modules/crypto-js/blowfish.js
+// ../../../../Project/code/siteFront/node_modules/crypto-js/blowfish.js
 var require_blowfish = __commonJS({
-  "../../../../project/code/siteFront/node_modules/crypto-js/blowfish.js"(exports, module) {
+  "../../../../Project/code/siteFront/node_modules/crypto-js/blowfish.js"(exports, module) {
     (function(root, factory, undef) {
       if (typeof exports === "object") {
         module.exports = exports = factory(require_core(), require_enc_base64(), require_md5(), require_evpkdf(), require_cipher_core());
@@ -6550,9 +6550,9 @@ var require_blowfish = __commonJS({
   }
 });
 
-// ../../../../project/code/siteFront/node_modules/crypto-js/index.js
+// ../../../../Project/code/siteFront/node_modules/crypto-js/index.js
 var require_crypto_js = __commonJS({
-  "../../../../project/code/siteFront/node_modules/crypto-js/index.js"(exports, module) {
+  "../../../../Project/code/siteFront/node_modules/crypto-js/index.js"(exports, module) {
     (function(root, factory, undef) {
       if (typeof exports === "object") {
         module.exports = exports = factory(require_core(), require_x64_core(), require_lib_typedarrays(), require_enc_utf16(), require_enc_base64(), require_enc_base64url(), require_md5(), require_sha1(), require_sha256(), require_sha224(), require_sha512(), require_sha384(), require_sha3(), require_ripemd160(), require_hmac(), require_pbkdf2(), require_evpkdf(), require_cipher_core(), require_mode_cfb(), require_mode_ctr(), require_mode_ctr_gladman(), require_mode_ofb(), require_mode_ecb(), require_pad_ansix923(), require_pad_iso10126(), require_pad_iso97971(), require_pad_zeropadding(), require_pad_nopadding(), require_format_hex(), require_aes(), require_tripledes(), require_rc4(), require_rabbit(), require_rabbit_legacy(), require_blowfish());