Browse Source
fix: 修复订单状态显示及金额积分显示问题
- 修正订单状态显示逻辑，将状态1改为"已付款"，状态2改为"确认收货" - 统一用户金额和积分显示字段，将price改为money - 修复购物车商品ID字段从id改为cartId - 添加快捷订单详情查询接口 - 修正拼写错误"搜素"为"搜索" - 优化提现页面提示信息，将"金额"改为"积分" - 调整QuickOrderEntry组件默认位置从30vh改为33vh - 添加分享ID存储功能 - 修复分类页面城市ID查询条件 - 新增loadList混入用于列表加载通用逻辑master
17 changed files with 202 additions and 69 deletions
Unified View
Diff Options
-
+5 -0api/model/index.js
-
+4 -2components/QuickOrderEntry.vue
-
+1 -1components/userShop/userShopCommission.vue
-
+1 -1config.js
-
+103 -0mixins/loadList.js
-
+1 -1pages/index/cart.vue
-
+1 -1pages/index/category.vue
-
+4 -4pages/index/center.vue
-
+4 -1pages/index/index.vue
-
+9 -3pages/index/order.vue
-
+2 -1pages_order/mine/individualTeam.vue
-
+23 -23pages_order/mine/purse.vue
-
+1 -1pages_order/order/createOrder.vue
-
+18 -22pages_order/order/fastOrderList.vue
-
+20 -6pages_order/order/firmOrder.vue
-
+4 -1pages_order/order/orderDetail.vue
-
+1 -1pages_order/product/productList.vue
+ 5
- 0
api/model/index.js
View File
+ 4
- 2
components/QuickOrderEntry.vue
View File
+ 1
- 1
components/userShop/userShopCommission.vue
View File
+ 1
- 1
config.js
View File
+ 103
- 0
mixins/loadList.js
View File
| @ -0,0 +1,103 @@ | |||||
| function query(self, queryParams){ | |||||
| // return (self.beforeGetData && self.beforeGetData()) || | |||||
| // queryParams || self.queryParams | |||||
| // 深度合并对象 | |||||
| return self.$utils.deepMergeObject( | |||||
| self.$utils.deepMergeObject(self.queryParams, | |||||
| (self.beforeGetData && self.beforeGetData()) || {}), | |||||
| queryParams) | |||||
| } | |||||
| export default { | |||||
| data() { | |||||
| return { | |||||
| queryParams: { | |||||
| pageNo: 1, | |||||
| pageSize: 10, | |||||
| }, | |||||
| total : 0, | |||||
| List : [], | |||||
| hasMore: true, // 是否还有更多数据 | |||||
| loading: false, // 是否正在加载 | |||||
| } | |||||
| }, | |||||
| onPullDownRefresh() { | |||||
| }, | |||||
| onReachBottom() { | |||||
| }, | |||||
| onShow() { | |||||
| }, | |||||
| methods: { | |||||
| // 刷新列表 | |||||
| refreshList() { | |||||
| this.pageNo = 1; | |||||
| this.hasMore = true; | |||||
| this.orderList = []; | |||||
| this.loadList(); | |||||
| }, | |||||
| // 加载更多 | |||||
| loadMore() { | |||||
| if (!this.hasMore || this.loading) return; | |||||
| this.pageNo++; | |||||
| this.loadList(); | |||||
| }, | |||||
| // 加载订单列表 | |||||
| loadList() { | |||||
| return new Promise((success, error) => { | |||||
| if(!this.mixinsListApi){ | |||||
| return console.error('mixinsListApi 缺失'); | |||||
| } | |||||
| if (this.loading) return; | |||||
| this.loading = true; | |||||
| const params = { | |||||
| ...this.queryParams, | |||||
| }; | |||||
| this.$api(this.mixinsListApi, query(this, params)) | |||||
| .then(res => { | |||||
| this.loading = false; | |||||
| uni.stopPullDownRefresh(); | |||||
| if (res.code === 200 && res.result) { | |||||
| this.getDataThen && this.getDataThen(res.result.records, res.result.total, res.result) | |||||
| success(res.result) | |||||
| const newList = res.result.records || []; | |||||
| this.total = res.result.total | |||||
| if (this.pageNo === 1) { | |||||
| this.List = newList; | |||||
| } else { | |||||
| this.List = [...this.List, ...newList]; | |||||
| } | |||||
| // 判断是否还有更多数据 | |||||
| this.hasMore = newList.length >= this.pageSize; | |||||
| } else { | |||||
| uni.showToast({ | |||||
| title: res.message || '加载失败', | |||||
| icon: 'none' | |||||
| }); | |||||
| error(res) | |||||
| } | |||||
| }) | |||||
| }) | |||||
| }, | |||||
| } | |||||
| } | |||||