Merge remote-tracking branch 'origin/main'

pages.json

@@ -59,13 +59,8 @@
 				"navigationStyle": "custom"
 			}
 		},
-		{
+
-			"path": "pages/signln/harvestaddress",
+
-			"style": {
-				"navigationBarTitleText": "地址",
-				"navigationStyle": "custom"
-			}
-		},
 		{
 			"path": "pages/post/postPublish/postPublish",
 			"style": {
@@ -80,6 +75,8 @@
 				"navigationStyle": "custom"
 			}
 		},
+
+
 		{
 			"path": "pages/signln/exdetail",
 			"style": {
@@ -87,6 +84,15 @@
 				"navigationStyle": "custom"
 			}
 		},
+
+		{
+			"path": "pages/signln/harvestaddress",
+			"style": {
+				"navigationBarTitleText": "收货地址",
+				"navigationStyle": "custom"
+			}
+		},
+
 		{
 			"path": "pages/signln/successfulexchange",
 			"style": {
@@ -293,12 +299,7 @@
 				"selectedIconPath": "static/images/tabbar/tu1-3.png",
 				"text": "活动"
 			}
-			// , {
+
-			// 	"pagePath": "pages/work/index",
-			// 	"iconPath": "static/images/tabbar/work.png",
-			// 	"selectedIconPath": "static/images/tabbar/work_.png",
-			// 	"text": "工作台"
-			// }
 			, {
 				"pagePath": "pages/partJob/index",
 				"iconPath": "static/images/tabbar/tu1-6.png",
@@ -322,4 +323,5 @@
 		"navigationBarTitleText": "RuoYi",
 		"navigationBarBackgroundColor": "#FFFFFF"
 	}
+
 }

pages/common/navbar/navbar_nead.vue

@@ -47,7 +47,7 @@
 	.uninavbars {
 		position: fixed;
 		z-index: 9999;
-		top: 20rpx;
+		top: 110rpx;
 		left: 32rpx;
 	}
 

pages/index.vue

@@ -310,7 +310,7 @@ import PostView from "@/pages/common/postview/index.vue";
 		
 			
 		function GotoUNISignid(){
-			proxy.$tab.navigateTo("./signln/signid");
+			proxy.$tab.navigateTo("/pages/signln/signid");
 		}
 
 </script>

pages/signln/exdetail.vue

@@ -1,6 +1,6 @@
 <!-- 兑换商城详情 -->
 <template>
-	<view class="uninavbar">
+	<view class="uninavbar" @click="returnTo()">
 		<image src="../../static/images/sign/return.png"></image>
 	</view>
 	<view>
@@ -209,6 +209,13 @@
 		});
 	}
 	
+	//返回
+	function returnTo(){
+		uni.navigateBack({
+			delta: 1
+		});
+	}
+
 
 	const arrImage = reactive([{
 			address: "https://img2.baidu.com/it/u=498628918,3669803110&fm=253&fmt=auto&app=138&f=JPEG?w=565&h=374"

pages/signln/harvestaddress.vue

@@ -2,6 +2,9 @@
 <template>
 	<navbar_neadVue title="收货地址" background_color="#ffffff"></navbar_neadVue>
 
+	<view style="position: fixed; z-index: -1; background-color: #ffffff; top: 0; bottom: 0;left: 0;right: 0;"></view>
+	
+
 	<!-- 有地址 -->
 	<view v-if="arr.length >= 1" v-for="(item,index) in arr" :key="index">
 		<view class="haveaddress" @click="HaveAddress(item.id)">
@@ -14,7 +17,7 @@
 			<text class="textaddress">{{item.address}}</text>
 		</view>
 
-		<view class="butview">
+		<view class="butview" @click="returnTo()">
 			<view class="but">
 				<text>确定地址</text>
 			</view>
@@ -71,6 +74,12 @@
 	function HaveAddress(id) {
 		IsHave.value = id;
 	}
+	
+	function returnTo(){
+		uni.navigateBack({
+			delta: 1
+		});
+	}
 </script>
 
 <style scoped>

pages/signln/signid.vue

@@ -84,8 +84,9 @@
 		<view class="bottom-text">
 			<text class="bottom-text-s">兑换商城</text>
 			<view class="bottom-text-r" @click="GoExchange()">
-				<text>更多</text>
+				<text style=" vertical-align: middle;">更多</text>
-				<image style="width: 14rpx; height: 23rpx;margin-left: 9rpx;" src="../../static/images/sign/rig.png">
+				<image style="width: 14rpx; height: 23rpx;margin-left: 9rpx; vertical-align: middle;"
+					src="../../static/images/sign/rig.png">
 				</image>
 			</view>
 		</view>

pages/signln/signiddetails.vue

@@ -1,6 +1,10 @@
 <!-- 签到明细 -->
 <template>
 	<navbar_neadVue title="签到明细"></navbar_neadVue>
+
+
+	<view style="position: fixed; z-index: -1; background-color: #ffffff; top: 0; bottom: 0;left: 0;right: 0;"></view>
+
 	<view style="background-color: #ffffff;">
 		<view style="height: 24rpx;"></view>
 		<view class="content" v-for="(item,index) in arr" :key="index">