|
|
|
@ -197,7 +197,6 @@ export default { |
|
|
|
let nlist = {data:result.data,total:result.count,current_page:pageNo} |
|
|
|
// 合并新数据 |
|
|
|
const newList = app.initList(nlist) |
|
|
|
console.log(newList,"newlist") |
|
|
|
app.list.data = getMoreListData(newList, app.list, pageNo) |
|
|
|
resolve(newList) |
|
|
|
}) |
|
|
|
@ -234,7 +233,6 @@ export default { |
|
|
|
}, |
|
|
|
// 切换标签项 |
|
|
|
onChangeTab(index) { |
|
|
|
console.log(this.list) |
|
|
|
const app = this |
|
|
|
// 设置当前选中的标签 |
|
|
|
app.curTab = index |
|
|
|
@ -271,6 +269,8 @@ export default { |
|
|
|
justify-content: space-between; |
|
|
|
font-size: 26rpx; |
|
|
|
margin-bottom: 20rpx; |
|
|
|
padding-bottom: 20rpx; |
|
|
|
border-bottom: 1rpx #9F9F9F solid; |
|
|
|
|
|
|
|
.order-time { |
|
|
|
color: #777; |
|
|
|
@ -289,7 +289,6 @@ export default { |
|
|
|
display: flex; |
|
|
|
flex-wrap: wrap; |
|
|
|
margin-bottom: 40rpx; |
|
|
|
border-top: 1rpx #777 solid; |
|
|
|
|
|
|
|
// 商品图片 |
|
|
|
.goods-image { |
|
|
|
@ -327,8 +326,9 @@ export default { |
|
|
|
font-weight: bold; |
|
|
|
} |
|
|
|
.twoline-hide-sum{ |
|
|
|
float: right; |
|
|
|
margin-top: 5rpx; |
|
|
|
color: red; |
|
|
|
margin-left: 25%; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@ -342,6 +342,10 @@ export default { |
|
|
|
margin-top: 10rpx; |
|
|
|
flex-basis: 100%; |
|
|
|
color: $uni-text-color-grey; |
|
|
|
|
|
|
|
.goods-props-item { |
|
|
|
margin-top: 10rpx; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|