Merge branch '2025鹅状元数学' of https://gogs.mtavip.com/wangguoyu/uniProject into 2025鹅状元数学

pages/bindPhone/bindPhone.vue

@@ -118,6 +118,8 @@
 		loginData.buttonText = '获取验证码';
 		isAgreed.value = false;
 		if (from.value = 'my') {
+
+
 			uni.switchTab({
 				url: "/pages/chanpinMy/my"
 			})
@@ -215,6 +217,10 @@
 				// 更新用户信息
 				//	cacheManager.set('auth', res.data)
 				// 返回重新支付
+				//绑定成功后更新缓存
+				cacheManager.updateObject('auth', {
+					userName: loginData.phoneNumber
+				})
 				handleBack();
 				toast("绑定成功")
 			}

pages/chanpinMy/my.vue

@@ -27,11 +27,12 @@
 					<icon class="list-icon dd-icon"></icon>
 					<text>订单</text>
 				</view>
-				<view v-if="appleCode=='true'&&currentPlatform=='ios' || currentPlatform=='android'" class="list-item" @click="duihuamaDuihuan">
+				<view v-if="appleCode=='true'&&currentPlatform=='ios' || currentPlatform=='android'" class="list-item"
+					@click="duihuamaDuihuan">
 					<icon class="list-icon dhm-icon"></icon>
 					<text>兑换码</text>
 				</view>
-				<view class="list-item" @click="bangPhone">
+				<view class="list-item" v-if="isShowBindPhone" @click="bangPhone">
 					<icon class="list-icon bdsjh-icon"></icon>
 					<text>绑定手机号</text>
 				</view>
@@ -79,6 +80,7 @@
 	let authInfo = ref(null);
 	let loginRef = ref(null);
 	let currentTabIndex = ref(3)
+	let isShowBindPhone = ref(false);
 	let myInfoData = reactive({
 		userImg: '',
 		userName: '',
@@ -90,10 +92,16 @@
 	let pageFrom = ref(null)
 
 	onShow(() => {
+		console.log('pageFrom.value', pageFrom.value);
 		currentTabIndex.value = 3
 		if (pageFrom.value === 'myInfo') {
 			getMyInfo();
 		}
+		if (getUserIsYouke()) {
+			isShowBindPhone.value = true
+		} else {
+			isShowBindPhone.value = false
+		}
 	})
 	/***************** 测试 ******************/
 	const testRef = ref(null)
@@ -102,21 +110,17 @@
 		testRef.value.showPopup(7)
 	}
 	/***************** 测试 ******************/
-	function bangPhone(){
+	function bangPhone() {
+		pageFrom.value = 'myInfo'
 		uni.navigateTo({
-			url: '/pages/bindPhone/bindPhone?from=my'   
+			url: '/pages/bindPhone/bindPhone?from=my'
 		})
 	}
 
-	function bingPhoneSuccess(flag, tel) {
-		toast("绑定成功")
-		cacheManager.updateObject('auth', {
-			userName: tel,
-		})
-	}
 	// 获取用户数据
 	function getMyInfo() {
-		myInfo({}).then(res => {
+		return myInfo({}).then(res => {
+			console.log('res', res);
 			myInfoData.userName = res.data.userName;
 			myInfoData.nickName = res.data.nickName;
 			pageFrom.value = ''
@@ -129,31 +133,14 @@
 			if (res.data.icon) {
 				myInfoData.icon = res.data.icon;
 			} else {
-				getUserImg(res.data.growthType)
+				getUserImg()
 			}
 		})
 	}
 
 	// 获取用户头像
-	function getUserImg(data) {
-		switch (data) {
-			case 0:
-				myInfoData.icon = 'static/images/my/head-img0.png'
-				break;
-			case 1:
-				myInfoData.icon = 'static/images/my/head-img1.png'
-				break;
-			case 2:
-				myInfoData.icon = 'static/images/my/head-img2.png'
-				break;
-			case 3:
-				myInfoData.icon = 'static/images/my/head-img3.png'
-				break;
-			default:
-				myInfoData.icon = 'static/images/my/head-unlogin-img.png'
-				break;
-
-		}
+	function getUserImg() {
+		myInfoData.icon = 'static/images/my/head-img1.png'
 	}
 
 	function yingyongshezhi() {
@@ -184,11 +171,14 @@
 
 	function handleSuccess(authInfo) {
 		// 登录成功更改用户名
-		myInfoData.userName = authInfo.userName;
-		// 前往兑换码
-		uni.navigateTo({
-			url: '/pages/chanpinMy/duihuanma'
-		})
+		// myInfoData.userName = authInfo.userName;
+		getMyInfo().then(() => {
+			// 前往兑换码
+			uni.navigateTo({
+				url: '/pages/chanpinMy/duihuanma'
+			})
+		});
+
 	}
 
 	onLoad((options) => {
@@ -218,4 +208,4 @@
 			url: '/pages/chanpinShop/index'
 		})
 	}
-</script>
+</script>

pages/chanpinMy/myInfo.vue

@@ -8,38 +8,34 @@
 			<view class="yysz-row-box">
 				<view class="yysz-item img-item" @click="headClick">
 					<text>头像</text>
-					<icon class="yysz-img-box"
-						:style="{backgroundImage: 'url(' + myInfoData.icon + ')'}"></icon>
+					<icon class="yysz-img-box" :style="{backgroundImage: 'url(' + myInfoData.icon + ')'}"></icon>
 				</view>
-				<view class="yysz-item" @click="nichengClick">
-					<text>昵称</text>
-					<text class="item-text">{{myInfoData.nickName}}</text>
-				</view>
-			</view>	
-			<view class="yysz-row-box">
 				<view class="yysz-item" @click="telClick">
 					<text>手机号码</text>
 					<text class="item-text">{{myInfoData.userName}}</text>
 				</view>
 			</view>
-			<view class="yysz-row-box">	
+			<view class="yysz-row-box">
+
+			</view>
+			<view class="yysz-row-box">
 				<view class="yysz-item border-item" @click="aboutClick">
 					<text>关于我们</text>
 				</view>
-				<view v-if="loginFlag" class="yysz-item border-item" @click="yinsizhengce">
+				<view class="yysz-item border-item" @click="yinsizhengce">
 					<text>隐私政策</text>
 				</view>
 				<view class="yysz-item border-item" @click="kefudianhua">
 					<text>客服与投诉</text>
 					<text class="item-text">4001750778</text>
 				</view>
-				<view v-if="loginFlag" class="yysz-item border-item" @click="yonghuzhuxiao">
+				<view class="yysz-item border-item" @click="yonghuzhuxiao">
 					<text>用户注销</text>
 				</view>
-				 <view class="yysz-item" @click="exitLogin">
+				<view class="yysz-item" @click="exitLogin">
 					<text>退出登录</text>
 				</view>
-		</view>
+			</view>
 		</view>
 		<!-- <CustomTabBar  :currentTabNumber="3"> </CustomTabBar> -->
 		<tip-small-dialog ref="exitDialogRef" @confirm-btn="exitBtn" :content="tipContent"></tip-small-dialog>
@@ -56,6 +52,7 @@
 	import agreeContentDialog from '@/pages/login/agreeContentDialog.vue';
 	import {
 		toast,
+		getUserIsYouke
 	} from "@/utils/common";
 	import cacheManager from '@/utils/cacheManager.js';
 	import {
@@ -73,7 +70,8 @@
 	} from '@/api/my.js'
 	// import CustomTabBar from '@/components/custom-tabbar/custom-tabbar.vue';
 	import {
-		onLoad,onShow
+		onLoad,
+		onShow
 	} from '@dcloudio/uni-app';
 	import {
 		reactive,
@@ -85,16 +83,18 @@
 	import tipMiddleDialog from '@/components/dialog/tipMiddleDialog.vue';
 	import tipBigDialog from '@/components/dialog/tipBigDialog.vue';
 	import telDialog from './components/telDialog.vue'
-	
-	import { usePermission } from "@/store/permissionStore.js"
+
+	import {
+		usePermission
+	} from "@/store/permissionStore.js"
 	const permissionStore = usePermission()
-	
+
 	const agreeType = ref(null);
 	const agreeContentDialogRef = ref(null);
 
 	const tipContent = '你确定要执行这个操作吗？';
 	const zhuxiaoContent = '你确定要执行这个操作吗？';
-	let loginFlag = ref(false);
+	const isYouke = ref(false);
 	let telDialogFlag = ref(false);
 	let myInfoData = reactive({
 		userImg: '',
@@ -125,6 +125,10 @@
 	}
 
 	function headClick() {
+		if (isYouke.value) {
+			return;
+		}
+		
 		chooseImage()
 	}
 
@@ -138,14 +142,14 @@
 	}
 	const chooseImage = async () => {
 		try {
-		//	await checkAlbumPermission()
+			//	await checkAlbumPermission()
 			/* #ifdef APP */
 			const systemInfo = uni.getSystemInfoSync();
 			if (systemInfo.platform != 'ios') {
 				if (!await permissionStore.requstPermission('READ_EXTERNAL_STORAGE')) return
 			}
 			/* #endif */
-		
+
 			uni.chooseImage({
 				count: 1,
 				sizeType: ['compressed'],
@@ -229,28 +233,17 @@
 		})
 
 	}
-
-	function nichengClick() {
-		nichengDialogRef.value.handleShow();
-	}
 	// 退出按钮
 	const exitBtn = () => {
-		if (loginFlag.value) {
-			logout().then(res => {
-				toast('退出登录成功')
-				cacheManager.clearAll();
-				uni.reLaunch({
-					url: '/pages/login/index'
-				});
-			}).catch(err => {
-				toast('退出登录失败，请稍后重试')
-			})
-		} else {
+		logout().then(res => {
+			toast('退出登录成功')
+			cacheManager.clearAll();
 			uni.reLaunch({
 				url: '/pages/login/index'
 			});
-		}
-
+		}).catch(err => {
+			toast('退出登录失败，请稍后重试')
+		})
 	}
 	const zhuxiaoBtn = () => {
 		let req = {
@@ -273,7 +266,7 @@
 
 	function nichengBtn(data) {
 		console.log('data', data);
-		
+
 		let req = {
 			nickName: data
 		}
@@ -307,12 +300,10 @@
 	}
 	// 手机号码
 	function telClick() {
-		if (loginFlag.value) {
-			telDialogFlag.value = true;
-		} else {
-			youkeDialogRef.value.handleShow();
+		if (isYouke.value) {
+			return;
 		}
-
+		telDialogFlag.value = true;
 	}
 	// 手机号码绑定
 	function bindBtn() {
@@ -351,28 +342,14 @@
 	}
 
 	function getUserImg(data) {
-		switch (data) {
-			case 0:
-				myInfoData.icon = 'static/images/my/head-img0.png'
-				break;
-			case 1:
-				myInfoData.icon = 'static/images/my/head-img1.png'
-				break;
-			case 2:
-				myInfoData.icon = 'static/images/my/head-img2.png'
-				break;
-			case 3:
-				myInfoData.icon = 'static/images/my/head-img3.png'
-				break;
-			default:
-				myInfoData.icon = 'static/images/my/head-unlogin-img.png'
-				break;
-
-		}
+		myInfoData.icon = 'static/images/my/head-img1.png'
 	}
 
 	onLoad((options) => {
-		loginFlag.value = true;
 		getMyInfo();
 	})
+
+	onShow(() => {
+		isYouke.value = getUserIsYouke()
+	})
 </script>

pages/chanpinShop/usePay.js

@@ -371,7 +371,7 @@ export function usePay(opt = {}) {
 		try {
 			plus.payment.getChannels(
 				function(channels) {
-					uni.hideLoading();
+				//	uni.hideLoading();
 					// 获取苹果内购通道，赋值给外层作用域的iapChannel
 					iapChannel = channels.find((item) => item.id == "appleiap");
 					if (!iapChannel) {