bimwe/mini-programs
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feat/liujie'

Browse Source
This commit is contained in:
刘杰
2025-09-04 18:59:48 +08:00
parent 248acc1423 1012f75eac
commit bc26732558
7 changed files with 151 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/UploadCover/upload-from-wx.tsx
View File

@@ -27,8 +27,8 @@ export default function UploadFromWx(props: UploadFromWxProps) {
let count = 0
const files = res.tempFiles.map(item => ({
filePath: item.path,
description: 'test',
tags: 'test',
description: '封面图',
tags: 'cover',
is_public: 1 as unknown as 0 | 1,
id: (Date.now() + count++).toString(),
}))

22
src/components/UploadCover/upload-source-popup.tsx
View File

@@ -57,27 +57,17 @@ export default forwardRef(function UploadImage(props: UploadImageProps, ref) {
setVisible(true)
setSourceType(sourceType)
setMaxCount(maxCount)
fetchImages()
fetchImages(sourceType)
}
}))
function fetchImages() {
publishService.getPictures({
pageOption: {
page: 1,
pageSize: 100,
},
seachOption: {
tag: '',
resource_type: 'image',
dateRange: [],
},
}).then(res => {
if (res.success) {
function fetchImages(st: SourceType) {
publishService.getPictures({ type: st }).then(res => {
if (res.code === 0) {
let start = 0
setImages(res.data.data.rows.map(item => ({
setImages(res.data.rows.map(item => ({
id: (Date.now() + start++).toString(),
url: item.thumbnail_url,
url: item.file_url,
})))
} else {
// TODO: 显示错误信息

32
src/pages/detail/index.scss
View File

@@ -81,6 +81,38 @@
background-color: rgba(0, 0, 0, 0.3);
}
.detail-swiper-container {
height: 240px;
margin-top: 15px;
margin-left: 15px;
margin-right: 15px;
overflow-x: scroll;
.detail-swiper-scroll-container {
display: flex;
height: 240px;
width: auto;
align-items: center;
justify-content: flex-start;
flex-wrap: nowrap;
gap: 12px;
.detail-swiper-item {
flex: 0 0 auto;
max-width: calc(100vw - 30px);
max-height: 240px;
&-image {
max-width: 100%;
max-height: 100%;
width: 300px;
height: 300px;
border-radius: 12px;
transition: transform 0.5s;
}
}
}
}
.detail-swiper {
height: 240px;
margin-top: 15px;

68
src/pages/detail/index.tsx
View File

@@ -4,6 +4,8 @@ import { Cell, Avatar, Progress, Popover } from '@nutui/nutui-react-taro'
import Taro, { useRouter, useShareAppMessage, useShareTimeline, useDidShow } from '@tarojs/taro'
// 导入API服务
import DetailService from '../../services/detailService'
import { updateUserProfile } from '../../services/loginService'
import { getCurrentLocation } from '../../utils/locationUtils'
import {
useUserStats,
useUserActions
@@ -94,7 +96,7 @@ function Index() {
// const { incrementRequestCount, resetUserStats } = useUserActions()
const [current, setCurrent] = useState(0)
const [colors, setColors] = useState<string []>([])
// const [textColor, setTextColor] = useState<string []>([])
const [detail, setDetail] = useState<any>(null)
const { params } = useRouter()
const { id, autoShare, from } = params
@@ -111,11 +113,22 @@ function Index() {
// calcBgMainColors()
// }, [])
useDidShow(() => {
fetchDetail()
calcBgMainColors()
useDidShow(async () => {
await updateLocation()
await fetchDetail()
// calcBgMainColors()
})
const updateLocation = async () => {
try {
const location = await getCurrentLocation()
await updateUserProfile({ latitude: location.latitude, longitude: location.longitude })
console.log('用户位置更新成功')
} catch (error) {
console.error('用户位置更新失败', error)
}
}
const fetchDetail = async () => {
const res = await DetailService.getDetail(Number(id))
if (res.code === 0) {
@@ -124,14 +137,18 @@ function Index() {
}
}
const calcBgMainColors = async () => {
const textcolors: string[] = []
for (const index in images) {
const { textColor } = await getTextColorOnImage(images[index])
textcolors[index] = textColor
}
setColors(textcolors)
}
// const calcBgMainColors = async () => {
// const textcolors: string[] = []
// // for (const index in images) {
// // const { textColor } = await getTextColorOnImage(images[index])
// // textcolors[index] = textColor
// // }
// if (detail?.image_list?.length > 0) {
// const { textColor } = await getTextColorOnImage(detail.image_list[0])
// textcolors[0] = textColor
// }
// setColors(textcolors)
// }
function handleShare() {
sharePopupRef.current.show()
@@ -241,10 +258,27 @@ function Index() {
</View>
</View>
</view>
<View className='detail-page-bg' style={{ backgroundImage: `url(${images[current]})` }} />
<View className='detail-page-bg' style={{ backgroundImage: `url(${images[0]})` }} />
<View className='detail-page-bg-text' />
{/* swiper */}
<Swiper
<View className="detail-swiper-container">
<View className="detail-swiper-scroll-container">
{
detail?.image_list?.length > 0 && detail?.image_list.map((item, index) => {
return (
<View className='detail-swiper-item' key={index}>
<Image
src={item}
mode="aspectFill"
className='detail-swiper-item-image'
/>
</View>
)
})
}
</View>
</View>
{/* <Swiper
className='detail-swiper'
indicatorDots={false}
circular
@@ -266,7 +300,7 @@ function Index() {
/>
</SwiperItem>
))}
</Swiper>
</Swiper> */}
{/* content */}
<View className='detail-page-content'>
{/* avatar and tags */}
@@ -552,10 +586,10 @@ function Index() {
</View>
</View>
{/* share popup */}
<SharePopup ref={sharePopupRef} id={id} from={from} />
<SharePopup ref={sharePopupRef} id={id as string} from={from as string} />
</View>
</View>
)
}
export default Index
export default Index

2
src/services/httpService.ts
View File

@@ -58,7 +58,7 @@ class HttpService {
// 构建完整URL
private buildUrl(url: string, params?: Record<string, any>): string {
const fullUrl = url.startsWith('http') ? url : `${this.baseURL}${url}`
const fullUrl = url.startsWith('http') ? url : `${this.baseURL}${url.startsWith('/') ? url.slice(1) : url}`
if (params) {
const searchParams = new URLSearchParams()

33
src/services/loginService.ts
View File

@@ -43,7 +43,7 @@ export const wechat_auth_login = async (phone_code?: string): Promise<LoginRespo
try {
// 先进行微信登录获取code
const login_result = await Taro.login();
if (!login_result.code) {
return {
success: false,
@@ -93,7 +93,7 @@ export const phone_auth_login = async (params: PhoneLoginParams): Promise<LoginR
phone: params.phone,
code: params.verification_code
});
if (verify_response.code===0) {
return {
success: true,
@@ -130,7 +130,7 @@ export const send_sms_code = async (phone: string): Promise<SmsResponse> => {
const response = await httpService.post('user/sms/send', {
phone: phone
});
// 修复响应检查逻辑：检查 code === 0 或 success === true
if (response.code === 0 || response.success === true) {
return {
@@ -159,7 +159,7 @@ export const verify_sms_code = async (phone: string, code: string): Promise<Veri
phone: phone,
code: code
});
return {
success: response.success,
message: response.message || '验证失败',
@@ -207,7 +207,7 @@ export const save_login_state = (token: string, user_info: WechatUserInfo) => {
accessToken: token,
expiresAt: expires_at
});
// 保存用户信息
Taro.setStorageSync('user_info', user_info);
Taro.setStorageSync('is_logged_in', true);
@@ -222,7 +222,7 @@ export const clear_login_state = () => {
try {
// 使用 tokenManager 清除令牌
tokenManager.clearTokens();
// 清除其他登录状态
Taro.removeStorageSync('user_info');
Taro.removeStorageSync('is_logged_in');
@@ -240,7 +240,7 @@ export const check_login_status = (): boolean => {
clear_login_state();
return false;
}
const is_logged_in = Taro.getStorageSync('is_logged_in');
return !!is_logged_in;
} catch (error) {
@@ -265,7 +265,7 @@ export const get_token_status = () => {
const is_valid = tokenManager.hasValidToken();
const remaining_time = tokenManager.getTokenRemainingTime();
const is_expired = tokenManager.isTokenExpired();
return {
is_valid,
remaining_time,
@@ -317,17 +317,28 @@ export const refresh_login_status = async (): Promise<boolean> => {
try {
// 检查微信登录状态
const is_valid = await check_wechat_login();
if (!is_valid) {
// 微信登录已过期，需要重新登录
clear_login_state();
return false;
}
// 检查本地存储的登录状态
return check_login_status();
} catch (error) {
console.error('刷新登录状态失败:', error);
return false;
}
};
};
// 更新用户信息
export const updateUserProfile = async (payload: Partial<WechatUserInfo> & { latitude?: number; longitude?: number; }) => {
try {
const response = await httpService.post('user/update', payload);
return response;
} catch (error) {
console.error('更新用户信息失败:', error);
throw error;
}
};

38
src/services/publishService.ts
View File

@@ -129,12 +129,48 @@ class PublishService {
loadingText: '发布中...'
})
}
async getPictures(req: getPicturesReq): Promise<ApiResponse<getPicturesRes>> {
async getHistoryImageList(req: getPicturesReq): Promise<getPicturesRes> {
return httpService.post('/gallery/list', req, {
showLoading: false,
showToast: false,
})
}
async getPresetImageList(req: getPicturesReq): Promise<getPicturesRes> {
return httpService.post('/gallery/sys_img_list', req, {
showLoading: false,
showToast: false,
})
}
async getPictures(req) {
const { type, otherReq = {} } = req
if (type === 'history') {
return this.getHistoryImageList({
pageOption: {
page: 1,
pageSize: 100,
},
seachOption: {
tag: 'cover',
resource_type: 'image',
dateRange: [],
},
...otherReq,
})
} else {
return this.getPresetImageList({
pageOption: {
page: 1,
pageSize: 100,
},
seachOption: {
tag: '',
resource_type: 'image',
dateRange: [],
},
...otherReq,
})
}
}
}
// 导出认证服务实例