From fb14fa911bde1ed360fe89a1c41d74b158db9ab5 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期五, 09 八月 2024 15:26:28 +0800
Subject: [PATCH] update 花店样式等

---
 pages/user/supplier-user.vue |  214 ++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 186 insertions(+), 28 deletions(-)

diff --git a/pages/user/supplier-user.vue b/pages/user/supplier-user.vue
index 234857b..c9f1c83 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&&currentInfo.customerDTO.cover
+				<image class="user-icon" v-if="
+					currentInfo.customerDTO&&currentInfo.customerDTO.cover
 					||currentInfo.supplierDTO&&currentInfo.supplierDTO.cover
-					" :src="currentInfo.picture
-					||currentInfo.customerDTO&&currentInfo.customerDTO.cover
-					||currentInfo.supplierDTO&&currentInfo.supplierDTO.cover" mode="scaleToFill"></image>
+					|| currentInfo.picture
+					" :src="
+					currentInfo.customerDTO&&currentInfo.customerDTO.cover
+					||currentInfo.supplierDTO&&currentInfo.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>
@@ -80,10 +83,11 @@
 					</view>
 				</view>
 				<view class="flex order-icons-container">
-					<view class="order-icons" style="position: relative;" @click="goto('/pages/order/order?status=PENDING',true)">
+					<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">{{order_pendding_num||''}}</view>							
+							style="position: relative;">
+							<view class="image-shop-number" v-if="order_pendding_num">{{order_pendding_num||''}}</view>
 						</image>
 						<view>待付款</view>
 					</view>
@@ -169,14 +173,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'&&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>
 				</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)&&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'&&currentInfo&&currentInfo.id&&currentInfo.supplierDTO&&currentInfo.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>
@@ -184,8 +214,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>
@@ -199,14 +237,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'">
@@ -296,20 +338,66 @@
 
 			};
 		},
-		// watch: {
-		// 	currentInfo(nv, ov) {
-		// 		if (!cacheUserId) {
-
-		// 		}
-		// 	}
-		// },
-		onShow() {
+		// #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
 
 
 		},
@@ -321,6 +409,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) {
@@ -355,8 +514,7 @@
 						})
 						//获取待支付数目
 						this.$http.request('get', '/api/customer/order/count/pending', {
-							params: {
-							}
+							params: {}
 						}).then(res => {
 							if (res.code === 0) {
 								that.order_pendding_num = res.data || 0

--
Gitblit v1.9.3