feat:测试出来的bug
This commit is contained in:
1 parent
e52882238c
commit
fcf18ec1b7
10 files changed
+41
-25
No files matched your search
+6
-5
@@ -6,6 +6,7 @@ const CHAT_ENV = {};
|
||||
if (ENV == 'DEV') {
|
||||
CHAT_ENV.BASE_URL = 'http://chatsever.zianxin.com';
|
||||
CHAT_ENV.WS_URL = 'ws://chatapp.zianxin.com/im';
|
||||
|
||||
// CHAT_ENV.BASE_URL = 'http://127.0.0.1:8888';
|
||||
// CHAT_ENV.WS_URL = 'ws://127.0.0.1:8876/im'
|
||||
|
||||
@@ -18,10 +19,10 @@ if (ENV == 'DEV') {
|
||||
console.log("CHAT_ENV:", CHAT_ENV);
|
||||
|
||||
|
||||
// // 生产
|
||||
// if (ENV == 'PROD') {
|
||||
// CHAT_ENV.BASE_URL = 'http://chatsever.zianxin.com';
|
||||
// CHAT_ENV.WS_URL = 'ws://chatapp.zianxin.com/im';
|
||||
// }
|
||||
// 生产
|
||||
if (ENV == 'PROD') {
|
||||
CHAT_ENV.BASE_URL = 'http://chatsever.zianxin.com';
|
||||
CHAT_ENV.WS_URL = 'ws://chatapp.zianxin.com/im';
|
||||
}
|
||||
|
||||
export default CHAT_ENV;
|
||||
+2
-2
@@ -2,8 +2,8 @@
|
||||
"name" : "荷塘月色",
|
||||
"appid" : "__UNI__5B53E65",
|
||||
"description" : "聊天交友app",
|
||||
"versionName" : "0.0.0",
|
||||
"versionCode" : 1,
|
||||
"versionName" : "0.0.1",
|
||||
"versionCode" : 2,
|
||||
"transformPx" : false,
|
||||
"app-plus" : {
|
||||
"usingComponents" : true,
|
||||
|
||||
@@ -121,6 +121,16 @@ const handleLogin = async () => {
|
||||
)
|
||||
return uni.showToast({ title: '手机号格式错误', icon: 'none' });
|
||||
if (!smsCode.value) return uni.showToast({ title: '请填写验证码', icon: 'none' });
|
||||
|
||||
// #ifdef MP-WEIXIN
|
||||
if (!isAgree.value) {
|
||||
uni.showToast({ title: '请先同意授权', icon: 'none' });
|
||||
return
|
||||
}
|
||||
disposeLogin();
|
||||
// #endif
|
||||
|
||||
// #ifndef MP-WEIXIN
|
||||
if (!isAgree.value) {
|
||||
agreeMessage
|
||||
.confirm({
|
||||
@@ -133,6 +143,7 @@ const handleLogin = async () => {
|
||||
return;
|
||||
}
|
||||
disposeLogin();
|
||||
// #endif
|
||||
};
|
||||
|
||||
const disposeLogin = async () => {
|
||||
|
||||
@@ -1295,11 +1295,13 @@ export default {
|
||||
},
|
||||
},
|
||||
},
|
||||
onLoad(options) {
|
||||
async onLoad(options) {
|
||||
this.userId = options.memberId
|
||||
// 聊天数据
|
||||
if (options.chatIdx == -200) {
|
||||
if (options.chatIdx == -200 && options.memberId == -200) {
|
||||
await this.friendStore.loadFriend();
|
||||
this.chat = this.chatStore.chats.find((chat) => chat.targetId == this.userId);
|
||||
console.log("chat:", this.chat);
|
||||
} else {
|
||||
this.chat = this.chatStore.chats[options.chatIdx];
|
||||
}
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
</template>
|
||||
<template #title>
|
||||
<view class="flex items-center h-full">
|
||||
<segmented v-model="current" :items="segmentedItems" />
|
||||
<segmented :item-widht="60" v-model="current" :items="segmentedItems" />
|
||||
</view>
|
||||
</template>
|
||||
</wd-navbar>
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
</template>
|
||||
</wd-navbar>
|
||||
|
||||
<wd-tabs v-model="activeTab">
|
||||
<wd-tabs v-model="activeTab" swipeable>
|
||||
<wd-tab title="我看过的">
|
||||
<scroll-list style="height: calc(100dvh - 44px - 50px - 42px)" :loadMoreStatus="loadMoreStatus_seenIt"
|
||||
@refresh="refreshList_seenIt" @loadMore="listLoadMore_seenIt">
|
||||
|
||||
@@ -136,3 +136,11 @@ const goSelectAddress = () => {
|
||||
});
|
||||
};
|
||||
</script>
|
||||
|
||||
<style lang="scss">
|
||||
.wd-navbar {
|
||||
.wd-navbar__title {
|
||||
max-width: 70% !important;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@@ -14,7 +14,7 @@
|
||||
</wd-navbar>
|
||||
|
||||
<swiper :current="current" style="height: calc(100vh - 44rpx - 100rpx)"
|
||||
@change="(e) => (current = e.detail.current)" :duration="200" disable-touch>
|
||||
@change="(e) => (current = e.detail.current)" :duration="200">
|
||||
<swiper-item v-for="(item, index) in segmentedItems" :key="index">
|
||||
<scroll-moment :scene="item['search-action']" />
|
||||
</swiper-item>
|
||||
|
||||
@@ -244,16 +244,8 @@ const subOfficial = () => {
|
||||
confirmButtonText: "保存图片",
|
||||
})
|
||||
.then(async () => {
|
||||
// 首先请求存储权限
|
||||
// #ifdef APP-PLUS || MP-WEIXIN
|
||||
const permissionStatus = await requestPermission("location")
|
||||
// 已拒绝|受限
|
||||
if (permissionStatus === 'denied') {
|
||||
gotoAppPermissionSetting()
|
||||
}
|
||||
// #endif
|
||||
uni.saveImageToPhotosAlbum({
|
||||
filePath: "/src/static/gzh/gzh.jpg",
|
||||
filePath: "http://hch5.zianxin.com/gzh.jpg",
|
||||
success: () => {
|
||||
uni.showToast({ title: '保存成功', icon: 'success' });
|
||||
},
|
||||
@@ -274,7 +266,7 @@ const goFeedback = () => {
|
||||
|
||||
// 菜单
|
||||
const MenuCellList = [
|
||||
{ title: '我的收益', value: '', icon: 'wallet', to: '/pages/wechat-tabbar/index' },
|
||||
// { title: '我的收益', value: '', icon: 'wallet', to: '/pages/wechat-tabbar/index' },
|
||||
{ title: '访客记录', value: '', icon: 'browse', to: '/pages/profile/view-record' },
|
||||
{ title: '认证中心', value: '', icon: 'user', to: '/pages/profile/verify-status' },
|
||||
{ title: '联系方式', value: '修改微信需客服核实', icon: 'user', to: '/pages/profile/set-wechat' },
|
||||
|
||||
@@ -17,10 +17,12 @@ import { computed } from 'vue';
|
||||
|
||||
const props = withDefaults(
|
||||
defineProps<{
|
||||
itemWidht?: number | string;
|
||||
items?: { label: string }[];
|
||||
modelValue?: number | string;
|
||||
}>(),
|
||||
{
|
||||
itemWidht: 50,
|
||||
items: () => [],
|
||||
modelValue: 0,
|
||||
},
|
||||
@@ -31,15 +33,15 @@ const emit = defineEmits<{
|
||||
}>();
|
||||
|
||||
const activeStyle = computed(() => {
|
||||
const x = 60 * Number(props.modelValue);
|
||||
const x = Number(props.itemWidht) * Number(props.modelValue);
|
||||
return {
|
||||
width: `${60}px`,
|
||||
width: `${Number(props.itemWidht)}px`,
|
||||
transform: `translate3d(${x}px, 0, 0)`,
|
||||
};
|
||||
});
|
||||
|
||||
const segmentedWidth = computed(() => {
|
||||
return { width: `${props.items.length * 60}px` };
|
||||
return { width: `${props.items.length * Number(props.itemWidht)}px` };
|
||||
});
|
||||
|
||||
function segmentedItem(item: { label: string }, index: number) {
|
||||
|
||||
Reference in new issue
Block a user