From 59b1f0e9967902aa10f5e017d5a0bdfd1b60c9ea Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 29 四月 2026 09:42:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
small-program/pages/mine/mine.vue | 171 +++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 125 insertions(+), 46 deletions(-)
diff --git a/small-program/pages/mine/mine.vue b/small-program/pages/mine/mine.vue
index 6f7a3ea..2ece09a 100644
--- a/small-program/pages/mine/mine.vue
+++ b/small-program/pages/mine/mine.vue
@@ -7,8 +7,7 @@
</view>
<view class="page-scroll">
<view class="page-content">
- <view class="profile-card">
- <button open-type="getPhoneNumber" @getphonenumber="getphonenumber">鎺堟潈鎵嬫満鍙�</button>
+ <view class="profile-card" @click="handleProfileClick">
<image class="avatar" :src="userInfo.fullCoverImage ? userInfo.fullCoverImage : '/static/image/tx@2x.png'" mode="widthFix"></image>
<view class="profile-copy">
<text class="login-text">{{ userInfo.nickName || '鐐瑰嚮鐧诲綍' }}</text>
@@ -17,23 +16,23 @@
<view class="tool-item" @click="toSetting">
<image class="tool-icon" src="/static/icon/ic_option@2x.png" mode="aspectFit"></image>
</view>
- <view class="tool-item has-badge">
+ <!-- <view class="tool-item has-badge">
<image class="tool-icon" src="/static/icon/ic_notice@2x.png" mode="aspectFit"></image>
<view class="tool-badge" v-if="userInfo.hasMessage"></view>
- </view>
+ </view> -->
</view>
</view>
<view class="order-card section-card">
<view class="section-head">
<text class="section-title">鎴戠殑璁㈠崟</text>
- <view class="more-wrap" @click="toAllOrders">
+ <view class="more-wrap" @click="toOrderDetail(-1)">
<text class="more-text">鍏ㄩ儴璁㈠崟</text>
<u-icon name="arrow-right" size="13" color="#999999"></u-icon>
</view>
</view>
<view class="order-grid">
- <view v-for="(item, index) in orderMenus" :key="index" class="order-item" @click="toOrderDetail(item.label)">
+ <view v-for="(item, index) in orderMenus" :key="index" class="order-item" @click="toOrderDetail(item.status)">
<image class="order-icon" :src="item.url" mode="widthFix"></image>
<view v-if="item.badge" class="order-badge">{{ item.badge }}</view>
<text class="order-label">{{ item.label }}</text>
@@ -46,58 +45,137 @@
</view>
<view class="menu-card section-card">
- <view v-for="item in menuList" :key="item.label" class="menu-row">
+ <view v-for="item in menuList" :key="item.label" class="menu-row" @click="handleMenuClick(item)">
<text class="menu-label">{{ item.label }}</text>
- <u-icon name="arrow-right" size="18" color="#B5BBC5"></u-icon>
+ <view class="right-icon">
+ <text v-if="['闂ㄥ簵鍏ラ┗','闂ㄥ簵淇℃伅'].includes(item.label)" :class="{ 'status-red': userInfo.shopAuditStatus === 1 || userInfo.shopAuditStatus === 2 }">
+ {{userInfo.shopAuditStatus === 0 ? '瀹℃牳涓�' : userInfo.shopAuditStatus === 1 ? '瀹℃牳閫氳繃锛岃鏀粯鎶奸噾' : userInfo.shopAuditStatus === 2 ? '瀹℃牳鏈�氳繃' : userInfo.shopAuditStatus === 3 ? '闂ㄥ簵宸插叆椹�' : '' }}
+ </text>
+ <button v-if="item.label === '鍦ㄧ嚎瀹㈡湇'" open-type="contact" type="default"> </button>
+ <u-icon name="arrow-right" size="18" color="#B5BBC5"></u-icon>
+ </view>
</view>
</view>
</view>
</view>
+
+ <auth-login
+ :show="showAuthLogin"
+ :checked.sync="agreeChecked"
+ @close="showAuthLogin = false" />
+ <custom-tabbar></custom-tabbar>
</view>
</template>
<script>
-import { mapState } from 'vuex'
+ import { mapState } from 'vuex'
+ import CustomTabbar from '@/components/custom-tabbar/custom-tabbar.vue'
-export default {
- computed: {
- ...mapState(['navHeight', 'statusbarHeight', 'openid', 'userInfo'])
+ export default {
+ components: {
+ CustomTabbar
+ },
+ computed: {
+ ...mapState(['navHeight', 'statusbarHeight', 'openid', 'userInfo', 'token'])
},
data() {
return {
+ showAuthLogin: false,
+ agreeChecked: true,
userName: '',
orderMenus: [
- { label: '寰呮敮浠�', url: '/static/icon/mine_ic_daifukuan@2x.png', badge: 0 },
- { label: '寰呮敹璐�', url: '/static/icon/mine_ic_daishouhuo@2x.png', badge: 0 },
- { label: '閫�娆�/鍞悗', url: '/static/icon/mine_ic_tuikuan@2x.png', badge: 0 }
+ { label: '寰呮敮浠�', url: '/static/icon/mine_ic_daifukuan@2x.png', badge: 0,status:0 },
+ { label: '寰呮敹璐�', url: '/static/icon/mine_ic_daishouhuo@2x.png', badge: 0,status:3 },
+ { label: '閫�娆�/鍞悗', url: '/static/icon/mine_ic_tuikuan@2x.png', badge: 0 ,status:5}
],
menuList: [
{ label: '闂ㄥ簵鍏ラ┗' },
{ label: '鎴戠殑闂ㄥ簵' },
- { label: '瑙勮寖椤荤煡' },
+ { label: '鐢ㄦ埛鏈嶅姟鍗忚' },
+ { label: '鐢ㄦ埛闅愮鏀跨瓥' },
{ label: '鍦ㄧ嚎瀹㈡湇' },
{ label: '鍏充簬鎴戜滑' }
]
}
},
async onShow() {
- await this.$onLaunched
- this.getOrderNum()
+ await this.$onLaunched;
+ if (this.token) {
+ this.getOrderNum()
+ }
+ if (this.userInfo) {
+ if (this.userInfo.shopAuditStatus === 3) {
+ this.menuList[0].label = '闂ㄥ簵淇℃伅'
+ }
+ } else {
+ this.orderMenus = [
+ { label: '寰呮敮浠�', url: '/static/icon/mine_ic_daifukuan@2x.png', badge: 0 },
+ { label: '寰呮敹璐�', url: '/static/icon/mine_ic_daishouhuo@2x.png', badge: 0 },
+ { label: '閫�娆�/鍞悗', url: '/static/icon/mine_ic_tuikuan@2x.png', badge: 0 }
+ ]
+ }
},
methods: {
+ handleProfileClick() {
+ if (this.token) {
+ return
+ }
+ this.showAuthLogin = true
+ },
toAllOrders() {
- uni.navigateTo({
- url: '/pages/orders/orders'
+ uni.switchTab({
+ url: '/pages/itinerary/itinerary'
})
},
+ handleMenuClick(item) {
+ const urlMap = {
+ '闂ㄥ簵鍏ラ┗': '/pages/store-apply/store-apply',
+ '鎴戠殑闂ㄥ簵': '/shop/pages/login/login',
+ '鐢ㄦ埛鏈嶅姟鍗忚': '/pages/rich-text/rich-text?type=0',
+ '鐢ㄦ埛闅愮鏀跨瓥': '/pages/rich-text/rich-text?type=1',
+ '鍏充簬鎴戜滑': '/pages/rich-text/rich-text?type=5'
+ }
+ if (['闂ㄥ簵鍏ラ┗', '鎴戠殑闂ㄥ簵'].includes(item.label)) {
+ if (!this.token) {
+ this.showAuthLogin = true
+ return
+ }
+ }
+ if (['闂ㄥ簵鍏ラ┗','闂ㄥ簵淇℃伅'].includes(item.label) && [0,1,2,3].includes(this.userInfo.shopAuditStatus)) {
+ uni.navigateTo({
+ url: '/pages/details-entry/details-entry'
+ })
+ return
+ }
+ if (item.label!=='鍦ㄧ嚎瀹㈡湇' && urlMap[item.label]) {
+ uni.navigateTo({
+ url: urlMap[item.label]
+ })
+ }
+ },
toOrderDetail(label) {
- uni.navigateTo({
- url: '/pages/orders/orders?status=' + label
+ uni.setStorageSync("orderStatus",label===0?-2:label)
+ uni.switchTab({
+ url: '/pages/itinerary/itinerary'
})
},
toSetting() {
+ if (!this.token) {
+ this.showAuthLogin = true
+ return
+ }
uni.navigateTo({
url: '/pages/settings/settings'
+ })
+ },
+ goService() {
+ uni.navigateTo({
+ url: '/pages/rich-text/rich-text?type=userAgreement'
+ })
+ },
+ goPrivacy() {
+ uni.navigateTo({
+ url: '/pages/rich-text/rich-text?type=privacyPolicy'
})
},
getOrderNum() {
@@ -115,30 +193,6 @@
})
}
})
- },
- // 鎺堟潈鎵嬫満鍙�
- getphonenumber(e) {
- var that = this;
- if (e.detail.errMsg === 'getPhoneNumber:ok') {
- 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.wxAuthPhone({
- code: e.detail.code,
- openid: 'oKKHU5IFKpss_DIbFX1lqghFJOEg'
- }).then(res => {
- if (res.code === 200) {
- that.$store.commit('setUserInfo', res.data.member)
- that.$store.commit('setToken', res.data.token)
- }
- })
- }
- }
- });
- }
}
}
}
@@ -354,4 +408,29 @@
font-size: 30rpx;
color: #222222;
}
+
+ .right-icon {
+ display: flex;
+ align-items: center;
+ gap: 4rpx;
+ text {
+ font-weight: 400;
+ font-size: 24rpx;
+ color: #10B2FA;
+ margin-right: 20rpx;
+ }
+ .status-red {
+ color: #FF0000;
+ }
+ button {
+ position: relative;
+ top: 0;
+ float:right;
+ right: 0;
+ width: 200rpx;
+ height: 48rpx;
+ opacity: 0;
+ z-index: 9999;
+ }
+ }
</style>
--
Gitblit v1.9.3