From 39d0dcea86814e69a6f6be9e3da42039e75eaaaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A7=A6=E6=98=9F=E6=98=9F?= <605893810@qq.com>
Date: Wed, 22 Jul 2026 22:19:35 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E4=BF=AE=E6=94=B9=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/login_package/login/login.vue   |  85 ++++++++--
 pages/mine/mine.vue                   |   5 +-
 pages/rwa_package/dongjian/search.vue | 233 +++++++++++++-------------
 pages/shopping_cart/shopping_cart.vue |  10 +-
 4 files changed, 201 insertions(+), 132 deletions(-)

diff --git a/pages/login_package/login/login.vue b/pages/login_package/login/login.vue
index ec71c19..5c2ceeb 100644
--- a/pages/login_package/login/login.vue
+++ b/pages/login_package/login/login.vue
@@ -81,6 +81,18 @@
       </up-checkbox>
     </view>
     <up-toast ref="uToastRef"></up-toast>
+
+    <!-- 自定义协议弹窗 -->
+    <view v-if="showPolicyModal" class="modal-overlay" @click="showPolicyModal = false">
+      <view class="modal-content" @click.stop>
+        <view class="modal-title">温馨提示</view>
+        <view class="modal-message">请您阅读并同意《服务协议》与《隐私政策》</view>
+        <view class="modal-buttons">
+          <view class="modal-btn modal-btn-cancel" @click="showPolicyModal = false">取消</view>
+          <view class="modal-btn modal-btn-confirm" @click="handlePolicyConfirm">同意并登录</view>
+        </view>
+      </view>
+    </view>
   </view>
 </template>
 
@@ -149,6 +161,7 @@ export default {
       isPolicy: false, // 是否同意
       countdown: false, // 清空倒计时
       loading: false,
+      showPolicyModal: false,
     };
   },
   methods: {
@@ -187,17 +200,7 @@ export default {
       const form = this.form;
       const params = {};
       if (!this.isPolicy) {
-        uni.showModal({
-          title: '温馨提示',
-          content: '请您阅读并同意《服务协议》与《隐私政策》',
-          confirmText: "同意并登录",
-          success: (res) => {
-            if (res.confirm) {
-              this.isPolicy = true;
-              this.loginFun(val);
-            }
-          }
-        });
+        this.showPolicyModal = true;
         return;
       }
       let response = val;
@@ -453,6 +456,11 @@ export default {
         }
       );
     },
+    handlePolicyConfirm() {
+      this.showPolicyModal = false;
+      this.isPolicy = true;
+      this.loginFun();
+    },
   },
   computed: {
     isIOS() {
@@ -538,4 +546,59 @@ export default {
     margin-bottom: 80rpx;
   }
 }
+
+.modal-overlay {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: rgba(0, 0, 0, 0.5);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  z-index: 1000;
+}
+
+.modal-content {
+  width: 500rpx;
+  background: #fff;
+  border-radius: 20rpx;
+  padding: 24rpx;
+  text-align: center;
+}
+
+.modal-title {
+  font-size: 36rpx;
+  font-weight: bold;
+  color: #333;
+  margin-bottom: 30rpx;
+}
+
+.modal-message {
+  font-size: 28rpx;
+  color: #666;
+  line-height: 1.6;
+  margin-bottom: 40rpx;
+}
+
+.modal-buttons {
+  display: flex;
+}
+
+.modal-btn {
+  flex: 1;
+  height: 80rpx;
+  line-height: 80rpx;
+  font-size: 30rpx;
+}
+
+.modal-btn-cancel {
+  color: #999;
+  border-right: 1rpx solid #eee;
+}
+
+.modal-btn-confirm {
+  color: #7934F6;
+}
 </style>
\ No newline at end of file
diff --git a/pages/mine/mine.vue b/pages/mine/mine.vue
index cc6b900..9289265 100644
--- a/pages/mine/mine.vue
+++ b/pages/mine/mine.vue
@@ -729,9 +729,10 @@ export default {
         }
 
         &.level-grade {
-            background: rgba(122, 53, 246, 0.1);
-            color: #7a35f6;
+            background: rgba(248, 185, 75, 0.15);
+            color: #613700;
         }
+
     }
 
     .grade_key_warp {
diff --git a/pages/rwa_package/dongjian/search.vue b/pages/rwa_package/dongjian/search.vue
index 6cc362e..6166463 100644
--- a/pages/rwa_package/dongjian/search.vue
+++ b/pages/rwa_package/dongjian/search.vue
@@ -4,12 +4,15 @@
 		<view class="search-view">
 			<view class="head-view">
 				<u-icon size="30rpx" name="arrow-left" @click="onBack" color="#333"></u-icon>
-				<view class="search-box" :style="{ maxWidth: searchBoxMaxWidth + 'rpx' }">
-					<input class="input-view" v-model="searchInput" placeholder="请输入搜索关键词"></input>
+				<view class="search-box">
+					<input class="input-view wx-width" v-model="searchInput"></input>
+					<!-- <u-input class="input-view wx-width" 
+					v-model="searchInput"></u-input> -->
 					<view class="search-btn flex-c" @click="onSearch">
 						<text class="text-32 text-white">搜索</text>
 					</view>
 				</view>
+
 			</view>
 			<view class="top-view mt-24">
 				<view class="flex-r-lr">
@@ -17,10 +20,10 @@
 					<u-icon size="40rpx" name="trash" @click="isDel = !isDel" color="#333"></u-icon>
 				</view>
 				<view class="history-view" v-if="historyList.length">
-					<view class="history-box flex-c mt-24 mr-32" v-for="(item,index) in historyList" :key="item">
-						<text class="text-24 text-fu line-h" @click="onText(item)" >{{item}}</text>
-						<u-icon size="32rpx" class="close-pos" v-if="isDel" @click="onDel(index)"
-						 name="close-circle" color="#333"></u-icon>
+					<view class="history-box flex-c mt-24 mr-32" v-for="(item, index) in historyList" :key="item">
+						<text class="text-24 text-fu line-h" @click="onText(item)">{{ item }}</text>
+						<u-icon size="32rpx" class="close-pos" v-if="isDel" @click="onDel(index)" name="close-circle"
+							color="#333"></u-icon>
 					</view>
 				</view>
 				<view class="history-on-data flex-c" v-else>
@@ -32,15 +35,15 @@
 					<text class="text-32 text-bold text-zu">商品展示</text>
 				</view>
 				<view class="bottom-scroll" v-if="dataList.length">
-					<ShopItem :obj="item" class="mt-24" @click="onJump(item)"
-					v-for="(item,index) in dataList" :key="item.id"></ShopItem>
+					<ShopItem :obj="item" class="mt-24" @click="onJump(item)" v-for="(item, index) in dataList"
+						:key="item.id"></ShopItem>
 				</view>
 				<view class="bottom-scroll-no " v-else>
 					<text class="text-48 text-bold" style="margin-top:200rpx">暂无数据</text>
 				</view>
 			</view>
 		</view>
-		
+
 		<DownPopup></DownPopup>
 	</view>
 </template>
@@ -55,100 +58,82 @@ import ShopItem from './components/shop-item.vue'
 import func from '@/utils/func.js';
 
 export default {
-	components: { Header,TopSafe,DownPopup,ShopItem },
+	components: { Header, TopSafe, DownPopup, ShopItem },
 	data() {
 		return {
-			searchInput:'',
-			historyList:[],
-			isDel:false,
-			dataList:[],
-			searchBoxMaxWidth: 0 // 搜索框最大宽度
+			searchInput: '',
+			historyList: [],
+			isDel: false,
+			dataList: [],
 		};
 	},
 	onShow() {
 		this.init();
 	},
-	onLoad() {
-		// 获取胶囊按钮位置信息，计算搜索框最大宽度
-		this.calculateSearchBoxMaxWidth();
-	},
 	methods: {
-		init(){
+		init() {
+			// this.isSignContract()
+			// this.getSignContract()
+
 			let arr = uni.getStorageSync('history') || '';
-			if(arr){
+			if (arr) {
 				this.historyList = arr.split(',');
-			}else{
+			} else {
 				this.historyList = [];
 			}
 		},
-		// 计算搜索框最大宽度，确保不与胶囊按钮重叠
-		calculateSearchBoxMaxWidth() {
-			// #ifdef MP-WEIXIN
-			const menuButtonInfo = uni.getMenuButtonBoundingClientRect();
-			if (menuButtonInfo) {
-				const systemInfo = uni.getSystemInfoSync();
-				// 计算屏幕宽度减去左侧内边距和胶囊按钮左侧距离
-				// 左侧内边距32rpx转换为px
-				const leftPadding = 32 * (systemInfo.windowWidth / 750);
-				// 箭头图标宽度和间距约为30rpx + 24rpx = 54rpx
-				const arrowWidth = 54 * (systemInfo.windowWidth / 750);
-				// 计算搜索框最大宽度（px）
-				const maxWidthPx = menuButtonInfo.left - leftPadding - arrowWidth - 20; // 20px额外间距
-				// 转换为rpx
-				this.searchBoxMaxWidth = Math.ceil(maxWidthPx * (750 / systemInfo.windowWidth));
-			}
-			// #endif
-		},
-		onJump(item){
+		onJump(item) {
 			uni.navigateTo({
-			    url: '/pages/other_package/productInfo/productInfo?id='+item.id,
+				url: '/pages/other_package/productInfo/productInfo?id=' + item.id,
 			})
 		},
-		onBack(){
+		onBack() {
 			uni.navigateBack();
 		},
-		onSearch(){
-			if(!this.searchInput){
+		onSearch() {
+			if (!this.searchInput) {
 				return;
 			}
 			this.onAdd();
 			let params = {
-				keyword:this.searchInput
+				keyword: this.searchInput
 			}
-			searchList(params).then((res)=>{
+			searchList(params).then((res) => {
 				this.dataList = res.data;
-				console.log('res',res)
+				console.log('res', res)
 			})
 		},
-		onDel(index){
-			this.historyList.splice(index,1);
+		onDel(index) {
+			this.historyList.splice(index, 1);
 			this.onSave()
 		},
-		onAdd(){				
-			if(this.searchInput){
+		onAdd() {
+
+			if (this.searchInput) {
 				let bool = false;
-				this.historyList.forEach(item=>{
-					if(item == this.searchInput){
+				this.historyList.forEach(item => {
+					if (item == this.searchInput) {
 						bool = true;
 					}
 				})
-				if(!bool){
+				if (!bool) {
 					this.historyList.unshift(this.searchInput);
-					if(this.historyList.length > 15){
+					if (this.historyList.length > 15) {
 						this.historyList.pop();
 					}
 					this.onSave();
-				}				
+				}
+
 			}
 		},
-		onText(item){
+		onText(item) {
 			this.searchInput = item;
 		},
-		onSave(){
-			if(this.historyList.length){
-				uni.setStorageSync('history',this.historyList.join(','));
-			}else{
-				uni.setStorageSync('history','');
+		onSave() {
+			if (this.historyList.length) {
+				uni.setStorageSync('history', this.historyList.join(','));
+			} else {
+				uni.setStorageSync('history', '');
 			}
 		}
 	}
@@ -156,109 +141,131 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.search-view{
-	width:100%;
-	height:calc(100% - var(--status-bar-height));
+.search-view {
+	width: 100%;
+	height: calc(100% - var(--status-bar-height));
 	display: flex;
 	flex-direction: column;
 	align-items: center;
 	box-sizing: border-box;
-	.top-view{
-		width:100%;
-		min-height:150rpx;
+
+	.top-view {
+		width: 100%;
+		min-height: 150rpx;
 		display: flex;
 		flex-direction: column;
 		padding: 0 32rpx;
 		box-sizing: border-box;
 		overflow-y: auto;
-		.history-on-data{
-			width:100%;
-			height:100%;
-			
+
+		.history-on-data {
+			width: 100%;
+			height: 100%;
+
 		}
-		.history-view{
-			width:100%;
+
+		.history-view {
+			width: 100%;
 			display: flex;
 			flex-wrap: wrap;
-			.history-box{
+
+			.history-box {
 				position: relative;
 				padding: 8rpx 22rpx;
 				box-sizing: border-box;
 				border-radius: 8rpx;
-				border:2rpx solid #7932FE;
-				.close-pos{
-					right:-20rpx;
+				border: 2rpx solid #7932FE;
+
+				.close-pos {
+					right: -20rpx;
 					position: absolute;
-					top:-40%;
+					top: -40%;
 				}
 			}
 		}
 	}
-	.bottom-view{
-		width:100%;
-		flex:1;
+
+	.bottom-view {
+		width: 100%;
+		flex: 1;
 		display: flex;
 		flex-direction: column;
 		padding: 0 32rpx;
 		box-sizing: border-box;
-		.bottom-head{
-			height:50rpx;
+
+		.bottom-head {
+			height: 50rpx;
 			display: flex;
 		}
-		.bottom-scroll{
-			width:100%;
-			height:calc(100vh - 50rpx - 324rpx - 4rpx - 88rpx - var(--status-bar-height));
+
+		.bottom-scroll {
+			width: 100%;
+			height: calc(100vh - 50rpx - 324rpx - 4rpx - 88rpx - var(--status-bar-height));
 			overflow-y: auto;
 			display: flex;
 			flex-wrap: wrap;
 			justify-content: space-between;
-			
+
 		}
-		.bottom-scroll-no{
-			width:100%;
+
+		.bottom-scroll-no {
+			width: 100%;
 			display: flex;
 			flex-direction: column;
 			align-items: center;
-			
+
 		}
 	}
-	.head-view{
-		width:100%;
-		height:118rpx;
-		min-height:118rpx;
+
+	.head-view {
+		width: 100%;
+		height: 118rpx;
+		min-height: 118rpx;
 		display: flex;
 		flex-direction: row;
 		align-items: center;
 		padding: 0 32rpx;
 		box-sizing: border-box;
 		background-color: #fff;
-		.search-box{
-			/* 移除flex:1，使用固定最大宽度 */
-			height:84rpx;
-			min-height:16rpx;
+
+		.search-box {
+			width: 100%;
+			height: 84rpx;
+			min-height: 16rpx;
 			display: flex;
 			flex-direction: row;
 			justify-content: space-between;
 			align-items: center;
 			border-radius: 16rpx;
-			border:2rpx solid #7932FE;
-			margin-left:24rpx;
+			border: 2rpx solid #7932FE;
+			margin-left: 24rpx;
 		}
-		.search-btn{
-			width:156rpx;
-			height:100%;
+
+		.search-btn {
+			width: 156rpx;
+			height: 100%;
 			border-radius: 16rpx;
-			background: linear-gradient( 270deg, #B164FB 0%, #7934F6 100%);
+			background: linear-gradient(270deg, #B164FB 0%, #7934F6 100%);
 		}
-		.input-view{
-			height:72rpx;
+
+		.input-view {
+			height: 72rpx;
 			box-sizing: border-box;
-			padding: 0 7rpx !important;
+			padding: 0 30rpx !important;
 			border-radius: 36rpx;
-			margin-left:12rpx;
-			flex:1; /* 输入框在搜索框内自适应 */
+			margin-left: 12rpx;
+			flex: 1;
 		}
+
+		/* #ifdef MP-WEIXIN */
+		.wx-width {
+			width: 350rpx !important;
+			flex: none;
+		}
+
+		/* #endif */
+
+
 	}
 }
-
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/shopping_cart/shopping_cart.vue b/pages/shopping_cart/shopping_cart.vue
index c4ad21b..85a72bf 100644
--- a/pages/shopping_cart/shopping_cart.vue
+++ b/pages/shopping_cart/shopping_cart.vue
@@ -440,8 +440,7 @@ export default {
 <style lang="scss" scoped>
 .shopping_cart_warp {
   background-color: $app-bj;
-  padding: constant(safe-area-inset-top) 30rpx 30rpx;
-  padding: env(safe-area-inset-top) 30rpx 30rpx;
+  padding: 104rpx 30rpx 30rpx;
   overflow: hidden;
 
   &.isDataNull-calss {
@@ -456,7 +455,7 @@ export default {
     height: calc(100vh - 100rpx - 50rpx) !important;
 
     .shopping_cart_content {
-      // height: calc(100vh - 104rpx - 30rpx - 30rpx - 100rpx - 10rpx) !important;
+      height: calc(100vh - 104rpx - 30rpx - 30rpx - 100rpx - 10rpx) !important;
     }
 
     .shopping_cart_but {
@@ -469,7 +468,7 @@ export default {
   display: flex;
   justify-content: space-between;
   color: #222222;
-  margin-top: 160rpx;
+
   .cart {
     font-weight: bold;
     font-size: 38rpx;
@@ -544,8 +543,7 @@ export default {
 
 .shopping_cart_but {
   position: fixed;
-  bottom: 0;
-  // bottom: calc(90rpx + env(safe-area-inset-bottom));
+  bottom: calc(90rpx + env(safe-area-inset-bottom));
   left: 0;
   width: calc(100% - 40rpx);
   background: #ffffff;