From efa9bfe98ba906e4c9b8f49c89f5da162a46bb0f Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期一, 13 一月 2025 10:21:24 +0800
Subject: [PATCH] 1.微信一键登录：新增“同意用户协议”之后才可登录
---
pages/user/supplier-user.vue | 802 +++++++++++++++++++++++++++++++++------------------------
1 files changed, 462 insertions(+), 340 deletions(-)
diff --git a/pages/user/supplier-user.vue b/pages/user/supplier-user.vue
index 2c87d6e..456bc0f 100644
--- a/pages/user/supplier-user.vue
+++ b/pages/user/supplier-user.vue
@@ -4,7 +4,7 @@
我的
</view> -->
<!-- 背景图 -->
- <view class="top-bg img100 relative" :style="{'padding-top':(StatusBar)+'px','line-height':CustomBar+'rpx' }">
+ <view class="top-bg img100 relative" :style="{ 'padding-top': (StatusBar) + 'px', 'line-height': CustomBar + 'rpx' }">
<image class="component-bg"
src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/21/21c95c14e9504be69edff7785e3b44a9bg.png"
mode="scaleToFill" />
@@ -17,94 +17,135 @@
<view class="flex user-info">
<!-- 头像 -->
<image class="user-icon" v-if="
- (currentInfo.customerDTO&¤tInfo.customerDTO.cover)
- ||(currentInfo.supplierDTO&¤tInfo.supplierDTO.cover)
- ||(currentInfo.partnerDTO&¤tInfo.partnerDTO.cover)
+ (currentInfo.customerDTO && currentInfo.customerDTO.cover)
+ || (currentInfo.supplierDTO && currentInfo.supplierDTO.cover)
+ || (currentInfo.partnerDTO && currentInfo.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>
-
-
-
+ " :src="(currentInfo.customerDTO && currentInfo.customerDTO.cover)
+ || (currentInfo.supplierDTO && currentInfo.supplierDTO.cover)
+ || (currentInfo.partnerDTO && currentInfo.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>
<view class="name" v-if="currentInfo.id">
- <view class="t1">
- {{
+ <view class="t1 flex" style="align-items: center; justify-content: start;">
+ <!-- <view class="t1"> -->
+ <!-- {{
(!!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'">
+ }} -->
+ <span v-if="currentInfo.partnerDTO && currentInfo.partnerDTO.name">
+ {{ currentInfo.partnerDTO.name }}
+ </span>
+ <span v-else-if="currentInfo.supplierSub && currentInfo.supplierSub.name">
+ {{ currentInfo.supplierSub.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 && currentInfo.supplierDTO.status !== 'P'">
({{ currentInfo.supplierDTO ? currentInfo.supplierDTO.statusStr : '' }})</span>
- <span v-if="currentInfo.partnerDTO&¤tInfo.partnerDTO.status!=='P'">
+ <span v-if="currentInfo.partnerDTO && currentInfo.partnerDTO.status !== 'P'">
({{ currentInfo.partnerDTO ? currentInfo.partnerDTO.statusStr : '' }})</span>
<!-- #ifdef PUB_CUSTOMER -->
- <span class="member-level" @click="goto('/sub_pages/customer/self/member-center',true)"
- v-if="currentInfo&¤tInfo.customerDTO&¤tInfo.customerDTO.userGrowthRecord">
- <view v-if="currentInfo.customerDTO.userGrowthRecord.currentMemberLevel=='普通会员'" class="v1">
+ <span class="member-level" @click="goto('/sub_pages/customer/self/member-center', true)"
+ v-if="currentInfo && currentInfo.customerDTO && currentInfo.customerDTO.userGrowthRecord">
+ <view v-if="currentInfo.customerDTO.userGrowthRecord.currentMemberLevel == '普通会员'" class="v1">
<image class="member-icon"
- src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/73/732e40e1c473494bb9fb5cc639d9aa45icon-member-1.png"></image>
- {{currentInfo.customerDTO.userGrowthRecord.currentMemberLevel}}
+ src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/73/732e40e1c473494bb9fb5cc639d9aa45icon-member-1.png">
+ </image>
+ {{ currentInfo.customerDTO.userGrowthRecord.currentMemberLevel }}
<uni-icons color="#7CC662" type="right" size="18"></uni-icons>
</view>
- <view v-else-if="currentInfo.customerDTO.userGrowthRecord.currentMemberLevel=='银卡会员'"
+ <view v-else-if="currentInfo.customerDTO.userGrowthRecord.currentMemberLevel == '银卡会员'"
class="v2">
<image class="member-icon v2"
- src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/10/10af6861ae834bd3bb1b28a3c57b7dd1icon-member-2.png"></image>
- {{currentInfo.customerDTO.userGrowthRecord.currentMemberLevel}}
+ src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/10/10af6861ae834bd3bb1b28a3c57b7dd1icon-member-2.png">
+ </image>
+ {{ currentInfo.customerDTO.userGrowthRecord.currentMemberLevel }}
<uni-icons color="#7498E0" type="right" size="18"></uni-icons>
</view>
- <view v-else-if="currentInfo.customerDTO.userGrowthRecord.currentMemberLevel=='金卡会员'"
+ <view v-else-if="currentInfo.customerDTO.userGrowthRecord.currentMemberLevel == '金卡会员'"
class="v3">
<image class="member-icon v3"
- src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/c7/c70ca53f4dad4722a4e3a101dd6e23e9icon-member-3.png"></image>
- {{currentInfo.customerDTO.userGrowthRecord.currentMemberLevel}}
+ src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/c7/c70ca53f4dad4722a4e3a101dd6e23e9icon-member-3.png">
+ </image>
+ {{ currentInfo.customerDTO.userGrowthRecord.currentMemberLevel }}
<uni-icons color="#C47810" type="right" size="18"></uni-icons>
</view>
<view v-else class="v4">
<image class="member-icon v4"
- src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/ad/ad380ae0ee7043a699a83cfceab0d7b2icon-member-4.png"></image>
- {{currentInfo.customerDTO.userGrowthRecord.currentMemberLevel}}
+ src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/ad/ad380ae0ee7043a699a83cfceab0d7b2icon-member-4.png">
+ </image>
+ {{ currentInfo.customerDTO.userGrowthRecord.currentMemberLevel }}
<uni-icons color="#DD834E" type="right" size="18"></uni-icons>
</view>
</span>
<!-- #endif -->
+ <view v-if="selftype === 'supplier' && currentInfo.switchFlag " style="margin-left: 10px; display: flex; justify-content: start; align-items: center;">
+ <u--image v-if="selftype === 'supplier' && currentInfo.switchFlag "
+ src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/96/96f6ea502bac4360bf35399e86e463efswitch2.png"
+ width="10px" height="10px" style="margin-left: 20px; margin-right: 20px;"
+ @click="switchSubAccount"></u--image>
+ <!-- <u--text v-if="selftype === 'supplier' && currentInfo.switchFlag " style="color: black;" text="切换账号" @click="switchSubAccount"></u--text> -->
+ <view v-if="selftype === 'supplier' && currentInfo.switchFlag " @click="switchSubAccount" style="font-size: 10px; ">切换账号</view>
+ </view>
</view>
- <view class="t2">{{ currentInfo.tel || '暂无电话' }}</view>
+ <view class="t2 flex " style="align-items: center; justify-content: start;" >
+ <view>{{ currentInfo.supplierSub.phone || currentInfo.tel || '暂无电话' }}</view>
+ <!-- <view v-if="selftype === 'supplier' && $hasPermission('supplier:workbench:common:functions:sub:account') ">
+ <view v-if="currentInfo.isSubSupplier" class="account_sub m-l-a m-r-0" >子账号</view>
+ <view v-else class="account_sub m-l-a m-r-0" >主账号</view>
+ </view> -->
+ </view>
</view>
<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 class="icon-setting" v-if="
+ (selftype === 'supplier' && $hasPermission('supplier:mine:setting'))
+ || (selftype === 'partner' && $hasPermission('partner:mine:setting'))
+ || (selftype === 'customer')
+ " @click="toInfo" src="../../static/common/icon-setting.png" mode="aspectFit">
</image>
</view>
<!-- #ifdef PUB_CUSTOMER -->
<view class="customer-info-records">
- <view class="item" @click="goto('/sub_pages/customer/self/collect',true)">
+ <view class="item" @click="goto('/sub_pages/customer/self/collect', true)">
<view class="num">{{ tj.collectNum || 0 }}
</view>
<view class="name">我的收藏</view>
</view>
<view class="line"></view>
- <view class="item" @click="goto('/sub_pages/customer/self/follow',true)">
+ <view class="item" @click="goto('/sub_pages/customer/self/follow', true)">
<view class="num">{{ tj.followNum || 0 }}
</view>
<view class="name">关注店铺</view>
</view>
<view class="line"></view>
- <view class="item" @click="goto('/sub_pages/customer/self/history',true)">
+ <view class="item" @click="goto('/sub_pages/customer/self/history', true)">
<view class="num">{{ tj.browseNum || 0 }}</view>
<view class="name">浏览记录</view>
</view>
@@ -115,11 +156,11 @@
</view>
<!-- #ifdef PUB_CUSTOMER -->
- <view class="m-20 coupon-info-container" @click="goto( `/sub_pages/customer/coupon/good-all`,true)"
- v-if="selftype==='customer'||!selftype">
+ <view class="m-20 coupon-info-container" @click="goto(`/sub_pages/customer/coupon/good-all`, true)"
+ v-if="selftype === 'customer' || !selftype">
<view>
<view class="title">积分商城</view>
- <view class="score m-t-8">拥有积分：{{self_point}}</view>
+ <view class="score m-t-8">拥有积分：{{ self_point }}</view>
</view>
<view class="button m-l-a m-r-0 m-t-12">
去兑换 <uni-icons color="#ffffff" type="right" size="16"></uni-icons>
@@ -129,56 +170,56 @@
<!-- #ifdef PUB_CUSTOMER -->
- <view class="user-utils m-20 user-customer-order-infos" v-if="selftype==='customer'||!selftype">
+ <view class="user-utils m-20 user-customer-order-infos" v-if="selftype === 'customer' || !selftype">
<view class="user-util m-t-12">
<view class="title flex">
<view class="flex1">我的订单</view>
- <view class="m-r-a m-r-0 more" @click="goto('/pages/order/order',true)">全部订单
+ <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 class="flex order-icons-container">
<view class="order-icons" style="position: relative;"
- @click="goto('/pages/order/order?status=PENDING',true)">
+ @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 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)">
+ <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"
style="position: relative;">
- <view class="image-shop-number" v-if="tj_order.sendCount">{{tj_order.sendCount||''}}</view>
+ <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)">
+ <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"
style="position: relative;">
- <view class="image-shop-number" v-if="tj_order.receiveCount">{{tj_order.receiveCount||''}}
+ <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)">
+ <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"
style="position: relative;">
- <view class="image-shop-number" v-if="tj_order.evaluateCount">{{tj_order.evaluateCount||''}}
+ <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)">
+ <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"
style="position: relative;">
<view class="image-shop-number" v-if="tj_order.salesPendingCount">
- {{tj_order.salesPendingCount||''}}
+ {{ tj_order.salesPendingCount || '' }}
</view>
</image>
@@ -187,53 +228,83 @@
</view>
</view>
</view>
- <view class="user-utils m-20" v-if="selftype==='customer'||!selftype">
+
+ <view class="user-utils kf-container m-20 flex" v-if="selftype === 'customer' || !selftype"
+ @click="goto('/sub_pages/supplier/customer_service/customer_service', false)">
+ <view class="">
+ <image src="/static/common/icon-kf.png" class="icon-kf m-r-15 img100 icon"></image>
+ </view>
+ <view class="flex1">
+ <view class="icon-view" style="font-weight: 600;">
+ 我的客服
+ </view>
+ <view class="flex m-t-12">
+ <view class="flex1 w-fit m-auto icon-view" @click.stop="callTel">
+ <image src="/static/common/icon-call.png" class="icon icon-call m-r-10 img100"></image>
+ {{ tel }}
+ </view>
+ <view class="flex1 w-fit m-auto icon-view flex flex-wrap-normal" open-type="contact">
+ <image src="/static/common/icon-wx.png" class="icon icon-call m-t-2 m-r-10 img100"></image>
+
+ <button open-type="contact" class="component-button-contact" @handleContact="handleContact">
+ 在线客服
+ </button>
+ </view>
+
+
+ </view>
+ </view>
+ </view>
+
+ <view class="user-utils m-20" v-if="selftype === 'customer' || !selftype">
<view class="user-util m-t-12 user-customer-service-infos">
<view class="title flex">
<view>我的服务</view>
</view>
<view class="flex service-icons-container">
- <view class="service-icons" @click="goto('/sub_pages/customer/self/sign',true)">
- <image src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/7e/7ec5bba5748d4414befb413f38c0f674icon-sign-home.png" class="service-icon ">
+ <view class="service-icons" @click="goto('/sub_pages/customer/self/sign', true)">
+ <image
+ src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/7e/7ec5bba5748d4414befb413f38c0f674icon-sign-home.png"
+ class="service-icon ">
</image>
<view>签到</view>
<view v-if="!signToday" class="dot"></view>
</view>
- <view class="service-icons" @click="goto('/sub_pages/customer/self/collect',true)">
+ <view class="service-icons" @click="goto('/sub_pages/customer/self/collect', true)">
<image src="../../static/images/customer/service/service-icon-2.png" class="service-icon ">
</image>
<view>我的收藏</view>
</view>
- <view class="service-icons" @click="goto('/pages/user/address/address',true)">
+ <view class="service-icons" @click="goto('/pages/user/address/address', true)">
<image src="../../static/images/customer/service/service-icon-3.png" class="service-icon ">
</image>
<view>地址管理</view>
</view>
- <view class="service-icons" @click="goto('/pages/help/content?id=售后规则',false)">
+ <view class="service-icons" @click="goto('/pages/help/content?id=售后规则', false)">
<image src="../../static/images/customer/service/service-icon-4.png" class="service-icon ">
</image>
<view>售后规则</view>
</view>
</view>
<view class="flex service-icons-container">
- <view class="service-icons" @click="goto('/pages/help/content?id=新手帮助',false)">
+ <view class="service-icons" @click="goto('/pages/help/content?id=新手帮助', false)">
<image src="../../static/images/customer/service/service-icon-5.png" class="t2 service-icon ">
</image>
<view>新手帮助</view>
</view>
- <view class="service-icons" @click="goto('/sub_pages/customer/self/feedback',true)">
+ <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>
<!-- #ifdef PUB_CUSTOMER -->
- <view class="service-icons" @click="goto('/sub_pages/customer/coupon/coupon-self',true)">
+ <view class="service-icons" @click="goto('/sub_pages/customer/coupon/coupon-self', true)">
<image src="../../static/images/customer/service/service-icon-8.png" class="t2 service-icon ">
</image>
<view>优惠券</view>
</view>
- <view class="service-icons" @click="goto('/sub_pages/customer/coupon/good-self',true)">
+ <view class="service-icons" @click="goto('/sub_pages/customer/coupon/good-self', true)">
<image src="../../static/images/customer/service/service-icon-9.png" class="t2 service-icon ">
</image>
<view>兑换券</view>
@@ -252,7 +323,7 @@
<!-- #ifdef PUB_CUSTOMER -->
<view class="flex service-icons-container">
- <view class="service-icons" @click="goto('/sub_pages/customer/self/follow',true)">
+ <view class="service-icons" @click="goto('/sub_pages/customer/self/follow', true)">
<image src="../../static/images/customer/service/service-icon-1.png" class="service-icon ">
</image>
<view>关注店铺</view>
@@ -272,31 +343,34 @@
</view>
<!-- #endif -->
<view class="user-utils m-20">
- <view class="user-util m-t-12 flex" v-if="selftype==='customer'||!selftype"
+ <!-- <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>
</view>
- </view>
- <view class="user-util m-t-12 flex" v-if="selftype==='partner'||!selftype"
- @click="goto('/sub_pages/partner/partner-info/partner-info-personal',true)">
+ </view> -->
+ <view class="user-util m-t-12 flex"
+ v-if="(selftype === 'partner' && $hasPermission('partner:mine:personal:info')) || !selftype"
+ @click="goto('/sub_pages/partner/partner-info/partner-info-personal', 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-info',true)">
+ <view class="user-util m-t-12 flex"
+ v-if="selftype === 'partner' && $hasPermission('partner:mine:partner:info')"
+ @click="goto('/sub_pages/partner/partner-info/partner-info', true)">
<view class="title">合伙人信息</view>
<view class="right-icon">
<uni-icons type="right"></uni-icons>
</view>
</view>
<!-- #ifdef PUB_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="user-util m-t-12 flex" v-if="
+ selftype === 'partner' && $hasPermission('partner:mine:reg:qrcode')
+ && currentInfo.partnerDTO && currentInfo.partnerDTO.id && currentInfo.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>
@@ -312,7 +386,7 @@
<!-- #endif -->
<!-- #ifdef PUB_CUSTOMER -->
<view class="user-util m-t-12 flex"
- v-if="(selftype==='customer'||!selftype)&¤tInfo.id&¤tInfo.customerDTO&&!currentInfo.customerDTO.partnerId"
+ v-if="(selftype === 'customer' || !selftype) && currentInfo.id && currentInfo.customerDTO && !currentInfo.customerDTO.partnerId"
@click="scanPartnerCode">
<view class="title">扫码绑定合伙人</view>
<view class="right-icon">
@@ -320,23 +394,36 @@
</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="user-util m-t-12 flex" v-if="
+ (selftype === 'supplier' && currentInfo && currentInfo.id && currentInfo.supplierDTO && currentInfo.supplierDTO.status === 'P'
+ && $hasPermission('supplier:mine:edit:info')
+ )
+ " @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="user-util m-t-12 flex"
+ v-if="(selftype === 'supplier' && $hasPermission('supplier:mine:shop:info'))"
+ @click="goto('/sub_pages/supplier/supplier-info/supplier-info', 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'||selftype==='partner'"
+ @click="goto('/sub_pages/customer/setup/account-self',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('/pages/user/user-pwd/user-pwd',true)">
+ <view class="user-util m-t-12 flex" v-if="
+ (selftype === 'supplier' && $hasPermission('supplier:mine:edit:password'))
+ || (selftype === 'partner' && $hasPermission('partner:mine:edit:password'))
+ " @click="goto('/pages/user/user-pwd/user-pwd', true)">
<view class="title">修改密码</view>
<view class="right-icon">
<uni-icons type="right"></uni-icons>
@@ -349,8 +436,11 @@
<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="user-util m-t-12 flex" v-if="
+ currentInfo && currentInfo.id &&
+ ((selftype === 'supplier' && $hasPermission('supplier:mine:bind:wechat'))
+ || (selftype === 'partner') && $hasPermission('partner:mine:bind:wechat'))"
+ @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>
@@ -364,21 +454,23 @@
</view> -->
<!-- v-if="selftype==='customer'" -->
- <view class="user-util m-t-12 flex" @click="clearlogout">
+ <view class="user-util m-t-12 flex" v-if="
+ (selftype === 'supplier' && $hasPermission('supplier:mine:logout')) ||
+ (selftype === 'partner' && $hasPermission('partner:mine:logout'))" @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 flex"
+ <!-- <view class="user-util m-t-12 flex"
v-if="selftype==='supplier'||selftype==='customer' || !selftype"
@click="goto('/sub_pages/supplier/customer_service/customer_service',false)">
<view class="title">我的客服</view>
<view class="right-icon">
<uni-icons type="right"></uni-icons>
</view>
- </view>
+ </view> -->
@@ -471,276 +563,306 @@
</template>
<script>
- export default {
- computed: {
+export default {
+ computed: {
- self_point() {
- if (this.currentInfo.currentPoint) {
- if (this.currentInfo.currentPoint >= 10000) {
- return (this.currentInfo.currentPoint / 10000 + '万')
- } else {
- return this.currentInfo.currentPoint
- }
+ self_point() {
+ if (this.currentInfo.currentPoint) {
+ if (this.currentInfo.currentPoint >= 10000) {
+ return (this.currentInfo.currentPoint / 10000 + '万')
+ } else {
+ return this.currentInfo.currentPoint
}
-
- return 0
}
- },
- data() {
- return {
- CustomBar: uni.getStorageSync('CustomBar'),
- StatusBar: uni.getStorageSync('StatusBar'),
- tcode: '',
- inviterName: '',
- // StatusBar:0,
- tel: '15974805814',
- tj: {},
- tj_order: {},
- cacheUserId: '',
- signToday: false
- // order_pendding_num: 0,
- };
- },
- // #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
-
-
- },
- created() {
-
- },
-
- async onPullDownRefresh() {
- await this.$store.dispatch('getCurrentInfo')
- 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) {
- // #ifdef PUB_CUSTOMER
- // url = '/sub_pages/customer/customer-info/customer-info'
-
- url = '/sub_pages/customer/setup/setup'
-
- // #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(() => {
-
-
-
- // #ifdef PUB_CUSTOMER
- this.$http.request('get', '/api/customer/center/tj', {}).then(res => {
- if (res.code === 0) {
- 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)
- }
- })
- //判断有没有签到
- let that = this
- this.$http.request('get', '/api/customer/point/sign/sign/today', {}).then(res => {
- if (res.data) {
- that.signToday = true
- }
- })
-
- // #endif
- }, 200)
- }
-
- },
-
- async clearlogout() {
- await this.$message.confirm('是否退出登录?')
- this.$store.commit('updateLogin', false)
-
- uni.reLaunch({
- url: '/pages/login/supplier-login'
- })
- },
- async callTel() {
- await this.$message.confirm('是否拨打客服电话')
- uni.makePhoneCall({
- phoneNumber: this.tel //仅为示例
- });
- },
- toCustomerLogin() {
- uni.navigateTo({
- url: '/pages/login/supplier-login'
- })
- },
+ return 0
}
+ },
+ data() {
+ return {
+ CustomBar: uni.getStorageSync('CustomBar'),
+ StatusBar: uni.getStorageSync('StatusBar'),
+ tcode: '',
+ inviterName: '',
+ // StatusBar:0,
+ tel: '19288780072',
+ tj: {},
+ tj_order: {},
+ cacheUserId: '',
+ signToday: false
+ // order_pendding_num: 0,
+
+ };
+ },
+ // #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
+ async onShow() {
+ if(this.selftype==='supplier'){
+ await this.$store.dispatch('getAppMenuSupplier')
+ }else if(this.selftype==='partner'){
+ await this.$store.dispatch('getAppMenuPartner')
+ }
+
+ 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
+
+
+ },
+ created() {
+
+ },
+
+ async onPullDownRefresh() {
+ // 需要判断当前是否是子账号，如果是子账号则需要刷新账号切换的信息
+ // const currentInfo = this.$store.state.currentInfo
+ // if (currentInfo && currentInfo.supplierSub && currentInfo.supplierSub.id) {
+ // await this.$store.dispatch('getSwitchSubAccount', currentInfo.supplierSub)
+ // } else {
+ // await this.$store.dispatch('getCurrentInfo')
+ // }
+ await this.$store.dispatch('getCurrentInfo')
+ uni.stopPullDownRefresh()
+ },
+ methods: {
+ switchSubAccount() {
+ uni.navigateTo({
+ url: '/sub_pages/supplier/sub-account/sub-account-switch-list'
+ })
+ },
+ 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) {
+ // #ifdef PUB_CUSTOMER
+ // url = '/sub_pages/customer/customer-info/customer-info'
+
+ url = '/sub_pages/customer/setup/setup'
+
+ // #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(() => {
+
+
+
+ // #ifdef PUB_CUSTOMER
+ this.$http.request('get', '/api/customer/center/tj', {}).then(res => {
+ if (res.code === 0) {
+ 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)
+ }
+ })
+ //判断有没有签到
+ let that = this
+ this.$http.request('get', '/api/customer/point/sign/sign/today', {}).then(res => {
+ if (res.data) {
+ that.signToday = true
+ }
+ })
+
+ // #endif
+ }, 200)
+ }
+
+ },
+
+ async clearlogout() {
+ await this.$message.confirm('是否退出登录?')
+ this.$store.commit('updateLogin', false)
+
+ uni.reLaunch({
+ url: '/pages/login/supplier-login'
+ })
+ },
+ async callTel() {
+ await this.$message.confirm('是否拨打客服电话')
+ uni.makePhoneCall({
+ phoneNumber: this.tel //仅为示例
+ });
+ },
+ toCustomerLogin() {
+ uni.navigateTo({
+ url: '/pages/login/supplier-login'
+ })
+ },
}
+}
</script>
<style lang="scss" scoped>
- @import "./user.scss";
+@import "./user.scss";
</style>
<!-- #ifdef PUB_CUSTOMER -->
<style lang="scss" scoped>
- @import "./user-customer.scss";
+@import "./user-customer.scss";
</style>
<!-- #endif -->
<style lang="scss" scoped>
+.account_sub {
+ width: 80rpx;
+ height: 24rpx;
+ border-radius: 30rpx;
+ border: 2rpx solid #23A9F2;
+ font-size: 18rpx;
+ color: white;
+ line-height: 20rpx;
+ text-align: center;
+ background-color: #23A9F2;
+ margin-left: 10px !important;
+}
</style>
\ No newline at end of file
--
Gitblit v1.9.3