diff --git a/mixins/loadList.js b/mixins/loadList.js
index 6b206a7..a2f0c81 100644
--- a/mixins/loadList.js
+++ b/mixins/loadList.js
@@ -31,24 +31,29 @@ export default {
}
},
onPullDownRefresh() {
+ this.refreshList()
},
onReachBottom() {
+ this.loadMore()
},
- onShow() {
+ onLoad() {
+ this.refreshList()
},
methods: {
// 刷新列表
refreshList() {
- this.pageNo = 1;
+ this.queryParams.pageNo = 1;
this.hasMore = true;
- this.orderList = [];
+ this.List = [];
this.loadList();
},
// 加载更多
loadMore() {
+ console.log(this.hasMore , this.loading);
+
if (!this.hasMore || this.loading) return;
- this.pageNo++;
+ this.queryParams.pageNo++;
this.loadList();
},
@@ -67,8 +72,7 @@ export default {
};
- this.$api(this.mixinsListApi, query(this, params))
- .then(res => {
+ this.$api(this.mixinsListApi, query(this, params), res => {
this.loading = false;
uni.stopPullDownRefresh();
@@ -88,7 +92,7 @@ export default {
}
// 判断是否还有更多数据
- this.hasMore = newList.length >= this.pageSize;
+ this.hasMore = newList.length >= this.queryParams.pageSize;
} else {
uni.showToast({
title: res.message || '加载失败',
diff --git a/pages/index/order.vue b/pages/index/order.vue
index 743ff67..00709b2 100644
--- a/pages/index/order.vue
+++ b/pages/index/order.vue
@@ -171,13 +171,14 @@ export default {
margin: 20rpx;
box-sizing: border-box;
border-radius: 16rpx;
- padding: 30rpx;
+ padding: 30rpx 0;
.top {
display: flex;
justify-content: space-between;
align-items: center;
font-size: 30rpx;
+ padding: 10rpx 30rpx;
.service {}
@@ -190,7 +191,7 @@ export default {
.content {
display: flex;
- margin: 10rpx 0;
+ padding: 10rpx 30rpx;
.left {
width: 150rpx;
@@ -233,11 +234,15 @@ export default {
border: 1px solid #777;
color: #777;
box-sizing: border-box;
+ flex-shrink: 0;
+ height: fit-content;
}
.b2 {
background: linear-gradient(178deg, $uni-color, #d34f4f);
color: #fff;
+ flex-shrink: 0;
+ height: fit-content;
}
view {
diff --git a/pages_order/order/createOrder.vue b/pages_order/order/createOrder.vue
index 68cfd86..25743b3 100644
--- a/pages_order/order/createOrder.vue
+++ b/pages_order/order/createOrder.vue
@@ -73,7 +73,9 @@
-
@@ -553,7 +555,7 @@
&::v-deep .uv-number-box__input {
color: $uni-color !important;
- width: 100rpx !important;
+ width: 200rpx !important;
}
}
diff --git a/pages_order/order/firmOrder.vue b/pages_order/order/firmOrder.vue
index 82d7e4e..a307017 100644
--- a/pages_order/order/firmOrder.vue
+++ b/pages_order/order/firmOrder.vue
@@ -42,7 +42,10 @@
元/{{info.unit || ''}}
-
+
@@ -263,7 +266,7 @@
// 提交订单
submitOrder(skipAddressCheck = false) {
- if (!skipAddressCheck && this.addressTotal === 0) {
+ if (!this.address.id) {
const addressForm = this.$refs.addressForm;
// 验证地址表单
const isValid = addressForm.parameterVerification(addressForm.addressDetail);
diff --git a/uni_modules/uv-number-box/components/uv-number-box/props.js b/uni_modules/uv-number-box/components/uv-number-box/props.js
index 6d7e886..c86effb 100644
--- a/uni_modules/uv-number-box/components/uv-number-box/props.js
+++ b/uni_modules/uv-number-box/components/uv-number-box/props.js
@@ -51,7 +51,7 @@ export default {
// 输入框宽度,单位为px
inputWidth: {
type: [String, Number],
- default: 35
+ default: 80
},
// 是否显示减少按钮
showMinus: {