diff --git a/components/products/products.vue b/components/products/products.vue
index 68eca9c..372e49f 100644
--- a/components/products/products.vue
+++ b/components/products/products.vue
@@ -41,28 +41,41 @@
imgUrl: '',
tagsArray: [],
productList: [],
+ pageNum: 1, // 当前页
+ pageSize: 4, // 每页条数
}
},
created() {
this.getProducts()
this.imgUrl = uni.getStorageSync('img_url')
+
},
methods: {
//获取产品列表
getProducts() {
- // console.log("子组件的获取产品列表方法====");
- this.$apiServe.getProducts().then(res => {
- // console.log(res.data.data)
+ this.$apiServe.getProducts({
+ pageSize: this.pageSize,
+ pageNum: this.pageNum
+ }).then(res => {
+
let tags = res.data.data
for (const item of tags) {
let tag = item.tags
this.tagsArray = tag.split(',')
item.tags = this.tagsArray[0]
}
- this.productList = res.data.data
- }).finally(_ => {})
+ // if (res.data.data.length == 0) {
+ // requestTask.abort()
+ // }
+ console.log(res);
+ // 为数据赋值:通过展开运算符的形式,进行新旧数据的拼接
+ this.productList = [...this.productList, ...res.data.data]
+
+ }).finally(_ => {
+
+ })
},
//点击图片跳转到详情页
toDetailPage(item) {
diff --git a/packageReport/certifiedCjDetail/certifiedCjDetail.vue b/packageReport/certifiedCjDetail/certifiedCjDetail.vue
index 2ca5d7c..3019065 100644
--- a/packageReport/certifiedCjDetail/certifiedCjDetail.vue
+++ b/packageReport/certifiedCjDetail/certifiedCjDetail.vue
@@ -64,7 +64,6 @@
getCertifiedCjDetail() {
this.$apiServe.getCertifiedCjDetail(this.id).then(res => {
console.log('认证厂家详情页', res)
-
// this.detailList = res.data.data
}).finally(_ => {})
},
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 44624bd..cf9b3f6 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -61,19 +61,18 @@
swiperList: [],
}
},
- onPullDownRefresh() {
- // this.$refs.getProducts.query.pageNum = 1
- // this.$refs.getProducts.productList = []
-
+ onReachBottom() {
+ // console.log('pageNum===', this.$refs.getProducts);
+ this.$refs.getProducts.pageNum += 1
this.$refs.getProducts.getProducts()
+
//关闭下拉刷新
- uni.stopPullDownRefresh()
+ // uni.stopPullDownRefresh()
},
onLoad() {
this.getCategories()
this.getBanner()
this.getImgUrl()
- // this.$refs.getProducts.getProducts()
this.imgUrl = uni.getStorageSync('img_url')
},
diff --git a/pages/my/login/login.vue b/pages/my/login/login.vue
index 976e127..9ccaf5d 100644
--- a/pages/my/login/login.vue
+++ b/pages/my/login/login.vue
@@ -1,56 +1,56 @@
-
-
- 获取电话号码
-
+
+
+ 获取电话号码
+
\ No newline at end of file
+
diff --git a/service/request.js b/service/request.js
index 22c98d9..5cb1159 100644
--- a/service/request.js
+++ b/service/request.js
@@ -1,4 +1,3 @@
-
const serverHost = 'https://pupil.hchyun.com/api' // https://api-ugo-web.itheima.net'
function isOutTime(res) {
if (res.data.message === '请先登录') {
@@ -190,10 +189,10 @@ const apiService = {
})
},
// 获取产品列表
- getProducts() {
- const url = `/home/product?sortType=1&pageSize=4&pageNum=1`
+ getProducts(data) {
+ const url = `/home/product?sortType=1`
return new Promise((resolve, reject) => {
- resolve(service.get(url))
+ resolve(service.get(url, data))
})
},
// 获取产品详情
@@ -231,76 +230,78 @@ const apiService = {
resolve(service.get(url, id))
})
},
- login: data => {
- data = Object.assign(data || {}, {})
- const url = `/api`
- return new Promise((resolve, reject) => {
- resolve(service.post(url, data, true))
- })
- },
+ login: data => {
+ data = Object.assign(data || {}, {})
+ const url = `/api`
+ return new Promise((resolve, reject) => {
+ resolve(service.post(url, data, true))
+ })
+ },
// 获取首页分类Tag
- getTags(data) {
- const url = `/home/tags`
- return new Promise((resolve, reject) => {
- resolve(service.get(url, data))
- })
- },
+ getTags(data) {
+ const url = `/home/tags`
+ return new Promise((resolve, reject) => {
+ resolve(service.get(url, data))
+ })
+ },
// 获取首页分类
- getCategories(data) {
- const url = `/home/classlist`
- return new Promise((resolve, reject) => {
- resolve(service.get(url, data))
- })
- },
- // 搜索发现 热搜
- getDiscover() {
- const url = `/home/discover`
- return new Promise((resolve, reject) => {
- resolve(service.get(url))
- })
- },
- // 搜索产品
- getProductList(data) {
- const url = `/home/product`
- return new Promise((resolve, reject) => {
- resolve(service.get(url, data))
- })
- },
- // 图片基本地址
- getImgUrl() {
- const url = `/center/cfg?key=img_url`
- return new Promise((resolve, reject) => {
- resolve(service.get(url))
- })
- },
- // 新增
- addOutboundOrder(data) {
- const url = `/api`
- return new Promise((resolve, reject) => {
- resolve(service.post(url, data))
- })
- },
- // 提交
- deliveryOrderConfirm(data) {
- const url = `/api`
- return new Promise((resolve, reject) => {
- resolve(service.post(url, data))
- })
- },
- // 解密
- decrypt(data) {
- const url = `/api`
- return new Promise((resolve, reject) => {
- resolve(service.post(url, { data }))
- })
- },
- // 国密sm4加密
- sm4Encrypt(data) {
- const url = `/api`
- return new Promise((resolve, reject) => {
- resolve(service.sm(url, data))
- })
- }
+ getCategories(data) {
+ const url = `/home/classlist`
+ return new Promise((resolve, reject) => {
+ resolve(service.get(url, data))
+ })
+ },
+ // 搜索发现 热搜
+ getDiscover() {
+ const url = `/home/discover`
+ return new Promise((resolve, reject) => {
+ resolve(service.get(url))
+ })
+ },
+ // 搜索产品
+ getProductList(data) {
+ const url = `/home/product`
+ return new Promise((resolve, reject) => {
+ resolve(service.get(url, data))
+ })
+ },
+ // 图片基本地址
+ getImgUrl() {
+ const url = `/center/cfg?key=img_url`
+ return new Promise((resolve, reject) => {
+ resolve(service.get(url))
+ })
+ },
+ // 新增
+ addOutboundOrder(data) {
+ const url = `/api`
+ return new Promise((resolve, reject) => {
+ resolve(service.post(url, data))
+ })
+ },
+ // 提交
+ deliveryOrderConfirm(data) {
+ const url = `/api`
+ return new Promise((resolve, reject) => {
+ resolve(service.post(url, data))
+ })
+ },
+ // 解密
+ decrypt(data) {
+ const url = `/api`
+ return new Promise((resolve, reject) => {
+ resolve(service.post(url, {
+ data
+ }))
+ })
+ },
+ // 国密sm4加密
+ sm4Encrypt(data) {
+ const url = `/api`
+ return new Promise((resolve, reject) => {
+ resolve(service.sm(url, data))
+ })
+ }
}
export {
apiService,