diff --git a/components/mine/order-item/index.vue b/components/mine/order-item/index.vue
index be5d173..0568a76 100644
--- a/components/mine/order-item/index.vue
+++ b/components/mine/order-item/index.vue
@@ -12,9 +12,7 @@
{{ goods.goods_name }}
-
- {{ spec + ';' }}
-
+ {{ goods.goods_spec | concatSpec }}
总价:¥{{ goods.goods_price }},实付款¥{{ goods.goods_pay_price }}
@@ -53,6 +51,18 @@ export default {
mounted() {
this.viewState();
},
+ filters: {
+ concatSpec(value) {
+ let spec = '';
+ for (const key in value) {
+ if (value.hasOwnProperty(key)) {
+ const element = value[key];
+ spec = spec + element + ';'
+ }
+ }
+ return spec;
+ }
+ },
methods: {
viewState() {
let state;
@@ -172,15 +182,16 @@ export default {
margin-right: 30rpx;
}
.goods-text {
- display: flex;
- flex-direction: column;
- justify-content: space-between;
+ // display: flex;
+ // flex-direction: column;
+ // justify-content: space-between;
.goods-name {
font-size: 28rpx;
color: rgba(51,51,51,1);
line-height: 38rpx;
}
.goods-sku {
+ margin-top: 10rpx;
display: inline-block;
max-width: 230rpx;
background: rgba(236,236,236,1);
diff --git a/pageE/tool/MineHistory.vue b/pageE/tool/MineHistory.vue
index 67d100e..46b459e 100644
--- a/pageE/tool/MineHistory.vue
+++ b/pageE/tool/MineHistory.vue
@@ -79,6 +79,7 @@ export default {
})
},
async getBrowseList ({ load = 'reload' } = {}) {
+ if(load == 'reload') this.page = 1;
const res = await this.$u.api.getBrowseList({ page: this.page });
this.timer = true;
if(res.errCode == 0) {
@@ -124,7 +125,7 @@ export default {
background: rgba(255,255,255,1);
border-radius: 10rpx;
padding: 20rpx 20rpx 22rpx;
- margin: 0 10rpx 20rpx 0;
+ margin: 0 11rpx 20rpx 0;
.item-title {
display: flex;
align-items: center;