no message

common/config.js

@@ -3,15 +3,15 @@
 // const ROOTPATH2 = "wss://mxys.chuanghai-tech.com/wss/websocket/"
 // const ROOTPATH3 = "wss://mxys.chuanghai-tech.com/wss/ordersChat/"
 
-const ROOTPATH = "https://mxys.chuanghai-tech.com/wm-test/wm-api/sqx_fast";
-const ROOTPATH1 = "https://mxys.chuanghai-tech.com/wm-test/wm-api/sqx_fast";
-const ROOTPATH2 = "wss://mxys.chuanghai-tech.com/wss-test/websocket/"
-const ROOTPATH3 = "wss://mxys.chuanghai-tech.com/wss-test/ordersChat/"
+// const ROOTPATH = "https://mxys.chuanghai-tech.com/wm-test/wm-api/sqx_fast";
+// const ROOTPATH1 = "https://mxys.chuanghai-tech.com/wm-test/wm-api/sqx_fast";
+// const ROOTPATH2 = "wss://mxys.chuanghai-tech.com/wss-test/websocket/"
+// const ROOTPATH3 = "wss://mxys.chuanghai-tech.com/wss-test/ordersChat/"
 
-// const ROOTPATH = "http://192.168.161.190:8171/sqx_fast";
-// const ROOTPATH1 = "http://192.168.161.190:8171/sqx_fast";
-// const ROOTPATH2 = "wss://mxys.chuanghai-tech.com/wss/websocket/"
-// const ROOTPATH3 = "wss://mxys.chuanghai-tech.com/wss/ordersChat/"
+const ROOTPATH = "http://192.168.161.190:8171/sqx_fast";
+const ROOTPATH1 = "http://192.168.161.190:8171/sqx_fast";
+const ROOTPATH2 = "wss://mxys.chuanghai-tech.com/wss/websocket/"
+const ROOTPATH3 = "wss://mxys.chuanghai-tech.com/wss/ordersChat/"
 
 
 module.exports = {

my/address/add.vue

@@ -12,11 +12,11 @@
 			
 			<view v-if="form.isInner">
 				<view class="cu-form-group">
-					<view class="title">选择骑手站点</view>
+					<view class="title">选择校区</view>
 					<view style="width: 50vw;text-align: end;">
 						<picker style="padding-right: 0;" @change="bindPickerChange_station" :value="stationIndex" range-key="stationName" :range="stationList">
 							<view :style="stationIndex==null?'color:#aaa':''">
-								{{stationIndex==null?"请选择骑手站点":stationList[stationIndex].stationName}}
+								{{stationIndex==null?"请选择校区":stationList[stationIndex].stationName}}
 							</view>
 						</picker>
 					</view>

pages/index/shop/index.vue

@@ -26,7 +26,7 @@
 								</view>
 								<view style="padding-left: 20rpx; display: flex; flex-direction: column; justify-content: space-between">
 									<span style="color: #707070; font-size: 24rpx">平台配送</span>
-									<view class="text-bold">{{ shopDet.errandTime }}分钟</view>
+									<view class="text-bold">{{ shopDet.errandTime || 0 }}分钟</view>
 								</view>
 							</view>
 							<view class="flex align-center margin-top-xs" v-if="shopDet.shopNotice">
@@ -141,7 +141,7 @@
 						</view>
 					</view>
 					<view class="VerticalBox" v-if="current == 1">
-						<scroll-view class="VerticalNav nav bg-gray" scroll-y scroll-with-animation :scroll-top="verticalNavTop">
+						<scroll-view class="VerticalNav nav bg-gray" scroll-y scroll-with-animation :scroll-top="verticalNavTop" @scrolltolower="scrolltolower_left">
 							<view
 								style="font-size: 28upx"
 								class="cu-item text-lg"
@@ -154,7 +154,14 @@
 								{{ item.classifyName }}
 							</view>
 						</scroll-view>
-						<scroll-view class="VerticalMain" scroll-y scroll-with-animation :scroll-into-view="'main-' + mainCur" @scroll="VerticalMain">
+						<scroll-view
+							class="VerticalMain"
+							scroll-y
+							scroll-with-animation
+							:scroll-into-view="'main-' + mainCur"
+							@scroll="VerticalMainFun"
+							@scrolltolower="scrolltolower_right"
+						>
 							<view class="bg-white padding-sm margin-bottom-sm" v-for="(item, index) in dataList" v-if="item.goodsList.length" :key="index" :id="'main-' + index">
 								<view class="flex justify-between padding-bottom-sm" @click="goDet(ite.goodsId)" v-for="(ite, ind) in item.goodsList" :key="ind">
 									<image :src="ite.goodsCover" mode="aspectFill" style="width: 184rpx; height: 184rpx; border-radius: 10rpx"></image>
@@ -634,7 +641,8 @@ export default {
 			lng: '',
 			shopName: '',
 			page: 1,
-			limit: 10,
+			limit: 12,
+			total: 0,
 			evaluatePage: 1,
 			evaluateLimit: 10,
 			show: true,
@@ -767,6 +775,30 @@ export default {
 				})
 			}
 		},
+		scrolltolower_left() {
+			console.log(111)
+			if (this.total > this.dataList.length) {
+				this.page++
+				this.getData()
+			} else {
+				uni.showToast({
+					title: '没有更多数据了',
+					icon: 'none'
+				})
+			}
+		},
+		scrolltolower_right() {
+			console.log(222)
+			if (this.total > this.dataList.length) {
+				this.page++
+				this.getData()
+			} else {
+				uni.showToast({
+					title: '没有更多数据了',
+					icon: 'none'
+				})
+			}
+		},
 		//营业执照点击放大
 		clickImg(img) {
 			uni.previewImage({
@@ -840,10 +872,12 @@ export default {
 			})
 		},
 		switchTab(e) {
-			// this.page = 1
 			this.current = e
 
 			if (this.current == 1) {
+				this.page = 1
+				this.total = 0
+				this.dataList = []
 				this.getData()
 			} else if (this.current == 2) {
 				this.evaluatePage = 1
@@ -882,24 +916,28 @@ export default {
 			let data = {
 				shopId: this.shopId,
 				lng: this.lng,
-				lat: this.lat
+				lat: this.lat,
+				page: this.page,
+				limit: this.limit
 			}
 			this.$Request.get('/app/goods/selectGoodsList', data).then((res) => {
 				console.log(res, '999')
 				if (res.code == 0 && res.data) {
-					this.dataList = res.data.list
+					this.dataList = [...this.dataList, ...res.data.list]
 					this.shopDet = res.data.goodsShop
+					this.total = res.data.total
 
-					for (var i = 0; i < this.dataList.length; i++) {
-						this.dataList[i].id = i
+					for (let i = 0, len = this.dataList.length; i < len; i++) {
+						this.$set(this.dataList[i], 'id', i)
 					}
+					console.log(this.dataList)
 
 					this.shopDet.shopScore1 = Math.floor(this.shopDet.shopScore)
 					this.shopDet.errandTime = Math.round(this.shopDet.errandTime)
 					if (this.shopDet.shopBanner) {
 						this.shopDet.shopBanner = this.shopDet.shopBanner.split(',')
 					}
-					console.log(this.shopDet, 'kkkkkk')
+					// console.log(this.shopDet, 'kkkkkk')
 					if (this.shopDet.businessLicense) {
 						this.shop_zhizhao = this.shopDet.businessLicense.split(',')
 					}
@@ -914,8 +952,8 @@ export default {
 					uni.setNavigationBarTitle({
 						title: this.shopDet.shopName
 					})
+					uni.hideLoading()
 				}
-				uni.hideLoading()
 			})
 		},
 		getEchoOrder() {
@@ -1344,11 +1382,12 @@ export default {
 			}
 		},
 		TabSelect(e) {
+			// console.log(e)
 			this.tabCur = e.currentTarget.dataset.id
 			this.mainCur = e.currentTarget.dataset.id
 			this.verticalNavTop = (e.currentTarget.dataset.id - 1) * 50
 		},
-		VerticalMain(e) {
+		VerticalMainFun(e) {
 			let tabHeight = 0
 			if (this.load) {
 				for (let i = 0; i < this.dataList.length; i++) {
@@ -1713,6 +1752,7 @@ page {
 	height: calc(100% - 120rpx);
 	white-space: initial;
 	background-color: #fff;
+	overflow-y: scroll;
 }
 
 .VerticalNav.nav .cu-item {