From 7ebb4cf0c55623a279a38a15db58002be1192693 Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Thu, 29 Aug 2024 22:53:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/showLogin/showLogin.vue | 31 +++++++++++++++++++++++--------
 pages/center/center.vue            | 30 +++++++++++++++++++-----------
 pages/login/wxUserInfo.vue         | 29 +++++++++++++++--------------
 pages/payment/payment.vue          | 15 +++++++++++----
 store/store.js                     |  9 ++++++---
 5 files changed, 74 insertions(+), 40 deletions(-)

diff --git a/components/showLogin/showLogin.vue b/components/showLogin/showLogin.vue
index 361da25..c1e1245 100644
--- a/components/showLogin/showLogin.vue
+++ b/components/showLogin/showLogin.vue
@@ -1,5 +1,7 @@
 <template>
-	<uni-popup ref="popup" type="bottom" border-radius="10px 10px 0 0">
+	<uv-popup ref="popup" 
+	:safeAreaInsetBottom="false"
+	type="bottom" round="30rpx">
 		<view class="toast">
 			<view class="title">
 				提示
@@ -7,16 +9,13 @@
 			<view class="content">
 				本小程序需要登录之后才可以正常使用
 			</view>
-			<view class="btnstwo">
-				<view class="btn c" @click="cancel">
-					取消
-				</view>
-				<view class="btn c" @click="$store.commit('login')">
+			<view class="btns">
+				<view class="btn c" @click="login">
 					登录
 				</view>
 			</view>
 		</view>
-	</uni-popup>
+	</uv-popup>
 </template>
 
 <script setup>
@@ -37,6 +36,10 @@
 			
 			cancel() {
 				this.$refs.popup.close('center')
+			},
+			login(){
+				this.$store.commit('login')
+				this.$refs.popup.close('center')
 			}
 		}
 	}
@@ -57,12 +60,24 @@
 
 		.content {
 			font-size: 28rpx;
-			min-height: 300rpx;
 			display: flex;
 			flex-direction: column;
 			justify-content: center;
 			align-items: center;
 		}
+		
+		.btns{
+			display: flex;
+			padding: 30rpx;
+			.btn{
+				flex: 1;
+				background: #00aaff;
+				border-radius: 20rpx;
+				color: #fff;
+				padding: 20rpx 0;
+				text-align: center;
+			}
+		}
 
 		.btnstwo {
 			display: flex;
diff --git a/pages/center/center.vue b/pages/center/center.vue
index a58fb52..fecbc2a 100644
--- a/pages/center/center.vue
+++ b/pages/center/center.vue
@@ -4,11 +4,21 @@
 		<view class="content">
 			<view class="topBox">
 				<view class="users">
-					<view class="u-top">
+					<view class="u-top" v-if="userInfo.appletOpenid">
+						<image
+							:src="userInfo.headImage"
+							mode=""></image>
+						<view class="tit"
+						>
+							{{ userInfo.nickName }}
+						</view>
+					</view>
+					<view class="u-top" v-else>
 						<image
 							src="https://img2.baidu.com/it/u=2953585264,744730101&fm=253&fmt=auto&app=138&f=JPEG?w=360&h=360"
 							mode=""></image>
-						<view class="tit">
+						<view class="tit"
+						>
 							登录 / 注册
 						</view>
 					</view>
@@ -49,25 +59,23 @@
 
 <script>
 	import showLogin from '../../components/showLogin/showLogin.vue'
+	import { mapState } from 'vuex'
 	export default {
 		name : 'Center',
 		components : { showLogin },
+		computed : {
+			...mapState(['userInfo']),
+		},
 		data() {
 			return {}
 		},
 		onShow(){
-			this.getUserInfo()
+			if (!this.$refs.login.checkLogin()) {
+				this.$store.commit('getUserInfo')
+			}
 		},
 		methods: {
 			
-			//获取个人信息
-			getUserInfo(){
-				this.$api('infoGetInfo', res => {
-					console.log(res);
-				})
-			}
-			
-			
 		}
 	}
 </script>
diff --git a/pages/login/wxUserInfo.vue b/pages/login/wxUserInfo.vue
index 485d43a..d0ec311 100644
--- a/pages/login/wxUserInfo.vue
+++ b/pages/login/wxUserInfo.vue
@@ -66,20 +66,21 @@
 					.exec((res) => {
 						const nickName = res?.[0]?.value
 						self.userInfo.nickName = nickName
+						
+						if (self.$utils.verificationAll(self.userInfo, {
+								headImage: '请选择头像',
+								nickName: '请填写昵称',
+							})) {
+							return
+						}
+						
+						self.$api('infoUpdateInfo', self.userInfo, res => {
+							if (res.code == 200) {
+								uni.navigateBack(-1)
+							}
+						})
 					})
-
-				if (this.$utils.verificationAll(this.userInfo, {
-						headImage: '请选择头像',
-						nickName: '请填写昵称',
-					})) {
-					return
-				}
-
-				this.$api('infoUpdateInfo', this.userInfo, res => {
-					if (res.code == 200) {
-						uni.navigateBack(-1)
-					}
-				})
+				
 			},
 		}
 	}
@@ -118,7 +119,7 @@
 
 		.btn {
 			// background: $uni-linear-gradient-btn-color;
-			background: lightblue;
+			background: #00aaff;
 			color: #fff;
 			width: 80%;
 			padding: 20rpx 0;
diff --git a/pages/payment/payment.vue b/pages/payment/payment.vue
index 37f4229..d249fe4 100644
--- a/pages/payment/payment.vue
+++ b/pages/payment/payment.vue
@@ -20,9 +20,13 @@
 			</view>
 
 			<view v-if="form.money" class="tip">
-				折后共计{{ form.money * 0.99 }}元
+				折后共计{{ 
+				form.money * 
+				(configList.preferential ?
+				configList.preferential.keyCentent
+				: 1)
+				}}元
 			</view>
-
 			<view class="select-money">
 				<view v-for="(item, index) in rechargeList" class="money-item" :key="index">
 					<view @click="selectMoney(item.price,index)" :class="{ 'active-money' : currentIndex == index }"
@@ -49,13 +53,16 @@
 <script setup>
 	import PrivacyAgreementPoup from "../../components/PrivacyAgreementPoup/PrivacyAgreementPoup.vue";
 	import showLogin from "../../components/showLogin/showLogin.vue";
-
+	import { mapState } from 'vuex'
 	export default {
 		name: 'Payment',
 		component: {
 			PrivacyAgreementPoup,
 			showLogin
 		},
+		computed : {
+			...mapState(['configList']),
+		},
 		data() {
 			return {
 				form: {
@@ -88,7 +95,7 @@
 			this.getRechargePage()
 		},
 		methods: {
-
+			
 			// 用户选择加油金额
 			selectMoney(money, item) {
 				this.form.money = money
diff --git a/store/store.js b/store/store.js
index 7f87187..ae7baee 100644
--- a/store/store.js
+++ b/store/store.js
@@ -9,12 +9,13 @@ import api from '@/api/api.js'
 const store = new Vuex.Store({
 	state: {
 		configList: {}, //配置对象
+		userInfo : {},
 	},
 	getters: {},
 	mutations: {
 		// 初始化配置
 		initConfig(state) {
-			let config = ['discount', 'wx']
+			let config = ['preferential', 'wx']
 			config.forEach(k => {
 				api('getConfig', {
 					keyValue : k
@@ -53,9 +54,11 @@ const store = new Vuex.Store({
 				}
 			})
 		},
-		getUserInfo() {
+		getUserInfo(state) {
 			api('infoGetInfo', res => {
-				console.log(res);
+				if(res.code == 200){
+					state.userInfo = res.result
+				}
 			})
 		},
 	},