Merge branch 'master' of http://8.140.253.224:3000/root/school_uni

package1/group/shopEvaluate.vue

@@ -34,7 +34,8 @@
 					</view>
 				</view>
 			</view>
-			<view class="evaluate-list" v-for="(item,index) in shopComments" :key="index">
+			<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"
@@ -53,7 +54,7 @@
 						<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" />
+								<uni-rate :disabled="true" disabledColor="rgba(255, 184, 84, 1)" :value="item.score" size="12" />
 							</view>
 						</view>
 						<view class="eval-text">
@@ -111,6 +112,8 @@
 						</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;

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>

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="" />

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({