diff --git a/pages/index/downStearmList.vue b/pages/index/downStearmList.vue index f50458a..ef5ed89 100644 --- a/pages/index/downStearmList.vue +++ b/pages/index/downStearmList.vue @@ -26,7 +26,8 @@ - + + @@ -179,7 +180,8 @@ data() { return { indexList: [], - pageNum: 1, //分页的页码 + pages: 1, //分页的页码 + totalPages: 0, shopList: [], info: 0, categoryId: '', //分类id @@ -212,7 +214,8 @@ city: '', area: '', id: '' - }, + }, + status: 'loadmore', rules: { consigneeName: { rules: [{ @@ -244,6 +247,12 @@ }, }, } + }, + onReachBottom() { + if (this.pages >= this.totalPages) return; + this.status = 'loading'; + this.pages = ++this.pages; + this.getShareList(); }, onLoad(options) { this.khid = options.khid; @@ -601,17 +610,23 @@ } }, //点击分类获取商品列表 - getShareList(id) { + getShareList(id) { + this.status = 'loading'; this.tui.request("/app/productShare/getShareList", "POST", { searchStr: this.searchName, id: this.khid, - pageNum: this.pageNum, + pageNum: this.pages, pageSize: '10' - }, false, true).then((res) => { + }, false, true).then((res) => { + this.status = 'nomore'; if (res.code == 200) { - this.shopList = res.result.shareList.records this.priceType = res.result.share.priceType - this.shopId = res.result.shareList.records[0].shopId + this.shopId = res.result.shareList.records[0].shopId + if (this.pages == 1) { + this.shopList = res.result.shareList.records + } else { + this.shopList = [...this.shopList, ...res.result.shareList.records] + } for (var i = 0; i < this.shopList.length; i++) { if (res.result.share.priceType == 1) { //批发价 this.shopList[i].discountAmount = this.shopList[i].wholesalePrice @@ -619,7 +634,7 @@ this.shopList[i].discountAmount = this.shopList[i].price } } - + this.totalPages = res.result.shareList.pages } else { this.tui.toast(res.message) } diff --git a/pages/index/orderDetail.vue b/pages/index/orderDetail.vue index 575de3e..8cdb038 100644 --- a/pages/index/orderDetail.vue +++ b/pages/index/orderDetail.vue @@ -594,7 +594,7 @@ strCmd += blesdk.addCPCLText('50', '890', '24', '0', 0, '地址:' + this.shopData.shopAddress) strCmd += blesdk.addCPCLLocation(0); strCmd += blesdk.addCPCLPrint(); - this.bufferData = strCmd; + this.bufferData.push(strCmd); }, //计算打印机当前行高度 countPrint(){ diff --git a/pages/index/peopleList.vue b/pages/index/peopleList.vue index db05ad0..e6c6840 100644 --- a/pages/index/peopleList.vue +++ b/pages/index/peopleList.vue @@ -24,12 +24,15 @@ {{item.name == '散客'?'-':item.province + item.city + item.area}} - {{item.name == '散客'?'-':item.address}} + {{item.name == '散客'?'-':item.address}} - + + 欠款:{{item.noEarn?item.noEarn :0}} + + 编辑 - + 查看明细 @@ -415,17 +418,18 @@ font-size: 15px; } .name-edit{ - width: 120rpx; - height: 60rpx; + width: 110rpx; + height: 55rpx; position: absolute; right: 35rpx; background: #088FEB; color: #fff; - font-size: 24rpx; - line-height: 60rpx; + font-size: 22rpx; + line-height: 55rpx; text-align: center; border-radius: 5px; - } + } + .standard-box { color: #088FEB; width: 30%;