From 678c37e39637dead1c059374a622975b44c54855 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期三, 14 八月 2024 09:02:37 +0800
Subject: [PATCH] update 搜索、统计、供应商的
---
pages/home/components/home-search.vue | 8 ++--
pages/user/user-customer.scss | 1
sub_pages/supplier/order-manage/order-manage-settlement.vue | 12 +++---
pages/user/supplier-user.vue | 54 +++++++++++++++------------
4 files changed, 41 insertions(+), 34 deletions(-)
diff --git a/pages/home/components/home-search.vue b/pages/home/components/home-search.vue
index bd9798a..d953ec8 100644
--- a/pages/home/components/home-search.vue
+++ b/pages/home/components/home-search.vue
@@ -122,16 +122,16 @@
<style lang="scss" scoped>
.history-item-list {
.history-item {
- margin-right: 20rpx;
+ margin-right: 30rpx;
min-width: 100rpx;
padding: 10rpx 20rpx;
- margin-bottom: 20rpx;
+ margin-bottom: 30rpx;
text-align: center;
height: 30rpx;
line-height: 30rpx;
font-size: 28rpx;
- padding-left: 20rpx;
- padding-right: 20rpx;
+ // padding-left: 10rpx;
+ // padding-right: 10rpx;
border: 2rpx solid #e9e9e9;
}
}
diff --git a/pages/user/supplier-user.vue b/pages/user/supplier-user.vue
index cd92ccf..8c2da6b 100644
--- a/pages/user/supplier-user.vue
+++ b/pages/user/supplier-user.vue
@@ -81,48 +81,52 @@
<view class="m-r-a m-r-0 more" @click="goto('/pages/order/order',true)">全部订单
<uni-icons class="" type="right" size="12"></uni-icons>
</view>
- </view>
-
-
-
-
-
-
+ </view>
+
+
+
+
+
+
<view class="flex order-icons-container">
<view class="order-icons" style="position: relative;"
@click="goto('/pages/order/order?status=PENDING',true)">
<image src="../../static/images/customer/order/order-type-1.png" class="order-icon dfk"
style="position: relative;">
- <view class="image-shop-number" v-if="tj_order.pendingCount">{{tj_order.pendingCount||''}}</view>
+ <view class="image-shop-number" v-if="tj_order.pendingCount">{{tj_order.pendingCount||''}}
+ </view>
</image>
<view>待付款</view>
</view>
<view class="order-icons" @click="goto('/pages/order/order?status=SEND',true)">
- <image src="../../static/images/customer/order/order-type-2.png" class="order-icon dfh">
- <view class="image-shop-number" v-if="tj_order.sendCount">{{tj_order.sendCount||''}}</view>
-
+ <image src="../../static/images/customer/order/order-type-2.png" class="order-icon dfh" style="position: relative;">
+ <view class="image-shop-number" v-if="tj_order.sendCount">{{tj_order.sendCount||''}}</view>
+
</image>
<view>待发货</view>
</view>
<view class="order-icons" @click="goto('/pages/order/order?status=RECEIVE',true)">
- <image src="../../static/images/customer/order/order-type-3.png" class="order-icon dsh">
- <view class="image-shop-number" v-if="tj_order.receiveCount">{{tj_order.receiveCount||''}}</view>
-
+ <image src="../../static/images/customer/order/order-type-3.png" class="order-icon dsh" style="position: relative;">
+ <view class="image-shop-number" v-if="tj_order.receiveCount">{{tj_order.receiveCount||''}}
+ </view>
+
</image>
<view>待收货</view>
</view>
<view class="order-icons" @click="goto('/pages/order/order?status=EVALUATE',true)">
- <image src="../../static/images/customer/order/order-type-4.png" class="order-icon dpj">
- <view class="image-shop-number" v-if="tj_order.evaluateCount">{{tj_order.evaluateCount||''}}</view>
-
+ <image src="../../static/images/customer/order/order-type-4.png" class="order-icon dpj" style="position: relative;">
+ <view class="image-shop-number" v-if="tj_order.evaluateCount">{{tj_order.evaluateCount||''}}
+ </view>
+
</image>
<view>待评价</view>
</view>
<view class="order-icons" @click="goto('/pages/order/order-sale/order-sale',true)">
- <image src="../../static/images/customer/order/order-type-5.png" class="order-icon sh">
- <view class="image-shop-number" v-if="tj_order.salesPendingCount">{{tj_order.salesPendingCount||''}}</view>
-
+ <image src="../../static/images/customer/order/order-type-5.png" class="order-icon sh" style="position: relative;">
+ <view class="image-shop-number" v-if="tj_order.salesPendingCount">
+ {{tj_order.salesPendingCount||''}}</view>
+
</image>
<view>售后</view>
</view>
@@ -247,7 +251,7 @@
<uni-icons type="right"></uni-icons>
</view>
</view>
- <!-- v-if="selftype==='customer'" -->
+ <!-- v-if="selftype==='customer'" -->
<view class="user-util m-t-12 flex" @click="clearlogout">
<view class="title">退出登录</view>
<view class="right-icon">
@@ -329,7 +333,7 @@
<!-- #endif -->
<!-- #ifndef PUB_CUSTOMER -->
- <!-- <view class="button-login-out topic-gray" @click="clearlogout">
+ <!-- <view class="button-login-out topic-gray" @click="clearlogout">
退出登录
</view> -->
@@ -352,8 +356,8 @@
inviterName: '',
// StatusBar:0,
tel: '15974805814',
- tj: {},
- tj_order:{},
+ tj: {},
+ tj_order: {},
cacheUserId: '',
// order_pendding_num: 0,
@@ -541,6 +545,8 @@
if (res.code === 0) {
// that.order_pendding_num = res.data || 0
that.tj_order = res.data || {}
+ // this.$forceUpdate()
+ console.log('tj_order', that.tj_order)
}
})
diff --git a/pages/user/user-customer.scss b/pages/user/user-customer.scss
index 8793b8c..f7401ca 100644
--- a/pages/user/user-customer.scss
+++ b/pages/user/user-customer.scss
@@ -30,6 +30,7 @@
font-size: 24rpx;
color: #000000;
line-height: 34rpx;
+ position: relative;
.order-icon{
flex:1;
margin: 0 auto;
diff --git a/sub_pages/supplier/order-manage/order-manage-settlement.vue b/sub_pages/supplier/order-manage/order-manage-settlement.vue
index 17f8344..f1de251 100644
--- a/sub_pages/supplier/order-manage/order-manage-settlement.vue
+++ b/sub_pages/supplier/order-manage/order-manage-settlement.vue
@@ -19,31 +19,31 @@
<view class="flex">
<view class="form-item">
<view class="label">订单数量</view>
- <view class="value">{{item.orderNum}}</view>
+ <view class="value">{{item.orderNum||0}}</view>
</view>
<view class="form-item">
<view class="label">买家数量</view>
- <view class="value">{{item.customerNum}}</view>
+ <view class="value">{{item.customerNum||0}}</view>
</view>
</view>
<view class="flex">
<view class="form-item">
<view class="label">服务费</view>
- <view class="value">{{item.serviceFee}}</view>
+ <view class="value">{{item.serviceFee||0}}</view>
</view>
<view class="form-item">
<view class="label">售后理赔</view>
- <view class="value">{{item.salesFee}}</view>
+ <view class="value">{{item.salesFee||0}}</view>
</view>
</view>
<view class="flex">
<view class="form-item">
<view class="label">质检扣款</view>
- <view class="value">{{item.checkFee}}</view>
+ <view class="value">{{item.checkFee||0}}</view>
</view>
<view class="form-item">
<view class="label">集货站运费</view>
- <view class="value">{{item.stationFee}}</view>
+ <view class="value">{{item.stationFee||0}}</view>
</view>
</view>
</view>
--
Gitblit v1.9.3