From a0ea1ece4e3ffb728aee73e954d65a2209ebde32 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期三, 06 十一月 2024 17:51:45 +0800
Subject: [PATCH] 1.提现不能超过500
---
pages/home/supplier-home.vue | 109 ++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 84 insertions(+), 25 deletions(-)
diff --git a/pages/home/supplier-home.vue b/pages/home/supplier-home.vue
index 0f94c2b..6204421 100644
--- a/pages/home/supplier-home.vue
+++ b/pages/home/supplier-home.vue
@@ -7,28 +7,67 @@
我的
</view> -->
<!-- 背景图 -->
+
<view class="top-bg" :style="{'padding-top':(StatusBar)+'px','line-height':CustomBar+'rpx' }">
<view class="title" style="position: relative;">
首页
</view>
<view class="flex user-info" v-if="currentInfo&&(currentInfo.id)">
+
+ <image class="user-icon" v-if="
+ (currentInfo.customerDTO&¤tInfo.customerDTO.cover)
+ ||(currentInfo.supplierDTO&¤tInfo.supplierDTO.cover)
+ ||(currentInfo.partnerDTO&¤tInfo.partnerDTO.cover)
+ || currentInfo.picture
+ " :src="
+ (currentInfo.customerDTO&¤tInfo.customerDTO.cover)
+ ||(currentInfo.supplierDTO&¤tInfo.supplierDTO.cover)
+ ||(currentInfo.partnerDTO&¤tInfo.partnerDTO.cover)
+ || currentInfo.picture
+ " mode="scaleToFill"></image>
+
+ <image class="user-icon" v-else
+ src='https://youzhen123.oss-cn-huhehaote.aliyuncs.com/WechatOwnerProperty/images/mrtx.png'
+ mode="scaleToFill"></image>
+
<!-- 头像 -->
- <image class="user-icon" v-if="!currentInfo.picture"
+ <!-- <image class="user-icon" v-if="!currentInfo.picture"
src='https://youzhen123.oss-cn-huhehaote.aliyuncs.com/WechatOwnerProperty/images/mrtx.png'
mode="aspectFit"></image>
- <image class="user-icon" v-if="currentInfo.picture" :src="currentInfo.picture" mode="aspectFit"></image>
+ <image class="user-icon" v-if="currentInfo.picture" :src="currentInfo.picture" mode="aspectFit"></image> -->
<view class="name">
<view class="t1">
- {{ (!!currentInfo.supplierDTO?(currentInfo.supplierDTO.name):"") || currentInfo.nickName || currentInfo.loginName || '-'}}<span
- v-if="currentInfo.supplierDTO&¤tInfo.supplierDTO.status!=='P'">
+ <!-- {{ (!!currentInfo.supplierDTO?(currentInfo.supplierDTO.name):"") || currentInfo.nickName || currentInfo.loginName || '-'}} -->
+ <span v-if="currentInfo.partnerDTO && currentInfo.partnerDTO.name">
+ {{ currentInfo.partnerDTO.name }}
+ </span>
+ <span v-else-if="currentInfo.supplierDTO && currentInfo.supplierDTO.name">
+ {{ currentInfo.supplierDTO.name }}
+ </span>
+ <span v-else-if="currentInfo.customerDTO && currentInfo.customerDTO.name">
+ {{ currentInfo.customerDTO.name }}
+ </span>
+ <span v-else-if="currentInfo.nickName">
+ {{ currentInfo.nickName }}
+ </span>
+ <span v-else-if="currentInfo.loginName">
+ {{ currentInfo.loginName }}
+ </span>
+ <span v-else>-</span>
+
+ <span v-if="currentInfo.supplierDTO&¤tInfo.supplierDTO.status!=='P'">
({{currentInfo.supplierDTO?currentInfo.supplierDTO.statusStr:''}})</span>
<span v-if="currentInfo.partnerDTO&¤tInfo.partnerDTO.status!=='P'">
({{currentInfo.partnerDTO?currentInfo.partnerDTO.statusStr:''}})</span>
<span v-if="!currentInfo.partnerDTO&¤tInfo.type==='partner'">(信息待完善)</span>
</view>
<view class="t2">{{currentInfo.tel || '暂无电话'}}</view>
+ <view class="t2" v-if="currentInfo.partnerDTO && currentInfo.partnerDTO.id">
+ ID: {{ currentInfo.partnerDTO.id }}
+ </view>
+
</view>
</view>
@@ -36,7 +75,7 @@
</view>
<view class="item-container" :class="[selftype?selftype:'']">
<view class="title">我的收益</view>
- <view class="flex tj-container" v-if="selftype==='partner'">.
+ <view class="flex tj-container" v-if="selftype==='partner'">
<view class="tj-each">
<view class="num total">
￥{{tj.income||'0.00'}}
@@ -51,7 +90,7 @@
<view class="line"></view>
<view class="flex tj-container" v-if="selftype==='supplier'">
- <view class="tj-each">
+ <view class="tj-each" @click="goto('/sub_pages/supplier/data-statis/data-statis',true)">
<view class="num">
{{tj.dealCountLastMonth||0}}扎
</view>
@@ -59,7 +98,7 @@
上月成交
</view>
</view>
- <view class="tj-each">
+ <view class="tj-each" @click="goto('/sub_pages/supplier/data-statis/data-statis',true)">
<view class="num">
{{tj.dealCountToday||0}}扎
</view>
@@ -67,7 +106,7 @@
今日成交
</view>
</view>
- <view class="tj-each">
+ <view class="tj-each" @click="goto('/sub_pages/supplier/data-statis/data-statis',true)">
<view class="num">
{{tj.dealCountDay30||0}}扎
</view>
@@ -111,12 +150,12 @@
<view class="tj-panel pink flex1"
@click="goto('/pages/order/order-delivery?status=PENDING&range=today',true)">
<view class="name">今日待配送</view>
- <view class="title">{{tj.deliverCount||0}}单</view>
+ <view class="title">{{tj.deliverCount||0}}扎</view>
</view>
<view class="tj-panel green flex1"
- @click="goto('/pages/order/order-delivery?range=today',true)">
+ @click="goto('/pages/order/order-delivery?status=ARRIVED&range=today',true)">
<view class="name green">今日配送汇总</view>
- <view class="title">{{tj.deliverTotal||0}}单</view>
+ <view class="title">{{tj.deliverTotal||0}}扎</view>
</view>
</view>
<view class="m-t-12" @click="getNoticeMore">
@@ -131,31 +170,31 @@
@click="goto('/sub_pages/partner/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" />
+ src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/23/23a7ad86e00c4ba28cd962dc4910433cuser-icon-ddgl.png" mode="scaleToFill" />
</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" />
+ src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/23/23a7ad86e00c4ba28cd962dc4910433cuser-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)">
<view class="img-c">
<image class="icon margin-bottom order-icon zdjs"
- src="/static/images/supplier/user/user-icon-zdjs.png" mode="scaleToFill" />
+ src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/7b/7b7ed1488fd64f6fa9bc6b557f141f37user-icon-zdjs.png" mode="scaleToFill" />
</view>
<view class="order-desc tg">账单结算</view>
</view>
<view class="nav row margin-tb" @click="toFlowManage" v-if="selftype==='supplier'">
<view class="img-c">
<image class="icon margin-bottom order-icon spgl"
- src="/static/images/supplier/user/user-icon-spgl.png" mode="scaleToFill" />
+ src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/47/478e007ad07a43ea9f40a962d83cedb4user-icon-spgl.png" mode="scaleToFill" />
</view>
<view class="order-desc cqw">商品管理</view>
</view>
@@ -163,24 +202,43 @@
@click="goto('/sub_pages/partner/markup-config/markup-config',true)">
<view class="img-c">
<image class="icon margin-bottom order-icon jjpz"
- src="/static/images/partner/user/user-icon-jjpz.png" mode="scaleToFill" />
+ src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/93/93356ec339074b49b04c1a3a37146f22user-icon-jjpz.png" mode="scaleToFill" />
</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" />
+ src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/47/47b54c52e4c2430c8f9e91645fbf9ebduser-icon-shlp.png" mode="scaleToFill" />
</view>
<view class="order-desc syst">售后理赔</view>
</view>
+
<!-- <view class="nav row margin-tb" @click="printDeliveryOrder">
<view class="img-c">
<image class="icon margin-bottom order-icon kkjl"
- src="/static/images/supplier/user/user-icon-kkjl.png" mode="scaleToFill" />
+ src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/22/22db478554ec436a8c7e6e89c346767duser-icon-kkjl.png" mode="scaleToFill" />
</view>
<view class="order-desc wbsp">测试蓝牙</view>
</view> -->
+ </view>
+ <view class="flex order-icons m-t-12">
+ <view class="nav row margin-tb" v-if="selftype==='supplier'" @click="goto('/sub_pages/supplier/wallet/my-wallet',true)">
+ <view class="img-c">
+ <image class="icon margin-bottom order-icon shlp"
+ src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/8d/8d72f2df8a4348ac90bfbfb553a9cc71qianbao.png" mode="scaleToFill" />
+ </view>
+ <view class="order-desc syst">我的钱包</view>
+ </view>
+ <view class="nav row margin-tb">
+
+ </view>
+ <view class="nav row margin-tb">
+
+ </view>
+ <view class="nav row margin-tb">
+
+ </view>
</view>
</view>
@@ -238,6 +296,7 @@
},
async onPullDownRefresh() {
await this.$store.dispatch('getCurrentInfo')
+ await this.getTj(true)
uni.stopPullDownRefresh()
},
onLoad(options) {
@@ -245,7 +304,7 @@
const urlcode = options.url && decodeURIComponent(options.url) || ''
},
onShow() {
- this.getTj()
+ this.getTj(true)
},
created() {
//公告
@@ -267,7 +326,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]
@@ -430,10 +489,10 @@
},
})
},
- getTj() {
+ getTj(refresh=false) {
// /api/supplier/delivery
- if (this.currentInfo.id && this.currentInfo.id !== this.cacheUserId) {
+ if (this.currentInfo.id && (this.currentInfo.id !== this.cacheUserId || refresh)) {
this.cacheUserId = this.currentInfo.id
let that = this
setTimeout(() => {
--
Gitblit v1.9.3