diff --git a/pages/index/index.vue b/pages/index/index.vue
index 9f9370d..04eb581 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -125,14 +125,14 @@
 								商品管理
 							</view>
 						</view>
-						<view class="menu22" @tap="goDetail('dp')">
+						<!-- <view class="menu22" @tap="goDetail('dp')">
 							<view class="menu33">
 								<image src="../../static/image/dingdan/dd1.png" alt="" />
 							</view>
 							<view class="menu44">
 								店铺管理
 							</view>
-						</view>
+						</view> -->
 						<view class="menu22" @tap="changeIndex(1)">
 							<view class="menu33">
 								<image src="../../static/image/dingdan/dd2.png" alt="" />
@@ -187,7 +187,7 @@
 		<uni-popup ref="areaPopup" background-color="#fff">
 			<view class="popup-area-content">
 				<view class="popup-area-title">
-					<text>请选择所属区域</text>
+					<text>请选择店铺</text>
 				</view>
 				<view class="popup-area-container" v-for="(item,index) in areaList" :key="index" @tap="onClickArea(item)">
 					<text style="display: inline-block">{{item.shop.shopName}}</text>
diff --git a/pages/shop/goodsList.vue b/pages/shop/goodsList.vue
index 7d2c420..dca77b7 100644
--- a/pages/shop/goodsList.vue
+++ b/pages/shop/goodsList.vue
@@ -6,7 +6,7 @@
 				<view class="back-btn" @tap="back">
 					<uni-icons type="left" size="28"></uni-icons>
 				</view>
-				<view class="title-search" @tap="goDetail('search')">
+				<view class="title-search">
 					<uni-icons type="search" size="18" style="margin: 9rpx;"></uni-icons>
 					<input type="text" placeholder="搜索" @input="search" />
 				</view>
@@ -135,9 +135,23 @@
 		</view>
 		<view class="bottom-box">
 			<view class="bottom-btn" @tap="goDetail('goods')" style="background: rgba(0, 35, 28, 1);color: rgba(166, 255, 234, 1);">新增商品</view>
-			<view class="bottom-btn" @tap="goDetail('type')">新增分类</view>
+			<view class="bottom-btn" @tap="$refs.payDialog.open()">更多</view>
 		</view>
 		<u-loadmore :status="status" />
+		<!-- 弹出输入框 -->
+		<uni-popup ref="payDialog" background-color="#fff">
+			<view class="popup-pay-content">
+				<view class="popup-pay-title">
+					<text>请选择</text>
+				</view>
+				<view class="popup-pay-container" @tap="goDetail('type')">
+					<text style="display: inline-block">分类管理</text>
+				</view>
+				<view class="popup-pay-container" @tap="goDetail('attribute')">
+					<text style="display: inline-block">属性管理</text>
+				</view>
+			</view>
+		</uni-popup>
 	</view>
 </template>
 
@@ -313,8 +327,12 @@
 				let url=""
 				if(type == 'goods'){
 					url = '/pages/shop/addGoods?dataList='+ JSON.stringify(item)
-				}else{
+				}else if(type == 'type'){
 					url = '/pages/shop/addType'
+				}else if(type == 'attribute'){
+					url = '/pages/shop/attributeList'
+				}else{
+					
 				}
 				uni.navigateTo({
 					url:url
@@ -578,4 +596,30 @@
 		flex: 1;
 		padding-top: 14rpx;
 	}
+	.popup-pay-content {
+		align-items: center;
+		justify-content: center;
+		padding: 15px;
+		width: 500rpx;
+		height: auto;
+		background-color: #fff;
+	}
+	.popup-pay-title {
+		font-size: 36rpx;
+		font-weight: bold;
+		text-align: center;
+		position: relative;
+	}
+	
+	.popup-pay-container {
+		margin-top: 20rpx;
+		height: 100rpx;
+		border-radius: 10px;
+		background: #088FEB;
+		line-height: 100rpx;
+		text-align: center;
+		border-bottom: 1px solid #eee;
+		border-top: 1px solid #eee;
+		color: #fff;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/shop/shopEvaluate.vue b/pages/shop/shopEvaluate.vue
index c1723ba..c195ad7 100644
--- a/pages/shop/shopEvaluate.vue
+++ b/pages/shop/shopEvaluate.vue
@@ -34,83 +34,87 @@
 					</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}}
-						</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" />
+			<scroll-view scroll-y @scrolltolower="onReachPage" style="width:100%;height: 600px;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>
-					<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" :class="{'expanded': isExpanded}" v-for="(item1,index1) in item.comments" :key="index1">
-						<!-- 标题行：商家回复 + 展开/收起按钮 -->
-						<view class="reply-header">
-							<!-- 回复内容区域（动态类控制展开/折叠） -->
-							<view class="reply-content" :class="{ collapsed: !isExpanded, expanded: isExpanded }">
-								<text>{{item1.createByName}} : {{ item1.remark }}</text>
-								<img :src="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">
-								<text v-if="!isExpanded">展开</text>
-								<text v-else>收起</text>
+							<view class="eval-time">
+								{{item.createTime | formatTime}}
 							</view>
 						</view>
 					</view>
-					<view class="" v-if="isMerchant == 1">
-						<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="eval-text">
+							{{item.remark}}
+						</view>
+						<view class="eval-img" v-if="item.picture">
+							<img @tap="largeImg" :src="item.picture" alt="">
 						</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="reply-card" :class="{'expanded': isExpanded}" v-for="(item1,index1) in item.comments" :key="index1">
+							<!-- 标题行：商家回复 + 展开/收起按钮 -->
+							<view class="reply-header">
+								<!-- 回复内容区域（动态类控制展开/折叠） -->
+								<view class="reply-content" :class="{ collapsed: !isExpanded, expanded: isExpanded }">
+									<text>{{item1.createByName}} : {{ item1.remark }}</text>
+									<img :src="item1.picture" alt="" class="upload-img" style="margin-top: 10px;border-radius: 10px;">
 								</view>
-								<view class="eval-num" style="border: none;padding: 0 30rpx;display: flex;margin-bottom: 10px;">
-									<view class="upload-img" @tap="pictureAdd()"
-										style="background: #eee;text-align: center;line-height: 160rpx;">
-										<uni-icons type="camera" size="28" color="#777"></uni-icons>
+								<view class="reply-expand-btn" @click="toggleReply">
+									<text v-if="!isExpanded">展开</text>
+									<text v-else>收起</text>
+								</view>
+							</view>
+						</view>
+						<view class="" v-if="isMerchant == 1">
+							<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: #eee;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>
+				<view style="width: 100%;height: 100rpx;"></view>
+			</scroll-view>
+			
 		</view>
 		<!-- 查看大图弹出层 -->
 		<uni-popup ref="imgPopup" background-color="#fff">
@@ -132,7 +136,6 @@
 				isPintuan: true,
 				bigImg: '',
 				shopItem:{},
-				pageNum:1,
 				searchAll:true,
 				total:0,
 				shopComments:[],
@@ -207,27 +210,37 @@
 				this.searchForm.shopId = id
 				that.NB.sendRequest("/app/comment/getCommentList", this.searchForm, false, 'post', 'application/json').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]
 						}
 						for(let i=0;i<that.shopComments.length;i++){
 							that.shopComments[i].isReply=false
+							if(that.shopComments[i].comments.length > 0){
+								for(let m=0;m<that.shopComments[i].comments.length;m++){
+									that.shopComments[i].comments[m].isOpen = false
+								}
+							}
 						}
+						that.total = res.result.pages; // pages = 总页数
 						that.$forceUpdate()
 						if(this.searchAll){
 							that.menuList[0].num =  res.result.total
 						}
 					} else {
-						uni.showToast({
-							title: res.message,
-							icon:'none'
-						});
+						that.tui.toast(res.message,1000)
+						return
 					}
 					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 = [{ //店铺
@@ -287,6 +300,8 @@
 					this.searchForm.picture = 0
 					this.searchForm.score = 1
 				}
+				this.searchForm.pageNum = 1
+				this.shopComments = []
 				this.getshopComments(this.shopItem.id)
 			},
 			pictureAdd() {
@@ -463,10 +478,6 @@
 		flex: 1;
 	}
 
-	.evaluate-list {
-		margin-top: 40rpx;
-	}
-
 	.eval-title {
 		width: 100%;
 		height: 80rpx;