Toggle navigation
Toggle navigation
This project
Loading...
Sign in
fe
/
xianyu-ufo-app-web
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
0
Merge Requests
0
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Plain Diff
Browse Files
Authored by
lea guo
5 years ago
Commit
7ee3e0a22f9b01fd8ae86336271194fe3ddc978a
2 parents
833d1c08
00069aa1
Merge branch 'develop' of git.yoho.cn:fe/xianyu-ufo-app-web into develop
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
18 additions
and
32 deletions
apps/pages/home/tradeIncome/components/payAccount.vue
apps/pages/order/order-detail/buyer-order-detail.vue
apps/pages/order/order-list/components/video-player.vue
apps/pages/order/order-list/order-list.vue
apps/store/home/bindAccount.js
apps/pages/home/tradeIncome/components/payAccount.vue
View file @
7ee3e0a
...
...
@@ -3,7 +3,7 @@
<div v-if="validStatus === 1">
<div class="account">
<p class="account-tip">支付宝账号</p>
<p class="account-name">{{alipayAccount}}</p>
<p class="account-name">{{alipayAccount
?alipayAccount:nickName
}}</p>
</div>
<p class="tip"><i class="cubeic-warn"></i><span>已绑定的支付宝账号暂无法提供系统换绑和解除,如
需要帮助可致电<a class="phone" href="tel:400-8890-9646"> 400-8890-9646 </a>联系电话客服</span></p>
...
...
@@ -26,7 +26,7 @@ export default {
this.fetchUserAliPayAccount()
},
computed: {
...mapState(['alipayAccount','certName', 'validStatus'])
...mapState(['alipayAccount','certName', 'validStatus'
,'nickName'
])
},
methods: {
...mapActions(['fetchUserAliPayAccount']),
...
...
apps/pages/order/order-detail/buyer-order-detail.vue
View file @
7ee3e0a
...
...
@@ -25,12 +25,8 @@
<!-- 商品信息 -->
<order-item-info class="item-wrapper" />
<!-- 鉴定视频 -->
<div
class="video-img"
v-if="orderDetail.appraiseVideoUrl"
@click="() => onVideoHandler()"
></div>
<div ref="videoWrapper" class="video-wrapper">
<div class="video-img" v-if="orderDetail.appraiseVideoUrl" @click="() => onVideoHandler()"></div>
<div class="video-wrapper">
<VideoPlayer
ref="videoPlayer"
class="video-player"
...
...
@@ -215,12 +211,13 @@ export default {
}
.video-img {
display: block;
margin-top: 40px;
margin-left: -15px;
width: calc(100% + 20px);
width: 100%;
height: 378px;
background: url("~statics/image/order/video-big@3x.png");
background: url("~statics/image/order/video-big@3x.png")
no-repeat
;
background-size: cover;
background-position: center;
}
.video-wrapper {
...
...
@@ -229,7 +226,7 @@ export default {
.video-player {
display: block;
height:
3
0px;
height:
4
0px;
opacity: 0;
}
...
...
apps/pages/order/order-list/components/video-player.vue
View file @
7ee3e0a
...
...
@@ -122,7 +122,7 @@ export default {
}
},
mounted() {
this.showPlayer();
//
this.showPlayer();
},
beforeDestroy() {
if (this.player) {
...
...
@@ -131,8 +131,10 @@ export default {
},
methods: {
parentHandleclick() {
this.showVideo = true;
this.showPlayer();
this.player.play();
const timeId = setTimeout(() => {
this.player.requestFullscreen();
clearTimeout(timeId);
...
...
@@ -143,6 +145,7 @@ export default {
return;
}
this.showVideo = true;
this.$nextTick(() => {
this.initPlayer();
});
...
...
@@ -187,14 +190,6 @@ export default {
this.voiceBtn.removeClass(noVioceClass);
}
});
// setTimeout(() => {
// this.$yoho.getNetStatus({}, res => {
// if (res && +res.wifi === 1) {
// this.player.autoplay("muted");
// }
// });
// }, 1000);
},
getTime() {
return new Date().getTime();
...
...
apps/pages/order/order-list/order-list.vue
View file @
7ee3e0a
...
...
@@ -29,7 +29,7 @@
@on-video="params => onVideoHandle(params)"
/>
</div>
<div
ref="videoWrapper"
class="video-wrapper">
<div class="video-wrapper">
<VideoPlayer
:ref="order.orderCode"
class="video-player"
...
...
@@ -115,15 +115,6 @@ export default {
$video.parentHandleclick();
}
}
},
mounted() {
if (this.$yoho.isAndroid) {
this.$refs.videoWrapper.forEach($vnode => {
$vnode.style.position = "absolute";
$vnode.style.top = "-1000px";
});
}
}
};
</script>
...
...
apps/store/home/bindAccount.js
View file @
7ee3e0a
...
...
@@ -5,6 +5,7 @@ export default function() {
state
:
{
alipayAccount
:
''
,
certName
:
''
,
nickName
:
''
,
validStatus
:
0
},
mutations
:
{
...
...
@@ -12,10 +13,12 @@ export default function() {
let
{
alipayAccount
,
certName
,
nickName
,
validStatus
}
=
data
;
state
.
alipayAccount
=
maskAccount
(
alipayAccount
);
state
.
nickName
=
nickName
||
''
;
state
.
certName
=
certName
;
state
.
validStatus
=
validStatus
;
}
...
...
Please
register
or
login
to post a comment