diff --git a/pages.json b/pages.json
index f19eb4c..1d8133d 100644
--- a/pages.json
+++ b/pages.json
@@ -7,6 +7,10 @@
 			"^u-([^-].*)": "uview-plus/components/u-$1/u-$1.vue"
 		}
 	},
+<<<<<<< HEAD
+	"pages": [{
+			"path": "pages/Friend/violationreporting",
+=======
 	"pages": [
 		{
 			"path": "pages/index",
@@ -32,8 +36,24 @@
 		},
 		{
 			"path": "pages/signln/harvestaddress",
+>>>>>>> fc6726a74b5811cc7e918233ea3a847aadb88d7d
 			"style": {
-				"navigationBarTitleText": "收货地址",
+				"navigationBarTitleText": "违规举报",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/Friend/systemnotification",
+			"style": {
+				"navigationBarTitleText": "系统通知",
+				"navigationStyle": "custom"
+			}
+		},
+
+		{
+			"path": "pages/signln/signid",
+			"style": {
+				"navigationBarTitleText": "签到任务",
 				"navigationStyle": "custom"
 			}
 		},
@@ -44,6 +64,14 @@
 				"navigationStyle": "custom"
 			}
 		},
+		{
+			"path": "pages/signln/harvestaddress",
+			"style": {
+				"navigationBarTitleText": "收货地址",
+				"navigationStyle": "custom"
+			}
+		},
+
 		{
 			"path": "pages/signln/successfulexchange",
 			"style": {
@@ -52,10 +80,18 @@
 			}
 		},
 		{
+<<<<<<< HEAD
+			"path": "pages/index",
+			"style": {
+				"navigationBarTitleText": "若依移动端框架",
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "white"
+=======
 			"path": "pages/signln/signid",
 			"style": {
 				"navigationBarTitleText": "签到任务",
 				"navigationStyle": "custom"
+>>>>>>> fc6726a74b5811cc7e918233ea3a847aadb88d7d
 			}
 		},
 		{
@@ -216,7 +252,8 @@
 		{
 			"path": "pages/communication/addfriends",
 			"style": {
-				"navigationBarTitleText": "添加好友"
+				"navigationBarTitleText": "添加好友",
+				"navigationStyle": "custom"
 			}
 		},
 
@@ -229,21 +266,24 @@
 		{
 			"path": "pages/Friend/messagenotification",
 			"style": {
-				"navigationBarTitleText": ""
+				"navigationBarTitleText": "消息通知",
+				"navigationStyle": "custom"
 			}
 		},
 		{
 			"path": "pages/Friend/addfruebd",
 			"style": {
-				"navigationBarTitleText": ""
+				"navigationBarTitleText": "添加好友",
+				"navigationStyle": "custom"
 			}
 		},
 		{
 			"path": "pages/common/exchange/index",
 			"style": {
-				"navigationBarTitleText": ""
+				"navigationBarTitleText": "组件"
 			}
 		}
+
 	],
 	"tabBar": {
 		"color": "#000000",
diff --git a/pages/Friend/systemnotification.vue b/pages/Friend/systemnotification.vue
new file mode 100644
index 0000000..e125f5f
--- /dev/null
+++ b/pages/Friend/systemnotification.vue
@@ -0,0 +1,177 @@
+<!-- 系统通知 -->
+<template>
+	<navbar_neadVue title="系统通知"></navbar_neadVue>
+
+	<view v-for="(item,index) in arrcontent" :key="index">
+		<view class="timeview">
+			<text>{{item.time}}</text>
+		</view>
+
+		<view style="display: flex;margin-left: 32rpx;margin-top: 24rpx;">
+			<view class="imageview">
+				<image v-if="item.leng === '系统通知'" src="../../static/images/sign/系统通知.png" />
+				<image v-if="item.leng === '审核通知'" src="../../static/images/sign/审核通知.png" />
+			</view>
+			<view class="contentview">
+				<text class="viewtitle">{{item.title}}</text>
+				<text class="viewtext">
+					{{item.content}}
+				</text>
+				<text v-if="item.type=== 1" @click="haveGoTo()" class="viewtexttypesuccsee">
+					{{item.typecontent}}
+				</text>
+				<text v-if="item.type === 2" class="viewtexttypelose">
+					{{item.typecontent}}
+				</text>
+			</view>
+		</view>
+	</view>
+
+</template>
+
+<script setup>
+	import {
+		reactive
+	} from 'vue';
+	import navbar_neadVue from '../common/navbar/navbar_nead.vue';
+
+	const arrcontent = reactive([{
+			id: 1,
+			leng: "系统通知",
+			time: "2023.06.01 09:00",
+			title: "系统通知",
+			content: '尊敬的用户，您好，因您涉嫌违反平台规定，现对您进行禁言处理禁言时长：3天',
+			type: "",
+			typecontent: ""
+		},
+		{
+			id: 2,
+			leng: "系统通知",
+			time: "2023.06.01 09:00",
+			title: "活动公告",
+			content: '尊敬的用户，您好，您参加的《志愿者服务》活动即将开始，请您注意时间，及时参加。',
+			type: 1,
+			typecontent: "立即查看>"
+		},
+		{
+			id: 3,
+			leng: "系统通知",
+			time: "2023.06.01 09:00",
+			title: "系统通知",
+			content: '尊敬的用户，您好，因您涉嫌违反平台规定，现对您进行禁言处理禁言时长：3天',
+			type: 2,
+			typecontent: "未通过原因：内容存在铭感词"
+		},
+		{
+			id: 4,
+			leng: "审核通知",
+			time: "2023.06.01 09:00",
+			title: "话题审核",
+			content: '尊敬的用户，您好，您发布的话提“关于工作和生活”审核未通过。',
+			type: 2,
+			typecontent: "未通过原因：内容存在铭感词"
+		},
+	])
+
+	// 成功 立即查看>
+	function haveGoTo() {
+
+	}
+</script>
+
+<style scoped>
+	@import '../../pages/common/navbar/navbar.css';
+
+	.timeview {
+		width: 192rpx;
+		height: 28rpx;
+		border-radius: 14rpx 14rpx 14rpx 14rpx;
+		opacity: 0.1;
+		background: #000000;
+		margin: auto;
+		margin-top: 48rpx;
+	}
+
+	.timeview>text {
+		font-weight: Regular;
+		width: 166rpx;
+		height: 17rpx;
+		font-size: 20rpx;
+		text-align: center;
+		color: #FFFFFF;
+		line-height: 28rpx;
+		display: block;
+		margin: auto;
+		padding-top: 2rpx;
+	}
+
+	.imageview {
+		width: 80rpx;
+		height: 80rpx;
+		/* background-color: #000000; */
+	}
+
+	.imageview>image {
+		width: 80rpx;
+		height: 80rpx;
+	}
+
+	.contentview {
+		width: 490rpx;
+		/* height: 190rpx; */
+		border-radius: 12rpx 12rpx 12rpx 12rpx;
+		background: #ffffff;
+		margin: auto;
+		margin-right: 130rpx;
+	}
+
+	.viewtitle {
+		font-weight: Regular;
+		font-weight: 600;
+		width: 122rpx;
+		height: 32rpx;
+		font-size: 30rpx;
+		text-align: left;
+		color: #000000;
+		display: block;
+		margin-left: 24rpx;
+		margin-top: 23rpx;
+	}
+
+	.viewtext {
+		color: #000000;
+		font-weight: Regular;
+		font-face: Microsoft YaHei;
+		font-size: 28rpx;
+		text-align: left;
+		line-height: 36rpx;
+		margin-top: 11rpx;
+		margin-right: 46rpx;
+		display: block;
+		margin-left: 24rpx;
+	}
+
+	.viewtexttypesuccsee {
+		font-weight: Regular;
+		width: 118rpx;
+		height: 24rpx;
+		font-size: 24rpx;
+		text-align: left;
+		color: #3477FC;
+		margin-top: 11rpx;
+		display: block;
+		margin-left: 24rpx;
+	}
+
+	.viewtexttypelose {
+		font-weight: Regular;
+		width: 319rpx;
+		height: 25rpx;
+		font-size: 24rpx;
+		text-align: left;
+		color: #FA3939;
+		margin-top: 12rpx;
+		display: block;
+		margin-left: 24rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/Friend/violationreporting.vue b/pages/Friend/violationreporting.vue
new file mode 100644
index 0000000..b31d318
--- /dev/null
+++ b/pages/Friend/violationreporting.vue
@@ -0,0 +1,318 @@
+<!-- 违规举报 -->
+<template>
+
+	<view style="
+		position: fixed;
+		top: 0rpx;
+		left: 0rpx;
+		bottom: 0rpx;
+		right: 0rpx;
+		background-color: #ffffff;
+		z-index: -1;
+	"></view>
+
+	<navbar_neadVue title="违规举报"></navbar_neadVue>
+
+	<view v-show="IsNext">
+		<view class="boxtop">
+			<text>请选择您要举报得问题，帮助我们准确处理</text>
+		</view>
+		<view class="boxcontent">
+			<view v-for="(item,index) in arr" :key="index">
+				<view class="boxc" @click="HaveIsClick(item.id)">
+					<text class="box-text">{{item.title}}</text>
+					<image v-if="item.id == IsClick" class="box-image" src="../../static/images/sign/选中.png"></image>
+					<image v-else class="box-image" src="../../static/images/sign/未选中.png"></image>
+				</view>
+			</view>
+			<view class="but" @click="goNext()">
+				<text>下一步</text>
+			</view>
+		</view>
+	</view>
+
+
+	<view v-show="!IsNext">
+		<view class="next-viewtitle">
+			<text>举报原因：{{IsClickTitle}}</text>
+		</view>
+		<view class="next-viewtitle">
+			<text>举报描述（必填）</text>
+		</view>
+		<view class="next-input">
+			<textarea @input="SumVlaue()" maxlength="200" placeholder-class="inputcolor"
+				placeholder="请您详细描述举报原因，您的描述越详细越有利于我们的判断，可以更好的帮助我们准确处理。" id="many" v-model="textareavalue"></textarea>
+
+			<text>{{textsum}}/200</text>
+		</view>
+
+
+
+		<view class="next-viewtitle">
+			<text>上传照片（必填）</text>
+		</view>
+
+		<view class="next-image">
+			<image src="../../static/images/sign/添加图片.png"></image>
+			<view>
+				<text class="next-bot-text">(0/3)</text>
+			</view>
+		</view>
+
+		<view class="but" @click="NextButton()">
+			<text>提交</text>
+		</view>
+
+	</view>
+
+</template>
+
+<script setup>
+	import {
+		reactive,
+		ref
+	} from 'vue';
+	import navbar_neadVue from '../common/navbar/navbar_nead.vue';
+	import Logger from 'qiniu-js/esm/logger';
+	const IsNext = ref(true);
+	const arr = reactive([{
+			id: 1,
+			title: "色情低俗"
+		},
+		{
+			id: 2,
+			title: "违法犯罪"
+		},
+		{
+			id: 3,
+			title: "辱骂、引战、拉仇恨"
+		},
+		{
+			id: 4,
+			title: "涉政言行不当"
+		},
+		{
+			id: 5,
+			title: "虚假信息"
+		},
+		{
+			id: 6,
+			title: "涉嫌诈骗"
+		},
+		{
+			id: 7,
+			title: "侵犯著作、商标、名誉、隐私、专利权"
+		},
+		{
+			id: 8,
+			title: "其他"
+		},
+
+	])
+
+
+	// 表示选中的
+	// const IsClick = reactive([])
+	const IsClick = ref(0);
+	const IsClickTitle = ref("");
+	// 选中的函数
+	function HaveIsClick(id) {
+		console.log(id)
+		IsClick.value = id;
+	}
+
+	//下一步
+	function goNext() {
+		if (IsClick.value == 0) {
+			uni.showToast({
+				title: '必须选中一个',
+				//将值设置为 success 或者直接不用写icon这个参数
+				//显示持续时间为 2秒
+				duration: 2000
+			})
+		} else {
+			IsClickTitle.value = arr.find(item => item.id == IsClick.value).title;
+			IsNext.value = !IsNext.value;
+		}
+	}
+
+	// 
+	const textareavalue = ref("");
+	const textsum = ref(0);
+
+	//计算字数
+	function SumVlaue() {
+		textsum.value = textareavalue.value.length;
+	}
+
+	// 提交
+	function NextButton() {
+		// TODO 提交前的校验
+		uni.showToast({
+			title: '提交成功',
+			//将值设置为 success 或者直接不用写icon这个参数
+			//显示持续时间为 2秒
+			duration: 2000
+		})
+	}
+</script>
+
+<style scoped>
+	@import '../../pages/common/navbar/navbar.css';
+
+	.boxtop {
+		width: 750rpx;
+		height: 72rpx;
+		background: #f4f5f6;
+	}
+
+	.boxtop>text {
+		font-weight: Regular;
+		width: 456rpx;
+		height: 24rpx;
+		font-size: 24rpx;
+		text-align: left;
+		color: #999999;
+		display: block;
+		line-height: 72rpx;
+		margin-left: 32rpx;
+	}
+
+	.boxcontent {
+		background-color: #ffffff;
+	}
+
+
+	.boxc {
+		width: 750rpx;
+		height: 76rpx;
+	}
+
+	.box-text {
+		font-weight: Regular;
+		/* width: 112rpx; */
+		height: 28rpx;
+		font-size: 28rpx;
+		text-align: left;
+		color: #000000;
+		margin-left: 32rpx;
+		line-height: 76rpx;
+	}
+
+	.box-image {
+		width: 32rpx;
+		height: 32rpx;
+		float: right;
+		margin-right: 32rpx;
+		margin-top: 24rpx;
+	}
+
+	.but {
+		width: 686rpx;
+		height: 88rpx;
+		border-radius: 44rpx 44rpx 44rpx 44rpx;
+		background: #c0f0ec;
+		position: absolute;
+		bottom: 92rpx;
+		left: 32rpx;
+	}
+
+	.but>text {
+		font-weight: Regular;
+		width: 92rpx;
+		height: 31rpx;
+		font-size: 30rpx;
+		text-align: center;
+		color: #00CCBE;
+		display: block;
+		margin: auto;
+		line-height: 88rpx;
+	}
+
+	.next-viewtitle {
+		margin-top: 48rpx;
+		margin-left: 32rpx;
+	}
+
+	.next-viewtitle>text {
+		font-weight: Regular;
+		width: 221rpx;
+		height: 31rpx;
+		font-size: 30rpx;
+		text-align: left;
+		color: #000000;
+	}
+
+	.next-input {
+		width: 686rpx;
+		height: 280rpx;
+		border-radius: 12rpx 12rpx 12rpx 12rpx;
+		background: #f4f5f6;
+		margin-top: 23rpx;
+		margin-left: 32rpx;
+		box-sizing: border-box;
+	}
+
+	.next-input>textarea {
+		width: 638rpx;
+		height: 200rpx;
+		padding-left: 24rpx;
+		padding-top: 23rpx;
+		font-size: 24rpx;
+		text-align: left;
+		color: #999999;
+	}
+
+	.next-input>text {
+		font-weight: Regular;
+		width: 55rpx;
+		height: 19rpx;
+		font-size: 20rpx;
+		text-align: left;
+		color: #999999;
+		display: block;
+		margin-top: 12rpx;
+		float: right;
+		margin-right: 32rpx;
+	}
+
+	:deep(.inputcolor) {
+		font-weight: Regular;
+		width: 638rpx;
+		height: 200rpx;
+		font-size: 24rpx;
+		text-align: left;
+		color: #999999;
+	}
+
+	.next-image {
+		width: 220rpx;
+		height: 220rpx;
+		border-radius: 12rpx 12rpx 12rpx 12rpx;
+		background: #f4f5f6;
+		margin-left: 32rpx;
+		margin-top: 23rpx;
+	}
+
+	.next-image>image {
+		width: 78rpx;
+		height: 66rpx;
+		display: block;
+		float: left;
+		margin-left: 71rpx;
+		margin-top: 57rpx;
+	}
+	.next-bot-text{
+		font-weight: Regular;
+		width: 65rpx;
+		height: 29rpx;
+		font-size: 30rpx;
+		text-align: left;
+		color: #999999;
+		
+		display: block;
+		float: left;
+		margin-left: 71rpx;
+		/* margin-top: 11rpx; */
+	}
+</style>
\ No newline at end of file
diff --git a/pages/common/exchange/index.vue b/pages/common/exchange/index.vue
index fe00ba9..e3e2804 100644
--- a/pages/common/exchange/index.vue
+++ b/pages/common/exchange/index.vue
@@ -2,7 +2,7 @@
 <template class="content">
 	<view class="cp">
 		<view class="view-content" v-for="(item,index) in arr" :key="index">
-			<view class="content-main">
+			<view class="content-main"  @click="goToDetail(item.id)">
 				<view class="content-image">
 					<image :src="item.src"></image>
 				</view>
@@ -37,7 +37,7 @@
 
 	let arr = reactive([{
 			id: 1,
-			src: "https://cbu01.alicdn.com/img/ibank/2019/524/629/11890926425_297889188.jpg",
+			src: "https://cbu01.alicdn.com/img/ibank/2018/374/990/9121099473_1558693147.jpg",
 			content: "[端午礼盒] 西凤酒52度头曲礼盒 陕西凤香型白酒礼11111111111",
 			count: 700
 		},
@@ -49,31 +49,25 @@
 		},
 		{
 			id: 3,
-			src: "https://ts1.cn.mm.bing.net/th/id/R-C.2bcea282254788c581f0a18f47efb5f8?rik=rcZeIVRgTcWUkQ&riu=http%3a%2f%2fhimg2.huanqiu.com%2fattachment2010%2f2019%2f0429%2f10%2f58%2f20190429105829589.jpg&ehk=HCIAZrOId0EVKf%2bFyNg7cgff6Cg8WLUCNHpaDgwi1ng%3d&risl=&pid=ImgRaw&r=0",
+			src: "https://cbu01.alicdn.com/img/ibank/2018/374/990/9121099473_1558693147.jpg",
 			content: "男生酷帅穿搭套装休闲夏季青少年潮牌短袖短裤初中1111111111	",
 			count: 500
 		},
 		{
 			id: 3,
-			src: "https://ts1.cn.mm.bing.net/th/id/R-C.2bcea282254788c581f0a18f47efb5f8?rik=rcZeIVRgTcWUkQ&riu=http%3a%2f%2fhimg2.huanqiu.com%2fattachment2010%2f2019%2f0429%2f10%2f58%2f20190429105829589.jpg&ehk=HCIAZrOId0EVKf%2bFyNg7cgff6Cg8WLUCNHpaDgwi1ng%3d&risl=&pid=ImgRaw&r=0",
+			src: "https://cbu01.alicdn.com/img/ibank/2018/374/990/9121099473_1558693147.jpg",
 			content: "男生酷帅穿搭套装休闲夏季青少年潮牌短袖短裤初中1111111111	",
 			count: 500
 		},
 		{
 			id: 3,
-			src: "https://ts1.cn.mm.bing.net/th/id/R-C.2bcea282254788c581f0a18f47efb5f8?rik=rcZeIVRgTcWUkQ&riu=http%3a%2f%2fhimg2.huanqiu.com%2fattachment2010%2f2019%2f0429%2f10%2f58%2f20190429105829589.jpg&ehk=HCIAZrOId0EVKf%2bFyNg7cgff6Cg8WLUCNHpaDgwi1ng%3d&risl=&pid=ImgRaw&r=0",
+			src: "https://cbu01.alicdn.com/img/ibank/2018/374/990/9121099473_1558693147.jpg",
 			content: "男生酷帅穿搭套装休闲夏季青少年潮牌短袖短裤初中1111111111	",
 			count: 500
 		},
 		{
 			id: 3,
-			src: "https://ts1.cn.mm.bing.net/th/id/R-C.2bcea282254788c581f0a18f47efb5f8?rik=rcZeIVRgTcWUkQ&riu=http%3a%2f%2fhimg2.huanqiu.com%2fattachment2010%2f2019%2f0429%2f10%2f58%2f20190429105829589.jpg&ehk=HCIAZrOId0EVKf%2bFyNg7cgff6Cg8WLUCNHpaDgwi1ng%3d&risl=&pid=ImgRaw&r=0",
-			content: "男生酷帅穿搭套装休闲夏季青少年潮牌短袖短裤初中1111111111	",
-			count: 500
-		},
-		{
-			id: 3,
-			src: "https://ts1.cn.mm.bing.net/th/id/R-C.2bcea282254788c581f0a18f47efb5f8?rik=rcZeIVRgTcWUkQ&riu=http%3a%2f%2fhimg2.huanqiu.com%2fattachment2010%2f2019%2f0429%2f10%2f58%2f20190429105829589.jpg&ehk=HCIAZrOId0EVKf%2bFyNg7cgff6Cg8WLUCNHpaDgwi1ng%3d&risl=&pid=ImgRaw&r=0",
+			src: "https://cbu01.alicdn.com/img/ibank/2018/374/990/9121099473_1558693147.jpg",
 			content: "男生酷帅穿搭套装休闲夏季青少年潮牌短袖短裤初中1111111111	",
 			count: 500
 		},
@@ -82,6 +76,13 @@
 	function return_left() {
 		console.log("返回事件")
 	}
+	
+	// 
+	function goToDetail(id){
+		uni.navigateTo({
+			url: '/pages/signln/exdetail'
+		});
+	}
 </script>
 
 <style>
diff --git a/pages/signln/exchangemall.vue b/pages/signln/exchangemall.vue
index 739d01d..fd1e3a6 100644
--- a/pages/signln/exchangemall.vue
+++ b/pages/signln/exchangemall.vue
@@ -7,6 +7,7 @@
 		</view>
 	</view>
 	<ex></ex>
+	<ex></ex>
 </template>
 
 <script setup>
diff --git a/pages/signln/exdetail.vue b/pages/signln/exdetail.vue
index a30040a..fe12319 100644
--- a/pages/signln/exdetail.vue
+++ b/pages/signln/exdetail.vue
@@ -7,28 +7,154 @@
 		<image :src="images"></image>
 	</view>
 
-	<view class="but" @click="butOn()">
-		<text>立即兑换</text>
+	<view style="background-color: #ffffff; overflow-x: hidden;">
+		<view style="margin-left: 32rpx; margin-right: 32rpx;">
+			<view style="margin-top: 33rpx;">
+				<image class="nv-image" src="../../static/images/sign/1.png"></image>
+				<text class="nv-text">200</text>
+				<text class="nv-ku">库存20</text>
+			</view>
+
+			<view>
+				<text class="nv-con">男生酷帅穿搭套装休闲夏季青少年潮牌短袖短裤初
+					中生潮流套装</text>
+			</view>
+
+			<view style="
+		width: 750rpx;
+		height: 8rpx;
+		background: #faf9fa;
+		margin-top: 28rpx;
+		"></view>
+
+			<view style="margin-top: 24rpx;">
+				<text class="nv-r">兑换规则</text>
+			</view>
+
+			<view style="margin-top: 24rpx;">
+				<p>
+					(1)活动参与:通过参加我们组织的促销活动、问卷调查或者签到等方式可以获得积分。不同活动的积分奖励数额会有所不同，请您注意查看活动规则。
+				</p>
+				<p>
+					(2)消费累积:您在我们的商城购物进行支付时，将会根据您的消费额度累积相应的积分。具体积分累积规则可以在购物时的结算界面或活动页面上获得。
+				</p>
+				<p>
+					(3)推荐好友:通过邀请好友注册、购物等方式参与我们的服务，您可以获得定的积分奖励。请注意，为了避免滥用行为，我们可能会对邀请积分进行限制或验证。
+				</p>
+			</view>
+
+
+			<view style="
+		width: 750rpx;
+		height: 8rpx;
+		background: #faf9fa;
+		margin-top: 25rpx;
+		"></view>
+
+			<view style="margin-top: 30rpx;">
+				<text style="
+			font-weight: Regular;
+			width: 100rpx;
+			height: 25rpx;
+			font-size: 24.37rpx;
+			text-align: left;
+			color: #000000;
+			margin: auto ;
+			display: block;
+			">商品详情</text>
+			</view>
+		</view>
+
+
+		<view style="overflow-x: hidden;width: 100%; margin-top: 33rpx;background-color: #ffffff;">
+			<view v-for="(item,index) in arrImage" :key="index">
+				<image style="margin-top: 24rpx;display: block;" :src="item.address"></image>
+			</view>
+		</view>
+
+
+		<view class="but" @click="butOn()" style="position: fixed; bottom: 92rpx; left: 32rpx;">
+			<text>立即兑换</text>
+		</view>
 	</view>
 
-	<uni-popup  ref="popup" border-radius="32rpx 32rpx  0 0" background-color="#ffffff">
+
+
+
+	<!-- 弹起 -->
+	<uni-popup ref="popup" border-radius="32rpx 32rpx 0 0" background-color="#ffffff">
+
+		<view style="position:absolute; right: 32rpx; vertical-align:middle; z-index: 10;">
+			<image @click="clone()" style="width: 32rpx;height: 32rpx;" src="../../static/images/sign/关闭.png"></image>
+		</view>
+
 		<view class="uni-popup-view">
 			<view class="uni-top">
 				<text class="uni-top-text">确认兑换</text>
-				<view style="float: right;margin-right: 32rpx;vertical-align:middle;">
-					<image style="width: 32rpx;height: 32rpx;" src="../../static/images/sign/关闭.png"></image>
-				</view>
 			</view>
-			
-			
-			<view>
+
+
+			<view v-if="arraddress.length >= 1" style="margin-top: 57rpx;margin-left: 32rpx;" @click="handerGoTo()">
 				<view>
-					<text></text>
-					<image src=""></image>
-					<text></text>
+					<text class="textname">
+						沈辞<text class="textphone">19993849411</text>
+					</text>
+					<image style="width: 14rpx;height: 23rpx;" class="icons" src="../../static/images/sign/右.png">
+					</image>
+					<text class="textaddress">天津 天津市河北区建昌道街道红星北路72号11111111111111111111111</text>
 				</view>
 			</view>
 
+			<view v-else style="margin-top: 73rpx;margin-left: 32rpx;" @click="handerGoTo()">
+				<view>
+					<text class="textname">
+						请先添加收货信息
+					</text>
+					<image style="width: 14rpx;height: 23rpx;" class="icons1" src="../../static/images/sign/右.png">
+					</image>
+				</view>
+			</view>
+
+
+
+
+			<view class="boxconte">
+				<view style="display: flex;">
+					<view>
+						<image :src="images" class="boximage"></image>
+					</view>
+					<view>
+						<text class="boxtext">
+							男生酷帅穿搭套装休闲夏季青少年潮牌短袖短裤初中生潮流套装男生酷帅穿搭套装休闲夏季青少年潮牌短袖短裤初中生潮流套装
+						</text>
+
+						<view class="boxbottom-image">
+							<image class="right-image" src="../../static/images/sign/1.png"></image>
+							<text>200</text>
+
+
+							<view class="right-rigth">
+								<view @click="right_first_child()" class="right-first-child">-</view>
+								<text class="right-text">{{sum}}</text>
+								<view @click="right_last_child()" class="right-last-child">+</view>
+							</view>
+
+						</view>
+					</view>
+				</view>
+
+			</view>
+
+			<view class="boxbottom">
+				<input placeholder="留言备注 (限50字)" placeholder-class="inputcolor" v-model="inputvalue" />
+			</view>
+
+
+			<view @click="butOnBut()" class="but" style="position: absolute;bottom: 24rpx;left: 32rpx;right: 32rpx;">
+				<text>立即兑换</text>
+			</view>
+
+
 		</view>
 	</uni-popup>
 
@@ -36,18 +162,74 @@
 
 <script setup>
 	import {
+		reactive,
 		ref
 	}
 	from "vue"
 	const popup = ref(null);
 	const images = ref("https://cbu01.alicdn.com/img/ibank/2018/374/990/9121099473_1558693147.jpg");
+	const inputvalue = ref("");
+	const IsShow = ref(false);
+	const sum = ref(1)
+
+	const arraddress = reactive([{
+		id: 1,
+		name: "1",
+		phone: "1",
+		address: "1"
+	}])
 
 	function butOn() {
 		popup.value.open('bottom');
 	}
+
+	function clone() {
+		popup.value.close()
+	}
+	//地址
+	function handerGoTo() {
+		uni.navigateTo({
+			url: './harvestaddress'
+		});
+	}
+	//减
+	function right_first_child() {
+		if (sum >= 1) {
+			sum = sum.value--;
+		}
+	}
+	//加
+	function right_last_child() {
+		sum = sum.value++;
+	}
+	//立即越换
+	function butOnBut() {
+		uni.navigateTo({
+			url: './successfulexchange'
+		});
+	}
+
+
+	const arrImage = reactive([{
+			address: "https://img2.baidu.com/it/u=498628918,3669803110&fm=253&fmt=auto&app=138&f=JPEG?w=565&h=374"
+		},
+		{
+			address: "https://img1.cfw.cn/editors/attached/image/20231123/202311231332325212.jpg"
+		},
+		{
+			address: "http://t13.baidu.com/it/u=2134668050,4238032983&fm=224&app=112&f=JPEG?w=500&h=500"
+		},
+		{
+			address: "http://t13.baidu.com/it/u=2134668050,4238032983&fm=224&app=112&f=JPEG?w=500&h=500"
+		}
+	])
 </script>
 
-<style>
+<style scoped>
+	/* 	:deep(.uni-popup .uni-popup__wrapper){
+		background-color:red !important;
+	} */
+
 	.uninavbar {
 		position: absolute;
 		z-index: 9999;
@@ -73,7 +255,8 @@
 		background: linear-gradient(-90deg, #c9f6f5, #f7f8e3);
 	}
 
-	.but>text {
+	.but>text,
+	.buts>text {
 		font-weight: Regular;
 		width: 131rpx;
 		height: 33rpx;
@@ -102,17 +285,19 @@
 		position: absolute;
 		bottom: 91rpx;
 	}
-	
-	.uni-popup-view{
+
+	.uni-popup-view {
 		position: relative;
 		left: 0rpx;
 		height: 70vh;
 		width: 750rpx;
 		margin-top: 31rpx;
 	}
-	.uni-top{
+
+	.uni-top {
 		display: flex;
 	}
+
 	.uni-top-text {
 		font-weight: Regular;
 		width: 124rpx;
@@ -124,4 +309,239 @@
 		margin: auto;
 		line-height: 31rpx;
 	}
+
+	.textname,
+	.textphone,
+	.textaddress {
+		font-weight: Regular;
+		width: 48rpx;
+		height: 24rpx;
+		font-size: 24rpx;
+		text-align: left;
+		color: #999999;
+	}
+
+	.icons {
+		float: right;
+		margin-top: 19rpx;
+		margin-right: 32rpx;
+	}
+
+	.icons1 {
+		float: right;
+		margin-top: 1rpx;
+		margin-right: 32rpx;
+	}
+
+	.textphone {
+		margin-left: 26rpx;
+	}
+
+	.textaddress {
+		display: block;
+		width: 501rpx;
+		/* height: 24rpx; */
+		line-height: 24rpx;
+		overflow: hidden;
+		word-wrap: break-word;
+		text-overflow: ellipsis;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 1;
+	}
+
+	.boxconte {
+		width: 686rpx;
+		height: 198rpx;
+		border-radius: 24rpx 24rpx 24rpx 24rpx;
+		background: #ffffff;
+		box-shadow: 0 0 10rpx #ffffff;
+		margin-left: 32rpx;
+		margin-top: 24rpx;
+		margin-right: 32rpx;
+	}
+
+	.boximage {
+		width: 150rpx;
+		height: 150rpx;
+		border-radius: 24rpx 24rpx 24rpx 24rpx;
+		background: #999999;
+		margin: 24rpx 0rpx 24rpx 24rpx;
+	}
+
+	.boxtext {
+		font-weight: Regular;
+		width: 459rpx;
+		height: 44rpx;
+		line-height: 22rpx;
+		font-size: 20rpx;
+		text-align: left;
+		color: #000000;
+		margin: 24rpx 29rpx 0 29rpx;
+
+		overflow: hidden;
+		word-wrap: break-word;
+		text-overflow: ellipsis;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2;
+
+		/* display: block; */
+
+	}
+
+	.boxbottom-image {
+		margin-left: 24rpx;
+		margin-top: 80rpx;
+	}
+
+	.boxbottom-image>text {
+		font-weight: Regular;
+		width: 34rpx;
+		height: 17rpx;
+		font-size: 20rpx;
+		text-align: left;
+		color: #F99B46;
+		margin-left: 10rpx;
+		vertical-align: middle;
+	}
+
+	.boxbottom {
+		width: 686rpx;
+		height: 88rpx;
+		border-radius: 24rpx 24rpx 24rpx 24rpx;
+		background: #f6f6f6;
+		margin: 32rpx
+	}
+
+	.boxbottom>input {
+		width: 686rpx;
+		height: 88rpx;
+		padding-left: 25rpx;
+	}
+
+	.right-image {
+		width: 25rpx;
+		height: 26rpx;
+		vertical-align: middle;
+	}
+
+	:deep(.inputcolor) {
+		font-weight: Regular;
+		width: 207rpx;
+		height: 88rpx;
+		font-size: 24.37rpx;
+		text-align: left;
+		color: #999999;
+	}
+
+	.right-rigth {
+		float: right;
+		margin-right: 24rpx;
+		display: flex;
+
+	}
+
+	.right-first-child {
+		width: 33.94rpx;
+		height: 33.94rpx;
+		background: #ffffff;
+		line-height: 32rpx;
+		text-align: center;
+		border-radius: 32rpx;
+
+		color: #F6F6F6;
+		line-height: 32rpx;
+		text-align: center;
+		font-size: 20rpx;
+	}
+
+	.right-text {
+		vertical-align: middle;
+		font-weight: Regular;
+		width: 7rpx;
+		height: 16rpx;
+		font-size: 20rpx;
+		color: #000000;
+		margin-left: 24rpx;
+		margin-right: 24rpx;
+		margin-top: 4rpx;
+	}
+
+	.right-last-child {
+		vertical-align: middle;
+		width: 32rpx;
+		height: 32rpx;
+		background: #f99b46;
+		border-radius: 32rpx;
+
+		color: #F6F6F6;
+		line-height: 32rpx;
+		text-align: center;
+		font-size: 20rpx;
+	}
+
+	.nv-image {
+		width: 37rpx;
+		height: 38rpx;
+		vertical-align: middle;
+	}
+
+	.nv-text {
+		font-weight: Regular;
+		width: 60rpx;
+		height: 30rpx;
+		font-size: 36rpx;
+		text-align: left;
+		color: #F99B46;
+		margin-left: 12rpx;
+		vertical-align: middle;
+	}
+
+	.nv-ku {
+		font-weight: Regular;
+		width: 94rpx;
+		height: 30rpx;
+		font-size: 30rpx;
+		text-align: left;
+		color: #999999;
+		vertical-align: middle;
+		float: right;
+		margin-right: 1rpx;
+	}
+
+	.nv-con {
+		font-weight: Regular;
+		width: 659rpx;
+		height: 66rpx;
+		font-size: 30rpx;
+		text-align: left;
+		color: #000000;
+		margin-top: 27rpx;
+		line-height: 30rpx;
+		overflow: hidden;
+		word-wrap: break-word;
+		text-overflow: ellipsis;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2;
+	}
+
+	.nv-r {
+		font-weight: Regular;
+		width: 118rpx;
+		height: 30rpx;
+		font-size: 30rpx;
+		text-align: left;
+		color: #000000;
+	}
+
+	p {
+		color: #000000;
+		font-weight: Regular;
+		font-face: Microsoft YaHei;
+		font-size: 24rpx;
+		text-align: left;
+		line-height: 36rpx;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/signln/signid.vue b/pages/signln/signid.vue
index a7aee1b..686ca44 100644
--- a/pages/signln/signid.vue
+++ b/pages/signln/signid.vue
@@ -35,22 +35,16 @@
 					<text>记得去商城兑换礼物奥！</text>
 				</view>
 
+				<!-- 签到日期 -->
 				<view>
-
-					<ul style="display: flex; margin-left: 24rpx;padding-left: 2rpx;margin-top: 48rpx;">
-						<li>
-							<image style="width: 42rpx; height: 44rpx;" src="../../static/images/sign/1.png">
+					<view class="data">
+						<view class="data-view" v-for="(item,index) in datetime" :key="index">
+							<image v-if="item.isDate == true" class="data-image" src="../../static/images/sign/金币虚.png">
 							</image>
-
-							<text style="display: block; font-weight: Regular;
-width: 60rpx;
-height: 22rpx;
-font-size: 24rpx;
-text-align: center;
-color: #7E7E7E;">12日</text>
-						</li>
-
-					</ul>
+							<image v-else class="data-image" src="../../static/images/sign/1.png"></image>
+							<text class="data-text">{{item.data}}日</text>
+						</view>
+					</view>
 				</view>
 
 			</view>
@@ -65,7 +59,8 @@ color: #7E7E7E;">12日</text>
 		</view>
 
 		<view class="task-content" v-for="(item,index) in arr" :key="index">
-			<view class="task-right">
+			<!-- 签到按钮 -->
+			<view class="task-right" @click="goTaskRight(item.id)">
 				<text>{{item.type}}</text>
 			</view>
 			<view>
@@ -84,12 +79,15 @@ color: #7E7E7E;">12日</text>
 		<view style="height: 24rpx;"></view>
 	</view>
 
-
 	<view class="bottom">
 		<view class="bottom-left"></view>
 		<view class="bottom-text">
 			<text class="bottom-text-s">兑换商城</text>
-			<text class="bottom-text-r" @click="GoExchange()">更多 <text>></text></text>
+			<view class="bottom-text-r" @click="GoExchange()">
+				<text>更多</text>
+				<image style="width: 14rpx; height: 23rpx;margin-left: 9rpx;" src="../../static/images/sign/右.png">
+				</image>
+			</view>
 		</view>
 	</view>
 
@@ -103,6 +101,37 @@ color: #7E7E7E;">12日</text>
 <script setup>
 	import navbar_neadVue from "@/pages/common/navbar/navbar_nead.vue";
 	import ex from "@/pages/common/exchange/index.vue";
+
+	const datetime = reactive([{
+			data: "12",
+			isDate: true
+		},
+		{
+			data: "13",
+			isDate: false
+		},
+		{
+			data: "14",
+			isDate: false
+		},
+		{
+			data: "15",
+			isDate: false
+		},
+		{
+			data: "16",
+			isDate: false
+		},
+		{
+			data: "17",
+			isDate: false
+		},
+		{
+			data: "18",
+			isDate: false
+		}
+	])
+
 	//
 	function GoTo() {
 		uni.navigateTo({
@@ -111,11 +140,23 @@ color: #7E7E7E;">12日</text>
 	}
 
 	//
-	function GoExchange(){
+	function GoExchange() {
 		uni.navigateTo({
 			url: './exchangemall'
 		});
 	}
+
+	function goTaskRight(id) {
+		arr.find(item=>item.id == id).type = "成功";
+		uni.showToast({
+			title: '成功',
+			//将值设置为 success 或者直接不用写icon这个参数
+			icon: 'success',
+			//显示持续时间为 2秒
+			duration: 2000
+		})  
+	}
+
 	import {
 		ref,
 		reactive
@@ -435,9 +476,43 @@ color: #7E7E7E;">12日</text>
 		font-size: 24rpx;
 		text-align: left;
 		color: #999999;
-		vertical-align: baseline;
-
+		vertical-align: middle;
+		margin-right: 32rpx;
 	}
 
 	.bottom-text-r>text {}
+
+
+	.data {
+		display: flex;
+		margin-left: 24rpx;
+		padding-left: 2rpx;
+		margin-top: 48rpx;
+	}
+
+	.data-view {
+		margin-right: 45rpx;
+	}
+
+	.data-image {
+		display: flex;
+	}
+
+	.data-image {
+		width: 42rpx;
+		height: 44rpx;
+	}
+
+	.data-text {
+		display: block;
+		font-weight: Regular;
+		width: 60rpx;
+		height: 22rpx;
+		font-size: 24rpx;
+		text-align: center;
+		vertical-align: middle;
+		color: #7E7E7E;
+		margin-left: -8rpx;
+		margin-top: 12rpx;
+	}
 </style>
\ No newline at end of file
diff --git a/static/images/sign/右 (2).png b/static/images/sign/右.png
similarity index 100%
rename from static/images/sign/右 (2).png
rename to static/images/sign/右.png
diff --git a/static/images/sign/审核通知.png b/static/images/sign/审核通知.png
new file mode 100644
index 0000000..1d45dbb
Binary files /dev/null and b/static/images/sign/审核通知.png differ
diff --git a/static/images/sign/添加图片.png b/static/images/sign/添加图片.png
new file mode 100644
index 0000000..91bd7ca
Binary files /dev/null and b/static/images/sign/添加图片.png differ
diff --git a/static/images/sign/系统通知.png b/static/images/sign/系统通知.png
new file mode 100644
index 0000000..094c299
Binary files /dev/null and b/static/images/sign/系统通知.png differ
diff --git a/static/images/sign/金币虚.png b/static/images/sign/金币虚.png
new file mode 100644
index 0000000..a77900c
Binary files /dev/null and b/static/images/sign/金币虚.png differ