Commit 7a0a0df3 authored by Facius's avatar Facius

订单列表页ui修改

parent f9921081
......@@ -185,7 +185,7 @@
}]
},
buttonDisabled() {
return this.orderData.orderStatus == 4 || this.orderData.orderStatus == 6
return this.orderType == 4 || this.orderType == 6
},
dizhiImage() {
return process.uniEnv.qn_base_url + 'shouye-dizhi.png'
......@@ -266,7 +266,8 @@
display: flex;
align-items: center;
.tag-view {
.tag-view {
text-align: center;
width: 84rpx;
height: 40rpx;
color: #FFFFFF;
......@@ -286,7 +287,8 @@
}
}
.right-view {
.right-view {
text-align: center;
width: 100rpx;
height: 40rpx;
background-color: #F4F5F7;
......@@ -360,7 +362,8 @@
display: flex;
align-items: center;
.bottom-tag-view {
.bottom-tag-view {
text-align: center;
width: 52rpx;
height: 52rpx;
border-radius: 26rpx;
......
<template>
<view class="content">
<u-navbar :is-back="false" :is-fixed="false" :background="{ background: 'transparent' }" :border-bottom="false">
<text class="title-view">{{title}}</text>
</u-navbar>
<slot></slot>
</view>
</template>
<script>
export default {
props: {
title: {
type: String,
default: '充电桩自营平台'
}
},
data() {
return {
}
},
methods: {
}
}
</script>
<style lang="scss" scoped>
.content {
height: 100vh;
background-color: #f4f5f7;
padding: 0rpx 30rpx 0 30rpx;
overflow-y: auto;
.title-view {
color: #333333;
font-weight: bold;
font-size: 40rpx;
}
}
</style>
......@@ -14,7 +14,9 @@
{
"path": "pages/order/index",
"style": {
"navigationBarTitleText": "订单"
"navigationBarTitleText": "订单",
"navigationStyle": "custom",
"enablePullDownRefresh": true
}
},
{
......@@ -201,13 +203,13 @@
"navigationStyle": "custom"// 隐藏系统导航栏
}
}
}
],
"globalStyle": {
"navigationBarTextStyle": "black",
"navigationBarTitleText": "uni-app",
"navigationBarBackgroundColor": "#F8F8F8",
"backgroundColor": "#F8F8F8"
"backgroundColor": "#F4F5F7"
},
"tabBar": {
"color": "#7A7E83",
......
<template>
<view class="content">
<!-- <view style="width: 700rpx; height: 800rpx"> -->
<!-- <view class="title-view">充电桩自营平台</view> -->
<u-navbar :is-back="false" :is-fixed="false" :background="{ background: 'transparent' }" :border-bottom="false">
<text class="title-view">充电桩自营平台</text>
</u-navbar>
<!-- <u-swiper
:height="240"
:list="list"
:indicator-pos="indicatorPos"
:mode="mode"
:interval="3000"
@click="clickSwiper"
>
</u-swiper> -->
<TabBarPage title="充电桩自营平台">
<image class="banner-image" :src="bannerImage"></image>
<view class="msg-view">
......@@ -66,23 +52,24 @@
</view>
<!-- </view> -->
<!-- </scroll-view> -->
<view class="bottom-view">
<view class="bottom-view" v-if="needSettled || orderList.length <= 0">
<view class="bottom-line-view"></view>
<view class="bottom-text">我也是有底线哒</view>
<view class="bottom-line-view"></view>
</view>
</view>
</TabBarPage>
</template>
<script>
import util from "@/utils/util.js";
import TabBarPage from "@/components/tabBarList/index.vue"
const app = getApp();
import OrderCell from "@/components/order/index.vue";
export default {
components: {
OrderCell,
TabBarPage
},
data() {
return {
......@@ -102,12 +89,13 @@
pageNumber: 0,
pageSize: 10,
},
bottomLoading: false,
bottomLoading: false
};
},
watch: {
vuex_token(val) {
// 监听token变化,如果更新则重新加载页面数据
vuex_token(val, oldVal) {
// 监听token变化,如果更新则重新加载页面数据
console.log('', val, oldVal)
val && this.initSettleInfo()
}
},
......@@ -142,10 +130,11 @@
// 每次进入页面都刷新入驻状态
if (this.vuex_token) {
this.initSettleInfo();
} else {
// 初始化订单数据
this.loadOrderList();
}
// else {
// // 初始化订单数据
// this.loadOrderList();
// }
},
onPullDownRefresh() {
console.log('------下拉刷新------')
......@@ -194,6 +183,8 @@
});
},
loadOrderList() {
console.log('-----------准备加载推荐列表-----------')
return
let self = this;
// 加载订单列表
self.search.token = self.vuex_token;
......@@ -208,21 +199,6 @@
}
});
},
onRefresh() {
if (this._freshing) return;
this._freshing = true;
// 获取入驻状态
this.initSettleInfo();
// 获取推荐订单及数量
// ....
setTimeout(() => {
// 数据加载完成更新入驻状态和推荐列表
this.triggered = false;
this._freshing = false;
}, 1000);
},
onRestore() {
this.triggered = "restore";
},
......@@ -294,82 +270,70 @@
</script>
<style lang="scss" scoped>
.content {
height: 100vh;
background-color: #f4f5f7;
padding: 0rpx 30rpx 0 30rpx;
overflow-y: auto;
.banner-image {
width: 730rpx;
height: 280rpx;
margin-left: -14rpx;
}
.title-view {
.msg-view {
.msg-title {
color: #333333;
font-size: 32rpx;
font-weight: bold;
font-size: 40rpx;
padding: 1rpx 0rpx 30rpx 0rpx;
}
.banner-image {
width: 730rpx;
height: 280rpx;
margin-left: -14rpx;
.msg-list-view {
border-radius: 12rpx;
background-color: #ffffff;
padding: 12rpx 30rpx;
height: 252rpx;
}
.msg-view {
.msg-title {
color: #333333;
font-size: 32rpx;
font-weight: bold;
padding: 1rpx 0rpx 30rpx 0rpx;
}
.msg-list-view {
border-radius: 12rpx;
background-color: #ffffff;
padding: 12rpx 30rpx;
height: 252rpx;
}
.msg-content {
color: #333333;
font-size: 26rpx;
.msg-content {
color: #333333;
font-size: 26rpx;
.msg-content-view {
display: flex;
align-items: center;
justify-content: space-between;
margin-top: 20rpx;
margin-bottom: 20rpx;
.msg-content-view {
.left-view {
display: flex;
align-items: center;
justify-content: space-between;
margin-top: 20rpx;
margin-bottom: 20rpx;
.left-view {
display: flex;
align-items: center;
.msg-icon {
width: 80rpx;
height: 36rpx;
margin-right: 20rpx;
}
.msg-text {
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
width: 448rpx;
}
.msg-icon {
width: 80rpx;
height: 36rpx;
margin-right: 20rpx;
}
.right-icon {
width: 14rpx;
height: 24rpx;
.msg-text {
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
width: 448rpx;
}
}
.line-view {
height: 2rpx;
background-color: #f4f5f7;
.right-icon {
width: 14rpx;
height: 24rpx;
}
}
.line-view {
height: 2rpx;
background-color: #f4f5f7;
}
}
}
.logo {
height: 200 rpx;
width: 100%;
......@@ -452,7 +416,7 @@
font-size: 28rpx;
padding: 30rpx;
background-color: #ffffff;
border-radius: 12rpx;
border-radius: 12rpx;
min-height: 460rpx;
.no-order-image {
......
This diff is collapsed.
......@@ -18,7 +18,7 @@
mode="aspectFill"
v-for="(src, key) in fileItem.placeholderImages"
:src="fileItem.imgs.length > key ? fileItem.imgs[key] : src"
:key="src + key"
:key="key"
@click="handleClick(fileItem, index, key)"
></image>
</view>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment