theluyuan/deming
2
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixing bug 8.11

Browse Source
This commit is contained in:
ghusermoon
2020-08-11 10:23:04 +08:00
parent 6e900dcd3b
commit c01470b52d
13 changed files with 47 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pages/index/index.vue
View File

@@ -27,11 +27,11 @@
<view class="list">
<view>
<videoItem v-for="(item,id) in articleList.filter((_, index) => !(index&1))" :key="id" :item="item"
@updateList="updateList"></videoItem>
@getArticlelist="getArticlelist"></videoItem>
</view>
<view style="margin-left:20rpx">
<videoItem v-for="(item,id) in articleList.filter((_, index) => index&1)" :key="id" :item="item"
@updateList="updateList"></videoItem>
@getArticlelist="getArticlelist"></videoItem>
</view>
</view>
<u-loadmore class="load-size" color="#999999" :status="status" icon-type="iconType" margin-top="50" margin-bottom="50" :load-text="loadText" />
@@ -103,9 +103,6 @@
display: flex;
flex-direction: column;
height: 100vh;
/* #ifdef APP-PLUS */
padding-bottom: 100rpx;
/* #endif */
overflow: hidden;
.top {
@@ -413,12 +410,6 @@
}
})
},
// 屏蔽更新列表
updateList() {
console.log(111);
this.page = 0;
this.getArticlelist();
},
// 发现下拉加载
swiperBottom(e) {
this.getArticlelist();

37
pages/mine/index.vue
View File

@@ -46,7 +46,7 @@
<view class="title">
<view class="title-text">我的订单</view>
<view class="more" @click="toOtherPage('/order/Index')">
<view class="title-text-more">查看全部订单</view>
<view class="title-text">查看全部订单</view>
<image src="/static/image/mine/21.png"></image>
</view>
</view>
@@ -71,14 +71,14 @@
<image src="/static/image/mine/37.png"></image>
<view>拼团中</view>
</view>
<view @click="toOtherPage('/order/Index?current=7')">
<image src="/static/image/mine/3.png"></image>
<view>待评价</view>
</view>
<view @click="toOtherPage('/order/Index?current=6')">
<image src="/static/image/mine/9.png"></image>
<view>售后</view>
</view>
<view @click="toOtherPage('/order/Index?current=7')">
<image src="/static/image/mine/3.png"></image>
<view>待评价</view>
</view>
</view>
</view>
<view class="tool">
@@ -250,9 +250,8 @@ export default {
> view {
margin-right: 80rpx;
text-align: center;
font-size: 26rpx;
font-weight: 500;
color: #333;
font-size: 24rpx;
color:rgba(51,51,51,1);
> view:first-child {
margin-bottom: 10rpx;
}
@@ -276,7 +275,7 @@ export default {
.title {
height: 76rpx;
font-size: 28rpx;
color: #666;
color: rgba(51,51,51,1);
position: relative;
display: flex;
align-items: center;
@@ -291,10 +290,6 @@ export default {
transform: translate(-50%,0);
}
}
.title-text-more {
font-size: 24rpx;
color: #999;
}
.content {
padding: $content-padding-top 0 $content-padding-bottom;
display: flex;
@@ -335,7 +330,6 @@ export default {
}
.content {
justify-content: space-between;
align-items: center;
> view {
display: flex;
flex-direction: column;
@@ -343,25 +337,22 @@ export default {
justify-content: space-between;
}
> view:nth-child(1){
@include image-size($image-width: 36rpx, $image-height: 34rpx);
@include image-size($image-width: 33rpx, $image-height: 36rpx);
}
> view:nth-child(2){
@include image-size($image-width: 38rpx, $image-height: 36rpx);
@include image-size($image-width: 38rpx, $image-height: 32rpx);
}
> view:nth-child(3){
@include image-size($image-width: 40rpx, $image-height: 36rpx);
@include image-size($image-width: 41rpx, $image-height: 33rpx);
}
> view:nth-child(4){
@include image-size($image-width: 38rpx, $image-height: 38rpx);
@include image-size($image-width: 40rpx, $image-height: 35rpx);
}
> view:nth-child(5){
@include image-size($image-width: 36rpx, $image-height: 40rpx);
@include image-size($image-width: 37rpx, $image-height: 37rpx);
}
> view:nth-child(6){
@include image-size($image-width: 40rpx, $image-height: 40rpx);
}
> view:nth-child(7){
@include image-size($image-width: 40rpx, $image-height: 40rpx);
@include image-size($image-width: 33rpx, $image-height: 35rpx);
}
}
}