From 825418425a91c4cf95e56c3fbaf06ea9fb5a37d8 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期六, 28 二月 2026 09:41:21 +0800
Subject: [PATCH] 合并

---
 mini-program/pages/mine/mine.vue |  112 +++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 78 insertions(+), 34 deletions(-)

diff --git a/mini-program/pages/mine/mine.vue b/mini-program/pages/mine/mine.vue
index 0df5eae..e425685 100644
--- a/mini-program/pages/mine/mine.vue
+++ b/mini-program/pages/mine/mine.vue
@@ -8,7 +8,7 @@
 			<view class="user">
 				<view class="user-left">
 					<view class="user-image">
-						<image :src="userInfo.imgFullUrl" mode="widthFix"></image>
+						<image :src="userInfo.imgFullUrl?userInfo.imgFullUrl:'/static/icon/default.png'" mode="widthFix"></image>
 					</view>
 					<view class="user-name">
 						<button open-type="getPhoneNumber" @getphonenumber="getphonenumber" v-if="!userInfo">鑾峰彇鎵嬫満鍙�</button>
@@ -20,25 +20,25 @@
 						<image src="/static/icon/ic_option@2x.png" mode="widthFix"></image>
 					</view>
 					<view class="user-right-item" @click="jumpNotice">
-						<view class="user-right-item-tips" v-if="objNum && objNum.unRead === 1"></view>
+						<view class="user-right-item-tips" v-if="objNum && objNum.unRead === 0"></view>
 						<image src="/static/icon/ic_notice@2x.png" mode="widthFix"></image>
 					</view>
 				</view>
 			</view>
 			<view class="cate">
-				<view class="cate-item">
+				<view class="cate-item" @click="jumpTo(1)">
 					<text>{{objNum ? objNum.cartTypeNum : 0}}</text>
 					<text>璐墿杞�</text>
 				</view>
-				<view class="cate-item">
+				<view class="cate-item" @click="jumpTo(2)">
 					<text>{{objNum ? objNum.member.integral : 0}}</text>
 					<text>绉垎</text>
 				</view>
-				<view class="cate-item">
+				<view class="cate-item" @click="jumpTo(3)">
 					<text>{{objNum ? objNum.couponNum : 0}}</text>
 					<text>浼樻儬鍒�</text>
 				</view>
-				<view class="cate-item">
+				<view class="cate-item" @click="jumpTo(4)">
 					<text>{{objNum ? objNum.collectNum : 0}}</text>
 					<text>鏀惰棌</text>
 				</view>
@@ -46,31 +46,31 @@
 			<view class="func">
 				<view class="func-top">
 					<view class="func-top-title">鎴戠殑璁㈠崟</view>
-					<view class="func-top-to" @click="jumpOrder">
+					<view class="func-top-to" @click="jumpOrder(0)">
 						鍏ㄩ儴璁㈠崟
 						<image src="/static/icon/ic_ar2@2x.png" mode="widthFix"></image>
 					</view>
 				</view>
 				<view class="func-list">
-					<view class="func-list-item" @click="jumpOrder(0)">
+					<view class="func-list-item" @click="jumpOrder(1)">
 						<view class="func-list-item-num" v-if="orderNum && orderNum.waitPayOrders > 0">{{orderNum.waitPayOrders}}</view>
 						<image src="/static/icon/mine_ic_daifukuan@2x.png" mode="widthFix"></image>
 						<text>寰呮敮浠�</text>
 					</view>
-					<view class="func-list-item" @click="jumpOrder(1)">
+					<view class="func-list-item" @click="jumpOrder(2)">
 						<view class="func-list-item-num" v-if="orderNum && orderNum.waitOrders > 0">{{orderNum.waitOrders}}</view>
 						<image src="/static/icon/mine_ic_daifahuo@2x.png" mode="widthFix"></image>
 						<text>寰呭彂璐�/鑷彁</text>
 					</view>
-					<view class="func-list-item" @click="jumpOrder(2)">
-						<view class="func-list-item-num" v-if="orderNum && orderNum.waitOrders > 0">{{orderNum.waitReceivedOrders}}</view>
+					<view class="func-list-item" @click="jumpOrder(3)">
+						<view class="func-list-item-num" v-if="orderNum && orderNum.waitReceivedOrders > 0">{{orderNum.waitReceivedOrders}}</view>
 						<image src="/static/icon/mine_ic_daishouhuo@2x.png" mode="widthFix"></image>
 						<text>寰呮敹璐�</text>
 					</view>
 				</view>
 			</view>
-			<view class="guanggao">
-				<image src="/static/images/share@2x.png" mode="widthFix"></image>
+			<view class="guanggao" @click="jumpShare()">
+				<image :src="share"  mode="widthFix"></image>
 			</view>
 			<view class="gn">
 				<view class="gn-item" @click="jump()">
@@ -78,6 +78,7 @@
 					<image src="/static/icon/ic_ar2@2x.png" mode="widthFix"></image>
 				</view>
 				<view class="gn-item">
+					<button open-type="contact">瀹㈡湇</button>
 					<text>鍦ㄧ嚎瀹㈡湇</text>
 					<image src="/static/icon/ic_ar2@2x.png" mode="widthFix"></image>
 				</view>
@@ -94,23 +95,56 @@
 	import { mapState } from 'vuex'
 	export default {
 		computed: {
-			...mapState(['navHeight', 'statusbarHeight', 'openid', 'userInfo'])
+			...mapState(['navHeight', 'statusbarHeight', 'openid', 'userInfo','recshopid','recuserid'])
 		},
 		data() {
 			return {
 				objNum: null,
-				orderNum: null
+				orderNum: null,
+				share: ''
 			};
 		},
 		async onLoad() {
 			await this.$onLaunched;
-			this.getMyInfo()
+			if (uni.getStorageSync('backgroundImage')) {
+				this.share = uni.getStorageSync('backgroundImage').centerInviteBg
+			}
 			this.ordersStatistics()
 		},
+		async onShow() {
+			await this.$onLaunched;
+			if (this.userInfo) {
+				this.getMyInfo()
+			}
+		},
 		methods: {
+			jumpTo(type) {
+				if (type === 1) {
+					uni.navigateTo({
+						url: '/pages/shopping-cart/shopping-cart'
+					})
+				} else if (type === 2) {
+					uni.navigateTo({
+						url: '/pages/my-points/my-points'
+					})
+				} else if (type === 3) {
+					uni.navigateTo({
+						url: '/pages/coupon/coupon'
+					})
+				} else if (type === 4) {
+					uni.navigateTo({
+						url: '/pages/my-collection/my-collection'
+					})
+				}
+			},
 			jump() {
 				uni.navigateTo({
 					url: '/pages/login/login'
+				})
+			},
+			jumpShare(){
+				uni.navigateTo({
+					url: '/pages/share/share'
 				})
 			},
 			// 璺宠浆娑堟伅
@@ -127,15 +161,21 @@
 			},
 			// 鎺堟潈鎵嬫満鍙�
 			getphonenumber(e) {
-				this.$u.api.wxPhone({
-					code: e.detail.code,
-					openid: this.openid
-				}).then(res => {
-					if (res.code === 200) {
-						this.$store.commit('setUserInfo', res.data.member)
-						this.$store.commit('setToken', res.data.token)
-					}
-				})
+				if (e.detail.errMsg === 'getPhoneNumber:ok') {
+					this.$u.api.wxPhone({
+						code: e.detail.code,
+						shopId:this.recshopid,
+						recId:this.recuserid,
+						openid: this.openid
+					}).then(res => {
+						if (res.code === 200) {
+							this.$store.commit('setUserInfo', res.data.member)
+							this.$store.commit('setToken', res.data.token)
+							 this.$store.commit('setRecShopId','')
+							 this.$store.commit('setRecUserId','')
+						}
+					})
+				}
 			},
 			// 鑾峰彇鏀惰棌绛夋暟閲�
 			getMyInfo() {
@@ -157,15 +197,9 @@
 			},
 			// 璺宠浆璁㈠崟鍒楄〃
 			jumpOrder(status) {
-				if (status >= 0) {
-					uni.navigateTo({
-						url: '/pages/order/order?status=' + status
-					})
-				} else {
-					uni.navigateTo({
-						url: '/pages/order/order'
-					})
-				}
+				uni.navigateTo({
+					url: '/pagesA/pages/order/order?userType=0&status=' + status
+				})
 			}
 		}
 	}
@@ -220,9 +254,19 @@
 					align-items: center;
 					justify-content: space-between;
 					border-bottom: 1rpx solid #E5E5E5;
+					position: relative;
 					&:last-child {
 						border: none !important;
 					}
+					button {
+						position: absolute;
+						top: 0;
+						left: 0;
+						width: 100%;
+						height: 100%;
+						opacity: 0;
+						z-index: 99;
+					}
 					text {
 						font-weight: 400;
 						font-size: 30rpx;

--
Gitblit v1.9.3