From ba8ce4451b48b5902a307df075442bf016b5e4ae Mon Sep 17 00:00:00 2001
From: queenwuli <942534046@qq.com>
Date: Mon, 11 Jan 2021 17:06:21 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/jyyforjava/hive-app into master
---
hive-app/pages/workbench/orderList.vue | 214 +++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 167 insertions(+), 47 deletions(-)
diff --git a/hive-app/pages/workbench/orderList.vue b/hive-app/pages/workbench/orderList.vue
index 96857fe..f1784c3 100644
--- a/hive-app/pages/workbench/orderList.vue
+++ b/hive-app/pages/workbench/orderList.vue
@@ -2,11 +2,13 @@
<!-- 订单列表 -->
<view>
<view class="header">
- <search-bar class="mb-0"></search-bar>
+ <search-bar @confirm="search" placeholder="输入会员姓名、手机号、订单号" class="mb-0"></search-bar>
</view>
<view>
<h-tabs
class="tab"
+ :activeIndex="orderStatus"
+ @tabClick="tabChange"
:tabData="tabs"
:config="{
color: '#abb1cc',
@@ -18,30 +20,37 @@
}"
/>
<view class="list">
- <view class="list-item" v-for="item in 4">
- <view class="list-header">
- <text>订单号: N202012123556</text>
- <text class="blue">待付款</text>
- </view>
- <view class="list-content">
- <view class="flex flex-v">
- <text class="font-bold font-16">李某某</text>
- <text class="gray">2020-12-15 18:11:01</text>
+ <view class="list-item" v-for="item in list">
+ <navigator :url="'./orderDetail?orderId='+item.orderId" hover-class="none">
+ <view class="list-header">
+ <text>订单号: {{item.orderNo}}</text>
+ <text :class="caculateColor(item.orderStatus)">{{item.orderStatus}}</text>
</view>
- <view class="flex flex-v">
- <text>应付金额</text>
- <text>实付金额</text>
- <text>欠款总额</text>
+ <view class="list-content">
+ <view class="flex flex-v flex-1">
+ <text class="font-bold font-15">{{item.vipName}}</text>
+ <text class="gray">{{item.orderTime}}</text>
+ </view>
+ <view class="flex justify-between flex-1">
+ <view>
+ <view>应付金额</view>
+ <view>实付金额</view>
+ <view>欠款总额</view>
+ </view>
+ <view class="right">
+ <view>￥ {{item.needPay | formatNum}}</view>
+ <view>￥ {{item.realPay | formatNum}}</view>
+ <view>￥ {{item.arrears | formatNum}}</view>
+ </view>
+ </view>
</view>
- <view class="flex flex-v right">
- <text>￥ 8000.00</text>
- <text>￥ 0.00</text>
- <text>￥ 8000.00</text>
- </view>
+ </navigator>
+ <view class="list-footer" v-if="item.orderStatus!=='已取消' && $utils.hasPermission('ddgl.cancel')">
+ <text class="blue-btn small-btn" @click="cancelOrder(item.orderId)">取消订单</text>
</view>
- <view class="list-footer">
- <text class="blue-btn small-btn">取消订单</text>
- </view>
+ </view>
+ <view v-if="list.length">
+ <uni-load-more :status="loadStatus" color="#a5abaf"></uni-load-more>
</view>
</view>
</view>
@@ -51,32 +60,141 @@
<script>
import HTabs from "@/components/liuyuno-tabs/liuyuno-tabs.vue";
import searchBar from '../../components/searchBar/index.vue';
+ import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
export default {
components: {
HTabs,
- searchBar
+ searchBar,
+ uniLoadMore
},
data() {
- return {
- tabs:[
- {
- state: 1,
- name: '全部'
- },
- {
- state: 2,
- name: '待付款'
- },
- {
- state: 3,
- name: '已付款'
- },
- {
- state: 4,
- name: '欠款'
- },
- ],
- }
+ return {
+ orderStatus: 0,
+ tabs:[
+ {
+ state: 0,
+ name: '全部'
+ },
+ {
+ state: 1,
+ name: '待付款'
+ },
+ {
+ state: 2,
+ name: '已付款'
+ },
+ {
+ state: 3,
+ name: '欠款'
+ },
+ ],
+ list: [],
+ loadStatus: 'more',
+ pageNum: 1
+ }
+ },
+ onLoad(options) {
+ if(options.status){
+ this.orderStatus = Number(options.status);
+ }
+ this.loadList()
+
+ // 判断权限
+ // #ifdef APP-PLUS
+ if(!this.$utils.hasPermission('ddgl.add')){
+ let webView = this.$mp.page.$getAppWebview();
+ webView.setTitleNViewButtonStyle(0, {
+ width: 0,
+ });
+ }
+ // #endif
+ },
+ onPullDownRefresh(){
+ this.reloadData();
+ let timer = setTimeout(function () {
+ uni.startPullDownRefresh();
+ clearTimeout(timer);
+ timer = null;
+ }, 800);
+ },
+ onReachBottom(){
+ this.loadList()
+ },
+ onNavigationBarButtonTap(Object){
+ if(Object.key === 'add'){
+ uni.navigateTo({
+ url: './selectCustomer'
+ })
+ }
+ },
+ methods:{
+ reloadData(){
+ this.list = [];
+ this.pageNum = 1;
+ this.loadStatus = 'more';
+ this.loadList();
+ },
+ loadList(){
+ if(this.loadStatus!=='more'){
+ return;
+ }
+ this.$httpUtils.request('/api/order/findOrderList', {
+ pageNum: this.pageNum,
+ pageSize: 10,
+ queryKey: this.queryKey,
+ orderStatus: this.orderStatus
+ }, 'POST').then((res) => {
+ if(res.status == 200){
+ let result = res.rows;
+ if(result.length < 10){
+ this.loadStatus = 'noMore';
+ } else {
+ this.pageNum ++ ;
+ this.loadStatus = 'more';
+ }
+ this.list = this.list.concat(result);
+ }
+ })
+ },
+ search(val){
+ this.queryKey = val;
+ this.reloadData();
+ },
+ tabChange(index){
+ if(this.orderStatus === index){
+ return;
+ }
+ this.orderStatus = index;
+ this.reloadData();
+ },
+ caculateColor(status){
+ if(status==='待付款'){
+ return 'blue'
+ } else if(status === '已付款'){
+ return 'blueness'
+ } else if(status === '欠款'){
+ return 'red'
+ } else {
+ return 'gray'
+ }
+ },
+ cancelOrder(id){
+ uni.showModal({
+ title: '提示',
+ content: '确定取消订单吗？',
+ success: (res) => {
+ if (res.confirm) {
+ console.log('用户点击确定');
+ this.$httpUtils.request('/api/order/cancelOrder/'+id).then((res) => {
+ if(res.status == 200){
+ this.reloadData()
+ }
+ this.$toast.info(res.info);
+ })
+ }
+ }
+ });
+ }
}
}
</script>
@@ -86,7 +204,7 @@
background: #F6F6F8;
}
.header{
- padding: 10px;
+ padding: 10px 10px 5px;
background: #FFFFFF;
}
.tab{
@@ -98,25 +216,27 @@
border-radius: 4px;
margin: 10px;
color: #3a3f3f;
+ border: 1px solid #EDEAF4;
+ padding: 0 10px;
}
.list-header{
display: flex;
justify-content: space-between;
- padding: 12px 15px;
+ padding: 12px 0;
font-size: 15px;
border-bottom: 1px solid #EDEAF4;
}
.list-content{
display: flex;
justify-content: space-between;
- padding: 12px 15px;
+ padding: 12px 0;
font-size: 14px;
line-height: 28px;
}
.list-footer{
display: flex;
justify-content: flex-end;
- padding: 10px 15px;
+ padding: 10px 0;
border-top: 1px solid #EDEAF4;
}
</style>
--
Gitblit v1.9.1