From e4233b5c4e123c4b79a38d0a9b0c8b60631e1683 Mon Sep 17 00:00:00 2001 From: xuxueyang <xuxy@fengyuntec.com> Date: 星期二, 30 七月 2024 10:40:24 +0800 Subject: [PATCH] update --- pages/user/supplier-user.vue | 63 ++++++++++++++++++++++++------- 1 files changed, 49 insertions(+), 14 deletions(-) diff --git a/pages/user/supplier-user.vue b/pages/user/supplier-user.vue index 99e3571..c0a7541 100644 --- a/pages/user/supplier-user.vue +++ b/pages/user/supplier-user.vue @@ -30,9 +30,12 @@ <view class="name" v-if="currentInfo.id"> <view class="t1"> {{ - (!!currentInfo.supplierDTO ? (currentInfo.supplierDTO.name) : "") || (!!currentInfo.customerDTO ? (currentInfo.customerDTO.name) : "") || currentInfo.nickName || currentInfo.loginName || '-' - }}<span v-if="currentInfo.supplierDTO&¤tInfo.supplierDTO.status!=='P'"> + (!!currentInfo.partnerDTO ? (currentInfo.partnerDTO.name) : "") || (!!currentInfo.supplierDTO ? (currentInfo.supplierDTO.name) : "") || (!!currentInfo.customerDTO ? (currentInfo.customerDTO.name) : "") || currentInfo.nickName || currentInfo.loginName || '-' + }} + <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> </view> <view class="t2">{{ currentInfo.tel || '暂无电话' }}</view> </view> @@ -41,17 +44,20 @@ <!-- getUserProfile --> {{ '点击登陆' }} </view> - <image class="icon-setting" src="../../static/common/icon-setting.png" mode="aspectFit"></image> + <image class="icon-setting" @click="toInfo" src="../../static/common/icon-setting.png" mode="aspectFit"> + </image> </view> <!-- #ifdef PUB_CUSTOMER --> <view class="customer-info-records"> <view class="item"> - <view class="num">{{ tj.collectNum || 0 }}</view> + <view class="num" @click="goto('/sub_pages/customer/self/collect',true)">{{ tj.collectNum || 0 }} + </view> <view class="name">我的收藏</view> </view> <view class="line"></view> <view class="item"> - <view class="num">{{ tj.followNum || 0 }}</view> + <view class="num" @click="goto('/sub_pages/customer/self/follow',true)">{{ tj.followNum || 0 }} + </view> <view class="name">关注店铺</view> </view> <view class="line"></view> @@ -90,7 +96,7 @@ <image src="../../static/images/customer/order/order-type-4.png" class="order-icon dpj"></image> <view>待评价</view> </view> - <view class="order-icons" @click="goto('/pages/order/order?status=COMPLETED',true)"> + <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"></image> <view>售后</view> </view> @@ -145,7 +151,8 @@ </view> <!-- #endif --> <view class="user-utils m-20"> - <view class="user-util m-t-12 flex" @click="goto('/sub_pages/customer/customer-info/customer-info',true)"> + <view class="user-util m-t-12 flex" v-if="selftype==='customer'||!selftype" + @click="goto('/sub_pages/customer/customer-info/customer-info',true)"> <view class="title">个人信息</view> <view class="right-icon"> <uni-icons type="right"></uni-icons> @@ -158,6 +165,15 @@ <uni-icons type="right"></uni-icons> </view> </view> + <!-- #ifdef PUB_PARTNER --> + <view class="user-util m-t-12 flex" v-if="selftype==='partner'" + @click="goto('/sub_pages/partner/partner-info/partner-code',true)"> + <view class="title">推广的注册二维码</view> + <view class="right-icon"> + <uni-icons type="right"></uni-icons> + </view> + </view> + <!-- #endif --> <view class="user-util m-t-12 flex" v-if="selftype==='supplier'" @click="goto('/sub_pages/supplier/supplier-info/supplier-info',true)"> <view class="title">店铺信息</view> @@ -275,9 +291,9 @@ // } // } - // }, - onShow(){ - this.getTj() + // }, + onShow() { + this.getTj() }, onLoad(options) { // const url = options.q ? decodeURIComponent(options.q) : ''; @@ -294,23 +310,42 @@ uni.stopPullDownRefresh() }, methods: { + toInfo() { + var url = '' + if (this.currentInfo.id) { + // #ifdef PUB_CUSTOMER + url = '/sub_pages/customer/customer-info/customer-info' + // #endif + // #ifdef PUB_PARTNER + url = '/sub_pages/partner/partner-info/partner-info' + // #endif + // #ifdef PUB_SUPPLIER + url = '/sub_pages/supplier/supplier-info/supplier-info' + // #endif + if (url) { + uni.navigateTo({ + url: url + }) + } + } + }, getTj() { // /api/supplier/delivery - + if (this.currentInfo.id && this.currentInfo.id !== this.cacheUserId) { this.cacheUserId = this.currentInfo.id let that = this - setTimeout(() => { + setTimeout(() => { // #ifdef PUB_CUSTOMER this.$http.request('get', '/api/customer/center/tj', {}).then(res => { if (res.code === 0) { that.tj = res.data || {} } - }) + }) // #endif }, 200) } - + }, async clearlogout() { -- Gitblit v1.9.3