From 9e0d2563ee3adc08b27f365e315855d776fd08f0 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 11 七月 2025 10:00:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 pages/tabbar/user/my.vue |   69 ++++++++++++++++++++++++++++++++--
 1 files changed, 64 insertions(+), 5 deletions(-)

diff --git a/pages/tabbar/user/my.vue b/pages/tabbar/user/my.vue
index a86a497..b1327ef 100644
--- a/pages/tabbar/user/my.vue
+++ b/pages/tabbar/user/my.vue
@@ -6,7 +6,8 @@
     </view>
     <view class="header"  @click="userDetail">
       <view class="head-1">
-        <image :src="userInfo.face || userImage"></image>
+        <image v-if="userInfo.face" :src="endpoint + '/' + userInfo.face"></image>
+        <image v-else :src="userImage"></image>
       </view>
       <view class="head-2" v-if="userInfo.id">
         <view class="user-name">{{ userInfo.nickName }}</view>
@@ -68,24 +69,67 @@
         </view>
       </view>
     </div>
+	
+	<!-- 瑙嗛鐩稿叧锛� -->
+	<div class="pointBox box" style="margin-top: 20rpx;">
+	  <view class="order">
+	    <view class="order-item" @click="jumpToVideoHome()">
+	      <view>
+	        <text class="iconfont">&#xe676;</text>
+	      </view>
+	      <view>瑙嗛涓婚〉</view>
+	    </view>
+	    <view class="order-item" @click="navigateTo('/pages/mine/myAttention')">
+	      <view>
+	        <text class="iconfont">&#xe66f;</text>
+	      </view>
+	      <view>鍏虫敞鍒楄〃</view>
+	    </view>
+	    <view class="order-item" @click="navigateTo('/pages/mine/myCollect/myCollect')">
+	      <view>
+	        <text class="iconfont">&#xe608;</text>
+	      </view>
+	      <view>鏀惰棌鍒楄〃</view>
+	    </view>
+		<view class="order-item" @click="navigateTo('/pages/mine/activity/myActivity')">
+		  <view>
+		    <text class="iconfont">&#xe635;</text>
+		  </view>
+		  <view>鎴戠殑娲诲姩</view>
+		</view>
+		<view class="order-item" @click="navigateTo('/pages/mine/myTracks')">
+		  <view>
+		    <text class="iconfont">&#xe738;</text>
+		  </view>
+		  <view>娴忚璁板綍</view>
+		</view>
+	  </view>
+	</div>
+	
     <!-- 甯哥敤宸ュ叿 -->
-
-    <tool />
+	<view class="pointBox box" style="margin-top: 20rpx;">
+		<tool />
+	</view>
+    
+	
   <custom-tabbar bgColor="#ffffff" selected="my"></custom-tabbar>
   </view>
 </template>
 <script>
 import '@/components/uview-components/uview-ui';
 import tool from "@/pages/tabbar/user/utils/tool.vue";
+import { getSTSToken } from "@/api/common.js";
 import { getCouponsNum, getFootprintNum } from "@/api/members.js";
 import { getUserWallet } from "@/api/members";
 import configs from '@/config/config'
+import storage from '@/utils/storage.js'
 export default {
   components: {
     tool
   },
   data() {
     return {
+	  endpoint: '',
       configs,
       userImage:configs.defaultUserPhoto,
       coverTransform: "translateY(0px)",
@@ -97,7 +141,9 @@
       walletNum: "",
     };
   },
-  onLoad() { },
+  onLoad() {
+	  this.initCOS()
+  },
   onShow() {
     this.userInfo = this.$options.filters.isLogin() || {};
     if (this.$options.filters.isLogin("auth")) {
@@ -123,6 +169,19 @@
 
   mounted() { },
   methods: {
+	  // 鍒濆鍖栬吘璁簯cos瀹㈡埛绔�
+	  initCOS() {
+		  // 璋冪敤鍚庣鑾峰彇sts涓存椂璁块棶鍑瘉
+		  getSTSToken().then(res => {
+			   this.endpoint = res.data.data.endpoint
+		  })
+	  },
+	  // 璺宠浆瑙嗛涓婚〉
+	  jumpToVideoHome() {
+		  uni.navigateTo({
+		    url: '/pages/video/home-page?authorId=' + storage.getUserInfo().id
+		  });
+	  },
     /**
      * 缁熶竴璺宠浆鎺ュ彛,鎷︽埅鏈櫥褰曡矾鐢�
      * navigator鏍囩鐜板湪榛樿娌℃湁杞満鍔ㄧ敾锛屾墍浠ョ敤view
@@ -171,7 +230,7 @@
   .header {
     max-width: 100%;
     padding: calc(50rpx + var(--status-bar-height)) 30rpx 0 6%;
-    height: calc(var(--status-bar-height) + 360rpx);
+    height: calc(360rpx);
     background-size: cover;
     border-bottom-left-radius: 30rpx;
     border-bottom-right-radius: 30rpx;

--
Gitblit v1.8.0