From af6a57f3783a10092e7471629eb5aa7c65ccb416 Mon Sep 17 00:00:00 2001
From: wangzimeng <3297159934@qq.com>
Date: Thu, 14 Aug 2025 16:20:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/app/score-shop.vue                      | 48 ++++++++++++-------
 pages/canteenRent/fabu.vue                    |  2 +-
 pages/canteenRent/rentEdit.vue                |  2 +-
 pages/canteenRent/rentList.vue                |  2 +-
 .../goods/components/detail/detail-navbar.vue | 32 +++++++------
 pages/goods/index.vue                         | 12 +++--
 pages/index/index.vue                         | 10 ++--
 pages/user/myRelease/list.vue                 |  2 +-
 .../s-custom-navbar/s-custom-navbar.vue       | 23 +++++----
 sheep/ui/su-navbar/su-navbar.vue              | 25 ++++++----
 10 files changed, 97 insertions(+), 61 deletions(-)

diff --git a/pages/app/score-shop.vue b/pages/app/score-shop.vue
index 5c2527b..013308a 100644
--- a/pages/app/score-shop.vue
+++ b/pages/app/score-shop.vue
@@ -1,6 +1,9 @@
 <!-- 页面  -->
 <template>
 	<s-layout title="积分商城">
+		<scroll-view @scrolltolower="onScrolltolower" :refresher-enabled="true" :refresher-triggered="homrS"
+			@refresherrefresh="onS" scroll-y="true" class="flex align-items "
+			style="height: 100vh;box-sizing: border-box;">
 		<view class="container">
 			<!-- 顶部信息 -->
 			<view class="conTop">
@@ -14,33 +17,42 @@
 					</view>
 				</view>
 			</view>
-			<!-- tabs页签 -->
+			<!-- tabs页签 
 			<view class="tabs-box">
 				<su-tabs :list="tabMaps" @change="onChange" :scrollable="false" :current="currentTab"></su-tabs>
-			</view>
+			</view>-->
 
 			<!-- 可兑换券列表 -->
-			<scroll-view @scrolltolower="onScrolltolower" :refresher-enabled="true" :refresher-triggered="homrS"
-				@refresherrefresh="onS" scroll-y="true" class="flex align-items"
-				style="height: 1250rpx;box-sizing: border-box;">
 				<!-- 满减券 -->
-				<view class="exChangeBox" v-if="currentTab == 0">
+				<view class="exChangeBox">
+					<view class="scoreBox" style="display: flex;justify-content: center;align-items: center;width: 100%;margin: 40rpx 30rpx;">
+						<view style="width: 60rpx;height: 8rpx;background-color: #fcc74e;"></view>
+						<view style="color: #333333;font-size: 42rpx;font-weight: bold;line-height: 28rpx;margin: 0 30rpx;font-family: PingFang SC;;">积分兑换</view>
+						<view style="width: 60rpx;height: 8rpx;background-color: #fcc74e;"></view>
+					</view>
 					<view class="couponsList">
 						<view class="list-item" v-for="(item, index) in couponList" :key="index" @click="openCouponPro(item)">
-							<image style="width: 330rpx;height: 200rpx;" src="https://jiangxiaoxian.0rui.cn/fullCoupon.png">
-							</image>
-							<view class="item-text">
-								<view class="fs30 c3" style="margin: 0 auto;text-align: center;">{{item.name}}</view>
-								<view class="exchangeBtn">
-									{{item.score}}积分兑换
+							<view >
+								<image v-if="item.status == 1" style="width: 330rpx;height: 200rpx;" src="https://jiangxiaoxian.0rui.cn/fullCoupon.png">
+								</image>
+								<image v-else style="width: 330rpx;height: 200rpx;"
+									src="https://jiangxiaoxian.0rui.cn/scoreNumCoupon.png"></image>
+								<view class="item-text">
+									<view class="fs30 c3" style="margin: 0 auto;text-align: center;">{{item.name}}</view>
+									<view class="exchangeBtn">
+										{{item.score}}积分兑换
+									</view>
 								</view>
 							</view>
+							
 						</view>
+						
+						
 					</view>
 				
 				</view>
-				<!-- 次数券 -->
-				<view class="exChangeBox" v-if="currentTab == 1">
+				<!-- 次数券 
+				<view class="exChangeBox">
 					<view class="couponsList">
 						<view class="list-item" v-for="(item, index) in couponList" :key="index" @click="openCouponPro(item)">
 							<image style="width: 330rpx;height: 200rpx;"
@@ -54,9 +66,9 @@
 				
 						</view>
 					</view>
-				</view>
+				</view>-->
 				
-			</scroll-view>
+			
 			
 
 
@@ -84,6 +96,8 @@
 			</su-popup>
 
 		</view>
+		
+		</scroll-view>
 
 	</s-layout>
 </template>
@@ -146,10 +160,10 @@
 	const couponCount = ref(0)
 	const homrS = ref(false)
 	async function getCouponList() {
+		// status: listQuery.value.status,
 		const res = await sheep.$api.app.scoreShop.fullList({
 			page: listQuery.value.page,
 			limit: listQuery.value.limit,
-			status: listQuery.value.status,
 			order: 'normal'
 		});
 		if (res.code === 1) {
diff --git a/pages/canteenRent/fabu.vue b/pages/canteenRent/fabu.vue
index 92f8489..367db30 100644
--- a/pages/canteenRent/fabu.vue
+++ b/pages/canteenRent/fabu.vue
@@ -72,7 +72,7 @@
 						style="margin-top: 20rpx;padding: 30rpx">
 						<view class="row align-items" style="">
 							<view class="label flex align-items" style="width: auto;">
-								详细信息
+								餐厅信息
 							</view>
 							<view style="margin-top: 20rpx;height: 120rpx;margin-bottom: 30rpx;">
 								<textarea v-model="form.content" style="height: 120rpx;width: 100%;" maxlength="400"
diff --git a/pages/canteenRent/rentEdit.vue b/pages/canteenRent/rentEdit.vue
index 8369116..25c643c 100644
--- a/pages/canteenRent/rentEdit.vue
+++ b/pages/canteenRent/rentEdit.vue
@@ -70,7 +70,7 @@
 						style="margin-top: 20rpx;padding: 30rpx;">
 						<view class="row align-items" style="">
 							<view class="label flex align-items" style="width: auto;">
-								详细信息
+								餐厅信息
 							</view>
 							<view style="margin-top: 20rpx;height: 120rpx;margin-bottom: 30rpx;">
 								<textarea v-model="form.content" style="height: 120rpx;width: 100%;" maxlength="400"
diff --git a/pages/canteenRent/rentList.vue b/pages/canteenRent/rentList.vue
index 0b7e1e7..a6c4a22 100644
--- a/pages/canteenRent/rentList.vue
+++ b/pages/canteenRent/rentList.vue
@@ -17,7 +17,7 @@
 						<view class="locTop-left-left" @click="state.showRegion = true">
 							<view @click="state.showRegion = true"
 								style="font-size: 28rpx;font-weight: 400;line-height: 32rpx;color: #999999;max-width: 140rpx;">
-								{{state.model.city_name ? state.model.city_name:'全国' }}
+								{{state.model.city_name ? state.model.city_name:'全部地区' }}
 							</view>
 							<image @click="state.showRegion = true"
 								style="width: 27rpx;height: 27rpx;margin-left: 10rpx;"
diff --git a/pages/goods/components/detail/detail-navbar.vue b/pages/goods/components/detail/detail-navbar.vue
index d90b5e1..0b7ff6b 100644
--- a/pages/goods/components/detail/detail-navbar.vue
+++ b/pages/goods/components/detail/detail-navbar.vue
@@ -62,11 +62,11 @@
         value: 'goods',
         to: 'detail-swiper-selector',
       },
-      {
-        label: '评价',
-        value: 'comment',
-        to: 'detail-comment-selector',
-      },
+      // {
+      //   label: '评价',
+      //   value: 'comment',
+      //   to: 'detail-comment-selector',
+      // },
       {
         label: '详情',
         value: 'detail',
@@ -150,30 +150,34 @@
   .icon-box {
     box-shadow: 0px 0px 4rpx rgba(51, 51, 51, 0.08), 0px 4rpx 6rpx 2rpx rgba(102, 102, 102, 0.12);
     border-radius: 30rpx;
-    width: 134rpx;
-    height: 56rpx;
+    width: 150rpx;
+    height: 64rpx;
+	// width: 134rpx;
+	// height: 56rpx;
     margin-left: 8rpx;
     border: 1px solid rgba(#fff, 0.4);
     .line {
-      width: 2rpx;
-      height: 24rpx;
-      background: #e5e5e7;
+      width: 3rpx;
+      height: 30rpx;
+      // height: 24rpx;
+      // background: #e5e5e7;
+	  background-color: #000;
     }
     .sicon-back {
-      font-size: 32rpx;
+      font-size: 36rpx;
       color: #000;
     }
     .sicon-home {
-      font-size: 32rpx;
+      font-size: 36rpx;
       color: #000;
     }
     .sicon-more {
-      font-size: 32rpx;
+      font-size: 36rpx;
       color: #000;
     }
     .icon-button {
       width: 67rpx;
-      height: 56rpx;
+      height: 56rpx;s
       &-left:hover {
         background: rgba(0, 0, 0, 0.16);
         border-radius: 30rpx 0px 0px 30rpx;
diff --git a/pages/goods/index.vue b/pages/goods/index.vue
index d73d710..a2ab09f 100644
--- a/pages/goods/index.vue
+++ b/pages/goods/index.vue
@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<s-layout :onShareAppMessage="shareInfo" navbar="goods">
-			<!-- 标题栏 -->
+			<!-- 标题栏  -->
 			<detailNavbar />
 
 			<!-- 骨架屏 -->
@@ -67,7 +67,9 @@
 				<!-- <detail-comment-card class="detail-comment-selector" :goodsId="state.goodsId" /> -->
 				<!-- 详情 -->
 				<detail-content-card class="detail-content-selector" :content="state.goodsInfo.content" />
-
+				
+				<view style="width: 100%;height: 100rpx;"></view>
+				
 				<!-- 活动跳转 -->
 				<detail-activity-tip v-if="state.goodsInfo.activities" :data="state.goodsInfo"></detail-activity-tip>
 
@@ -332,7 +334,8 @@
 	// 购买
 	.buy-box {
 		.add-btn {
-			width: 214rpx;
+			// width: 214rpx;
+			width: 312rpx;
 			height: 72rpx;
 			font-weight: 500;
 			font-size: 28rpx;
@@ -342,7 +345,8 @@
 		}
 
 		.buy-btn {
-			width: 214rpx;
+			// width: 214rpx;
+			width: 312rpx;
 			height: 72rpx;
 			font-weight: 500;
 			font-size: 28rpx;
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 205545f..3b2967f 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -3,8 +3,8 @@
 		<s-layout title="首页" navbar="custom" tabbar="/pages/index/index" :bgStyle="template.style?.background"
 			:navbarStyle="template.style?.navbar" onShareAppMessage :showFloatButton="true" bgColor="#fcc74e">
 			<scroll-view @scrolltolower="onScrolltolower" :refresher-enabled="true" :refresher-triggered="homrS"
-				@refresherrefresh="onS" scroll-y="true" class="scrollBox  align-items"
-				style="height: 1080rpx;box-sizing: border-box;">
+				@refresherrefresh="onS" scroll-y="true" class="scrollBox align-items"
+				style="height: 84vh;box-sizing: border-box;">
 				<view class="container">
 					<!-- 顶部 -->
 					<view class="top">
@@ -77,7 +77,7 @@
 								</view>
 								<view class="cityBox" @click="state.showRegion = true">
 									<view style="margin-right: 10rpx;font-size: 30rpx;font-weight: 800;line-height: 45rpx;
-									white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
+									white-space: nowrap;overflow: hidden;text-overflow: ellipsis;color: #999999;">
 										{{ state.model.city_name ?  state.model.city_name : '地区筛选'}}
 									</view>
 									<image style="width: 25rpx;height: 13rpx;"
@@ -139,7 +139,7 @@
 						</view>
 					</view>
 
-					<view class="viewCan" style="width: 100%;height: 200rpx;"></view>
+					<view class="viewCan" style="width: 100%;height: 300rpx;"></view>
 
 				</view>
 			</scroll-view>
@@ -565,7 +565,7 @@
 			height: 520rpx;
 			background-image: url('https://jiangxiaoxian.0rui.cn/topBack.png');
 			background-size: 100%;
-			padding: 30rpx 30rpx 30rpx 30rpx;
+			padding: 30rpx;
 			display: grid;
 
 			.locTop {
diff --git a/pages/user/myRelease/list.vue b/pages/user/myRelease/list.vue
index b859f3e..95fb6e5 100644
--- a/pages/user/myRelease/list.vue
+++ b/pages/user/myRelease/list.vue
@@ -225,7 +225,7 @@
 		const res = await sheep.$api.rent.rentlist({
 			page: listQuery.value.page,
 			limit: listQuery.value.limit,
-			order: 'normal',
+			order: 'new',
 			status: listQuery.value.status,
 			my: 1,
 		});
diff --git a/sheep/components/s-custom-navbar/s-custom-navbar.vue b/sheep/components/s-custom-navbar/s-custom-navbar.vue
index 753b825..5043c6b 100644
--- a/sheep/components/s-custom-navbar/s-custom-navbar.vue
+++ b/sheep/components/s-custom-navbar/s-custom-navbar.vue
@@ -161,24 +161,31 @@
         box-shadow: 0px 0px 4rpx rgba(51, 51, 51, 0.08),
           0px 4rpx 6rpx 2rpx rgba(102, 102, 102, 0.12);
         border-radius: 30rpx;
-        width: 134rpx;
-        height: 56rpx;
+		width: 150rpx;
+		height: 64rpx;
+        // width: 134rpx;
+        // height: 56rpx;
         margin-left: 8rpx;
         .line {
-          width: 2rpx;
-          height: 24rpx;
-          background: #e5e5e7;
+          width: 4rpx;
+		   height: 30rpx;
+          // height: 24rpx;
+          // background: #e5e5e7;
+		  background-color: #000;
         }
         .sicon-back {
-          font-size: 32rpx;
+          // font-size: 32rpx;
+		  font-size: 36rpx;
           color: #000;
         }
         .sicon-home {
-          font-size: 32rpx;
+          // font-size: 32rpx;
+		  font-size: 36rpx;
           color: #000;
         }
         .sicon-more {
-          font-size: 32rpx;
+          // font-size: 32rpx;
+		  font-size: 36rpx;
           color: #000;
         }
         .icon-button {
diff --git a/sheep/ui/su-navbar/su-navbar.vue b/sheep/ui/su-navbar/su-navbar.vue
index c043661..d9b4568 100644
--- a/sheep/ui/su-navbar/su-navbar.vue
+++ b/sheep/ui/su-navbar/su-navbar.vue
@@ -186,7 +186,7 @@
     },
     leftWidth: {
       type: [Number, String],
-      default: 80,
+      default: 86,
     },
     rightWidth: {
       type: [Number, String],
@@ -285,25 +285,31 @@
     background: #ffffff;
     box-shadow: 0px 0px 4rpx rgba(51, 51, 51, 0.08), 0px 4rpx 6rpx 2rpx rgba(102, 102, 102, 0.12);
     border-radius: 30rpx;
+	// width: 150rpx;
+	height: 64rpx;
     width: 134rpx;
-    height: 56rpx;
+    // height: 56rpx;
     margin-left: 8rpx;
     .line {
-      width: 2rpx;
-      height: 24rpx;
-      // background: #e5e5e7;
-	  background: #3d3d3d;
+      width: 4rpx;
+	  height: 30rpx;
+     // height: 24rpx;
+     // background: #e5e5e7;
+	  background: #000;
     }
     .sicon-back {
-      font-size: 32rpx;
+      // font-size: 32rpx;
+	  font-size: 36rpx;
       color: #000;
     }
     .sicon-home {
-      font-size: 32rpx;
+      // font-size: 32rpx;
+	  font-size: 34rpx;
       color: #000;
     }
     .sicon-more {
-      font-size: 32rpx;
+      // font-size: 32rpx;
+	  font-size: 34rpx;
       color: #000;
     }
     .icon-button {
@@ -401,6 +407,7 @@
     /* #endif */
     width: 120rpx;
     justify-content: flex-start;
+	// justify-content: center;
     align-items: center;
   }