diff --git a/components/scroll-list/scroll-list.vue b/components/scroll-list/scroll-list.vue index 261facc..e0540d9 100644 --- a/components/scroll-list/scroll-list.vue +++ b/components/scroll-list/scroll-list.vue @@ -25,7 +25,7 @@ - + {{ emptyText }} diff --git a/pages/add-paper/index.vue b/pages/add-paper/index.vue index 7e56836..3301e1c 100644 --- a/pages/add-paper/index.vue +++ b/pages/add-paper/index.vue @@ -503,7 +503,7 @@ export default { for (let i = 0; i < validateFields.length; i++) { if (this.form[validateFields[i]] === null || this.form[validateFields[i]] === '') { uni.showToast({ - title: '请完善信息', + title: '请完善纸品基础信息', icon: 'none' }) return @@ -513,7 +513,7 @@ export default { for (let z = 0; z < this.skuList.length; z++) { if (this.skuList[z][validatePriceFields[j]] === null || this.skuList[z][validatePriceFields[j]] === '') { uni.showToast({ - title: '请完善信息', + title: '请完善纸品售价信息', icon: 'none' }) return @@ -758,13 +758,13 @@ export default { height: 88rpx; border-radius: 10rpx; line-height: 80rpx; - width: 150px; + width: 270rpx; } .btn-class-upload { height: 88rpx; border-radius: 10rpx; line-height: 80rpx; - width: 200px; + width: 400rpx; } .uploud-btn { display: flex; diff --git a/pages/mall/index.vue b/pages/mall/index.vue index 60d485b..5958898 100644 --- a/pages/mall/index.vue +++ b/pages/mall/index.vue @@ -136,7 +136,7 @@ export default { this.storeInformation = { supplierId: this.$store.state.supplierInfo.supplierId } - this.queryData() + this.downCallback() this.getSupplier(this.$store.state.supplierInfo.supplierId) } }, @@ -251,7 +251,7 @@ export default { }) setTimeout(() => { this.orderPagination.pageNum = 1 - this.queryData() + this.downCallback() }, 500) } }) diff --git a/pages/trade/orderList.vue b/pages/trade/orderList.vue index ba1f789..610f4e2 100644 --- a/pages/trade/orderList.vue +++ b/pages/trade/orderList.vue @@ -25,7 +25,10 @@ - + {{ subItem.productName }} @@ -214,13 +217,13 @@ export default { } .list-info-line { padding-left: 32rpx; - line-height: 70rpx; + // line-height: 70rpx; // width: 750rpx; // height: 88rpx; background: #ffffff; } .list-info-content { - margin-left: 48rpx; + margin-left: 20rpx; } .list-info-title { font-family: PingFangSC-Medium; @@ -229,6 +232,7 @@ export default { letter-spacing: 0; text-align: left; font-weight: 550; + margin-top: 8rpx; } .list-info-text { font-family: PingFangSC-Regular; @@ -236,16 +240,16 @@ export default { color: #888888; letter-spacing: 0; text-align: left; - line-height: 64rpx; + margin-top: 26rpx; font-weight: 400; } .list-image { width: 100rpx; height: 100rpx; - margin-top: 20rpx; } .list-info { display: flex; + padding: 24rpx 0; } .list-bottom-content { // line-height: 70rpx; diff --git a/utils/http/index.js b/utils/http/index.js index a8677b2..a36ccfc 100644 --- a/utils/http/index.js +++ b/utils/http/index.js @@ -92,7 +92,7 @@ const resInterceptor = (response, options) => { if (statusCode >= 200 && statusCode < 300) { if (res.code == 0) { // 将成功的null置位1 - return res.data || 1 + return res.data === null ? 1 : res.data } else { uni.showToast({ title: res.message,