Merge branch 'main' of https://git.nuttyreading.com/zm/taimed-international-app

pages/user/myBook/index.vue

@@ -68,7 +68,7 @@ function goToDetail(bookId: number) {
 
 function goToReader(bookId: number) {
   uni.navigateTo({
-    url: `/pages/book/reader?isBuy=0&bookId=${bookId}`
+    url: `/pages/book/reader?isBuy=1&bookId=${bookId}`
   })
 }
 

pages/user/profile/index.vue

@@ -7,7 +7,7 @@
       <!-- 头像区域 -->
       <view class="avatar-section">
         <image 
-          :src="userInfo.avatar || defaultAvatar" 
+          :src="userInfo.avatar" 
           class="avatar"
           @click="editAvatar"
         />
@@ -148,7 +148,7 @@ const { t } = useI18n()
 const userStore = useUserStore()
 
 // 默认头像
-const defaultAvatar = '/static/home_icon.png'
+const defaultAvatar = '/static/logo.png'
 
 // 字段列表
 const fields = computed(() => [
@@ -200,10 +200,9 @@ const avatarUrl = ref('')
 const userInfo = ref<any>({}) // 用户信息
 const getData = async () => {
   const res = await getUserInfo()
-  if (res.result) {
-    userStore.setUserInfo(res.result)
-    userInfo.value = res.result
-  }
+  userStore.setUserInfo(res.result)
+  userInfo.value = res.result
+  userInfo.value.avatar = res.result.avatar || defaultAvatar
 }
 
 /**