From 5e4a9f8cc27186b8c13fbd2469941de07602bf75 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 19 Aug 2023 17:00:08 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E3=80=91=201=E3=80=81=E5=AE=8C=E6=88=90=E4=B8=AA=E4=BA=BA?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=9A=84=E6=8E=A5=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/member/user.js      |  6 +++
 api/product/favorite.js |  5 +++
 api/promotion/coupon.js |  5 +++
 api/user.js             |  8 ++--
 pages/user/index.vue    | 84 ++++++++++++++++++++++-------------------
 store/modules/app.js    | 16 ++++----
 6 files changed, 72 insertions(+), 52 deletions(-)
 create mode 100644 api/member/user.js

diff --git a/api/member/user.js b/api/member/user.js
new file mode 100644
index 00000000..f8480b18
--- /dev/null
+++ b/api/member/user.js
@@ -0,0 +1,6 @@
+import request from "@/utils/request.js";
+
+// 获得用户收件地址
+export function getUserInfo() {
+  return request.get('app-api/member/user/get');
+}
diff --git a/api/product/favorite.js b/api/product/favorite.js
index b1f669e6..7c552305 100644
--- a/api/product/favorite.js
+++ b/api/product/favorite.js
@@ -7,6 +7,11 @@ export function isFavoriteExists(spuId) {
   });
 }
 
+// 获得商品收藏数量
+export function getFavoriteCount() {
+  return request.get('app-api/product/favorite/get-count');
+}
+
 // 添加商品收藏
 export function createFavorite(spuId) {
   return request.post('app-api/product/favorite/create', {
diff --git a/api/promotion/coupon.js b/api/promotion/coupon.js
index a9e0e475..efc0bd59 100644
--- a/api/promotion/coupon.js
+++ b/api/promotion/coupon.js
@@ -27,3 +27,8 @@ export function getCouponTemplateList(spuId, useType) {
 export function getCouponTemplatePage(data) {
   return request.get("app-api/promotion/coupon-template/page", data);
 }
+
+// 获得未使用的优惠劵数量
+export function getUnusedCouponCount() {
+  return request.get("app-api/promotion/coupon/get-unused-count");
+}
diff --git a/api/user.js b/api/user.js
index 53854438..da81fc15 100644
--- a/api/user.js
+++ b/api/user.js
@@ -1,17 +1,15 @@
 import request from "@/utils/request.js";
-import Cache from "@/utils/cache.js"
+
 /**
  * 获取用户信息
- *
-*/
+ */
 export function getUserInfo(){
   return request.get('user');
 }
 
 /**
  * 设置用户分享
- *
-*/
+ */
 export function userShare(){
   return request.post('user/share');
 }
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 6b31fc47..d95d91da 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -6,46 +6,46 @@
 				<view class="head pad30">
 					<view class="user-card">
 						<view class="user-info">
-							<image class="avatar" :src='userInfo.avatar' v-if="userInfo.avatar && uid"
-								@click="goEdit()"></image>
+              <!-- 头像 -->
+							<image class="avatar" :src='userInfo.avatar' v-if="userInfo.avatar" @click="goEdit" />
 							<image v-else class="avatar" src="/static/images/f.png" mode="" @click="goEdit()"></image>
-							<view class="info">
-								<view class="name" v-if="!uid" @tap="openAuto">
-									请点击登录
-								</view>
-								<view class="name" v-if="uid">
-									{{userInfo.nickname}}
+							<!-- 昵称 -->
+              <view class="info">
+								<view class="name" v-if="!isLogin" @tap="openAuto">请点击登录</view>
+								<view class="name" v-else>
+									{{ userInfo.nickname }}
+                  <!-- TODO 芋艿：vip 逻辑 -->
 									<view class="vip" v-if="userInfo.vip">
-										<image :src="userInfo.vipIcon" alt="">
-											<view style="margin-left: 10rpx;" class="vip-txt">{{userInfo.vipName || ''}}
-											</view>
+										<image :src="userInfo.vipIcon" alt="" />
+                    <view style="margin-left: 10rpx;" class="vip-txt">{{userInfo.vipName || ''}}</view>
 									</view>
 								</view>
-								<view class="num" v-if="userInfo.phone && uid" @click="goEdit()">
-									<view class="num-txt">{{userInfo.phone}}</view>
+                <!-- 手机 -->
+								<view class="num" v-if="userInfo.mobile" @click="goEdit">
+									<view class="num-txt">{{userInfo.mobile}}</view>
 									<view class="icon">
-										<image src="/static/images/edit.png" mode=""></image>
+										<image src="/static/images/edit.png" mode="" />
 									</view>
 								</view>
-								<view class="phone" v-if="!userInfo.phone && isLogin" @tap="bindPhone">绑定手机号</view>
+								<view class="phone" v-else-if="isLogin" @tap="bindPhone">绑定手机号</view>
 							</view>
 						</view>
 						<view class="num-wrapper">
+              <!-- TODO 芋艿：钱包 -->
 							<view class="num-item" @click="goMenuPage('/pages/users/user_money/index')">
-								<text
-									class="num">{{userInfo.nowMoney && uid ?Number(userInfo.nowMoney).toFixed(2):0}}</text>
+								<text class="num">{{ userInfo.nowMoney ? Number(userInfo.nowMoney).toFixed(2) : 0 }}</text>
 								<view class="txt">余额</view>
 							</view>
 							<view class="num-item" @click="goMenuPage('/pages/users/user_integral/index')">
-								<text class="num">{{userInfo.integral && uid ? userInfo.integral: 0}}</text>
+								<text class="num">{{ userInfo.point ? userInfo.point: 0 }}</text>
 								<view class="txt">积分</view>
 							</view>
 							<view class="num-item" @click="goMenuPage('/pages/users/user_coupon/index')">
-								<text class="num">{{userInfo.couponCount && uid ? userInfo.couponCount : 0}}</text>
+								<text class="num">{{ couponCount }}</text>
 								<view class="txt">优惠券</view>
 							</view>
 							<view class="num-item" @click="goMenuPage('/pages/users/user_goods_collection/index')">
-								<text class="num">{{userInfo.collectCount && uid ? userInfo.collectCount : 0}}</text>
+								<text class="num">{{ favoriteCount }}</text>
 								<view class="txt">收藏</view>
 							</view>
 						</view>
@@ -95,7 +95,8 @@
 						<view class="list-box">
 							<block v-for="(item,index) in menus" :key="index">
 								<navigator class="item" :url="item.url" hover-class="none"
-									v-if="!(item.url ==='/pages/service/index' || (item.url === '/pages/users/user_spread_user/index' && !userInfo.isPromoter))">
+									v-if="!(item.url ==='/pages/service/index'
+									|| (item.url === '/pages/users/user_spread_user/index' && !userInfo.isPromoter))">
 									<image :src="item.picUrl"></image>
 									<text>{{ item.name }}</text>
 								</navigator>
@@ -131,11 +132,13 @@
   import * as TradeOrderApi from '@/api/trade/order.js';
   import * as AfterSaleApi from '@/api/trade/afterSale.js';
   import * as DecorateApi from '@/api/promotion/decorate.js';
+  import * as ProductFavoriteApi from '@/api/product/favorite.js';
+  import * as CouponApi from '@/api/promotion/coupon.js';
   const app = getApp();
 	export default {
 		components: {
     },
-		computed: mapGetters(['isLogin', 'chatUrl', 'userInfo', 'uid']),
+		computed: mapGetters(['isLogin', 'chatUrl', 'userInfo']),
 		data() {
 			return {
 				orderMenu: [{
@@ -178,6 +181,9 @@
         menus: [], // 用户菜单
 				servicePic: '/static/images/customer.png',
 
+        favoriteCount: 0, // 收藏数量
+        couponCount: 0, // 优惠劵数量
+
 				sysHeight: sysHeight,
 				// #ifdef MP
 				pageHeight: '100%',
@@ -188,13 +194,6 @@
 			}
 		},
 		onLoad() {
-      if (!this.isLogin) {
-        // #ifdef H5
-        toLogin()
-        // #endif
-        return
-      }
-
 			// #ifdef H5
 			this.$set(this, 'pageHeight', app.globalData.windowHeight);
 			// #endif
@@ -209,13 +208,11 @@
 				}
 			});
 			// #endif
-			if (that.isLogin) {
+			if (this.isLogin) {
 				this.getMyMenus();
 				// this.setVisit();
+        this.getUserInfo();
 				this.getOrderData();
-				this.$store.dispatch('USERINFO');
-			} else {
-				toLogin();
 			}
 		},
 		methods: {
@@ -231,6 +228,17 @@
 			kefuClick() {
 				location.href = this.chatUrl;
 			},
+      getUserInfo() {
+        // 刷新用户信息
+        this.$store.dispatch('USERINFO');
+        // 获取各种数量
+        ProductFavoriteApi.getFavoriteCount().then(res => {
+          this.favoriteCount = res.data;
+        })
+        CouponApi.getUnusedCouponCount().then(res => {
+          this.couponCount = res.data;
+        })
+      },
 			getOrderData() {
         TradeOrderApi.getOrderCount().then(res => {
           this.orderMenu.forEach((item) => {
@@ -292,13 +300,13 @@
 			},
 			// 编辑页面
 			goEdit() {
-				if (this.isLogin == false) {
+				if (!this.isLogin) {
 					toLogin();
-				} else {
-					uni.navigateTo({
-						url: '/pages/users/user_info/index'
-					})
+          return;
 				}
+        uni.navigateTo({
+          url: '/pages/users/user_info/index'
+        })
 			},
 			// 签到
 			goSignIn() {
diff --git a/store/modules/app.js b/store/modules/app.js
index 5122e152..4b2d3afa 100644
--- a/store/modules/app.js
+++ b/store/modules/app.js
@@ -1,6 +1,4 @@
-import {
-	getUserInfo
-} from "../../api/user.js";
+import * as UserApi from '@/api/member/user.js';
 import {
 	LOGIN_STATUS,
 	UID,
@@ -27,7 +25,7 @@ const mutations = {
 		state.token = opt.token;
 		Cache.set(LOGIN_STATUS, opt.token);
 	},
-	SETUID(state,val){                                                
+	SETUID(state,val){
 		state.uid = val;
 		Cache.set(UID, val);
 	},
@@ -83,12 +81,12 @@ const actions = {
 		commit
 	}, force) {
 		return new Promise(reslove => {
-			getUserInfo().then(res => {
-				commit("UPDATE_USERINFO", res.data);
-				reslove(res.data);
-			});
+      UserApi.getUserInfo().then(res => {
+        commit("UPDATE_USERINFO", res.data);
+        reslove(res.data);
+      })
 		}).catch(() => {
-		
+
 		});
 		// debugger
 		// if (state.userInfo !== null && !force)