zs 2 lat temu
rodzic
commit
6685812a7b
2 zmienionych plików z 8 dodań i 17 usunięć
  1. 8 15
      pagesHome/order/detail.vue
  2. 0 2
      pagesHome/order/order.vue

+ 8 - 15
pagesHome/order/detail.vue

@@ -425,21 +425,14 @@
 							}
 						}
 						// 规格排序
-						var temp;
-						for (var i = 0; i < data.specs.length - 1; i++) { //确定轮数
-							for (var j = 0; j < data.specs.length - i - 1; j++) { //确定每次比较的次数
-								let a, b
-								if (data.specs[j].price) a = 'price'
-								else a = 'sell_money'
-								if (data.specs[j + 1].price) b = 'price'
-								else b = 'sell_money'
-								if (data.specs[j][a] > data.specs[j + 1][b]) {
-									temp = data.specs[j];
-									data.specs[j] = data.specs[j + 1];
-									data.specs[j + 1] = temp;
-								}
-							}
-						}
+						data.specs.sort(function(a, b) {
+							let i, j;
+							if (a.price) i = 'price'
+							else i = 'sell_money'
+							if (b.price) j = 'price'
+							else j = 'sell_money'
+							return a[i] - b[j];
+						})
 						that.$set(that, `info`, data);
 						// 优惠
 						let discount;

+ 0 - 2
pagesHome/order/order.vue

@@ -517,8 +517,6 @@
 			}
 
 			.one_2 {
-				margin: 2vw 0 0 0;
-
 				.list {
 					width: 100vw;
 					margin: 2vw 0;