店铺列表和店铺详情分页功能添加

apis/interfaces/store.js

@@ -22,11 +22,12 @@ const goods = id => {
 }
 
 // 店铺列表
-const shops = (categoryId) => {
+const shops = (categoryId,page) => {
 	return request({
 		url: 'mall/shops',
 		data: {
-			category_id: categoryId
+			category_id: categoryId,
+            page:page
 		}
 	})
 }
@@ -39,12 +40,13 @@ const shopsDetail = (shopId) => {
 }
 
 // 店铺商品
-const shopsGoods = (shop_id, category_id) => {
+const shopsGoods = (shop_id, category_id,page) => {
 	return request({
 		url: 'mall/goods',
 		data: {
 			shop_id,
-			category_id
+			category_id,
+            page,
 		}
 	})
 }

pages/store/shop/shopDetail.vue

@@ -28,7 +28,7 @@
 				</scroll-view>
 			</view>
 			<view class="right">
-				<scroll-view scroll-y="true" class="scroll-view-right">
+				<scroll-view scroll-y="true" class="scroll-view-right"  @scrolltolower='lower'>
 					<block v-if="goods.length > 0">
 						<view class="goods-item" v-for="(item,index) in goods" :key="index"
 							@click="onGoods(item.goods_id)">
@@ -39,7 +39,7 @@
 								<view class="price">{{item.price.price_min || '0'}}
 									<view class="price-type">
 										<text> DT积分</text>
-										<text class="kucun"> 库存量:1222</text>
+										<text class="kucun"> 库存量:{{item.stock}}</text>
 									</view>
 								</view>
 							</view>
@@ -70,12 +70,14 @@
 				category_id	: '',
 				classify	: [],
 				goods		: [],
-				pages		: {}
+				has_more:true,
+                page:1,
 			}
 		},
 		onLoad(e) {
 			this.ShopId = this.$Route.query.ShopId
 			shopsDetail(this.ShopId).then(res => {
+                console.log(res);
 				this.classify = [{
 					category_id: '',
 					name: '全部商品',
@@ -90,14 +92,19 @@
 				})
 			})
 		},
+        onPullDownRefresh() {
+            this.has_more = true;
+            this.page = 1;
+            this.getGoods()
+        },
 		methods: {
 			getGoods() {
 				uni.showLoading({
 					title: '加载中...'
 				})
-				shopsGoods(this.ShopId, this.category_id).then(res => {
+				shopsGoods(this.ShopId, this.category_id,this.page).then(res => {
-					this.goods = res.data
+					this.goods = this.goods.concat(res.data);
-					this.pages = res.page
+					this.has_more = res.page.has_more;
 					uni.hideLoading()
 				}).catch(err => {
 					uni.showToast({
@@ -106,9 +113,19 @@
 					})
 				})
 			},
+            lower(){
+              if(this.has_more){
+                  this.page = this.page + 1;
+                  this.has_more = true;
+                  this.getGoods()
+              }
+            },
 			selectClassify(id) {
 				if (id === this.category_id) return;
 				this.category_id = id;
+                this.page = 1;
+                this.goods =[];
+                this.has_more = true;
 				this.getGoods()
 			},
 			search() {

pages/store/shop/shopList.vue

@@ -15,17 +15,15 @@
                             <view>店铺评分:<span>5.0</span></view>
                         </view>
                     </view>
-					<view class="shopInfo-title-right" >在售{{item.goods_count}}件<uni-icons class="icons" type="right" size="14" color="grey" /></view>
+                    <view class="shopInfo-title-right">在售{{item.goods_count}}件
+                        <uni-icons class="icons" type="right" size="14" color="grey" />
+                    </view>
                 </view>
             </view>
         </block>
         <block v-else>
             <view class="vertical pages-empty">
-				<u-empty
+                <u-empty icon="http://cdn.uviewui.com/uview/empty/list.png" textColor="#999" text="暂无相关店铺">
-					icon="http://cdn.uviewui.com/uview/empty/list.png"
-					textColor="#999"
-					text="暂无相关店铺"
-				>
                 </u-empty>
             </view>
         </block>
@@ -39,29 +37,42 @@
     export default {
         data() {
             return {
-                shopsArr : [],
+                shopsArr: [],
-                classify : [],
+                classify: [],
-				shopsPage: {},
+                // shopsPage: {},
+                page: 1,
+                has_more: true,
             };
         },
         mounted() {
             this.getShops()
         },
+        onReachBottom() {
+            if (this.has_more) {
+                this.page = this.page + 1;
+                this.getShops();
+            }
+        },
         methods: {
             getShops() {
-                shops(this.categoryId).then(res => {
+                shops(this.categoryId, this.page).then(res => {
                     console.log(res)
-                    this.shopsArr = res.shops.data
+                    if (this.page == 1) {
-					this.shopsPage= res.shops.page
+                        this.shopsArr = [];
                         this.classify = [{
                             name: "全部",
                             category_id: ""
                         }].concat(res.categories)
+                    }
+                    this.shopsArr = this.shopsArr.concat(res.shops.data);
+                    this.has_more = res.shops.page.has_more;
                     uni.stopPullDownRefresh()
                 })
             },
             onTabs(e) {
                 this.categoryId = e.category_id
+                this.page = 1;
+                this.has_more = true;
                 this.getShops()
             },
             toShop(id) {
@@ -74,26 +85,33 @@
             }
         },
         onPullDownRefresh() {
-            this.getShops()
+            this.category_id = '';
+            this.page = 1;
+            this.has_more = true;
+            this.getShops();
         },
 
     }
 </script>
 
 <style lang="scss" scoped>
-	.pages-empty{
+    .pages-empty {
         height: 70vh;
     }
+
     .content {
         background: $window-color;
         min-height: 100vh;
     }
+
     // 筛选
     .classify-tabs {
         background: white;
     }
-	.shop-List{
+
+    .shop-List {
         padding: $padding;
+
         .shopInfo {
             display: flex;
             flex-direction: row;
@@ -104,9 +122,11 @@
             background-color: #fff;
             border-radius: $radius;
             margin-top: 20rpx;
-			&:first-child{
+
+            &:first-child {
                 margin-top: 0;
             }
+
             .shopInfo-title-left {
                 width: 60%;
                 display: flex;
@@ -118,6 +138,7 @@
                 padding-left: 90rpx;
                 min-height: 90rpx;
                 box-sizing: border-box;
+
                 .shop-logo {
                     position: absolute;
                     left: 0;
@@ -127,6 +148,7 @@
                     border-radius: 10rpx;
                     border: solid 1rpx #f9f9f9;
                 }
+
                 .shop-title {
                     display: flex;
                     flex-direction: column;
@@ -137,10 +159,12 @@
                     margin-left: $margin;
                     color: #999;
                     width: 100%;
+
                     span {
                         color: $text-price;
                         padding-left: 4rpx;
                     }
+
                     .shop-titl {
                         font-size: 32rpx;
                         color: #333;
@@ -153,12 +177,14 @@
                     }
                 }
             }
+
             .shopInfo-title-right {
                 width: 40%;
                 text-align: right;
                 font-size: 26rpx;
                 color: gray;
-				.icons{
+
+                .icons {
                     vertical-align: bottom;
                     margin-top: 2rpx;
                 }

unpackage/dist/dev/app-plus/app-view.js

@@ -20376,7 +20376,12 @@ var render = function() {
                 "v-uni-scroll-view",
                 {
                   staticClass: _vm._$g(19, "sc"),
-                  attrs: { "scroll-y": "true", _i: 19 }
+                  attrs: { "scroll-y": "true", _i: 19 },
+                  on: {
+                    scrolltolower: function($event) {
+                      return _vm.$handleViewEvent($event)
+                    }
+                  }
                 },
                 [
                   _vm._$g(20, "i")
@@ -20454,7 +20459,12 @@ var render = function() {
                                             ),
                                             attrs: { _i: "29-" + $31 }
                                           },
-                                          [_vm._v("库存量:1222")]
+                                          [
+                                            _vm._v(
+                                              "库存量:" +
+                                                _vm._$g("29-" + $31, "t0-0")
+                                            )
+                                          ]
                                         )
                                       ],
                                       1