|
@@ -9,24 +9,26 @@
|
|
<ul :class="player.lang" @touchmove.stop v-show="otherShow">
|
|
<ul :class="player.lang" @touchmove.stop v-show="otherShow">
|
|
<li>
|
|
<li>
|
|
<!-- <ui-icon type="icon_other_on" @click.stop="onMusicClick"></ui-icon> -->
|
|
<!-- <ui-icon type="icon_other_on" @click.stop="onMusicClick"></ui-icon> -->
|
|
-
|
|
|
|
- <img class="iconImg" v-if="showMusicPlaying.value" @click.stop="onMusicClick" :src="require(`@/assets/images/christmas/icon_other_on@3x.png`)" alt="">
|
|
|
|
- <img class="iconImg" v-else @click.stop="onMusicClick" :src="require(`@/assets/images/christmas/icon_other_on@3x.png`)" alt="">
|
|
|
|
|
|
+ <!-- <div class="music" @click.stop="onMusicClick"> -->
|
|
|
|
+ <img class="iconImg" style="width: 16px;height: 16px" :src="require(`@/assets/images/icon/${showMusicPlaying ? 'music_on@2x' : 'music_off@2x'}.png`)" alt="" />
|
|
|
|
+ <!-- </div> -->
|
|
|
|
+ <!-- <img class="iconImg" v-if="showMusicPlaying.value" @click.stop="onMusicClick" :src="require(`@/assets/images/christmas/icon_other_on@3x.png`)" alt=""> -->
|
|
|
|
+ <!-- <img class="iconImg" v-else @click.stop="onMusicClick" :src="require(`@/assets/images/christmas/icon_other_on@3x.png`)" alt=""> -->
|
|
<div>{{$t('mode.music')}}</div>
|
|
<div>{{$t('mode.music')}}</div>
|
|
</li>
|
|
</li>
|
|
|
|
|
|
<!-- 一起逛 -->
|
|
<!-- 一起逛 -->
|
|
<li v-if="showdaogou">
|
|
<li v-if="showdaogou">
|
|
|
|
|
|
- <img class="iconImg" @click.stop="
|
|
|
|
|
|
+ <!-- <img class="iconImg" @click.stop="
|
|
onClickMenu({
|
|
onClickMenu({
|
|
icon: 'guided_shopping',
|
|
icon: 'guided_shopping',
|
|
id: 'guided_shopping',
|
|
id: 'guided_shopping',
|
|
name: $t('common.mode'),
|
|
name: $t('common.mode'),
|
|
})
|
|
})
|
|
- " :src="require(`@/assets/images/christmas/icon_shopping_together@3x.png`)" alt="">
|
|
|
|
- <!-- <ui-icon
|
|
|
|
- type="icon_shopping"
|
|
|
|
|
|
+ " :src="require(`@/assets/images/christmas/icon_shopping_together@3x.png`)" alt=""> -->
|
|
|
|
+ <ui-icon
|
|
|
|
+ type="guided_shopping"
|
|
@click.stop="
|
|
@click.stop="
|
|
onClickMenu({
|
|
onClickMenu({
|
|
icon: 'guided_shopping',
|
|
icon: 'guided_shopping',
|
|
@@ -34,26 +36,26 @@
|
|
name: $t('common.mode'),
|
|
name: $t('common.mode'),
|
|
})
|
|
})
|
|
"
|
|
"
|
|
- ></ui-icon> -->
|
|
|
|
|
|
+ ></ui-icon>
|
|
<div>{{ $t('common.mode') }}</div>
|
|
<div>{{ $t('common.mode') }}</div>
|
|
</li>
|
|
</li>
|
|
<!-- //帮助 -->
|
|
<!-- //帮助 -->
|
|
<li>
|
|
<li>
|
|
- <img class="iconImg" @click.stop="
|
|
|
|
|
|
+ <!-- <img class="iconImg" @click.stop="
|
|
onClickMenu({
|
|
onClickMenu({
|
|
icon: 'help',
|
|
icon: 'help',
|
|
id: 'help',
|
|
id: 'help',
|
|
name: t('common.help'),
|
|
name: t('common.help'),
|
|
})
|
|
})
|
|
" :src="require(`@/assets/images/christmas/icon_help@3x.png`)" alt="">
|
|
" :src="require(`@/assets/images/christmas/icon_help@3x.png`)" alt="">
|
|
-
|
|
|
|
- <!-- <ui-icon type="icon_help" @click.stop="
|
|
|
|
|
|
+ -->
|
|
|
|
+ <ui-icon type="help" @click.stop="
|
|
onClickMenu({
|
|
onClickMenu({
|
|
icon: 'help',
|
|
icon: 'help',
|
|
id: 'help',
|
|
id: 'help',
|
|
name: t('common.help'),
|
|
name: t('common.help'),
|
|
})
|
|
})
|
|
- "></ui-icon> -->
|
|
|
|
|
|
+ "></ui-icon>
|
|
<div>{{$t('common.help')}}</div>
|
|
<div>{{$t('common.help')}}</div>
|
|
</li>
|
|
</li>
|
|
</ul>
|
|
</ul>
|
|
@@ -74,13 +76,13 @@
|
|
<div>{{$t('common.tour')}}</div>
|
|
<div>{{$t('common.tour')}}</div>
|
|
</li>
|
|
</li>
|
|
<li v-show="metadata.cdfRegionData?.region == 'AM'" @click.stop="onClickMenu(item)" v-for="(item, i) in menulist" :key="i">
|
|
<li v-show="metadata.cdfRegionData?.region == 'AM'" @click.stop="onClickMenu(item)" v-for="(item, i) in menulist" :key="i">
|
|
- <!-- <ui-icon :type="item.icon"></ui-icon> -->
|
|
|
|
- <img class="iconImg" :src="require(`@/assets/images/christmas/icon_customer_service@3x.png`)" alt="">
|
|
|
|
|
|
+ <ui-icon :type="item.icon"></ui-icon>
|
|
|
|
+ <!-- <img class="iconImg" :src="require(`@/assets/images/christmas/icon_customer_service@3x.png`)" alt=""> -->
|
|
<div>{{ item.name }}</div>
|
|
<div>{{ item.name }}</div>
|
|
</li>
|
|
</li>
|
|
|
|
|
|
<!-- 一起逛 -->
|
|
<!-- 一起逛 -->
|
|
- <!-- <li v-if="showdaogou">
|
|
|
|
|
|
+ <!-- <li>
|
|
<ui-icon
|
|
<ui-icon
|
|
type="guided_shopping"
|
|
type="guided_shopping"
|
|
@click.stop="
|
|
@click.stop="
|
|
@@ -93,29 +95,30 @@
|
|
></ui-icon>
|
|
></ui-icon>
|
|
<div>{{ $t('common.mode') }}</div>
|
|
<div>{{ $t('common.mode') }}</div>
|
|
</li> -->
|
|
</li> -->
|
|
- <li>
|
|
|
|
- <img class="iconImg" @click.stop="
|
|
|
|
- onClickMenu({
|
|
|
|
- icon: 'shopping',
|
|
|
|
- id: 'shopping',
|
|
|
|
- name: $t('common.shopping'),
|
|
|
|
- })
|
|
|
|
- " :src="require(`@/assets/images/christmas/icon_shopping@3x.png`)" alt="">
|
|
|
|
- <!-- <ui-icon
|
|
|
|
- type="icon_shopping"
|
|
|
|
- @click.stop="
|
|
|
|
- onClickMenu({
|
|
|
|
- icon: 'shopping',
|
|
|
|
- id: 'shopping',
|
|
|
|
- name: $t('common.shopping'),
|
|
|
|
- })
|
|
|
|
- "
|
|
|
|
- ></ui-icon> -->
|
|
|
|
|
|
+ <li v-if="showdaogou && isShowLive">
|
|
|
|
+ <ui-icon type="guided_shopping" @click.stop="
|
|
|
|
+ onClickMenu({
|
|
|
|
+ icon: 'guided_shopping',
|
|
|
|
+ id: 'guided_shopping',
|
|
|
|
+ name: $t('common.mode'),
|
|
|
|
+ })
|
|
|
|
+ "></ui-icon>
|
|
|
|
+ <div>{{ $t('common.mode') }}</div>
|
|
|
|
+ </li>
|
|
|
|
+
|
|
|
|
+ <li v-if="metadata?.cdfProductSource?.mchType == 0">
|
|
|
|
+ <ui-icon type="shopping" @click.stop="
|
|
|
|
+ onClickMenu({
|
|
|
|
+ icon: 'shopping',
|
|
|
|
+ id: 'shopping',
|
|
|
|
+ name: $t('common.shopping'),
|
|
|
|
+ })
|
|
|
|
+ "></ui-icon>
|
|
<div>{{ $t('common.shopping') }}</div>
|
|
<div>{{ $t('common.shopping') }}</div>
|
|
</li>
|
|
</li>
|
|
<li>
|
|
<li>
|
|
|
|
|
|
- <img class="iconImg" @click.stop="otherShow = !otherShow" :src="require(`@/assets/images/christmas/icon_other@3x.png`)" alt="">
|
|
|
|
|
|
+ <img class="iconImg" @click.stop="otherShow = !otherShow" :src="require(`@/assets/images/icon/other.svg`)" alt="">
|
|
<!-- <ui-icon
|
|
<!-- <ui-icon
|
|
type="icon_other"
|
|
type="icon_other"
|
|
@click.stop="otherShow = !otherShow"
|
|
@click.stop="otherShow = !otherShow"
|
|
@@ -292,10 +295,10 @@ const menulist = computed(() => {
|
|
// {
|
|
// {
|
|
// icon: 'help',
|
|
// icon: 'help',
|
|
// id: 'help',
|
|
// id: 'help',
|
|
- // name: t('common.help'),
|
|
|
|
|
|
+ // name: 'asdasd',
|
|
// },
|
|
// },
|
|
{
|
|
{
|
|
- icon: 'icon_customer_service',
|
|
|
|
|
|
+ icon: 'customer_service',
|
|
id: 'kefu',
|
|
id: 'kefu',
|
|
name: t('common.kefu'),
|
|
name: t('common.kefu'),
|
|
},
|
|
},
|
|
@@ -543,7 +546,7 @@ musicPlayer.on('pause', () => (showMusicPlaying.value = false))
|
|
box-sizing: border-box;
|
|
box-sizing: border-box;
|
|
position: relative;
|
|
position: relative;
|
|
align-items: center;
|
|
align-items: center;
|
|
- height: 1.4rem;
|
|
|
|
|
|
+ height: 48px;
|
|
padding: 0 12px;
|
|
padding: 0 12px;
|
|
text-align: center;
|
|
text-align: center;
|
|
float: right;
|
|
float: right;
|
|
@@ -578,14 +581,13 @@ musicPlayer.on('pause', () => (showMusicPlaying.value = false))
|
|
box-sizing: border-box;
|
|
box-sizing: border-box;
|
|
position: relative;
|
|
position: relative;
|
|
align-items: center;
|
|
align-items: center;
|
|
- height: 1.4rem;
|
|
|
|
|
|
+ height: 48px;
|
|
padding: 0 0.32rem;
|
|
padding: 0 0.32rem;
|
|
- border-radius: 25px;
|
|
|
|
text-align: center;
|
|
text-align: center;
|
|
.searchDiv{
|
|
.searchDiv{
|
|
width: 4rem;
|
|
width: 4rem;
|
|
- height: 0.75rem;
|
|
|
|
- background: rgba(0, 0, 0, 0.5);
|
|
|
|
|
|
+ height: 30px;
|
|
|
|
+ background: rgba(0, 0, 0, 0.2);
|
|
border-radius: 24px;
|
|
border-radius: 24px;
|
|
display: flex;
|
|
display: flex;
|
|
font-size: 12px;
|
|
font-size: 12px;
|
|
@@ -807,7 +809,7 @@ musicPlayer.on('pause', () => (showMusicPlaying.value = false))
|
|
|
|
|
|
.search {
|
|
.search {
|
|
width: 100%;
|
|
width: 100%;
|
|
- height: 0.91rem;
|
|
|
|
|
|
+ height: 38px;
|
|
background: rgba(46, 46, 46, 0.9);
|
|
background: rgba(46, 46, 46, 0.9);
|
|
border-radius: 20px;
|
|
border-radius: 20px;
|
|
display: flex;
|
|
display: flex;
|