From aea82fc6285fd37a33e0efd6cd0e5089dfa32faf Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 01 九月 2025 22:05:58 +0800
Subject: [PATCH] Merge branch 'dev_fix_sub' of http://42.193.1.25:9521/r/lmk-shop-wx into dev_fix_sub
---
pages/tabbar/user/utils/tool.vue | 40 +++++++++++++++++++++++++++++++++-------
1 files changed, 33 insertions(+), 7 deletions(-)
diff --git a/pages/tabbar/user/utils/tool.vue b/pages/tabbar/user/utils/tool.vue
index 8c5452f..f7280c8 100644
--- a/pages/tabbar/user/utils/tool.vue
+++ b/pages/tabbar/user/utils/tool.vue
@@ -3,7 +3,7 @@
<!-- 甯哥敤宸ュ叿 -->
<view class="interact-tools" style="margin-bottom: 15px">
- <div class="paddingBox">
+ <view class="paddingBox">
<view class="interact-container">
<view class="interact-item" @click="navigateTo('/pages/mine/address/addressManage')">
<image src="/static/mine/myaddress.png" mode=""></image>
@@ -50,10 +50,10 @@
<!-- <view class="interact-item" @click="navigateTo('/pages/mine/activity/myActivity')">
<image src="/static/mine/shensu.png" mode=""></image>
<view>鎴戠殑娲诲姩</view>
- </view>
</view> -->
+<!-- </view>-->
- <view class="interact-item" v-if="isStoreManger" @click="navigateTo('/pages/mine/activity/applayActivityList')">
+ <view class="interact-item" v-if="isStoreManger" @click="navigateTo('/pages/mine/activity/applyActivityList')">
<image src="/static/mine/shensu.png" mode=""></image>
<view>鐢宠娲诲姩</view>
</view>
@@ -65,11 +65,11 @@
<view class="interact-item" v-if="isStoreManger" @click="navigateTo('/pages/userPermissions/userPermissions')">
<image src="/static/mine/shensu.png" mode=""></image>
- <view>鏂板搴楀憳</view>
+ <view>搴楀憳绠＄悊</view>
</view>
<view class="interact-item" @click="navigateTo('/pages/news/news')">
<image src="/static/mine/shensu.png" mode=""></image>
- <view>鏂伴椈</view>
+ <view>蹇</view>
</view>
<!-- <view class="interact-item" v-if="isStoreManger" @click="navigateTo('/pages/customerManager/customerManager')">
@@ -120,7 +120,7 @@
<view class="interact-item" @click="navigateTo('/pages/passport/entry/seller/index')">
<image src="/static/mine/feedback.png" mode=""></image>
- <view>搴楅摵鍏ラ┗</view>
+ <view>渚涘簲鍟嗗叆椹�</view>
</view>
@@ -136,15 +136,25 @@
<image src="/static/mine/order.png" mode=""></image>
<view>鍟嗘埛璁㈠崟绠＄悊</view>
</view>
+
+ <view class="interact-item" v-if="prizeActivityId !== null && prizeActivityId !==''" @click="gotoPrizeActivity()">
+ <image src="/static/mine/prize-activity.png"></image>
+ <view>鎶藉娲诲姩</view>
+ </view>
+ <view class="interact-item" @click="navigateTo('/pages/prizeRecord/prizeRecord')">
+ <image src="/static/mine/prize-record.png"></image>
+ <view>鎶藉璁板綍</view>
+ </view>
</view>
- </div>
+ </view>
</view>
</view>
</template>
<script>
import { getUserInfo } from "@/api/members";
+ import {getONPrizeActivity} from '@/api/prize-activity.js'
import {
distribution
} from "@/api/goods";
@@ -154,6 +164,7 @@
export default {
data() {
return {
+ prizeActivityId:'',
isStoreManger:false,
configs,
storage
@@ -169,8 +180,23 @@
}
}
})
+ this.getONPrizeActivity();
},
+
methods: {
+ getONPrizeActivity(){
+ getONPrizeActivity().then(res =>{
+ if(res.statusCode=== 200){
+ //鍚庣娌℃煡鍒板紑鍚殑鎶藉娲诲姩 res.data.data.id鍊间负null
+ this.prizeActivityId = res.data.data.id;
+ }
+ })
+ },
+ gotoPrizeActivity(){
+ uni.navigateTo({
+ url:'/pages/prize/PrizeDetail/PrizeDetail?id=' + this.prizeActivityId,
+ });
+ },
handleNavigate(url) {
uni.navigateTo({
--
Gitblit v1.8.0