From 6d54fb64df667c0c396fc7d74aeed9e096d95f95 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期三, 11 九月 2024 10:36:50 +0800
Subject: [PATCH] Merge branch 'v2' of ssh://47.96.225.205:29418/hmy_farmer-main into v2
---
pages/home/supplier-home.vue | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pages/home/supplier-home.vue b/pages/home/supplier-home.vue
index 3faafc4..595d984 100644
--- a/pages/home/supplier-home.vue
+++ b/pages/home/supplier-home.vue
@@ -53,7 +53,7 @@
<view class="flex tj-container" v-if="selftype==='supplier'">
<view class="tj-each">
<view class="num">
- {{tj.dealCountLastMonth||0}}单
+ {{tj.dealCountLastMonth||0}}扎
</view>
<view class="name">
上月成交
@@ -61,7 +61,7 @@
</view>
<view class="tj-each">
<view class="num">
- {{tj.dealCountToday||0}}单
+ {{tj.dealCountToday||0}}扎
</view>
<view class="name">
今日成交
@@ -69,7 +69,7 @@
</view>
<view class="tj-each">
<view class="num">
- {{tj.dealCountDay30||0}}单
+ {{tj.dealCountDay30||0}}扎
</view>
<view class="name">
近30天成交
@@ -135,14 +135,14 @@
</view>
<view class="order-desc tg">订单管理</view>
</view>
- <!-- <view class="nav row margin-tb" v-if="selftype==='supplier'"
+ <view class="nav row margin-tb" v-if="selftype==='supplier'"
@click="goto('/sub_pages/supplier/order-manage/order-manage',true)">
<view class="img-c">
<image class="icon margin-bottom order-icon ddgl"
src="/static/images/partner/user/user-icon-ddgl.png" mode="scaleToFill" />
</view>
<view class="order-desc tg">订单统计</view>
- </view> -->
+ </view>
<view class="nav row margin-tb"
@click="goto('/sub_pages/supplier/order-settlement/order-settlement',true)">
@@ -167,7 +167,7 @@
</view>
<view class="order-desc tg">加价配置</view>
</view>
- <view class="nav row margin-tb" @click="goto('/sub_pages/supplier/order-sale/order-sale',true)">
+ <view class="nav row margin-tb" @click="goto('/pages/order/order-sale/order-sale',true)">
<view class="img-c">
<image class="icon margin-bottom order-icon shlp"
src="/static/images/supplier/user/user-icon-shlp.png" mode="scaleToFill" />
@@ -267,7 +267,7 @@
}
}).then(res => {
if (res.code == 0) {
- this.noticeList = (res.data && res.data.records || [])
+ this.noticeList = (res.data && res.data || [])
console.log('this.noticeList', this.noticeList)
if (this.noticeList.length > 0) {
this.currentNotice = this.noticeList[0]
--
Gitblit v1.9.3