From c1f6996b25ddec9f576d380471b842b44a7f1545 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期五, 02 八月 2024 11:55:22 +0800
Subject: [PATCH] 1

---
 pages/user/supplier-user.vue |   88 +++++++++++++++++++++++++++++++++++++++----
 1 files changed, 79 insertions(+), 9 deletions(-)

diff --git a/pages/user/supplier-user.vue b/pages/user/supplier-user.vue
index e8020b8..7d2002c 100644
--- a/pages/user/supplier-user.vue
+++ b/pages/user/supplier-user.vue
@@ -19,7 +19,7 @@
 
 				<image class="user-icon" v-if="
 					currentInfo.customerDTO&&currentInfo.customerDTO.cover
-					||currentInfo.supplierDTO&&currentInfo.supplierDTO.cover
+					||currentInfo.supplierDTO&&currentInfo.supplierDTO.cover
 					|| currentInfo.picture
 					" :src="
 					currentInfo.customerDTO&&currentInfo.customerDTO.cover
@@ -45,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>
@@ -181,6 +181,17 @@
 				</view>
 			</view>
 			<!-- #endif -->
+			<!-- #ifdef PUB_CUSTOMER -->
+			<view class="user-util m-t-12 flex"
+				v-if="(selftype==='customer'||!selftype)&&currentInfo.id&&currentInfo.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'"
 				@click="goto('/sub_pages/supplier/supplier-info/supplier-info',true)">
 				<view class="title">店铺信息</view>
@@ -188,8 +199,16 @@
 					<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" v-if="currentInfo&&currentInfo.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>
@@ -203,14 +222,18 @@
 
 			<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">
-						客服电话 : &nbsp;&nbsp; <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">
+							客服电话 : &nbsp;&nbsp; <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'">
@@ -325,6 +348,53 @@
 			uni.stopPullDownRefresh()
 		},
 		methods: {
+			async scanPartnerCode() {
+				await this.$message.confirm('确定要绑定合伙人吗?')
+				//扫二维码确认
+				let that = this
+				uni.scanCode({
+					success: async function(res) {
+						console.log('条码内容：' + res.result);
+						var dto = undefined
+						try {
+							dto = JSON.parse(res.result)
+							if (!!dto['userId']) {
+								var partnerName = dto['name'] || ''
+								var partnerId = dto['userId'] || ''
+								//调用接口绑定
+								that.$message.showLoading()
+								const {
+									code,
+									data
+								} = await that.$http.request('post', '/api/customer/bind/partner', {
+									data: {
+										partnerUserId: partnerId
+									}
+								})
+								that.$message.hideLoading()
+								if (code == 0) {
+									that.$message.showToast(`绑定合伙人${partnerName}成功`)
+									await that.$store.dispatch('getCurrentInfo')
+
+									// setTimeout(async () => {
+									// 	that.$message.showLoading()
+									// 	that.$message.hideLoading()
+									// }, 1000)
+
+								}
+							} else {
+								that.$message.showToast('二维码格式不正确扫码失败')
+							}
+						} catch (e) {
+							that.$message.showToast('二维码扫码错误')
+						}
+					},
+					fail() {
+						that.$message.showToast('扫码失败')
+
+					}
+				});
+			},
 			toInfo() {
 				var url = ''
 				if (this.currentInfo.id) {

--
Gitblit v1.9.3