From 1e97cc472f8b156c464ecfd1c91c1e62f53151f0 Mon Sep 17 00:00:00 2001
From: xuxy <1059738716@qq.com>
Date: 星期日, 11 八月 2024 18:18:30 +0800
Subject: [PATCH] Merge branch 'main' of https://gitee.com/people_3/hmy_farmer
---
pages/user/supplier-user.vue | 129 ++++++++++++++++++++++++++++++++++--------
1 files changed, 104 insertions(+), 25 deletions(-)
diff --git a/pages/user/supplier-user.vue b/pages/user/supplier-user.vue
index c9da5b7..58212fb 100644
--- a/pages/user/supplier-user.vue
+++ b/pages/user/supplier-user.vue
@@ -81,30 +81,49 @@
<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="order_pendding_num">{{order_pendding_num||''}}</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"></image>
+ <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>
<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"></image>
+ <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>
<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"></image>
+ <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>
<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"></image>
+ <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>
<view>售后</view>
</view>
</view>
@@ -173,14 +192,15 @@
</view>
</view>
<!-- #ifdef PUB_PARTNER -->
- <view class="user-util m-t-12 flex" v-if="selftype==='partner'"
+ <view class="user-util m-t-12 flex"
+ v-if="selftype==='partner'&¤tInfo.partnerDTO&¤tInfo.partnerDTO.id&¤tInfo.partnerDTO.status=='P'"
@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>
- <!-- <view class="user-util m-t-12 flex" v-if="selftype==='partner'"
+ <!-- <view class="user-util m-t-12 flex" v-if="selftype==='partner'"
@click="goto('/sub_pages/partner/partner-info/partner-code-v2',true)">
<view class="title">测试二维码</view>
<view class="right-icon">
@@ -198,7 +218,14 @@
</view>
</view>
<!-- #endif -->
-
+ <view class="user-util m-t-12 flex"
+ v-if="selftype==='supplier'&¤tInfo&¤tInfo.id&¤tInfo.supplierDTO&¤tInfo.supplierDTO.status==='P'"
+ @click="goto('/sub_pages/supplier/supplier-info/supplier-info-update',true)">
+ <view class="title">信息维护</view>
+ <view class="right-icon">
+ <uni-icons type="right"></uni-icons>
+ </view>
+ </view>
<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>
@@ -324,20 +351,63 @@
inviterName: '',
// StatusBar:0,
tel: '15974805814',
- tj: {},
+ tj: {},
+ tj_order:{},
cacheUserId: '',
- order_pendding_num: 0,
+ // order_pendding_num: 0,
};
},
- // watch: {
- // currentInfo(nv, ov) {
- // if (!cacheUserId) {
-
- // }
- // }
- // },
+ // #ifndef PUB_CUSTOMER
+ onShareAppMessage() {
+ let that = this;
+ var name = that.currentInfo.customerDTO && currentInfo.customerDTO.name || that.currentInfo.supplierDTO &&
+ currentInfo.supplierDTO.name || that.currentInfo.partnerDTO && currentInfo.partnerDTO.name || ''
+ var url =
+ `/pages/login/supplier-login?shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${name||''}`; //你的转发页面路径拼接参数
+ return {
+ title: "花满芫",
+ path: url,
+ }
+ },
+ onShareTimeline() {
+ let that = this;
+ var name = that.currentInfo.customerDTO && that.currentInfo.customerDTO.name || that.currentInfo.supplierDTO &&
+ that.currentInfo.supplierDTO.name || that.currentInfo.partnerDTO && that.currentInfo.partnerDTO.name || ''
+ var url =
+ `/pages/login/supplier-login?shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${name||''}`; //你的转发页面路径拼接参数
+ return {
+ title: "花满芫",
+ path: url,
+ }
+ },
+ // #endif
+ // #ifdef PUB_CUSTOMER
+ onShareAppMessage() {
+ let that = this;
+ var name = that.currentInfo.customerDTO && that.currentInfo.customerDTO.name || that.currentInfo.supplierDTO &&
+ that.currentInfo.supplierDTO.name || that.currentInfo.partnerDTO && that.currentInfo.partnerDTO.name || ''
+ var url =
+ `/pages/home/home?shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${name||''}`; //你的转发页面路径拼接参数
+ return {
+ title: "花满芫",
+ path: url,
+ }
+ },
+ onShareTimeline() {
+ let that = this;
+ var name = that.currentInfo.customerDTO && that.currentInfo.customerDTO.name || that.currentInfo.supplierDTO &&
+ that.currentInfo.supplierDTO.name || that.currentInfo.partnerDTO && that.currentInfo.partnerDTO.name || ''
+ var url =
+ `/pages/home/home?shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${name||''}`; //你的转发页面路径拼接参数
+ return {
+ title: "花满芫",
+ path: url,
+ }
+ },
+ // #endif
onShow() {
+ this.cacheUserId = ''
this.getTj()
},
onLoad(options) {
@@ -360,7 +430,7 @@
},
methods: {
async bindPartnerUser(userId, name) {
- await this.$message.confirm(`确定要绑定${name}合伙人吗?`)
+ // await this.$message.confirm(`确定要绑定${name}合伙人吗?`)
//调用接口绑定
this.$message.showLoading()
const {
@@ -383,20 +453,27 @@
uni.scanCode({
success: async function(res) {
console.log('条码内容：' + res.result);
+ if (!res.result) {
+ that.$message.showToast('未识别出合伙人信息，如果是微信小程序二维码，请微信扫码打开')
+ return
+ }
var dto = undefined
try {
- if (res.result && res.result.startsWith('http://') && res.result.indexOf(
+ if (res.result && (res.result.startsWith('https://') || res.result.startsWith(
+ 'http://')) && res.result.indexOf(
'partnerUserId') >= 0) {
var arr = res.result.split("?")[1].split("&")
dto = {}
for (var item of arr) {
var tarr = item.split("=")
+ // console.log('tarr',tarr)
if (tarr[1]) {
- dto[tarr[0]] = dto[tarr[1]]
+ dto[tarr[0]] = tarr[1]
}
}
- dto['name'] = dto['partnerUserName'] || dto['partnerUserId'] || '佚名'
+ dto['name'] = dto['partnerUserName'] || ''
dto['userId'] = dto['partnerUserId'] || ''
+ // console.log('tmp arr',arr,dto)
} else {
dto = JSON.parse(res.result)
@@ -411,6 +488,7 @@
that.$message.showToast('二维码格式不正确扫码失败')
}
} catch (e) {
+ console.log('e', e)
that.$message.showToast('二维码扫码错误')
}
},
@@ -455,12 +533,13 @@
}
})
//获取待支付数目
- this.$http.request('get', '/api/customer/order/count/pending', {
+
+ this.$http.request('get', '/api/customer/order/statistics/count', {
params: {}
}).then(res => {
if (res.code === 0) {
- that.order_pendding_num = res.data || 0
-
+ // that.order_pendding_num = res.data || 0
+ that.tj_order = res.data || {}
}
})
--
Gitblit v1.9.3