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

Merge pull request 'nickname 8.14' (#197) from zhy into master

Browse Source 
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/197
This commit is contained in:
hansu 2020-08-14 14:58:19 +08:00
commit 899b93fc4f
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pageE/order/Index.vue
View File

@ -14,7 +14,7 @@
</view> </view>
</view> </view>
<u-empty text="暂无订单" mode="order" color="#000000" v-if="!orderList[index] || !orderList[index].length"></u-empty> <u-empty text="暂无订单" mode="order" color="#000000" v-if="!orderList[index] || !orderList[index].length"></u-empty>
<u-loadmore :status="loadStatus[index]" bgColor="#ECECEC" margin-bottom="20" v-if="current != 4 && (!orderList[index] || orderList[index].length>3)" class="order-loadmore"></u-loadmore> <u-loadmore :status="loadStatus[index]" bgColor="#ECECEC" font-size="14" margin-bottom="20" v-if="current != 4 && (!orderList[index] || orderList[index].length>3)" class="order-loadmore"></u-loadmore>
</scroll-view> </scroll-view>
</swiper-item> </swiper-item>
</swiper> </swiper>

3
pageE/tool/MineHistory.vue
View File

@ -19,7 +19,7 @@
</view> </view>
<u-action-sheet :list="actionList" v-model="showAction" :cancel-btn="true" @click="delHistory" border-radius="20"></u-action-sheet> <u-action-sheet :list="actionList" v-model="showAction" :cancel-btn="true" @click="delHistory" border-radius="20"></u-action-sheet>
<u-empty text="暂无足迹" mode="list" color="#000" v-if="!historyList.length"></u-empty> <u-empty text="暂无足迹" mode="list" color="#000" v-if="!historyList.length"></u-empty>
<u-loadmore :status="loadStatus" bgColor="#ECECEC" margin-bottom="20" v-if="historyList.length > 9"></u-loadmore> <u-loadmore :status="loadStatus" bgColor="#ECECEC" margin-top="20" margin-bottom="20" v-if="historyList.length > pageSize" @loadmore="reachBottom"></u-loadmore>
</scroll-view> </scroll-view>
</view> </view>
</template> </template>
@ -28,6 +28,7 @@
export default { export default {
data() { data() {
return { return {
pageSize: 12,
hid: '', // 选中的商品 id hid: '', // 选中的商品 id
historyList: [], historyList: [],
page: 1, // 默认1 page: 1, // 默认1

4
pages/mine/index.vue
View File

@ -192,14 +192,14 @@ export default {
.info-left { .info-left {
margin-right: 15rpx; margin-right: 15rpx;
.user-nickname { .user-nickname {
width: 100rpx; max-width: 200rpx;
font-size: 30rpx; font-size: 30rpx;
color: rgba(51,51,51,1); color: rgba(51,51,51,1);
margin-bottom: 19rpx; margin-bottom: 19rpx;
} }
.user-medal { .user-medal {
display: flex; display: flex;
// width: 110rpx; width: 110rpx;
// height: 25rpx; // height: 25rpx;
background: linear-gradient(269deg,rgba(175,175,175,1) 0%,rgba(224,224,224,1) 100%); background: linear-gradient(269deg,rgba(175,175,175,1) 0%,rgba(224,224,224,1) 100%);
border-radius: 13rpx; border-radius: 13rpx;