diff --git a/config.js b/config.js
index 1692a89..c724aeb 100644
--- a/config.js
+++ b/config.js
@@ -4,8 +4,8 @@ export default {
   uploadQiNiuDomain: 'https://upload-z2.qiniup.com',
  // baseUrl: 'https://vue.ruoyi.vip/prod-api',
   // baseUrl: 'http://47.93.242.168:8080',
-  //   baseUrl: 'http://47.93.242.168:8080',
-  baseUrl: 'http://localhost:8080',
+     baseUrl: 'http://47.93.242.168:8080',
+ // baseUrl: 'http://localhost:8080',
   // 应用信息
   appInfo: {
     // 应用名称
diff --git a/manifest.json b/manifest.json
index be71bc2..b14d530 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,10 @@
 {
     "name" : "若依移动端",
+<<<<<<< HEAD
+    "appid" : "__UNI__9F2C9D7",
+=======
     "appid" : "__UNI__9285214",
+>>>>>>> 7e91066419318ef278bdfb774de71fe10f912b5d
     "description" : "",
     "versionName" : "1.1.0",
     "versionCode" : "100",
diff --git a/pages.json b/pages.json
index 6f967bf..1c26e95 100644
--- a/pages.json
+++ b/pages.json
@@ -7,9 +7,12 @@
 			"^u-([^-].*)": "uview-plus/components/u-$1/u-$1.vue"
 		}
 	},
+<<<<<<< HEAD
+=======
 
 
 
+>>>>>>> 7e91066419318ef278bdfb774de71fe10f912b5d
 	"pages": [
 		{
 			"path": "pages/index",
@@ -20,6 +23,12 @@
 			}
 		},
 		{
+<<<<<<< HEAD
+			"path": "pages/Friend/Interactivemessage",
+			"style": {
+				"navigationBarTitleText": "互动消息",
+				"navigationStyle": "custom"
+=======
 			 		"path": "pages/Friend/violationreporting"
 				},
 		{
@@ -27,31 +36,24 @@
 			"style" :
 			{
 				"navigationBarTitleText" : "话题详情"
+>>>>>>> 7e91066419318ef278bdfb774de71fe10f912b5d
 			}
 		},
 		{
-			"path" : "pages/post/postPublish/postPublish",
-			"style" :
-			{
-				"navigationBarTitleText" : "发布话题"
-			}
-		},
-		{
-			"path": "pages/signln/harvestaddress",
-
+			"path": "pages/Friend/addfruebd",
 			"style": {
-				"navigationBarTitleText": "违规举报",
+				"navigationBarTitleText": "添加好友",
 				"navigationStyle": "custom"
 			}
 		},
 		{
-			"path": "pages/Friend/systemnotification",
+<<<<<<< HEAD
+			"path": "pages/communication/addfriends",
 			"style": {
-				"navigationBarTitleText": "系统通知",
+				"navigationBarTitleText": "添加好友",
 				"navigationStyle": "custom"
 			}
 		},
-
 		{
 			"path": "pages/signln/signid",
 			"style": {
@@ -59,6 +61,46 @@
 				"navigationStyle": "custom"
 			}
 		},
+		{
+			"path": "pages/Friend/violationreporting",
+=======
+			"path": "pages/signln/harvestaddress",
+
+>>>>>>> 7e91066419318ef278bdfb774de71fe10f912b5d
+			"style": {
+				"navigationBarTitleText": "违规举报",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/signln/harvestaddress",
+			"style": {
+				"navigationBarTitleText": "地址",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/post/postInfo/postInfo",
+			"style": {
+				"navigationBarTitleText": "话题详情"
+			}
+		},
+		{
+			"path": "pages/post/postPublish/postPublish",
+			"style": {
+				"navigationBarTitleText": "发布话题"
+			}
+		},
+
+		{
+			"path": "pages/Friend/systemnotification",
+			"style": {
+				"navigationBarTitleText": "系统通知",
+				"navigationStyle": "custom"
+			}
+		},
+
+
 		{
 			"path": "pages/signln/exdetail",
 			"style": {
@@ -66,6 +108,8 @@
 				"navigationStyle": "custom"
 			}
 		},
+<<<<<<< HEAD
+=======
 		// {
 		// 	"path": "pages/signln/harvestaddress",
 		// 	"style": {
@@ -74,6 +118,7 @@
 		// 	}
 		// },
 
+>>>>>>> 7e91066419318ef278bdfb774de71fe10f912b5d
 		{
 			"path": "pages/signln/successfulexchange",
 			"style": {
@@ -81,7 +126,10 @@
 				"navigationStyle": "custom"
 			}
 		},
+<<<<<<< HEAD
+=======
 
+>>>>>>> 7e91066419318ef278bdfb774de71fe10f912b5d
 		{
 			"path": "pages/signln/signiddetails",
 			"style": {
@@ -245,40 +293,15 @@
 				"navigationBarTitleText": "搜索"
 			}
 		},
-		{
-			"path": "pages/communication/addfriends",
-			"style": {
-				"navigationBarTitleText": "添加好友",
-				"navigationStyle": "custom"
-			}
-		},
-
-		{
-			"path": "pages/common/navbar/navbar_nead",
-			"style": {
-				"navigationBarTitleText": "navbar"
-			}
-		},
 		{
 			"path": "pages/Friend/messagenotification",
 			"style": {
 				"navigationBarTitleText": "消息通知",
 				"navigationStyle": "custom"
 			}
-		},
-		{
-			"path": "pages/Friend/addfruebd",
-			"style": {
-				"navigationBarTitleText": "添加好友",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/common/exchange/index",
-			"style": {
-				"navigationBarTitleText": "组件"
-			}
 		}
+<<<<<<< HEAD
+=======
 		,
 		{
 			"path": "pages/takeaway/index",
@@ -294,6 +317,7 @@
 			}
 		}
 
+>>>>>>> 7e91066419318ef278bdfb774de71fe10f912b5d
 	],
 	"tabBar": {
 		"color": "#000000",
@@ -341,5 +365,9 @@
 		"navigationBarTitleText": "RuoYi",
 		"navigationBarBackgroundColor": "#FFFFFF"
 	}
+<<<<<<< HEAD
+}
+=======
 
 }
+>>>>>>> 7e91066419318ef278bdfb774de71fe10f912b5d
diff --git a/pages/Friend/Interactivemessage.vue b/pages/Friend/Interactivemessage.vue
new file mode 100644
index 0000000..75b883a
--- /dev/null
+++ b/pages/Friend/Interactivemessage.vue
@@ -0,0 +1,39 @@
+<!-- 互动消息 -->
+<template>
+	<navbar_neadVue title="互动消息"></navbar_neadVue>
+
+	<view>
+		<u-tabs  :list="list1" @change="tabChange"></u-tabs>
+	</view>
+
+</template>
+
+<script setup>
+	import {
+		reactive,
+		ref
+	} from "vue";
+	import navbar_neadVue from '@/pages/common/navbar/navbar_nead.vue';
+
+	const list1 = reactive([{
+			name: '全部消息'
+		},
+		{
+			name: '点赞'
+		},
+		{
+			name: '评论'
+		},
+		{
+			name: '关注'
+		}
+	])
+
+	function tabChange(index) {
+		console.log('当前选中的选项卡索引：', index);
+	}
+</script>
+
+<style>
+	@import '@/pages/common/navbar/navbar.css';
+</style>
\ No newline at end of file
diff --git a/pages/Friend/addfruebd.vue b/pages/Friend/addfruebd.vue
index 24e0486..50bf831 100644
--- a/pages/Friend/addfruebd.vue
+++ b/pages/Friend/addfruebd.vue
@@ -1,14 +1,87 @@
 <!-- 添加好友 -->
 <template>
-	<view>
-		
+	<view class="uninavbar">
+		<image src="../../static/images/sign/return.png"></image>
+	</view>
+	<view class="back">
+		<image src="../../static/images/sign/背景.png" style=" 
+		position: fixed;
+		width: 750rpx;
+		height: 500rpx; z-index: -1;"></image>
+		<view style="width: 154rpx;
+height: 154rpx;
+background: #83c4ff"></view>
+		<text> 爱吃饭的小张</text>
+		<text>女</text>
+		<text>LV 2</text>
+		<text>ID:</text>
+		<text>19993849611</text>
+	</view>
+
+
+
+	<view style="position: absolute; top: 424rpx; bottom: 0; left: 0; right: 0; border-radius: 32rpx 32rpx 32rpx 32rpx;
+background: #ffffff; ">
+		<view>
+			<text>9999 获赞</text>
+		</view>
+
+		<view>
+			签名：陌上人如玉，公子世无双！
+		</view>
+
+		<view style="width: 512rpx;
+height: 80rpx;
+border-radius: 40rpx 40rpx 40rpx 40rpx;
+background: #f7f8fa;">
+			<image style="width: 34rpx; height: 30rpx;" src="../../static/images/sign/发消息.png"></image>
+			<text>发消息</text>
+		</view>
+
+		<view style="width:150rpx;
+height: 80rpx;
+border-radius: 40rpx 40rpx 40rpx 40rpx;
+background: #83c4ff;">关注</view>
+
+
+
+		<view>
+			<text style="font-weight: Regular;
+width: 155rpx;
+height: 31rpx;
+font-size: 30rpx;
+text-align: left;
+color: #333333">发布的话题</text>
+			<view style="width: 154rpx;
+height: 12rpx;
+border-radius: 6rpx 6rpx 6rpx 6rpx;
+background: linear-gradient(-90deg, #c9f6f5, #f7f8e3);"></view>
+		</view>
+
+
 	</view>
 </template>
 
 <script setup>
-	
+
 </script>
 
-<style>
-	       
-</style>
+<style scoped>
+	.uninavbar {
+		position: absolute;
+		z-index: 9999;
+		top: 110rpx;
+		left: 32rpx;
+	}
+
+	.uninavbar>image {
+		width: 31rpx;
+		height: 44rpx;
+		color: #000000;
+	}
+
+	.back {
+		width: 750rpx;
+		height: 500rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/Friend/systemnotification.vue b/pages/Friend/systemnotification.vue
index e125f5f..07a4032 100644
--- a/pages/Friend/systemnotification.vue
+++ b/pages/Friend/systemnotification.vue
@@ -33,7 +33,7 @@
 	import {
 		reactive
 	} from 'vue';
-	import navbar_neadVue from '../common/navbar/navbar_nead.vue';
+	import navbar_neadVue from '@/pages/common/navbar/navbar_nead.vue';
 
 	const arrcontent = reactive([{
 			id: 1,
@@ -80,7 +80,7 @@
 </script>
 
 <style scoped>
-	@import '../../pages/common/navbar/navbar.css';
+	@import '@/pages/common/navbar/navbar.css';
 
 	.timeview {
 		width: 192rpx;
diff --git a/pages/activity/info.vue b/pages/activity/info.vue
index 75acc9d..43dbabf 100644
--- a/pages/activity/info.vue
+++ b/pages/activity/info.vue
@@ -213,6 +213,10 @@ const toqrcode = (e) => {
 };
 </script>
 <style lang="scss">
+page{
+    background-color: #ffffff;
+
+}
 .navbarcenter {
     font-weight: 400;
     width: 148rpx;
diff --git a/pages/common/exchange/index.vue b/pages/common/exchange/index.vue
index e3e2804..eed1b8c 100644
--- a/pages/common/exchange/index.vue
+++ b/pages/common/exchange/index.vue
@@ -17,7 +17,8 @@
 						</view>
 
 						<view class="text3">
-							<image src="../../static/images/sign/1.png"></image>
+							<image src="../../../static/images/sign/one.png"></image>
+							<!-- <image src="../../static/images/sign/1.png"></image> -->
 							<text>{{item.count}}</text>
 						</view>
 					</view>
@@ -70,7 +71,7 @@
 			src: "https://cbu01.alicdn.com/img/ibank/2018/374/990/9121099473_1558693147.jpg",
 			content: "男生酷帅穿搭套装休闲夏季青少年潮牌短袖短裤初中1111111111	",
 			count: 500
-		},
+		}
 	]);
 
 	function return_left() {
@@ -88,6 +89,7 @@
 <style>
 	.content {
 		background: #faf9fa;
+		width: 756rpx;
 	}
 
 	.view-top {
diff --git a/pages/common/navbar/navbar.css b/pages/common/navbar/navbar.css
index ccc2f35..21fa668 100644
--- a/pages/common/navbar/navbar.css
+++ b/pages/common/navbar/navbar.css
@@ -1,8 +1,13 @@
 :deep(.uni-nav-bar-text.data-v-26544265) {
-	font-size: 36rpx;
+	font-size: 36rpx !important;
 	font-weight: 600;
 }
 
+:deep(.uni-nav-bar-text[data-v-26544265]) {
+	font-size: 36rpx !important;
+	font-weight: 600 !important;
+}
+
 :deep(.uni-icons) {
 	font-family: uniicons;
 	text-decoration: none;
diff --git a/pages/common/navbar/navbar_nead.vue b/pages/common/navbar/navbar_nead.vue
index b5d4786..97aafb6 100644
--- a/pages/common/navbar/navbar_nead.vue
+++ b/pages/common/navbar/navbar_nead.vue
@@ -1,10 +1,12 @@
 <template>
-	<view class="uninavbars">
-		<image :src="leftImage" @click="left_return"></image>
+	<view class="uninavbars" @click="ReturnPage()">
+		<image src="../../../static/images/sign/return.png" @click="left_return"></image>
 	</view>
 	<view class="uninavbar">
-		<uni-nav-bar statusBar="false" :fixed="true" :border="false" :background-color=background_color :title="title" />
+		<uni-nav-bar statusBar="false" :fixed="true" :border="false" :background-color=background_color
+			:title="title" />
 	</view>
+
 </template>
 
 <script setup>
@@ -17,7 +19,7 @@
 
 	const props = defineProps({
 		title: String,
-		background_color:String
+		background_color: String
 	})
 	const {
 		title,
@@ -25,15 +27,29 @@
 	} = toRefs(props)
 
 	let leftImage = ref("../../../static/images/sign/return.png")
+	//返回上一页
+	function ReturnPage() {
+		uni.navigateBack({
+			delta: 1
+		});
+	}
 </script>
 
 <style>
+	/* #ifdef H5 */
 	.uninavbars {
 		position: fixed;
 		z-index: 9999;
 		top: 110rpx;
 		left: 32rpx;
 	}
+	/* #ifdef APP-PLUS */
+	.uninavbars {
+		position: fixed;
+		z-index: 9999;
+		top: 20rpx;
+		left: 32rpx;
+	}
 
 	.uninavbars>image {
 		width: 31rpx;
diff --git a/pages/common/postview/index.vue b/pages/common/postview/index.vue
index 283f33d..965442a 100644
--- a/pages/common/postview/index.vue
+++ b/pages/common/postview/index.vue
@@ -54,7 +54,11 @@
 				    <!-- 靠左对齐 -->
 					<view class="">
 						<view class="p-item">
+<<<<<<< HEAD
+						    <!-- <image style="width: 40rpx; height: 40rpx;" src="../static/images/icon/tu2-9.png" mode=""></image> -->
+=======
 						    <image style="width: 40rpx; height: 40rpx;" src="../../../static/images/icon/tu2-9.png" mode=""></image>
+>>>>>>> 7e91066419318ef278bdfb774de71fe10f912b5d
 						    <text class="count">{{ postValue.transmitCount }}</text>
 						</view>
 					</view>
diff --git a/pages/index.vue b/pages/index.vue
index 9a34891..f4e29ef 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -3,7 +3,7 @@
 		<!-- 顶部导航栏 -->
 		<u-navbar leftText=" " title=" " :placeholder="true" :safeAreaInsetTop="true"  :bgColor="bgColor">
 		    <template class="img1BOX" #left>
-				<image src="../static/images/icon/tu2-4.png" class="img1"></image>
+				<image @click="GotoUNISignid()" src="../static/images/icon/tu2-4.png" class="img1"></image>
 				<!-- <image src="../static/images/icon/tu2-5.png" class="img2 image-container" @click="togglePostType"></image> -->
 				<view class="image-container">
 				  <image src="../static/images/icon/tu2-5.png" class="img2" @click="togglePostType"></image>
@@ -307,6 +307,12 @@ import PostView from "@/pages/common/postview/index.vue";
 		onMounted(() => {
 			console.log(proxy.$store.state.user.QNDomain);
 		});
+		
+		
+			
+		function GotoUNISignid(){
+			proxy.$tab.navigateTo("./signln/signid");
+		}
 
 </script>
 
diff --git a/pages/post/postInfo/postInfo.vue b/pages/post/postInfo/postInfo.vue
index e8f9905..d4e6139 100644
--- a/pages/post/postInfo/postInfo.vue
+++ b/pages/post/postInfo/postInfo.vue
@@ -262,6 +262,10 @@
 </script>
 
 <style lang="scss">
+page{
+    background-color: #ffffff;
+
+}
 	.data-v-6fcabaad {
 			border-radius: 20rpx 20rpx 20rpx 20rpx !important;
 	/* 		width: 200rpx !important;
diff --git a/pages/signln/exchangemall.vue b/pages/signln/exchangemall.vue
index fd1e3a6..bf76016 100644
--- a/pages/signln/exchangemall.vue
+++ b/pages/signln/exchangemall.vue
@@ -7,7 +7,6 @@
 		</view>
 	</view>
 	<ex></ex>
-	<ex></ex>
 </template>
 
 <script setup>
@@ -22,6 +21,7 @@
 </script>
 
 <style>
+	@import '@/pages/common/navbar/navbar.css';
 	.view-top {
 		/* height: 100rpx; */
 	}
diff --git a/pages/signln/exdetail.vue b/pages/signln/exdetail.vue
index fe12319..d0d157c 100644
--- a/pages/signln/exdetail.vue
+++ b/pages/signln/exdetail.vue
@@ -10,7 +10,7 @@
 	<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>
+				<image class="nv-image" src="../../static/images/sign/one.png"></image>
 				<text class="nv-text">200</text>
 				<text class="nv-ku">库存20</text>
 			</view>
@@ -85,7 +85,7 @@
 	<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>
+			<image @click="clone()" style="width: 32rpx;height: 32rpx;" src="../../static/images/sign/clone.png"></image>
 		</view>
 
 		<view class="uni-popup-view">
@@ -99,7 +99,7 @@
 					<text class="textname">
 						沈辞<text class="textphone">19993849411</text>
 					</text>
-					<image style="width: 14rpx;height: 23rpx;" class="icons" src="../../static/images/sign/右.png">
+					<image style="width: 14rpx;height: 23rpx;" class="icons" src="../../static/images/sign/rig.png">
 					</image>
 					<text class="textaddress">天津 天津市河北区建昌道街道红星北路72号11111111111111111111111</text>
 				</view>
@@ -110,7 +110,7 @@
 					<text class="textname">
 						请先添加收货信息
 					</text>
-					<image style="width: 14rpx;height: 23rpx;" class="icons1" src="../../static/images/sign/右.png">
+					<image style="width: 14rpx;height: 23rpx;" class="icons1" src="../../static/images/sign/rig.png">
 					</image>
 				</view>
 			</view>
@@ -129,7 +129,7 @@
 						</text>
 
 						<view class="boxbottom-image">
-							<image class="right-image" src="../../static/images/sign/1.png"></image>
+							<image class="right-image" src="../../static/images/sign/one.png"></image>
 							<text>200</text>
 
 
@@ -226,6 +226,7 @@
 </script>
 
 <style scoped>
+	
 	/* 	:deep(.uni-popup .uni-popup__wrapper){
 		background-color:red !important;
 	} */
diff --git a/pages/signln/harvestaddress.vue b/pages/signln/harvestaddress.vue
index 32f5785..1a36b88 100644
--- a/pages/signln/harvestaddress.vue
+++ b/pages/signln/harvestaddress.vue
@@ -8,8 +8,8 @@
 			<text class="textname">
 				{{item.name}}<text class="textphone">{{item.phone}}</text>
 			</text>
-			<image v-if="IsHave === item.id" class="image" src="../../static/images/sign/选中.png"></image>
-			<image v-else class="image" src="../../static/images/sign/未选中.png"></image>
+			<image v-if="IsHave === item.id" class="image" src="../../static/images/sign/isH.png"></image>
+			<image v-else class="image" src="../../static/images/sign/IsHave.png"></image>
 
 			<text class="textaddress">{{item.address}}</text>
 		</view>
@@ -24,7 +24,7 @@
 
 	<!-- 添加收货地址 -->
 	<view class="noadderes" v-else>
-		<image class="icons" src="../../static/images/sign/暂无地址.png"></image>
+		<image class="icons" src="../../static/images/sign/Noaddress.png"></image>
 		<text class="notext">暂无收货地址请添加</text>
 
 		<view class="butview">
diff --git a/pages/signln/signid.vue b/pages/signln/signid.vue
index 686ca44..95a1e73 100644
--- a/pages/signln/signid.vue
+++ b/pages/signln/signid.vue
@@ -19,7 +19,7 @@
 			</view>
 
 			<view class="right-image">
-				<image src="../../static/images/sign/金币.png"></image>
+				<image src="../../static/images/sign/jin.png"></image>
 			</view>
 
 			<view class="content-bottom">
@@ -39,9 +39,9 @@
 				<view>
 					<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 v-if="item.isDate == true" class="data-image" src="../../static/images/sign/jin.png">
 							</image>
-							<image v-else class="data-image" src="../../static/images/sign/1.png"></image>
+							<image v-else class="data-image" src="../../static/images/sign/one.png"></image>
 							<text class="data-text">{{item.data}}日</text>
 						</view>
 					</view>
@@ -65,7 +65,7 @@
 			</view>
 			<view>
 				<text class="c-text">{{item.title}}</text>
-				<image style="width: 21rpx;height: 21rpx;margin-left: 36rpx;" src="../../static/images/sign/1.png">
+				<image style="width: 21rpx;height: 21rpx;margin-left: 36rpx;" src="../../static/images/sign/one.png">
 				</image>
 				<text class="count-text">{{item.count}}</text>
 			</view>
@@ -85,7 +85,7 @@
 			<text class="bottom-text-s">兑换商城</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 style="width: 14rpx; height: 23rpx;margin-left: 9rpx;" src="../../static/images/sign/rig.png">
 				</image>
 			</view>
 		</view>
@@ -147,14 +147,14 @@
 	}
 
 	function goTaskRight(id) {
-		arr.find(item=>item.id == id).type = "成功";
+		arr.find(item => item.id == id).type = "成功";
 		uni.showToast({
 			title: '成功',
 			//将值设置为 success 或者直接不用写icon这个参数
 			icon: 'success',
 			//显示持续时间为 2秒
 			duration: 2000
-		})  
+		})
 	}
 
 	import {
@@ -224,7 +224,7 @@
 
 
 <style scoped>
-	@import '../../pages/common/navbar/navbar.css';
+	@import '@/pages/common/navbar/navbar.css';
 
 	.content-top {
 		/* height: 424rpx; */
diff --git a/pages/signln/signiddetails.vue b/pages/signln/signiddetails.vue
index ce2f38c..4f5633e 100644
--- a/pages/signln/signiddetails.vue
+++ b/pages/signln/signiddetails.vue
@@ -22,7 +22,8 @@
 		ref
 	} from "vue"
 	let leftIcon = ref("../../static/images/sign/return.png")
-	import navbar_neadVue from "../common/navbar/navbar_nead.vue";
+	import navbar_neadVue from "@/pages/common/navbar/navbar_nead.vue";
+
 	let arr = reactive([{
 			id: 1,
 			text: "每日签到",
@@ -69,6 +70,8 @@
 </script>
 
 <style scoped>
+	@import '@/pages/common/navbar/navbar.css';
+
 	:deep(.uni-nav-bar-text.data-v-26544265) {
 		font-size: 36rpx;
 		font-weight: 600;
diff --git a/pages/signln/successfulexchange.vue b/pages/signln/successfulexchange.vue
index 8eb6dee..e0975fd 100644
--- a/pages/signln/successfulexchange.vue
+++ b/pages/signln/successfulexchange.vue
@@ -26,8 +26,8 @@
 		ref
 	} from 'vue';
 	const returns = ref("../../static/images/sign/return.png");
-	const images = ref("../../static/images/sign/兑换成功.png");
-	const icons = ref("../../static/images/sign/成功.png");
+	const images = ref("../../static/images/sign/co.png");
+	const icons = ref("../../static/images/sign/success.png");
 	
 	function RetExChangemall(){
 		uni.navigateTo({
@@ -37,7 +37,7 @@
 	}
 </script>
 
-<style>
+<style scoped>
 	.uninavbar {
 		position: absolute;
 		z-index: 9999;
diff --git a/permission.js b/permission.js
index 0de5fed..453440d 100644
--- a/permission.js
+++ b/permission.js
@@ -1,20 +1,32 @@
 import { getToken } from "@/utils/auth";
 
+<<<<<<< HEAD
+// // 登录页面
+// const loginPage = "/pages/loginInfo/login";
+
+// // 页面白名单
+// const whiteList = [
+//   "/pages/loginInfo/login",
+//   "/pages/register",
+//   "/pages/common/webview/index",
+// ];
+=======
 // 登录页面
-const loginPage = "/pages/loginInfo/login";
+const loginPage = "/pages/login";
 
 // 页面白名单
 const whiteList = [
-  "/pages/loginInfo/login",
+  "/pages/login",
   "/pages/register",
   "/pages/common/webview/index",
 ];
+>>>>>>> 7e91066419318ef278bdfb774de71fe10f912b5d
 
-// 检查地址白名单
-function checkWhite(url) {
-  const path = url.split("?")[0];
-  return whiteList.indexOf(path) !== -1;
-}
+// // 检查地址白名单
+// function checkWhite(url) {
+//   const path = url.split("?")[0];
+//   return whiteList.indexOf(path) !== -1;
+// }
 
 // 页面跳转验证拦截器
 // let list = ["navigateTo", "redirectTo", "reLaunch", "switchTab"]
diff --git a/static/images/sign/未选中.png b/static/images/sign/IsHave.png
similarity index 100%
rename from static/images/sign/未选中.png
rename to static/images/sign/IsHave.png
diff --git a/static/images/sign/暂无地址.png b/static/images/sign/Noaddress.png
similarity index 100%
rename from static/images/sign/暂无地址.png
rename to static/images/sign/Noaddress.png
diff --git a/static/images/sign/添加图片.png b/static/images/sign/add.png
similarity index 100%
rename from static/images/sign/添加图片.png
rename to static/images/sign/add.png
diff --git a/static/images/sign/关闭.png b/static/images/sign/clone.png
similarity index 100%
rename from static/images/sign/关闭.png
rename to static/images/sign/clone.png
diff --git a/static/images/sign/兑换成功.png b/static/images/sign/co.png
similarity index 100%
rename from static/images/sign/兑换成功.png
rename to static/images/sign/co.png
diff --git a/static/images/sign/go.png b/static/images/sign/go.png
new file mode 100644
index 0000000..c3ba77b
Binary files /dev/null and b/static/images/sign/go.png differ
diff --git a/static/images/sign/选中.png b/static/images/sign/isH.png
similarity index 100%
rename from static/images/sign/选中.png
rename to static/images/sign/isH.png
diff --git a/static/images/sign/金币.png b/static/images/sign/jin.png
similarity index 100%
rename from static/images/sign/金币.png
rename to static/images/sign/jin.png
diff --git a/static/images/sign/系统通知.png b/static/images/sign/message.png
similarity index 100%
rename from static/images/sign/系统通知.png
rename to static/images/sign/message.png
diff --git a/static/images/sign/审核通知.png b/static/images/sign/message1.png
similarity index 100%
rename from static/images/sign/审核通知.png
rename to static/images/sign/message1.png
diff --git a/static/images/sign/1.png b/static/images/sign/one.png
similarity index 100%
rename from static/images/sign/1.png
rename to static/images/sign/one.png
diff --git a/static/images/sign/金币虚.png b/static/images/sign/one_l.png
similarity index 100%
rename from static/images/sign/金币虚.png
rename to static/images/sign/one_l.png
diff --git a/static/images/sign/返回.png b/static/images/sign/return1.png
similarity index 100%
rename from static/images/sign/返回.png
rename to static/images/sign/return1.png
diff --git a/static/images/sign/右.png b/static/images/sign/rig.png
similarity index 100%
rename from static/images/sign/右.png
rename to static/images/sign/rig.png
diff --git a/static/images/sign/成功.png b/static/images/sign/success.png
similarity index 100%
rename from static/images/sign/成功.png
rename to static/images/sign/success.png