From 32526e5bddb7b14328b2467cd18783f480b33f3b Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期六, 31 八月 2024 01:51:53 +0800
Subject: [PATCH] update合伙人
---
pages/user/supplier-user.vue | 299 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 262 insertions(+), 37 deletions(-)
diff --git a/pages/user/supplier-user.vue b/pages/user/supplier-user.vue
index 36cc797..b2354d5 100644
--- a/pages/user/supplier-user.vue
+++ b/pages/user/supplier-user.vue
@@ -17,12 +17,15 @@
<view class="flex user-info">
<!-- 头像 -->
- <image class="user-icon" v-if="currentInfo.picture
- ||currentInfo.customerDTO&¤tInfo.customerDTO.cover
+ <image class="user-icon" v-if="
+ currentInfo.customerDTO&¤tInfo.customerDTO.cover
||currentInfo.supplierDTO&¤tInfo.supplierDTO.cover
- " :src="currentInfo.picture
- ||currentInfo.customerDTO&¤tInfo.customerDTO.cover
- ||currentInfo.supplierDTO&¤tInfo.supplierDTO.cover" mode="scaleToFill"></image>
+ || currentInfo.picture
+ " :src="
+ currentInfo.customerDTO&¤tInfo.customerDTO.cover
+ ||currentInfo.supplierDTO&¤tInfo.supplierDTO.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>
@@ -42,7 +45,7 @@
<view class="name" v-if="!currentInfo.id" open-type="getUserInfo" @click.stop="toCustomerLogin"
style="font-size: 48rpx;margin-top: 16rpx;">
<!-- getUserProfile -->
- {{ '点击登陆' }}
+ {{ '点击登陆/注册' }}
</view>
<image class="icon-setting" @click="toInfo" src="../../static/common/icon-setting.png" mode="aspectFit">
</image>
@@ -79,25 +82,57 @@
<uni-icons class="" type="right" size="12"></uni-icons>
</view>
</view>
+
+
+
+
+
+
+
<view class="flex order-icons-container">
- <view class="order-icons" @click="goto('/pages/order/order?status=PENDING',true)">
- <image src="../../static/images/customer/order/order-type-1.png" class="order-icon dfk"></image>
+ <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>
+ </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"
+ 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"></image>
+ <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"></image>
+ <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"></image>
+ <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>
</view>
@@ -136,11 +171,11 @@
</image>
<view>新手帮助</view>
</view>
- <!-- <view class="service-icons" @click.stop="$meesage.showToast('敬请期待')">
- <image src="../../static/images/customer/service/service-icon-6.png" class="t2 service-icon ">
+ <view class="service-icons" @click="goto('/sub_pages/customer/self/feedback',true)">
+ <image src="../../static/images/customer/service/service-icon-7.png" class="t2 service-icon ">
</image>
- <view>运费详查</view>
- </view> -->
+ <view>投诉反馈</view>
+ </view>
<view class="service-icons"></view>
@@ -166,14 +201,40 @@
</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'"
+ @click="goto('/sub_pages/partner/partner-info/partner-code-v2',true)">
+ <view class="title">测试二维码</view>
+ <view class="right-icon">
+ <uni-icons type="right"></uni-icons>
+ </view>
+ </view> -->
<!-- #endif -->
+ <!-- #ifdef PUB_CUSTOMER -->
+ <view class="user-util m-t-12 flex"
+ v-if="(selftype==='customer'||!selftype)&¤tInfo.id&¤tInfo.customerDTO&&!currentInfo.customerDTO.partnerId"
+ @click="scanPartnerCode">
+ <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'&¤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>
@@ -181,29 +242,60 @@
<uni-icons type="right"></uni-icons>
</view>
</view>
+
<view class="user-util m-t-12 flex" @click="goto('/pages/user/user-pwd/user-pwd',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" @click="goto('/sub_pages/partner/delivery/delivery-detail',true)">
+ <view class="title">debug</view>
+ <view class="right-icon">
+ <uni-icons type="right"></uni-icons>
+ </view>
+ </view> -->
+ <view class="user-util m-t-12 flex" v-if="currentInfo&¤tInfo.id"
+ @click="goto('/pages/user/user-bind-wx/user-bind-wx',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==='customer'" @click="clearlogout">
+ <!-- <view class="user-util m-t-12 flex" @click="goto('/sub_pages/customer/self/feedback',true)">
+ <view class="title">投诉反馈</view>
+ <view class="right-icon">
+ <uni-icons type="right"></uni-icons>
+ </view>
+ </view> -->
+
+ <!-- v-if="selftype==='customer'" -->
+ <view class="user-util m-t-12 flex" @click="clearlogout">
<view class="title">退出登录</view>
<view class="right-icon">
<uni-icons type="right"></uni-icons>
</view>
</view>
+
+
+
+
<view class="user-util m-t-12 " v-if="selftype==='supplier'||selftype==='customer' || !selftype">
<view class="title">我的客服</view>
- <view class="flex">
+ <view class="flex flex-wrap-normal">
<image class="icon-clock m-r-6 m-t-2" src="../../static/common/icon-call.png"></image>
- <view class="name" @click="callTel">
- 客服电话 : <span class="topic-gray">{{ tel }}</span>
- </view>
- <view class="right-icon" open-type="contact">
- <uni-icons type="right"></uni-icons>
- </view>
+ <!-- @click="callTel" -->
+ <button open-type="contact" class="component-button-contact" @handleContact="handleContact">
+ <view class="name">
+ 客服电话 : <span class="topic-gray">{{ tel }}</span>
+ </view>
+ <view class="right-icon">
+ <uni-icons type="right"></uni-icons>
+ </view>
+ </button>
+
</view>
</view>
<!-- <view class="user-util m-t-12 " @click="callTel" v-if="selftype==='partner'">
@@ -218,7 +310,7 @@
<!-- #ifdef PUB_CUSTOMER -->
- <view style="padding-bottom:200rpx">
+ <view style="padding-bottom:140rpx">
</view>
<common-footer flg="3"></common-footer>
@@ -264,11 +356,11 @@
<!-- #endif -->
<!-- #ifndef PUB_CUSTOMER -->
- <view class="button-login-out topic-gray" @click="clearlogout">
+ <!-- <view class="button-login-out topic-gray" @click="clearlogout">
退出登录
- </view>
+ </view> -->
- <view style="padding-bottom:200rpx">
+ <view style="padding-bottom:160rpx">
</view>
<common-footer flg="1"></common-footer>
<!-- #endif -->
@@ -288,24 +380,72 @@
// StatusBar:0,
tel: '15974805814',
tj: {},
+ tj_order: {},
cacheUserId: '',
+ // 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) {
// const url = options.q ? decodeURIComponent(options.q) : '';
// const urlcode = options.url && decodeURIComponent(options.url) || ''
-
+ // #ifdef PUB_CUSTOMER
+ if (options.partnerUserId) {
+ this.bindPartnerUser(options.partnerUserId, options.partnerUserName)
+ }
+ // #endif
},
@@ -317,6 +457,77 @@
uni.stopPullDownRefresh()
},
methods: {
+ async bindPartnerUser(userId, name) {
+ // await this.$message.confirm(`确定要绑定${name}合伙人吗?`)
+ //调用接口绑定
+ this.$message.showLoading()
+ const {
+ code,
+ data
+ } = await this.$http.request('post', '/api/customer/bind/partner', {
+ data: {
+ partnerUserId: userId
+ }
+ })
+ this.$message.hideLoading()
+ if (code == 0) {
+ this.$message.showToast(`绑定合伙人${name}成功`)
+ await this.$store.dispatch('getCurrentInfo')
+ }
+ },
+ async scanPartnerCode() {
+ //扫二维码确认
+ let that = this
+ 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('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]] = tarr[1]
+ }
+ }
+ dto['name'] = dto['partnerUserName'] || ''
+ dto['userId'] = dto['partnerUserId'] || ''
+ // console.log('tmp arr',arr,dto)
+
+ } else {
+ dto = JSON.parse(res.result)
+
+ }
+ if (!!dto['userId']) {
+ var partnerName = dto['name'] || ''
+ var partnerId = dto['userId'] || ''
+ that.bindPartnerUser(partnerId, partnerName)
+
+ } else {
+ that.$message.showToast('二维码格式不正确扫码失败')
+ }
+ } catch (e) {
+ console.log('e', e)
+ that.$message.showToast('二维码扫码错误')
+ }
+ },
+ fail() {
+ that.$message.showToast('扫码失败')
+
+ }
+ });
+ },
+
+
toInfo() {
var url = ''
if (this.currentInfo.id) {
@@ -349,6 +560,20 @@
that.tj = res.data || {}
}
})
+ //获取待支付数目
+
+ this.$http.request('get', '/api/customer/order/statistics/count', {
+ params: {}
+ }).then(res => {
+ 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)
+ }
+ })
+
+
// #endif
}, 200)
}
--
Gitblit v1.9.3