1

pagesHome/group/order.vue

@@ -154,9 +154,7 @@
 				const res = await that.$api(`/address`, 'GET', {
 					customer: user._id
 				})
-				if (res.errcode == '0') {
-					that.$set(that, `addressList`, res.data.reverse());
-				}
+				if (res.errcode == '0') that.$set(that, `addressList`, res.data.reverse());
 				const arr = await that.$api(`/groupOrder/toOrderPage`, 'POST', {
 					key: that.key
 				}, 'group')

pagesMy/assets/index.vue

@@ -248,7 +248,7 @@
 				const that = this;
 				that.$set(that, `list`, [])
 				that.$set(that, `skip`, 0)
-				that.$set(that, `limit`, 6)
+				that.$set(that, `limit`, 10)
 				that.$set(that, `page`, 0)
 			},
 			// 提现
@@ -318,7 +318,7 @@
 			const that = this;
 			that.$set(that, `list`, [])
 			that.$set(that, `skip`, 0)
-			that.$set(that, `limit`, 6)
+			that.$set(that, `limit`, 10)
 			that.$set(that, `page`, 0)
 			await that.search();
 			uni.stopPullDownRefresh();
@@ -369,7 +369,7 @@
 			.tabsList {
 				position: relative;
 				width: 100vw;
-				height: 82vh;
+				height: 78vh;
 
 				.list {
 					width: 92vw;

pagesMy/dough/handle.vue

@@ -167,9 +167,6 @@
 					for (let val of list) {
 						if (val.status) val.zhStatus = that.searchStatus(val.status)
 					}
-					list.sort(function(a, b) {
-						return a.buy_time < b.buy_time ? 1 : -1;
-					})
 					that.$set(that, `list`, list);
 					that.$set(that, `total`, res.total)
 				} else {
@@ -222,11 +219,8 @@
 			// 输入框
 			toInput(e) {
 				const that = this;
-				if (that.searchInfo.goods) {
-					that.$set(that.searchInfo, `customer`, e.detail.value)
-				} else {
-					that.$set(that, `searchInfo`, {})
-				}
+				if (that.searchInfo.customer) that.$set(that.searchInfo, `customer`, e.detail.value)
+				else that.$set(that, `searchInfo`, {})
 				that.clearPage();
 				that.search();
 			},
@@ -266,7 +260,7 @@
 							} else {
 								if (e.is_afterSale != true) {
 									let arr = await that.$api(`/groupAfterSale`, 'POST', {
-										order_detail: e._id,
+										order: e._id,
 										type: '4'
 									}, 'group')
 									if (arr.errcode == '0') {
@@ -397,7 +391,7 @@
 					success: async function(res) {
 						if (res.confirm) {
 							let arr = await that.$api(`/groupAfterSale`, 'POST', {
-								order_detail: e._id,
+								order: e._id,
 								type: '5'
 							}, 'group')
 							if (arr.errcode == '0') {
@@ -561,7 +555,7 @@
 					text-align: right;
 
 					button {
-						margin: 0 2vw 0 0;
+						margin: 0 1vw 0 0;
 					}
 				}
 			}

pagesMy/dough/index.vue

@@ -374,11 +374,14 @@
 			// 关闭弹框
 			dialogClose() {
 				const that = this;
+				that.clearPage();
+				that.search();
 				that.$set(that, `dialog`, {
 					show: false,
 					type: '1'
 				})
 			},
+			// 查询
 			onSubmit() {
 				const that = this;
 				that.clearPage();
@@ -650,6 +653,7 @@
 					}
 				});
 			},
+			// 团处理
 			toHandle(e) {
 				const that = this;
 				that.clearPage();

pagesMy/dough/info.vue

@@ -145,9 +145,7 @@
 				res = await that.$api(`/dictData`, 'GET', {
 					code: 'order_process'
 				})
-				if (res.errcode == '0') {
-					that.$set(that, `statusList`, res.data);
-				}
+				if (res.errcode == '0') that.$set(that, `statusList`, res.data);
 			},
 		}
 	}

pagesMy/integral/index.vue

@@ -57,7 +57,6 @@
 			that.searchConfig();
 			await that.searchOther();
 			await that.watchLogin();
-
 		},
 		onHide: function() {
 			const that = this;
@@ -70,7 +69,6 @@
 			uni.stopPullDownRefresh();
 		},
 		methods: {
-
 			// 查询基本设置
 			searchConfig() {
 				const that = this;

pagesMy/order/after.vue

@@ -196,9 +196,7 @@
 				res = await that.$api(`/dictData`, 'GET', {
 					code: "afterSale_status"
 				});
-				if (res.errcode == '0') {
-					that.$set(that, `statusList`, res.data)
-				}
+				if (res.errcode == '0') that.$set(that, `statusList`, res.data)
 			},
 			// 分页
 			toPage(e) {
@@ -228,11 +226,8 @@
 			// 输入框
 			toInput(e) {
 				const that = this;
-				if (that.searchInfo.goods) {
-					that.$set(that.searchInfo, `goods`, e.detail.value)
-				} else {
-					that.$set(that, `searchInfo`, {})
-				}
+				if (that.searchInfo.goods) that.$set(that.searchInfo, `goods`, e.detail.value)
+				else that.$set(that, `searchInfo`, {})
 				that.clearPage();
 				that.search();
 			},

pagesMy/order/afterInfo.vue

@@ -106,21 +106,15 @@
 				res = await that.$api(`/dictData`, 'GET', {
 					code: "afterSale_status"
 				});
-				if (res.errcode == '0') {
-					that.$set(that, `statusList`, res.data)
-				}
+				if (res.errcode == '0') that.$set(that, `statusList`, res.data)
 				res = await that.$api(`/dictData`, 'GET', {
 					code: "afterSale_type"
 				});
-				if (res.errcode == '0') {
-					that.$set(that, `typeList`, res.data)
-				}
+				if (res.errcode == '0') that.$set(that, `typeList`, res.data)
 				res = await that.$api(`/dictData`, 'GET', {
 					code: "afterSale_reason"
 				});
-				if (res.errcode == '0') {
-					that.$set(that, `reasonList`, res.data)
-				}
+				if (res.errcode == '0') that.$set(that, `reasonList`, res.data)
 			},
 			// 监听用户是否登录
 			watchLogin() {

pagesMy/order/detail.vue

@@ -108,9 +108,7 @@
 					code: "transport_company",
 					label: e
 				});
-				if (res.errcode == '0') {
-					that.$set(that, `typeList`, res.data);
-				}
+				if (res.errcode == '0') that.$set(that, `typeList`, res.data);
 			}
 		}
 	}

pagesMy/order/index.vue

@@ -283,11 +283,8 @@
 			// 输入框
 			toInput(e) {
 				const that = this;
-				if (that.searchInfo.goods) {
-					that.$set(that.searchInfo, `goods`, e.detail.value)
-				} else {
-					that.$set(that, `searchInfo`, {})
-				}
+				if (that.searchInfo.goods) that.$set(that.searchInfo, `goods`, e.detail.value)
+				else that.$set(that, `searchInfo`, {})
 				that.clearPage();
 				that.search();
 			},
@@ -533,7 +530,6 @@
 				that.$set(that, `page`, 0)
 			}
 		},
-
 	}
 </script>
 

pagesMy/order/info.vue

@@ -242,9 +242,7 @@
 				res = await that.$api(`/dictData`, 'GET', {
 					code: 'order_process'
 				})
-				if (res.errcode == '0') {
-					that.$set(that, `statusList`, res.data);
-				}
+				if (res.errcode == '0') that.$set(that, `statusList`, res.data);
 			},
 		}
 	}

pagesMy/order/service.vue

@@ -385,9 +385,7 @@
 				res = await that.$api(`/dictData`, 'GET', {
 					code: "afterSale_reason"
 				});
-				if (res.errcode == '0') {
-					that.$set(that, `reasonList`, res.data)
-				}
+				if (res.errcode == '0') that.$set(that, `reasonList`, res.data)
 			}
 		}
 	}