Commit c3b1ff5f by wxl

fix g

parent b1b39906
...@@ -24,8 +24,8 @@ export default { ...@@ -24,8 +24,8 @@ export default {
{ {
"pagePath": "pages/index/index", "pagePath": "pages/index/index",
"text": "联系人", "text": "联系人",
"iconPath": "assets/Contact.png", "iconPath": "assets/contact-off3x.png",
"selectedIconPath": "assets/Contact-Check.png" "selectedIconPath": "assets/contact-on3x.png"
}, },
{ {
"pagePath": "pages/task/index", "pagePath": "pages/task/index",
...@@ -36,8 +36,8 @@ export default { ...@@ -36,8 +36,8 @@ export default {
{ {
"pagePath": "pages/mine/index", "pagePath": "pages/mine/index",
"text": "个人中心", "text": "个人中心",
"iconPath": "assets/Personal@3x.png", "iconPath": "assets/user-off3x.png",
"selectedIconPath": "assets/Personal-Check@3x.png" "selectedIconPath": "assets/user-on3x.png"
} }
] ]
} }
......
src/assets/Contact - Check.png

780 Bytes | W: | H:

src/assets/Contact - Check.png

492 Bytes | W: | H:

src/assets/Contact - Check.png
src/assets/Contact - Check.png
src/assets/Contact - Check.png
src/assets/Contact - Check.png
  • 2-up
  • Swipe
  • Onion skin
src/assets/Contact - Check@2x.png

890 Bytes | W: | H:

src/assets/Contact - Check@2x.png

780 Bytes | W: | H:

src/assets/Contact - Check@2x.png
src/assets/Contact - Check@2x.png
src/assets/Contact - Check@2x.png
src/assets/Contact - Check@2x.png
  • 2-up
  • Swipe
  • Onion skin
src/assets/Contact - Check@3x.png

1.21 KB | W: | H:

src/assets/Contact - Check@3x.png

1.15 KB | W: | H:

src/assets/Contact - Check@3x.png
src/assets/Contact - Check@3x.png
src/assets/Contact - Check@3x.png
src/assets/Contact - Check@3x.png
  • 2-up
  • Swipe
  • Onion skin
src/assets/Contact.png

982 Bytes | W: | H:

src/assets/Contact.png

601 Bytes | W: | H:

src/assets/Contact.png
src/assets/Contact.png
src/assets/Contact.png
src/assets/Contact.png
  • 2-up
  • Swipe
  • Onion skin
src/assets/Contact@2x.png

1019 Bytes | W: | H:

src/assets/Contact@2x.png

982 Bytes | W: | H:

src/assets/Contact@2x.png
src/assets/Contact@2x.png
src/assets/Contact@2x.png
src/assets/Contact@2x.png
  • 2-up
  • Swipe
  • Onion skin
src/assets/Contact@3x.png

1.47 KB | W: | H:

src/assets/Contact@3x.png

1.38 KB | W: | H:

src/assets/Contact@3x.png
src/assets/Contact@3x.png
src/assets/Contact@3x.png
src/assets/Contact@3x.png
  • 2-up
  • Swipe
  • Onion skin
src/assets/Personal - Check.png

812 Bytes | W: | H:

src/assets/Personal - Check.png

497 Bytes | W: | H:

src/assets/Personal - Check.png
src/assets/Personal - Check.png
src/assets/Personal - Check.png
src/assets/Personal - Check.png
  • 2-up
  • Swipe
  • Onion skin
src/assets/Personal.png

963 Bytes | W: | H:

src/assets/Personal.png

512 Bytes | W: | H:

src/assets/Personal.png
src/assets/Personal.png
src/assets/Personal.png
src/assets/Personal.png
  • 2-up
  • Swipe
  • Onion skin
src/assets/answer.png

1.59 KB | W: | H:

src/assets/answer.png

1.52 KB | W: | H:

src/assets/answer.png
src/assets/answer.png
src/assets/answer.png
src/assets/answer.png
  • 2-up
  • Swipe
  • Onion skin
src/assets/call-no.png

1.39 KB | W: | H:

src/assets/call-no.png

747 Bytes | W: | H:

src/assets/call-no.png
src/assets/call-no.png
src/assets/call-no.png
src/assets/call-no.png
  • 2-up
  • Swipe
  • Onion skin
src/assets/call-small.png

393 Bytes | W: | H:

src/assets/call-small.png

237 Bytes | W: | H:

src/assets/call-small.png
src/assets/call-small.png
src/assets/call-small.png
src/assets/call-small.png
  • 2-up
  • Swipe
  • Onion skin
src/assets/call.png

1.51 KB | W: | H:

src/assets/call.png

805 Bytes | W: | H:

src/assets/call.png
src/assets/call.png
src/assets/call.png
src/assets/call.png
  • 2-up
  • Swipe
  • Onion skin
...@@ -56,8 +56,8 @@ ...@@ -56,8 +56,8 @@
padding: 0 20px; padding: 0 20px;
} }
.call{ .call{
width: 65px; width: 85px;
height: 65px; height: 85px;
} }
} }
</style> </style>
\ No newline at end of file
...@@ -57,13 +57,14 @@ ...@@ -57,13 +57,14 @@
position: absolute; position: absolute;
width: 50%; width: 50%;
height: 50%; height: 50%;
top:25%; top:50%;
left:25%; left:50%;
transform: translate(-50%, -50%);
} }
.name{ .name{
position: absolute; position: absolute;
top: 10px; bottom: 10px;
left: 10px; right: 10px;
} }
} }
} }
......
...@@ -53,8 +53,9 @@ ...@@ -53,8 +53,9 @@
position: absolute; position: absolute;
width: 50%; width: 50%;
height: 50%; height: 50%;
top:25%; top:50%;
left:25%; left:50%;
transform: translate(-50%, -50%);
} }
.name{ .name{
position: absolute; position: absolute;
......
...@@ -34,8 +34,8 @@ import { useMeetingCenter } from 'any-hooks/communication/useMeetingCenter'; ...@@ -34,8 +34,8 @@ import { useMeetingCenter } from 'any-hooks/communication/useMeetingCenter';
</view> </view>
<view class="operators" v-if="myCallState!=='idle'"> <view class="operators" v-if="myCallState!=='idle'">
<image v-if="myCallState==='callin'" @tap="answerCaller('Connect')" class="op-icon" src="../../assets/answer3x.png"></image>
<image @tap="onTapHangup()" class="op-icon" src="../../assets/hangup.png"></image> <image @tap="onTapHangup()" class="op-icon" src="../../assets/hangup.png"></image>
<image v-if="myCallState==='callin'" @tap="answerCaller('Connect')" class="op-icon" src="../../assets/answer3x.png"></image>
</view> </view>
</view> </view>
</template> </template>
......
...@@ -54,7 +54,7 @@ const onCall = (data: any) => { ...@@ -54,7 +54,7 @@ const onCall = (data: any) => {
</view> </view>
<view class="call-btn" @tap="onCall(currentContact)" v-if="currentContact.is_signin==='1'"> <view class="call-btn" @tap="onCall(currentContact)" v-if="currentContact.is_signin==='1'">
<image class="call-icon" src="../../assets/call-small2x.png"></image> <image class="call-icon" src="../../assets/call-small@3x.png"></image>
&nbsp;&nbsp; &nbsp;&nbsp;
<text>视频通话</text> <text>视频通话</text>
</view> </view>
...@@ -75,7 +75,7 @@ const onCall = (data: any) => { ...@@ -75,7 +75,7 @@ const onCall = (data: any) => {
} }
.call-btn{ .call-btn{
background-color: #2b91e2; background-color: #4880FF;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
...@@ -85,8 +85,8 @@ const onCall = (data: any) => { ...@@ -85,8 +85,8 @@ const onCall = (data: any) => {
margin-top: 40px; margin-top: 40px;
border-radius: 8px; border-radius: 8px;
.call-icon{ .call-icon{
width: 30px; width: 42px;
height: 40px; height: 42px;
} }
} }
} }
......
...@@ -48,8 +48,8 @@ ...@@ -48,8 +48,8 @@
<view>{{item.nickname}}</view> <view>{{item.nickname}}</view>
<text style="color:#999">{{item.group_name}}</text> <text style="color:#999">{{item.group_name}}</text>
</view> </view>
<image v-if="item.is_signin === '1'" @tap.stop="onTapCall(item)" class="call" src="../../assets/call3x.png" mode="widthFix"/> <image v-if="item.is_signin === '1'" @tap.stop="onTapCall(item)" class="call" src="../../assets/call@3x.png" mode="widthFix"/>
<image v-else class="call" src="../../assets/call-no3x.png" mode="widthFix"/> <image v-else class="call" src="../../assets/call-no@3x.png" mode="widthFix"/>
</view> </view>
</view> </view>
</view> </view>
......
...@@ -7,6 +7,8 @@ ...@@ -7,6 +7,8 @@
import { ref } from '@vue/reactivity'; import { ref } from '@vue/reactivity';
import { useThrottle } from 'any-hooks/common/useThrottle'; import { useThrottle } from 'any-hooks/common/useThrottle';
import { useContacts } from 'any-hooks/contacts/useContacts'; import { useContacts } from 'any-hooks/contacts/useContacts';
import { nextTick } from '@tarojs/taro';
const [showLogo, setShowLogo] = useState(true); const [showLogo, setShowLogo] = useState(true);
const [viewMode, setViewMode] = useState<'items' | 'groups'>('items'); const [viewMode, setViewMode] = useState<'items' | 'groups'>('items');
...@@ -17,9 +19,18 @@ ...@@ -17,9 +19,18 @@
const capHeight = ref(rect.height-2); const capHeight = ref(rect.height-2);
const capWidth = ref(`${rect.width+15}px`); const capWidth = ref(`${rect.width+15}px`);
const isFocus = ref(false);
const onScroll = useThrottle((event: any) => { const onScroll = useThrottle((event: any) => {
setShowLogo(event.detail.deltaY >= 0); setShowLogo(event.detail.deltaY >= 0);
}, 500) }, 500)
const showInput = (show: boolean) => {
setShowLogo(!show);
nextTick(() => {
if(show) isFocus.value = true;
})
}
</script> </script>
<template> <template>
...@@ -28,7 +39,7 @@ ...@@ -28,7 +39,7 @@
<image class="logo" v-if="showLogo" src="../../assets/logo3x.png" mode="widthFix"></image> <image class="logo" v-if="showLogo" src="../../assets/logo3x.png" mode="widthFix"></image>
<view class="input-box" :style="{height: capHeight+'px','borderRadius': capHeight/2+'px'}"> <view class="input-box" :style="{height: capHeight+'px','borderRadius': capHeight/2+'px'}">
<image class="search-icon" src="../../assets/serch2x.png" mode="widthFix"></image> <image class="search-icon" src="../../assets/serch2x.png" mode="widthFix"></image>
<input class="search" type="text" placeholder="搜索" v-model="keyword"> <input class="search" type="text" :focus="isFocus" placeholder="搜索" v-model="keyword" @focus="showInput(true)">
</view> </view>
</view> </view>
...@@ -114,8 +125,8 @@ ...@@ -114,8 +125,8 @@
padding: 0 20px; padding: 0 20px;
} }
.call{ .call{
width: 65px; width: 80px;
height: 65px; height: 80px;
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment