From ad876a6fea2df6e2a831d4c9d95cf724855610f4 Mon Sep 17 00:00:00 2001
From: Liuyi <candymxq888@outlook.com>
Date: 星期六, 14 十二月 2024 16:43:35 +0800
Subject: [PATCH] 修复用户微信扫码进入小程序无法跳转及登录问题,修改会员卡解绑接口

---
 pages/index/index.vue |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index 40cd85c..9abbe73 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,7 +1,7 @@
 <script setup>
     import { onMounted, ref } from "vue";
 	import { BASE_URL } from '../../config/baseUrl';
-	import { getVipInfoApi,getUserInfo,reportLossApi,removeCardApi,buyWaterApi } from '../../api/index.js'
+	import { getVipInfoApi,getUserInfo,reportLossApi,removeBindingApi,buyWaterApi } from '../../api/index.js'
 	import { onShow,getCurrentPages } from '@dcloudio/uni-app'
 	//状态栏高度
 	const topHeight = ref(0)
@@ -66,7 +66,8 @@
 				cardInfo.value.userPhone = res.data.userInfo.userPhone
 				cardInfo.value.id = res.data.userInfo.id
 				await getVipInfo()
-				console.log('00000',cardInfo.value)
+				console.log('用户信息响应',res)
+				console.log('用户信息',cardInfo.value)
 				uni.setStorageSync('userInfo',JSON.stringify(cardInfo.value))
 			}
 		})
@@ -90,6 +91,7 @@
 	 * 功能列表相关
 	 */
 	const functionList = ref([
+		//isUrl:1:页面跳转,2:弹窗功能,3:弹窗功能,4:未开发
 		{text:'余额记录',icon:'../../static/images/index/icon31.png',bgColor:'#16b387',url:'/pages/functionList/balanceRecord/index',isUrl:1},
 		{text:'消费记录',icon:'../../static/images/index/icon32.png',bgColor:'#329ae8',url:'/pages/functionList/paymentRecord/index',isUrl:1},
 		{text:'充值记录',icon:'../../static/images/index/icon33.png',bgColor:'#f0a50e',url:'/pages/functionList/rechargeRecord/index',isUrl:1},
@@ -156,13 +158,14 @@
 			}
 		}else if(isUrl == 3){
 			if(cardInfo.value.waterCardNumber){
+				//判断是否是分享卡:分享卡不许注销
 				if(!isShareCard.value){
 					uni.showModal({
 							title: '会员卡注销',
 							content: '确认注销会员卡?',
 							success: async function(res) {
 							if (res.confirm) {
-								await removeCardApi(cardInfo.value.waterCardNumber).then(async(res) =>{
+								await removeBindingApi(cardInfo.value.waterCardNumber).then(async(res) =>{
 									if(res.code == 200){
 										uni.showToast({
 											title: '已注销',
@@ -365,6 +368,7 @@
 					</block>
 				</view>
 			</view>
+			<!-- <view @click="navTo('/pages/wxScanWater/index')">测试扫码取水</view> -->
 			<!-- 积分商城 -->
 			<view class="advertisement-box" @click="navTo('/pagesPoints/pointsMall/index')">
 				<view class="point-advert">

--
Gitblit v1.9.3