diff --git a/package1/group/shopEvaluate.vue b/package1/group/shopEvaluate.vue
index 8050405..c46679c 100644
--- a/package1/group/shopEvaluate.vue
+++ b/package1/group/shopEvaluate.vue
@@ -34,83 +34,86 @@
 					</view>
 				</view>
 			</view>
-			<view class="evaluate-list" v-for="(item,index) in shopComments" :key="index">
-				<view class="eval-title">
-					<view class="eval-icon">
-						<img :src="item.createByIcon"
-							alt="" />
-					</view>
-					<view class="eval-name">
-						<view class="name1">
-							{{item.createByName}}
+			<scroll-view scroll-y @scrolltolower="onReachPage" style="width:100%;height: 540px;overflow: scroll;">
+				<view v-for="(item,index) in shopComments" :key="index">
+					<view class="eval-title">
+						<view class="eval-icon">
+							<img :src="item.createByIcon"
+								alt="" />
 						</view>
-						<view class="eval-time">
-							{{item.createTime | formatTime}}
-						</view>
-					</view>
-				</view>
-				<view class="eval-content">
-					<view style="display: flex;height: 50rpx;line-height: 50rpx;font-size: 24rpx;">
-						商品
-						<view style="padding: 12rpx 0 0 10rpx;">
-							<uni-rate v-model="item.score" size="12" />
-						</view>
-					</view>
-					<view class="eval-text">
-						{{item.remark}}
-					</view>
-					<view class="eval-img" v-if="item.picture">
-						<img @tap="largeImg" :src="item.picture" alt="">
-					</view>
-					<view class="reply-card" v-for="(item1,index1) in item.comments" :key="index1" :class="{'expanded': item1.isOpen}">
-						<!-- 标题行：商家回复 + 展开/收起按钮 -->
-						<view class="reply-header">
-							<!-- 回复内容区域（动态类控制展开/折叠） -->
-							<view class="reply-content" :class="{ collapsed: !item1.isOpen, expanded: item1.isOpen }">
-								<text>{{item1.createByName}} : {{ item1.remark }}</text>
-								<img :src="item1.picture" v-if="item1.picture" alt="" class="upload-img" style="margin-top: 10px;border-radius: 10px;">
+						<view class="eval-name">
+							<view class="name1">
+								{{item.createByName}}
 							</view>
-							<view class="reply-expand-btn" @click="toggleReply(index,index1)">
-								<text v-if="!item1.isOpen">展开</text>
-								<text v-else>收起</text>
+							<view class="eval-time">
+								{{item.createTime | formatTime}}
 							</view>
 						</view>
 					</view>
-					<view class="" v-if="(isMerchant == 1 || isMerchant == 2)">
-						<view @tap="changeStatus(index)" class="reply-card" v-if="!item.isReply" style="text-align: right;padding-right: 10px;color: #00BFFF;">
-							回复
+					<view class="eval-content">
+						<view style="display: flex;height: 50rpx;line-height: 50rpx;font-size: 24rpx;">
+							商品
+							<view style="padding: 12rpx 0 0 10rpx;">
+								<uni-rate :disabled="true" disabledColor="rgba(255, 184, 84, 1)" :value="item.score" size="12" />
+							</view>
 						</view>
-						<view class="" v-else>
-							<view class="" style="background: #f5f5f5;border-radius: 10px;border: 1px solid #777;margin-top: 10px;">
-								<view class="eval-num" style="border: none;">
-									<textarea name="" v-model="replyText" id="" cols="30" rows="10" placeholder="有什么想说的吗？可以写下来，提交给我们" style="width: 100%;font-size: 28rpx;padding: 30rpx;height: 200rpx;"></textarea>
+						<view class="eval-text">
+							{{item.remark}}
+						</view>
+						<view class="eval-img" v-if="item.picture">
+							<img @tap="largeImg" :src="item.picture" alt="">
+						</view>
+						<view class="reply-card" v-for="(item1,index1) in item.comments" :key="index1" :class="{'expanded': item1.isOpen}">
+							<!-- 标题行：商家回复 + 展开/收起按钮 -->
+							<view class="reply-header">
+								<!-- 回复内容区域（动态类控制展开/折叠） -->
+								<view class="reply-content" :class="{ collapsed: !item1.isOpen, expanded: item1.isOpen }">
+									<text>{{item1.createByName}} : {{ item1.remark }}</text>
+									<img :src="item1.picture" v-if="item1.picture" alt="" class="upload-img" style="margin-top: 10px;border-radius: 10px;">
+								</view>
+								<view class="reply-expand-btn" @click="toggleReply(index,index1)">
+									<text v-if="!item1.isOpen">展开</text>
+									<text v-else>收起</text>
 								</view>
-								<view class="eval-num" style="border: none;padding: 0 30rpx;display: flex;margin-bottom: 10px;">
-									<view class="upload-img" @tap="pictureAdd()"
-										style="background: #f5f5f5;text-align: center;line-height: 160rpx;">
-										<uni-icons type="camera" size="28" color="#777"></uni-icons>
+							</view>
+						</view>
+						<view class="" v-if="(isMerchant == 1 || isMerchant == 2)">
+							<view @tap="changeStatus(index)" class="reply-card" v-if="!item.isReply" style="text-align: right;padding-right: 10px;color: #00BFFF;">
+								回复
+							</view>
+							<view class="" v-else>
+								<view class="" style="background: #f5f5f5;border-radius: 10px;border: 1px solid #777;margin-top: 10px;">
+									<view class="eval-num" style="border: none;">
+										<textarea name="" v-model="replyText" id="" cols="30" rows="10" placeholder="有什么想说的吗？可以写下来，提交给我们" style="width: 100%;font-size: 28rpx;padding: 30rpx;height: 200rpx;"></textarea>
 									</view>
-									<view style="flex: 1;display: flex;">
-										<view v-if="replyPicture !=''"
-											:key="index" style="width: 160rpx;height: 160rpx;margin-left: 20rpx;">
-											<img :src="replyPicture" alt="" class="upload-img">
+									<view class="eval-num" style="border: none;padding: 0 30rpx;display: flex;margin-bottom: 10px;">
+										<view class="upload-img" @tap="pictureAdd()"
+											style="background: #f5f5f5;text-align: center;line-height: 160rpx;">
+											<uni-icons type="camera" size="28" color="#777"></uni-icons>
+										</view>
+										<view style="flex: 1;display: flex;">
+											<view v-if="replyPicture !=''"
+												:key="index" style="width: 160rpx;height: 160rpx;margin-left: 20rpx;">
+												<img :src="replyPicture" alt="" class="upload-img">
+											</view>
 										</view>
 									</view>
 								</view>
-							</view>
-							<!-- <textarea type="text" v-model="replyText" placeholder="要说什么写下来吧" style="background: #eee;border-radius: 10px;height: 100px;margin: 10px 0;padding: 10px;" /> -->
-							<view class="" style="display: flex;flex-direction: row-reverse;padding-right: 10px;margin-top: 10px;">
-								<view @tap="submit(index)" class="" style="margin-left: 20px;color: #00BFFF;">
-									确认
-								</view>
-								<view class="" @tap="changeStatus(index)">
-									取消
+								<!-- <textarea type="text" v-model="replyText" placeholder="要说什么写下来吧" style="background: #eee;border-radius: 10px;height: 100px;margin: 10px 0;padding: 10px;" /> -->
+								<view class="" style="display: flex;flex-direction: row-reverse;padding-right: 10px;margin-top: 10px;">
+									<view @tap="submit(index)" class="" style="margin-left: 20px;color: #00BFFF;">
+										确认
+									</view>
+									<view class="" @tap="changeStatus(index)">
+										取消
+									</view>
 								</view>
 							</view>
 						</view>
 					</view>
 				</view>
-			</view>
+				
+			</scroll-view>
 			<view style="width: 100%;height: 100rpx;"></view>
 		</view>
 		<!-- 查看大图弹出层 -->
@@ -133,7 +136,6 @@
 				isPintuan: true,
 				bigImg: '',
 				shopItem:{},
-				pageNum:1,
 				searchAll:true,
 				total:0,
 				shopComments:[],
@@ -209,7 +211,7 @@
 				this.searchForm.shopId = id
 				that.tui.request("/app/comment/getCommentList", "POST", this.searchForm, false, false).then((res) => {
 					if (res.code == 200) {
-						if (that.pageNum == 1) {
+						if (that.searchForm.pageNum == 1) {
 							that.shopComments = res.result.records
 						} else {
 							that.shopComments = [...that.shopComments, ...res.result.records]
@@ -222,6 +224,7 @@
 								}
 							}
 						}
+						that.total = res.result.pages; // pages = 总页数
 						that.$forceUpdate()
 						if(this.searchAll){
 							that.menuList[0].num =  res.result.total
@@ -233,6 +236,12 @@
 					uni.hideLoading()
 				}).catch((res) => {})
 			},
+			onReachPage(){
+				console.log("11111")
+				if (this.searchForm.pageNum >= this.total) return;
+				this.searchForm.pageNum++;
+				this.getshopComments(this.shopItem.id);
+			},
 			submit(v){
 				let that = this;
 				let data = [{ //店铺
@@ -290,6 +299,8 @@
 					this.searchForm.picture = 0
 					this.searchForm.score = 1
 				}
+				this.searchForm.pageNum = 1
+				this.shopComments = []
 				this.getshopComments(this.shopItem.id)
 			},
 			pictureAdd() {
@@ -443,7 +454,7 @@
 	}
 
 	.menu-list {
-		height: 100rpx;
+		height: 120rpx;
 		width: 100%;
 		display: flex;
 		overflow-y: hidden;
@@ -468,10 +479,6 @@
 		flex: 1;
 	}
 
-	.evaluate-list {
-		margin-top: 40rpx;
-	}
-
 	.eval-title {
 		width: 100%;
 		height: 80rpx;
diff --git a/package1/myCenter/goodsList.vue b/package1/myCenter/goodsList.vue
index 46ba42e..d218aa6 100644
--- a/package1/myCenter/goodsList.vue
+++ b/package1/myCenter/goodsList.vue
@@ -6,7 +6,7 @@
 				<view class="back-btn" @tap="back" :style="{'padding-top': menuButtonInfo.top +'px'}">
 					<uni-icons type="left" size="28"></uni-icons>
 				</view>
-				<view class="title-search" :style="{'padding-top': menuButtonInfo.top +'px'}" @tap="goDetail('search')">
+				<view class="title-search" :style="{'padding-top': menuButtonInfo.top +'px'}">
 					<uni-icons type="search" size="18" style="margin: 9rpx;"></uni-icons>
 					<input type="text" placeholder="搜索" @input="search" />
 				</view>
diff --git a/package2/shop/merchantCenter.vue b/package2/shop/merchantCenter.vue
index 9b868c9..1ed3004 100644
--- a/package2/shop/merchantCenter.vue
+++ b/package2/shop/merchantCenter.vue
@@ -126,14 +126,14 @@
 						商品管理
 					</view>
 				</view>
-				<view class="menu22" @tap="goDetail('dp')">
+				<!-- <view class="menu22" @tap="goDetail('dp')">
 					<view class="menu33">
 						<img src="/static/images/dingdan/dd1.png" alt="" />
 					</view>
 					<view class="menu44">
 						店铺管理
 					</view>
-				</view>
+				</view> -->
 				<view class="menu22" @tap="goDetail('dd')">
 					<view class="menu33">
 						<img src="/static/images/dingdan/dd2.png" alt="" />
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 4d091ed..7a6fc7c 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -827,10 +827,13 @@
 						url = '/package1/group/groupBuyList'
 						break;
 					case '3':
-						url = '/package1/order/orderList'
+						url = ''
 						break;
 					case '4':	
-						url = '/package1/order/orderDetail'
+						url = ''
+						break;
+					case '5':
+						url = ''
 						break;
 				}
 				uni.navigateTo({