restore: 恢复橙色逍遥梦UI版本(2ea2860)到主分支

Co-authored-by: Cursor <cursoragent@cursor.com>

pages/merchant/merchant.wxss

@@ -1,7 +1,7 @@
 @import '../../styles/shangjia-xym-common.wxss';
 
 page {
-  background: #f5f3ff;
+  background: #fff8e1;
 }
 
 .user-page {
@@ -15,6 +15,18 @@ page {
   display: flex;
   align-items: center;
   justify-content: center;
+  position: relative;
+}
+
+.sj-nav-bar {
+  justify-content: center;
+}
+
+.nav-refresh-ico {
+  position: absolute;
+  right: 24rpx;
+  width: 44rpx;
+  height: 44rpx;
 }
 
 .content {
@@ -42,10 +54,39 @@ page {
   height: 32rpx;
 }
 
+.user-header-actions {
+  display: flex;
+  align-items: center;
+  gap: 16rpx;
+  flex-shrink: 0;
+}
+
+.header-action-ico {
+  width: 48rpx;
+  height: 48rpx;
+  padding: 6rpx;
+  flex-shrink: 0;
+}
+
 .user-info {
   padding: 10rpx 30rpx;
 }
 
+.user-info > .flex {
+  align-items: flex-start;
+  width: 100%;
+}
+
+.user-info > .flex > .avatar {
+  flex-shrink: 0;
+}
+
+.user-info > .flex > view:not(.avatar) {
+  flex: 1;
+  min-width: 0;
+  overflow: hidden;
+}
+
 .avatar {
   width: 110rpx;
   height: 110rpx;
@@ -64,7 +105,25 @@ page {
 .nickname-row {
   flex-wrap: wrap;
   align-items: center;
-  gap: 8rpx;
+  gap: 6rpx;
+  max-width: 100%;
+}
+
+.sj-identity-tag {
+  flex-shrink: 0;
+}
+
+.nickname-edit-btn {
+  display: inline-flex;
+  margin-top: 10rpx;
+  padding: 8rpx 22rpx;
+  font-size: 24rpx;
+  font-weight: 600;
+  color: #7a5a12;
+  background: linear-gradient(180deg, #fff8e1, #ffe9b8);
+  border: 1rpx solid #e8c547;
+  border-radius: 28rpx;
+  box-shadow: 0 2rpx 8rpx rgba(200, 160, 40, 0.15);
 }
 
 .sn-row {
@@ -85,7 +144,7 @@ page {
 }
 
 .badge-zone {
-  padding: 0 24rpx 8rpx;
+  padding: 0 24rpx 4rpx;
 }
 
 .badge-scroll {
@@ -95,9 +154,21 @@ page {
 
 .badge-tag-wrap {
   display: inline-block;
-  transform: scale(0.72);
+  transform: scale(0.65);
   transform-origin: left center;
-  margin-right: -8rpx;
+  margin-right: -12rpx;
+}
+
+.identity-tags-row {
+  flex-wrap: wrap;
+  gap: 2rpx;
+  margin-top: 6rpx;
+  max-width: 100%;
+}
+
+.identity-tags-row .badge-tag-wrap {
+  transform: scale(0.62);
+  margin-right: -14rpx;
 }
 
 .wallet-btns .sj-btn-outline {
@@ -108,7 +179,7 @@ page {
   margin: 16rpx 30rpx 0;
   padding: 20rpx 10rpx;
   border-radius: 15rpx;
-  background: #ede9fe;
+  background: #fef6d4;
 }
 
 .freeze-col {
@@ -230,7 +301,7 @@ page {
   width: 60rpx;
   height: 60rpx;
   border: 4rpx solid rgba(0, 0, 0, 0.08);
-  border-top-color: #9333ea;
+  border-top-color: #ffd061;
   border-radius: 50%;
   animation: sjSpin 0.8s linear infinite;
 }