From bc5d79cdd957fcee510d7a1cee07f6775af65596 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 03 三月 2026 10:04:46 +0800
Subject: [PATCH] 合并
---
mini-program/pages/mine/mine.vue | 70 ++++++++++++++++++++++++----------
1 files changed, 49 insertions(+), 21 deletions(-)
diff --git a/mini-program/pages/mine/mine.vue b/mini-program/pages/mine/mine.vue
index e425685..1e9b4e8 100644
--- a/mini-program/pages/mine/mine.vue
+++ b/mini-program/pages/mine/mine.vue
@@ -53,17 +53,17 @@
</view>
<view class="func-list">
<view class="func-list-item" @click="jumpOrder(1)">
- <view class="func-list-item-num" v-if="orderNum && orderNum.waitPayOrders > 0">{{orderNum.waitPayOrders}}</view>
+ <view class="func-list-item-num" v-if="orderNum && orderNum.waitPayOrders > 0">{{orderNum.waitPayOrders > 99 ? '99+' : 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(2)">
- <view class="func-list-item-num" v-if="orderNum && orderNum.waitOrders > 0">{{orderNum.waitOrders}}</view>
+ <view class="func-list-item-num" v-if="orderNum && orderNum.waitOrders > 0">{{orderNum.waitOrders > 99 ? '99+' : 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(3)">
- <view class="func-list-item-num" v-if="orderNum && orderNum.waitReceivedOrders > 0">{{orderNum.waitReceivedOrders}}</view>
+ <view class="func-list-item-num" v-if="orderNum && orderNum.waitReceivedOrders > 0">{{orderNum.waitReceivedOrders > 99 ? '99+' : orderNum.waitReceivedOrders}}</view>
<image src="/static/icon/mine_ic_daishouhuo@2x.png" mode="widthFix"></image>
<text>寰呮敹璐�</text>
</view>
@@ -88,12 +88,15 @@
</view>
</view>
</view>
+ <Login ref="login" />
</view>
</template>
<script>
import { mapState } from 'vuex'
+ import Login from '@/components/login/login.vue'
export default {
+ components: { Login },
computed: {
...mapState(['navHeight', 'statusbarHeight', 'openid', 'userInfo','recshopid','recuserid'])
},
@@ -109,16 +112,25 @@
if (uni.getStorageSync('backgroundImage')) {
this.share = uni.getStorageSync('backgroundImage').centerInviteBg
}
- this.ordersStatistics()
+ // 閫�鍑�/娉ㄩ攢娓呴櫎鏁版嵁
+ uni.$on('loginOut', () => {
+ this.objNum = null
+ this.orderNum = null
+ })
},
async onShow() {
await this.$onLaunched;
if (this.userInfo) {
this.getMyInfo()
+ this.ordersStatistics()
}
},
methods: {
jumpTo(type) {
+ if (!this.userInfo) {
+ this.$refs.login.open()
+ return
+ }
if (type === 1) {
uni.navigateTo({
url: '/pages/shopping-cart/shopping-cart'
@@ -161,20 +173,32 @@
},
// 鎺堟潈鎵嬫満鍙�
getphonenumber(e) {
+ var that = this;
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','')
+ uni.login({
+ provider: 'weixin',
+ success: async function (loginRes) {
+ let { code } = loginRes;
+ let res = await that.$u.api.wxLogin({ code })
+ if (res.code === 200) {
+ that.$u.api.wxPhone({
+ code: e.detail.code,
+ shopId:that.recshopid,
+ recId:that.recuserid,
+ openid: res.data.openid
+ }).then(res => {
+ if (res.code === 200) {
+ that.getMyInfo()
+ that.ordersStatistics()
+ that.$store.commit('setUserInfo', res.data.member)
+ that.$store.commit('setToken', res.data.token)
+ that.$store.commit('setRecShopId','')
+ that.$store.commit('setRecUserId','')
+ }
+ })
+ }
}
- })
+ });
}
},
// 鑾峰彇鏀惰棌绛夋暟閲�
@@ -197,6 +221,10 @@
},
// 璺宠浆璁㈠崟鍒楄〃
jumpOrder(status) {
+ if (!this.userInfo) {
+ this.$refs.login.open()
+ return
+ }
uni.navigateTo({
url: '/pagesA/pages/order/order?userType=0&status=' + status
})
@@ -323,11 +351,11 @@
.func-list-item-num {
position: absolute;
top: 0;
- right: 0;
- height: 32rpx;
- line-height: 32rpx;
- padding: 0 8rpx;
- box-sizing: border-box;
+ right: -10rpx;
+ width: 40rpx;
+ height: 40rpx;
+ line-height: 40rpx;
+ text-align: center;
border-radius: 50%;
background-color: #E4001D;
font-weight: 400;
--
Gitblit v1.9.3