From d3d0b4dbb4f1f8c4784c834e0a39feba8aa5afa5 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期三, 02 七月 2025 10:41:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
pages/tabbar/user/utils/tool.vue | 54 ++++++++++++++++++++++++++++++++----------------------
1 files changed, 32 insertions(+), 22 deletions(-)
diff --git a/pages/tabbar/user/utils/tool.vue b/pages/tabbar/user/utils/tool.vue
index 21aa150..c7567f9 100644
--- a/pages/tabbar/user/utils/tool.vue
+++ b/pages/tabbar/user/utils/tool.vue
@@ -42,19 +42,14 @@
<view>鎴戠殑鍒嗛攢</view>
</view> -->
- <view class="interact-item" @click="navigateTo('/pages/mine/myCollect')">
+ <!-- <view class="interact-item" @click="navigateTo('/pages/mine/myCollect')">
<image src="/static/mine/shensu.png" mode=""></image>
<view>鎴戠殑鏀惰棌</view>
- </view>
+ </view> -->
<view class="interact-item" @click="navigateTo('/pages/mine/activity/myActivity')">
<image src="/static/mine/shensu.png" mode=""></image>
<view>鎴戠殑娲诲姩</view>
- </view>
-
- <view class="interact-item" @click="navigateTo('/pages/mine/activity/reportActivity')">
- <image src="/static/mine/shensu.png" mode=""></image>
- <view>娲诲姩</view>
</view>
<view class="interact-item" @click="navigateTo('/pages/mine/myCollect/myCollect')">
@@ -62,15 +57,19 @@
<view>鎴戠殑鏀惰棌</view>
</view>
- <view class="interact-item" @click="navigateTo('/pages/userPermissions/userPermissions')">
+ <view class="interact-item" v-if="isStoreManger" @click="navigateTo('/pages/userPermissions/userPermissions')">
<image src="/static/mine/shensu.png" mode=""></image>
<view>鐢ㄦ埛鏉冮檺</view>
</view>
+ <view class="interact-item" v-if="isStoreManger" @click="navigateTo('/pages/news/news')">
+ <image src="/static/mine/shensu.png" mode=""></image>
+ <view>鏂伴椈</view>
+ </view>
- <view class="interact-item" @click="navigateTo('/pages/customerManager/customerManager')">
+ <!-- <view class="interact-item" v-if="isStoreManger" @click="navigateTo('/pages/customerManager/customerManager')">
<image src="/static/mine/shensu.png" mode=""></image>
<view>瀹㈡埛绠＄悊</view>
- </view>
+ </view> -->
<view class="interact-item" @click="navigateTo('/pages/order/complain/complainList')">
<image src="/static/mine/shensu.png" mode=""></image>
<view>鎴戠殑鎶曡瘔</view>
@@ -84,15 +83,10 @@
- <view class="interact-item" @click="navigateTo('/pages/mine/signIn')">
+<!-- <view class="interact-item" @click="navigateTo('/pages/mine/signIn')">
<image src="/static/mine/sign.png" mode=""></image>
<view>姣忔棩绛惧埌</view>
- </view>
-
-
-
-
-
+ </view> -->
<view class="interact-item" @click="navigateTo('/pages/cart/coupon/couponCenter')">
<image src="/static/mine/couponcenter.png" mode=""></image>
@@ -101,10 +95,10 @@
- <view class="interact-item" @click="navigateTo('/pages/promotion/bargain/log')">
+<!-- <view class="interact-item" @click="navigateTo('/pages/promotion/bargain/log')">
<image src="/static/mine/kanjia.png" mode=""></image>
<view>鐮嶄环璁板綍</view>
- </view>
+ </view> -->
@@ -132,7 +126,10 @@
<image src="/static/mine/setting.png" mode=""></image>
<view>鍟嗗搧绠＄悊</view>
</view>
-
+ <view class="interact-item" @click="navigateTo('/pages/goods-manager/goodsList/goodsList')">
+ <image src="/static/mine/order.png" mode=""></image>
+ <view>鍟嗘埛璁㈠崟绠＄悊</view>
+ </view>
</view>
</div>
@@ -141,7 +138,8 @@
</template>
<script>
- import {
+ import { getUserInfo } from "@/api/members";
+import {
distribution
} from "@/api/goods";
import configs from "@/config/config";
@@ -150,12 +148,24 @@
export default {
data() {
return {
+ isStoreManger:false,
configs,
storage
}
},
-
+ onReady(){
+ getUserInfo().then(res => {
+ if(res.data.result){
+ if(res.data.result.storeId){
+ this.isStoreManger = true;
+ }else{
+ this.isStoreManger = false;
+ }
+ }
+ })
+ },
methods: {
+
handleNavigate(url) {
uni.navigateTo({
url,
--
Gitblit v1.8.0