Commit 7a0a0df3 authored by Facius's avatar Facius

订单列表页ui修改

parent f9921081
...@@ -185,7 +185,7 @@ ...@@ -185,7 +185,7 @@
}] }]
}, },
buttonDisabled() { buttonDisabled() {
return this.orderData.orderStatus == 4 || this.orderData.orderStatus == 6 return this.orderType == 4 || this.orderType == 6
}, },
dizhiImage() { dizhiImage() {
return process.uniEnv.qn_base_url + 'shouye-dizhi.png' return process.uniEnv.qn_base_url + 'shouye-dizhi.png'
...@@ -267,6 +267,7 @@ ...@@ -267,6 +267,7 @@
align-items: center; align-items: center;
.tag-view { .tag-view {
text-align: center;
width: 84rpx; width: 84rpx;
height: 40rpx; height: 40rpx;
color: #FFFFFF; color: #FFFFFF;
...@@ -287,6 +288,7 @@ ...@@ -287,6 +288,7 @@
} }
.right-view { .right-view {
text-align: center;
width: 100rpx; width: 100rpx;
height: 40rpx; height: 40rpx;
background-color: #F4F5F7; background-color: #F4F5F7;
...@@ -361,6 +363,7 @@ ...@@ -361,6 +363,7 @@
align-items: center; align-items: center;
.bottom-tag-view { .bottom-tag-view {
text-align: center;
width: 52rpx; width: 52rpx;
height: 52rpx; height: 52rpx;
border-radius: 26rpx; 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 @@ ...@@ -14,7 +14,9 @@
{ {
"path": "pages/order/index", "path": "pages/order/index",
"style": { "style": {
"navigationBarTitleText": "订单" "navigationBarTitleText": "订单",
"navigationStyle": "custom",
"enablePullDownRefresh": true
} }
}, },
{ {
...@@ -207,7 +209,7 @@ ...@@ -207,7 +209,7 @@
"navigationBarTextStyle": "black", "navigationBarTextStyle": "black",
"navigationBarTitleText": "uni-app", "navigationBarTitleText": "uni-app",
"navigationBarBackgroundColor": "#F8F8F8", "navigationBarBackgroundColor": "#F8F8F8",
"backgroundColor": "#F8F8F8" "backgroundColor": "#F4F5F7"
}, },
"tabBar": { "tabBar": {
"color": "#7A7E83", "color": "#7A7E83",
......
<template> <template>
<view class="content"> <TabBarPage title="充电桩自营平台">
<!-- <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> -->
<image class="banner-image" :src="bannerImage"></image> <image class="banner-image" :src="bannerImage"></image>
<view class="msg-view"> <view class="msg-view">
...@@ -66,23 +52,24 @@ ...@@ -66,23 +52,24 @@
</view> </view>
<!-- </view> --> <!-- </view> -->
<!-- </scroll-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-line-view"></view>
<view class="bottom-text">我也是有底线哒</view> <view class="bottom-text">我也是有底线哒</view>
<view class="bottom-line-view"></view> <view class="bottom-line-view"></view>
</view> </view>
</view> </TabBarPage>
</template> </template>
<script> <script>
import util from "@/utils/util.js"; import util from "@/utils/util.js";
import TabBarPage from "@/components/tabBarList/index.vue"
const app = getApp(); const app = getApp();
import OrderCell from "@/components/order/index.vue"; import OrderCell from "@/components/order/index.vue";
export default { export default {
components: { components: {
OrderCell, OrderCell,
TabBarPage
}, },
data() { data() {
return { return {
...@@ -102,12 +89,13 @@ ...@@ -102,12 +89,13 @@
pageNumber: 0, pageNumber: 0,
pageSize: 10, pageSize: 10,
}, },
bottomLoading: false, bottomLoading: false
}; };
}, },
watch: { watch: {
vuex_token(val) { vuex_token(val, oldVal) {
// 监听token变化,如果更新则重新加载页面数据 // 监听token变化,如果更新则重新加载页面数据
console.log('', val, oldVal)
val && this.initSettleInfo() val && this.initSettleInfo()
} }
}, },
...@@ -142,10 +130,11 @@ ...@@ -142,10 +130,11 @@
// 每次进入页面都刷新入驻状态 // 每次进入页面都刷新入驻状态
if (this.vuex_token) { if (this.vuex_token) {
this.initSettleInfo(); this.initSettleInfo();
} else {
// 初始化订单数据
this.loadOrderList();
} }
// else {
// // 初始化订单数据
// this.loadOrderList();
// }
}, },
onPullDownRefresh() { onPullDownRefresh() {
console.log('------下拉刷新------') console.log('------下拉刷新------')
...@@ -194,6 +183,8 @@ ...@@ -194,6 +183,8 @@
}); });
}, },
loadOrderList() { loadOrderList() {
console.log('-----------准备加载推荐列表-----------')
return
let self = this; let self = this;
// 加载订单列表 // 加载订单列表
self.search.token = self.vuex_token; self.search.token = self.vuex_token;
...@@ -208,21 +199,6 @@ ...@@ -208,21 +199,6 @@
} }
}); });
}, },
onRefresh() {
if (this._freshing) return;
this._freshing = true;
// 获取入驻状态
this.initSettleInfo();
// 获取推荐订单及数量
// ....
setTimeout(() => {
// 数据加载完成更新入驻状态和推荐列表
this.triggered = false;
this._freshing = false;
}, 1000);
},
onRestore() { onRestore() {
this.triggered = "restore"; this.triggered = "restore";
}, },
...@@ -294,18 +270,6 @@ ...@@ -294,18 +270,6 @@
</script> </script>
<style lang="scss" scoped> <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;
}
.banner-image { .banner-image {
width: 730rpx; width: 730rpx;
height: 280rpx; height: 280rpx;
...@@ -368,7 +332,7 @@ ...@@ -368,7 +332,7 @@
} }
} }
} }
}
.logo { .logo {
height: 200 rpx; height: 200 rpx;
......
This diff is collapsed.
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
mode="aspectFill" mode="aspectFill"
v-for="(src, key) in fileItem.placeholderImages" v-for="(src, key) in fileItem.placeholderImages"
:src="fileItem.imgs.length > key ? fileItem.imgs[key] : src" :src="fileItem.imgs.length > key ? fileItem.imgs[key] : src"
:key="src + key" :key="key"
@click="handleClick(fileItem, index, key)" @click="handleClick(fileItem, index, key)"
></image> ></image>
</view> </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